com php-src: Merge branch 'deprecate_concat_add_sub' into PHP-8.4: Zend/zend_ast.c Zend/zend_ compile.c Zend/zend_compile.h Zend/zend_language_
parser.y Zend/zend_opcode.c

From: Date: Thu, 16 May 2019 16:31:28 +0000
Subject: com php-src: Merge branch 'deprecate_concat_add_sub' into PHP-8.4: Zend/zend_ast.c Zend/zend_ compile.c Zend/zend_compile.h Zend/zend_language_
parser.y Zend/zend_opcode.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-106215@lists.php.net to get a copy of this message
Commit: cbc90b1f6e97cfa5b8ff990f9343c684bd1039a4 Author: Bob Weinand <bobwei9@hotmail.com> Thu, 16 May 2019 18:31:28 +0200 Parents: ab2710c8d0261b4e3a5b1efcd86256134b9905d0 3b23694aac62ad9c2dfdb60cafb304f9fc0b7c04 Branches: PHP-7.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cbc90b1f6e97cfa5b8ff990f9343c684bd1039a4 Log: Merge branch 'deprecate_concat_add_sub' into PHP-8.4 Changed paths: MM Zend/zend_ast.c MM Zend/zend_compile.c MM Zend/zend_compile.h MM Zend/zend_language_parser.y MM Zend/zend_opcode.c Diff: diff --cc Zend/zend_language_parser.y index 2239486,4c2a7fd...b20c619 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@@ -961,10 -957,7 +961,11 @@@ expr { $$ = zend_ast_create_binary_op(ZEND_SPACESHIP, $1, $3); } | expr T_INSTANCEOF class_name_reference { $$ = zend_ast_create(ZEND_AST_INSTANCEOF, $1, $3); } - | '(' expr ')' { $$ = $2; if ($$->kind == ZEND_AST_BINARY_OP && $$->attr == ZEND_CONCAT) $$->attr = ZEND_PARENTHESIZED_CONCAT; } + | '(' expr ')' { + $$ = $2; + if ($$->kind == ZEND_AST_CONDITIONAL) $$->attr = ZEND_PARENTHESIZED_CONDITIONAL; ++ if ($$->kind == ZEND_AST_BINARY_OP && $$->attr == ZEND_CONCAT) $$->attr = ZEND_PARENTHESIZED_CONCAT; + } | new_expr { $$ = $1; } | expr '?' expr ':' expr { $$ = zend_ast_create(ZEND_AST_CONDITIONAL, $1, $3, $5); }

« previous php.cvs (#106215) next »