Skip to content

adding angular module #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

adding angular module #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
18cc75f
adding angular module
lukasz-karolewski May 31, 2015
8e4e2d6
setting proper module name
lukasz-karolewski May 31, 2015
52fd537
missed quotes
lukasz-karolewski May 31, 2015
aeee03b
no need for require
lukasz-karolewski May 31, 2015
4e38b4d
Merge pull request #1 from nolanlawson/246
May 31, 2015
9eabc2f
parse error is on current object not it's prototype, if it's not set …
lukasz-karolewski Jun 1, 2015
1d441ab
added a generated comment and jshint ignore
lukasz-karolewski Jun 1, 2015
c56324c
ignore .idea
lukasz-karolewski Jun 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ node_modules
# Editor backup files
*.bak
*~
web/content/assets/js/jison.js
web/content/assets/js/jison.js
.idea/
25 changes: 22 additions & 3 deletions lib/jison.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,9 @@ lrGeneratorMixin.generate = function parser_generate (opt) {
case "js":
code = this.generateModule(opt);
break;
case "angular":
code = this.generateAngularModule(opt);
break;
case "amd":
code = this.generateAMDModule(opt);
break;
Expand All @@ -947,7 +950,24 @@ lrGeneratorMixin.generate = function parser_generate (opt) {
return code;
};

lrGeneratorMixin.generateAMDModule = function generateAMDModule(opt){
lrGeneratorMixin.generateAngularModule = function generateAngularModule(opt){
opt = typal.mix.call({}, this.options, opt);
var module = this.generateModule_();
var moduleName = opt.moduleName || "parser";

var out = '// generated by jison\n// jshint ignore: start\nangular.module("jison.'+moduleName+'", [])' +
'.factory("'+moduleName+'Parser", function(){\n'
+ module.commonCode
+ '\nvar parser = '+ module.moduleCode
+ "\n"+this.moduleInclude
+ (this.lexer && this.lexer.generateModule ?
'\n' + this.lexer.generateModule() +
'\nparser.lexer = lexer;' : '')
+ '\nreturn parser;'
+ '\n});';
return out;
};
lrGeneratorMixin.generateAMDModule = function generateAMDModule(opt){
opt = typal.mix.call({}, this.options, opt);
var module = this.generateModule_();
var out = '\n\ndefine(function(require){\n'
Expand Down Expand Up @@ -1340,6 +1360,7 @@ lrGeneratorMixin.createParser = function createParser () {
// backwards compatability
p.lexer = this.lexer;
p.generate = bind('generate');
p.generateAngularModule = bind('generateAngularModule');
p.generateAMDModule = bind('generateAMDModule');
p.generateModule = bind('generateModule');
p.generateCommonJSModule = bind('generateCommonJSModule');
Expand Down Expand Up @@ -1405,8 +1426,6 @@ parser.parse = function parse (input) {

if (typeof sharedState.yy.parseError === 'function') {
this.parseError = sharedState.yy.parseError;
} else {
this.parseError = Object.getPrototypeOf(this).parseError;
}

function popStack (n) {
Expand Down