Skip to content

Commit e11233d

Browse files
krakjoekrakjoe
committed
Revert "Rename *.l files to *.re"
This reverts commit 9690477.
1 parent f45b61b commit e11233d

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

‎Zend/Makefile.frag

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
$(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
66
$(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
77

8-
$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.re
9-
@(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)
8+
$(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
9+
@(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)
1010

1111
$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
1212
$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -29,8 +29,8 @@ $(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
2929
$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
3030
@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
3131

32-
$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.re
33-
@(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)
32+
$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
33+
@(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)
3434

3535
$(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
3636

‎Zend/tests/bug70748.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.re)
2+
Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)
33
--FILE--
44
<?php
55
$ini = '[${ ';

‎Zend/zend_compile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ ZEND_API void function_add_ref(zend_function *function);
759759
#define INITIAL_OP_ARRAY_SIZE 64
760760

761761

762-
/* helper functions in zend_language_scanner.re */
762+
/* helper functions in zend_language_scanner.l */
763763
ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type);
764764
ZEND_API zend_op_array *compile_string(zval *source_string, char *filename);
765765
ZEND_API zend_op_array *compile_filename(int type, zval *filename);

‎Zend/zend_ini_scanner.re renamed to ‎Zend/zend_ini_scanner.l

File renamed without changes.

‎Zend/zend_language_scanner.re renamed to ‎Zend/zend_language_scanner.l

File renamed without changes.

‎sapi/phpdbg/Makefile.frag

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ $(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
99
$(BUILD_PHPDBG)
1010

1111
%.c: %.y
12-
%.c: %.re
12+
%.c: %.l
1313

1414
$(builddir)/phpdbg_lexer.lo: $(srcdir)/phpdbg_parser.h
1515

16-
$(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.re
17-
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.re)
16+
$(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.l
17+
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l)
1818

1919
$(srcdir)/phpdbg_parser.h: $(srcdir)/phpdbg_parser.c
2020
$(srcdir)/phpdbg_parser.c: $(srcdir)/phpdbg_parser.y

‎sapi/phpdbg/phpdbg_lexer.re renamed to ‎sapi/phpdbg/phpdbg_lexer.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* phpdbg_lexer.re
2+
* phpdbg_lexer.l
33
*/
44

55
#include "phpdbg.h"

‎win32/build/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_parser.h: sapi\phpdbg\phpdbg_pars
8989
$(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d -p phpdbg_ sapi/phpdbg/phpdbg_parser.y
9090

9191
!if $(RE2C) != ""
92-
Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.re
93-
$(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
92+
Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l
93+
$(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
9494

95-
Zend\zend_language_scanner.c: Zend\zend_language_scanner.re
96-
$(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
95+
Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
96+
$(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
9797

98-
sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.re
99-
$(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.re
98+
sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.l
99+
$(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l
100100
!endif
101101

102102
!if "$(ZTS)" == "1"

0 commit comments

Comments
 (0)