Change the precedence of concatenation

bwoebi · bwoebi · commit 61ee86992120 · 2019-03-28T13:42:09.000+01:00
This implements RFC https://wiki.php.net/rfc/concatenation_precedence
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -871,8 +871,9 @@ ZEND_API void zend_ast_apply(zend_ast *ast, zend_ast_apply_func fn) {
  *  160     left            &
  *  170     non-associative == != === !==
  *  180     non-associative < <= > >= <=>
+ *  185     left            .
  *  190     left            << >>
- *  200     left            + - .
+ *  200     left            + -
  *  210     left            * / %
  *  220     right           !
  *  230     non-associative instanceof
@@ -1682,7 +1683,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 				case ZEND_MOD:                 BINARY_OP(" % ",   210, 210, 211);
 				case ZEND_SL:                  BINARY_OP(" << ",  190, 190, 191);
 				case ZEND_SR:                  BINARY_OP(" >> ",  190, 190, 191);
-				case ZEND_CONCAT:              BINARY_OP(" . ",   200, 200, 201);
+				case ZEND_CONCAT:              BINARY_OP(" . ",   185, 185, 186);
 				case ZEND_BW_OR:               BINARY_OP(" | ",   140, 140, 141);
 				case ZEND_BW_AND:              BINARY_OP(" & ",   160, 160, 161);
 				case ZEND_BW_XOR:              BINARY_OP(" ^ ",   150, 150, 151);
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -69,8 +69,9 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %left '&'
 %nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL T_SPACESHIP
 %nonassoc '<' T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL
+%left '.'
 %left T_SL T_SR
-%left '+' '-' '.'
+%left '+' '-'
 %left '*' '/' '%'
 %precedence '!'
 %precedence T_INSTANCEOF
