Improve isolation of ObjectiveC syntax filter code.

[cycript.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ff8c1bee9c9cf95fbf36e39e3efc5f80a3b99dde..e2c6f7152c9a054f9350e174980b71db62694b79 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -82,7 +82,8 @@ all := cycript
 header := Cycript.tab.hh Parser.hpp Pooling.hpp List.hpp Local.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp
 
 code := 
-code += Replace.lo Output.lo Highlight.lo
+code += Replace.lo Output.lo
+code += Highlight.lo Display.lo
 code += Cycript.tab.lo lex.cy.lo
 code += Network.lo Parser.lo
 code += JavaScriptCore.lo Library.lo
@@ -108,7 +109,7 @@ filters += C
 header += JavaScript.hpp
 endif
 
-cflags += -Wall -Werror -Wno-parentheses #-Wno-unused
+cflags := -Wall -Werror -Wno-parentheses $(cflags)
 cflags += -fno-common
 ifneq ($(srcdir),.)
 cflags += -I.
@@ -187,7 +188,7 @@ endif
 all: $(all)
 
 clean::
-       rm -rf *.lo *.o *.d *.t.hpp .libs */*.d */*.lo */.libs lib*.la $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.yy Cycript.l control Bridge.gperf Bridge.hpp Cycript.output
+       rm -rf *.lo *.o *.d *.t.hpp .libs */*.d */*.lo */.libs lib*.la $(all) Struct.hpp lex.cy.cpp Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.yy Cycript.l control Bridge.gperf Bridge.hpp Cycript.output
 ifneq ($(srcdir),.)
        rm -rf Mach ObjectiveC sig
 endif
@@ -203,8 +204,10 @@ distclean: clean
 
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.yy
        $(bison) -v --report=state $<
+       ! 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]* ([^)]*)$$'
 
-lex.cy.c: Cycript.l
+lex.cy.cpp: Cycript.l
        $(flex) -t $< | $(sed) -e 's/int yyl;/yy_size_t yyl;/;s/int yyleng_r;/yy_size_t yyleng_r;/' >$@
 
 #Parser.hpp: Parser.py Parser.dat
@@ -213,7 +216,7 @@ lex.cy.c: Cycript.l
 Cycript.tab.lo: Cycript.tab.cc $(header)
        $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $<
 
-lex.cy.lo: lex.cy.c $(header)
+lex.cy.lo: lex.cy.cpp $(header)
        $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $<
 
 %.lo: %.cpp $(header)