Always remove the token stack label

_token_stack label was only removed when `token-stack` option was present.
GerHobbelt · Apr 8, 2017 · b7d6e0d · b7d6e0d
1 parent 7653842
commit b7d6e0d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/jison.js b/lib/jison.js
@@ -1092,12 +1092,16 @@ function addTokenStack (fn) {
 
         labeled[0].body = stackAst;
 
-        return escodegen.generate(ast).replace(/_token_stack:\s?/,"").replace(/\\\\n/g,"\\n");
+        return escodegen.generate(ast);
     } catch (e) {
         return parseFn;
     }
 }
 
+function removeTokenStackLabel(code) {
+    return code.replace(/_token_stack:\s?/,"").replace(/\\\\n/g,"\\n");
+}
+
 // lex function that supports token stacks
 function tokenStackLex() {
     var token;
@@ -1143,6 +1147,8 @@ lrGeneratorMixin.generateModule_ = function generateModule_ () {
     if (this.options['token-stack']) {
       parseFn = addTokenStack(parseFn);
     }
+
+    parseFn = removeTokenStackLabel(parseFn);
 
     // Generate code with fresh variable names
     nextVariableId = 0;