Verify lexer tokens are always default reductions.

diff --git a/Makefile.am b/Makefile.am
index 3e7e0e5417182c37936f3aee884b68204838f506..0f567cbdf2b4c97959f46905ab0186477ccf9e40 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,5 +116,6 @@ CLEANFILES += Parser.cpp Parser.hpp stack.hh Parser.output
 Parser.cpp Parser.hpp stack.hh Parser.output: Parser.ypp
        $(BISON) -v --report=state -Werror -o Parser.cpp $<
        ! grep -n '^State [0-9]* conflicts:' Parser.output
+       ! grep -n '^ *.* *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output | grep -v '$$default'
        ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep 'shift, and go to state [0-9]*$$'
        ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep -v '$$default' | grep 'reduce using rule [0-9]* ([^)]*)$$'

diff --git a/Makefile.in b/Makefile.in
index e7ef78c902ff134a383ce6c0baeb56aed5f560aa..3ca299b7c0560a7f691f63bd50593a705eef04c7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1318,6 +1318,7 @@ Scanner.lo: Parser.hpp IdentifierStart.h IdentifierContinue.h
 Parser.cpp Parser.hpp stack.hh Parser.output: Parser.ypp
        $(BISON) -v --report=state -Werror -o Parser.cpp $<
        ! grep -n '^State [0-9]* conflicts:' Parser.output
+       ! grep -n '^ *.* *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output | grep -v '$$default'
        ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep 'shift, and go to state [0-9]*$$'
        ! grep -n '^ *$$default *reduce using rule [0-9]* (Lex[A-Z][^)]*)$$' Parser.output -B 2 | grep -v '$$default' | grep 'reduce using rule [0-9]* ([^)]*)$$'
 

diff --git a/Parser.ypp.in b/Parser.ypp.in
index 6acefbc6ae9896a2a583f3b99bedb3db52d19fac..f7f0f0f82ca2edaddd7db5a572bc0059050d5493 100644 (file)
--- a/Parser.ypp.in
+++ b/Parser.ypp.in
@@ -1916,7 +1916,7 @@ ClassSuperOpt
     ;
 
 ImplementationFieldListOpt
-    : TypedIdentifier ";" ImplementationFieldListOpt { $$ = CYNew CYImplementationField($1, $3); }
+    : LexSetRegExp TypedIdentifier ";" ImplementationFieldListOpt { $$ = CYNew CYImplementationField($2, $4); }
     | LexSetRegExp { $$ = NULL; }
     ;
 
@@ -2388,7 +2388,7 @@ RubyProcParameters
 
 RubyProcParametersOpt
     : RubyProcParameters { $$ = $1; }
-    | { $$ = NULL; }
+    | LexSetRegExp { $$ = NULL; }
     ;
 
 RubyProcExpression