refactor generation so that in-memory and to-source code paths are th…

…e same

lib/jison.js

@@ -253,13 +253,7 @@ generator.buildProductions = function buildProductions(bnf, productions, nonterm
  var parameters = "yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */";
  if (this.parseParams) parameters += ', ' + this.parseParams.join(', ');
 
- // first try to create the performAction function the old way,
- // but this will break for some legal constructs in the user action code:
- try {
- this.performAction = Function(parameters, actions);
- } catch (e) {
- this.performAction = "function anonymous(" + parameters + ") {\n" + actions + "\n}";
- }
+ this.performAction = "function anonymous(" + parameters + ") {\n" + actions + "\n}";
 
  function buildProduction (handle) {
  var r, rhs, i;
@@ -1054,7 +1048,17 @@ lrGeneratorMixin.generateModule = function generateModule (opt) {
  + " recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error)\n"
  + " }\n"
  + "*/\n";
- out += (moduleName.match(/\./) ? moduleName : "var "+moduleName)+" = (function(){";
+ out += (moduleName.match(/\./) ? moduleName : "var "+moduleName) +
+ " = " + this.generateModuleExpr();
+
+ return out;
+};
+
+
+lrGeneratorMixin.generateModuleExpr = function generateModuleExpr () {
+ var out = '';
+
+ out += "(function(){";
  out += "\nvar parser = "+this.generateModule_();
  out += "\n"+this.moduleInclude;
  if (this.lexer && this.lexer.generateModule) {
@@ -1157,16 +1161,8 @@ var lrGeneratorDebug = {
 var parser = typal.beget();
 
 lrGeneratorMixin.createParser = function createParser () {
- var p = parser.beget();
- p.yy = {};
-
- p.init(this);
 
- // don't throw if grammar recovers from errors
- if (this.hasErrorRecovery) {
- p.parseError = traceParseError;
- p.recover = true;
- }
+ var p = eval(this.generateModuleExpr());
 
  // for debugging
  p.productions = this.productions;
@@ -1180,16 +1176,11 @@ lrGeneratorMixin.createParser = function createParser () {
  }
 
  // backwards compatability
- p.lexer = this.lexer;
  p.generate = bind('generate');
  p.generateAMDModule = bind('generateAMDModule');
  p.generateModule = bind('generateModule');
  p.generateCommonJSModule = bind('generateCommonJSModule');
 
- p.Parser = function () {
- return self.createParser();
- };
-
  return p;
 };