Skip to content

Commit e55a0de

Browse files
author
Scott MacVicar
committed
MFB 5.3: Rewrite scanner to be based on re2c instead of flex
There are still changes in regards to parsing of Unicode encoded scripts to come.
1 parent f2ca4aa commit e55a0de

24 files changed

+712
-2311
lines changed

Zend/FlexLexer.h

-186
This file was deleted.

Zend/Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ zend_ini_scanner.lo: zend_ini_parser.h
3131
# Language parser/scanner rules
3232

3333
zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
34-
$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l
34+
$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
3535

3636
zend_language_parser.h: zend_language_parser.c
3737
zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -43,7 +43,7 @@ zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
4343
$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
4444

4545
zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
46-
$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
46+
$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
4747

4848
zend_ini_parser.h: zend_ini_parser.c
4949

Zend/Zend.m4

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ AC_DEFUN([LIBZEND_BASIC_CHECKS],[
3131
AC_REQUIRE([AC_PROG_YACC])
3232
AC_REQUIRE([AC_PROG_CC])
3333
AC_REQUIRE([AC_PROG_CC_C_O])
34-
AC_REQUIRE([AC_PROG_LEX])
3534
AC_REQUIRE([AC_HEADER_STDC])
3635
3736
LIBZEND_BISON_CHECK

Zend/configure.in

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ AM_CONFIG_HEADER(zend_config.h)
77
AM_SANITY_CHECK
88
AM_MAINTAINER_MODE
99
AC_PROG_CC
10-
AM_PROG_LEX
1110
AM_PROG_CC_STDC
1211
ZEND_VERSION=$VERSION
1312
AC_ZEND_C_BIGENDIAN

0 commit comments

Comments
 (0)