diff options
| author | Nikita Popov <nikic@php.net> | 2014-06-28 18:03:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-06-28 18:03:26 +0200 |
| commit | 111ad71d38a62f937cfbf6a49f37b1be43860c81 (patch) | |
| tree | b3bd90b23f34847ff60fc2f80e0870d26ca734aa /Zend/zend_language_parser.y | |
| parent | 64dab4b914ddc76afa2690f1057aa9fe5aee9799 (diff) | |
| download | php-git-111ad71d38a62f937cfbf6a49f37b1be43860c81.tar.gz | |
Rename ZEND_CONST to ZEND_AST_ZVAL
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 17738ef9d5..4fed735826 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -938,7 +938,7 @@ exit_expr: backticks_expr: /* empty */ { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); - $$.u.ast = zend_ast_create_constant(&empty_str); } + $$.u.ast = zend_ast_create_zval(&empty_str); } | T_ENCAPSED_AND_WHITESPACE { $$.u.ast = AST_ZVAL(&$1); } | encaps_list { $$.u.ast = $1.u.ast; } ; @@ -974,14 +974,14 @@ scalar: { if (Z_TYPE($1.u.constant) == IS_UNDEF) { zval class_const; ZVAL_STRING(&class_const, "__CLASS__"); $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, - zend_ast_create_constant(&class_const)); + zend_ast_create_zval(&class_const)); } else { $$.u.ast = AST_ZVAL(&$1); } } | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } | T_START_HEREDOC T_END_HEREDOC { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); - $$.u.ast = zend_ast_create_constant(&empty_str); } + $$.u.ast = zend_ast_create_zval(&empty_str); } | '"' encaps_list '"' { $$.u.ast = $2.u.ast; } | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.u.ast = $2.u.ast; } | dereferencable_scalar { $$.u.ast = $1.u.ast; } |