From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Tue, 7 Jan 2014 03:34:02 +0000 (-0800)
Subject: Do not allow the grammar to contain conflicts.
X-Git-Tag: v0.9.500~100
X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/7c354490c1d5cf76496fe22ab2a17cd51e434e8b?ds=inline

Do not allow the grammar to contain conflicts.
---

diff --git a/Makefile.am b/Makefile.am
index f34a4b6..d92adb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,5 +124,6 @@ Console.$(OBJEXT) Cycript.tab.lo Driver.lo Handler.lo Highlight.lo Library.lo le
 CLEANFILES += Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output: Cycript.yy
 	$(BISON) -v --report=state $<
+	! grep -n '^State [0-9]* conflicts:' Cycript.output
 	! grep -n '^ *$$default  reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Cycript.output -B 2 | grep 'shift, and go to state [0-9]*$$'
 	! grep -n '^ *$$default  reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Cycript.output -B 2 | grep -v '$$default' | grep 'reduce using rule [0-9]* ([^)]*)$$'
diff --git a/Makefile.in b/Makefile.in
index a1fdd8a..fe3ef22 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1342,6 +1342,7 @@ lex.cy.cpp: Cycript.l
 Console.$(OBJEXT) Cycript.tab.lo Driver.lo Handler.lo Highlight.lo Library.lo lex.cy.lo: Cycript.tab.hh
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output: Cycript.yy
 	$(BISON) -v --report=state $<
+	! grep -n '^State [0-9]* conflicts:' Cycript.output
 	! grep -n '^ *$$default  reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Cycript.output -B 2 | grep 'shift, and go to state [0-9]*$$'
 	! grep -n '^ *$$default  reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Cycript.output -B 2 | grep -v '$$default' | grep 'reduce using rule [0-9]* ([^)]*)$$'