Merge remote-tracking branch 'remotes/CecilLee/master': merged zaach#260, all tests pass, as before.

# Conflicts:
#	lib/jison.js
#	package.json

Author: GerHobbelt

lib/jison.js

@@ -2104,29 +2104,33 @@ lrGeneratorMixin.gotoOperation = function gotoOperation(itemSet, symbol) {
         }
     });
 
-    return gotoSet.isEmpty() ? gotoSet : this.closureOperation(gotoSet);
+    return gotoSet;
 };
 
 /*
  * Create unique set of item sets
  */
 lrGeneratorMixin.canonicalCollection = function canonicalCollection() {
     var item1 = new this.Item(this.productions[0], 0, [this.EOF]);
-    var firstState = this.closureOperation(new this.ItemSet(item1)),
+    var firstStateNoClosure = new this.ItemSet(item1),
+        firstState = this.closureOperation(firstStateNoClosure),
         states = new Set(firstState),
         marked = 0,
         self = this,
-        itemSet;
+        itemSet,
+        markedSymbols;
 
     states.has = {};
-    states.has[firstState] = 0;
+    states.has[firstStateNoClosure.valueOf()] = 0;
 
     if (devDebug > 0) Jison.print('canonicalCollection: ', states.has);
 
     while (marked !== states.size()) {
         itemSet = states.item(marked);
+        markedSymbols = {};
         itemSet.forEach(function CC_itemSet_forEach(item) {
-            if (item.markedSymbol && item.markedSymbol !== self.EOF) {
+            if (item.markedSymbol && !markedSymbols[item.markedSymbol] && item.markedSymbol !== self.EOF) {
+                markedSymbols[item.markedSymbol] = true;
                 self.canonicalCollectionInsert(item.markedSymbol, itemSet, states, marked);
             }
         });
@@ -2138,22 +2142,23 @@ lrGeneratorMixin.canonicalCollection = function canonicalCollection() {
 
 // Pushes a unique state into the queue. Some parsing algorithms may perform additional operations
 lrGeneratorMixin.canonicalCollectionInsert = function canonicalCollectionInsert(symbol, itemSet, states, stateNum) {
-    var g = this.gotoOperation(itemSet, symbol);
-    if (!g.predecessors) {
-        g.predecessors = {};
-    }
-    // add g to queue if not empty or duplicate
-    if (!g.isEmpty()) {
-        var gv = g.valueOf(),
-            i = states.has[gv];
-        if (i === -1 || typeof i === 'undefined') {
-            states.has[gv] = states.size();
+    var g = this.gotoOperation(itemSet, symbol),
+        state = states.has[g.valueOf()];
+
+    if (state !== undefined) {
+        itemSet.edges[symbol] = state;       // store goto transition for table
+        states.item(state).predecessors[symbol].push(stateNum);
+    } else {
+        // add g to queue if not empty or duplicate
+        if (!g.isEmpty()) {
+            states.has[g.valueOf()] = states.size();
+            g = this.closureOperation(g);
+            if (!g.predecessors) {
+                g.predecessors = {};
+            }
             itemSet.edges[symbol] = states.size();  // store goto transition for table
             states.push(g);
             g.predecessors[symbol] = [stateNum];
-        } else {
-            itemSet.edges[symbol] = i;              // store goto transition for table
-            states.item(i).predecessors[symbol].push(stateNum);
         }
     }
 };

lib/util/transform-parser.js

@@ -2111,29 +2111,33 @@ lrGeneratorMixin.gotoOperation = function gotoOperation(itemSet, symbol) {
         }
     });
 
-    return gotoSet.isEmpty() ? gotoSet : this.closureOperation(gotoSet);
+    return gotoSet;
 };
 
 /*
  * Create unique set of item sets
  */
 lrGeneratorMixin.canonicalCollection = function canonicalCollection() {
     var item1 = new this.Item(this.productions[0], 0, [this.EOF]);
-    var firstState = this.closureOperation(new this.ItemSet(item1)),
+    var firstStateNoClosure = new this.ItemSet(item1),
+        firstState = this.closureOperation(firstStateNoClosure),
         states = new Set(firstState),
         marked = 0,
         self = this,
-        itemSet;
+        itemSet,
+        markedSymbols;
 
     states.has = {};
-    states.has[firstState] = 0;
+    states.has[firstStateNoClosure.valueOf()] = 0;
 
     if (devDebug > 0) Jison.print('canonicalCollection: ', states.has);
 
     while (marked !== states.size()) {
         itemSet = states.item(marked);
+        markedSymbols = {};
         itemSet.forEach(function CC_itemSet_forEach(item) {
-            if (item.markedSymbol && item.markedSymbol !== self.EOF) {
+            if (item.markedSymbol && !markedSymbols[item.markedSymbol] && item.markedSymbol !== self.EOF) {
+                markedSymbols[item.markedSymbol] = true;
                 self.canonicalCollectionInsert(item.markedSymbol, itemSet, states, marked);
             }
         });
@@ -2145,22 +2149,23 @@ lrGeneratorMixin.canonicalCollection = function canonicalCollection() {
 
 // Pushes a unique state into the queue. Some parsing algorithms may perform additional operations
 lrGeneratorMixin.canonicalCollectionInsert = function canonicalCollectionInsert(symbol, itemSet, states, stateNum) {
-    var g = this.gotoOperation(itemSet, symbol);
-    if (!g.predecessors) {
-        g.predecessors = {};
-    }
-    // add g to queue if not empty or duplicate
-    if (!g.isEmpty()) {
-        var gv = g.valueOf(),
-            i = states.has[gv];
-        if (i === -1 || typeof i === 'undefined') {
-            states.has[gv] = states.size();
+    var g = this.gotoOperation(itemSet, symbol),
+        state = states.has[g.valueOf()];
+
+    if (state !== undefined) {
+        itemSet.edges[symbol] = state;       // store goto transition for table
+        states.item(state).predecessors[symbol].push(stateNum);
+    } else {
+        // add g to queue if not empty or duplicate
+        if (!g.isEmpty()) {
+            states.has[g.valueOf()] = states.size();
+            g = this.closureOperation(g);
+            if (!g.predecessors) {
+                g.predecessors = {};
+            }
             itemSet.edges[symbol] = states.size();  // store goto transition for table
             states.push(g);
             g.predecessors[symbol] = [stateNum];
-        } else {
-            itemSet.edges[symbol] = i;              // store goto transition for table
-            states.item(i).predecessors[symbol].push(stateNum);
         }
     }
 };
@@ -17729,7 +17734,7 @@ if (typeof exports !== 'undefined') {
 
 
 },{"./typal":11,"assert":12}],10:[function(require,module,exports){
-/* parser generated by jison 0.4.18-155 */
+/* parser generated by jison 0.4.18-156 */
 /*
  * Returns a Parser object of the following structure:
  *
@@ -18757,7 +18762,7 @@ parse: function parse(input) {
         vstack.length = 0;
         stack_pointer = 0;
 
-        // nuke the error hash info instances created during this run. 
+        // nuke the error hash info instances created during this run.
         // Userland code must COPY any data/references
         // in the error hash instance(s) it is more permanently interested in.
         if (!do_not_nuke_errorinfos) {
@@ -18799,10 +18804,10 @@ parse: function parse(input) {
             lexer: lexer,
             parser: this,
 
-            // and make sure the error info doesn't stay due to potential 
+            // and make sure the error info doesn't stay due to potential
             // ref cycle via userland code manipulations.
             // These would otherwise all be memory leak opportunities!
-            // 
+            //
             // Note that only array and object references are nuked as those
             // constitute the set of elements which can produce a cyclic ref.
             // The rest of the members is kept intact as they are harmless.
@@ -19055,7 +19060,7 @@ parser.originalParseError = parser.parseError;
 parser.originalQuoteName = parser.quoteName;
 
 
-/* generated by jison-lex 0.3.4-155 */
+/* generated by jison-lex 0.3.4-156 */
 var lexer = (function () {
 // See also:
 // http://stackoverflow.com/questions/1382107/whats-a-good-way-to-extend-error-in-javascript/#35881508