Allow only simple variables with global keyword

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 6eb2c4287e22dfd2897bb70c8cee1008bd4e9f99..e28949d71cdcd74d5bd0914369ac89d60b79d1dc 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -597,15 +597,12 @@ function_call_parameter:
 ;
 
 global_var_list:
-               global_var_list ',' global_var  { zend_do_fetch_global_variable(&$3, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); }
-       |       global_var                                              { zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); }
+               global_var_list ',' global_var
+       |       global_var
 ;
 
-
 global_var:
-               T_VARIABLE                      { $$ = $1; }
-       |       '$' r_variable          { $$ = $2; }
-       |       '$' '{' expr '}'        { $$ = $3; }
+       simple_variable { zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); }
 ;