From 59f5298cf38d2056e611b867fcb6ac428c20158b Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Mon, 6 Aug 2001 12:54:38 +0000 Subject: Make the C++less scanner compile under UNIX --- Zend/Makefile.am | 25 +++++++------------------ Zend/Zend.m4 | 9 +-------- Zend/flex.skl | 5 ----- Zend/zend_ini_scanner.l | 2 +- Zend/zend_language_scanner.l | 2 +- 5 files changed, 10 insertions(+), 33 deletions(-) diff --git a/Zend/Makefile.am b/Zend/Makefile.am index 11157ef7ca..89c7a59a60 100644 --- a/Zend/Makefile.am +++ b/Zend/Makefile.am @@ -3,15 +3,11 @@ #CLEANFILES = zend_language_parser.c zend_language_parser.h zend_language_scanner.c zend_language_parser.output zend_ini_parser.c zend_ini_parser.h zend_ini_scanner.c zend_ini_parser.output AUTOMAKE_OPTIONS=foreign -EXTRA_LTLIBRARIES=libZend_cc.la libZend_c.la -noinst_LTLIBRARIES=$(ZEND_SCANNER) libZend.la - -libZend_cc_la_SOURCES=zend_language_scanner_cc.cc zend_ini_scanner_cc.cc -libZend_c_la_SOURCES=zend_language_scanner.c zend_ini_scanner.c +noinst_LTLIBRARIES=libZend.la libZend_la_SOURCES=\ - zend_language_parser.y \ - zend_ini_parser.y \ + zend_language_parser.y zend_language_scanner.l \ + zend_ini_parser.y zend_ini_scanner.l \ zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \ zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \ zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ @@ -19,23 +15,18 @@ libZend_la_SOURCES=\ zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ zend_ini.c -libZend_la_LIBADD = $(ZEND_SCANNER) libZend_la_LDFLAGS = @EXTRA_LIBS@ -libZend_la_DEPENDENCIES = $(ZEND_SCANNER) # automake isn't too clever about "non-standard" use of lex and yacc -$(libZend_la_OBJECTS) zend_language_scanner.lo zend_language_scanner_cc.lo: zend_language_parser.h +$(libZend_la_OBJECTS): zend_language_parser.h -zend_ini_scanner.lo zend_ini_scanner_cc.lo: zend_ini_parser.h +zend_ini_scanner.lo: zend_ini_parser.h # Language parser/scanner rules zend_language_scanner.c: $(srcdir)/zend_language_scanner.l - $(LEX) -Pzend -o$@ -i $(srcdir)/zend_language_scanner.l - -zend_language_scanner_cc.cc: $(srcdir)/zend_language_scanner.l - $(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pzend -o$@ $(srcdir)/zend_language_scanner.l + $(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l zend_language_parser.h: zend_language_parser.c zend_language_parser.c: $(srcdir)/zend_language_parser.y @@ -47,10 +38,8 @@ zend_ini_parser.c: $(srcdir)/zend_ini_parser.y $(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l - $(LEX) -Pini_ -o$@ -i $(srcdir)/zend_ini_scanner.l + $(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l -zend_ini_scanner_cc.cc: $(srcdir)/zend_ini_scanner.l - $(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pini_ -o$@ $(srcdir)/zend_ini_scanner.l zend_ini_parser.h: zend_ini_parser.c depend: diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 9cffb9ad3a..65a766f28d 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -70,8 +70,6 @@ AC_CHECK_FUNCS(finite isfinite isinf isnan) ZEND_FP_EXCEPT -AC_SUBST(ZEND_SCANNER) - ]) @@ -153,15 +151,10 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then AC_DEFINE(ZTS,1,[ ]) - ZEND_SCANNER_TYPE=cc - CPPFLAGS="$CPPFLAGS -I../TSRM" + CFLAGS="$CFLAGS -DZTS" LIBZEND_CPLUSPLUS_CHECKS -else - ZEND_SCANNER_TYPE=c fi -ZEND_SCANNER="libZend_${ZEND_SCANNER_TYPE}.la" - if test "$ZEND_MEMORY_LIMIT" = "yes"; then AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit]) else diff --git a/Zend/flex.skl b/Zend/flex.skl index 3e642b469f..65ddbd5467 100644 --- a/Zend/flex.skl +++ b/Zend/flex.skl @@ -107,9 +107,7 @@ class istream; typedef struct yy_buffer_state *YY_BUFFER_STATE; -//FIXextern int yyleng; %- -//FIX extern FILE *yyin, *yyout; %* @@ -214,7 +212,6 @@ struct yy_buffer_state }; %- Standard (non-C++) definition -//FIXstatic YY_BUFFER_STATE yy_current_buffer = 0; #define yy_current_buffer SCNG(current_buffer) %* @@ -232,8 +229,6 @@ static char yy_hold_char; static int yy_n_chars; /* number of characters read into yy_ch_buf */ -//FIXint yyleng; - /* Points to current character in buffer. */ #define yy_c_buf_p SCNG(c_buf_p) #define yy_init SCNG(init) diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index 715f49904f..ea5f99c491 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -22,7 +22,7 @@ #include "zend_ini_parser.h" #include "zend_ini_scanner.h" -#ifdef ZTS +#ifdef __cplusplus # ifdef HAVE_STDIOSTR_H # include # endif diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 05036f7d07..74e15ffb62 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -49,7 +49,7 @@ #include "zend_variables.h" #include "zend_operators.h" -#ifdef ZTS +#ifdef __cplusplus # include # ifdef HAVE_STDIOSTR_H # include -- cgit v1.2.1