From c937f292473ac8c8be2694c7ebf59934d904d751 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 1 Dec 2015 13:56:01 -0800 Subject: [PATCH 1/1] Fix lexer hack correctness check when more spaces. --- Makefile.am | 4 ++-- Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index a3da5f9..09f002c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,5 +115,5 @@ CLEANFILES += Cycript.tab.cc Cycript.tab.hh stack.hh Cycript.output Cycript.tab.cc Cycript.tab.hh stack.hh Cycript.output: Cycript.yy $(BISON) -v --report=state -Werror $< ! 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]* ([^)]*)$$' + ! 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 d9411fc..7383506 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1339,8 +1339,8 @@ Console.$(OBJEXT) Cycript.tab.lo Driver.lo Handler.lo Highlight.lo Library.lo le Cycript.tab.cc Cycript.tab.hh stack.hh Cycript.output: Cycript.yy $(BISON) -v --report=state -Werror $< ! 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]* ([^)]*)$$' + ! 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]* ([^)]*)$$' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.45.2