com php-src: Port constant declaration: Zend/zend_ast.h Z end/zend_compile.c Zend/zend_compile.h Zend/zend_ language_parser.y
| From: | Nikita Popov | Date: | Tue, 22 Jul 2014 09:55:07 +0000 |
| Subject: | com php-src: Port constant declaration: Zend/zend_ast.h Z end/zend_compile.c Zend/zend_compile.h Zend/zend_ language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80945@lists.php.net to get a copy of this message | ||
Commit: b6c9eb21d46200648c01205cc8ac87941a08b802
Author: Nikita Popov <nikic@php.net> Tue, 22 Jul 2014 11:55:07 +0200
Parents: 64151ec37a0ddb14aed32a6fe8c327bdb26d105b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b6c9eb21d46200648c01205cc8ac87941a08b802
Log:
Port constant declaration
Changed paths:
M Zend/zend_ast.h
M Zend/zend_compile.c
M Zend/zend_compile.h
M Zend/zend_language_parser.y
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index c89b4af..c992e3e 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -107,6 +107,7 @@ enum _zend_ast_kind { ZEND_AST_PROP_DECL, ZEND_AST_PROP_ELEM, + ZEND_AST_CONST_DECL, ZEND_AST_CLASS_CONST_DECL, ZEND_AST_CONST_ELEM, diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a938900..6c2b7b6 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3030,34 +3030,34 @@ void zend_do_halt_compiler_register(TSRMLS_D) /* {{{ */ } /* }}} */ -static zend_constant* zend_get_ct_const(const zval *const_name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */ +static zend_constant *zend_get_ct_const(zend_string *name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */ { zend_constant *c = NULL; char *lookup_name; - if (Z_STRVAL_P(const_name)[0] == '\\') { - if ((c = zend_hash_str_find_ptr(EG(zend_constants), Z_STRVAL_P(const_name)+1, Z_STRLEN_P(const_name)-1)) == NULL) { - lookup_name = zend_str_tolower_dup(Z_STRVAL_P(const_name)+1, Z_STRLEN_P(const_name)-1); - if ((c = zend_hash_str_find_ptr(EG(zend_constants), lookup_name, Z_STRLEN_P(const_name)-1)) != NULL) { - if ((c->flags & CONST_CT_SUBST) && !(c->flags & CONST_CS)) { - efree(lookup_name); - return c; - } - } + if (name->val[0] == '\\') { + c = zend_hash_str_find_ptr(EG(zend_constants), name->val + 1, name->len - 1); + if (!c) { + lookup_name = zend_str_tolower_dup(name->val + 1, name->len - 1); + c = zend_hash_str_find_ptr(EG(zend_constants), lookup_name, name->len - 1); efree(lookup_name); - return NULL; - } - } else if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR_P(const_name))) == NULL) { - lookup_name = zend_str_tolower_dup(Z_STRVAL_P(const_name), Z_STRLEN_P(const_name)); - if ((c = zend_hash_str_find_ptr(EG(zend_constants), lookup_name, Z_STRLEN_P(const_name))) != NULL) { - if ((c->flags & CONST_CT_SUBST) && !(c->flags & CONST_CS)) { - efree(lookup_name); + + if (c && (c->flags & CONST_CT_SUBST) && !(c->flags & CONST_CS)) { return c; } + return NULL; } + } else if ((c = zend_hash_find_ptr(EG(zend_constants), name)) == NULL) { + lookup_name = zend_str_tolower_dup(name->val, name->len); + c = zend_hash_str_find_ptr(EG(zend_constants), lookup_name, name->len); efree(lookup_name); + + if (c && (c->flags & CONST_CT_SUBST) && !(c->flags & CONST_CS)) { + return c; + } return NULL; } + if (c->flags & CONST_CT_SUBST) { return c; } @@ -3073,7 +3073,8 @@ static zend_constant* zend_get_ct_const(const zval *const_name, int all_internal static int zend_constant_ct_subst(znode *result, zval *const_name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */ { - zend_constant *c = zend_get_ct_const(const_name, all_internal_constants_substitution TSRMLS_CC); + zend_constant *c = zend_get_ct_const(Z_STR_P(const_name), + all_internal_constants_substitution TSRMLS_CC); if (c) { result->op_type = IS_CONST; @@ -3548,55 +3549,6 @@ void zend_do_begin_namespace(znode *name, zend_bool with_bracket TSRMLS_DC) /* { } /* }}} */ -void zend_do_declare_constant(znode *name, znode *value TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - zval *ns_name; - - if ((Z_TYPE(value->u.constant) == IS_ARRAY) || - (Z_TYPE(value->u.constant) == IS_CONSTANT_AST && - Z_ASTVAL(value->u.constant)->kind == ZEND_INIT_ARRAY)) { - zend_error_noreturn(E_COMPILE_ERROR, "Arrays are not allowed as constants"); - } - - if (zend_get_ct_const(&name->u.constant, 0 TSRMLS_CC)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare constant '%s'", Z_STRVAL(name->u.constant)); - } - - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - /* Prefix constant name with name of current namespace, lowercased */ - znode tmp; - - tmp.op_type = IS_CONST; - ZVAL_NEW_STR(&tmp.u.constant, STR_ALLOC(Z_STRLEN(CG(current_namespace)), 0)); - zend_str_tolower_copy(Z_STRVAL(tmp.u.constant), Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace))); - zend_do_build_namespace_name(&tmp, &tmp, name TSRMLS_CC); - *name = tmp; - } - - /* Constant name must not conflict with import names */ - if (CG(current_import_const) && - (ns_name = zend_hash_find(CG(current_import_const), Z_STR(name->u.constant))) != NULL) { - - char *tmp = estrndup(Z_STRVAL_P(ns_name), Z_STRLEN_P(ns_name)); - - if (Z_STRLEN_P(ns_name) != Z_STRLEN(name->u.constant) || - memcmp(tmp, Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant))) { - zend_error(E_COMPILE_ERROR, "Cannot declare const %s because the name is already in use", Z_STRVAL(name->u.constant)); - } - efree(tmp); - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_DECLARE_CONST; - SET_UNUSED(opline->result); - SET_NODE(opline->op1, name); - SET_NODE(opline->op2, value); - - zend_hash_add_ptr(&CG(const_filenames), Z_STR(name->u.constant), CG(compiled_filename)); -} -/* }}} */ - void zend_verify_namespace(TSRMLS_D) /* {{{ */ { if (CG(has_bracketed_namespaces) && !CG(in_namespace)) { @@ -5950,11 +5902,7 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { return; } - if (value_ast) { - _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); - } else { - ZVAL_NULL(&value_zv); - } + _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); if (Z_TYPE(value_zv) == IS_ARRAY || (Z_TYPE(value_zv) == IS_CONSTANT_AST && Z_ASTVAL(value_zv)->kind == ZEND_AST_ARRAY) @@ -6450,6 +6398,57 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { } } +void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { + zend_uint i; + for (i = 0; i < ast->children; ++i) { + zend_ast *const_ast = ast->child[i]; + zend_ast *name_ast = const_ast->child[0]; + zend_ast *value_ast = const_ast->child[1]; + zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); + + zend_string *import_name; + znode name_node, value_node; + zval *value_zv = &value_node.u.constant; + + value_node.op_type = IS_CONST; + _tmp_compile_const_expr(value_zv, value_ast TSRMLS_CC); + + if (Z_TYPE_P(value_zv) == IS_ARRAY + || (Z_TYPE_P(value_zv) == IS_CONSTANT_AST + && Z_ASTVAL_P(value_zv)->kind == ZEND_AST_ARRAY) + ) { + zend_error_noreturn(E_COMPILE_ERROR, "Arrays are not allowed as constants"); + } + + if (zend_get_ct_const(name, 0 TSRMLS_CC)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare constant '%s'", name->val); + } + + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + name = zend_concat_names(Z_STRVAL(CG(current_namespace)), + Z_STRLEN(CG(current_namespace)), name->val, name->len); + } else { + STR_ADDREF(name); + } + + if (CG(current_import_const) + && (import_name = zend_hash_find_ptr(CG(current_import_const), name)) + ) { + if (import_name->len != name->len || memcmp(import_name->val, name->val, name->len)) { + zend_error(E_COMPILE_ERROR, "Cannot declare const %s because " + "the name is already in use", name->val); + } + } + + name_node.op_type = IS_CONST; + ZVAL_STR(&name_node.u.constant, name); + + emit_op(NULL, ZEND_DECLARE_CONST, &name_node, &value_node TSRMLS_CC); + + zend_hash_add_ptr(&CG(const_filenames), name, CG(compiled_filename)); + } +} + void zend_compile_binary_op(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *left_ast = ast->child[0]; zend_ast *right_ast = ast->child[1]; @@ -7363,6 +7362,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_USE: zend_compile_use(ast TSRMLS_CC); break; + case ZEND_AST_CONST_DECL: + zend_compile_const_decl(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index c79ef2c..11e3550 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -519,7 +519,6 @@ void zend_do_ticks(TSRMLS_D); void zend_do_abstract_method(const znode *function_name, znode *modifiers, const znode *body TSRMLS_DC); -void zend_do_declare_constant(znode *name, znode *value TSRMLS_DC); void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRMLS_DC); void zend_do_begin_namespace(znode *name, zend_bool with_brackets TSRMLS_DC); void zend_do_end_namespace(TSRMLS_D); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 3ba256c..5ecdfb8 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -261,7 +261,7 @@ top_statement: { $3.u.ast->attr = T_FUNCTION; AS($3); zend_verify_namespace(TSRMLS_C); } | T_USE T_CONST use_declarations ';' { $3.u.ast->attr = T_CONST; AS($3); zend_verify_namespace(TSRMLS_C); } - | constant_declaration ';' { zend_verify_namespace(TSRMLS_C); } + | T_CONST const_list ';' { AS($2); zend_verify_namespace(TSRMLS_C); } ; use_declarations: @@ -282,9 +282,10 @@ use_declaration: { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), AST_ZVAL(&$4)); } ; -constant_declaration: - constant_declaration ',' T_STRING '=' static_scalar { zend_do_declare_constant(&$3, &$5 TSRMLS_CC); } - | T_CONST T_STRING '=' static_scalar { zend_do_declare_constant(&$2, &$4 TSRMLS_CC); } +const_list: + const_list ',' const_decl { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | const_decl + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CONST_DECL, $1.u.ast); } ; inner_statement_list: @@ -606,8 +607,8 @@ class_statement_list: class_statement: variable_modifiers property_list ';' { $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); } - | class_const_list ';' - { $$.u.ast = $1.u.ast; + | T_CONST class_const_list ';' + { $$.u.ast = $2.u.ast; if (CG(doc_comment)) { STR_RELEASE(CG(doc_comment)); CG(doc_comment) = NULL; } } | T_USE name_list trait_adaptations { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_TRAIT, $2.u.ast, $3.u.ast); } @@ -711,14 +712,14 @@ property: ; class_const_list: - class_const_list ',' class_const { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } - | class_const + class_const_list ',' const_decl { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | const_decl { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CLASS_CONST_DECL, $1.u.ast); } ; -class_const: - T_CONST T_STRING '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_CONST_ELEM, AST_ZVAL(&$2), $4.u.ast); } +const_decl: + T_STRING '=' expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_CONST_ELEM, AST_ZVAL(&$1), $3.u.ast); } ; echo_expr_list:
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index c89b4af..c992e3e 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -107,6 +107,7 @@ enum _zend_ast_kind { ZEND_AST_PROP_DECL, ZEND_AST_PROP_ELEM, + ZEND_AST_CONST_DECL, ZEND_AST_CLASS_CONST_DECL, ZEND_AST_CONST_ELEM, diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a938900..6c2b7b6 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3030,34 +3030,34 @@ void zend_do_halt_compiler_register(TSRMLS_D) /* {{{ */ } /* }}} */ -static zend_constant* zend_get_ct_const(const zval *const_name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */ +static zend_constant *zend_get_ct_const(zend_string *name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */ { zend_constant *c = NULL; char *lookup_name; - if (Z_STRVAL_P(const_name)[0] == '\\') { - if ((c = zend_hash_str_find_ptr(EG(zend_constants), Z_STRVAL_P(const_name)+1, Z_STRLEN_P(const_name)-1)) == NULL) { - lookup_name = zend_str_tolower_dup(Z_STRVAL_P(const_name)+1, Z_STRLEN_P(const_name)-1); - if ((c = zend_hash_str_find_ptr(EG(zend_constants), lookup_name, Z_STRLEN_P(const_name)-1)) != NULL) { - if ((c->flags & CONST_CT_SUBST) && !(c->flags & CONST_CS)) { - efree(lookup_name); - return c; - } - } + if (name->val[0] == '\\') { + c = zend_hash_str_find_ptr(EG(zend_constants), name->val + 1, name->len - 1); + if (!c) { + lookup_name = zend_str_tolower_dup(name->val + 1, name->len - 1); + c = zend_hash_str_find_ptr(EG(zend_constants), lookup_name, name->len - 1); efree(lookup_name); - return NULL; - } - } else if ((c = zend_hash_find_ptr(EG(zend_constants), Z_STR_P(const_name))) == NULL) { - lookup_name = zend_str_tolower_dup(Z_STRVAL_P(const_name), Z_STRLEN_P(const_name)); - if ((c = zend_hash_str_find_ptr(EG(zend_constants), lookup_name, Z_STRLEN_P(const_name))) != NULL) { - if ((c->flags & CONST_CT_SUBST) && !(c->flags & CONST_CS)) { - efree(lookup_name); + + if (c && (c->flags & CONST_CT_SUBST) && !(c->flags & CONST_CS)) { return c; } + return NULL; } + } else if ((c = zend_hash_find_ptr(EG(zend_constants), name)) == NULL) { + lookup_name = zend_str_tolower_dup(name->val, name->len); + c = zend_hash_str_find_ptr(EG(zend_constants), lookup_name, name->len); efree(lookup_name); + + if (c && (c->flags & CONST_CT_SUBST) && !(c->flags & CONST_CS)) { + return c; + } return NULL; } + if (c->flags & CONST_CT_SUBST) { return c; } @@ -3073,7 +3073,8 @@ static zend_constant* zend_get_ct_const(const zval *const_name, int all_internal static int zend_constant_ct_subst(znode *result, zval *const_name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */ { - zend_constant *c = zend_get_ct_const(const_name, all_internal_constants_substitution TSRMLS_CC); + zend_constant *c = zend_get_ct_const(Z_STR_P(const_name), + all_internal_constants_substitution TSRMLS_CC); if (c) { result->op_type = IS_CONST; @@ -3548,55 +3549,6 @@ void zend_do_begin_namespace(znode *name, zend_bool with_bracket TSRMLS_DC) /* { } /* }}} */ -void zend_do_declare_constant(znode *name, znode *value TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - zval *ns_name; - - if ((Z_TYPE(value->u.constant) == IS_ARRAY) || - (Z_TYPE(value->u.constant) == IS_CONSTANT_AST && - Z_ASTVAL(value->u.constant)->kind == ZEND_INIT_ARRAY)) { - zend_error_noreturn(E_COMPILE_ERROR, "Arrays are not allowed as constants"); - } - - if (zend_get_ct_const(&name->u.constant, 0 TSRMLS_CC)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare constant '%s'", Z_STRVAL(name->u.constant)); - } - - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - /* Prefix constant name with name of current namespace, lowercased */ - znode tmp; - - tmp.op_type = IS_CONST; - ZVAL_NEW_STR(&tmp.u.constant, STR_ALLOC(Z_STRLEN(CG(current_namespace)), 0)); - zend_str_tolower_copy(Z_STRVAL(tmp.u.constant), Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace))); - zend_do_build_namespace_name(&tmp, &tmp, name TSRMLS_CC); - *name = tmp; - } - - /* Constant name must not conflict with import names */ - if (CG(current_import_const) && - (ns_name = zend_hash_find(CG(current_import_const), Z_STR(name->u.constant))) != NULL) { - - char *tmp = estrndup(Z_STRVAL_P(ns_name), Z_STRLEN_P(ns_name)); - - if (Z_STRLEN_P(ns_name) != Z_STRLEN(name->u.constant) || - memcmp(tmp, Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant))) { - zend_error(E_COMPILE_ERROR, "Cannot declare const %s because the name is already in use", Z_STRVAL(name->u.constant)); - } - efree(tmp); - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_DECLARE_CONST; - SET_UNUSED(opline->result); - SET_NODE(opline->op1, name); - SET_NODE(opline->op2, value); - - zend_hash_add_ptr(&CG(const_filenames), Z_STR(name->u.constant), CG(compiled_filename)); -} -/* }}} */ - void zend_verify_namespace(TSRMLS_D) /* {{{ */ { if (CG(has_bracketed_namespaces) && !CG(in_namespace)) { @@ -5950,11 +5902,7 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { return; } - if (value_ast) { - _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); - } else { - ZVAL_NULL(&value_zv); - } + _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); if (Z_TYPE(value_zv) == IS_ARRAY || (Z_TYPE(value_zv) == IS_CONSTANT_AST && Z_ASTVAL(value_zv)->kind == ZEND_AST_ARRAY) @@ -6450,6 +6398,57 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { } } +void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { + zend_uint i; + for (i = 0; i < ast->children; ++i) { + zend_ast *const_ast = ast->child[i]; + zend_ast *name_ast = const_ast->child[0]; + zend_ast *value_ast = const_ast->child[1]; + zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); + + zend_string *import_name; + znode name_node, value_node; + zval *value_zv = &value_node.u.constant; + + value_node.op_type = IS_CONST; + _tmp_compile_const_expr(value_zv, value_ast TSRMLS_CC); + + if (Z_TYPE_P(value_zv) == IS_ARRAY + || (Z_TYPE_P(value_zv) == IS_CONSTANT_AST + && Z_ASTVAL_P(value_zv)->kind == ZEND_AST_ARRAY) + ) { + zend_error_noreturn(E_COMPILE_ERROR, "Arrays are not allowed as constants"); + } + + if (zend_get_ct_const(name, 0 TSRMLS_CC)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare constant '%s'", name->val); + } + + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + name = zend_concat_names(Z_STRVAL(CG(current_namespace)), + Z_STRLEN(CG(current_namespace)), name->val, name->len); + } else { + STR_ADDREF(name); + } + + if (CG(current_import_const) + && (import_name = zend_hash_find_ptr(CG(current_import_const), name)) + ) { + if (import_name->len != name->len || memcmp(import_name->val, name->val, name->len)) { + zend_error(E_COMPILE_ERROR, "Cannot declare const %s because " + "the name is already in use", name->val); + } + } + + name_node.op_type = IS_CONST; + ZVAL_STR(&name_node.u.constant, name); + + emit_op(NULL, ZEND_DECLARE_CONST, &name_node, &value_node TSRMLS_CC); + + zend_hash_add_ptr(&CG(const_filenames), name, CG(compiled_filename)); + } +} + void zend_compile_binary_op(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *left_ast = ast->child[0]; zend_ast *right_ast = ast->child[1]; @@ -7363,6 +7362,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_USE: zend_compile_use(ast TSRMLS_CC); break; + case ZEND_AST_CONST_DECL: + zend_compile_const_decl(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index c79ef2c..11e3550 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -519,7 +519,6 @@ void zend_do_ticks(TSRMLS_D); void zend_do_abstract_method(const znode *function_name, znode *modifiers, const znode *body TSRMLS_DC); -void zend_do_declare_constant(znode *name, znode *value TSRMLS_DC); void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRMLS_DC); void zend_do_begin_namespace(znode *name, zend_bool with_brackets TSRMLS_DC); void zend_do_end_namespace(TSRMLS_D); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 3ba256c..5ecdfb8 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -261,7 +261,7 @@ top_statement: { $3.u.ast->attr = T_FUNCTION; AS($3); zend_verify_namespace(TSRMLS_C); } | T_USE T_CONST use_declarations ';' { $3.u.ast->attr = T_CONST; AS($3); zend_verify_namespace(TSRMLS_C); } - | constant_declaration ';' { zend_verify_namespace(TSRMLS_C); } + | T_CONST const_list ';' { AS($2); zend_verify_namespace(TSRMLS_C); } ; use_declarations: @@ -282,9 +282,10 @@ use_declaration: { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), AST_ZVAL(&$4)); } ; -constant_declaration: - constant_declaration ',' T_STRING '=' static_scalar { zend_do_declare_constant(&$3, &$5 TSRMLS_CC); } - | T_CONST T_STRING '=' static_scalar { zend_do_declare_constant(&$2, &$4 TSRMLS_CC); } +const_list: + const_list ',' const_decl { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | const_decl + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CONST_DECL, $1.u.ast); } ; inner_statement_list: @@ -606,8 +607,8 @@ class_statement_list: class_statement: variable_modifiers property_list ';' { $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); } - | class_const_list ';' - { $$.u.ast = $1.u.ast; + | T_CONST class_const_list ';' + { $$.u.ast = $2.u.ast; if (CG(doc_comment)) { STR_RELEASE(CG(doc_comment)); CG(doc_comment) = NULL; } } | T_USE name_list trait_adaptations { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_TRAIT, $2.u.ast, $3.u.ast); } @@ -711,14 +712,14 @@ property: ; class_const_list: - class_const_list ',' class_const { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } - | class_const + class_const_list ',' const_decl { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | const_decl { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CLASS_CONST_DECL, $1.u.ast); } ; -class_const: - T_CONST T_STRING '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_CONST_ELEM, AST_ZVAL(&$2), $4.u.ast); } +const_decl: + T_STRING '=' expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_CONST_ELEM, AST_ZVAL(&$1), $3.u.ast); } ; echo_expr_list: