Move all "regular" LexPushInOff/LexPopIn to lexer.

[cycript.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index cafdcf7a4523857ef7b22d5b0ea26c756888dba1..3ca299b7c0560a7f691f63bd50593a705eef04c7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -211,10 +211,10 @@ libcycript_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) \
        $(OBJCXXFLAGS) $(libcycript_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(bin_PROGRAMS)
-am__cycript_SOURCES_DIST = Console.cpp Display.cpp Inject.cpp
+am__cycript_SOURCES_DIST = Console.cpp Inject.cpp
 @CY_ATTACH_TRUE@@CY_CONSOLE_TRUE@am__objects_6 = Inject.$(OBJEXT)
 @CY_CONSOLE_TRUE@am_cycript_OBJECTS = Console.$(OBJEXT) \
-@CY_CONSOLE_TRUE@      Display.$(OBJEXT) $(am__objects_6)
+@CY_CONSOLE_TRUE@      $(am__objects_6)
 cycript_OBJECTS = $(am_cycript_OBJECTS)
 @CY_CONSOLE_TRUE@cycript_DEPENDENCIES = libcycript.la \
 @CY_CONSOLE_TRUE@      $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -561,8 +561,7 @@ libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp \
        $(am__append_2) $(am__append_8) $(am__append_11) \
        $(am__append_13)
 filters = $(am__append_5) $(am__append_7) $(am__append_10)
-@CY_CONSOLE_TRUE@cycript_SOURCES = Console.cpp Display.cpp \
-@CY_CONSOLE_TRUE@      $(am__append_14)
+@CY_CONSOLE_TRUE@cycript_SOURCES = Console.cpp $(am__append_14)
 @CY_CONSOLE_TRUE@cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -754,7 +753,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Console.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConvertUTF.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Decode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Display.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Driver.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Execute.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Handler.Plo@am__quote@
@@ -1312,13 +1310,15 @@ Scanner.lpp: Scanner.lpp.in UnicodeIDStart.l UnicodeIDContinue.l
        $(srcdir)/Filter.sh $< >$@ $(filters)
 Scanner.cpp: Scanner.lpp
        $(FLEX) $(LFLAGS) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false)
-       grep -E '^(No backing up\.|Compressed tables always back up\.)$$' lex.backup >/dev/null
+       @#grep -E '^(No backing up\.|Compressed tables always back up\.)$$' lex.backup >/dev/null
+       ! grep -n '^ jam-transitions: ' lex.backup | grep -v ': EOF \[\(\]\| \\2\)'
        ! grep -F ': warning, ' Scanner.output || true
 
-Scanner.lo: Parser.hpp
+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]* ([^)]*)$$'