summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorAkim Demaille <akim.demaille@gmail.com>2020-02-01 07:03:13 +0100
committerkocsismate <kocsismate@woohoolabs.com>2020-02-01 14:21:21 +0100
commit2127a37b833a863e28a4692e7394613b89c89290 (patch)
tree73337ca9b08c5b5aca5ef6d7c9f0c2c58a08f633 /Zend
parentb97c9dc72a642bd0fe2e4f59fbb9c0c818addefa (diff)
downloadphp-git-2127a37b833a863e28a4692e7394613b89c89290.tar.gz
Bison: enable all the warnings and fix them
First, fix 5547d361208d90e12d53bb62bb2ffbbff9b93ca0: the definition of YFLAGS was not passed into the Makefile: AC_SUBST does not suffice, we need PHP_SUBST_OLD. While at it, allow to pass variable and value at the same time. Then pass -Wall to bison, rather than only -Wempty-rules. Use %precedence where associativity is useless. Remove useless %precedence. GH-5138
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_ini_parser.y2
-rw-r--r--Zend/zend_language_parser.y2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 9e350664ba..6b69aec7d9 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -309,7 +309,7 @@ static void zval_ini_dtor(zval *zv)
%token END_OF_LINE
%token '=' ':' ',' '.' '"' '\'' '^' '+' '-' '/' '*' '%' '$' '~' '<' '>' '?' '@' '{' '}'
%left '|' '&' '^'
-%right '~' '!'
+%precedence '~' '!'
%destructor { zval_ini_dtor(&$$); } TC_RAW TC_CONSTANT TC_NUMBER TC_STRING TC_WHITESPACE TC_LABEL TC_OFFSET TC_VARNAME BOOL_TRUE BOOL_FALSE NULL_NULL cfg_var_ref constant_literal constant_string encapsed_list expr option_offset section_string_or_value string_or_value var_string_list var_string_list_section
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 4fe6f77bb1..2f7b772c8b 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -79,7 +79,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%precedence T_INSTANCEOF
%precedence '~' T_INT_CAST T_DOUBLE_CAST T_STRING_CAST T_ARRAY_CAST T_OBJECT_CAST T_BOOL_CAST T_UNSET_CAST '@'
%right T_POW
-%precedence T_NEW T_CLONE
+%precedence T_CLONE
/* Resolve danging else conflict */
%precedence T_NOELSE