From: Nikita Popov <nikic@php.net>
Date: Fri, 30 May 2014 21:30:37 +0000 (+0200)
Subject: Make function calls directly callable
X-Git-Tag: POST_AST_MERGE^2~230
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e89958a6340201f9c0e00f9fac7d1d00c5e30e84;p=php

Make function calls directly callable
---

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 9b3e2c7d1e..41c2bc3391 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -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: