archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename *.l files to *.re

Browse source 
This syncs PHP lexer files to all use *.re extension. The *.re files are
processed with the RE2C tool.
This commit is contained in:
Peter Kokot 2019-05-17 04:19:34 +02:00
parent 63ef554fe4
commit 969047749d
8 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Zend/Makefile.frag
View file

@ -5,8 +5,8 @@
$(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h $(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
$(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h $(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l $(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.re
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l) @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.re)
$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c $(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y $(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@ -16,8 +16,8 @@ $(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@ @$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l $(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.re
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l) @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.re)
$(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h

2
Zend/tests/bug70748.phpt
View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l) Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.re)
--FILE-- --FILE--
<?php <?php
$ini = '[${ '; $ini = '[${ ';

2
Zend/zend_compile.h
View file

@ -759,7 +759,7 @@ ZEND_API void function_add_ref(zend_function *function);
#define INITIAL_OP_ARRAY_SIZE 64 #define INITIAL_OP_ARRAY_SIZE 64
/* helper functions in zend_language_scanner.l */ /* helper functions in zend_language_scanner.re */
ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type); ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type);
ZEND_API zend_op_array *compile_string(zval *source_string, char *filename); ZEND_API zend_op_array *compile_string(zval *source_string, char *filename);
ZEND_API zend_op_array *compile_filename(int type, zval *filename); ZEND_API zend_op_array *compile_filename(int type, zval *filename);

0
Zend/zend_ini_scanner.l → Zend/zend_ini_scanner.re
View file

0
Zend/zend_language_scanner.l → Zend/zend_language_scanner.re
View file

6
sapi/phpdbg/Makefile.frag
View file

@ -9,12 +9,12 @@ $(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
$(BUILD_PHPDBG) $(BUILD_PHPDBG)
%.c: %.y %.c: %.y
%.c: %.l %.c: %.re
$(builddir)/phpdbg_lexer.lo: $(srcdir)/phpdbg_parser.h $(builddir)/phpdbg_lexer.lo: $(srcdir)/phpdbg_parser.h
$(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.l $(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.re
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l) @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.re)
$(srcdir)/phpdbg_parser.h: $(srcdir)/phpdbg_parser.c $(srcdir)/phpdbg_parser.h: $(srcdir)/phpdbg_parser.c
$(srcdir)/phpdbg_parser.c: $(srcdir)/phpdbg_parser.y $(srcdir)/phpdbg_parser.c: $(srcdir)/phpdbg_parser.y

2
sapi/phpdbg/phpdbg_lexer.l → sapi/phpdbg/phpdbg_lexer.re
View file

@ -1,5 +1,5 @@
/* /*
* phpdbg_lexer.l * phpdbg_lexer.re
*/ */
#include "phpdbg.h" #include "phpdbg.h"

12
win32/build/Makefile
View file

@ -89,14 +89,14 @@ sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_parser.h: sapi\phpdbg\phpdbg_pars
$(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d -p phpdbg_ sapi/phpdbg/phpdbg_parser.y $(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d -p phpdbg_ sapi/phpdbg/phpdbg_parser.y
!if $(RE2C) != "" !if $(RE2C) != ""
Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.re
$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.re
Zend\zend_language_scanner.c: Zend\zend_language_scanner.l Zend\zend_language_scanner.c: Zend\zend_language_scanner.re
$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.re
sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.l sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.re
$(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.re
!endif !endif
!if "$(ZTS)" == "1" !if "$(ZTS)" == "1"