com php-src: Cleanup member modifier code: Zend/zend_compile .c Zend/zend_compile.h Zend/zend_language_parser .y

From: Date: Sun, 27 Jul 2014 10:19:01 +0000
Subject: com php-src: Cleanup member modifier code: Zend/zend_compile .c Zend/zend_compile.h Zend/zend_language_parser .y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80932@lists.php.net to get a copy of this message
Commit: 1ea9a2d934a0aef66aaf92c174cdf0542dd0dd68 Author: Nikita Popov <nikic@php.net> Sun, 27 Jul 2014 12:17:36 +0200 Parents: df42793cd2ceed11cb46288e0f89d4684b885a57 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1ea9a2d934a0aef66aaf92c174cdf0542dd0dd68 Log: Cleanup member modifier code Changed paths: M Zend/zend_compile.c M Zend/zend_compile.h M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 496392b..df4d474 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -703,30 +703,25 @@ void zend_do_free(znode *op1 TSRMLS_DC) /* {{{ */ } /* }}} */ -int zend_do_verify_access_types(const znode *current_access_type, const znode *new_modifier) /* {{{ */ -{ - if ((Z_LVAL(current_access_type->u.constant) & ZEND_ACC_PPP_MASK) - && (Z_LVAL(new_modifier->u.constant) & ZEND_ACC_PPP_MASK)) { +zend_uint zend_add_member_modifier(zend_uint flags, zend_uint new_flag) { + zend_uint new_flags = flags | new_flag; + if ((flags & ZEND_ACC_PPP_MASK) && (new_flag & ZEND_ACC_PPP_MASK)) { zend_error_noreturn(E_COMPILE_ERROR, "Multiple access type modifiers are not allowed"); } - if ((Z_LVAL(current_access_type->u.constant) & ZEND_ACC_ABSTRACT) - && (Z_LVAL(new_modifier->u.constant) & ZEND_ACC_ABSTRACT)) { + if ((flags & ZEND_ACC_ABSTRACT) && (new_flag & ZEND_ACC_ABSTRACT)) { zend_error_noreturn(E_COMPILE_ERROR, "Multiple abstract modifiers are not allowed"); } - if ((Z_LVAL(current_access_type->u.constant) & ZEND_ACC_STATIC) - && (Z_LVAL(new_modifier->u.constant) & ZEND_ACC_STATIC)) { + if ((flags & ZEND_ACC_STATIC) && (new_flag & ZEND_ACC_STATIC)) { zend_error_noreturn(E_COMPILE_ERROR, "Multiple static modifiers are not allowed"); } - if ((Z_LVAL(current_access_type->u.constant) & ZEND_ACC_FINAL) - && (Z_LVAL(new_modifier->u.constant) & ZEND_ACC_FINAL)) { + if ((flags & ZEND_ACC_FINAL) && (new_flag & ZEND_ACC_FINAL)) { zend_error_noreturn(E_COMPILE_ERROR, "Multiple final modifiers are not allowed"); } - if (((Z_LVAL(current_access_type->u.constant) | Z_LVAL(new_modifier->u.constant)) & (ZEND_ACC_ABSTRACT | ZEND_ACC_FINAL)) == (ZEND_ACC_ABSTRACT | ZEND_ACC_FINAL)) { + if ((new_flags & ZEND_ACC_ABSTRACT) && (new_flags & ZEND_ACC_FINAL)) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use the final modifier on an abstract class member"); } - return (Z_LVAL(current_access_type->u.constant) | Z_LVAL(new_modifier->u.constant)); + return new_flags; } -/* }}} */ void zend_do_handle_exception(TSRMLS_D) /* {{{ */ { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 22c0472..192de68 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -468,11 +468,11 @@ void zend_discard_doc_comment(TSRMLS_D); void zend_stop_lexing(TSRMLS_D); void zend_emit_final_return(zval *zv TSRMLS_DC); zend_ast *zend_ast_append_str(zend_ast *left, zend_ast *right); +zend_uint zend_add_member_modifier(zend_uint flags, zend_uint new_flag); /* parser-driven code generators */ void zend_do_free(znode *op1 TSRMLS_DC); -int zend_do_verify_access_types(const znode *current_access_type, const znode *new_modifier); void zend_do_handle_exception(TSRMLS_D); ZEND_API int do_bind_function(const zend_op_array *op_array, zend_op *opline, HashTable *function_table, zend_bool compile_time TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index f592b04..fa505b0 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -607,13 +607,13 @@ class_statement_list: class_statement: variable_modifiers property_list ';' - { $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); } + { $$.u.ast = $2.u.ast; $$.u.ast->attr = $1.EA; } | T_CONST class_const_list ';' { $$.u.ast = $2.u.ast; zend_discard_doc_comment(TSRMLS_C); } | T_USE name_list trait_adaptations { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_TRAIT, $2.u..ast, $3.u.ast); } | method_modifiers function returns_ref T_STRING '(' parameter_list ')' method_body - { $$.u.ast = zend_ast_create_decl(ZEND_AST_METHOD, $3.EA | Z_LVAL($1.u.constant), + { $$.u..ast = zend_ast_create_decl(ZEND_AST_METHOD, $3.EA | $1.EA, $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), $2.u.op.ptr, zend_ast_get_str($4.u.ast), $6.u.ast, NULL, $8.u.ast); } ; @@ -649,10 +649,10 @@ trait_precedence: trait_alias: trait_method_reference T_AS trait_modifiers T_STRING { $$.u.ast = zend_ast_create_ex(2, ZEND_AST_TRAIT_ALIAS, - Z_LVAL($3.u.constant), $1.u.ast, $4.u.ast); } + $3.EA, $1.u.ast, $4.u.ast); } | trait_method_reference T_AS member_modifier { $$.u.ast = zend_ast_create_ex(2, ZEND_AST_TRAIT_ALIAS, - Z_LVAL($3..u.constant), $1.u.ast, NULL); } + $3.EA, $1.u.ast, NULL); } ; trait_method_reference: @@ -667,8 +667,8 @@ absolute_trait_method_reference: ; trait_modifiers: - /* empty */ { Z_LVAL($$.u.constant) = 0; } - | member_modifier { $$ = $1; } + /* empty */ { $$.EA = 0; } + | member_modifier { $$.EA = $1.EA; } ; method_body: @@ -677,27 +677,29 @@ method_body: ; variable_modifiers: - non_empty_member_modifiers { $$ = $1; } - | T_VAR { Z_LVAL($$.u.constant) = ZEND_ACC_PUBLIC; } + non_empty_member_modifiers { $$.EA = $1.EA; } + | T_VAR { $$.EA = ZEND_ACC_PUBLIC; } ; method_modifiers: - /* empty */ { Z_LVAL($$.u.constant) = ZEND_ACC_PUBLIC; } - | non_empty_member_modifiers { $$ = $1; if (!(Z_LVAL($$.u.constant) & ZEND_ACC_PPP_MASK)) { Z_LVAL($$.u.constant) |= ZEND_ACC_PUBLIC; } } + /* empty */ { $$.EA = ZEND_ACC_PUBLIC; } + | non_empty_member_modifiers + { $$.EA = $1.EA; if (!($$.EA & ZEND_ACC_PPP_MASK)) { $$.EA |= ZEND_ACC_PUBLIC; } } ; non_empty_member_modifiers: - member_modifier { $$ = $1; } - | non_empty_member_modifiers member_modifier { Z_LVAL($$.u.constant) = zend_do_verify_access_types(&$1, &$2); } + member_modifier { $$.EA = $1..EA; } + | non_empty_member_modifiers member_modifier + { $$.EA = zend_add_member_modifier($1.EA, $2.EA); } ; member_modifier: - T_PUBLIC { Z_LVAL($$.u.constant) = ZEND_ACC_PUBLIC; } - | T_PROTECTED { Z_LVAL($$.u.constant) = ZEND_ACC_PROTECTED; } - | T_PRIVATE { Z_LVAL($$.u.constant) = ZEND_ACC_PRIVATE; } - | T_STATIC { Z_LVAL($$.u.constant) = ZEND_ACC_STATIC; } - | T_ABSTRACT { Z_LVAL($$.u.constant) = ZEND_ACC_ABSTRACT; } - | T_FINAL { Z_LVAL($$.u.constant) = ZEND_ACC_FINAL; } + T_PUBLIC { $$.EA = ZEND_ACC_PUBLIC; } + | T_PROTECTED { $$.EA = ZEND_ACC_PROTECTED; } + | T_PRIVATE { $$.EA = ZEND_ACC_PRIVATE; } + | T_STATIC { $$.EA = ZEND_ACC_STATIC; } + | T_ABSTRACT { $$.EA = ZEND_ACC_ABSTRACT; } + | T_FINAL { $$.EA = ZEND_ACC_FINAL; } ; property_list:

« previous php.cvs (#80932) next »