Permalink
Browse files

Merge from branch - move to standard C scanners in thread safe mode

  • Loading branch information...
1 parent a35df18 commit 609d58a4d6aa63dd7abaf2651cf40f4907b77c1e @zsuraski zsuraski committed Aug 6, 2001
View
@@ -3,39 +3,30 @@
#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 \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
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:
View
@@ -405,6 +405,10 @@ BuildCmds= \
# PROP Default_Filter "l"
# Begin Source File
+SOURCE=.\flex.skl
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_ini_scanner.l
!IF "$(CFG)" == "Zend - Win32 Release"
View
@@ -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
@@ -186,39 +179,5 @@ AC_SUBST(INLINE_CFLAGS)
AC_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[
-dnl extra check to avoid C++ preprocessor testing if in non-ZTS mode
-
-if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
-AC_PROG_CXX
-AC_PROG_CXXCPP
-AC_LANG_CPLUSPLUS
-AC_CHECK_HEADER(stdiostream.h, [ AC_DEFINE(HAVE_STDIOSTREAM_H, [], Whether you have stdiostream.h) ])
-
-AC_CHECK_LIB(C, cin)
-AC_CHECK_LIB(g++, cin)
-AC_CHECK_LIB(stdc++, cin)
-dnl Digital Unix 4.0
-AC_CHECK_LIB(cxx, cin)
-AC_CHECK_LIB(cxxstd, __array_delete)
-
-AC_CACHE_CHECK(for class istdiostream,ac_cv_class_istdiostream,[
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <unistd.h>
-#include <fstream.h>
-#include <stdiostream.h>
-],[
-istdiostream *foo = new istdiostream((FILE *) 0);
-],[
- ac_cv_class_istdiostream=yes
-],[
- ac_cv_class_istdiostream=no
-])
-])
- if test "$ac_cv_class_istdiostream" = "yes"; then
- AC_DEFINE(HAVE_CLASS_ISTDIOSTREAM, 1, [Whether you have class istdiostream])
- fi
-AC_LANG_C
-fi
])
View
@@ -192,15 +192,15 @@ SOURCE=.\zend_ini_parser.c
# End Source File
# Begin Source File
-SOURCE=.\zend_ini_scanner.cpp
+SOURCE=.\zend_ini_scanner.c
# End Source File
# Begin Source File
SOURCE=".\zend_language_parser.c"
# End Source File
# Begin Source File
-SOURCE=".\zend_language_scanner.cpp"
+SOURCE=.\zend_language_scanner.c
# End Source File
# Begin Source File
@@ -518,6 +518,10 @@ BuildCmds= \
# PROP Default_Filter "l"
# Begin Source File
+SOURCE=.\flex.skl
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_ini_scanner.l
!IF "$(CFG)" == "ZendTS - Win32 Release_TS"
@@ -535,8 +539,8 @@ InputPath=.\zend_ini_scanner.l
# Begin Custom Build
InputPath=.\zend_ini_scanner.l
-"zend_ini_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- flex -+ -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.cpp zend_ini_scanner.l
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
# End Custom Build
@@ -582,8 +586,8 @@ InputPath=".\zend_language_scanner.l"
# Begin Custom Build
InputPath=".\zend_language_scanner.l"
-"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
# End Custom Build
Oops, something went wrong.

0 comments on commit 609d58a

Please sign in to comment.