diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-27 22:01:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-27 22:01:59 +0200 |
| commit | a8792887d92c0f5033314bf9a0f3e3c19ea4b78a (patch) | |
| tree | dcb0c966063bc3bc2569d8fe8161a2ee9b0eb19c /Zend/zend_language_parser.y | |
| parent | 99ce142f6e37e803ce7c0fdaece79b9813c33543 (diff) | |
| parent | e5c7f710048ac5705f1782f3697da74676f1135f (diff) | |
| download | php-git-a8792887d92c0f5033314bf9a0f3e3c19ea4b78a.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 7a21409a03..fb8de46820 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -76,7 +76,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %left '*' '/' '%' %precedence '!' %precedence T_INSTANCEOF -%precedence '~' T_INC T_DEC T_INT_CAST T_DOUBLE_CAST T_STRING_CAST T_ARRAY_CAST T_OBJECT_CAST T_BOOL_CAST T_UNSET_CAST '@' +%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 @@ -939,8 +939,8 @@ expr: | expr '%' expr { $$ = zend_ast_create_binary_op(ZEND_MOD, $1, $3); } | expr T_SL expr { $$ = zend_ast_create_binary_op(ZEND_SL, $1, $3); } | expr T_SR expr { $$ = zend_ast_create_binary_op(ZEND_SR, $1, $3); } - | '+' expr %prec T_INC { $$ = zend_ast_create(ZEND_AST_UNARY_PLUS, $2); } - | '-' expr %prec T_INC { $$ = zend_ast_create(ZEND_AST_UNARY_MINUS, $2); } + | '+' expr %prec '~' { $$ = zend_ast_create(ZEND_AST_UNARY_PLUS, $2); } + | '-' expr %prec '~' { $$ = zend_ast_create(ZEND_AST_UNARY_MINUS, $2); } | '!' expr { $$ = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, $2); } | '~' expr { $$ = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BW_NOT, $2); } | expr T_IS_IDENTICAL expr |