Unify the names of these last 3 files...

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index a5dadf1b57535b9cc1e9442318484f6ef5f70483..25e2ce7e84e20db3876a3945702814a216f31c12 100644 (file)
--- 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 65671b53fc826200a2c03c035be09b2912038785..19bdc481ee2029d2f9712d752e7862df2e1a847a 100644 (file)
--- 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"\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-parser.c"\r
+SOURCE=".\zend_language_parser.c"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-scanner.c"\r
+SOURCE=".\zend_language_scanner.c"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -211,11 +211,11 @@ SOURCE=.\modules.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-parser.h"\r
+SOURCE=".\zend_language_parser.h"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-scanner.h"\r
+SOURCE=".\zend_language_scanner.h"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -311,23 +311,23 @@ SOURCE=.\zend_variables.h
 # PROP Default_Filter "y"\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-parser.y"\r
+SOURCE=".\zend_language_parser.y"\r
 \r
 !IF  "$(CFG)" == "Zend - Win32 Release"\r
 \r
 # Begin Custom Build\r
 InputDir=.\r
-InputPath=".\zend-parser.y"\r
+InputPath=".\zend_language_parser.y"\r
 \r
 BuildCmds= \\r
-       if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \\r
-       if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \\r
+       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 \\r
        \r
 \r
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 \r
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 # End Custom Build\r
 \r
@@ -335,17 +335,17 @@ BuildCmds= \
 \r
 # Begin Custom Build\r
 InputDir=.\r
-InputPath=".\zend-parser.y"\r
+InputPath=".\zend_language_parser.y"\r
 \r
 BuildCmds= \\r
-       if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \\r
-       if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \\r
+       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 \\r
        \r
 \r
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 \r
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 # End Custom Build\r
 \r
@@ -353,17 +353,17 @@ BuildCmds= \
 \r
 # Begin Custom Build\r
 InputDir=.\r
-InputPath=".\zend-parser.y"\r
+InputPath=".\zend_language_parser.y"\r
 \r
 BuildCmds= \\r
-       if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \\r
-       if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \\r
+       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 \\r
        \r
 \r
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 \r
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 # End Custom Build\r
 \r
@@ -376,35 +376,35 @@ BuildCmds= \
 # PROP Default_Filter "l"\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-scanner.l"\r
+SOURCE=".\zend_language_scanner.l"\r
 \r
 !IF  "$(CFG)" == "Zend - Win32 Release"\r
 \r
 # Begin Custom Build\r
-InputPath=".\zend-scanner.l"\r
+InputPath=".\zend_language_scanner.l"\r
 \r
-"zend-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       flex -i -Pzend -ozend-scanner.c zend-scanner.l\r
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l\r
 \r
 # End Custom Build\r
 \r
 !ELSEIF  "$(CFG)" == "Zend - Win32 Debug"\r
 \r
 # Begin Custom Build\r
-InputPath=".\zend-scanner.l"\r
+InputPath=".\zend_language_scanner.l"\r
 \r
-"zend-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       flex -i -Pzend -ozend-scanner.c zend-scanner.l\r
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l\r
 \r
 # End Custom Build\r
 \r
 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
 \r
 # Begin Custom Build\r
-InputPath=".\zend-scanner.l"\r
+InputPath=".\zend_language_scanner.l"\r
 \r
-"zend-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       flex -i -Pzend -ozend-scanner.c zend-scanner.l\r
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l\r
 \r
 # End Custom Build\r
 \r

diff --git a/Zend/ZendCore.dep b/Zend/ZendCore.dep
index 5320a0b674cdba3060f8206be2bdfcc3ad1401e4..1b53bd65e9336a74187f95b15c47237a9ecb8c05 100644 (file)
--- 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 dfab10b7673277d35802936fd934dfa5670f128d..cf228b8510b362baa608b431706a67d4067fa731 100644 (file)
--- 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"\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-parser.c"\r
+SOURCE=".\zend_language_parser.c"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-scanner.cpp"\r
+SOURCE=".\zend_language_scanner.cpp"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -215,11 +215,11 @@ SOURCE=.\modules.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-parser.h"\r
+SOURCE=".\zend_language_parser.h"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-scanner.h"\r
+SOURCE=".\zend_language_scanner.h"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -327,23 +327,23 @@ SOURCE=.\zend_variables.h
 # PROP Default_Filter "y"\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-parser.y"\r
