diff options
| -rw-r--r-- | Zend/zend_ini_parser.y | 2 | ||||
| -rw-r--r-- | Zend/zend_language_parser.y | 2 | ||||
| -rw-r--r-- | build/php.m4 | 10 |
3 files changed, 7 insertions, 7 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 diff --git a/build/php.m4 b/build/php.m4 index 87527f4381..8cdfb4da51 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -81,7 +81,7 @@ AC_DEFUN([PHP_DEFINE],[ dnl dnl PHP_SUBST(varname) dnl -dnl Adds variable with it's value into Makefile, e.g.: +dnl Adds variable with its value into Makefile, e.g.: dnl CC = gcc dnl AC_DEFUN([PHP_SUBST],[ @@ -89,14 +89,14 @@ AC_DEFUN([PHP_SUBST],[ ]) dnl -dnl PHP_SUBST_OLD(varname) +dnl PHP_SUBST_OLD(varname, [VALUE]) dnl dnl Same as PHP_SUBST() but also substitutes all @VARNAME@ instances in every dnl file passed to AC_OUTPUT. dnl AC_DEFUN([PHP_SUBST_OLD],[ - PHP_SUBST($1) - AC_SUBST($1) + AC_SUBST($@) + PHP_SUBST([$1]) ]) dnl @@ -1815,7 +1815,7 @@ AC_DEFUN([PHP_PROG_BISON], [ done if test "$php_bison_check" != "invalid"; then - AC_SUBST([YFLAGS], [-Wempty-rule]) + PHP_SUBST_OLD([YFLAGS], [-Wall]) AC_MSG_RESULT([$php_bison_version (ok)]) else AC_MSG_RESULT([$php_bison_version]) |