com php-src: Move T_STRING_VARNAME handling: Zend/zen d_language_parser.y
| From: | Nikita Popov | Date: | Sat, 21 Jun 2014 18:11:31 +0000 |
| Subject: | com php-src: Move T_STRING_VARNAME handling: Zend/zen d_language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81047@lists.php.net to get a copy of this message | ||
Commit: 508d146cd318274199b34327b9947b583d601083
Author: Nikita Popov <nikic@php.net> Sat, 21 Jun 2014 20:11:31 +0200
Parents: 90d36554e208cea9d5600d1a9bdee909002a2352
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=508d146cd318274199b34327b9947b583d601083
Log:
Move T_STRING_VARNAME handling
Changed paths:
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 40d8876..7190f38 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -1035,8 +1035,7 @@ static_operation:
scalar:
- T_STRING_VARNAME { $$ = $1; AZ($$); }
- | class_name_scalar { $$.u.ast = $1.u.ast; }
+ class_name_scalar { $$.u.ast = $1.u.ast; }
| class_constant { $$.u.ast = $1.u.ast; }
| namespace_name
{ $$.u.ast = zend_ast_create_unary(
@@ -1225,9 +1224,11 @@ encaps_var:
zend_ast_create_var(&$1.u.constant), $3.u.ast); }
| T_VARIABLE T_OBJECT_OPERATOR T_STRING
{ $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP,
- zend_ast_create_var(&$1.u.constant), AST_ZNODE(&$3)); }
+ zend_ast_create_var(&$1.u.constant), AST_ZVAL(&$3)); }
| T_DOLLAR_OPEN_CURLY_BRACES expr '}'
{ $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); }
+ | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}'
+ { $$.u.ast = zend_ast_create_var(&$2.u.constant); }
| T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}'
{ $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM,
zend_ast_create_var(&$2.u.constant), $4.u.ast); }