summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>1999-04-09 15:18:29 +0000
committerAndi Gutmans <andi@php.net>1999-04-09 15:18:29 +0000
commit5cb576d81a53da011b76b0b0e376dc7dafa1a529 (patch)
tree016417e5fc16d1d025e7c0a4c3ffc4ce2e3a32c4
parent2d7b9b038d09565a8c94ddaf5a44ef14bb2bb0a1 (diff)
downloadphp-git-5cb576d81a53da011b76b0b0e376dc7dafa1a529.tar.gz
- I guess print $GLOBALS and print "$GLOBALS" should yield the same result
so I returned the one in encaps_var. - Made INITAL_OP_ARRAY_SIZE smaller (64? can't remeber). I don't think the erealloc()'s during compile time are such a biggy, we might make it even smaller. We can have a configure time option as to it's size.
-rw-r--r--Zend/zend-parser.y2
-rw-r--r--Zend/zend_compile.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y
index e89b235a6c..a3f22364ab 100644
--- a/Zend/zend-parser.y
+++ b/Zend/zend-parser.y
@@ -604,7 +604,7 @@ encaps_list:
encaps_var:
- VARIABLE { do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
+ VARIABLE { do_fetch_globals(&$1); 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); }
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index a6d7d834ef..c54f7d4705 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -318,7 +318,7 @@ ZEND_API zend_op_array *compile_string(zval *source_string CLS_DC);
ZEND_API zend_op_array *compile_filename(zval *filename CLS_DC);
inline int open_file_for_scanning(zend_file_handle *file_handle CLS_DC);
-#define INITIAL_OP_ARRAY_SIZE 1024
+#define INITIAL_OP_ARRAY_SIZE 64
ZEND_API void init_op_array(zend_op_array *op_array, int initial_ops_size);