Skip to content

Commit d7d3a1c

Browse files
authored
Sync YFLAGS in scripts/dev/genfiles with PHP_PROG_BISON macro defaults (#12709)
- Adds -Wall YFLAGS when using the scripts/dev/genfiles to have similar output there in case things need to be fixed. - Syncs @ suppression operators across the bison calls.
1 parent ec8f880 commit d7d3a1c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Zend/Makefile.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ $(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
2323

2424
$(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
2525
$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
26-
$(YACC) $(YFLAGS) -v -d $(srcdir)/zend_ini_parser.y -o $@
26+
@$(YACC) $(YFLAGS) -v -d $(srcdir)/zend_ini_parser.y -o $@
2727

2828
$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
2929
@(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)

scripts/dev/genfiles

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
YACC=${YACC:-bison}
3737
YACC="$YACC -l"
38+
YFLAGS="-Wall"
3839
RE2C=${RE2C:-re2c}
3940
RE2C_FLAGS="-i"
4041
SED=${SED:-sed}
@@ -100,21 +101,21 @@ if ! test -x "$(command -v $MAKE)"; then
100101
fi
101102

102103
echo "genfiles: Generating Zend parser and lexer files"
103-
$MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" YACC="$YACC" SED="$SED" srcdir=Zend builddir=Zend top_srcdir=. \
104+
$MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" YACC="$YACC" YFLAGS="$YFLAGS" SED="$SED" srcdir=Zend builddir=Zend top_srcdir=. \
104105
-f Zend/Makefile.frag \
105106
Zend/zend_language_parser.c \
106107
Zend/zend_language_scanner.c \
107108
Zend/zend_ini_parser.c \
108109
Zend/zend_ini_scanner.c
109110

110111
echo "genfiles: Generating phpdbg parser and lexer files"
111-
$MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" YACC="$YACC" srcdir=sapi/phpdbg builddir=sapi/phpdbg top_srcdir=. \
112+
$MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" YACC="$YACC" YFLAGS="$YFLAGS" srcdir=sapi/phpdbg builddir=sapi/phpdbg top_srcdir=. \
112113
-f sapi/phpdbg/Makefile.frag \
113114
sapi/phpdbg/phpdbg_parser.c \
114115
sapi/phpdbg/phpdbg_lexer.c
115116

116117
echo "genfiles: Generating json extension parser and lexer files"
117-
$MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" YACC="$YACC" srcdir=ext/json builddir=ext/json top_srcdir=. \
118+
$MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" YACC="$YACC" YFLAGS="$YFLAGS" srcdir=ext/json builddir=ext/json top_srcdir=. \
118119
-f ext/json/Makefile.frag \
119120
ext/json/json_parser.tab.c \
120121
ext/json/json_scanner.c

0 commit comments

Comments
 (0)