mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for C89

Browse Source
This commit is contained in:
Nikita Popov 2014-08-25 19:46:21 +02:00
parent 0a230fb4db
commit 7813d85d3d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Zend/zend_compile.c
View File

@ -3642,12 +3642,12 @@ void zend_compile_dim(znode *result, zend_ast *ast, int type TSRMLS_DC) {
}
static zend_bool is_this_fetch(zend_ast *ast) {
if (ast->kind != ZEND_AST_VAR || ast->child[0]->kind != ZEND_AST_ZVAL) {
return 0;
if (ast->kind == ZEND_AST_VAR && ast->child[0]->kind == ZEND_AST_ZVAL) {
zval *name = zend_ast_get_zval(ast->child[0]);
return Z_TYPE_P(name) == IS_STRING && zend_str_equals_literal(Z_STR_P(name), "this");
}
zval *name = zend_ast_get_zval(ast->child[0]);
return Z_TYPE_P(name) == IS_STRING && zend_str_equals_literal(Z_STR_P(name), "this");
return 0;
}
static zend_op *zend_delayed_compile_prop(
@ -7141,12 +7141,10 @@ void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) {
ZEND_ASSERT(ast->attr == T_CLASS_C && ce && ZEND_CE_IS_TRAIT(ce));
{
zval const_zv;
ZVAL_STRING(&const_zv, "__CLASS__");
zend_ast *const_ast = zend_ast_create(ZEND_AST_CONST,
zend_ast_create_zval(&const_zv));
zend_ast_create_zval_from_str(STR_INIT("__CLASS__", sizeof("__CLASS__") - 1, 0)));
zend_compile_const(result, const_ast TSRMLS_CC);
zval_ptr_dtor(&const_zv);
zend_ast_destroy(const_ast);
}
}