Logically order type specifier cases in sig/parse.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fba24398b12abaad3178ea235911b36bf6b13ffa..278e27bad42e58c31787743308f929f985cc0214 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ SUBDIRS =
 
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS = -DYYDEBUG=1
+AM_CPPFLAGS = -DYYDEBUG=1 -DCY_SYSTEM="\"$(CY_SYSTEM)\""
 AM_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
 
 AM_CFLAGS = -fvisibility=hidden
@@ -41,9 +41,9 @@ lib_LTLIBRARIES =
 
 lib_LTLIBRARIES += libcycript.la
 libcycript_la_LDFLAGS = $(CY_LDFLAGS)
-libcycript_la_LIBADD = $(LTLIBUV) $(LTLIBFFI) $(LTLIBGCC) -ldl
+libcycript_la_LIBADD = $(LTLIBUV) $(LTLIBFFI) $(LTLIBSQLITE3) $(LTLIBGCC) -ldl
 
-libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Replace.cpp Syntax.cpp
+libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Error.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Replace.cpp Syntax.cpp
 libcycript_la_SOURCES += Parser.cpp Scanner.cpp
 
 filters = 
@@ -57,17 +57,36 @@ endif
 
 if CY_EXECUTE
 libcycript_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp
-libcycript_la_SOURCES += Bridge.cpp Execute.cpp JavaScriptCore.cpp
+libcycript_la_SOURCES += Execute.cpp JavaScriptCore.cpp
 libcycript_la_LIBADD += $(LTJAVASCRIPTCORE)
 
 AM_CPPFLAGS += -DCY_EXECUTE
 filters += C
 
-Bridge.lo: Bridge.hpp
+datdir = $(libdir)
+dat_DATA = libcycript.db
+
+CLEANFILES += libcycript.db
+libcycript.db: Bridge.def libcycript.sh
+       $(srcdir)/libcycript.sh $(CY_SYSTEM) $@ $<
+
+if CY_PRELINK
+CLEANFILES += Analyze
+Analyze: Analyze.cpp Error.cpp Output.cpp Replace.cpp Syntax.cpp
+       $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -std=c++11 $(LDFLAGS_FOR_BUILD) -DCY_OBJECTIVEC=$(CY_OBJECTIVEC) -I$(srcdir)/extra -o $@ $^ $(CY_LIBCLANG) -Wno-bitwise-op-parentheses -Wno-dangling-else -Wno-logical-op-parentheses
+
+CLEANFILES += Bridge.def
+Bridge.def: Analysis.cpp Analyze
+       ./Analyze $< $(OBJCXX) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) >$@
+else
+CLEANFILES += Bridge.def
+Bridge.def: Bridge.def.in
+       cat $< >$@
+endif
 
 CLEANFILES += Bridge.gperf
 Bridge.gperf: Bridge.def Bridge.sh
-       $(srcdir)/Bridge.sh $< >$@
+       $(srcdir)/Bridge.sh <$< >$@
 
 CLEANFILES += Bridge.hpp
 Bridge.hpp: Bridge.gperf
@@ -110,11 +129,15 @@ Scanner.cpp: Scanner.lpp
        ! 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.lo: Parser.hpp
+Parser.cpp: Parser.hpp
 
 CLEANFILES += Parser.cpp Parser.hpp stack.hh Parser.output
-Parser.cpp Parser.hpp stack.hh Parser.output: Parser.ypp
+Parser.hpp: 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]* ([^)]*)$$'
+       perl -pi -e 's/yytranslate_ \(yylex \(/(yylex_ (/g' Parser.cpp