diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-11-02 10:11:42 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-11-02 10:11:42 +0000 |
| commit | f10766f1fbf4e6839cff0a24e9090ae81a3e9f6c (patch) | |
| tree | 41aaf128867a5a5a2b20015976db4bec51e737a7 /Zend/zend_compile.c | |
| parent | 3fbaa4b8736cfad803c4a5943fc19610e47bd213 (diff) | |
| download | php-git-f10766f1fbf4e6839cff0a24e9090ae81a3e9f6c.tar.gz | |
Reimplemented support for namespaces in indexes id constant arrays (removed zval.idx_type)
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2b97eb0de0..64520cdba2 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3643,8 +3643,12 @@ void zend_do_add_static_array_element(znode *result, znode *offset, znode *expr) case IS_CONSTANT: /* Ugly hack to denote that this value has a constant index */ Z_TYPE_P(element) |= IS_CONSTANT_INDEX; - element->idx_type = Z_TYPE(offset->u.constant); - /* break missing intentionally */ + Z_STRVAL(offset->u.constant) = erealloc(Z_STRVAL(offset->u.constant), Z_STRLEN(offset->u.constant)+3); + Z_STRVAL(offset->u.constant)[Z_STRLEN(offset->u.constant)+1] = Z_TYPE(offset->u.constant); + Z_STRVAL(offset->u.constant)[Z_STRLEN(offset->u.constant)+2] = 0; + zend_symtable_update(result->u.constant.value.ht, Z_STRVAL(offset->u.constant), Z_STRLEN(offset->u.constant)+3, &element, sizeof(zval *), NULL); + zval_dtor(&offset->u.constant); + break; case IS_STRING: zend_symtable_update(result->u.constant.value.ht, offset->u.constant.value.str.val, offset->u.constant.value.str.len+1, &element, sizeof(zval *), NULL); zval_dtor(&offset->u.constant); |