From e11233dc492a96844d22e4a3ed8e9e2d8a36651c Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 20 May 2019 06:06:38 +0200
Subject: [PATCH] Revert "Rename *.l files to *.re"

This reverts commit 969047749d33bb88a0573aa91a57e2070335111a.
---
 Zend/Makefile.frag                                   |  8 ++++----
 Zend/tests/bug70748.phpt                             |  2 +-
 Zend/zend_compile.h                                  |  2 +-
 Zend/{zend_ini_scanner.re => zend_ini_scanner.l}     |  0
 ...d_language_scanner.re => zend_language_scanner.l} |  0
 sapi/phpdbg/Makefile.frag                            |  6 +++---
 sapi/phpdbg/{phpdbg_lexer.re => phpdbg_lexer.l}      |  2 +-
 win32/build/Makefile                                 | 12 ++++++------
 8 files changed, 16 insertions(+), 16 deletions(-)
 rename Zend/{zend_ini_scanner.re => zend_ini_scanner.l} (100%)
 rename Zend/{zend_language_scanner.re => zend_language_scanner.l} (100%)
 rename sapi/phpdbg/{phpdbg_lexer.re => phpdbg_lexer.l} (99%)

diff --git a/Zend/Makefile.frag b/Zend/Makefile.frag
index 8196cd797c..ceb81d7d1a 100644
--- a/Zend/Makefile.frag
+++ b/Zend/Makefile.frag
@@ -5,8 +5,8 @@
 $(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
 $(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
 
-$(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.re)
+$(srcdir)/zend_language_scanner.c: $(srcdir)/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.l)
 
 $(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
 $(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -29,8 +29,8 @@ $(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
 $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 	@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
 
-$(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.re)
+$(srcdir)/zend_ini_scanner.c: $(srcdir)/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.l)
 
 $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
 
diff --git a/Zend/tests/bug70748.phpt b/Zend/tests/bug70748.phpt
index 9c23c0e84e..feb0e2a59d 100644
--- a/Zend/tests/bug70748.phpt
+++ b/Zend/tests/bug70748.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.re)
+Bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)
 --FILE--
 <?php
 $ini = '[${ 	';
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 3f9d514517..963314ced8 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -759,7 +759,7 @@ ZEND_API void function_add_ref(zend_function *function);
 #define INITIAL_OP_ARRAY_SIZE 64
 
 
-/* helper functions in zend_language_scanner.re */
+/* helper functions in zend_language_scanner.l */
 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_filename(int type, zval *filename);
diff --git a/Zend/zend_ini_scanner.re b/Zend/zend_ini_scanner.l
similarity index 100%
rename from Zend/zend_ini_scanner.re
rename to Zend/zend_ini_scanner.l
diff --git a/Zend/zend_language_scanner.re b/Zend/zend_language_scanner.l
similarity index 100%
rename from Zend/zend_language_scanner.re
rename to Zend/zend_language_scanner.l
diff --git a/sapi/phpdbg/Makefile.frag b/sapi/phpdbg/Makefile.frag
index c105419702..65377e608a 100644
--- a/sapi/phpdbg/Makefile.frag
+++ b/sapi/phpdbg/Makefile.frag
@@ -9,12 +9,12 @@ $(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 	$(BUILD_PHPDBG)
 
 %.c: %.y
-%.c: %.re
+%.c: %.l
 
 $(builddir)/phpdbg_lexer.lo: $(srcdir)/phpdbg_parser.h
 
-$(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.re)
+$(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.l
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l)
 
 $(srcdir)/phpdbg_parser.h: $(srcdir)/phpdbg_parser.c
 $(srcdir)/phpdbg_parser.c: $(srcdir)/phpdbg_parser.y
diff --git a/sapi/phpdbg/phpdbg_lexer.re b/sapi/phpdbg/phpdbg_lexer.l
similarity index 99%
rename from sapi/phpdbg/phpdbg_lexer.re
rename to sapi/phpdbg/phpdbg_lexer.l
index 214850942e..422cda4f2c 100644
--- a/sapi/phpdbg/phpdbg_lexer.re
+++ b/sapi/phpdbg/phpdbg_lexer.l
@@ -1,5 +1,5 @@
 /*
- * phpdbg_lexer.re
+ * phpdbg_lexer.l
  */
 
 #include "phpdbg.h"
diff --git a/win32/build/Makefile b/win32/build/Makefile
index 9a8949c425..26b73b625a 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -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
 
 !if $(RE2C) != ""
-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.re
+Zend\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.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.re
+Zend\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.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.re
+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.l
 !endif
 
 !if "$(ZTS)" == "1"
-- 
2.40.0