Permalink
Browse files

Merge branch 'master' of github.com:zaach/jison

  • Loading branch information...
2 parents 982440b + 240e557 commit 4198c01a91d7507648636d5abe19a511dfd8447d @zaach committed Aug 27, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 lib/jison.js
  2. +5 −5 lib/jison/cli-wrapper.js
View
@@ -941,7 +941,7 @@ lrGeneratorMixin.generateModule = function generateModule (opt) {
out += this.lexer.generateModule();
out += "\nparser.lexer = lexer;";
}
- out += "function Parser () { this.yy = {}; }"
+ out += "\nfunction Parser () { this.yy = {}; }"
+ "Parser.prototype = parser;"
+ "parser.Parser = Parser;"
+ "\nreturn new Parser;\n})();";
View
@@ -7,11 +7,11 @@ var JISON = require('../jison'),
var opts = [
{ name: 'file',
position: 0,
- help: 'Grammar file'
+ help: '\t\t\tGrammar file'
},
{ name: 'lexfile',
position: 1,
- help: 'Lexical grammar file (optional)'
+ help: '\t\tLexical grammar file (optional)'
},
{ name: 'outfile',
string: '-o FILE, --output-file=FILE',
@@ -20,16 +20,16 @@ var opts = [
{ name: 'debug',
string: '-t, --debug',
"default": false,
- help: 'Use debug mode'
+ help: '\t\tUse debug mode'
},
{ name: 'moduleType',
string: '-m, --module-type',
"default": "commonjs",
- help: 'The type of module to generate (commonjs, amd, js)'
+ help: '\tThe type of module to generate (commonjs, amd, js)'
},
{ name: 'version',
string: '-V, --version',
- help: 'Version number'
+ help: '\t\tVersion number'
}
];

0 comments on commit 4198c01

Please sign in to comment.