From 2d7b9b038d09565a8c94ddaf5a44ef14bb2bb0a1 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Fri, 9 Apr 1999 15:01:13 +0000 Subject: - Support $GLOBALS in cvar's. Now list(..) = each($GLOBALS) will work. - Remove support of $GLOBALS in enacapsed strings. print "$GLOBALS" isn't supposed to work in any case. --- Zend/zend-parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y index df3e7deabc..e89b235a6c 100644 --- a/Zend/zend-parser.y +++ b/Zend/zend-parser.y @@ -509,7 +509,7 @@ cvar_without_objects: reference_variable: dim_list ']' { $$ = $1; } - | compound_variable { do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); } + | compound_variable { do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); } ; @@ -604,7 +604,7 @@ encaps_list: encaps_var: - VARIABLE { do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); } + VARIABLE { do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); } | VARIABLE '[' encaps_var_offset ']' { do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); fetch_array_begin(&$$, &$1, &$3 CLS_CC); } | VARIABLE ZEND_OBJECT_OPERATOR STRING { do_begin_variable_parse(CLS_C); fetch_simple_variable(&$2, &$1, 1 CLS_CC); do_fetch_property(&$$, &$2, &$3 CLS_CC); } | DOLLAR_OPEN_CURLY_BRACES expr '}' { do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$2, 1 CLS_CC); } -- cgit v1.2.1