Logically order type specifier cases in sig/parse.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8be16df3bc418ef26ec0a71f84617a4968d9729d..278e27bad42e58c31787743308f929f985cc0214 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,10 +25,15 @@ SUBDIRS =
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 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_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
 

-AM_OBJCXXFLAGS = -fobjc-exceptions
+AM_CFLAGS = -fvisibility=hidden
+AM_CXXFLAGS = -fvisibility=hidden
+AM_OBJCXXFLAGS = -fvisibility=hidden
+AM_LDFLAGS = -fvisibility=hidden
+
+AM_OBJCXXFLAGS += -fobjc-exceptions

 
 CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
 
 
 CY_LDFLAGS = -no-undefined -avoid-version -export-dynamic
 


@@ -36,36 +41,56 @@ lib_LTLIBRARIES =
 
 lib_LTLIBRARIES += libcycript.la
 libcycript_la_LDFLAGS = $(CY_LDFLAGS)
 
 lib_LTLIBRARIES += libcycript.la
 libcycript_la_LDFLAGS = $(CY_LDFLAGS)

-libcycript_la_LIBADD = $(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 Parser.cpp Replace.cpp
-libcycript_la_SOURCES += Cycript.tab.cc lex.cy.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 = 
 
 if CY_CONSOLE
 bin_PROGRAMS = cycript
 
 filters = 
 
 if CY_CONSOLE
 bin_PROGRAMS = cycript

-cycript_SOURCES = Console.cpp Display.cpp
+cycript_SOURCES = Console.cpp

 cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
 cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl

+libcycript_la_SOURCES += Complete.cpp

 endif
 
 if CY_EXECUTE
 libcycript_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp
 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
 
 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
 
 CLEANFILES += Bridge.gperf
 Bridge.gperf: Bridge.def Bridge.sh

-       $(srcdir)/Bridge.sh $< >$@
+       $(srcdir)/Bridge.sh <$< >$@

 
 CLEANFILES += Bridge.hpp
 Bridge.hpp: Bridge.gperf
 
 CLEANFILES += Bridge.hpp
 Bridge.hpp: Bridge.gperf

-       $(GPERF) $< | $(SED) -e 's/defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/0/' >$@
+       $(GPERF) $< >$@

 endif
 
 if CY_JAVA
 endif
 
 if CY_JAVA


@@ -89,24 +114,30 @@ AM_CPPFLAGS += -DCY_ATTACH
 endif
 endif
 
 endif
 endif
 

-CLEANFILES += Cycript.yy
-Cycript.yy: Cycript.yy.in
+CLEANFILES += Parser.ypp
+Parser.ypp: Parser.ypp.in

        $(srcdir)/Filter.sh $< >$@ $(filters)
 
        $(srcdir)/Filter.sh $< >$@ $(filters)
 

-CLEANFILES += Cycript.l
-Cycript.l: Cycript.l.in UnicodeIDStart.l UnicodeIDContinue.l
+CLEANFILES += Scanner.lpp
+Scanner.lpp: Scanner.lpp.in UnicodeIDStart.l UnicodeIDContinue.l

        $(srcdir)/Filter.sh $< >$@ $(filters)
 
        $(srcdir)/Filter.sh $< >$@ $(filters)
 

-CLEANFILES += lex.cy.cpp
-lex.cy.cpp: Cycript.l
-       $(FLEX) -b -t $< | $(SED) -e 's/int yyl;/yy_size_t yyl;/;s/int yyleng_r;/yy_size_t yyleng_r;/;s/yyg =/yyg __attribute__((__unused__)) =/' >$@
-       grep -F 'No backing up.' lex.backup >/dev/null
-
-Console.$(OBJEXT) Cycript.tab.lo Driver.lo Handler.lo Highlight.lo Library.lo lex.cy.lo: Cycript.tab.hh
-
-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]* ([^)]*)$$'
+CLEANFILES += Scanner.cpp Scanner.output lex.backup
+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 -n '^ jam-transitions: ' lex.backup | grep -v ': EOF \[\(\]\| \\2\)'
+       ! grep -F ': warning, ' Scanner.output || true
+
+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.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