+SOURCE=".\zend_language_parser.y"\r
 \r
 !IF  "$(CFG)" == "ZendTS - Win32 Release_TS"\r
 \r
 # Begin Custom Build\r
 InputDir=.\r
-InputPath=".\zend-parser.y"\r
+InputPath=".\zend_language_parser.y"\r
 \r
 BuildCmds= \\r
-       if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \\r
-       if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \\r
+       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 \\r
        \r
 \r
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 \r
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 # End Custom Build\r
 \r
@@ -351,17 +351,17 @@ BuildCmds= \
 \r
 # Begin Custom Build\r
 InputDir=.\r
-InputPath=".\zend-parser.y"\r
+InputPath=".\zend_language_parser.y"\r
 \r
 BuildCmds= \\r
-       if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \\r
-       if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \\r
+       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 \\r
        \r
 \r
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 \r
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 # End Custom Build\r
 \r
@@ -369,17 +369,17 @@ BuildCmds= \
 \r
 # Begin Custom Build\r
 InputDir=.\r
-InputPath=".\zend-parser.y"\r
+InputPath=".\zend_language_parser.y"\r
 \r
 BuildCmds= \\r
-       if not "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend-parser.y \\r
-       if "X%CYGWIN%"=="X" bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \\r
+       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 \\r
        \r
 \r
-"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 \r
-"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 # End Custom Build\r
 \r
@@ -392,35 +392,35 @@ BuildCmds= \
 # PROP Default_Filter "l"\r
 # Begin Source File\r
 \r
-SOURCE=".\zend-scanner.l"\r
+SOURCE=".\zend_language_scanner.l"\r
 \r
 !IF  "$(CFG)" == "ZendTS - Win32 Release_TS"\r
 \r
 # Begin Custom Build\r
-InputPath=".\zend-scanner.l"\r
+InputPath=".\zend_language_scanner.l"\r
 \r
-"zend-scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       flex -+ -B -i -Sflex.skl -Pzend -ozend-scanner.cpp zend-scanner.l\r
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l\r
 \r
 # End Custom Build\r
 \r
 !ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"\r
 \r
 # Begin Custom Build\r
-InputPath=".\zend-scanner.l"\r
+InputPath=".\zend_language_scanner.l"\r
 \r
-"zend-scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       flex -+ -B -i -Sflex.skl -Pzend -ozend-scanner.cpp zend-scanner.l\r
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l\r
 \r
 # End Custom Build\r
 \r
 !ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"\r
 \r
 # Begin Custom Build\r
-InputPath=".\zend-scanner.l"\r
+InputPath=".\zend_language_scanner.l"\r
 \r
-"zend-scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       flex -+ -B -i -Sflex.skl -Pzend -ozend-scanner.cpp zend-scanner.l\r
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l\r
 \r
 # End Custom Build\r
 \r

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 1534b4d0ead9121de3bfec4972619f0384f85aa1..84cc98411e5206bbf75e9d2a15e0afd58250ddae 100644 (file)
--- 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 57d90be57efae04e02191c80ee0af593825c7239..1abec93ebe4d268848a37096ba44c6f0d52e1d60 100644 (file)
--- 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 0558d836b40c01dd412672aa3e9065f9c2539387..61e2ecbf78c494fed9454f3277e2e9fb9aca817f 100644 (file)
--- 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 b61c89a1b43644fa856b65266442dc7f7a7c7195..f46f1c2bb30f361e7494103338eb6aac73b810de 100644 (file)
--- 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
similarity index 100%
rename from Zend/zend-parser.y
rename to Zend/zend_language_parser.y

diff --git a/Zend/zend-scanner.h b/Zend/zend_language_scanner.h
similarity index 100%
rename from Zend/zend-scanner.h
rename to Zend/zend_language_scanner.h

diff --git a/Zend/zend-scanner.l b/Zend/zend_language_scanner.l
similarity index 99%
rename from Zend/zend-scanner.l
rename to Zend/zend_language_scanner.l
index 0cc11b5dd95e0b977735b8e23687d0e768d35b38..d307181b5ba2021ec156b26248088b1831a9cf27 100644 (file)
--- 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"