summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zend/Makefile.am24
-rw-r--r--Zend/Zend.dsp60
-rw-r--r--Zend/ZendCore.dep2
-rw-r--r--Zend/ZendTS.dsp60
-rw-r--r--Zend/zend_compile.c2
-rw-r--r--Zend/zend_compile.h2
-rw-r--r--Zend/zend_highlight.c2
-rw-r--r--Zend/zend_indent.c2
-rw-r--r--Zend/zend_language_parser.y (renamed from Zend/zend-parser.y)0
-rw-r--r--Zend/zend_language_scanner.h (renamed from Zend/zend-scanner.h)0
-rw-r--r--Zend/zend_language_scanner.l (renamed from Zend/zend-scanner.l)4
11 files changed, 79 insertions, 79 deletions
diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index a5dadf1b57..25e2ce7e84 100644
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -1,16 +1,16 @@
## Process this file with automake to produce Makefile.in -*- makefile -*-
-#CLEANFILES = zend-parser.c zend-parser.h zend-scanner.c zend-parser.output
+#CLEANFILES = zend_language_parser.c zend_language_parser.h zend_language_scanner.c zend_language_parser.output
AUTOMAKE_OPTIONS=foreign
EXTRA_LTLIBRARIES=libZend_cc.la libZend_c.la
noinst_LTLIBRARIES=$(ZEND_SCANNER) libZend.la
-libZend_cc_la_SOURCES=zend-scanner-cc.cc
-libZend_c_la_SOURCES=zend-scanner.c
+libZend_cc_la_SOURCES=zend_language_scanner_cc.cc
+libZend_c_la_SOURCES=zend_language_scanner.c
libZend_la_SOURCES=\
- zend-parser.y \
+ zend_language_parser.y \
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 \
@@ -24,17 +24,17 @@ libZend_la_DEPENDENCIES = $(ZEND_SCANNER)
# automake isn't too clever about "non-standard" use of lex and yacc
-$(libZend_la_OBJECTS) zend-scanner.lo zend-scanner-cc.lo: zend-parser.h
+$(libZend_la_OBJECTS) zend_language_scanner.lo zend_language_scanner_cc.lo: zend_language_parser.h
-zend-scanner.c: $(srcdir)/zend-scanner.l
- $(LEX) -Pzend -o$@ -i $(srcdir)/zend-scanner.l
+zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
+ $(LEX) -Pzend -o$@ -i $(srcdir)/zend_language_scanner.l
-zend-scanner-cc.cc: $(srcdir)/zend-scanner.l
- $(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pzend -o$@ $(srcdir)/zend-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
-zend-parser.h: zend-parser.c
-zend-parser.c: $(srcdir)/zend-parser.y
- $(YACC) -p zend -v -d $(srcdir)/zend-parser.y -o zend-parser.c
+zend_language_parser.h: zend_language_parser.c
+zend_language_parser.c: $(srcdir)/zend_language_parser.y
+ $(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o zend_language_parser.c
depend:
diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 65671b53fc..19bdc481ee 100644
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -107,11 +107,11 @@ LIB32=link.exe -lib
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=".\zend-parser.c"
+SOURCE=".\zend_language_parser.c"
# End Source File
# Begin Source File
-SOURCE=".\zend-scanner.c"
+SOURCE=".\zend_language_scanner.c"
# End Source File
# Begin Source File
@@ -211,11 +211,11 @@ SOURCE=.\modules.h
# End Source File
# Begin Source File
-SOURCE=".\zend-parser.h"
+SOURCE=".\zend_language_parser.h"
# End Source File
# Begin Source File
-SOURCE=".\zend-scanner.h"
+SOURCE=".\zend_language_scanner.h"
# End Source File
# Begin Source File
@@ -311,23 +311,23 @@ SOURCE=.\zend_variables.h
# PROP Default_Filter "y"
# Begin Source File
-SOURCE=".\zend-parser.y"
+SOURCE=".\zend_language_parser.y"
!IF "$(CFG)" == "Zend - Win32 Release"
# Begin Custom Build
InputDir=.
-InputPath=".\zend-parser.y"
+InputPath=".\zend_language_parser.y"
BuildCmds= \
- if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \
- if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \
+ if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \
+ if "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend_language_parser.y \
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -335,17 +335,17 @@ BuildCmds= \
# Begin Custom Build
InputDir=.
-InputPath=".\zend-parser.y"
+InputPath=".\zend_language_parser.y"
BuildCmds= \
- if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \
- if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \
+ if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \
+ if "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend_language_parser.y \
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -353,17 +353,17 @@ BuildCmds= \
# Begin Custom Build
InputDir=.
-InputPath=".\zend-parser.y"
+InputPath=".\zend_language_parser.y"
BuildCmds= \
- if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \
- if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \
+ if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \
+ if "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend_language_parser.y \
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -376,35 +376,35 @@ BuildCmds= \
# PROP Default_Filter "l"
# Begin Source File
-SOURCE=".\zend-scanner.l"
+SOURCE=".\zend_language_scanner.l"
!IF "$(CFG)" == "Zend - Win32 Release"
# Begin Custom Build
-InputPath=".\zend-scanner.l"
+InputPath=".\zend_language_scanner.l"
-"zend-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- flex -i -Pzend -ozend-scanner.c zend-scanner.l
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
# End Custom Build
!ELSEIF "$(CFG)" == "Zend - Win32 Debug"
# Begin Custom Build
-InputPath=".\zend-scanner.l"
+InputPath=".\zend_language_scanner.l"
-"zend-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- flex -i -Pzend -ozend-scanner.c zend-scanner.l
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
# End Custom Build
!ELSEIF "$(CFG)" == "Zend - Win32 Release_inline"
# Begin Custom Build
-InputPath=".\zend-scanner.l"
+InputPath=".\zend_language_scanner.l"
-"zend-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- flex -i -Pzend -ozend-scanner.c zend-scanner.l
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
# End Custom Build
diff --git a/Zend/ZendCore.dep b/Zend/ZendCore.dep
index 5320a0b674..1b53bd65e9 100644
--- a/Zend/ZendCore.dep
+++ b/Zend/ZendCore.dep
@@ -86,7 +86,7 @@
".\zend_llist.h"\
".\zend_ptr_stack.h"\
".\zend_stack.h"\
- ".\zend-parser.tab.h"\
+ ".\zend_language_parser.tab.h"\
".\zend.h"\
".\zend_errors.h"\
".\zend_globals.h"\
diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index dfab10b767..cf228b8510 100644
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -107,11 +107,11 @@ LIB32=link.exe -lib
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=".\zend-parser.c"
+SOURCE=".\zend_language_parser.c"
# End Source File
# Begin Source File
-SOURCE=".\zend-scanner.cpp"
+SOURCE=".\zend_language_scanner.cpp"
# End Source File
# Begin Source File
@@ -215,11 +215,11 @@ SOURCE=.\modules.h
# End Source File
# Begin Source File
-SOURCE=".\zend-parser.h"
+SOURCE=".\zend_language_parser.h"
# End Source File
# Begin Source File
-SOURCE=".\zend-scanner.h"
+SOURCE=".\zend_language_scanner.h"
# End Source File
# Begin Source File
@@ -327,23 +327,23 @@ SOURCE=.\zend_variables.h
# PROP Default_Filter "y"
# Begin Source File
-SOURCE=".\zend-parser.y"
+SOURCE=".\zend_language_parser.y"
!IF "$(CFG)" == "ZendTS - Win32 Release_TS"
# Begin Custom Build
InputDir=.
-InputPath=".\zend-parser.y"
+InputPath=".\zend_language_parser.y"
BuildCmds= \
- if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \
- if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \
+ if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \
+ if "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend_language_parser.y \
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -351,17 +351,17 @@ BuildCmds= \
# Begin Custom Build
InputDir=.
-InputPath=".\zend-parser.y"
+InputPath=".\zend_language_parser.y"
BuildCmds= \
- if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \
- if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \
+ if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \
+ if "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend_language_parser.y \
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -369,17 +369,17 @@ BuildCmds= \
# Begin Custom Build
InputDir=.
-InputPath=".\zend-parser.y"
+InputPath=".\zend_language_parser.y"
BuildCmds= \
- if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \
- if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \
+ if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \
+ if "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend_language_parser.y \
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -392,35 +392,35 @@ BuildCmds= \
# PROP Default_Filter "l"
# Begin Source File
-SOURCE=".\zend-scanner.l"
+SOURCE=".\zend_language_scanner.l"
!IF "$(CFG)" == "ZendTS - Win32 Release_TS"
# Begin Custom Build
-InputPath=".\zend-scanner.l"
+InputPath=".\zend_language_scanner.l"
-"zend-scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- flex -+ -B -i -Sflex.skl -Pzend -ozend-scanner.cpp zend-scanner.l
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
# End Custom Build
!ELSEIF "$(CFG)" == "ZendTS - Win32 Debug_TS"
# Begin Custom Build
-InputPath=".\zend-scanner.l"
+InputPath=".\zend_language_scanner.l"
-"zend-scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- flex -+ -B -i -Sflex.skl -Pzend -ozend-scanner.cpp zend-scanner.l
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
# End Custom Build
!ELSEIF "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
# Begin Custom Build
-InputPath=".\zend-scanner.l"
+InputPath=".\zend_language_scanner.l"
-"zend-scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- flex -+ -B -i -Sflex.skl -Pzend -ozend-scanner.cpp zend-scanner.l
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
# End Custom Build
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 1534b4d0ea..84cc98411e 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -18,7 +18,7 @@
*/
-#include "zend-parser.h"
+#include "zend_language_parser.h"
#include "zend.h"
#include "zend_compile.h"
#include "zend_llist.h"
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 57d90be57e..1abec93ebe 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -374,7 +374,7 @@ ZEND_API void function_add_ref(zend_function *function);
#define INITIAL_OP_ARRAY_SIZE 64
-/* helper functions in zend-scanner.l */
+/* helper functions in zend_language_scanner.l */
ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type CLS_DC);
ZEND_API zend_op_array *compile_string(zval *source_string, char *filename CLS_DC);
ZEND_API zend_op_array *compile_filename(int type, zval *filename CLS_DC ELS_DC);
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 0558d836b4..61e2ecbf78 100644
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -19,7 +19,7 @@
#include "zend.h"
-#include "zend-parser.h"
+#include "zend_language_parser.h"
#include "zend_compile.h"
#include "zend_highlight.h"
#include "zend_ptr_stack.h"
diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c
index b61c89a1b4..f46f1c2bb3 100644
--- a/Zend/zend_indent.c
+++ b/Zend/zend_indent.c
@@ -22,7 +22,7 @@
#include "zend.h"
-#include "zend-parser.h"
+#include "zend_language_parser.h"
#include "zend_compile.h"
#include "zend_indent.h"
diff --git a/Zend/zend-parser.y b/Zend/zend_language_parser.y
index 0917f7d555..0917f7d555 100644
--- a/Zend/zend-parser.y
+++ b/Zend/zend_language_parser.y
diff --git a/Zend/zend-scanner.h b/Zend/zend_language_scanner.h
index e6e2f12f95..e6e2f12f95 100644
--- a/Zend/zend-scanner.h
+++ b/Zend/zend_language_scanner.h
diff --git a/Zend/zend-scanner.l b/Zend/zend_language_scanner.l
index 0cc11b5dd9..d307181b5b 100644
--- a/Zend/zend-scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -40,9 +40,9 @@
#include <errno.h>
#include "zend.h"
#include "zend_alloc.h"
-#include "zend-parser.h"
+#include "zend_language_parser.h"
#include "zend_compile.h"
-#include "zend-scanner.h"
+#include "zend_language_scanner.h"
#include "zend_highlight.h"
#include "zend_constants.h"
#include "zend_variables.h"
View Lorry Controller Status