]> granicus.if.org Git - php/commitdiff
Make function calls directly callable
authorNikita Popov <nikic@php.net>
Fri, 30 May 2014 21:30:37 +0000 (23:30 +0200)
committerNikita Popov <nikic@php.net>
Fri, 30 May 2014 21:30:37 +0000 (23:30 +0200)
Zend/zend_language_parser.y

index 9b3e2c7d1e66f416cf2800aadf5b238795100467..41c2bc3391e305d28d51f495e2c58257a2531632 100644 (file)
@@ -1083,8 +1083,6 @@ rw_variable:
 
 variable:
                reference_variable { $$ = $1; }
-       |       array_function_dereference      { $$ = $1; }
-       |       function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; }
 ;
 
 variable_property:
@@ -1143,6 +1141,9 @@ directly_callable_variable:
                        { zend_do_end_function_call(&$4, &$$, 1, 1 TSRMLS_CC);
                          zend_do_extended_fcall_end(TSRMLS_C);
                          $$.EA = ZEND_PARSED_METHOD_CALL; }
+       |       function_call
+                       { zend_do_begin_variable_parse(TSRMLS_C);
+                         $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; }
 ;
 
 reference_variable: