com php-src: Minor cleanup: Zend/zend_language_parser.y

From: Date: Fri, 30 May 2014 22:02:51 +0000
Subject: com php-src: Minor cleanup: Zend/zend_language_parser.y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81062@lists.php.net to get a copy of this message
Commit: 5712f0e9bdf2c2abc513dfd9dcbc17a9c0839871 Author: Nikita Popov <nikic@php.net> Sat, 31 May 2014 00:02:51 +0200 Parents: 87f8e758c840a88c435c684cbea6defba4a88710 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5712f0e9bdf2c2abc513dfd9dcbc17a9c0839871 Log: Minor cleanup Changed paths: M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 2b8b32e..47f9a3e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1059,7 +1059,7 @@ rw_variable: ; variable_class_name: - variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$=$1;; } + variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$ = $1; } ; dereferencable: @@ -1068,14 +1068,14 @@ dereferencable: ; directly_callable_variable: - dereferencable '[' dim_offset ']' - { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | dereferencable '{' expr '}' - { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | simple_variable + simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } + | dereferencable '[' dim_offset ']' + { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } + | dereferencable '{' expr '}' + { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } | dereferencable T_OBJECT_OPERATOR object_member { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); zend_do_begin_method_call(&$$ TSRMLS_CC); }

« previous php.cvs (#81062) next »