nitcc:: when removing a reduction in S/R, notify the token to not generate the reduce...

[nit.git] / contrib / nitcc / src / grammar.nit

diff --git a/contrib/nitcc/src/grammar.nit b/contrib/nitcc/src/grammar.nit
index 0a10beb..095072e 100644 (file)
--- a/contrib/nitcc/src/grammar.nit
+++ b/contrib/nitcc/src/grammar.nit
@@ -1001,7 +1001,8 @@ class LRState
                        if a.length > 1 then
                                print "REDUCE/REDUCE Conflict on state {self.number} {self.name} for token {t}:"
                                for i in a do print "\treduce: {i}"
-                       else if guarded_shift.has_key(t) then
+                       end
+                       if guarded_shift.has_key(t) then
                                var ri = a.first
                                var confs = new Array[Item]
                                var ress = new Array[String]
@@ -1044,6 +1045,7 @@ class LRState
                end
                for t in removed_reduces do
                        guarded_reduce.keys.remove(t)
+                       t.reduces.remove(self)
                end
        end