Sort-of improve multi-line editor when in vi mode.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b9e7b643c36db9ea185f2f89311e5cfb22659b0a..3a71b357e0e25c9fda599cb0d0f893bea8798c68 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,23 +28,31 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -DYYDEBUG=1
 AM_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
 
+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
 
 lib_LTLIBRARIES = 
 
 lib_LTLIBRARIES += libcycript.la
 libcycript_la_LDFLAGS = $(CY_LDFLAGS)
-libcycript_la_LIBADD = $(LTLIBFFI) $(LTLIBGCC) -ldl
+libcycript_la_LIBADD = $(LTLIBUV) $(LTLIBFFI) $(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 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
-cycript_SOURCES = Console.cpp Display.cpp
+cycript_SOURCES = Console.cpp
 cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
+libcycript_la_SOURCES += Complete.cpp
 endif
 
 if CY_EXECUTE
@@ -63,7 +71,7 @@ Bridge.gperf: Bridge.def Bridge.sh
 
 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
@@ -87,23 +95,25 @@ AM_CPPFLAGS += -DCY_ATTACH
 endif
 endif
 
-CLEANFILES += Cycript.yy
-Cycript.yy: Cycript.yy.in
-       $(srcdir)/Filter.sh <$< >$@ $(filters)
+CLEANFILES += Parser.ypp
+Parser.ypp: Parser.ypp.in
+       $(srcdir)/Filter.sh $< >$@ $(filters)
 
-CLEANFILES += Cycript.l
-Cycript.l: Cycript.l.in
-       $(srcdir)/Filter.sh <$< >$@ $(filters)
+CLEANFILES += Scanner.lpp
+Scanner.lpp: Scanner.lpp.in UnicodeIDStart.l UnicodeIDContinue.l
+       $(srcdir)/Filter.sh $< >$@ $(filters)
 
-CLEANFILES += lex.cy.cpp
-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;/' >$@
+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 -F ': warning, ' Scanner.output || true
 
-Console.$(OBJEXT) Cycript.tab.lo Driver.lo Handler.lo Highlight.lo Library.lo lex.cy.lo: Cycript.tab.hh
+Scanner.lo: Parser.hpp
 
-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 $<
-       ! 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 += Parser.cpp Parser.hpp stack.hh Parser.output
+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 '^ *$$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]* ([^)]*)$$'