summaryrefslogtreecommitdiff
path: root/Zend/zend-parser.y
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>1999-04-09 15:01:13 +0000
committerAndi Gutmans <andi@php.net>1999-04-09 15:01:13 +0000
commit2d7b9b038d09565a8c94ddaf5a44ef14bb2bb0a1 (patch)
tree47ab271ee9c845fcd61993d31740955fd181d4f3 /Zend/zend-parser.y
parent43c0e94ac91e7968670478c5e47bf7edffa52343 (diff)
downloadphp-git-2d7b9b038d09565a8c94ddaf5a44ef14bb2bb0a1.tar.gz
- 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.
Diffstat (limited to 'Zend/zend-parser.y')
-rw-r--r--Zend/zend-parser.y4
1 files 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); }