From 95a3a126577aae761a93b06b051b23322d9a6e41 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 16:31:10 +0200 Subject: Change precedence of $ operator $$foo['bar'] is now interpreted as ${$foo}['bar'] rather than ${$foo['bar']}. --- Zend/zend_compile.c | 11 ++--------- Zend/zend_compile.h | 2 +- Zend/zend_language_parser.y | 13 +++---------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ea75c1503a..37649e7bb2 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6315,17 +6315,10 @@ void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC) /* { } /* }}} */ -void zend_do_indirect_references(znode *result, const znode *num_references, znode *variable TSRMLS_DC) /* {{{ */ +void zend_do_indirect_reference(znode *result, znode *variable TSRMLS_DC) /* {{{ */ { - int i; + fetch_simple_variable_ex(result, variable, 0, ZEND_FETCH_R TSRMLS_CC); - zend_do_end_variable_parse(variable, BP_VAR_R, 0 TSRMLS_CC); - for (i=1; iu.constant); i++) { - fetch_simple_variable_ex(result, variable, 0, ZEND_FETCH_R TSRMLS_CC); - *variable = *result; - } - zend_do_begin_variable_parse(TSRMLS_C); - fetch_simple_variable(result, variable, 1 TSRMLS_CC); /* there is a chance someone is accessing $this */ if (CG(active_op_array)->scope && CG(active_op_array)->this_var == -1) { zend_string *key = STR_INIT("this", sizeof("this")-1, 0); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 5b5397844f..9f17b110d1 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -457,7 +457,7 @@ void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC); void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC); void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC); void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar op TSRMLS_DC); -void zend_do_indirect_references(znode *result, const znode *num_references, znode *variable TSRMLS_DC); +void zend_do_indirect_reference(znode *result, znode *variable TSRMLS_DC); void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC); void zend_do_fetch_global_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 43e20cd9ce..886eff03db 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1130,7 +1130,6 @@ method_or_not: variable_without_objects: reference_variable { $$ = $1; } - | simple_indirect_reference reference_variable { zend_do_indirect_references(&$$, &$1, &$2 TSRMLS_CC); } ; static_member: @@ -1158,20 +1157,19 @@ base_variable_with_function_calls: base_variable: reference_variable { $$ = $1; $$.EA = ZEND_PARSED_VARIABLE; } - | simple_indirect_reference reference_variable { zend_do_indirect_references(&$$, &$1, &$2 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } ; reference_variable: reference_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } | reference_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } - | compound_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } + | simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } ; - -compound_variable: +simple_variable: T_VARIABLE { $$ = $1; } | '$' '{' expr '}' { $$ = $3; } + | '$' simple_variable { zend_do_indirect_reference(&$$, &$2 TSRMLS_CC); } ; dim_offset: @@ -1196,11 +1194,6 @@ variable_name: | '{' expr '}' { $$ = $2; } ; -simple_indirect_reference: - '$' { Z_LVAL($$.u.constant) = 1; } - | simple_indirect_reference '$' { Z_LVAL($$.u.constant)++; } -; - assignment_list: assignment_list ',' assignment_list_element | assignment_list_element -- cgit v1.2.1 From e2be2cee97ade5169d4502c862360f67f5544e6e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 21:11:25 +0200 Subject: Temporarily disable complex variables in new expressions --- Zend/zend_language_parser.y | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 886eff03db..206c290977 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -930,21 +930,7 @@ class_name_reference: dynamic_class_name_reference: - base_variable T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } - object_property { zend_do_push_object(&$4 TSRMLS_CC); } dynamic_class_name_variable_properties - { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; } - | base_variable { $$ = $1; } -; - - -dynamic_class_name_variable_properties: - dynamic_class_name_variable_properties dynamic_class_name_variable_property - | /* empty */ -; - - -dynamic_class_name_variable_property: - T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); } + simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } ; exit_expr: -- cgit v1.2.1 From 46e35e3d5dd6447245a4d80ddde21f4e348c98d5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 21:14:18 +0200 Subject: Get rid of base_variable_with_function_calls --- Zend/zend_language_parser.y | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 206c290977..1fd580ef58 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1082,10 +1082,10 @@ rw_variable: ; variable: - base_variable_with_function_calls T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } + base_variable T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } object_property { zend_do_push_object(&$4 TSRMLS_CC); } method_or_not variable_properties { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = $1.EA | ($7.EA ? $7.EA : $6.EA); } - | base_variable_with_function_calls { $$ = $1; } + | base_variable { $$ = $1; } ; variable_properties: @@ -1134,16 +1134,11 @@ array_function_dereference: '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$4 TSRMLS_CC); } ; -base_variable_with_function_calls: - base_variable { $$ = $1; } - | array_function_dereference { $$ = $1; } - | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } -; - - base_variable: reference_variable { $$ = $1; $$.EA = ZEND_PARSED_VARIABLE; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } + | array_function_dereference { $$ = $1; } + | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } ; reference_variable: -- cgit v1.2.1 From b8b3b355be4ac5c537dd5fc60c929f9f15c5c636 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 22:03:24 +0200 Subject: Use recursion for property fetches --- Zend/zend_language_parser.y | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1fd580ef58..08c3ffe7eb 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1082,18 +1082,15 @@ rw_variable: ; variable: - base_variable T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } - object_property { zend_do_push_object(&$4 TSRMLS_CC); } method_or_not variable_properties - { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = $1.EA | ($7.EA ? $7.EA : $6.EA); } - | base_variable { $$ = $1; } -; - -variable_properties: - variable_properties variable_property { $$.EA = $2.EA; } - | /* empty */ { $$.EA = 0; } + variable T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } + object_property { zend_do_push_object(&$4 TSRMLS_CC); } method_or_not + { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = $6.EA; } + | reference_variable { $$ = $1; $$.EA = ZEND_PARSED_VARIABLE; } + | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } + | array_function_dereference { $$ = $1; } + | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } ; - variable_property: T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); } method_or_not { $$.EA = $4.EA; } ; @@ -1134,13 +1131,6 @@ array_function_dereference: '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$4 TSRMLS_CC); } ; -base_variable: - reference_variable { $$ = $1; $$.EA = ZEND_PARSED_VARIABLE; } - | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } - | array_function_dereference { $$ = $1; } - | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } -; - reference_variable: reference_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } | reference_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } -- cgit v1.2.1 From a8c1595012a59d5b4e8a8d0b90650f3075f02869 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 22:33:03 +0200 Subject: LTR static member access --- Zend/tests/bug27669.phpt | 2 +- Zend/zend_compile.c | 74 ++++++++++++--------------------------------- Zend/zend_compile.h | 2 +- Zend/zend_language_parser.y | 18 ++++++----- 4 files changed, 32 insertions(+), 64 deletions(-) diff --git a/Zend/tests/bug27669.phpt b/Zend/tests/bug27669.phpt index 4d513e91aa..43591a9386 100644 --- a/Zend/tests/bug27669.phpt +++ b/Zend/tests/bug27669.phpt @@ -10,7 +10,7 @@ Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dy } } $y[0] = 'hello'; - A::$y[0](); + A::{$y[0]}(); ?> ===DONE=== --EXPECTF-- diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 37649e7bb2..b6754d202b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -703,7 +703,7 @@ void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC) /* { } /* }}} */ -void zend_do_fetch_static_member(znode *result, znode *class_name TSRMLS_DC) /* {{{ */ +void zend_do_fetch_static_member(znode *result, znode *class_name, znode *member_name TSRMLS_DC) /* {{{ */ { znode class_node; zend_llist *fetch_list_ptr; @@ -718,65 +718,29 @@ void zend_do_fetch_static_member(znode *result, znode *class_name TSRMLS_DC) /* } else { zend_do_fetch_class(&class_node, class_name TSRMLS_CC); } + + zend_do_begin_variable_parse(TSRMLS_C); fetch_list_ptr = zend_stack_top(&CG(bp_stack)); - if (result->op_type == IS_CV) { - init_op(&opline TSRMLS_CC); + init_op(&opline TSRMLS_CC); - opline.opcode = ZEND_FETCH_W; - opline.result_type = IS_VAR; - opline.result.var = get_temporary_variable(CG(active_op_array)); - opline.op1_type = IS_CONST; - LITERAL_STR(opline.op1, STR_COPY(CG(active_op_array)->vars[EX_VAR_TO_NUM(result->u.op.var)])); + opline.opcode = ZEND_FETCH_W; + opline.result_type = IS_VAR; + opline.result.var = get_temporary_variable(CG(active_op_array)); + SET_NODE(opline.op1, member_name); + if (opline.op1_type == IS_CONST) { GET_POLYMORPHIC_CACHE_SLOT(opline.op1.constant); - if (class_node.op_type == IS_CONST) { - opline.op2_type = IS_CONST; - opline.op2.constant = - zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); - } else { - SET_NODE(opline.op2, &class_node); - } - GET_NODE(result,opline.result); - opline.extended_value |= ZEND_FETCH_STATIC_MEMBER; - opline_ptr = &opline; - - zend_llist_add_element(fetch_list_ptr, &opline); + } + if (class_node.op_type == IS_CONST) { + opline.op2_type = IS_CONST; + opline.op2.constant = + zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); } else { - le = fetch_list_ptr->head; - - opline_ptr = (zend_op *)le->data; - if (opline_ptr->opcode != ZEND_FETCH_W && opline_ptr->op1_type == IS_CV) { - init_op(&opline TSRMLS_CC); - opline.opcode = ZEND_FETCH_W; - opline.result_type = IS_VAR; - opline.result.var = get_temporary_variable(CG(active_op_array)); - opline.op1_type = IS_CONST; - LITERAL_STR(opline.op1, STR_COPY(CG(active_op_array)->vars[EX_VAR_TO_NUM(opline_ptr->op1.var)])); - GET_POLYMORPHIC_CACHE_SLOT(opline.op1.constant); - if (class_node.op_type == IS_CONST) { - opline.op2_type = IS_CONST; - opline.op2.constant = - zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); - } else { - SET_NODE(opline.op2, &class_node); - } - opline.extended_value |= ZEND_FETCH_STATIC_MEMBER; - COPY_NODE(opline_ptr->op1, opline.result); - - zend_llist_prepend_element(fetch_list_ptr, &opline); - } else { - if (opline_ptr->op1_type == IS_CONST) { - GET_POLYMORPHIC_CACHE_SLOT(opline_ptr->op1.constant); - } - if (class_node.op_type == IS_CONST) { - opline_ptr->op2_type = IS_CONST; - opline_ptr->op2.constant = - zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); - } else { - SET_NODE(opline_ptr->op2, &class_node); - } - opline_ptr->extended_value |= ZEND_FETCH_STATIC_MEMBER; - } + SET_NODE(opline.op2, &class_node); } + GET_NODE(result,opline.result); + opline.extended_value |= ZEND_FETCH_STATIC_MEMBER; + + zend_llist_add_element(fetch_list_ptr, &opline); } /* }}} */ diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 9f17b110d1..bb4142884d 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -464,7 +464,7 @@ void zend_do_fetch_global_variable(znode *varname, const znode *static_assignmen void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC); void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC); void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC); -void zend_do_fetch_static_member(znode *result, znode *class_znode TSRMLS_DC); +void zend_do_fetch_static_member(znode *result, znode *class_name, znode *member_name TSRMLS_DC); void zend_do_print(znode *result, znode *arg TSRMLS_DC); void zend_do_echo(znode *arg TSRMLS_DC); typedef int (*unary_op_type)(zval *, zval * TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 08c3ffe7eb..d22d1c266d 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -898,13 +898,13 @@ function_call: function_call_parameter_list { zend_do_end_function_call(&$2, &$$, 0, $3.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } | class_name T_PAAMAYIM_NEKUDOTAYIM variable_name { $$.u.op.opline_num = zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call($4.u.op.opline_num?NULL:&$3, &$$, $4.u.op.opline_num, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects { zend_do_end_variable_parse(&$3, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } + | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { fetch_simple_variable_ex(&$$, &$3, 0, ZEND_FETCH_R TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$$ TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} | variable_class_name T_PAAMAYIM_NEKUDOTAYIM variable_name { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects { zend_do_end_variable_parse(&$3, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { fetch_simple_variable_ex(&$$, &$3, 0, ZEND_FETCH_R TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$$ TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | variable_without_objects { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); } + | directly_callable_variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} ; @@ -1086,7 +1086,6 @@ variable: object_property { zend_do_push_object(&$4 TSRMLS_CC); } method_or_not { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = $6.EA; } | reference_variable { $$ = $1; $$.EA = ZEND_PARSED_VARIABLE; } - | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } | array_function_dereference { $$ = $1; } | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } ; @@ -1116,8 +1115,8 @@ variable_without_objects: ; static_member: - class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects { $$ = $3; zend_do_fetch_static_member(&$$, &$1 TSRMLS_CC); } - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects { $$ = $3; zend_do_fetch_static_member(&$$, &$1 TSRMLS_CC); } + class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } ; @@ -1131,12 +1130,17 @@ array_function_dereference: '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$4 TSRMLS_CC); } ; -reference_variable: +directly_callable_variable: reference_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } | reference_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } | simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } ; +reference_variable: + directly_callable_variable { $$ = $1; } + | static_member { $$ = $1; } +; + simple_variable: T_VARIABLE { $$ = $1; } | '$' '{' expr '}' { $$ = $3; } -- cgit v1.2.1 From 667f8409c58da7043d7b2ebd888376c3349bb6db Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 22:53:30 +0200 Subject: Recursive definition for object proprety fetches --- Zend/zend_language_parser.y | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index d22d1c266d..9b3e2c7d1e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -765,8 +765,8 @@ chaining_instance_call: instance_call: /* empty */ { $$ = $0; } - | { zend_do_push_object(&$0 TSRMLS_CC); zend_do_begin_variable_parse(TSRMLS_C); } - chaining_instance_call { zend_do_pop_object(&$$ TSRMLS_CC); zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); } +/* | { zend_do_push_object(&$0 TSRMLS_CC); zend_do_begin_variable_parse(TSRMLS_C); } + chaining_instance_call { zend_do_pop_object(&$$ TSRMLS_CC); zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); }*/ ; new_expr: @@ -1082,10 +1082,7 @@ rw_variable: ; variable: - variable T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } - object_property { zend_do_push_object(&$4 TSRMLS_CC); } method_or_not - { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = $6.EA; } - | reference_variable { $$ = $1; $$.EA = ZEND_PARSED_VARIABLE; } + reference_variable { $$ = $1; } | array_function_dereference { $$ = $1; } | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } ; @@ -1131,14 +1128,28 @@ array_function_dereference: ; directly_callable_variable: - reference_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | reference_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } - | simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } + reference_variable '[' dim_offset ']' + { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } + | reference_variable '{' expr '}' + { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } + | simple_variable + { zend_do_begin_variable_parse(TSRMLS_C); + fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); + $$.EA = ZEND_PARSED_VARIABLE; } + | variable T_OBJECT_OPERATOR object_member + { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); + zend_do_begin_method_call(&$$ TSRMLS_CC); } + function_call_parameter_list + { zend_do_end_function_call(&$4, &$$, 1, 1 TSRMLS_CC); + zend_do_extended_fcall_end(TSRMLS_C); + $$.EA = ZEND_PARSED_METHOD_CALL; } ; reference_variable: directly_callable_variable { $$ = $1; } - | static_member { $$ = $1; } + | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } + | variable T_OBJECT_OPERATOR object_member + { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; } ; simple_variable: @@ -1152,6 +1163,10 @@ dim_offset: | expr { $$ = $1; } ; +object_member: + variable_name { $$ = $1; } + | simple_variable { fetch_simple_variable_ex(&$$, &$1, 0, ZEND_FETCH_R TSRMLS_CC); } +; object_property: object_dim_list { $$ = $1; } -- cgit v1.2.1 From e89958a6340201f9c0e00f9fac7d1d00c5e30e84 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 23:30:37 +0200 Subject: Make function calls directly callable --- Zend/zend_language_parser.y | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 9b3e2c7d1e..41c2bc3391 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1083,8 +1083,6 @@ rw_variable: variable: reference_variable { $$ = $1; } - | array_function_dereference { $$ = $1; } - | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } ; variable_property: @@ -1143,6 +1141,9 @@ directly_callable_variable: { zend_do_end_function_call(&$4, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); $$.EA = ZEND_PARSED_METHOD_CALL; } + | function_call + { zend_do_begin_variable_parse(TSRMLS_C); + $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } ; reference_variable: -- cgit v1.2.1 From 067fca0e89cbb9feb2ac21464f36a6d6cc16eddf Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 23:36:30 +0200 Subject: Remove reference_variable indirection --- Zend/zend_language_parser.y | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 41c2bc3391..97589831e5 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1081,10 +1081,6 @@ rw_variable: zend_check_writable_variable(&$1); } ; -variable: - reference_variable { $$ = $1; } -; - variable_property: T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); } method_or_not { $$.EA = $4.EA; } ; @@ -1106,7 +1102,7 @@ method_or_not: ; variable_without_objects: - reference_variable { $$ = $1; } + variable { $$ = $1; } ; static_member: @@ -1116,7 +1112,7 @@ static_member: ; variable_class_name: - reference_variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$=$1;; } + variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$=$1;; } ; array_function_dereference: @@ -1126,9 +1122,9 @@ array_function_dereference: ; directly_callable_variable: - reference_variable '[' dim_offset ']' + variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | reference_variable '{' expr '}' + | variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } | simple_variable { zend_do_begin_variable_parse(TSRMLS_C); @@ -1146,7 +1142,7 @@ directly_callable_variable: $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } ; -reference_variable: +variable: directly_callable_variable { $$ = $1; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } | variable T_OBJECT_OPERATOR object_member -- cgit v1.2.1 From 295d07e373486cd2fdb45d62710abaca1189ba9c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 23:44:30 +0200 Subject: Reintroduce new expression dereferencing --- Zend/zend_language_parser.y | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 97589831e5..a9293e6615 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1105,12 +1105,6 @@ variable_without_objects: variable { $$ = $1; } ; -static_member: - class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } - -; - variable_class_name: variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$=$1;; } ; @@ -1121,16 +1115,21 @@ array_function_dereference: '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$4 TSRMLS_CC); } ; +dereferencable: + variable { $$ = $1; } + | '(' new_expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); } +; + directly_callable_variable: - variable '[' dim_offset ']' + dereferencable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | variable '{' expr '}' + | dereferencable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } | simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | variable T_OBJECT_OPERATOR object_member + | dereferencable T_OBJECT_OPERATOR object_member { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); zend_do_begin_method_call(&$$ TSRMLS_CC); } function_call_parameter_list @@ -1145,7 +1144,7 @@ directly_callable_variable: variable: directly_callable_variable { $$ = $1; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } - | variable T_OBJECT_OPERATOR object_member + | dereferencable T_OBJECT_OPERATOR object_member { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; } ; @@ -1155,6 +1154,13 @@ simple_variable: | '$' simple_variable { zend_do_indirect_reference(&$$, &$2 TSRMLS_CC); } ; +static_member: + class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } + +; + + dim_offset: /* empty */ { $$.op_type = IS_UNUSED; } | expr { $$ = $1; } -- cgit v1.2.1 From 87f8e758c840a88c435c684cbea6defba4a88710 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 30 May 2014 23:51:54 +0200 Subject: Cleanup old grammar rules --- Zend/zend_compile.c | 2 -- Zend/zend_language_parser.y | 64 --------------------------------------------- 2 files changed, 66 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index b6754d202b..a0610b6c32 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -707,8 +707,6 @@ void zend_do_fetch_static_member(znode *result, znode *class_name, znode *member { znode class_node; zend_llist *fetch_list_ptr; - zend_llist_element *le; - zend_op *opline_ptr; zend_op opline; if (class_name->op_type == IS_CONST && diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index a9293e6615..2b8b32e78a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -747,28 +747,6 @@ non_empty_for_expr: | expr { $$ = $1; } ; -chaining_method_or_property: - chaining_method_or_property variable_property { $$.EA = $2.EA; } - | variable_property { $$.EA = $1.EA; } -; - -chaining_dereference: - chaining_dereference '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | '[' dim_offset ']' { zend_do_pop_object(&$1 TSRMLS_CC); fetch_array_dim(&$$, &$1, &$2 TSRMLS_CC); } -; - -chaining_instance_call: - chaining_dereference { zend_do_push_object(&$1 TSRMLS_CC); } chaining_method_or_property { $$ = $3; } - | chaining_dereference { zend_do_push_object(&$1 TSRMLS_CC); $$ = $1; } - | chaining_method_or_property { $$ = $1; } -; - -instance_call: - /* empty */ { $$ = $0; } -/* | { zend_do_push_object(&$0 TSRMLS_CC); zend_do_begin_variable_parse(TSRMLS_C); } - chaining_instance_call { zend_do_pop_object(&$$ TSRMLS_CC); zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); }*/ -; - new_expr: T_NEW class_name_reference { zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$1, &$2 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$$, &$1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} ; @@ -827,7 +805,6 @@ expr_without_variable: | expr T_INSTANCEOF class_name_reference { zend_do_instanceof(&$$, &$1, &$3, 0 TSRMLS_CC); } | parenthesis_expr { $$ = $1; } | new_expr { $$ = $1; } - | '(' new_expr ')' { $$ = $2; } instance_call { $$ = $5; } | expr '?' { zend_do_begin_qm_op(&$1, &$2 TSRMLS_CC); } expr ':' { zend_do_qm_true(&$4, &$2, &$5 TSRMLS_CC); } expr { zend_do_qm_false(&$$, &$7, &$2, &$5 TSRMLS_CC); } @@ -1081,40 +1058,10 @@ rw_variable: zend_check_writable_variable(&$1); } ; -variable_property: - T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); } method_or_not { $$.EA = $4.EA; } -; - -array_method_dereference: - array_method_dereference '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | method '[' dim_offset ']' { $1.EA = ZEND_PARSED_METHOD_CALL; fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } -; - -method: - { zend_do_pop_object(&$$ TSRMLS_CC); zend_do_begin_method_call(&$$ TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } -; - -method_or_not: - method { $$ = $1; $$.EA = ZEND_PARSED_METHOD_CALL; zend_do_push_object(&$$ TSRMLS_CC); } - | array_method_dereference { $$ = $1; zend_do_push_object(&$$ TSRMLS_CC); } - | /* empty */ { $$.EA = ZEND_PARSED_MEMBER; } -; - -variable_without_objects: - variable { $$ = $1; } -; - variable_class_name: variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$=$1;; } ; -array_function_dereference: - array_function_dereference '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | function_call { zend_do_begin_variable_parse(TSRMLS_C); $1.EA = ZEND_PARSED_FUNCTION_CALL; } - '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$4 TSRMLS_CC); } -; - dereferencable: variable { $$ = $1; } | '(' new_expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); } @@ -1171,17 +1118,6 @@ object_member: | simple_variable { fetch_simple_variable_ex(&$$, &$1, 0, ZEND_FETCH_R TSRMLS_CC); } ; -object_property: - object_dim_list { $$ = $1; } - | variable_without_objects { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); } { znode tmp_znode; zend_do_pop_object(&tmp_znode TSRMLS_CC); zend_do_fetch_property(&$$, &tmp_znode, &$1 TSRMLS_CC);} -; - -object_dim_list: - object_dim_list '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | object_dim_list '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } - | variable_name { znode tmp_znode; zend_do_pop_object(&tmp_znode TSRMLS_CC); zend_do_fetch_property(&$$, &tmp_znode, &$1 TSRMLS_CC);} -; - variable_name: T_STRING { $$ = $1; } | '{' expr '}' { $$ = $2; } -- cgit v1.2.1 From 5712f0e9bdf2c2abc513dfd9dcbc17a9c0839871 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 00:02:51 +0200 Subject: Minor cleanup --- Zend/zend_language_parser.y | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 2b8b32e78a..47f9a3eeeb 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1059,7 +1059,7 @@ rw_variable: ; variable_class_name: - variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$=$1;; } + variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$ = $1; } ; dereferencable: @@ -1068,14 +1068,14 @@ dereferencable: ; directly_callable_variable: - dereferencable '[' dim_offset ']' - { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | dereferencable '{' expr '}' - { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | simple_variable + simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } + | dereferencable '[' dim_offset ']' + { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } + | dereferencable '{' expr '}' + { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } | dereferencable T_OBJECT_OPERATOR object_member { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); zend_do_begin_method_call(&$$ TSRMLS_CC); } -- cgit v1.2.1 From 46a2ca8324ed70c457e8cc57a9cd868c493e47d3 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 00:09:11 +0200 Subject: Generalize expression dereferencing --- Zend/zend_language_parser.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 47f9a3eeeb..ec8d29f194 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -45,7 +45,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %} %pure_parser -%expect 3 +%expect 2 %code requires { #ifdef ZTS @@ -1063,8 +1063,8 @@ variable_class_name: ; dereferencable: - variable { $$ = $1; } - | '(' new_expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); } + variable { $$ = $1; } + | '(' expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); } ; directly_callable_variable: -- cgit v1.2.1 From 75c0db1119eb8b9a1bb414725d1abd1687511640 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 00:18:50 +0200 Subject: Integrate combined scalar as dereferencable --- Zend/zend_language_parser.y | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index ec8d29f194..1b2026359c 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -821,7 +821,6 @@ expr_without_variable: | T_EXIT exit_expr { zend_do_exit(&$$, &$2 TSRMLS_CC); } | '@' { zend_do_begin_silence(&$1 TSRMLS_CC); } expr { zend_do_end_silence(&$1 TSRMLS_CC); $$ = $3; } | scalar { $$ = $1; } - | combined_scalar_offset { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); } | combined_scalar { $$ = $1; } | '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); } | T_PRINT expr { zend_do_print(&$$, &$2 TSRMLS_CC); } @@ -841,14 +840,10 @@ yield_expr: | T_YIELD expr T_DOUBLE_ARROW variable { zend_do_yield(&$$, &$4, &$2, 1 TSRMLS_CC); } ; -combined_scalar_offset: - combined_scalar '[' dim_offset ']' { zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | combined_scalar_offset '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']' { $1.EA = 0; zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - combined_scalar: - T_ARRAY '(' array_pair_list ')' { $$ = $3; } - | '[' array_pair_list ']' { $$ = $2; } + T_ARRAY '(' array_pair_list ')' { $$ = $3; } + | '[' array_pair_list ']' { $$ = $2; } +; function: T_FUNCTION { $$.u.op.opline_num = CG(zend_lineno); } @@ -1065,6 +1060,8 @@ variable_class_name: dereferencable: variable { $$ = $1; } | '(' expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); } + | combined_scalar { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); } + | T_CONSTANT_ENCAPSED_STRING { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); } ; directly_callable_variable: -- cgit v1.2.1 From ff475e9e763ffc74c8c63d26b3d5c9f37c702904 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 00:37:03 +0200 Subject: Allow arrays + object access for new expressions --- Zend/zend_language_parser.y | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1b2026359c..04455cac9e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -902,7 +902,7 @@ class_name_reference: dynamic_class_name_reference: - simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } + new_variable { $$ = $1; } ; exit_expr: @@ -1104,6 +1104,15 @@ static_member: ; +new_variable: + simple_variable + { zend_do_begin_variable_parse(TSRMLS_C); + fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } + | new_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } + | new_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } + | new_variable T_OBJECT_OPERATOR object_member + { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); } +; dim_offset: /* empty */ { $$.op_type = IS_UNUSED; } -- cgit v1.2.1 From c5920af515c6833c80d8eef28c9727e5c385c250 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 00:40:32 +0200 Subject: Update two tests with new semantics --- Zend/tests/isset_003.phpt | 2 +- Zend/tests/isset_003_2_4.phpt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/tests/isset_003.phpt b/Zend/tests/isset_003.phpt index 4db42a933b..92225b5906 100644 --- a/Zend/tests/isset_003.phpt +++ b/Zend/tests/isset_003.phpt @@ -14,7 +14,7 @@ var_dump(isset($a[0]->a)); var_dump(isset($c[0][1][2]->a->b->c->d)); -var_dump(isset(${$a}->{$b->$c[$d]})); +var_dump(isset(${$a}->{$b->{$c[$d]}})); var_dump(isset($GLOBALS)); diff --git a/Zend/tests/isset_003_2_4.phpt b/Zend/tests/isset_003_2_4.phpt index c05f3e26f4..42d8cc6a08 100644 --- a/Zend/tests/isset_003_2_4.phpt +++ b/Zend/tests/isset_003_2_4.phpt @@ -16,7 +16,7 @@ var_dump(isset($a[0]->a)); var_dump(isset($c[0][1][2]->a->b->c->d)); -var_dump(isset(${$a}->{$b->$c[$d]})); +var_dump(isset(${$a}->{$b->{$c[$d]}})); var_dump(isset($GLOBALS)); -- cgit v1.2.1 From c29d3b6e3e7738573f269f62dc119651a27995a5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 00:48:06 +0200 Subject: Update another test --- Zend/tests/024.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/tests/024.phpt b/Zend/tests/024.phpt index ff35a5c895..f89c49e613 100644 --- a/Zend/tests/024.phpt +++ b/Zend/tests/024.phpt @@ -11,7 +11,7 @@ var_dump($a++); var_dump(++$b); var_dump($a->$b); var_dump($a->$b); -var_dump($a->$b->$c[1]); +var_dump($a->$b->{$c[1]}); ?> --EXPECTF-- -- cgit v1.2.1 From fcf42d817df81c887056ebcab8c6d16f4e987316 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 15:59:54 +0200 Subject: Remove object_stack (mostly) --- Zend/zend.c | 3 --- Zend/zend_compile.c | 18 ------------------ Zend/zend_globals.h | 2 +- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index 841fc38565..aec5b331ee 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1036,7 +1036,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ zend_stack function_call_stack; zend_stack switch_cond_stack; zend_stack foreach_copy_stack; - zend_stack object_stack; zend_stack declare_stack; zend_stack list_stack; zend_stack context_stack; @@ -1192,7 +1191,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ SAVE_STACK(function_call_stack); SAVE_STACK(switch_cond_stack); SAVE_STACK(foreach_copy_stack); - SAVE_STACK(object_stack); SAVE_STACK(declare_stack); SAVE_STACK(list_stack); SAVE_STACK(context_stack); @@ -1218,7 +1216,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ RESTORE_STACK(function_call_stack); RESTORE_STACK(switch_cond_stack); RESTORE_STACK(foreach_copy_stack); - RESTORE_STACK(object_stack); RESTORE_STACK(declare_stack); RESTORE_STACK(list_stack); RESTORE_STACK(context_stack); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a0610b6c32..e8182a6d05 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -194,7 +194,6 @@ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */ zend_stack_init(&CG(function_call_stack), sizeof(zend_function_call_entry)); zend_stack_init(&CG(switch_cond_stack), sizeof(zend_switch_entry)); zend_stack_init(&CG(foreach_copy_stack), sizeof(zend_op)); - zend_stack_init(&CG(object_stack), sizeof(znode)); zend_stack_init(&CG(declare_stack), sizeof(zend_declarables)); CG(active_class_entry) = NULL; zend_llist_init(&CG(list_llist), sizeof(list_llist_element), NULL, 0); @@ -242,7 +241,6 @@ void shutdown_compiler(TSRMLS_D) /* {{{ */ zend_stack_destroy(&CG(function_call_stack)); zend_stack_destroy(&CG(switch_cond_stack)); zend_stack_destroy(&CG(foreach_copy_stack)); - zend_stack_destroy(&CG(object_stack)); zend_stack_destroy(&CG(declare_stack)); zend_stack_destroy(&CG(list_stack)); zend_hash_destroy(&CG(filenames_table)); @@ -5556,22 +5554,6 @@ void zend_do_halt_compiler_register(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_do_push_object(const znode *object TSRMLS_DC) /* {{{ */ -{ - zend_stack_push(&CG(object_stack), object); -} -/* }}} */ - -void zend_do_pop_object(znode *object TSRMLS_DC) /* {{{ */ -{ - if (object) { - znode *tmp = zend_stack_top(&CG(object_stack)); - *object = *tmp; - } - zend_stack_del_top(&CG(object_stack)); -} -/* }}} */ - void zend_do_begin_new_object(znode *new_token, znode *class_type TSRMLS_DC) /* {{{ */ { zend_op *opline; diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 2a29e337de..ee68a7be96 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -73,7 +73,7 @@ struct _zend_compiler_globals { zend_stack bp_stack; zend_stack switch_cond_stack; zend_stack foreach_copy_stack; - zend_stack object_stack; + zend_stack object_stack; /* TODO: remove */ zend_stack declare_stack; zend_class_entry *active_class_entry; -- cgit v1.2.1 From 8a65c3b2343a7a53f2bfac73db7693e81c59a65c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 16:08:38 +0200 Subject: Remove now unnecessary code in begin_method_call --- Zend/zend_compile.c | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e8182a6d05..02698fca18 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1961,35 +1961,22 @@ void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC) /* {{{ */ zend_error_noreturn(E_COMPILE_ERROR, "Cannot call __clone() method on objects - use 'clone $obj' instead"); } - if (last_op->opcode == ZEND_FETCH_OBJ_R) { - if (last_op->op2_type == IS_CONST) { - zval name; - name = CONSTANT(last_op->op2.constant); - if (Z_TYPE(name) != IS_STRING) { - zend_error_noreturn(E_COMPILE_ERROR, "Method name must be a string"); - } - Z_STR(name) = STR_COPY(Z_STR(name)); - FREE_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant); - last_op->op2.constant = - zend_add_func_name_literal(CG(active_op_array), &name TSRMLS_CC); - GET_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant); - } - last_op->opcode = ZEND_INIT_METHOD_CALL; - last_op->result_type = IS_UNUSED; - last_op->result.num = CG(context).nested_calls; - Z_LVAL(left_bracket->u.constant) = ZEND_INIT_FCALL_BY_NAME; - } else { - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_INIT_FCALL_BY_NAME; - opline->result.num = CG(context).nested_calls; - SET_UNUSED(opline->op1); - if (left_bracket->op_type == IS_CONST) { - opline->op2_type = IS_CONST; - opline->op2.constant = zend_add_func_name_literal(CG(active_op_array), &left_bracket->u.constant TSRMLS_CC); - GET_CACHE_SLOT(opline->op2.constant); - } else { - SET_NODE(opline->op2, left_bracket); + /* Convert ZEND_FETCH_OBJ_R to ZEND_INIT_METHOD_CALL */ + last_op->opcode = ZEND_INIT_METHOD_CALL; + last_op->result_type = IS_UNUSED; + last_op->result.num = CG(context).nested_calls; + Z_LVAL(left_bracket->u.constant) = ZEND_INIT_FCALL_BY_NAME; + if (last_op->op2_type == IS_CONST) { + zval name; + name = CONSTANT(last_op->op2.constant); + if (Z_TYPE(name) != IS_STRING) { + zend_error_noreturn(E_COMPILE_ERROR, "Method name must be a string"); } + Z_STR(name) = STR_COPY(Z_STR(name)); + FREE_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant); + last_op->op2.constant = + zend_add_func_name_literal(CG(active_op_array), &name TSRMLS_CC); + GET_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant); } zend_push_function_call_entry(NULL TSRMLS_CC); -- cgit v1.2.1 From f48241f734b7994c69bfd2636169982b6e5c9045 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 16:27:03 +0200 Subject: Generalize static access syntax --- Zend/zend_language_parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 04455cac9e..3257bfff86 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1054,7 +1054,7 @@ rw_variable: ; variable_class_name: - variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$ = $1; } + dereferencable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$ = $1; } ; dereferencable: -- cgit v1.2.1 From 4ec505f9b5b1d64f180d7f13ec8a1363485afc92 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 16:33:52 +0200 Subject: Add two initial tests --- Zend/tests/varSyntax/indirectFcall.phpt | 25 ++++++++++++++++++++++++ Zend/tests/varSyntax/staticMember.phpt | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 Zend/tests/varSyntax/indirectFcall.phpt create mode 100644 Zend/tests/varSyntax/staticMember.phpt diff --git a/Zend/tests/varSyntax/indirectFcall.phpt b/Zend/tests/varSyntax/indirectFcall.phpt new file mode 100644 index 0000000000..e42376a89b --- /dev/null +++ b/Zend/tests/varSyntax/indirectFcall.phpt @@ -0,0 +1,25 @@ +--TEST-- +Indirect function calls +--FILE-- + 'id', 'b' => 'udef'])->a)(); + +?> +--EXPECT-- +int(0) +int(1) +int(2) +int(3) +int(4) +int(5) diff --git a/Zend/tests/varSyntax/staticMember.phpt b/Zend/tests/varSyntax/staticMember.phpt new file mode 100644 index 0000000000..13325bb1c9 --- /dev/null +++ b/Zend/tests/varSyntax/staticMember.phpt @@ -0,0 +1,34 @@ +--TEST-- +Static member access +--FILE-- + +--EXPECT-- +int(0) +int(0) +int(0) +int(0) +int(0) +int(0) +int(0) +int(1) -- cgit v1.2.1 From 64f80b3835aba0d3ad2c17a78e2d6dcf1c0bfc5e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 16:44:53 +0200 Subject: Introduce dereferencable_scalar to simplify future additions --- Zend/zend_language_parser.y | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 3257bfff86..014915f489 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -821,7 +821,6 @@ expr_without_variable: | T_EXIT exit_expr { zend_do_exit(&$$, &$2 TSRMLS_CC); } | '@' { zend_do_begin_silence(&$1 TSRMLS_CC); } expr { zend_do_end_silence(&$1 TSRMLS_CC); $$ = $3; } | scalar { $$ = $1; } - | combined_scalar { $$ = $1; } | '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); } | T_PRINT expr { zend_do_print(&$$, &$2 TSRMLS_CC); } | T_YIELD { zend_do_yield(&$$, NULL, NULL, 0 TSRMLS_CC); } @@ -840,11 +839,6 @@ yield_expr: | T_YIELD expr T_DOUBLE_ARROW variable { zend_do_yield(&$$, &$4, &$2, 1 TSRMLS_CC); } ; -combined_scalar: - T_ARRAY '(' array_pair_list ')' { $$ = $3; } - | '[' array_pair_list ']' { $$ = $2; } -; - function: T_FUNCTION { $$.u.op.opline_num = CG(zend_lineno); } ; @@ -924,10 +918,15 @@ ctor_arguments: ; +dereferencable_scalar: + T_ARRAY '(' array_pair_list ')' { $$ = $3; } + | '[' array_pair_list ']' { $$ = $2; } + | T_CONSTANT_ENCAPSED_STRING { $$ = $1; } +; + common_scalar: T_LNUMBER { $$ = $1; } | T_DNUMBER { $$ = $1; } - | T_CONSTANT_ENCAPSED_STRING { $$ = $1; } | T_LINE { $$ = $1; } | T_FILE { $$ = $1; } | T_DIR { $$ = $1; } @@ -955,6 +954,7 @@ static_scalar_value: | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = zend_ast_create_constant(&$$.u.constant); } | T_ARRAY '(' static_array_pair_list ')' { $$ = $3; } | '[' static_array_pair_list ']' { $$ = $2; } + | T_CONSTANT_ENCAPSED_STRING { $$ = $1; } | static_class_constant { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } | T_CLASS_C { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } | static_operation { $$ = $1; } @@ -1007,6 +1007,7 @@ scalar: | '"' encaps_list '"' { $$ = $2; } | T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = $2; } | T_CLASS_C { if (Z_TYPE($1.u.constant) == IS_CONSTANT) {zend_do_fetch_constant(&$$, NULL, &$1, ZEND_RT, 1 TSRMLS_CC);} else {$$ = $1;} } + | dereferencable_scalar { $$ = $1; } ; @@ -1058,10 +1059,9 @@ variable_class_name: ; dereferencable: - variable { $$ = $1; } - | '(' expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); } - | combined_scalar { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); } - | T_CONSTANT_ENCAPSED_STRING { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); } + variable { $$ = $1; } + | '(' expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); } + | dereferencable_scalar { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); } ; directly_callable_variable: -- cgit v1.2.1 From fd85f77857b38ba0ec2c27a1c27a3e0ebae36410 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 17:02:48 +0200 Subject: Fix previous commit --- Zend/zend_language_parser.y | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 014915f489..4473e3771d 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -946,17 +946,21 @@ static_scalar: /* compile-time evaluated scalars */ static_scalar_value { zend_do_constant_expression(&$$, $1.u.ast TSRMLS_CC); } ; +static_scalar_base: + common_scalar { $$ = $1; } + | T_CONSTANT_ENCAPSED_STRING { $$ = $1; } + | T_CLASS_C { $$ = $1; } + | static_class_name_scalar { $$ = $1; } + | static_class_constant { $$ = $1; } + | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); } + | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); } +; + static_scalar_value: - common_scalar { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } - | static_class_name_scalar { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } - | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); $$.u.ast = zend_ast_create_constant(&$$.u.constant); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = zend_ast_create_constant(&$$.u.constant); } - | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = zend_ast_create_constant(&$$.u.constant); } + static_scalar_base { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } | T_ARRAY '(' static_array_pair_list ')' { $$ = $3; } | '[' static_array_pair_list ']' { $$ = $2; } - | T_CONSTANT_ENCAPSED_STRING { $$ = $1; } - | static_class_constant { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } - | T_CLASS_C { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } | static_operation { $$ = $1; } ; -- cgit v1.2.1 From 64e4c9eff16b082f87e94fc02ec620b85124197d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 17:18:37 +0200 Subject: Support directly calling closure --- Zend/tests/varSyntax/indirectFcall.phpt | 16 +++++++++++++++- Zend/zend_language_parser.y | 12 +++++++++--- Zend/zend_vm_def.h | 4 ++-- Zend/zend_vm_execute.h | 16 ++++++++-------- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Zend/tests/varSyntax/indirectFcall.phpt b/Zend/tests/varSyntax/indirectFcall.phpt index e42376a89b..4499f5ab64 100644 --- a/Zend/tests/varSyntax/indirectFcall.phpt +++ b/Zend/tests/varSyntax/indirectFcall.phpt @@ -13,7 +13,17 @@ id('id')('id')('var_dump')(3); id()()('var_dump')(4); id(['udef', 'id'])[1]()('var_dump')(5); -// (id((object) ['a' => 'id', 'b' => 'udef'])->a)(); +(id((object) ['a' => 'id', 'b' => 'udef'])->a)()()()()('var_dump')(6); + +$id = function($x) { return $x; }; + +$id($id)('var_dump')(7); + +(function($x) { return $x; })('id')('var_dump')(8); + +($f = function($x = null) use (&$f) { + return $x ?: $f; +})()()()('var_dump')(9); ?> --EXPECT-- @@ -23,3 +33,7 @@ int(2) int(3) int(4) int(5) +int(6) +int(7) +int(8) +int(9) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 4473e3771d..d6b0f874c3 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -870,7 +870,7 @@ function_call: function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { fetch_simple_variable_ex(&$$, &$3, 0, ZEND_FETCH_R TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$$ TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | directly_callable_variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); } + | callable_expr { zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} ; @@ -1068,7 +1068,13 @@ dereferencable: | dereferencable_scalar { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); } ; -directly_callable_variable: +callable_expr: + callable_variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$ = $1; } + | '(' expr ')' { $$ = $2; } + | dereferencable_scalar { $$ = $1; } +; + +callable_variable: simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); @@ -1090,7 +1096,7 @@ directly_callable_variable: ; variable: - directly_callable_variable { $$ = $1; } + callable_variable { $$ = $1; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } | dereferencable T_OBJECT_OPERATOR object_member { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 0b5dde1599..20d350a892 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2646,7 +2646,7 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV) CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (OP2_TYPE != IS_CONST && OP2_TYPE != IS_TMP_VAR && + } else if (OP2_TYPE != IS_CONST && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) { @@ -2657,7 +2657,7 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV) call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ call->fbc->common.prototype = (zend_function*)function_name_ptr; - } else { + } else if (OP2_TYPE == IS_CV) { FREE_OP2(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a5b678c9d2..c2e103965a 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1515,7 +1515,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (IS_CONST != IS_CONST && IS_CONST != IS_TMP_VAR && + } else if (IS_CONST != IS_CONST && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) { @@ -1526,7 +1526,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ call->fbc->common.prototype = (zend_function*)function_name_ptr; - } else { + } else if (IS_CONST == IS_CV) { } @@ -1846,7 +1846,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (IS_TMP_VAR != IS_CONST && IS_TMP_VAR != IS_TMP_VAR && + } else if (IS_TMP_VAR != IS_CONST && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) { @@ -1857,7 +1857,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ call->fbc->common.prototype = (zend_function*)function_name_ptr; - } else { + } else if (IS_TMP_VAR == IS_CV) { zval_dtor(free_op2.var); } @@ -2035,7 +2035,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (IS_VAR != IS_CONST && IS_VAR != IS_TMP_VAR && + } else if (IS_VAR != IS_CONST && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) { @@ -2046,7 +2046,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ call->fbc->common.prototype = (zend_function*)function_name_ptr; - } else { + } else if (IS_VAR == IS_CV) { zval_ptr_dtor_nogc(free_op2.var); } @@ -2261,7 +2261,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (IS_CV != IS_CONST && IS_CV != IS_TMP_VAR && + } else if (IS_CV != IS_CONST && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) { @@ -2272,7 +2272,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ call->fbc->common.prototype = (zend_function*)function_name_ptr; - } else { + } else if (IS_CV == IS_CV) { } -- cgit v1.2.1 From c53a7ea4e5e70e6f748f5c13f48c24843a0bac45 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 17:36:22 +0200 Subject: Property handle calls on [] and '' consts/tmps --- Zend/tests/varSyntax/indirectFcall.phpt | 14 ++++++++++++++ Zend/zend_compile.c | 2 +- Zend/zend_vm_def.h | 5 ++--- Zend/zend_vm_execute.h | 20 ++++++++------------ 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/Zend/tests/varSyntax/indirectFcall.phpt b/Zend/tests/varSyntax/indirectFcall.phpt index 4499f5ab64..4cc5c1171a 100644 --- a/Zend/tests/varSyntax/indirectFcall.phpt +++ b/Zend/tests/varSyntax/indirectFcall.phpt @@ -25,6 +25,16 @@ $id($id)('var_dump')(7); return $x ?: $f; })()()()('var_dump')(9); +class Test { + public static function id($x = [__CLASS__, 'id']) { return $x; } +} + +$obj = new Test; +[$obj, 'id']()('id')($id)('var_dump')(10); +['Test', 'id']()()('var_dump')(11); +'id'()('id')('var_dump')(12); +('i' . 'd')()('var_dump')(13); + ?> --EXPECT-- int(0) @@ -37,3 +47,7 @@ int(6) int(7) int(8) int(9) +int(10) +int(11) +int(12) +int(13) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 02698fca18..7040ed6c5a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2018,7 +2018,7 @@ void zend_do_begin_dynamic_function_call(znode *function_name, int ns_call TSRML opline->opcode = ZEND_INIT_FCALL_BY_NAME; opline->result.num = CG(context).nested_calls; SET_UNUSED(opline->op1); - if (function_name->op_type == IS_CONST) { + if (function_name->op_type == IS_CONST && Z_TYPE(function_name->u.constant) == IS_STRING) { opline->op2_type = IS_CONST; opline->op2.constant = zend_add_func_name_literal(CG(active_op_array), &function_name->u.constant TSRMLS_CC); GET_CACHE_SLOT(opline->op2.constant); diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 20d350a892..2bd0280900 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2595,7 +2595,7 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV) zval *function_name_ptr, *function_name, *func; call_slot *call = EX(call_slots) + opline->result.num; - if (OP2_TYPE == IS_CONST) { + if (OP2_TYPE == IS_CONST && Z_TYPE_P(opline->op2.zv) == IS_STRING) { function_name_ptr = function_name = (zval*)(opline->op2.zv+1); if (CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv))) { call->fbc = CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv)); @@ -2667,8 +2667,7 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV) CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (OP2_TYPE != IS_CONST && - EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && + } else if (EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) { zval *obj; zval *method; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index c2e103965a..24f016066c 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1465,7 +1465,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE zval *function_name_ptr, *function_name, *func; call_slot *call = EX(call_slots) + opline->result.num; - if (IS_CONST == IS_CONST) { + if (IS_CONST == IS_CONST && Z_TYPE_P(opline->op2.zv) == IS_STRING) { function_name_ptr = function_name = (zval*)(opline->op2.zv+1); if (CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv))) { call->fbc = CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv)); @@ -1536,8 +1536,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (IS_CONST != IS_CONST && - EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && + } else if (EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) { zval *obj; zval *method; @@ -1795,7 +1794,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H zval *function_name_ptr, *function_name, *func; call_slot *call = EX(call_slots) + opline->result.num; - if (IS_TMP_VAR == IS_CONST) { + if (IS_TMP_VAR == IS_CONST && Z_TYPE_P(opline->op2.zv) == IS_STRING) { function_name_ptr = function_name = (zval*)(opline->op2.zv+1); if (CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv))) { call->fbc = CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv)); @@ -1867,8 +1866,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (IS_TMP_VAR != IS_CONST && - EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && + } else if (EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) { zval *obj; zval *method; @@ -1984,7 +1982,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H zval *function_name_ptr, *function_name, *func; call_slot *call = EX(call_slots) + opline->result.num; - if (IS_VAR == IS_CONST) { + if (IS_VAR == IS_CONST && Z_TYPE_P(opline->op2.zv) == IS_STRING) { function_name_ptr = function_name = (zval*)(opline->op2.zv+1); if (CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv))) { call->fbc = CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv)); @@ -2056,8 +2054,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (IS_VAR != IS_CONST && - EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && + } else if (EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) { zval *obj; zval *method; @@ -2211,7 +2208,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA zval *function_name_ptr, *function_name, *func; call_slot *call = EX(call_slots) + opline->result.num; - if (IS_CV == IS_CONST) { + if (IS_CV == IS_CONST && Z_TYPE_P(opline->op2.zv) == IS_STRING) { function_name_ptr = function_name = (zval*)(opline->op2.zv+1); if (CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv))) { call->fbc = CACHED_PTR(Z_CACHE_SLOT_P(opline->op2.zv)); @@ -2282,8 +2279,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); - } else if (IS_CV != IS_CONST && - EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && + } else if (EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) { zval *obj; zval *method; -- cgit v1.2.1 From f0ac7f7d7b694a4c567d190b79377219a1994f62 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 17:51:22 +0200 Subject: Properly handle property read on const/tmp --- Zend/tests/varSyntax/parenthesesDeref.phpt | 20 ++ Zend/tests/varSyntax/propertyOfStringError.phpt | 10 + Zend/zend_vm_def.h | 4 +- Zend/zend_vm_execute.h | 316 +++++++++++++++++++++++- 4 files changed, 340 insertions(+), 10 deletions(-) create mode 100644 Zend/tests/varSyntax/parenthesesDeref.phpt create mode 100644 Zend/tests/varSyntax/propertyOfStringError.phpt diff --git a/Zend/tests/varSyntax/parenthesesDeref.phpt b/Zend/tests/varSyntax/parenthesesDeref.phpt new file mode 100644 index 0000000000..0ebfe9c5d7 --- /dev/null +++ b/Zend/tests/varSyntax/parenthesesDeref.phpt @@ -0,0 +1,20 @@ +--TEST-- +Dereferencing expression parentheses +--FILE-- + 0, 'b' => 1])->b); + +$obj = (object) ['a' => 0, 'b' => ['var_dump', 1]]; +(clone $obj)->b[0](1); + +?> +--EXPECT-- +int(1) +int(1) +int(1) +int(1) diff --git a/Zend/tests/varSyntax/propertyOfStringError.phpt b/Zend/tests/varSyntax/propertyOfStringError.phpt new file mode 100644 index 0000000000..85abc5849a --- /dev/null +++ b/Zend/tests/varSyntax/propertyOfStringError.phpt @@ -0,0 +1,10 @@ +--TEST-- +Cannot take property of a string +--FILE-- +bar; + +?> +--EXPECTF-- +Notice: Trying to get property of non-object in %s on line %d diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 2bd0280900..aaf1e494bb 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1386,7 +1386,7 @@ ZEND_VM_HANDLER(96, ZEND_FETCH_DIM_UNSET, VAR|CV, CONST|TMP|VAR|CV) ZEND_VM_NEXT_OPCODE(); } -ZEND_VM_HELPER(zend_fetch_property_address_read_helper, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +ZEND_VM_HELPER(zend_fetch_property_address_read_helper, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) { USE_OPLINE zend_free_op free_op1; @@ -1419,7 +1419,7 @@ ZEND_VM_HELPER(zend_fetch_property_address_read_helper, VAR|UNUSED|CV, CONST|TMP ZEND_VM_NEXT_OPCODE(); } -ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) { ZEND_VM_DISPATCH_TO_HELPER(zend_fetch_property_address_read_helper); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 24f016066c..d2b8f57d79 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -3725,6 +3725,43 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_ ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = opline->op2.zv; + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + zend_error(E_NOTICE, "Trying to get property of non-object"); + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_R, ((IS_CONST == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_fetch_property_address_read_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -4704,6 +4741,44 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HA ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + zend_free_op free_op2; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + zend_error(E_NOTICE, "Trying to get property of non-object"); + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_R, ((IS_TMP_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_dtor(free_op2.var); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_fetch_property_address_read_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -5532,6 +5607,44 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HA ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + zend_free_op free_op2; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + zend_error(E_NOTICE, "Trying to get property of non-object"); + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_R, ((IS_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_ptr_dtor_nogc(free_op2.var); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_fetch_property_address_read_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -7039,6 +7152,43 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HAN ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + zend_error(E_NOTICE, "Trying to get property of non-object"); + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_R, ((IS_CV == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_fetch_property_address_read_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -8896,6 +9046,43 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HA ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = opline->op2.zv; + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + zend_error(E_NOTICE, "Trying to get property of non-object"); + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_R, ((IS_CONST == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_fetch_property_address_read_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -9743,6 +9930,44 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HAND ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + zend_free_op free_op2; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + zend_error(E_NOTICE, "Trying to get property of non-object"); + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_R, ((IS_TMP_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_dtor(free_op2.var); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_fetch_property_address_read_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + static int ZEND_FASTCALL ZEND_ADD_VAR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -10571,6 +10796,44 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HAND ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + zend_free_op free_op2; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + zend_error(E_NOTICE, "Trying to get property of non-object"); + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_R, ((IS_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_ptr_dtor_nogc(free_op2.var); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_fetch_property_address_read_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + static int ZEND_FASTCALL ZEND_ADD_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -11946,6 +12209,43 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDL ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + zend_error(E_NOTICE, "Trying to get property of non-object"); + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_R, ((IS_CV == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_fetch_property_address_read_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + static int ZEND_FASTCALL ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -41965,16 +42265,16 @@ void zend_init_opcodes_handlers(void) ZEND_FETCH_DIM_R_SPEC_CV_VAR_HANDLER, ZEND_NULL_HANDLER, ZEND_FETCH_DIM_R_SPEC_CV_CV_HANDLER, + ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_HANDLER, + ZEND_FETCH_OBJ_R_SPEC_CONST_TMP_HANDLER, + ZEND_FETCH_OBJ_R_SPEC_CONST_VAR_HANDLER, ZEND_NULL_HANDLER, + ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HANDLER, + ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HANDLER, + ZEND_FETCH_OBJ_R_SPEC_TMP_TMP_HANDLER, + ZEND_FETCH_OBJ_R_SPEC_TMP_VAR_HANDLER, ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, + ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLER, ZEND_FETCH_OBJ_R_SPEC_VAR_CONST_HANDLER, ZEND_FETCH_OBJ_R_SPEC_VAR_TMP_HANDLER, ZEND_FETCH_OBJ_R_SPEC_VAR_VAR_HANDLER, -- cgit v1.2.1 From 72b5e0cac00bac0b2253c4324d44eb4438a103de Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 18:18:20 +0200 Subject: Add another static member access test --- Zend/tests/varSyntax/staticMember.phpt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Zend/tests/varSyntax/staticMember.phpt b/Zend/tests/varSyntax/staticMember.phpt index 13325bb1c9..22a1fa2b13 100644 --- a/Zend/tests/varSyntax/staticMember.phpt +++ b/Zend/tests/varSyntax/staticMember.phpt @@ -6,6 +6,7 @@ Static member access class A { public static $b = 0; public static $c = [0, 1]; + public static $A_str = 'A'; } $A_str = 'A'; @@ -21,6 +22,7 @@ var_dump('A'::$b); var_dump('A'[0]::$b); var_dump(A::$$b_str); var_dump(A::$$c_str[1]); +var_dump(A::$A_str::$b); ?> --EXPECT-- @@ -32,3 +34,4 @@ int(0) int(0) int(0) int(1) +int(0) -- cgit v1.2.1 From 5c2120b6cf0d4a92a29dc7c38b407ee5ed213ddf Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 19:41:39 +0200 Subject: Forbid writing to temporary expressions --- Zend/tests/varSyntax/writeToTempExpr.phpt | 10 +++++ Zend/zend_compile.c | 62 ++++++++++++++++++++++--------- Zend/zend_language_parser.y | 4 +- 3 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 Zend/tests/varSyntax/writeToTempExpr.phpt diff --git a/Zend/tests/varSyntax/writeToTempExpr.phpt b/Zend/tests/varSyntax/writeToTempExpr.phpt new file mode 100644 index 0000000000..daeaf24938 --- /dev/null +++ b/Zend/tests/varSyntax/writeToTempExpr.phpt @@ -0,0 +1,10 @@ +--TEST-- +Writing to a temporary expression is not allowed +--FILE-- + +--EXPECTF-- +Fatal error: Cannot use temporary expression in write context in %s on line %d diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7040ed6c5a..f5efd84144 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1234,6 +1234,22 @@ void zend_do_begin_variable_parse(TSRMLS_D) /* {{{ */ } /* }}} */ +static zend_bool zend_can_parse_variable_for_write(znode *variable TSRMLS_DC) /* {{{ */ +{ + zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); + zend_llist_element *le = fetch_list_ptr->head; + for (le = fetch_list_ptr->head; le; le = le->next) { + zend_op *opline = (zend_op *) le->data; + if ((opline->opcode != ZEND_SEPARATE && opline->opcode != ZEND_FETCH_W) + && (opline->op1_type == IS_TMP_VAR || opline->op1_type == IS_CONST) + ) { + return 0; + } + } + return 1; +} +/* }}} */ + void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS_DC) /* {{{ */ { zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); @@ -1286,6 +1302,13 @@ void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS opline->op1_type = IS_CV; opline->op1.var = CG(active_op_array)->this_var; } + if (opline->opcode != ZEND_FETCH_W + && (opline->op1_type == IS_TMP_VAR || opline->op1_type == IS_CONST) + && (type != BP_VAR_R && type != BP_VAR_IS && type != BP_VAR_FUNC_ARG) + ) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot use temporary expression in write context"); + } switch (type) { case BP_VAR_R: if (opline->opcode == ZEND_FETCH_DIM_W && opline->op2_type == IS_UNUSED) { @@ -6373,18 +6396,19 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno zend_bool is_variable; zend_op dummy_opline; + open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); if (variable) { - if (zend_is_function_or_method_call(array)) { + if (zend_is_function_or_method_call(array) + || !zend_can_parse_variable_for_write(array TSRMLS_CC) + ) { is_variable = 0; + zend_do_end_variable_parse(array, BP_VAR_R, 0 TSRMLS_CC); } else { is_variable = 1; + zend_do_end_variable_parse(array, BP_VAR_W, 0 TSRMLS_CC); } - /* save the location of FETCH_W instruction(s) */ - open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); - zend_do_end_variable_parse(array, BP_VAR_W, 0 TSRMLS_CC); } else { is_variable = 0; - open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); } /* save the location of FE_RESET */ @@ -6464,19 +6488,21 @@ void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token CG(active_op_array)->opcodes[foreach_token->u.op.opline_num].extended_value |= ZEND_FE_RESET_REFERENCE; } else { zend_op *fetch = &CG(active_op_array)->opcodes[foreach_token->u.op.opline_num]; - zend_op *end = &CG(active_op_array)->opcodes[open_brackets_token->u.op.opline_num]; - - /* Change "write context" into "read context" */ - fetch->extended_value = 0; /* reset ZEND_FE_RESET_VARIABLE */ - while (fetch != end) { - --fetch; - if (fetch->opcode == ZEND_FETCH_DIM_W && fetch->op2_type == IS_UNUSED) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading"); - } - if (fetch->opcode == ZEND_SEPARATE) { - MAKE_NOP(fetch); - } else { - fetch->opcode -= 3; /* FETCH_W -> FETCH_R */ + if (fetch->extended_value == ZEND_FE_RESET_VARIABLE) { + zend_op *end = &CG(active_op_array)->opcodes[open_brackets_token->u.op.opline_num]; + + /* Change "write context" into "read context" */ + fetch->extended_value = 0; /* reset ZEND_FE_RESET_VARIABLE */ + while (fetch != end) { + --fetch; + if (fetch->opcode == ZEND_FETCH_DIM_W && fetch->op2_type == IS_UNUSED) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading"); + } + if (fetch->opcode == ZEND_SEPARATE) { + MAKE_NOP(fetch); + } else { + fetch->opcode -= 3; /* FETCH_W -> FETCH_R */ + } } } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index d6b0f874c3..68ac2b7076 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1064,8 +1064,8 @@ variable_class_name: dereferencable: variable { $$ = $1; } - | '(' expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); } - | dereferencable_scalar { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); } + | '(' expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); $$.EA = 0; } + | dereferencable_scalar { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); $$.EA = 0; } ; callable_expr: -- cgit v1.2.1 From 96b32ec532feb256e503a67bdc4dfe6a2ce4d281 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 20:05:03 +0200 Subject: Support isset() on temporaries --- Zend/tests/varSyntax/issetOnTemp.phpt | 26 + Zend/zend_vm_def.h | 12 +- Zend/zend_vm_execute.h | 1564 ++++++++++++++++++++++++++++++++- 3 files changed, 1564 insertions(+), 38 deletions(-) create mode 100644 Zend/tests/varSyntax/issetOnTemp.phpt diff --git a/Zend/tests/varSyntax/issetOnTemp.phpt b/Zend/tests/varSyntax/issetOnTemp.phpt new file mode 100644 index 0000000000..cd7bc006cd --- /dev/null +++ b/Zend/tests/varSyntax/issetOnTemp.phpt @@ -0,0 +1,26 @@ +--TEST-- +isset() can be used on dereferences of temporary expressions +--FILE-- + 'b'])->a)); +var_dump(isset(['a' => 'b']->a)); +var_dump(isset("str"->a)); +var_dump(isset((['a' => 'b'] + [])->a)); +var_dump(isset((['a' => 'b'] + [])->a->b)); + +?> +--EXPECT-- +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(false) +bool(false) +bool(false) +bool(false) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index aaf1e494bb..b1993f99a3 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1317,7 +1317,7 @@ ZEND_VM_HANDLER(87, ZEND_FETCH_DIM_RW, VAR|CV, CONST|TMP|VAR|UNUSED|CV) ZEND_VM_NEXT_OPCODE(); } -ZEND_VM_HANDLER(90, ZEND_FETCH_DIM_IS, VAR|CV, CONST|TMP|VAR|CV) +ZEND_VM_HANDLER(90, ZEND_FETCH_DIM_IS, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) { USE_OPLINE zend_free_op free_op1, free_op2; @@ -1473,7 +1473,7 @@ ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, VAR|UNUSED|CV, CONST|TMP|VAR|CV) ZEND_VM_NEXT_OPCODE(); } -ZEND_VM_HANDLER(91, ZEND_FETCH_OBJ_IS, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +ZEND_VM_HANDLER(91, ZEND_FETCH_OBJ_IS, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) { USE_OPLINE zend_free_op free_op1; @@ -4627,7 +4627,7 @@ ZEND_VM_HANDLER(114, ZEND_ISSET_ISEMPTY_VAR, CONST|TMP|VAR|CV, UNUSED|CONST|VAR) ZEND_VM_NEXT_OPCODE(); } -ZEND_VM_HANDLER(115, ZEND_ISSET_ISEMPTY_DIM_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +ZEND_VM_HANDLER(115, ZEND_ISSET_ISEMPTY_DIM_OBJ, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) { USE_OPLINE zend_free_op free_op1, free_op2; @@ -4731,12 +4731,12 @@ ZEND_VM_C_LABEL(str_index_prop): FREE_OP2(); ZVAL_BOOL(EX_VAR(opline->result.var), result); - FREE_OP1_IF_VAR(); + FREE_OP1(); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } -ZEND_VM_HANDLER(148, ZEND_ISSET_ISEMPTY_PROP_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +ZEND_VM_HANDLER(148, ZEND_ISSET_ISEMPTY_PROP_OBJ, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) { USE_OPLINE zend_free_op free_op1, free_op2; @@ -4764,7 +4764,7 @@ ZEND_VM_HANDLER(148, ZEND_ISSET_ISEMPTY_PROP_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|C FREE_OP2(); ZVAL_BOOL(EX_VAR(opline->result.var), result); - FREE_OP1_IF_VAR(); + FREE_OP1(); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index d2b8f57d79..fd9247ffc2 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -3725,6 +3725,21 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_ ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + + SAVE_OPLINE(); + container = opline->op1.zv; + zend_fetch_dimension_address_read_IS(EX_VAR(opline->result.var), container, opline->op2.zv, IS_CONST TSRMLS_CC); + + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -3762,6 +3777,37 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_ return zend_fetch_property_address_read_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = opline->op2.zv; + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_IS, ((IS_CONST == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -4271,6 +4317,146 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_CONST_HANDLER(ZEND_O ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + int result; + ulong hval; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = opline->op2.zv; + + if (Z_TYPE_P(container) == IS_ARRAY) { + HashTable *ht = Z_ARRVAL_P(container); + zval *value = NULL; + zend_string *str; + +isset_again: + switch (Z_TYPE_P(offset)) { + case IS_DOUBLE: + hval = zend_dval_to_lval(Z_DVAL_P(offset)); + goto num_index_prop; + case IS_LONG: + hval = Z_LVAL_P(offset); +num_index_prop: + value = zend_hash_index_find(ht, hval); + break; + case IS_STRING: + str = Z_STR_P(offset); + if (IS_CONST != IS_CONST) { + ZEND_HANDLE_NUMERIC_EX(str->val, str->len+1, hval, goto num_index_prop); + } +str_index_prop: + value = zend_hash_find_ind(ht, str); + break; + case IS_NULL: + str = STR_EMPTY_ALLOC(); + goto str_index_prop; + break; + case IS_FALSE: + hval = 0; + goto num_index_prop; + case IS_TRUE: + hval = 0; + goto num_index_prop; + case IS_RESOURCE: + hval = Z_RES_HANDLE_P(offset); + goto num_index_prop; + case IS_REFERENCE: + offset = Z_REFVAL_P(offset); + goto isset_again; + break; + default: + zend_error(E_WARNING, "Illegal offset type in isset or empty"); + break; + } + + if (opline->extended_value & ZEND_ISSET) { + /* > IS_NULL means not IS_UNDEF and not IS_NULL */ + result = (value != NULL && Z_TYPE_P(value) > IS_NULL); + } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { + result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); + } + } else if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_dimension) { + result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0 TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check element of non-array"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else if (Z_TYPE_P(container) == IS_STRING) { /* string offsets */ + zval tmp; + + result = 0; + if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { + if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ + || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ + && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { + ZVAL_DUP(&tmp, offset); + convert_to_long(&tmp); + offset = &tmp; + } + } + if (Z_TYPE_P(offset) == IS_LONG) { + if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { + if ((opline->extended_value & ZEND_ISSET) || + Z_STRVAL_P(container)[offset->value.lval] != '0') { + result = 1; + } + } + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + ZVAL_BOOL(EX_VAR(opline->result.var), result); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + int result; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = opline->op2.zv; + + if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_property) { + result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISSET) == 0, ((IS_CONST == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1) TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check property of non-object"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + ZVAL_BOOL(EX_VAR(opline->result.var), result); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_DECLARE_CONST_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -4741,6 +4927,21 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HA ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op2; + zval *container; + + SAVE_OPLINE(); + container = opline->op1.zv; + zend_fetch_dimension_address_read_IS(EX_VAR(opline->result.var), container, _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_TMP_VAR TSRMLS_CC); + zval_dtor(free_op2.var); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -4779,6 +4980,38 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HA return zend_fetch_property_address_read_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + zend_free_op free_op2; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_IS, ((IS_TMP_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_dtor(free_op2.var); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -5024,6 +5257,148 @@ static int ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HAN } } +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op2; + zval *container; + int result; + ulong hval; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_ARRAY) { + HashTable *ht = Z_ARRVAL_P(container); + zval *value = NULL; + zend_string *str; + +isset_again: + switch (Z_TYPE_P(offset)) { + case IS_DOUBLE: + hval = zend_dval_to_lval(Z_DVAL_P(offset)); + goto num_index_prop; + case IS_LONG: + hval = Z_LVAL_P(offset); +num_index_prop: + value = zend_hash_index_find(ht, hval); + break; + case IS_STRING: + str = Z_STR_P(offset); + if (IS_TMP_VAR != IS_CONST) { + ZEND_HANDLE_NUMERIC_EX(str->val, str->len+1, hval, goto num_index_prop); + } +str_index_prop: + value = zend_hash_find_ind(ht, str); + break; + case IS_NULL: + str = STR_EMPTY_ALLOC(); + goto str_index_prop; + break; + case IS_FALSE: + hval = 0; + goto num_index_prop; + case IS_TRUE: + hval = 0; + goto num_index_prop; + case IS_RESOURCE: + hval = Z_RES_HANDLE_P(offset); + goto num_index_prop; + case IS_REFERENCE: + offset = Z_REFVAL_P(offset); + goto isset_again; + break; + default: + zend_error(E_WARNING, "Illegal offset type in isset or empty"); + break; + } + + if (opline->extended_value & ZEND_ISSET) { + /* > IS_NULL means not IS_UNDEF and not IS_NULL */ + result = (value != NULL && Z_TYPE_P(value) > IS_NULL); + } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { + result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); + } + } else if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_dimension) { + result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0 TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check element of non-array"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else if (Z_TYPE_P(container) == IS_STRING) { /* string offsets */ + zval tmp; + + result = 0; + if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { + if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ + || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ + && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { + ZVAL_DUP(&tmp, offset); + convert_to_long(&tmp); + offset = &tmp; + } + } + if (Z_TYPE_P(offset) == IS_LONG) { + if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { + if ((opline->extended_value & ZEND_ISSET) || + Z_STRVAL_P(container)[offset->value.lval] != '0') { + result = 1; + } + } + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + zval_dtor(free_op2.var); + ZVAL_BOOL(EX_VAR(opline->result.var), result); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op2; + zval *container; + int result; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_property) { + result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISSET) == 0, ((IS_TMP_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1) TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check property of non-object"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + zval_dtor(free_op2.var); + ZVAL_BOOL(EX_VAR(opline->result.var), result); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_YIELD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -5607,6 +5982,21 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HA ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op2; + zval *container; + + SAVE_OPLINE(); + container = opline->op1.zv; + zend_fetch_dimension_address_read_IS(EX_VAR(opline->result.var), container, _get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_VAR TSRMLS_CC); + zval_ptr_dtor_nogc(free_op2.var); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -5645,6 +6035,38 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HA return zend_fetch_property_address_read_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + zend_free_op free_op2; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_IS, ((IS_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_ptr_dtor_nogc(free_op2.var); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -6041,6 +6463,148 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_VAR_HANDLER(ZEND_OPC ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op2; + zval *container; + int result; + ulong hval; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_ARRAY) { + HashTable *ht = Z_ARRVAL_P(container); + zval *value = NULL; + zend_string *str; + +isset_again: + switch (Z_TYPE_P(offset)) { + case IS_DOUBLE: + hval = zend_dval_to_lval(Z_DVAL_P(offset)); + goto num_index_prop; + case IS_LONG: + hval = Z_LVAL_P(offset); +num_index_prop: + value = zend_hash_index_find(ht, hval); + break; + case IS_STRING: + str = Z_STR_P(offset); + if (IS_VAR != IS_CONST) { + ZEND_HANDLE_NUMERIC_EX(str->val, str->len+1, hval, goto num_index_prop); + } +str_index_prop: + value = zend_hash_find_ind(ht, str); + break; + case IS_NULL: + str = STR_EMPTY_ALLOC(); + goto str_index_prop; + break; + case IS_FALSE: + hval = 0; + goto num_index_prop; + case IS_TRUE: + hval = 0; + goto num_index_prop; + case IS_RESOURCE: + hval = Z_RES_HANDLE_P(offset); + goto num_index_prop; + case IS_REFERENCE: + offset = Z_REFVAL_P(offset); + goto isset_again; + break; + default: + zend_error(E_WARNING, "Illegal offset type in isset or empty"); + break; + } + + if (opline->extended_value & ZEND_ISSET) { + /* > IS_NULL means not IS_UNDEF and not IS_NULL */ + result = (value != NULL && Z_TYPE_P(value) > IS_NULL); + } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { + result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); + } + } else if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_dimension) { + result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0 TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check element of non-array"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else if (Z_TYPE_P(container) == IS_STRING) { /* string offsets */ + zval tmp; + + result = 0; + if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { + if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ + || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ + && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { + ZVAL_DUP(&tmp, offset); + convert_to_long(&tmp); + offset = &tmp; + } + } + if (Z_TYPE_P(offset) == IS_LONG) { + if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { + if ((opline->extended_value & ZEND_ISSET) || + Z_STRVAL_P(container)[offset->value.lval] != '0') { + result = 1; + } + } + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + zval_ptr_dtor_nogc(free_op2.var); + ZVAL_BOOL(EX_VAR(opline->result.var), result); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op2; + zval *container; + int result; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_property) { + result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISSET) == 0, ((IS_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1) TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check property of non-object"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + zval_ptr_dtor_nogc(free_op2.var); + ZVAL_BOOL(EX_VAR(opline->result.var), result); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_YIELD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -7152,6 +7716,21 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HAN ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + + SAVE_OPLINE(); + container = opline->op1.zv; + zend_fetch_dimension_address_read_IS(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC), IS_CV TSRMLS_CC); + + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -7189,6 +7768,37 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HAN return zend_fetch_property_address_read_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_IS, ((IS_CV == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -7486,6 +8096,146 @@ static int ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HAND } } +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + int result; + ulong hval; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_ARRAY) { + HashTable *ht = Z_ARRVAL_P(container); + zval *value = NULL; + zend_string *str; + +isset_again: + switch (Z_TYPE_P(offset)) { + case IS_DOUBLE: + hval = zend_dval_to_lval(Z_DVAL_P(offset)); + goto num_index_prop; + case IS_LONG: + hval = Z_LVAL_P(offset); +num_index_prop: + value = zend_hash_index_find(ht, hval); + break; + case IS_STRING: + str = Z_STR_P(offset); + if (IS_CV != IS_CONST) { + ZEND_HANDLE_NUMERIC_EX(str->val, str->len+1, hval, goto num_index_prop); + } +str_index_prop: + value = zend_hash_find_ind(ht, str); + break; + case IS_NULL: + str = STR_EMPTY_ALLOC(); + goto str_index_prop; + break; + case IS_FALSE: + hval = 0; + goto num_index_prop; + case IS_TRUE: + hval = 0; + goto num_index_prop; + case IS_RESOURCE: + hval = Z_RES_HANDLE_P(offset); + goto num_index_prop; + case IS_REFERENCE: + offset = Z_REFVAL_P(offset); + goto isset_again; + break; + default: + zend_error(E_WARNING, "Illegal offset type in isset or empty"); + break; + } + + if (opline->extended_value & ZEND_ISSET) { + /* > IS_NULL means not IS_UNDEF and not IS_NULL */ + result = (value != NULL && Z_TYPE_P(value) > IS_NULL); + } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { + result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); + } + } else if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_dimension) { + result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0 TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check element of non-array"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else if (Z_TYPE_P(container) == IS_STRING) { /* string offsets */ + zval tmp; + + result = 0; + if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { + if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ + || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ + && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { + ZVAL_DUP(&tmp, offset); + convert_to_long(&tmp); + offset = &tmp; + } + } + if (Z_TYPE_P(offset) == IS_LONG) { + if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { + if ((opline->extended_value & ZEND_ISSET) || + Z_STRVAL_P(container)[offset->value.lval] != '0') { + result = 1; + } + } + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + ZVAL_BOOL(EX_VAR(opline->result.var), result); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + + zval *container; + int result; + zval *offset; + + SAVE_OPLINE(); + container = opline->op1.zv; + offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_property) { + result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISSET) == 0, ((IS_CV == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1) TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check property of non-object"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + ZVAL_BOOL(EX_VAR(opline->result.var), result); + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_YIELD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -9046,6 +9796,21 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HA ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + zend_fetch_dimension_address_read_IS(EX_VAR(opline->result.var), container, opline->op2.zv, IS_CONST TSRMLS_CC); + + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -9083,6 +9848,37 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HA return zend_fetch_property_address_read_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = opline->op2.zv; + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_IS, ((IS_CONST == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -9493,6 +10289,146 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPC ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + int result; + ulong hval; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = opline->op2.zv; + + if (Z_TYPE_P(container) == IS_ARRAY) { + HashTable *ht = Z_ARRVAL_P(container); + zval *value = NULL; + zend_string *str; + +isset_again: + switch (Z_TYPE_P(offset)) { + case IS_DOUBLE: + hval = zend_dval_to_lval(Z_DVAL_P(offset)); + goto num_index_prop; + case IS_LONG: + hval = Z_LVAL_P(offset); +num_index_prop: + value = zend_hash_index_find(ht, hval); + break; + case IS_STRING: + str = Z_STR_P(offset); + if (IS_CONST != IS_CONST) { + ZEND_HANDLE_NUMERIC_EX(str->val, str->len+1, hval, goto num_index_prop); + } +str_index_prop: + value = zend_hash_find_ind(ht, str); + break; + case IS_NULL: + str = STR_EMPTY_ALLOC(); + goto str_index_prop; + break; + case IS_FALSE: + hval = 0; + goto num_index_prop; + case IS_TRUE: + hval = 0; + goto num_index_prop; + case IS_RESOURCE: + hval = Z_RES_HANDLE_P(offset); + goto num_index_prop; + case IS_REFERENCE: + offset = Z_REFVAL_P(offset); + goto isset_again; + break; + default: + zend_error(E_WARNING, "Illegal offset type in isset or empty"); + break; + } + + if (opline->extended_value & ZEND_ISSET) { + /* > IS_NULL means not IS_UNDEF and not IS_NULL */ + result = (value != NULL && Z_TYPE_P(value) > IS_NULL); + } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { + result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); + } + } else if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_dimension) { + result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0 TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check element of non-array"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else if (Z_TYPE_P(container) == IS_STRING) { /* string offsets */ + zval tmp; + + result = 0; + if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { + if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ + || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ + && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { + ZVAL_DUP(&tmp, offset); + convert_to_long(&tmp); + offset = &tmp; + } + } + if (Z_TYPE_P(offset) == IS_LONG) { + if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { + if ((opline->extended_value & ZEND_ISSET) || + Z_STRVAL_P(container)[offset->value.lval] != '0') { + result = 1; + } + } + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + ZVAL_BOOL(EX_VAR(opline->result.var), result); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + int result; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = opline->op2.zv; + + if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_property) { + result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISSET) == 0, ((IS_CONST == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1) TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check property of non-object"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + ZVAL_BOOL(EX_VAR(opline->result.var), result); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_YIELD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -9930,6 +10866,21 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HAND ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1, free_op2; + zval *container; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + zend_fetch_dimension_address_read_IS(EX_VAR(opline->result.var), container, _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_TMP_VAR TSRMLS_CC); + zval_dtor(free_op2.var); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -9968,6 +10919,38 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HAND return zend_fetch_property_address_read_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + zend_free_op free_op2; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_IS, ((IS_TMP_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_dtor(free_op2.var); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_ADD_VAR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -10213,6 +11196,148 @@ static int ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDL } } +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1, free_op2; + zval *container; + int result; + ulong hval; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_ARRAY) { + HashTable *ht = Z_ARRVAL_P(container); + zval *value = NULL; + zend_string *str; + +isset_again: + switch (Z_TYPE_P(offset)) { + case IS_DOUBLE: + hval = zend_dval_to_lval(Z_DVAL_P(offset)); + goto num_index_prop; + case IS_LONG: + hval = Z_LVAL_P(offset); +num_index_prop: + value = zend_hash_index_find(ht, hval); + break; + case IS_STRING: + str = Z_STR_P(offset); + if (IS_TMP_VAR != IS_CONST) { + ZEND_HANDLE_NUMERIC_EX(str->val, str->len+1, hval, goto num_index_prop); + } +str_index_prop: + value = zend_hash_find_ind(ht, str); + break; + case IS_NULL: + str = STR_EMPTY_ALLOC(); + goto str_index_prop; + break; + case IS_FALSE: + hval = 0; + goto num_index_prop; + case IS_TRUE: + hval = 0; + goto num_index_prop; + case IS_RESOURCE: + hval = Z_RES_HANDLE_P(offset); + goto num_index_prop; + case IS_REFERENCE: + offset = Z_REFVAL_P(offset); + goto isset_again; + break; + default: + zend_error(E_WARNING, "Illegal offset type in isset or empty"); + break; + } + + if (opline->extended_value & ZEND_ISSET) { + /* > IS_NULL means not IS_UNDEF and not IS_NULL */ + result = (value != NULL && Z_TYPE_P(value) > IS_NULL); + } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { + result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); + } + } else if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_dimension) { + result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0 TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check element of non-array"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else if (Z_TYPE_P(container) == IS_STRING) { /* string offsets */ + zval tmp; + + result = 0; + if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { + if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ + || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ + && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { + ZVAL_DUP(&tmp, offset); + convert_to_long(&tmp); + offset = &tmp; + } + } + if (Z_TYPE_P(offset) == IS_LONG) { + if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { + if ((opline->extended_value & ZEND_ISSET) || + Z_STRVAL_P(container)[offset->value.lval] != '0') { + result = 1; + } + } + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + zval_dtor(free_op2.var); + ZVAL_BOOL(EX_VAR(opline->result.var), result); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1, free_op2; + zval *container; + int result; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_property) { + result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISSET) == 0, ((IS_TMP_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1) TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check property of non-object"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + zval_dtor(free_op2.var); + ZVAL_BOOL(EX_VAR(opline->result.var), result); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_YIELD_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -10796,6 +11921,21 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HAND ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1, free_op2; + zval *container; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + zend_fetch_dimension_address_read_IS(EX_VAR(opline->result.var), container, _get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_VAR TSRMLS_CC); + zval_ptr_dtor_nogc(free_op2.var); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -10834,6 +11974,38 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HAND return zend_fetch_property_address_read_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + zend_free_op free_op2; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_IS, ((IS_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_ptr_dtor_nogc(free_op2.var); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_ADD_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -11230,6 +12402,148 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCOD ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1, free_op2; + zval *container; + int result; + ulong hval; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_ARRAY) { + HashTable *ht = Z_ARRVAL_P(container); + zval *value = NULL; + zend_string *str; + +isset_again: + switch (Z_TYPE_P(offset)) { + case IS_DOUBLE: + hval = zend_dval_to_lval(Z_DVAL_P(offset)); + goto num_index_prop; + case IS_LONG: + hval = Z_LVAL_P(offset); +num_index_prop: + value = zend_hash_index_find(ht, hval); + break; + case IS_STRING: + str = Z_STR_P(offset); + if (IS_VAR != IS_CONST) { + ZEND_HANDLE_NUMERIC_EX(str->val, str->len+1, hval, goto num_index_prop); + } +str_index_prop: + value = zend_hash_find_ind(ht, str); + break; + case IS_NULL: + str = STR_EMPTY_ALLOC(); + goto str_index_prop; + break; + case IS_FALSE: + hval = 0; + goto num_index_prop; + case IS_TRUE: + hval = 0; + goto num_index_prop; + case IS_RESOURCE: + hval = Z_RES_HANDLE_P(offset); + goto num_index_prop; + case IS_REFERENCE: + offset = Z_REFVAL_P(offset); + goto isset_again; + break; + default: + zend_error(E_WARNING, "Illegal offset type in isset or empty"); + break; + } + + if (opline->extended_value & ZEND_ISSET) { + /* > IS_NULL means not IS_UNDEF and not IS_NULL */ + result = (value != NULL && Z_TYPE_P(value) > IS_NULL); + } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { + result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); + } + } else if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_dimension) { + result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0 TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check element of non-array"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else if (Z_TYPE_P(container) == IS_STRING) { /* string offsets */ + zval tmp; + + result = 0; + if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { + if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ + || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ + && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { + ZVAL_DUP(&tmp, offset); + convert_to_long(&tmp); + offset = &tmp; + } + } + if (Z_TYPE_P(offset) == IS_LONG) { + if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { + if ((opline->extended_value & ZEND_ISSET) || + Z_STRVAL_P(container)[offset->value.lval] != '0') { + result = 1; + } + } + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + zval_ptr_dtor_nogc(free_op2.var); + ZVAL_BOOL(EX_VAR(opline->result.var), result); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1, free_op2; + zval *container; + int result; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_property) { + result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISSET) == 0, ((IS_VAR == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1) TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check property of non-object"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + zval_ptr_dtor_nogc(free_op2.var); + ZVAL_BOOL(EX_VAR(opline->result.var), result); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_YIELD_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -12209,6 +13523,21 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_R_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDL ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + zend_fetch_dimension_address_read_IS(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC), IS_CV TSRMLS_CC); + + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -12246,6 +13575,37 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDL return zend_fetch_property_address_read_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + + if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) || + UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) { + ZVAL_NULL(EX_VAR(opline->result.var)); + } else { + zval *retval; + + /* here we are sure we are dealing with an object */ + retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_IS, ((IS_CV == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1), EX_VAR(opline->result.var) TSRMLS_CC); + + if (retval != EX_VAR(opline->result.var)) { + ZVAL_COPY(EX_VAR(opline->result.var), retval); + } + } + + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -12488,6 +13848,146 @@ static int ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLE } } +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + int result; + ulong hval; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_ARRAY) { + HashTable *ht = Z_ARRVAL_P(container); + zval *value = NULL; + zend_string *str; + +isset_again: + switch (Z_TYPE_P(offset)) { + case IS_DOUBLE: + hval = zend_dval_to_lval(Z_DVAL_P(offset)); + goto num_index_prop; + case IS_LONG: + hval = Z_LVAL_P(offset); +num_index_prop: + value = zend_hash_index_find(ht, hval); + break; + case IS_STRING: + str = Z_STR_P(offset); + if (IS_CV != IS_CONST) { + ZEND_HANDLE_NUMERIC_EX(str->val, str->len+1, hval, goto num_index_prop); + } +str_index_prop: + value = zend_hash_find_ind(ht, str); + break; + case IS_NULL: + str = STR_EMPTY_ALLOC(); + goto str_index_prop; + break; + case IS_FALSE: + hval = 0; + goto num_index_prop; + case IS_TRUE: + hval = 0; + goto num_index_prop; + case IS_RESOURCE: + hval = Z_RES_HANDLE_P(offset); + goto num_index_prop; + case IS_REFERENCE: + offset = Z_REFVAL_P(offset); + goto isset_again; + break; + default: + zend_error(E_WARNING, "Illegal offset type in isset or empty"); + break; + } + + if (opline->extended_value & ZEND_ISSET) { + /* > IS_NULL means not IS_UNDEF and not IS_NULL */ + result = (value != NULL && Z_TYPE_P(value) > IS_NULL); + } else /* if (opline->extended_value & ZEND_ISEMPTY) */ { + result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); + } + } else if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_dimension) { + result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISSET) == 0 TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check element of non-array"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else if (Z_TYPE_P(container) == IS_STRING) { /* string offsets */ + zval tmp; + + result = 0; + if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { + if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ + || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ + && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { + ZVAL_DUP(&tmp, offset); + convert_to_long(&tmp); + offset = &tmp; + } + } + if (Z_TYPE_P(offset) == IS_LONG) { + if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) { + if ((opline->extended_value & ZEND_ISSET) || + Z_STRVAL_P(container)[offset->value.lval] != '0') { + result = 1; + } + } + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + ZVAL_BOOL(EX_VAR(opline->result.var), result); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + +static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_free_op free_op1; + zval *container; + int result; + zval *offset; + + SAVE_OPLINE(); + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + + if (Z_TYPE_P(container) == IS_OBJECT) { + if (Z_OBJ_HT_P(container)->has_property) { + result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISSET) == 0, ((IS_CV == IS_CONST) ? Z_CACHE_SLOT_P(offset) : -1) TSRMLS_CC); + } else { + zend_error(E_NOTICE, "Trying to check property of non-object"); + result = 0; + } + if ((opline->extended_value & ZEND_ISSET) == 0) { + result = !result; + } + } else { + result = ((opline->extended_value & ZEND_ISSET) == 0); + } + + ZVAL_BOOL(EX_VAR(opline->result.var), result); + zval_dtor(free_op1.var); + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_YIELD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -42465,16 +43965,16 @@ void zend_init_opcodes_handlers(void) ZEND_FETCH_IS_SPEC_CV_VAR_HANDLER, ZEND_FETCH_IS_SPEC_CV_UNUSED_HANDLER, ZEND_NULL_HANDLER, + ZEND_FETCH_DIM_IS_SPEC_CONST_CONST_HANDLER, + ZEND_FETCH_DIM_IS_SPEC_CONST_TMP_HANDLER, + ZEND_FETCH_DIM_IS_SPEC_CONST_VAR_HANDLER, ZEND_NULL_HANDLER, + ZEND_FETCH_DIM_IS_SPEC_CONST_CV_HANDLER, + ZEND_FETCH_DIM_IS_SPEC_TMP_CONST_HANDLER, + ZEND_FETCH_DIM_IS_SPEC_TMP_TMP_HANDLER, + ZEND_FETCH_DIM_IS_SPEC_TMP_VAR_HANDLER, ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, + ZEND_FETCH_DIM_IS_SPEC_TMP_CV_HANDLER, ZEND_FETCH_DIM_IS_SPEC_VAR_CONST_HANDLER, ZEND_FETCH_DIM_IS_SPEC_VAR_TMP_HANDLER, ZEND_FETCH_DIM_IS_SPEC_VAR_VAR_HANDLER, @@ -42490,16 +43990,16 @@ void zend_init_opcodes_handlers(void) ZEND_FETCH_DIM_IS_SPEC_CV_VAR_HANDLER, ZEND_NULL_HANDLER, ZEND_FETCH_DIM_IS_SPEC_CV_CV_HANDLER, + ZEND_FETCH_OBJ_IS_SPEC_CONST_CONST_HANDLER, + ZEND_FETCH_OBJ_IS_SPEC_CONST_TMP_HANDLER, + ZEND_FETCH_OBJ_IS_SPEC_CONST_VAR_HANDLER, ZEND_NULL_HANDLER, + ZEND_FETCH_OBJ_IS_SPEC_CONST_CV_HANDLER, + ZEND_FETCH_OBJ_IS_SPEC_TMP_CONST_HANDLER, + ZEND_FETCH_OBJ_IS_SPEC_TMP_TMP_HANDLER, + ZEND_FETCH_OBJ_IS_SPEC_TMP_VAR_HANDLER, ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, + ZEND_FETCH_OBJ_IS_SPEC_TMP_CV_HANDLER, ZEND_FETCH_OBJ_IS_SPEC_VAR_CONST_HANDLER, ZEND_FETCH_OBJ_IS_SPEC_VAR_TMP_HANDLER, ZEND_FETCH_OBJ_IS_SPEC_VAR_VAR_HANDLER, @@ -43090,16 +44590,16 @@ void zend_init_opcodes_handlers(void) ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_VAR_HANDLER, ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_UNUSED_HANDLER, ZEND_NULL_HANDLER, + ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CONST_CONST_HANDLER, + ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CONST_TMP_HANDLER, + ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CONST_VAR_HANDLER, ZEND_NULL_HANDLER, + ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CONST_CV_HANDLER, + ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMP_CONST_HANDLER, + ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMP_TMP_HANDLER, + ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMP_VAR_HANDLER, ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, + ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_TMP_CV_HANDLER, ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_CONST_HANDLER, ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_TMP_HANDLER, ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_VAR_HANDLER, @@ -43915,16 +45415,16 @@ void zend_init_opcodes_handlers(void) ZEND_ASSIGN_DIM_SPEC_CV_VAR_HANDLER, ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER, ZEND_ASSIGN_DIM_SPEC_CV_CV_HANDLER, + ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CONST_CONST_HANDLER, + ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CONST_TMP_HANDLER, + ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CONST_VAR_HANDLER, ZEND_NULL_HANDLER, + ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CONST_CV_HANDLER, + ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMP_CONST_HANDLER, + ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMP_TMP_HANDLER, + ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMP_VAR_HANDLER, ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, + ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_TMP_CV_HANDLER, ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_VAR_CONST_HANDLER, ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_VAR_TMP_HANDLER, ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_VAR_VAR_HANDLER, -- cgit v1.2.1 From 8515b96e534aa1cf78d9314e6efda6c5ed87c1ea Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 20:15:55 +0200 Subject: Handle FUNC_ARG fetches on temporaries --- Zend/tests/varSyntax/tempDimFetchByRefError.phpt | 11 + Zend/tests/varSyntax/tempPropFetchByRefError.phpt | 11 + Zend/zend_vm_def.h | 10 +- Zend/zend_vm_execute.h | 716 +++++++++++++++++++++- 4 files changed, 728 insertions(+), 20 deletions(-) create mode 100644 Zend/tests/varSyntax/tempDimFetchByRefError.phpt create mode 100644 Zend/tests/varSyntax/tempPropFetchByRefError.phpt diff --git a/Zend/tests/varSyntax/tempDimFetchByRefError.phpt b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt new file mode 100644 index 0000000000..dbcac75ea9 --- /dev/null +++ b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt @@ -0,0 +1,11 @@ +--TEST-- +Passing a dimention fetch on a temporary by reference is not allowed +--FILE-- + +--EXPECTF-- +Fatal error: Cannot use temporary expression in write context in %s on line %d diff --git a/Zend/tests/varSyntax/tempPropFetchByRefError.phpt b/Zend/tests/varSyntax/tempPropFetchByRefError.phpt new file mode 100644 index 0000000000..f8298a936d --- /dev/null +++ b/Zend/tests/varSyntax/tempPropFetchByRefError.phpt @@ -0,0 +1,11 @@ +--TEST-- +Passing a property fetch on a temporary by reference is not allowed +--FILE-- +prop); + +?> +--EXPECTF-- +Fatal error: Cannot use temporary expression in write context in %s on line %d diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index b1993f99a3..84503b7d9f 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1332,7 +1332,7 @@ ZEND_VM_HANDLER(90, ZEND_FETCH_DIM_IS, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) ZEND_VM_NEXT_OPCODE(); } -ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, VAR|CV, CONST|TMP|VAR|UNUSED|CV) +ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, CONST|TMP|VAR|CV, CONST|TMP|VAR|UNUSED|CV) { USE_OPLINE zval *container; @@ -1341,6 +1341,9 @@ ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, VAR|CV, CONST|TMP|VAR|UNUSED|CV) SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W); if (OP1_TYPE == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -1505,7 +1508,7 @@ ZEND_VM_HANDLER(91, ZEND_FETCH_OBJ_IS, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV ZEND_VM_NEXT_OPCODE(); } -ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) { USE_OPLINE zval *container; @@ -1519,6 +1522,9 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, VAR|UNUSED|CV, CONST|TMP|VAR|CV) property = GET_OP2_ZVAL_PTR(BP_VAR_R); container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W); + if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index fd9247ffc2..b93f1ef881 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -3740,6 +3740,41 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, opline->op2.zv, IS_CONST TSRMLS_CC); + if (IS_CONST == IS_VAR && 0 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + + } else { + if (IS_CONST == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = opline->op1.zv; + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, opline->op2.zv, IS_CONST TSRMLS_CC); + + + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -3808,6 +3843,39 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + /* Behave like FETCH_OBJ_W */ + zend_free_op free_op1; + zval *property; + + SAVE_OPLINE(); + property = opline->op2.zv; + container = NULL; + + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + if (IS_CONST == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); + } + zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((IS_CONST == IS_CONST) ? Z_CACHE_SLOT_P(property) : -1), BP_VAR_W, 0 TSRMLS_CC); + + if (IS_CONST == IS_VAR && 0 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); + } else { + return zend_fetch_property_address_read_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } +} + static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -4942,6 +5010,41 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_H ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1, free_op2; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_TMP_VAR TSRMLS_CC); + if (IS_CONST == IS_VAR && 0 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + zval_dtor(free_op2.var); + + } else { + if (IS_TMP_VAR == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = opline->op1.zv; + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_TMP_VAR TSRMLS_CC); + zval_dtor(free_op2.var); + + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -5012,6 +5115,39 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_H ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + /* Behave like FETCH_OBJ_W */ + zend_free_op free_op1, free_op2; + zval *property; + + SAVE_OPLINE(); + property = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + container = NULL; + + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + if (IS_CONST == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); + } + zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((IS_TMP_VAR == IS_CONST) ? Z_CACHE_SLOT_P(property) : -1), BP_VAR_W, 0 TSRMLS_CC); + zval_dtor(free_op2.var); + if (IS_CONST == IS_VAR && 0 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); + } else { + return zend_fetch_property_address_read_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -5997,6 +6133,41 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_H ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1, free_op2; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_VAR TSRMLS_CC); + if (IS_CONST == IS_VAR && 0 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + zval_ptr_dtor_nogc(free_op2.var); + + } else { + if (IS_VAR == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = opline->op1.zv; + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, _get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_VAR TSRMLS_CC); + zval_ptr_dtor_nogc(free_op2.var); + + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -6067,6 +6238,39 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_H ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + /* Behave like FETCH_OBJ_W */ + zend_free_op free_op1, free_op2; + zval *property; + + SAVE_OPLINE(); + property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + container = NULL; + + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + if (IS_CONST == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); + } + zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((IS_VAR == IS_CONST) ? Z_CACHE_SLOT_P(property) : -1), BP_VAR_W, 0 TSRMLS_CC); + zval_ptr_dtor_nogc(free_op2.var); + if (IS_CONST == IS_VAR && 0 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); + } else { + return zend_fetch_property_address_read_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -6896,6 +7100,41 @@ static int ZEND_FASTCALL ZEND_FETCH_IS_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HA return zend_fetch_var_address_helper_SPEC_CONST_UNUSED(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED TSRMLS_CC); + if (IS_CONST == IS_VAR && 0 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + + } else { + if (IS_UNUSED == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = opline->op1.zv; + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, NULL, IS_UNUSED TSRMLS_CC); + + + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -7731,6 +7970,41 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HA ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC), IS_CV TSRMLS_CC); + if (IS_CONST == IS_VAR && 0 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + + } else { + if (IS_CV == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = opline->op1.zv; + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC), IS_CV TSRMLS_CC); + + + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -7799,6 +8073,39 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HA ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + /* Behave like FETCH_OBJ_W */ + zend_free_op free_op1; + zval *property; + + SAVE_OPLINE(); + property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + container = NULL; + + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + if (IS_CONST == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); + } + zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((IS_CV == IS_CONST) ? Z_CACHE_SLOT_P(property) : -1), BP_VAR_W, 0 TSRMLS_CC); + + if (IS_CONST == IS_VAR && 0 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); + } else { + return zend_fetch_property_address_read_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } +} + static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -9811,6 +10118,41 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_H ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, opline->op2.zv, IS_CONST TSRMLS_CC); + if (IS_TMP_VAR == IS_VAR && 1 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + + } else { + if (IS_CONST == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, opline->op2.zv, IS_CONST TSRMLS_CC); + + zval_dtor(free_op1.var); + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -9879,6 +10221,39 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_H ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + /* Behave like FETCH_OBJ_W */ + zend_free_op free_op1; + zval *property; + + SAVE_OPLINE(); + property = opline->op2.zv; + container = NULL; + + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + if (IS_TMP_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); + } + zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((IS_CONST == IS_CONST) ? Z_CACHE_SLOT_P(property) : -1), BP_VAR_W, 0 TSRMLS_CC); + + if (IS_TMP_VAR == IS_VAR && 1 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); + } else { + return zend_fetch_property_address_read_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } +} + static int ZEND_FASTCALL ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -10881,6 +11256,41 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HAN ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1, free_op2; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_TMP_VAR TSRMLS_CC); + if (IS_TMP_VAR == IS_VAR && 1 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + zval_dtor(free_op2.var); + + } else { + if (IS_TMP_VAR == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_TMP_VAR TSRMLS_CC); + zval_dtor(free_op2.var); + zval_dtor(free_op1.var); + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -10951,6 +11361,39 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HAN ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + /* Behave like FETCH_OBJ_W */ + zend_free_op free_op1, free_op2; + zval *property; + + SAVE_OPLINE(); + property = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + container = NULL; + + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + if (IS_TMP_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); + } + zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((IS_TMP_VAR == IS_CONST) ? Z_CACHE_SLOT_P(property) : -1), BP_VAR_W, 0 TSRMLS_CC); + zval_dtor(free_op2.var); + if (IS_TMP_VAR == IS_VAR && 1 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); + } else { + return zend_fetch_property_address_read_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } +} + static int ZEND_FASTCALL ZEND_ADD_VAR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -11936,6 +12379,41 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HAN ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1, free_op2; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_VAR TSRMLS_CC); + if (IS_TMP_VAR == IS_VAR && 1 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + zval_ptr_dtor_nogc(free_op2.var); + + } else { + if (IS_VAR == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, _get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2 TSRMLS_CC), IS_VAR TSRMLS_CC); + zval_ptr_dtor_nogc(free_op2.var); + zval_dtor(free_op1.var); + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -12006,6 +12484,39 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HAN ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + /* Behave like FETCH_OBJ_W */ + zend_free_op free_op1, free_op2; + zval *property; + + SAVE_OPLINE(); + property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); + container = NULL; + + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + if (IS_TMP_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); + } + zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((IS_VAR == IS_CONST) ? Z_CACHE_SLOT_P(property) : -1), BP_VAR_W, 0 TSRMLS_CC); + zval_ptr_dtor_nogc(free_op2.var); + if (IS_TMP_VAR == IS_VAR && 1 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); + } else { + return zend_fetch_property_address_read_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } +} + static int ZEND_FASTCALL ZEND_ADD_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -12835,6 +13346,41 @@ static int ZEND_FASTCALL ZEND_FETCH_IS_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HAND return zend_fetch_var_address_helper_SPEC_TMP_UNUSED(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED TSRMLS_CC); + if (IS_TMP_VAR == IS_VAR && 1 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + + } else { + if (IS_UNUSED == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, NULL, IS_UNUSED TSRMLS_CC); + + zval_dtor(free_op1.var); + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -13538,6 +14084,41 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_IS_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HAND ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + zend_free_op free_op1; + + SAVE_OPLINE(); + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + container = NULL; + if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); + } + zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC), IS_CV TSRMLS_CC); + if (IS_TMP_VAR == IS_VAR && 1 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + + } else { + if (IS_CV == IS_UNUSED) { + zend_error_noreturn(E_ERROR, "Cannot use [] for reading"); + } + container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + zend_fetch_dimension_address_read_R(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC), IS_CV TSRMLS_CC); + + zval_dtor(free_op1.var); + } + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -13606,6 +14187,39 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HAND ZEND_VM_NEXT_OPCODE(); } +static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zval *container; + + if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + /* Behave like FETCH_OBJ_W */ + zend_free_op free_op1; + zval *property; + + SAVE_OPLINE(); + property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); + container = NULL; + + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } + if (IS_TMP_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); + } + zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((IS_CV == IS_CONST) ? Z_CACHE_SLOT_P(property) : -1), BP_VAR_W, 0 TSRMLS_CC); + + if (IS_TMP_VAR == IS_VAR && 1 && READY_TO_DESTROY(free_op1.var)) { + EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); + } + + CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); + } else { + return zend_fetch_property_address_read_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } +} + static int ZEND_FASTCALL ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -16623,6 +17237,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OP SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -16799,6 +17416,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OP property = opline->op2.zv; container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -18838,6 +19458,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_TMP_HANDLER(ZEND_OPCO SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -19016,6 +19639,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TMP_HANDLER(ZEND_OPCO property = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -20963,6 +21589,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_VAR_HANDLER(ZEND_OPCO SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -21141,6 +21770,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_VAR_HANDLER(ZEND_OPCO property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -22815,6 +23447,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_UNUSED_HANDLER(ZEND_O SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -24328,6 +24963,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCOD SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -24504,6 +25142,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCOD property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -26205,6 +26846,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CONST_HANDLER(ZEND property = opline->op2.zv; container = _get_obj_zval_ptr_unused(TSRMLS_C); + if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_UNUSED == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -27566,6 +28210,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_TMP_HANDLER(ZEND_O property = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); container = _get_obj_zval_ptr_unused(TSRMLS_C); + if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_UNUSED == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -28844,6 +29491,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_VAR_HANDLER(ZEND_O property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); container = _get_obj_zval_ptr_unused(TSRMLS_C); + if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_UNUSED == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -30633,6 +31283,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CV_HANDLER(ZEND_OP property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); container = _get_obj_zval_ptr_unused(TSRMLS_C); + if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_UNUSED == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -33557,6 +34210,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPC SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -33733,6 +34389,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPC property = opline->op2.zv; container = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_CV == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -35563,6 +36222,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCOD SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -35741,6 +36403,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCOD property = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); container = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_CV == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -37571,6 +38236,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCOD SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -37749,6 +38417,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCOD property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC); container = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_CV == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -39305,6 +39976,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_UNUSED_HANDLER(ZEND_OP SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -40684,6 +41358,9 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) { + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } container = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an array"); @@ -40860,6 +41537,9 @@ static int ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC); container = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->op1.var TSRMLS_CC); + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_error_noreturn(E_ERROR, "Cannot use temporary expression in write context"); + } if (IS_CV == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) { zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } @@ -44040,16 +44720,16 @@ void zend_init_opcodes_handlers(void) ZEND_FETCH_FUNC_ARG_SPEC_CV_VAR_HANDLER, ZEND_FETCH_FUNC_ARG_SPEC_CV_UNUSED_HANDLER, ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_CONST_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_TMP_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_VAR_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_UNUSED_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_CV_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CONST_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_TMP_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_VAR_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_UNUSED_HANDLER, + ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CV_HANDLER, ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CONST_HANDLER, ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_TMP_HANDLER, ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_VAR_HANDLER, @@ -44065,16 +44745,16 @@ void zend_init_opcodes_handlers(void) ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_VAR_HANDLER, ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_UNUSED_HANDLER, ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_HANDLER, + ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_CONST_HANDLER, + ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_TMP_HANDLER, + ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_VAR_HANDLER, ZEND_NULL_HANDLER, + ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_CV_HANDLER, + ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CONST_HANDLER, + ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TMP_HANDLER, + ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_VAR_HANDLER, ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, - ZEND_NULL_HANDLER, + ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV_HANDLER, ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CONST_HANDLER, ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TMP_HANDLER, ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_VAR_HANDLER, -- cgit v1.2.1 From 8d7f5a403a248fa7de3da6729505aa53feb7549a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 20:58:44 +0200 Subject: Remove duplication --- Zend/zend_language_parser.y | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 68ac2b7076..20e41d3ba6 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -862,13 +862,9 @@ function_call: function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } | T_NS_SEPARATOR namespace_name { $$.u.op.opline_num = zend_do_begin_function_call(&$2, 0 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(&$2, &$$, 0, $3.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } - | class_name T_PAAMAYIM_NEKUDOTAYIM variable_name { $$.u.op.opline_num = zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } + | class_name T_PAAMAYIM_NEKUDOTAYIM member_name_or_variable { $$.u.op.opline_num = zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call($4.u.op.opline_num?NULL:&$3, &$$, $4.u.op.opline_num, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { fetch_simple_variable_ex(&$$, &$3, 0, ZEND_FETCH_R TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$$ TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM variable_name { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { fetch_simple_variable_ex(&$$, &$3, 0, ZEND_FETCH_R TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$$ TSRMLS_CC); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name_or_variable { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} | callable_expr { zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} @@ -1083,7 +1079,7 @@ callable_variable: { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } | dereferencable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | dereferencable T_OBJECT_OPERATOR object_member + | dereferencable T_OBJECT_OPERATOR member_name_or_variable { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); zend_do_begin_method_call(&$$ TSRMLS_CC); } function_call_parameter_list @@ -1098,7 +1094,7 @@ callable_variable: variable: callable_variable { $$ = $1; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } - | dereferencable T_OBJECT_OPERATOR object_member + | dereferencable T_OBJECT_OPERATOR member_name_or_variable { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; } ; @@ -1120,7 +1116,7 @@ new_variable: fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } | new_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } | new_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } - | new_variable T_OBJECT_OPERATOR object_member + | new_variable T_OBJECT_OPERATOR member_name_or_variable { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); } ; @@ -1129,12 +1125,12 @@ dim_offset: | expr { $$ = $1; } ; -object_member: - variable_name { $$ = $1; } - | simple_variable { fetch_simple_variable_ex(&$$, &$1, 0, ZEND_FETCH_R TSRMLS_CC); } +member_name_or_variable: + member_name { $$ = $1; } + | simple_variable { fetch_simple_variable_ex(&$$, &$1, 0, ZEND_FETCH_R TSRMLS_CC); } ; -variable_name: +member_name: T_STRING { $$ = $1; } | '{' expr '}' { $$ = $2; } ; -- cgit v1.2.1 From f4a11b66cc54995cfe7c25ea34e8f1948ed7a055 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 31 May 2014 21:00:11 +0200 Subject: Merge and rename to member_name --- Zend/zend_language_parser.y | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 20e41d3ba6..6eb2c4287e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -862,9 +862,9 @@ function_call: function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } | T_NS_SEPARATOR namespace_name { $$.u.op.opline_num = zend_do_begin_function_call(&$2, 0 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(&$2, &$$, 0, $3.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } - | class_name T_PAAMAYIM_NEKUDOTAYIM member_name_or_variable { $$.u.op.opline_num = zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } + | class_name T_PAAMAYIM_NEKUDOTAYIM member_name { $$.u.op.opline_num = zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call($4.u.op.opline_num?NULL:&$3, &$$, $4.u.op.opline_num, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name_or_variable { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} | callable_expr { zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); } function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} @@ -1079,7 +1079,7 @@ callable_variable: { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } | dereferencable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | dereferencable T_OBJECT_OPERATOR member_name_or_variable + | dereferencable T_OBJECT_OPERATOR member_name { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); zend_do_begin_method_call(&$$ TSRMLS_CC); } function_call_parameter_list @@ -1094,7 +1094,7 @@ callable_variable: variable: callable_variable { $$ = $1; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } - | dereferencable T_OBJECT_OPERATOR member_name_or_variable + | dereferencable T_OBJECT_OPERATOR member_name { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; } ; @@ -1116,7 +1116,7 @@ new_variable: fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } | new_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } | new_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } - | new_variable T_OBJECT_OPERATOR member_name_or_variable + | new_variable T_OBJECT_OPERATOR member_name { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); } ; @@ -1125,14 +1125,10 @@ dim_offset: | expr { $$ = $1; } ; -member_name_or_variable: - member_name { $$ = $1; } - | simple_variable { fetch_simple_variable_ex(&$$, &$1, 0, ZEND_FETCH_R TSRMLS_CC); } -; - member_name: T_STRING { $$ = $1; } | '{' expr '}' { $$ = $2; } + | simple_variable { fetch_simple_variable_ex(&$$, &$1, 0, ZEND_FETCH_R TSRMLS_CC); } ; assignment_list: -- cgit v1.2.1 From e4e42df4e6fc99bc05d243978146fb0b6e5b4085 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 4 Jun 2014 17:15:16 +0200 Subject: Allow only simple variables with global keyword --- Zend/zend_language_parser.y | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6eb2c4287e..e28949d71c 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -597,15 +597,12 @@ function_call_parameter: ; global_var_list: - global_var_list ',' global_var { zend_do_fetch_global_variable(&$3, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); } - | global_var { zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); } + global_var_list ',' global_var + | global_var ; - global_var: - T_VARIABLE { $$ = $1; } - | '$' r_variable { $$ = $2; } - | '$' '{' expr '}' { $$ = $3; } + simple_variable { zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); } ; -- cgit v1.2.1 From c8aa51f82590d8353640a0470ed49f7a1a21fcaa Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 6 Jun 2014 17:05:14 +0200 Subject: Accept static member fetch in new variable (BC) --- .../varSyntax/globalNonSimpleVariableError.phpt | 10 ++++++ Zend/tests/varSyntax/newVariable.phpt | 39 ++++++++++++++++++++++ Zend/zend_language_parser.y | 14 ++++---- 3 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 Zend/tests/varSyntax/globalNonSimpleVariableError.phpt create mode 100644 Zend/tests/varSyntax/newVariable.phpt diff --git a/Zend/tests/varSyntax/globalNonSimpleVariableError.phpt b/Zend/tests/varSyntax/globalNonSimpleVariableError.phpt new file mode 100644 index 0000000000..ed04921f89 --- /dev/null +++ b/Zend/tests/varSyntax/globalNonSimpleVariableError.phpt @@ -0,0 +1,10 @@ +--TEST-- +Global keyword only accepts simple variables +--FILE-- +bar; + +?> +--EXPECTF-- +Parse error: syntax error, unexpected '->' (T_OBJECT_OPERATOR), expecting ',' or ';' in %s on line %d diff --git a/Zend/tests/varSyntax/newVariable.phpt b/Zend/tests/varSyntax/newVariable.phpt new file mode 100644 index 0000000000..360f99ac36 --- /dev/null +++ b/Zend/tests/varSyntax/newVariable.phpt @@ -0,0 +1,39 @@ +--TEST-- +Variable as class name for new expression +--FILE-- + 'stdClass']; +$obj = (object) ['className' => 'stdClass']; + +class Test { + public static $className = 'stdClass'; +} +$test = 'Test'; +$weird = [0 => (object) ['foo' => 'Test']]; + +var_dump(new $className); +var_dump(new $array['className']); +var_dump(new $array{'className'}); +var_dump(new $obj->className); +var_dump(new Test::$className); +var_dump(new $test::$className); +var_dump(new $weird[0]->foo::$className); + +?> +--EXPECTF-- +object(stdClass)#%d (0) { +} +object(stdClass)#%d (0) { +} +object(stdClass)#%d (0) { +} +object(stdClass)#%d (0) { +} +object(stdClass)#%d (0) { +} +object(stdClass)#%d (0) { +} +object(stdClass)#%d (0) { +} diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e28949d71c..013e3ddbf0 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -883,13 +883,8 @@ fully_qualified_class_name: class_name_reference: - class_name { zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } - | dynamic_class_name_reference { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } -; - - -dynamic_class_name_reference: - new_variable { $$ = $1; } + class_name { zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } + | new_variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } ; exit_expr: @@ -1115,6 +1110,11 @@ new_variable: | new_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } | new_variable T_OBJECT_OPERATOR member_name { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); } + | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable + { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } + | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable + { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); + zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } ; dim_offset: -- cgit v1.2.1 From 98918fe65bba68050952b5097308a9028e4b6950 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 6 Jun 2014 22:35:21 +0200 Subject: Remove (&ast->u.child)[i] weirdness --- Zend/zend_ast.c | 165 +++++++++++++++++++++++++++------------------------- Zend/zend_ast.h | 15 +++-- Zend/zend_compile.c | 2 +- 3 files changed, 97 insertions(+), 85 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 7a9547b475..82bf42b0d2 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -25,11 +25,11 @@ ZEND_API zend_ast *zend_ast_create_constant(zval *zv) { - zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zval)); + zend_ast_zval *ast = emalloc(sizeof(zend_ast_zval)); ast->kind = ZEND_CONST; ast->children = 0; - ZVAL_COPY_VALUE(&ast->u.val, zv); - return ast; + ZVAL_COPY_VALUE(&ast->val, zv); + return (zend_ast *) ast; } ZEND_API zend_ast* zend_ast_create_unary(uint kind, zend_ast *op0) @@ -37,50 +37,55 @@ ZEND_API zend_ast* zend_ast_create_unary(uint kind, zend_ast *op0) zend_ast *ast = emalloc(sizeof(zend_ast)); ast->kind = kind; ast->children = 1; - (&ast->u.child)[0] = op0; + ast->child[0] = op0; return ast; } ZEND_API zend_ast* zend_ast_create_binary(uint kind, zend_ast *op0, zend_ast *op1) { - zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast*)); + zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *)); ast->kind = kind; ast->children = 2; - (&ast->u.child)[0] = op0; - (&ast->u.child)[1] = op1; + ast->child[0] = op0; + ast->child[1] = op1; return ast; } ZEND_API zend_ast* zend_ast_create_ternary(uint kind, zend_ast *op0, zend_ast *op1, zend_ast *op2) { - zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast*) * 2); + zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 2); ast->kind = kind; ast->children = 3; - (&ast->u.child)[0] = op0; - (&ast->u.child)[1] = op1; - (&ast->u.child)[2] = op2; + ast->child[0] = op0; + ast->child[1] = op1; + ast->child[2] = op2; return ast; } ZEND_API zend_ast* zend_ast_create_dynamic(uint kind) { - zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast*) * 3); /* use 4 children as deafult */ + /* use 4 children as default */ + zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 3); ast->kind = kind; ast->children = 0; return ast; } +static inline zend_bool is_power_of_two(unsigned short n) { + return n == (n & -n); +} + ZEND_API void zend_ast_dynamic_add(zend_ast **ast, zend_ast *op) { - if ((*ast)->children >= 4 && (*ast)->children == ((*ast)->children & -(*ast)->children)) { - *ast = erealloc(*ast, sizeof(zend_ast) + sizeof(zend_ast*) * ((*ast)->children * 2 + 1)); + if ((*ast)->children >= 4 && is_power_of_two((*ast)->children)) { + *ast = erealloc(*ast, sizeof(zend_ast) + sizeof(zend_ast *) * ((*ast)->children * 2 - 1)); } - (&(*ast)->u.child)[(*ast)->children++] = op; + (*ast)->child[(*ast)->children++] = op; } ZEND_API void zend_ast_dynamic_shrink(zend_ast **ast) { - *ast = erealloc(*ast, sizeof(zend_ast) + sizeof(zend_ast*) * ((*ast)->children - 1)); + *ast = erealloc(*ast, sizeof(zend_ast) + sizeof(zend_ast *) * ((*ast)->children - 1)); } ZEND_API int zend_ast_is_ct_constant(zend_ast *ast) @@ -88,11 +93,11 @@ ZEND_API int zend_ast_is_ct_constant(zend_ast *ast) int i; if (ast->kind == ZEND_CONST) { - return !Z_CONSTANT(ast->u.val); + return !Z_CONSTANT_P(zend_ast_get_zval(ast)); } else { for (i = 0; i < ast->children; i++) { - if ((&ast->u.child)[i]) { - if (!zend_ast_is_ct_constant((&ast->u.child)[i])) { + if (ast->child[i]) { + if (!zend_ast_is_ct_constant(ast->child[i])) { return 0; } } @@ -139,158 +144,158 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s switch (ast->kind) { case ZEND_ADD: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); add_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_SUB: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); sub_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_MUL: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); mul_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_POW: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); pow_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_DIV: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); div_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_MOD: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); mod_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_SL: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); shift_left_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_SR: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); shift_right_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_CONCAT: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); concat_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_BW_OR: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); bitwise_or_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_BW_AND: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); bitwise_and_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_BW_XOR: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); bitwise_xor_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_BW_NOT: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); bitwise_not_function(result, &op1 TSRMLS_CC); zval_dtor(&op1); break; case ZEND_BOOL_NOT: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); boolean_not_function(result, &op1 TSRMLS_CC); zval_dtor(&op1); break; case ZEND_BOOL_XOR: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); boolean_xor_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_IS_IDENTICAL: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); is_identical_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_IS_NOT_IDENTICAL: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); is_not_identical_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_IS_EQUAL: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); is_equal_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_IS_NOT_EQUAL: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); is_not_equal_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_IS_SMALLER: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); is_smaller_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_IS_SMALLER_OR_EQUAL: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); is_smaller_or_equal_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; case ZEND_CONST: - ZVAL_DUP(result, &ast->u.val); + ZVAL_DUP(result, zend_ast_get_zval(ast)); if (Z_OPT_CONSTANT_P(result)) { zval_update_constant_ex(result, 1, scope TSRMLS_CC); } break; case ZEND_BOOL_AND: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); if (zend_is_true(&op1 TSRMLS_CC)) { - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); ZVAL_BOOL(result, zend_is_true(&op2 TSRMLS_CC)); zval_dtor(&op2); } else { @@ -299,39 +304,39 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s zval_dtor(&op1); break; case ZEND_BOOL_OR: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); if (zend_is_true(&op1 TSRMLS_CC)) { ZVAL_BOOL(result, 1); } else { - zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); ZVAL_BOOL(result, zend_is_true(&op2 TSRMLS_CC)); zval_dtor(&op2); } zval_dtor(&op1); break; case ZEND_SELECT: - zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC); + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); if (zend_is_true(&op1 TSRMLS_CC)) { - if (!(&ast->u.child)[1]) { + if (!ast->child[1]) { *result = op1; } else { - zend_ast_evaluate(result, (&ast->u.child)[1], scope TSRMLS_CC); + zend_ast_evaluate(result, ast->child[1], scope TSRMLS_CC); zval_dtor(&op1); } } else { - zend_ast_evaluate(result, (&ast->u.child)[2], scope TSRMLS_CC); + zend_ast_evaluate(result, ast->child[2], scope TSRMLS_CC); zval_dtor(&op1); } break; case ZEND_UNARY_PLUS: ZVAL_LONG(&op1, 0); - zend_ast_evaluate(&op2, (&ast->u.child)[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[0], scope TSRMLS_CC); add_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op2); break; case ZEND_UNARY_MINUS: ZVAL_LONG(&op1, 0); - zend_ast_evaluate(&op2, (&ast->u.child)[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[0], scope TSRMLS_CC); sub_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op2); break; @@ -340,12 +345,12 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s { int i; for (i = 0; i < ast->children; i+=2) { - if ((&ast->u.child)[i]) { - zend_ast_evaluate(&op1, (&ast->u.child)[i], scope TSRMLS_CC); + if (ast->child[i]) { + zend_ast_evaluate(&op1, ast->child[i], scope TSRMLS_CC); } else { ZVAL_UNDEF(&op1); } - zend_ast_evaluate(&op2, (&ast->u.child)[i+1], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[i+1], scope TSRMLS_CC); zend_ast_add_array_element(result, &op1, &op2 TSRMLS_CC); } } @@ -360,16 +365,16 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) if (ast == NULL) { return NULL; } else if (ast->kind == ZEND_CONST) { - zend_ast *copy = zend_ast_create_constant(&ast->u.val); - zval_copy_ctor(©->u.val); + zend_ast *copy = zend_ast_create_constant(zend_ast_get_zval(ast)); + zval_copy_ctor(zend_ast_get_zval(copy)); return copy; } else if (ast->children) { - zend_ast *new = emalloc(sizeof(zend_ast) + sizeof(zend_ast*) * (ast->children - 1)); + zend_ast *new = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children - 1)); int i; new->kind = ast->kind; new->children = ast->children; for (i = 0; i < ast->children; i++) { - (&new->u.child)[i] = zend_ast_copy((&ast->u.child)[i]); + new->child[i] = zend_ast_copy(ast->child[i]); } return new; } @@ -381,11 +386,11 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) int i; if (ast->kind == ZEND_CONST) { - zval_dtor(&ast->u.val); + zval_dtor(zend_ast_get_zval(ast)); } else { for (i = 0; i < ast->children; i++) { - if ((&ast->u.child)[i]) { - zend_ast_destroy((&ast->u.child)[i]); + if (ast->child[i]) { + zend_ast_destroy(ast->child[i]); } } } diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 8678299f0f..d411e4e802 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -37,12 +37,19 @@ typedef enum _zend_ast_kind { struct _zend_ast { unsigned short kind; unsigned short children; - union { - zval val; - zend_ast *child; - } u; + zend_ast *child[1]; }; +typedef struct _zend_ast_zval { + unsigned short kind; + unsigned short children; + zval val; +} zend_ast_zval; + +static inline zval *zend_ast_get_zval(zend_ast *ast) { + return &((zend_ast_zval *) ast)->val; +} + ZEND_API zend_ast *zend_ast_create_constant(zval *zv); ZEND_API zend_ast *zend_ast_create_unary(uint kind, zend_ast *op0); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f5efd84144..f7adf95ed3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7478,7 +7478,7 @@ void zend_make_immutable_array_r(zval *zv TSRMLS_DC) /* {{{ */ void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ */ { if (ast->kind == ZEND_CONST) { - ZVAL_COPY_VALUE(&result->u.constant, &ast->u.val); + ZVAL_COPY_VALUE(&result->u.constant, zend_ast_get_zval(ast)); efree(ast); } else if (zend_ast_is_ct_constant(ast)) { zend_ast_evaluate(&result->u.constant, ast, NULL TSRMLS_CC); -- cgit v1.2.1 From 258a733ed2f368409d16c9168eaa8daa24fac798 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 7 Jun 2014 13:06:53 +0200 Subject: AST-based compiler: Stage 1 --- Zend/tests/bug39304.phpt | 4 +- Zend/tests/bug39304_2_4.phpt | 4 +- Zend/tests/foreach_list_002.phpt | 2 +- Zend/tests/list_005.phpt | 16 +- Zend/tests/list_006.phpt | 4 +- Zend/zend_ast.c | 11 +- Zend/zend_ast.h | 49 +- Zend/zend_compile.c | 1033 ++++++++++++++++++++++++++++++++++++-- Zend/zend_compile.h | 26 +- Zend/zend_language_parser.y | 274 ++++++---- 10 files changed, 1261 insertions(+), 162 deletions(-) diff --git a/Zend/tests/bug39304.phpt b/Zend/tests/bug39304.phpt index 8303b82573..5540135fa4 100644 --- a/Zend/tests/bug39304.phpt +++ b/Zend/tests/bug39304.phpt @@ -9,8 +9,8 @@ echo "I am alive"; --EXPECTF-- Notice: Uninitialized string offset: 0 in %sbug39304.php on line %d -Notice: Uninitialized string offset: 1 in %sbug39304.php on line %d - Notice: Uninitialized string offset: 0 in %sbug39304.php on line %d + +Notice: Uninitialized string offset: 1 in %sbug39304.php on line %d I am alive diff --git a/Zend/tests/bug39304_2_4.phpt b/Zend/tests/bug39304_2_4.phpt index b0e6ddc72c..cc0709b424 100644 --- a/Zend/tests/bug39304_2_4.phpt +++ b/Zend/tests/bug39304_2_4.phpt @@ -11,8 +11,8 @@ Bug #39304 (Segmentation fault with list unpacking of string offset) --EXPECTF-- Notice: Uninitialized string offset: 0 in %sbug39304_2_4.php on line %d -Notice: Uninitialized string offset: 1 in %sbug39304_2_4.php on line %d - Notice: Uninitialized string offset: 0 in %sbug39304_2_4.php on line %d + +Notice: Uninitialized string offset: 1 in %sbug39304_2_4.php on line %d string(0) "" string(0) "" diff --git a/Zend/tests/foreach_list_002.phpt b/Zend/tests/foreach_list_002.phpt index 251870ba09..bc17d94268 100644 --- a/Zend/tests/foreach_list_002.phpt +++ b/Zend/tests/foreach_list_002.phpt @@ -9,7 +9,7 @@ foreach (array(array(1,2), array(3,4)) as list($a, )) { $array = [['a', 'b'], 'c', 'd']; -foreach($array as list(list(), $a)) { +foreach($array as list(, $a)) { var_dump($a); } diff --git a/Zend/tests/list_005.phpt b/Zend/tests/list_005.phpt index 4afc353b2f..ec5640a60a 100644 --- a/Zend/tests/list_005.phpt +++ b/Zend/tests/list_005.phpt @@ -3,33 +3,33 @@ Testing list() with several variables --FILE-- --EXPECTF-- -Notice: Undefined offset: 1 in %s on line %d +Notice: Undefined offset: 0 in %s on line %d Notice: Undefined offset: 1 in %s on line %d - -Notice: Undefined offset: 0 in %s on line %d diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 82bf42b0d2..ba0b57fccc 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -32,6 +32,15 @@ ZEND_API zend_ast *zend_ast_create_constant(zval *zv) return (zend_ast *) ast; } +ZEND_API zend_ast *zend_ast_create_znode(znode *node) +{ + zend_ast_znode *ast = emalloc(sizeof(zend_ast_znode)); + ast->kind = ZEND_AST_ZNODE; + ast->children = 0; + ast->node = *node; + return (zend_ast *) ast; +} + ZEND_API zend_ast* zend_ast_create_unary(uint kind, zend_ast *op0) { zend_ast *ast = emalloc(sizeof(zend_ast)); @@ -62,7 +71,7 @@ ZEND_API zend_ast* zend_ast_create_ternary(uint kind, zend_ast *op0, zend_ast *o return ast; } -ZEND_API zend_ast* zend_ast_create_dynamic(uint kind) +ZEND_API zend_ast *zend_ast_create_dynamic(uint kind) { /* use 4 children as default */ zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 3); diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index d411e4e802..08fecd132a 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -26,12 +26,35 @@ typedef enum _zend_ast_kind { /* first 256 kinds are reserved for opcodes */ - ZEND_CONST = 256, + ZEND_CONST = 256, /* TODO.AST: Split in constant lookup and literal zval */ ZEND_BOOL_AND, ZEND_BOOL_OR, ZEND_SELECT, ZEND_UNARY_PLUS, ZEND_UNARY_MINUS, + + ZEND_AST_ZNODE, + + ZEND_AST_VAR, + ZEND_AST_DIM, + ZEND_AST_PROP, + ZEND_AST_STATIC_PROP, + + ZEND_AST_CALL, + ZEND_AST_METHOD_CALL, + ZEND_AST_STATIC_CALL, + + ZEND_AST_ASSIGN, + ZEND_AST_ASSIGN_REF, + ZEND_AST_LIST, + ZEND_AST_GLOBAL, + ZEND_AST_UNSET, + + ZEND_AST_PARAMS, + ZEND_AST_UNPACK, + + ZEND_AST_NAME, + ZEND_AST_NAME_FQ, } zend_ast_kind; struct _zend_ast { @@ -66,4 +89,28 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s ZEND_API zend_ast *zend_ast_copy(zend_ast *ast); ZEND_API void zend_ast_destroy(zend_ast *ast); +static inline zend_ast *zend_ast_create_var(zval *name) { + return zend_ast_create_unary(ZEND_AST_VAR, zend_ast_create_constant(name)); +} + +/* Temporary, for porting */ +#define AST_COMPILE(res, ast) do { \ + zend_ast *_ast = (ast); \ + zend_compile_expr((res), _ast TSRMLS_CC); \ + zend_ast_destroy(_ast); \ +} while (0) +#define AST_COMPILE_VAR(res, ast, type) do { \ + zend_ast *_ast = (ast); \ + zend_compile_var((res), _ast, type TSRMLS_CC); \ + zend_ast_destroy(_ast); \ +} while (0) +#define AST_COMPILE_STMT(ast) do { \ + zend_ast *_ast = (ast); \ + zend_compile_stmt(_ast TSRMLS_CC); \ + zend_ast_destroy(_ast); \ +} while (0) + +#define AST_ZNODE(znode) zend_ast_create_znode((znode)) +#define AST_ZVAL(znode) zend_ast_create_constant(&(znode)->u.constant) + #endif diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f7adf95ed3..536b904214 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2554,6 +2554,8 @@ void zend_do_end_function_call(znode *function_name, znode *result, int is_metho } /* }}} */ +static zend_bool zend_is_call(zend_ast *ast); + void zend_do_pass_param(znode *param, zend_uchar op TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -2587,10 +2589,10 @@ void zend_do_pass_param(znode *param, zend_uchar op TSRMLS_DC) /* {{{ */ if (function_ptr) { if (ARG_MAY_BE_SENT_BY_REF(function_ptr, fcall->arg_num)) { - if (op == ZEND_SEND_VAR && param->op_type & (IS_VAR|IS_CV)) { + // TODO.AST + if (op == ZEND_SEND_VAR /*&& param->op_type & (IS_VAR|IS_CV)*/) { send_by_reference = ZEND_ARG_SEND_BY_REF; - if (zend_is_function_or_method_call(param)) { - /* Method call */ + if (zend_is_call(param->u.ast)) { op = ZEND_SEND_VAR_NO_REF; send_function = ZEND_ARG_SEND_FUNCTION | ZEND_ARG_SEND_SILENT; } @@ -2602,8 +2604,7 @@ void zend_do_pass_param(znode *param, zend_uchar op TSRMLS_DC) /* {{{ */ } } - if (op == ZEND_SEND_VAR && zend_is_function_or_method_call(param)) { - /* Method call */ + if (op == ZEND_SEND_VAR && zend_is_call(param->u.ast)) { op = ZEND_SEND_VAR_NO_REF; send_function = ZEND_ARG_SEND_FUNCTION; } else if (op == ZEND_SEND_VAL && (param->op_type & (IS_VAR|IS_CV))) { @@ -2612,7 +2613,7 @@ void zend_do_pass_param(znode *param, zend_uchar op TSRMLS_DC) /* {{{ */ if (op!=ZEND_SEND_VAR_NO_REF && send_by_reference==ZEND_ARG_SEND_BY_REF) { /* change to passing by reference */ - switch (param->op_type) { + /*switch (param->op_type) { case IS_VAR: case IS_CV: op = ZEND_SEND_REF; @@ -2620,23 +2621,27 @@ void zend_do_pass_param(znode *param, zend_uchar op TSRMLS_DC) /* {{{ */ default: zend_error_noreturn(E_COMPILE_ERROR, "Only variables can be passed by reference"); break; - } + }*/ + // TODO.AST + op = ZEND_SEND_REF; } if (original_op == ZEND_SEND_VAR) { switch (op) { case ZEND_SEND_VAR_NO_REF: - zend_do_end_variable_parse(param, BP_VAR_R, 0 TSRMLS_CC); + AST_COMPILE_VAR(param, param->u.ast, BP_VAR_R); break; case ZEND_SEND_VAR: if (function_ptr) { - zend_do_end_variable_parse(param, BP_VAR_R, 0 TSRMLS_CC); + AST_COMPILE_VAR(param, param->u.ast, BP_VAR_R); } else { - zend_do_end_variable_parse(param, BP_VAR_FUNC_ARG, fcall->arg_num TSRMLS_CC); + // TODO.AST ! + //zend_do_end_variable_parse(param, BP_VAR_FUNC_ARG, fcall->arg_num TSRMLS_CC); + AST_COMPILE_VAR(param, param->u.ast, BP_VAR_R); } break; case ZEND_SEND_REF: - zend_do_end_variable_parse(param, BP_VAR_W, 0 TSRMLS_CC); + AST_COMPILE_VAR(param, param->u.ast, BP_VAR_W); break; } } @@ -2743,14 +2748,16 @@ void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC) /* {{{ */ zend_op *opline; int start_op_number, end_op_number; zend_bool returns_reference = (CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0; + zend_bool is_call = 0; /* The error for use of return inside a generator is thrown in pass_two. */ if (do_end_vparse) { - if (returns_reference && !zend_is_function_or_method_call(expr)) { - zend_do_end_variable_parse(expr, BP_VAR_W, 1 TSRMLS_CC); + is_call = zend_is_call(expr->u.ast); + if (returns_reference && !is_call) { + AST_COMPILE_VAR(expr, expr->u.ast, BP_VAR_REF); } else { - zend_do_end_variable_parse(expr, BP_VAR_R, 0 TSRMLS_CC); + AST_COMPILE_VAR(expr, expr->u.ast, BP_VAR_R); } } @@ -2786,7 +2793,7 @@ void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC) /* {{{ */ if (!do_end_vparse) { opline->extended_value = ZEND_RETURNS_VALUE; - } else if (zend_is_function_or_method_call(expr)) { + } else if (is_call) { opline->extended_value = ZEND_RETURNS_FUNCTION; } } else { @@ -2801,6 +2808,7 @@ void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC) /* {{{ */ void zend_do_yield(znode *result, znode *value, znode *key, zend_bool is_variable TSRMLS_DC) /* {{{ */ { zend_op *opline; + zend_bool is_call = 0; if (!CG(active_op_array)->function_name) { zend_error_noreturn(E_COMPILE_ERROR, "The \"yield\" expression can only be used inside a function"); @@ -2809,10 +2817,11 @@ void zend_do_yield(znode *result, znode *value, znode *key, zend_bool is_variabl CG(active_op_array)->fn_flags |= ZEND_ACC_GENERATOR; if (is_variable) { - if ((CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) && !zend_is_function_or_method_call(value)) { - zend_do_end_variable_parse(value, BP_VAR_W, 1 TSRMLS_CC); + is_call = zend_is_call(value->u.ast); + if ((CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) && !is_call) { + AST_COMPILE_VAR(value, value->u.ast, BP_VAR_REF); } else { - zend_do_end_variable_parse(value, BP_VAR_R, 0 TSRMLS_CC); + AST_COMPILE_VAR(value, value->u.ast, BP_VAR_R); } } @@ -2823,7 +2832,7 @@ void zend_do_yield(znode *result, znode *value, znode *key, zend_bool is_variabl if (value) { SET_NODE(opline->op1, value); - if (is_variable && zend_is_function_or_method_call(value)) { + if (is_call) { opline->extended_value = ZEND_RETURNS_FUNCTION; } } else { @@ -5882,7 +5891,6 @@ void zend_do_end_array(znode *result, const znode *array_node TSRMLS_DC) /* {{{ int i; int constant_array = 0; zval array; - zend_constant *c; /* check if constructed array consists only from constants */ if ((init_opline->op1_type & (IS_UNUSED | IS_CONST)) && @@ -6224,7 +6232,7 @@ void zend_do_fetch_global_variable(znode *varname, const znode *static_assignmen opline->result.var = get_temporary_variable(CG(active_op_array)); SET_NODE(opline->op1, varname); SET_UNUSED(opline->op2); - opline->extended_value = fetch_type; + opline->extended_value = fetch_type; // ZEND_FETCH_GLOBAL_LOCK GET_NODE(&result, opline->result); if (varname->op_type == IS_CONST) { @@ -6320,11 +6328,10 @@ void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC { zend_op *last_op; - zend_do_end_variable_parse(variable, BP_VAR_IS, 0 TSRMLS_CC); - - if (zend_is_function_or_method_call(variable)) { + if (zend_is_call(variable->u.ast)) { if (type == ZEND_ISEMPTY) { /* empty(func()) can be transformed to !func() */ + AST_COMPILE(variable, variable->u.ast); zend_do_unary_op(ZEND_BOOL_NOT, result, variable TSRMLS_CC); } else { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use isset() on the result of a function call (you can use \"null !== func()\" instead)"); @@ -6333,6 +6340,8 @@ void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC return; } + AST_COMPILE_VAR(variable, variable->u.ast, BP_VAR_IS); + if (variable->op_type == IS_CV) { last_op = get_next_op(CG(active_op_array) TSRMLS_CC); last_op->opcode = ZEND_ISSET_ISEMPTY_VAR; @@ -6398,14 +6407,13 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); if (variable) { - if (zend_is_function_or_method_call(array) - || !zend_can_parse_variable_for_write(array TSRMLS_CC) - ) { + // TODO.AST or !zend_can_parse_variable_for_write(array TSRMLS_CC) + if (zend_is_call(array->u.ast)) { is_variable = 0; - zend_do_end_variable_parse(array, BP_VAR_R, 0 TSRMLS_CC); + AST_COMPILE_VAR(array, array->u.ast, BP_VAR_R); } else { is_variable = 1; - zend_do_end_variable_parse(array, BP_VAR_W, 0 TSRMLS_CC); + AST_COMPILE_VAR(array, array->u.ast, BP_VAR_W); } } else { is_variable = 0; @@ -6452,6 +6460,9 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno } /* }}} */ +void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC); +static void zend_compile_list_assign(znode *result, zend_ast *list_ast, znode *expr_node TSRMLS_DC); + void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token, const znode *as_token, znode *value, znode *key TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -6480,6 +6491,7 @@ void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token } } + // TODO.AST check writable if (value->EA & ZEND_PARSED_REFERENCE_VARIABLE) { assign_by_ref = 1; @@ -6510,18 +6522,18 @@ void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token GET_NODE(&value_node, opline->result); if (value->EA & ZEND_PARSED_LIST_EXPR) { - if (!CG(list_llist).head) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use empty list"); - } - zend_do_list_end(&dummy, &value_node TSRMLS_CC); + zend_compile_list_assign(&dummy, value->u.ast, &value_node TSRMLS_CC); zend_do_free(&dummy TSRMLS_CC); + zend_ast_destroy(value->u.ast); } else { if (assign_by_ref) { - zend_do_end_variable_parse(value, BP_VAR_W, 0 TSRMLS_CC); - /* Mark FE_FETCH as IS_VAR as it holds the data directly as a value */ - zend_do_assign_ref(NULL, value, &value_node TSRMLS_CC); + zend_ast *assign_ast = zend_ast_create_binary( + ZEND_AST_ASSIGN_REF, value->u.ast, AST_ZNODE(&value_node)); + AST_COMPILE(NULL, assign_ast); } else { - zend_do_assign(&dummy, value, &value_node TSRMLS_CC); + zend_ast *assign_ast = zend_ast_create_binary( + ZEND_AST_ASSIGN, value->u.ast, AST_ZNODE(&value_node)); + AST_COMPILE(&dummy, assign_ast); zend_do_free(&dummy TSRMLS_CC); } } @@ -6534,7 +6546,9 @@ void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token opline->result.opline_num = get_temporary_variable(CG(active_op_array)); GET_NODE(&key_node, opline->result); - zend_do_assign(&dummy, key, &key_node TSRMLS_CC); + zend_ast *assign_ast = zend_ast_create_binary( + ZEND_AST_ASSIGN, key->u.ast, AST_ZNODE(&key_node)); + AST_COMPILE(&dummy, assign_ast); zend_do_free(&dummy TSRMLS_CC); } @@ -7586,6 +7600,949 @@ ZEND_API size_t zend_dirname(char *path, size_t len) } /* }}} */ +static void zend_adjust_for_fetch_type(zend_op *opline, zend_uint type) { + switch (type & BP_VAR_MASK) { + case BP_VAR_R: + return; + case BP_VAR_W: + opline->opcode += 3; + return; + case BP_VAR_REF: + opline->opcode += 3; + opline->extended_value |= ZEND_FETCH_MAKE_REF; + return; + case BP_VAR_RW: + opline->opcode += 6; + return; + case BP_VAR_IS: + opline->opcode += 9; + return; + case BP_VAR_FUNC_ARG: + opline->opcode += 12; + opline->extended_value |= type >> BP_VAR_SHIFT; + return; + case BP_VAR_UNSET: + opline->opcode += 15; + return; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + +static zend_op *emit_op(znode *result, zend_uchar opcode, znode *op1, znode *op2 TSRMLS_DC) { + zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = opcode; + + if (op1 == NULL) { + SET_UNUSED(opline->op1); + } else { + SET_NODE(opline->op1, op1); + } + + if (op2 == NULL) { + SET_UNUSED(opline->op2); + } else { + SET_NODE(opline->op2, op2); + } + + if (result == NULL) { + SET_UNUSED(opline->result); + } else { + opline->result_type = IS_VAR; + opline->result.var = get_temporary_variable(CG(active_op_array)); + GET_NODE(result, opline->result); + } + return opline; +} + +static zend_bool zend_is_variable(zend_ast *ast) { + return ast->kind == ZEND_AST_VAR || ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP + || ast->kind == ZEND_AST_CALL || ast->kind == ZEND_AST_METHOD_CALL + || ast->kind == ZEND_AST_STATIC_CALL; +} + +static zend_bool zend_is_call(zend_ast *ast) { + return ast->kind == ZEND_AST_CALL + || ast->kind == ZEND_AST_METHOD_CALL + || ast->kind == ZEND_AST_STATIC_CALL; +} + +static int zend_try_compile_cv(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *name_ast = ast->child[0]; + if (name_ast->kind == ZEND_CONST) { + zend_string *name = zval_get_string(zend_ast_get_zval(name_ast)); + + if (zend_is_auto_global(name TSRMLS_CC) || + (CG(active_op_array)->last != 0 && + CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode == ZEND_BEGIN_SILENCE) + ) { + // TODO.AST: handle ZEND_BEGIN_SILENCE properly + STR_RELEASE(name); + return FAILURE; + } + + result->op_type = IS_CV; + result->u.op.var = lookup_cv(CG(active_op_array), name TSRMLS_CC); + result->EA = 0; + + if (name->len == sizeof("this") - 1 && !memcmp(name->val, "this", sizeof("this") - 1)) { + CG(active_op_array)->this_var = result->u.op.var; + } + return SUCCESS; + } + + return FAILURE; +} + +static zend_op *zend_compile_simple_var_no_cv(znode *result, zend_ast *ast, int type TSRMLS_DC) { + zend_ast *name_ast = ast->child[0]; + znode name_node; + zend_op *opline; + + /* there is a chance someone is accessing $this */ + if (ast->kind != ZEND_CONST + && CG(active_op_array)->scope && CG(active_op_array)->this_var == -1 + ) { + zend_string *key = STR_INIT("this", sizeof("this") - 1, 0); + CG(active_op_array)->this_var = lookup_cv(CG(active_op_array), key TSRMLS_CC); + } + + zend_compile_expr(&name_node, name_ast TSRMLS_CC); + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline = emit_op(result, ZEND_FETCH_R, &name_node, NULL TSRMLS_CC); + + opline->extended_value = ZEND_FETCH_LOCAL; + if (name_node.op_type == IS_CONST) { + if (zend_is_auto_global(Z_STR(name_node.u.constant) TSRMLS_CC)) { + opline->extended_value = ZEND_FETCH_GLOBAL; + } + } + + return opline; +} + +static void zend_compile_simple_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { + if (zend_try_compile_cv(result, ast TSRMLS_CC) == FAILURE) { + zend_op *opline = zend_compile_simple_var_no_cv(result, ast, type TSRMLS_CC); + zend_adjust_for_fetch_type(opline, type); + } +} + +static void handle_numeric_op2(zend_op *opline TSRMLS_DC) { + if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { + ulong index; + int numeric = 0; + + ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(CONSTANT(opline->op2.constant)), Z_STRLEN(CONSTANT(opline->op2.constant))+1, index, numeric = 1); + if (numeric) { + zval_dtor(&CONSTANT(opline->op2.constant)); + ZVAL_LONG(&CONSTANT(opline->op2.constant), index); + } + } +} + +static void zend_separate_if_call_and_write(znode *node, zend_ast *ast, int type TSRMLS_DC) { + if (type != BP_VAR_R && type != BP_VAR_IS && zend_is_call(ast)) { + zend_op *opline = emit_op(NULL, ZEND_SEPARATE, node, NULL TSRMLS_CC); + opline->result_type = IS_VAR; + opline->result.var = opline->op1.var; + } +} + +zend_op *zend_compile_dim_common(znode *result, zend_ast *ast, int type TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + zend_ast *dim_ast = ast->child[1]; + + znode var_node, dim_node; + zend_op *opline; + + if (dim_ast == NULL) { + if (type == BP_VAR_R || type == BP_VAR_IS) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading"); + } + if (type == BP_VAR_UNSET) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for unsetting"); + } + dim_node.op_type = IS_UNUSED; + } else { + zend_compile_expr(&dim_node, dim_ast TSRMLS_CC); + } + + zend_compile_var(&var_node, var_ast, type TSRMLS_CC); + zend_separate_if_call_and_write(&var_node, var_ast, type TSRMLS_CC); + + opline = emit_op(result, ZEND_FETCH_DIM_R, &var_node, &dim_node TSRMLS_CC); + handle_numeric_op2(opline TSRMLS_CC); + + return opline; +} + +void zend_compile_dim(znode *result, zend_ast *ast, int type TSRMLS_DC) { + zend_op *opline = zend_compile_dim_common(result, ast, type TSRMLS_CC); + zend_adjust_for_fetch_type(opline, type); +} + +static zend_bool is_this_fetch(zend_ast *ast) { + if (ast->kind != ZEND_AST_VAR || ast->child[0]->kind != ZEND_CONST) { + return 0; + } + + zval *name = zend_ast_get_zval(ast->child[0]); + return Z_TYPE_P(name) == IS_STRING && Z_STRLEN_P(name) == sizeof("this") - 1 + && !memcmp(Z_STRVAL_P(name), "this", sizeof("this") - 1); +} + +zend_op *zend_compile_prop_common(znode *result, zend_ast *ast, int type TSRMLS_DC) { + zend_ast *obj_ast = ast->child[0]; + zend_ast *prop_ast = ast->child[1]; + + znode obj_node, prop_node; + zend_op *opline; + + zend_compile_expr(&prop_node, prop_ast TSRMLS_CC); + if (is_this_fetch(obj_ast)) { + obj_node.op_type = IS_UNUSED; + } else { + zend_compile_var(&obj_node, obj_ast, type TSRMLS_CC); + zend_separate_if_call_and_write(&obj_node, obj_ast, type TSRMLS_CC); + } + + opline = emit_op(result, ZEND_FETCH_OBJ_R, &obj_node, &prop_node TSRMLS_CC); + if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { + GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + } + + return opline; +} + +void zend_compile_prop(znode *result, zend_ast *ast, int type TSRMLS_DC) { + zend_op *opline = zend_compile_prop_common(result, ast, type TSRMLS_CC); + zend_adjust_for_fetch_type(opline, type); +} + +void zend_compile_static_prop(znode *result, zend_ast *ast, int type TSRMLS_DC) { + zend_ast *class_ast = ast->child[0]; + zend_ast *prop_ast = ast->child[1]; + + znode class_name_node, class_node, prop_node; + zend_op *opline; + + zend_compile_expr(&class_name_node, class_ast TSRMLS_CC); + if (class_name_node.op_type == IS_CONST && + ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type( + Z_STRVAL(class_name_node.u.constant), Z_STRLEN(class_name_node.u.constant)) + ) { + zend_resolve_class_name(&class_name_node TSRMLS_CC); + class_node = class_name_node; + } else { + zend_do_fetch_class(&class_node, &class_name_node TSRMLS_CC); + } + + zend_compile_expr(&prop_node, prop_ast TSRMLS_CC); + + opline = emit_op(result, ZEND_FETCH_R, &prop_node, NULL TSRMLS_CC); + zend_adjust_for_fetch_type(opline, type); + if (opline->op1_type == IS_CONST) { + GET_POLYMORPHIC_CACHE_SLOT(opline->op1.constant); + } + if (class_node.op_type == IS_CONST) { + opline->op2_type = IS_CONST; + opline->op2.constant = + zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); + } else { + SET_NODE(opline->op2, &class_node); + } + opline->extended_value |= ZEND_FETCH_STATIC_MEMBER; +} + +static zend_uchar get_list_fetch_opcode(zend_uchar op_type) { + switch (op_type) { + case IS_VAR: + case IS_CV: + return ZEND_FETCH_DIM_R; + case IS_TMP_VAR: + case IS_CONST: + return ZEND_FETCH_DIM_TMP_VAR; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + +static void zend_compile_list_assign(znode *result, zend_ast *list_ast, znode *expr_node TSRMLS_DC) { + zend_uint i; + + if (list_ast->children == 1 && !list_ast->child[0]) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use empty list"); + } + + for (i = 0; i < list_ast->children; ++i) { + zend_ast *var_ast = list_ast->child[i]; + znode fetch_result, dim_node, var_node, assign_result; + zend_op *opline; + + if (var_ast == NULL) { + continue; + } + + dim_node.op_type = IS_CONST; + ZVAL_LONG(&dim_node.u.constant, i); + + opline = emit_op(&fetch_result, + get_list_fetch_opcode(expr_node->op_type), expr_node, &dim_node TSRMLS_CC); + opline->extended_value |= ZEND_FETCH_ADD_LOCK; + + if (var_ast->kind != ZEND_AST_LIST) { + if (is_this_fetch(var_ast)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); + } + zend_compile_var(&var_node, var_ast, BP_VAR_W TSRMLS_CC); + emit_op(&assign_result, ZEND_ASSIGN, &var_node, &fetch_result TSRMLS_CC); + zend_do_free(&assign_result TSRMLS_CC); + } else { + zend_compile_list_assign(&assign_result, var_ast, &fetch_result TSRMLS_CC); + zend_do_free(&assign_result TSRMLS_CC); + } + } + *result = *expr_node; +} + +void zend_ensure_writable_variable(const zend_ast *ast) { + if (ast->kind == ZEND_AST_CALL) { + zend_error_noreturn(E_COMPILE_ERROR, "Can't use function return value in write context"); + } + if (ast->kind == ZEND_AST_METHOD_CALL || ast->kind == ZEND_AST_STATIC_CALL) { + zend_error_noreturn(E_COMPILE_ERROR, "Can't use method return value in write context"); + } +} + +/* Detected $a[b]... = $a pattern */ +zend_bool zend_is_dim_assign_to_self(zend_ast *var_ast, zend_ast *expr_ast TSRMLS_DC) { + if (expr_ast->kind != ZEND_AST_VAR || expr_ast->child[0]->kind != ZEND_CONST) { + return 0; + } + + while (zend_is_variable(var_ast) && !var_ast->kind == ZEND_AST_VAR) { + var_ast = var_ast->child[0]; + } + + if (var_ast->kind != ZEND_AST_VAR || var_ast->child[0]->kind != ZEND_CONST) { + return 0; + } + + { + zend_string *name1 = zval_get_string(zend_ast_get_zval(var_ast->child[0])); + zend_string *name2 = zval_get_string(zend_ast_get_zval(expr_ast->child[0])); + zend_bool result = name1->len == name2->len && !memcmp(name1->val, name2->val, name1->len); + STR_RELEASE(name1); + STR_RELEASE(name2); + return result; + } +} + +void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + zend_ast *expr_ast = ast->child[1]; + + znode var_node, expr_node; + zend_op *opline; + + if (is_this_fetch(var_ast)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); + } + + zend_ensure_writable_variable(var_ast); + + // TODO.AST handle $a[b] = $a + //if (zend_is_dim_assign_to_self(var_ast, expr_ast TSRMLS_CC)) { + //zend_compile_simple_var_no_cv(&expr_node, expr_ast, BP_VAR_R TSRMLS_CC); + //} else { + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + //} + + switch (var_ast->kind) { + case ZEND_AST_VAR: + case ZEND_AST_STATIC_PROP: + zend_compile_var(&var_node, var_ast, BP_VAR_W TSRMLS_CC); + emit_op(result, ZEND_ASSIGN, &var_node, &expr_node TSRMLS_CC); + return; + case ZEND_AST_DIM: + opline = zend_compile_dim_common(result, var_ast, BP_VAR_W TSRMLS_CC); + opline->opcode = ZEND_ASSIGN_DIM; + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + zend_do_op_data(opline, &expr_node TSRMLS_CC); + opline->op2.var = get_temporary_variable(CG(active_op_array)); + opline->op2_type = IS_VAR; + SET_UNUSED(opline->result); + return; + case ZEND_AST_PROP: + opline = zend_compile_prop_common(result, var_ast, BP_VAR_W TSRMLS_CC); + opline->opcode = ZEND_ASSIGN_OBJ; + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + zend_do_op_data(opline, &expr_node TSRMLS_CC); + SET_UNUSED(opline->result); + return; + case ZEND_AST_LIST: + zend_compile_list_assign(result, var_ast, &expr_node TSRMLS_CC); + return; + EMPTY_SWITCH_DEFAULT_CASE(); + } +} + +zend_op *zend_compile_assign_ref_common( + znode *result, zend_ast *target_ast, znode *source_node TSRMLS_DC +) { + znode target_node; + zend_op *opline; + + if (is_this_fetch(target_ast)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); + } + + zend_ensure_writable_variable(target_ast); + zend_compile_var(&target_node, target_ast, BP_VAR_W TSRMLS_CC); + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_ASSIGN_REF; + SET_NODE(opline->op1, &target_node); + SET_NODE(opline->op2, source_node); + + if (result) { + opline->result_type = IS_VAR; + opline->result.var = get_temporary_variable(CG(active_op_array)); + GET_NODE(result, opline->result); + } else { + opline->result_type = IS_UNUSED | EXT_TYPE_UNUSED; + } + + return opline; +} + +void zend_compile_assign_ref(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *target_ast = ast->child[0]; + zend_ast *source_ast = ast->child[1]; + + znode source_node; + zend_op *opline; + + zend_compile_var(&source_node, source_ast, BP_VAR_REF TSRMLS_CC); + opline = zend_compile_assign_ref_common(result, target_ast, &source_node TSRMLS_CC); + + if (zend_is_call(source_ast)) { + opline->extended_value = ZEND_RETURNS_FUNCTION; + } + // TODO.AST + /*if (rvar->EA & ZEND_PARSED_NEW) { + opline->extended_value = ZEND_RETURNS_NEW; + }*/ +} + +void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + zend_ast *expr_ast = ast->child[1]; + + znode var_node, expr_node; + zend_op *opline; + + zend_ensure_writable_variable(var_ast); + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + switch (var_ast->kind) { + case ZEND_AST_VAR: + zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); + emit_op(result, ast->kind, &var_node, &expr_node TSRMLS_CC); + return; + case ZEND_AST_DIM: + opline = zend_compile_dim_common(result, var_ast, BP_VAR_RW TSRMLS_CC); + opline->opcode = ast->kind; + opline->extended_value = ZEND_ASSIGN_DIM; + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + zend_do_op_data(opline, &expr_node TSRMLS_CC); + opline->op2.var = get_temporary_variable(CG(active_op_array)); + opline->op2_type = IS_VAR; + SET_UNUSED(opline->result); + return; + case ZEND_AST_PROP: + opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); + opline->opcode = ast->kind; + opline->extended_value = ZEND_ASSIGN_OBJ; + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + zend_do_op_data(opline, &expr_node TSRMLS_CC); + SET_UNUSED(opline->result); + return; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + +zend_uint zend_compile_params(zend_ast *params, zend_function *fbc TSRMLS_DC) { + // TODO.AST &var error + zend_uint i; + zend_bool uses_arg_unpack = 0; + zend_uint arg_count = 0; /* number of arguments not including unpacks */ + + for (i = 0; i < params->children; ++i) { + zend_ast *param = params->child[i]; + zend_uint arg_num = i + 1; + + znode param_node; + zend_op *opline; + zend_uchar opcode; + zend_ulong flags = 0; + + if (param->kind == ZEND_AST_UNPACK) { + uses_arg_unpack = 1; + + zend_compile_expr(¶m_node, param->child[0] TSRMLS_CC); + opline = emit_op(NULL, ZEND_SEND_UNPACK, ¶m_node, NULL TSRMLS_CC); + opline->op2.num = arg_count; + continue; + } + + if (uses_arg_unpack) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot use positional argument after argument unpacking"); + } + + arg_count++; + if (zend_is_variable(param)) { + if (zend_is_call(param)) { + zend_compile_var(¶m_node, param, BP_VAR_R TSRMLS_CC); + opcode = ZEND_SEND_VAR_NO_REF; + flags |= ZEND_ARG_SEND_FUNCTION; + if (fbc && ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { + flags |= ZEND_ARG_SEND_BY_REF; + if (ARG_MAY_BE_SENT_BY_REF(fbc, arg_num)) { + flags |= ZEND_ARG_SEND_SILENT; + } + } + } else if (fbc) { + if (ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { + zend_compile_var(¶m_node, param, BP_VAR_W TSRMLS_CC); + opcode = ZEND_SEND_REF; + } else { + zend_compile_var(¶m_node, param, BP_VAR_R TSRMLS_CC); + opcode = ZEND_SEND_VAR; + } + } else { + zend_compile_var(¶m_node, param, + BP_VAR_FUNC_ARG | (arg_num << BP_VAR_SHIFT) TSRMLS_CC); + opcode = ZEND_SEND_VAR; + } + } else { + zend_compile_expr(¶m_node, param TSRMLS_CC); + if (param_node.op_type & (IS_VAR|IS_CV)) { + opcode = ZEND_SEND_VAR_NO_REF; + if (fbc && ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { + flags |= ZEND_ARG_SEND_BY_REF; + } + } else { + opcode = ZEND_SEND_VAL; + if (fbc && ARG_MUST_BE_SENT_BY_REF(fbc, arg_num)) { + zend_error_noreturn(E_COMPILE_ERROR, "Only variables can be passed by reference"); + } + } + } + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = opcode; + SET_NODE(opline->op1, ¶m_node); + SET_UNUSED(opline->op2); + opline->op2.opline_num = arg_num; + + if (opcode == ZEND_SEND_VAR_NO_REF) { + if (fbc) { + flags |= ZEND_ARG_COMPILE_TIME_BOUND; + } + opline->extended_value = flags; + } else { + opline->extended_value = fbc ? ZEND_DO_FCALL : ZEND_DO_FCALL_BY_NAME; + } + + if (++CG(context).used_stack > CG(active_op_array)->used_stack) { + CG(active_op_array)->used_stack = CG(context).used_stack; + } + } + + return arg_count; +} + +zend_op *zend_compile_call_common(znode *result, zend_ast *params_ast, zend_function *fbc TSRMLS_DC) { + zend_op *opline; + zend_uint arg_count; + + zend_do_extended_fcall_begin(TSRMLS_C); + + if (!fbc) { + CG(context).nested_calls++; + } + + arg_count = zend_compile_params(params_ast, fbc TSRMLS_CC); + + opline = emit_op(result, fbc ? ZEND_DO_FCALL : ZEND_DO_FCALL_BY_NAME, NULL, NULL TSRMLS_CC); + opline->op2.num = CG(context).nested_calls; + opline->extended_value = arg_count; + + if (!fbc) { + CG(context).nested_calls--; + } + + zend_do_extended_fcall_end(TSRMLS_C); + + if (CG(context).nested_calls + 1 > CG(active_op_array)->nested_calls) { + CG(active_op_array)->nested_calls = CG(context).nested_calls + 1; + } + if (CG(context).used_stack + 1 > CG(active_op_array)->used_stack) { + CG(active_op_array)->used_stack = CG(context).used_stack + 1; + } + CG(context).used_stack -= arg_count; + + return opline; +} + +zend_bool zend_compile_function_name(znode *name_node, zend_ast *name_ast TSRMLS_DC) { + zend_bool check_namespace; + char *is_compound; + + zval *name = &name_node->u.constant; + ZVAL_COPY(name, zend_ast_get_zval(name_ast->child[0])); + name_node->op_type = IS_CONST; + + check_namespace = name_ast->kind == ZEND_AST_NAME; + is_compound = memchr(Z_STRVAL_P(name), '\\', Z_STRLEN_P(name)); + + zend_resolve_function_name(name_node, &check_namespace TSRMLS_CC); + + return check_namespace && Z_TYPE(CG(current_namespace)) != IS_UNDEF && !is_compound; +} + +void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *params_ast TSRMLS_DC) { + zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_INIT_NS_FCALL_BY_NAME; + opline->result.num = CG(context).nested_calls; + SET_UNUSED(opline->op1); + opline->op2_type = IS_CONST; + opline->op2.constant = zend_add_ns_func_name_literal( + CG(active_op_array), &name_node->u.constant TSRMLS_CC); + GET_CACHE_SLOT(opline->op2.constant); + + zend_compile_call_common(result, params_ast, NULL TSRMLS_CC); +} + +void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *params_ast TSRMLS_DC) { + zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_INIT_FCALL_BY_NAME; + opline->result.num = CG(context).nested_calls; + SET_UNUSED(opline->op1); + if (name_node->op_type == IS_CONST && Z_TYPE(name_node->u.constant) == IS_STRING) { + opline->op2_type = IS_CONST; + opline->op2.constant + = zend_add_func_name_literal(CG(active_op_array), &name_node->u.constant TSRMLS_CC); + GET_CACHE_SLOT(opline->op2.constant); + } else { + SET_NODE(opline->op2, name_node); + } + + zend_compile_call_common(result, params_ast, NULL TSRMLS_CC); +} + +zend_bool zend_params_contain_unpack(zend_ast *params) { + zend_uint i; + for (i = 0; i < params->children; ++i) { + if (params->child[i]->kind == ZEND_AST_UNPACK) { + return 1; + } + } + return 0; +} + +void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { + zend_ast *name_ast = ast->child[0]; + zend_ast *params_ast = ast->child[1]; + + znode name_node; + + if (name_ast->kind != ZEND_AST_NAME && name_ast->kind != ZEND_AST_NAME_FQ) { + zend_compile_expr(&name_node, name_ast TSRMLS_CC); + zend_compile_dynamic_call(result, &name_node, params_ast TSRMLS_CC); + return; + } + + { + zend_bool needs_runtime_resolution = zend_compile_function_name(&name_node, name_ast TSRMLS_CC); + if (needs_runtime_resolution) { + zend_compile_ns_call(result, &name_node, params_ast TSRMLS_CC); + return; + } + } + + /* Arg unpacking needs EX(call), so don't try to optimize it away */ + if (zend_params_contain_unpack(params_ast)) { + zend_compile_dynamic_call(result, &name_node, params_ast TSRMLS_CC); + return; + } + + { + zval *name = &name_node.u.constant; + zend_string *lcname = STR_ALLOC(Z_STRLEN_P(name), 0); + zend_function *fbc; + zend_op *opline; + + zend_str_tolower_copy(lcname->val, Z_STRVAL_P(name), Z_STRLEN_P(name)); + if (!(fbc = zend_hash_find_ptr(CG(function_table), lcname)) || + ((CG(compiler_options) & ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS) && + fbc->type == ZEND_INTERNAL_FUNCTION) + ) { + STR_FREE(lcname); + zend_compile_dynamic_call(result, &name_node, params_ast TSRMLS_CC); + return; + } + + zval_ptr_dtor(&name_node.u.constant); + ZVAL_NEW_STR(&name_node.u.constant, lcname); + + opline = zend_compile_call_common(result, params_ast, fbc TSRMLS_CC); + SET_NODE(opline->op1, &name_node); + GET_CACHE_SLOT(opline->op1.constant); + } +} + +void zend_compile_method_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { + //zend_ast *obj_ast = ast->child[0]; + //zend_ast *method_ast = ast->child[1]; + zend_ast *params_ast = ast->child[2]; + + // TODO.AST __clone check - WTF is that done in here?! + + // TODO.AST using an evil overload from AST_METHOD to AST_PROP here ... + zend_op *opline = zend_compile_prop_common(NULL, ast, BP_VAR_R TSRMLS_CC); + opline->opcode = ZEND_INIT_METHOD_CALL; + opline->result.num = CG(context).nested_calls; + + if (opline->op2_type == IS_CONST) { + zval name; + name = CONSTANT(opline->op2.constant); + if (Z_TYPE(name) != IS_STRING) { + zend_error_noreturn(E_COMPILE_ERROR, "Method name must be a string"); + } + Z_STR(name) = STR_COPY(Z_STR(name)); + FREE_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + opline->op2.constant = + zend_add_func_name_literal(CG(active_op_array), &name TSRMLS_CC); + GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + } + + zend_compile_call_common(result, params_ast, NULL TSRMLS_CC); +} + +zend_bool zend_is_constructor(zend_string *name) { + char *lcname = zend_str_tolower_dup(name->val, name->len); + zend_bool is_ctor = name->len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME) - 1 && + !memcmp(lcname, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME) - 1); + efree(lcname); + return is_ctor; +} + +void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { + zend_ast *class_ast = ast->child[0]; + zend_ast *method_ast = ast->child[1]; + zend_ast *params_ast = ast->child[2]; + + znode class_name_node, class_node, method_node; + zend_op *opline; + zend_ulong extended_value = 0; + + zend_compile_expr(&class_name_node, class_ast TSRMLS_CC); + if (class_name_node.op_type == IS_CONST && + ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type( + Z_STRVAL(class_name_node.u.constant), Z_STRLEN(class_name_node.u.constant)) + ) { + zend_resolve_class_name(&class_name_node TSRMLS_CC); + class_node = class_name_node; + } else { + zend_do_fetch_class(&class_node, &class_name_node TSRMLS_CC); + extended_value = class_node.EA; + } + + zend_compile_expr(&method_node, method_ast TSRMLS_CC); + if (method_node.op_type == IS_CONST) { + zval *name = &method_node.u.constant; + if (Z_TYPE_P(name) != IS_STRING) { + zend_error_noreturn(E_COMPILE_ERROR, "Method name must be a string"); + } + if (zend_is_constructor(Z_STR_P(name))) { + zval_ptr_dtor(name); + method_node.op_type = IS_UNUSED; + } + } + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_INIT_STATIC_METHOD_CALL; + opline->result.num = CG(context).nested_calls; + opline->extended_value = extended_value; + + if (class_node.op_type == IS_CONST) { + opline->op1_type = IS_CONST; + opline->op1.constant = + zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); + } else { + SET_NODE(opline->op1, &class_node); + } + + if (method_node.op_type == IS_CONST) { + opline->op2_type = IS_CONST; + opline->op2.constant = + zend_add_func_name_literal(CG(active_op_array), &method_node.u.constant TSRMLS_CC); + if (opline->op1_type == IS_CONST) { + GET_CACHE_SLOT(opline->op2.constant); + } else { + GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + } + } else { + SET_NODE(opline->op2, &method_node); + } + + zend_compile_call_common(result, params_ast, NULL TSRMLS_CC); +} + +void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + + znode var_node, result; + zend_op *opline; + + zend_compile_expr(&var_node, var_ast TSRMLS_CC); + if (var_node.op_type == IS_CONST) { + if (Z_TYPE(var_node.u.constant) != IS_STRING) { + convert_to_string(&var_node.u.constant); + } + } + + opline = emit_op(&result, ZEND_FETCH_W, &var_node, NULL TSRMLS_CC); + opline->extended_value = ZEND_FETCH_GLOBAL_LOCK; + + if (var_node.op_type == IS_CONST) { + //zval_copy_ctor(&var_node.u.constant); + } + + zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); + zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); + efree(fetch_ast); +} + +void zend_compile_unset(zend_ast *ast TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + + znode var_node; + zend_op *opline; + switch (var_ast->kind) { + case ZEND_AST_VAR: + if (zend_try_compile_cv(&var_node, ast TSRMLS_CC) == SUCCESS) { + opline = emit_op(NULL, ZEND_UNSET_VAR, &var_node, NULL TSRMLS_CC); + opline->extended_value = ZEND_FETCH_LOCAL | ZEND_QUICK_SET; + } else { + opline = zend_compile_simple_var_no_cv(NULL, var_ast, BP_VAR_UNSET TSRMLS_CC); + opline->opcode = ZEND_UNSET_VAR; + } + return; + case ZEND_AST_DIM: + opline = zend_compile_dim_common(NULL, var_ast, BP_VAR_UNSET TSRMLS_CC); + opline->opcode = ZEND_UNSET_DIM; + return; + case ZEND_AST_PROP: + opline = zend_compile_prop_common(NULL, var_ast, BP_VAR_UNSET TSRMLS_CC); + opline->opcode = ZEND_UNSET_OBJ; + return; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + +void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { + switch (ast->kind) { + case ZEND_AST_GLOBAL: + zend_compile_global_var(ast TSRMLS_CC); + return; + case ZEND_AST_UNSET: + zend_compile_unset(ast TSRMLS_CC); + return; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + +void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { + switch (ast->kind) { + case ZEND_CONST: + ZVAL_COPY(&result->u.constant, zend_ast_get_zval(ast)); + result->op_type = IS_CONST; + return; + case ZEND_AST_ZNODE: + *result = *zend_ast_get_znode(ast); + return; + case ZEND_AST_VAR: + case ZEND_AST_DIM: + case ZEND_AST_PROP: + case ZEND_AST_STATIC_PROP: + case ZEND_AST_CALL: + case ZEND_AST_METHOD_CALL: + case ZEND_AST_STATIC_CALL: + zend_compile_var(result, ast, BP_VAR_R TSRMLS_CC); + return; + case ZEND_AST_ASSIGN: + zend_compile_assign(result, ast TSRMLS_CC); + return; + case ZEND_AST_ASSIGN_REF: + zend_compile_assign_ref(result, ast TSRMLS_CC); + return; + case ZEND_ASSIGN_ADD: + case ZEND_ASSIGN_SUB: + case ZEND_ASSIGN_MUL: + case ZEND_ASSIGN_POW: + case ZEND_ASSIGN_DIV: + case ZEND_ASSIGN_CONCAT: + case ZEND_ASSIGN_MOD: + case ZEND_ASSIGN_BW_AND: + case ZEND_ASSIGN_BW_OR: + case ZEND_ASSIGN_BW_XOR: + case ZEND_ASSIGN_SL: + case ZEND_ASSIGN_SR: + zend_compile_compound_assign(result, ast TSRMLS_CC); + return; + default: + ZEND_ASSERT(0 /* not supported */); + } +} + +void zend_compile_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { + switch (ast->kind) { + case ZEND_AST_VAR: + zend_compile_simple_var(result, ast, type TSRMLS_CC); + return; + case ZEND_AST_DIM: + zend_compile_dim(result, ast, type TSRMLS_CC); + return; + case ZEND_AST_PROP: + zend_compile_prop(result, ast, type TSRMLS_CC); + return; + case ZEND_AST_STATIC_PROP: + zend_compile_static_prop(result, ast, type TSRMLS_CC); + return; + case ZEND_AST_CALL: + zend_compile_call(result, ast, type TSRMLS_CC); + return; + case ZEND_AST_METHOD_CALL: + zend_compile_method_call(result, ast, type TSRMLS_CC); + return; + case ZEND_AST_STATIC_CALL: + zend_compile_static_call(result, ast, type TSRMLS_CC); + return; + default: + // TODO.AST check writable + zend_compile_expr(result, ast TSRMLS_CC); + return; + } +} + /* * Local variables: * tab-width: 4 diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index bb4142884d..7fb428f15a 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -87,6 +87,22 @@ typedef struct _znode { /* used only during compilation */ zend_uint EA; /* extended attributes */ } znode; +/* Temporarily defined here, to avoid header ordering issues */ +typedef struct _zend_ast_znode { + unsigned short kind; + unsigned short children; + znode node; +} zend_ast_znode; +ZEND_API zend_ast *zend_ast_create_znode(znode *node); + +static inline znode *zend_ast_get_znode(zend_ast *ast) { + return &((zend_ast_znode *) ast)->node; +} + +void zend_compile_stmt(zend_ast *ast TSRMLS_DC); +void zend_compile_expr(znode *node, zend_ast *ast TSRMLS_DC); +void zend_compile_var(znode *node, zend_ast *ast, int type TSRMLS_DC); + typedef struct _zend_execute_data zend_execute_data; #define ZEND_OPCODE_HANDLER_ARGS zend_execute_data *execute_data TSRMLS_DC @@ -759,9 +775,13 @@ int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC); #define BP_VAR_W 1 #define BP_VAR_RW 2 #define BP_VAR_IS 3 -#define BP_VAR_NA 4 /* if not applicable */ -#define BP_VAR_FUNC_ARG 5 -#define BP_VAR_UNSET 6 +#define BP_VAR_FUNC_ARG 4 +#define BP_VAR_UNSET 5 +#define BP_VAR_REF 6 /* right-hand side of by-ref assignment */ + +/* Bottom 3 bits are the type, top bits are arg num for BP_VAR_FUNC_ARG */ +#define BP_VAR_SHIFT 3 +#define BP_VAR_MASK 7 #define ZEND_INTERNAL_FUNCTION 1 diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 013e3ddbf0..77508e048e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -389,7 +389,8 @@ unset_variables: ; unset_variable: - variable { zend_do_end_variable_parse(&$1, BP_VAR_UNSET, 0 TSRMLS_CC); zend_do_unset(&$1 TSRMLS_CC); } + variable + { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNSET, $1.u.ast); AST_COMPILE_STMT($$.u.ast); } ; function_declaration_statement: @@ -469,9 +470,9 @@ foreach_optional_arg: ; foreach_variable: - variable { zend_check_writable_variable(&$1); $$ = $1; } - | '&' variable { zend_check_writable_variable(&$2); $$ = $2; $$.EA |= ZEND_PARSED_REFERENCE_VARIABLE; } - | T_LIST '(' { zend_do_list_init(TSRMLS_C); } assignment_list ')' { $$ = $1; $$.EA = ZEND_PARSED_LIST_EXPR; } + variable { $$.u.ast = $1.u.ast; $$.EA = 0; } + | '&' variable { $$.u.ast = $2.u.ast; $$.EA = ZEND_PARSED_REFERENCE_VARIABLE; } + | T_LIST '(' assignment_list ')' { $$.u.ast = $3.u.ast; $$.EA = ZEND_PARSED_LIST_EXPR; } ; for_statement: @@ -596,13 +597,37 @@ function_call_parameter: | T_ELLIPSIS expr { zend_do_unpack_params(&$2 TSRMLS_CC); } ; +function_call_parameter_list_ast: + '(' ')' { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); } + | '(' non_empty_function_call_parameter_list_ast ')' { $$.u.ast = $2.u.ast; } + | '(' yield_expr ')' + { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); + zend_ast_dynamic_add(&$$.u.ast, AST_ZNODE(&$2)); } +; + +non_empty_function_call_parameter_list_ast: + function_call_parameter_ast + { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); + zend_ast_dynamic_add(&$$.u.ast, $1.u.ast); } + | non_empty_function_call_parameter_list_ast ',' function_call_parameter_ast + { zend_ast_dynamic_add(&$1.u.ast, $3.u.ast); $$.u.ast = $1.u.ast; } +; + +function_call_parameter_ast: + expr_without_variable { $$.u.ast = AST_ZNODE(&$1); } + | variable { $$.u.ast = $1.u.ast; } + | '&' w_variable { /* ERROR */ ZEND_ASSERT(0); } + | T_ELLIPSIS expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNPACK, AST_ZNODE(&$2)); } +; + global_var_list: global_var_list ',' global_var | global_var ; global_var: - simple_variable { zend_do_fetch_global_variable(&$1, NULL, ZEND_FETCH_GLOBAL_LOCK TSRMLS_CC); } + simple_variable + { $$.u.ast = zend_ast_create_unary(ZEND_AST_GLOBAL, $1.u.ast); AST_COMPILE_STMT($$.u.ast); } ; @@ -749,23 +774,53 @@ new_expr: ; expr_without_variable: - T_LIST '(' { zend_do_list_init(TSRMLS_C); } assignment_list ')' '=' expr { zend_do_list_end(&$$, &$7 TSRMLS_CC); } - | variable '=' expr { zend_check_writable_variable(&$1); zend_do_assign(&$$, &$1, &$3 TSRMLS_CC); } - | variable '=' '&' variable { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$4, BP_VAR_W, 1 TSRMLS_CC); zend_do_end_variable_parse(&$1, BP_VAR_W, 0 TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$4 TSRMLS_CC); } + T_LIST '(' assignment_list ')' '=' expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $3.u.ast, AST_ZNODE(&$6)); + AST_COMPILE(&$$, $$.u.ast); } + | variable '=' expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $$.u.ast); } + | variable '=' '&' variable + { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.u.ast, $4.u.ast); + AST_COMPILE(&$$, $$.u.ast); } | variable '=' '&' T_NEW class_name_reference { zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); zend_check_writable_variable(&$1); zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$4, &$5 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$3, &$4 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); zend_do_end_variable_parse(&$1, BP_VAR_W, 0 TSRMLS_CC); $3.EA = ZEND_PARSED_NEW; zend_do_assign_ref(&$$, &$1, &$3 TSRMLS_CC); } | T_CLONE expr { zend_do_clone(&$$, &$2 TSRMLS_CC); } - | variable T_PLUS_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_ADD, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_MINUS_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_SUB, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_MUL_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_MUL, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_POW_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_POW, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_DIV_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_DIV, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_CONCAT_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_CONCAT, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_MOD_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_MOD, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_AND_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_BW_AND, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_OR_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_BW_OR, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_XOR_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_BW_XOR, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_SL_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_SL, &$$, &$1, &$3 TSRMLS_CC); } - | variable T_SR_EQUAL expr { zend_check_writable_variable(&$1); zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_SR, &$$, &$1, &$3 TSRMLS_CC); } + | variable T_PLUS_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_ADD, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_MINUS_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SUB, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_MUL_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_MUL, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_POW_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_POW, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_DIV_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_DIV, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_CONCAT_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_CONCAT, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_MOD_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_MOD, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_AND_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_AND, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_OR_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_OR, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_XOR_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_XOR, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_SL_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SL, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } + | variable T_SR_EQUAL expr + { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SR, $1.u.ast, AST_ZNODE(&$3)); + AST_COMPILE(&$$, $2.u.ast); } | rw_variable T_INC { zend_do_post_incdec(&$$, &$1, ZEND_POST_INC TSRMLS_CC); } | T_INC rw_variable { zend_do_pre_incdec(&$$, &$2, ZEND_PRE_INC TSRMLS_CC); } | rw_variable T_DEC { zend_do_post_incdec(&$$, &$1, ZEND_POST_DEC TSRMLS_CC); } @@ -853,18 +908,25 @@ lexical_var_list: ; function_call: - namespace_name { $$.u.op.opline_num = zend_do_begin_function_call(&$1, 1 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, $2.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $1.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$1.u.constant); zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); $$.u.op.opline_num = zend_do_begin_function_call(&$1, 0 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } - | T_NS_SEPARATOR namespace_name { $$.u.op.opline_num = zend_do_begin_function_call(&$2, 0 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$2, &$$, 0, $3.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } - | class_name T_PAAMAYIM_NEKUDOTAYIM member_name { $$.u.op.opline_num = zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call($4.u.op.opline_num?NULL:&$3, &$$, $4.u.op.opline_num, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} - | callable_expr { zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); } - function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} + namespace_name function_call_parameter_list_ast + { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, + zend_ast_create_unary(ZEND_AST_NAME, AST_ZVAL(&$1)), $2.u.ast); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name function_call_parameter_list_ast + { ZVAL_EMPTY_STRING(&$1.u.constant); + zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); + $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, + zend_ast_create_unary(ZEND_AST_NAME_FQ, AST_ZVAL(&$1)), $4.u.ast); } + | T_NS_SEPARATOR namespace_name function_call_parameter_list_ast + { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, + zend_ast_create_unary(ZEND_AST_NAME_FQ, AST_ZVAL(&$2)), $3.u.ast); } + | class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list_ast + { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, + AST_ZVAL(&$1), $3.u.ast, $4.u.ast); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list_ast + { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, + AST_ZNODE(&$1), $3.u.ast, $4.u.ast); } + | callable_expr function_call_parameter_list_ast + { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.u.ast, $2.u.ast); } ; class_name: @@ -884,7 +946,7 @@ fully_qualified_class_name: class_name_reference: class_name { zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } - | new_variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } + | new_variable { AST_COMPILE_VAR(&$1, $1.u.ast, BP_VAR_R); zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } ; exit_expr: @@ -1032,112 +1094,110 @@ parenthesis_expr: r_variable: - variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$ = $1; } + variable { zend_compile_var(&$$, $1.u.ast, BP_VAR_R TSRMLS_CC); zend_ast_destroy($1.u.ast); } ; - w_variable: - variable { zend_do_end_variable_parse(&$1, BP_VAR_W, 0 TSRMLS_CC); $$ = $1; + variable { zend_compile_var(&$$, $1.u.ast, BP_VAR_W TSRMLS_CC); zend_ast_destroy($1.u.ast); zend_check_writable_variable(&$1); } ; rw_variable: - variable { zend_do_end_variable_parse(&$1, BP_VAR_RW, 0 TSRMLS_CC); $$ = $1; - zend_check_writable_variable(&$1); } + variable { zend_compile_var(&$$, $1.u.ast, BP_VAR_RW TSRMLS_CC); zend_ast_destroy($1.u.ast); + zend_check_writable_variable(&$$); } ; variable_class_name: - dereferencable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$ = $1; } + dereferencable { zend_compile_expr(&$$, $1.u.ast TSRMLS_CC); zend_ast_destroy($1.u.ast); } ; dereferencable: - variable { $$ = $1; } - | '(' expr ')' { $$ = $2; zend_do_begin_variable_parse(TSRMLS_C); $$.EA = 0; } - | dereferencable_scalar { $$ = $1; zend_do_begin_variable_parse(TSRMLS_C); $$.EA = 0; } + variable { $$.u.ast = $1.u.ast; } + | '(' expr ')' { $$.u.ast = AST_ZNODE(&$2); } + | dereferencable_scalar { $$.u.ast = AST_ZNODE(&$1); } ; callable_expr: - callable_variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$ = $1; } - | '(' expr ')' { $$ = $2; } - | dereferencable_scalar { $$ = $1; } + callable_variable { $$.u.ast = $1.u.ast; } + | '(' expr ')' { $$.u.ast = AST_ZNODE(&$2); } + | dereferencable_scalar { $$.u.ast = AST_ZNODE(&$1); } ; callable_variable: simple_variable - { zend_do_begin_variable_parse(TSRMLS_C); - fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); - $$.EA = ZEND_PARSED_VARIABLE; } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } | dereferencable '[' dim_offset ']' - { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } | dereferencable '{' expr '}' - { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | dereferencable T_OBJECT_OPERATOR member_name - { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); - zend_do_begin_method_call(&$$ TSRMLS_CC); } - function_call_parameter_list - { zend_do_end_function_call(&$4, &$$, 1, 1 TSRMLS_CC); - zend_do_extended_fcall_end(TSRMLS_C); - $$.EA = ZEND_PARSED_METHOD_CALL; } - | function_call - { zend_do_begin_variable_parse(TSRMLS_C); - $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, AST_ZNODE(&$3)); } + | dereferencable T_OBJECT_OPERATOR member_name function_call_parameter_list_ast + { $$.u.ast = zend_ast_create_ternary(ZEND_AST_METHOD_CALL, $1.u.ast, $3.u.ast, $4.u.ast); } + | function_call { $$.u.ast = $1.u.ast; } ; variable: - callable_variable { $$ = $1; } - | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } + callable_variable + { $$.u.ast = $1.u.ast; } + | static_member + { $$.u.ast = $1.u.ast; } | dereferencable T_OBJECT_OPERATOR member_name - { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.u.ast, $3.u.ast); } ; simple_variable: - T_VARIABLE { $$ = $1; } - | '$' '{' expr '}' { $$ = $3; } - | '$' simple_variable { zend_do_indirect_reference(&$$, &$2 TSRMLS_CC); } + T_VARIABLE + { $$.u.ast = AST_ZVAL(&$1); } + | '$' '{' expr '}' + { $$.u.ast = zend_ast_create_znode(&$3); } + | '$' simple_variable + { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); } ; static_member: - class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } - + class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, AST_ZVAL(&$1), $3.u.ast); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, AST_ZNODE(&$1), $3.u.ast); } ; new_variable: simple_variable - { zend_do_begin_variable_parse(TSRMLS_C); - fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } - | new_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); } - | new_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } + | new_variable '[' dim_offset ']' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } + | new_variable '{' expr '}' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, AST_ZNODE(&$3)); } | new_variable T_OBJECT_OPERATOR member_name - { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.u.ast, $3.u.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, AST_ZVAL(&$1), $3.u.ast); } | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable - { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); - zend_do_fetch_static_member(&$$, &$1, &$3 TSRMLS_CC); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } ; dim_offset: - /* empty */ { $$.op_type = IS_UNUSED; } - | expr { $$ = $1; } + /* empty */ { $$.u.ast = NULL; } + | expr { $$.u.ast = AST_ZNODE(&$1); } ; member_name: - T_STRING { $$ = $1; } - | '{' expr '}' { $$ = $2; } - | simple_variable { fetch_simple_variable_ex(&$$, &$1, 0, ZEND_FETCH_R TSRMLS_CC); } + T_STRING { $$.u.ast = AST_ZVAL(&$1); } + | '{' expr '}' { $$.u.ast = AST_ZNODE(&$2); } + | simple_variable { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } ; assignment_list: assignment_list ',' assignment_list_element + { zend_ast_dynamic_add(&$1.u.ast, $3.u.ast); $$.u.ast = $1.u.ast; } | assignment_list_element + { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_LIST); + zend_ast_dynamic_add(&$$.u.ast, $1.u.ast); } ; - assignment_list_element: - variable { zend_do_add_list_element(&$1 TSRMLS_CC); } - | T_LIST '(' { zend_do_new_list_begin(TSRMLS_C); } assignment_list ')' { zend_do_new_list_end(TSRMLS_C); } - | /* empty */ { zend_do_add_list_element(NULL TSRMLS_CC); } + variable { $$.u.ast = $1.u.ast; } + | T_LIST '(' assignment_list ')' { $$.u.ast = $3.u.ast; } + | /* empty */ { $$.u.ast = NULL; } ; @@ -1158,34 +1218,42 @@ non_empty_array_pair_list: ; encaps_list: - encaps_list encaps_var { zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); zend_do_add_variable(&$$, &$1, &$2 TSRMLS_CC); } + encaps_list encaps_var + { AST_COMPILE(&$2, $2.u.ast); zend_do_add_variable(&$$, &$1, &$2 TSRMLS_CC); } | encaps_list T_ENCAPSED_AND_WHITESPACE { zend_do_add_string(&$$, &$1, &$2 TSRMLS_CC); } - | encaps_var { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); zend_do_add_variable(&$$, NULL, &$1 TSRMLS_CC); } - | T_ENCAPSED_AND_WHITESPACE encaps_var { zend_do_add_string(&$$, NULL, &$1 TSRMLS_CC); zend_do_end_variable_parse(&$2, BP_VAR_R, 0 TSRMLS_CC); zend_do_add_variable(&$$, &$$, &$2 TSRMLS_CC); } + | encaps_var { AST_COMPILE(&$1, $1.u.ast); zend_do_add_variable(&$$, NULL, &$1 TSRMLS_CC); } + | T_ENCAPSED_AND_WHITESPACE encaps_var + { zend_do_add_string(&$$, NULL, &$1 TSRMLS_CC); + AST_COMPILE(&$2, $2.u.ast); zend_do_add_variable(&$$, &$$, &$2 TSRMLS_CC); } ; - - encaps_var: - T_VARIABLE { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } - | T_VARIABLE '[' { zend_do_begin_variable_parse(TSRMLS_C); } encaps_var_offset ']' { fetch_array_begin(&$$, &$1, &$4 TSRMLS_CC); } - | T_VARIABLE T_OBJECT_OPERATOR T_STRING { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$2, &$1, 1 TSRMLS_CC); zend_do_fetch_property(&$$, &$2, &$3 TSRMLS_CC); } - | T_DOLLAR_OPEN_CURLY_BRACES expr '}' { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$2, 1 TSRMLS_CC); } - | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' { zend_do_begin_variable_parse(TSRMLS_C); fetch_array_begin(&$$, &$2, &$4 TSRMLS_CC); } - | T_CURLY_OPEN variable '}' { $$ = $2; } + T_VARIABLE + { $$.u.ast = zend_ast_create_var(&$1.u.constant); } + | T_VARIABLE '[' encaps_var_offset ']' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, + zend_ast_create_var(&$1.u.constant), $3.u.ast); } + | T_VARIABLE T_OBJECT_OPERATOR T_STRING + { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, + zend_ast_create_var(&$1.u.constant), AST_ZNODE(&$3)); } + | T_DOLLAR_OPEN_CURLY_BRACES expr '}' + { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, AST_ZNODE(&$2)); } + | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, + zend_ast_create_var(&$2.u.constant), AST_ZNODE(&$4)); } + | T_CURLY_OPEN variable '}' { $$.u.ast = $2.u.ast; } ; - encaps_var_offset: - T_STRING { $$ = $1; } - | T_NUM_STRING { $$ = $1; } - | T_VARIABLE { fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); } + T_STRING { $$.u.ast = AST_ZVAL(&$1); } + | T_NUM_STRING { $$.u.ast = AST_ZVAL(&$1); } + | T_VARIABLE { $$.u.ast = zend_ast_create_var(&$1.u.constant); } ; internal_functions_in_yacc: T_ISSET '(' isset_variables ')' { $$ = $3; } - | T_EMPTY '(' variable ')' { zend_do_isset_or_isempty(ZEND_ISEMPTY, &$$, &$3 TSRMLS_CC); } + | T_EMPTY '(' variable ')' { zend_do_isset_or_isempty(ZEND_ISEMPTY, &$$, &$3 TSRMLS_CC); } | T_EMPTY '(' expr_without_variable ')' { zend_do_unary_op(ZEND_BOOL_NOT, &$$, &$3 TSRMLS_CC); } | T_INCLUDE expr { zend_do_include_or_eval(ZEND_INCLUDE, &$$, &$2 TSRMLS_CC); } | T_INCLUDE_ONCE expr { zend_do_include_or_eval(ZEND_INCLUDE_ONCE, &$$, &$2 TSRMLS_CC); } @@ -1200,7 +1268,7 @@ isset_variables: ; isset_variable: - variable { zend_do_isset_or_isempty(ZEND_ISSET, &$$, &$1 TSRMLS_CC); } + variable { zend_do_isset_or_isempty(ZEND_ISSET, &$$, &$1 TSRMLS_CC); } | expr_without_variable { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use isset() on the result of an expression (you can use \"null !== expression\" instead)"); } ; -- cgit v1.2.1 From 0ec49bba2290c364424ed8d8507e245b6b2e1d61 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 14 Jun 2014 18:30:18 +0200 Subject: AST stage 1.9 Expressions (mostly) use the AST --- Zend/tests/bug30080.phpt | 4 +- Zend/tests/bug55007.phpt | 2 +- Zend/zend_ast.h | 19 ++ Zend/zend_compile.c | 523 +++++++++++++++++++++++++++++++++++++++++--- Zend/zend_compile.h | 1 + Zend/zend_language_parser.y | 341 +++++++++++++---------------- 6 files changed, 671 insertions(+), 219 deletions(-) diff --git a/Zend/tests/bug30080.phpt b/Zend/tests/bug30080.phpt index bd8401e1be..8cac75ab8d 100644 --- a/Zend/tests/bug30080.phpt +++ b/Zend/tests/bug30080.phpt @@ -10,9 +10,9 @@ class foo { new foo(array(new stdClass)); ?> ---EXPECT-- +--EXPECTF-- array(1) { [0]=> - object(stdClass)#2 (0) { + object(stdClass)#%d (0) { } } diff --git a/Zend/tests/bug55007.phpt b/Zend/tests/bug55007.phpt index 12fbf120a8..425ce8f296 100644 --- a/Zend/tests/bug55007.phpt +++ b/Zend/tests/bug55007.phpt @@ -4,7 +4,7 @@ Bug #55007 (compiler fail after previous fail) u.constant) +#define AC(znode) AST_COMPILE(&znode, znode.u.ast) +#define AZ(znode) ((znode).u.ast = AST_ZNODE(&znode)) + #endif diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 536b904214..2e69763225 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7654,6 +7654,25 @@ static zend_op *emit_op(znode *result, zend_uchar opcode, znode *op1, znode *op2 return opline; } +static zend_op *emit_op_tmp(znode *result, zend_uchar opcode, znode *op1, znode *op2 TSRMLS_DC) { + zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = opcode; + + SET_NODE(opline->op1, op1); + + if (op2 == NULL) { + SET_UNUSED(opline->op2); + } else { + SET_NODE(opline->op2, op2); + } + + opline->result_type = IS_TMP_VAR; + opline->result.var = get_temporary_variable(CG(active_op_array)); + GET_NODE(result, opline->result); + + return opline; +} + static zend_bool zend_is_variable(zend_ast *ast) { return ast->kind == ZEND_AST_VAR || ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP || ast->kind == ZEND_AST_CALL || ast->kind == ZEND_AST_METHOD_CALL @@ -7666,6 +7685,52 @@ static zend_bool zend_is_call(zend_ast *ast) { || ast->kind == ZEND_AST_STATIC_CALL; } +static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { + zval *name; + int fetch_type; + if (name_ast->kind != ZEND_CONST) { + return 0; + } + + name = zend_ast_get_zval(name_ast); + fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); + return fetch_type == ZEND_FETCH_CLASS_DEFAULT; +} + +static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_DC) { + znode name_node; + zend_op *opline; + + zend_compile_expr(&name_node, name_ast TSRMLS_CC); + + if (name_node.op_type == IS_CONST) { + zval *name = &name_node.u.constant; + int fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); + + opline = emit_op(result, ZEND_FETCH_CLASS, NULL, NULL TSRMLS_CC); + opline->extended_value = fetch_type; + + switch (fetch_type) { + case ZEND_FETCH_CLASS_SELF: + case ZEND_FETCH_CLASS_PARENT: + case ZEND_FETCH_CLASS_STATIC: + zval_ptr_dtor(name); + break; + default: + zend_resolve_class_name(&name_node TSRMLS_CC); + opline->op2_type = IS_CONST; + opline->op2.constant = + zend_add_class_name_literal(CG(active_op_array), name TSRMLS_CC); + break; + } + } else { + opline = emit_op(result, ZEND_FETCH_CLASS, NULL, &name_node TSRMLS_CC); + opline->extended_value = ZEND_FETCH_CLASS_DEFAULT; + } + + return opline; +} + static int zend_try_compile_cv(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; if (name_ast->kind == ZEND_CONST) { @@ -7824,18 +7889,14 @@ void zend_compile_static_prop(znode *result, zend_ast *ast, int type TSRMLS_DC) zend_ast *class_ast = ast->child[0]; zend_ast *prop_ast = ast->child[1]; - znode class_name_node, class_node, prop_node; + znode class_node, prop_node; zend_op *opline; - zend_compile_expr(&class_name_node, class_ast TSRMLS_CC); - if (class_name_node.op_type == IS_CONST && - ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type( - Z_STRVAL(class_name_node.u.constant), Z_STRLEN(class_name_node.u.constant)) - ) { - zend_resolve_class_name(&class_name_node TSRMLS_CC); - class_node = class_name_node; + if (zend_is_const_default_class_ref(class_ast)) { + zend_compile_expr(&class_node, class_ast TSRMLS_CC); + zend_resolve_class_name(&class_node TSRMLS_CC); } else { - zend_do_fetch_class(&class_node, &class_name_node TSRMLS_CC); + zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); } zend_compile_expr(&prop_node, prop_ast TSRMLS_CC); @@ -7914,13 +7975,13 @@ void zend_ensure_writable_variable(const zend_ast *ast) { } } -/* Detected $a[b]... = $a pattern */ -zend_bool zend_is_dim_assign_to_self(zend_ast *var_ast, zend_ast *expr_ast TSRMLS_DC) { +/* Detects $a... = $a pattern */ +zend_bool zend_is_assign_to_self(zend_ast *var_ast, zend_ast *expr_ast TSRMLS_DC) { if (expr_ast->kind != ZEND_AST_VAR || expr_ast->child[0]->kind != ZEND_CONST) { return 0; } - while (zend_is_variable(var_ast) && !var_ast->kind == ZEND_AST_VAR) { + while (zend_is_variable(var_ast) && var_ast->kind != ZEND_AST_VAR) { var_ast = var_ast->child[0]; } @@ -7951,12 +8012,11 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { zend_ensure_writable_variable(var_ast); - // TODO.AST handle $a[b] = $a - //if (zend_is_dim_assign_to_self(var_ast, expr_ast TSRMLS_CC)) { - //zend_compile_simple_var_no_cv(&expr_node, expr_ast, BP_VAR_R TSRMLS_CC); - //} else { + if (zend_is_assign_to_self(var_ast, expr_ast TSRMLS_CC)) { + zend_compile_simple_var_no_cv(&expr_node, expr_ast, BP_VAR_R TSRMLS_CC); + } else { zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - //} + } switch (var_ast->kind) { case ZEND_AST_VAR: @@ -8030,11 +8090,9 @@ void zend_compile_assign_ref(znode *result, zend_ast *ast TSRMLS_DC) { if (zend_is_call(source_ast)) { opline->extended_value = ZEND_RETURNS_FUNCTION; - } - // TODO.AST - /*if (rvar->EA & ZEND_PARSED_NEW) { + } else if (source_ast->kind == ZEND_NEW) { opline->extended_value = ZEND_RETURNS_NEW; - }*/ + } } void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { @@ -8349,20 +8407,16 @@ void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) zend_ast *method_ast = ast->child[1]; zend_ast *params_ast = ast->child[2]; - znode class_name_node, class_node, method_node; + znode class_node, method_node; zend_op *opline; zend_ulong extended_value = 0; - zend_compile_expr(&class_name_node, class_ast TSRMLS_CC); - if (class_name_node.op_type == IS_CONST && - ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type( - Z_STRVAL(class_name_node.u.constant), Z_STRLEN(class_name_node.u.constant)) - ) { - zend_resolve_class_name(&class_name_node TSRMLS_CC); - class_node = class_name_node; + if (zend_is_const_default_class_ref(class_ast)) { + zend_compile_expr(&class_node, class_ast TSRMLS_CC); + zend_resolve_class_name(&class_node TSRMLS_CC); } else { - zend_do_fetch_class(&class_node, &class_name_node TSRMLS_CC); - extended_value = class_node.EA; + opline = zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); + extended_value = opline->extended_value; } zend_compile_expr(&method_node, method_ast TSRMLS_CC); @@ -8406,6 +8460,37 @@ void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) zend_compile_call_common(result, params_ast, NULL TSRMLS_CC); } +void zend_compile_new(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *class_ast = ast->child[0]; + zend_ast *params_ast = ast->child[1]; + + znode class_node, ctor_result; + zend_op *opline; + zend_uint opnum; + + zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); + + opnum = get_next_op_number(CG(active_op_array)); + opline = emit_op(result, ZEND_NEW, &class_node, NULL TSRMLS_CC); + opline->extended_value = CG(context).nested_calls; + + zend_compile_call_common(&ctor_result, params_ast, NULL TSRMLS_CC); + zend_do_free(&ctor_result TSRMLS_CC); + + /* New jumps over ctor call if ctor does not exist */ + opline = &CG(active_op_array)->opcodes[opnum]; + opline->op2.opline_num = get_next_op_number(CG(active_op_array)); +} + +void zend_compile_clone(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *obj_ast = ast->child[0]; + + znode obj_node; + zend_compile_expr(&obj_node, obj_ast TSRMLS_CC); + + emit_op(result, ZEND_CLONE, &obj_node, NULL TSRMLS_CC); +} + void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; @@ -8458,6 +8543,307 @@ void zend_compile_unset(zend_ast *ast TSRMLS_DC) { } } +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]; + + znode left_node, right_node; + zend_compile_expr(&left_node, left_ast TSRMLS_CC); + zend_compile_expr(&right_node, right_ast TSRMLS_CC); + + emit_op_tmp(result, ast->kind, &left_node, &right_node TSRMLS_CC); +} + +/* We do not use zend_compile_binary_op for this because we want to retain the left-to-right + * evaluation order. */ +void zend_compile_greater(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *left_ast = ast->child[0]; + zend_ast *right_ast = ast->child[1]; + znode left_node, right_node; + + ZEND_ASSERT(ast->kind == ZEND_AST_GREATER || ast->kind == ZEND_AST_GREATER_EQUAL); + + zend_compile_expr(&left_node, left_ast TSRMLS_CC); + zend_compile_expr(&right_node, right_ast TSRMLS_CC); + + emit_op_tmp(result, ast->kind == ZEND_AST_GREATER ? ZEND_IS_SMALLER : ZEND_IS_SMALLER_OR_EQUAL, + &right_node, &left_node TSRMLS_CC); +} + +void zend_compile_unary_op(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + + znode expr_node; + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + emit_op_tmp(result, ast->kind, &expr_node, NULL TSRMLS_CC); +} + +void zend_compile_unary_pm(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + znode zero_node, expr_node; + + ZEND_ASSERT(ast->kind == ZEND_UNARY_PLUS || ast->kind == ZEND_UNARY_MINUS); + + zero_node.op_type = IS_CONST; + ZVAL_LONG(&zero_node.u.constant, 0); + + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + emit_op_tmp(result, ast->kind == ZEND_UNARY_PLUS ? ZEND_ADD : ZEND_SUB, + &zero_node, &expr_node TSRMLS_CC); +} + +void zend_compile_short_circuiting(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *left_ast = ast->child[0]; + zend_ast *right_ast = ast->child[1]; + + znode left_node, right_node; + zend_op *opline_jmpz, *opline_bool; + zend_uint opnum_jmpz; + + ZEND_ASSERT(ast->kind == ZEND_AST_AND || ast->kind == ZEND_AST_OR); + + zend_compile_expr(&left_node, left_ast TSRMLS_CC); + + opnum_jmpz = get_next_op_number(CG(active_op_array)); + opline_jmpz = emit_op(NULL, ast->kind == ZEND_AST_AND ? ZEND_JMPZ_EX : ZEND_JMPNZ_EX, + &left_node, NULL TSRMLS_CC); + + if (left_node.op_type == IS_TMP_VAR) { + SET_NODE(opline_jmpz->result, &left_node); + } else { + opline_jmpz->result.var = get_temporary_variable(CG(active_op_array)); + opline_jmpz->result_type = IS_TMP_VAR; + } + GET_NODE(result, opline_jmpz->result); + + zend_compile_expr(&right_node, right_ast TSRMLS_CC); + + opline_bool = emit_op(NULL, ZEND_BOOL, &right_node, NULL TSRMLS_CC); + SET_NODE(opline_bool->result, result); + + opline_jmpz = &CG(active_op_array)->opcodes[opnum_jmpz]; + opline_jmpz->op2.opline_num = get_next_op_number(CG(active_op_array)); +} + +void zend_compile_post_incdec(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + + znode var_node; + zend_op *opline; + + ZEND_ASSERT(ast->kind == ZEND_POST_INC || ast->kind == ZEND_POST_DEC); + + if (var_ast->kind == ZEND_AST_PROP) { + opline = zend_compile_prop_common(NULL, var_ast, BP_VAR_RW TSRMLS_CC); + opline->opcode = ast->kind == ZEND_POST_INC ? ZEND_POST_INC_OBJ : ZEND_POST_DEC_OBJ; + opline->result_type = IS_TMP_VAR; + opline->result.var = get_temporary_variable(CG(active_op_array)); + GET_NODE(result, opline->result); + } else { + zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); + emit_op_tmp(result, ast->kind, &var_node, NULL TSRMLS_CC); + } +} + +void zend_compile_pre_incdec(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + + znode var_node; + zend_op *opline; + + ZEND_ASSERT(ast->kind == ZEND_PRE_INC || ast->kind == ZEND_PRE_DEC); + + if (var_ast->kind == ZEND_AST_PROP) { + opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); + opline->opcode = ast->kind == ZEND_PRE_INC ? ZEND_PRE_INC_OBJ : ZEND_PRE_DEC_OBJ; + } else { + zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); + emit_op(result, ast->kind, &var_node, NULL TSRMLS_CC); + } +} + +void zend_compile_cast(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + znode expr_node; + zend_op *opline; + + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + opline = emit_op(result, ZEND_CAST, &expr_node, NULL TSRMLS_CC); + switch (ast->kind) { + case ZEND_AST_CAST_NULL: opline->extended_value = IS_NULL; break; + case ZEND_AST_CAST_BOOL: opline->extended_value = _IS_BOOL; break; + case ZEND_AST_CAST_INT: opline->extended_value = IS_LONG; break; + case ZEND_AST_CAST_DOUBLE: opline->extended_value = IS_DOUBLE; break; + case ZEND_AST_CAST_STRING: opline->extended_value = IS_STRING; break; + case ZEND_AST_CAST_ARRAY: opline->extended_value = IS_ARRAY; break; + case ZEND_AST_CAST_OBJECT: opline->extended_value = IS_OBJECT; break; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + +static void zend_compile_shorthand_conditional(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *cond_ast = ast->child[0]; + zend_ast *false_ast = ast->child[2]; + + znode cond_node, false_node; + zend_op *opline_jmp_set, *opline_qm_assign; + zend_uint opnum_jmp_set; + + ZEND_ASSERT(ast->child[1] == NULL); + + zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); + + opnum_jmp_set = get_next_op_number(CG(active_op_array)); + emit_op_tmp(result, ZEND_JMP_SET, &cond_node, NULL TSRMLS_CC); + + zend_compile_expr(&false_node, false_ast TSRMLS_CC); + + opline_jmp_set = &CG(active_op_array)->opcodes[opnum_jmp_set]; + opline_jmp_set->op2.opline_num = get_next_op_number(CG(active_op_array)) + 1; + if (cond_node.op_type == IS_VAR || cond_node.op_type == IS_CV + || false_node.op_type == IS_VAR || false_node.op_type == IS_CV + ) { + opline_jmp_set->opcode = ZEND_JMP_SET_VAR; + opline_jmp_set->result_type = IS_VAR; + GET_NODE(result, opline_jmp_set->result); + + opline_qm_assign = emit_op(NULL, ZEND_QM_ASSIGN_VAR, &false_node, NULL TSRMLS_CC); + } else { + opline_qm_assign = emit_op(NULL, ZEND_QM_ASSIGN, &false_node, NULL TSRMLS_CC); + } + SET_NODE(opline_qm_assign->result, result); +} + +void zend_compile_conditional(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *cond_ast = ast->child[0]; + zend_ast *true_ast = ast->child[1]; + zend_ast *false_ast = ast->child[2]; + + znode cond_node, true_node, false_node; + zend_op *opline_jmpz, *opline_jmp, *opline_qm_assign1, *opline_qm_assign2; + zend_uint opnum_jmpz, opnum_jmp, opnum_qm_assign1; + + if (!true_ast) { + zend_compile_shorthand_conditional(result, ast TSRMLS_CC); + return; + } + + zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); + + opnum_jmpz = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMPZ, &cond_node, NULL TSRMLS_CC); + + zend_compile_expr(&true_node, true_ast TSRMLS_CC); + + opnum_qm_assign1 = get_next_op_number(CG(active_op_array)); + emit_op(result, ZEND_QM_ASSIGN, &true_node, NULL TSRMLS_CC); + + opnum_jmp = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + + opline_jmpz = &CG(active_op_array)->opcodes[opnum_jmpz]; + opline_jmpz->op2.opline_num = get_next_op_number(CG(active_op_array)); + + zend_compile_expr(&false_node, false_ast TSRMLS_CC); + + opline_qm_assign1 = &CG(active_op_array)->opcodes[opnum_qm_assign1]; + if (true_node.op_type == IS_VAR || true_node.op_type == IS_CV + || false_node.op_type == IS_VAR || false_node.op_type == IS_CV + ) { + opline_qm_assign1->opcode = ZEND_QM_ASSIGN_VAR; + opline_qm_assign1->result_type = IS_VAR; + GET_NODE(result, opline_qm_assign1->result); + } + + opline_qm_assign2 = emit_op(NULL, opline_qm_assign1->opcode, &false_node, NULL TSRMLS_CC); + SET_NODE(opline_qm_assign2->result, result); + + opline_jmp = &CG(active_op_array)->opcodes[opnum_jmp]; + opline_jmp->op1.opline_num = get_next_op_number(CG(active_op_array)); +} + +void zend_compile_print(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + + znode expr_node; + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + emit_op_tmp(result, ZEND_PRINT, &expr_node, NULL TSRMLS_CC); +} + +void zend_compile_exit(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + + if (expr_ast) { + znode expr_node; + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + emit_op(NULL, ZEND_EXIT, &expr_node, NULL TSRMLS_CC); + } else { + emit_op(NULL, ZEND_EXIT, NULL, NULL TSRMLS_CC); + } + + result->op_type = IS_CONST; + ZVAL_BOOL(&result->u.constant, 1); +} + +void zend_compile_yield(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *value_ast = ast->child[0]; + zend_ast *key_ast = ast->child[1]; + + znode value_node, key_node; + znode *value_node_ptr = NULL, *key_node_ptr = NULL; + zend_op *opline; + zend_bool returns_by_ref = (CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0; + + if (!CG(active_op_array)->function_name) { + zend_error_noreturn(E_COMPILE_ERROR, "The \"yield\" expression can only be used inside a function"); + } + + CG(active_op_array)->fn_flags |= ZEND_ACC_GENERATOR; + + if (key_ast) { + zend_compile_expr(&key_node, key_ast TSRMLS_CC); + key_node_ptr = &key_node; + } + + if (value_ast) { + if (returns_by_ref && zend_is_variable(value_ast) && !zend_is_call(value_ast)) { + zend_compile_var(&value_node, value_ast, BP_VAR_REF TSRMLS_CC); + } else { + zend_compile_expr(&value_node, value_ast TSRMLS_CC); + } + value_node_ptr = &value_node; + } + + opline = emit_op(result, ZEND_YIELD, value_node_ptr, key_node_ptr TSRMLS_CC); + + if (value_ast && returns_by_ref && zend_is_call(value_ast)) { + opline->extended_value = ZEND_RETURNS_FUNCTION; + } +} + +void zend_compile_instanceof(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *obj_ast = ast->child[0]; + zend_ast *class_ast = ast->child[1]; + + znode obj_node, class_node; + zend_op *opline; + + zend_compile_expr(&obj_node, obj_ast TSRMLS_CC); + if (obj_node.op_type == IS_CONST) { + zend_error_noreturn(E_COMPILE_ERROR, + "instanceof expects an object instance, constant given"); + } + + opline = zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); + opline->extended_value |= ZEND_FETCH_CLASS_NO_AUTOLOAD; + + emit_op_tmp(result, ZEND_INSTANCEOF, &obj_node, &class_node TSRMLS_CC); +} + void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { switch (ast->kind) { case ZEND_AST_GLOBAL: @@ -8494,6 +8880,12 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_ASSIGN_REF: zend_compile_assign_ref(result, ast TSRMLS_CC); return; + case ZEND_NEW: + zend_compile_new(result, ast TSRMLS_CC); + return; + case ZEND_CLONE: + zend_compile_clone(result, ast TSRMLS_CC); + return; case ZEND_ASSIGN_ADD: case ZEND_ASSIGN_SUB: case ZEND_ASSIGN_MUL: @@ -8508,6 +8900,75 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_ASSIGN_SR: zend_compile_compound_assign(result, ast TSRMLS_CC); return; + case ZEND_BOOL_XOR: + case ZEND_BW_OR: + case ZEND_BW_AND: + case ZEND_BW_XOR: + case ZEND_CONCAT: + case ZEND_ADD: + case ZEND_SUB: + case ZEND_MUL: + case ZEND_POW: + case ZEND_DIV: + case ZEND_MOD: + case ZEND_SL: + case ZEND_SR: + case ZEND_IS_IDENTICAL: + case ZEND_IS_NOT_IDENTICAL: + case ZEND_IS_EQUAL: + case ZEND_IS_NOT_EQUAL: + case ZEND_IS_SMALLER: + case ZEND_IS_SMALLER_OR_EQUAL: + zend_compile_binary_op(result, ast TSRMLS_CC); + return; + case ZEND_AST_GREATER: + case ZEND_AST_GREATER_EQUAL: + zend_compile_greater(result, ast TSRMLS_CC); + return; + case ZEND_BOOL_NOT: + case ZEND_BW_NOT: + zend_compile_unary_op(result, ast TSRMLS_CC); + return; + case ZEND_UNARY_PLUS: + case ZEND_UNARY_MINUS: + zend_compile_unary_pm(result, ast TSRMLS_CC); + return; + case ZEND_AST_AND: + case ZEND_AST_OR: + zend_compile_short_circuiting(result, ast TSRMLS_CC); + return; + case ZEND_POST_INC: + case ZEND_POST_DEC: + zend_compile_post_incdec(result, ast TSRMLS_CC); + return; + case ZEND_PRE_INC: + case ZEND_PRE_DEC: + zend_compile_pre_incdec(result, ast TSRMLS_CC); + return; + case ZEND_AST_CAST_NULL: + case ZEND_AST_CAST_BOOL: + case ZEND_AST_CAST_INT: + case ZEND_AST_CAST_DOUBLE: + case ZEND_AST_CAST_STRING: + case ZEND_AST_CAST_ARRAY: + case ZEND_AST_CAST_OBJECT: + zend_compile_cast(result, ast TSRMLS_CC); + return; + case ZEND_AST_CONDITIONAL: + zend_compile_conditional(result, ast TSRMLS_CC); + return; + case ZEND_PRINT: + zend_compile_print(result, ast TSRMLS_CC); + return; + case ZEND_EXIT: + zend_compile_exit(result, ast TSRMLS_CC); + return; + case ZEND_YIELD: + zend_compile_yield(result, ast TSRMLS_CC); + return; + case ZEND_INSTANCEOF: + zend_compile_instanceof(result, ast TSRMLS_CC); + return; default: ZEND_ASSERT(0 /* not supported */); } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 7fb428f15a..f814288ccd 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -99,6 +99,7 @@ static inline znode *zend_ast_get_znode(zend_ast *ast) { return &((zend_ast_znode *) ast)->node; } +void zend_ensure_writable_variable(const zend_ast *ast); void zend_compile_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_expr(znode *node, zend_ast *ast TSRMLS_DC); void zend_compile_var(znode *node, zend_ast *ast, int type TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 77508e048e..b086c47824 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -326,25 +326,25 @@ unticked_statement: for_statement { zend_do_for_end(&$7 TSRMLS_CC); } | T_SWITCH parenthesis_expr { zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); } | T_BREAK ';' { zend_do_brk_cont(ZEND_BRK, NULL TSRMLS_CC); } - | T_BREAK expr ';' { zend_do_brk_cont(ZEND_BRK, &$2 TSRMLS_CC); } + | T_BREAK expr ';' { AC($2); zend_do_brk_cont(ZEND_BRK, &$2 TSRMLS_CC); } | T_CONTINUE ';' { zend_do_brk_cont(ZEND_CONT, NULL TSRMLS_CC); } - | T_CONTINUE expr ';' { zend_do_brk_cont(ZEND_CONT, &$2 TSRMLS_CC); } + | T_CONTINUE expr ';' { AC($2); zend_do_brk_cont(ZEND_CONT, &$2 TSRMLS_CC); } | T_RETURN ';' { zend_do_return(NULL, 0 TSRMLS_CC); } - | T_RETURN expr_without_variable ';' { zend_do_return(&$2, 0 TSRMLS_CC); } + | T_RETURN expr_without_variable ';' { AC($2); zend_do_return(&$2, 0 TSRMLS_CC); } | T_RETURN variable ';' { zend_do_return(&$2, 1 TSRMLS_CC); } - | yield_expr ';' { zend_do_free(&$1 TSRMLS_CC); } + | yield_expr ';' { AC($1); zend_do_free(&$1 TSRMLS_CC); } | T_GLOBAL global_var_list ';' | T_STATIC static_var_list ';' | T_ECHO echo_expr_list ';' | T_INLINE_HTML { zend_do_echo(&$1 TSRMLS_CC); } - | expr ';' { zend_do_free(&$1 TSRMLS_CC); } + | expr ';' { AC($1); zend_do_free(&$1 TSRMLS_CC); } | T_UNSET '(' unset_variables ')' ';' | T_FOREACH '(' variable T_AS { zend_do_foreach_begin(&$1, &$2, &$3, &$4, 1 TSRMLS_CC); } foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$6, &$7 TSRMLS_CC); } foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); } | T_FOREACH '(' expr_without_variable T_AS - { zend_do_foreach_begin(&$1, &$2, &$3, &$4, 0 TSRMLS_CC); } + { AC($3); zend_do_foreach_begin(&$1, &$2, &$3, &$4, 0 TSRMLS_CC); } foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$6, &$7 TSRMLS_CC); } foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); } | T_DECLARE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); } @@ -352,7 +352,7 @@ unticked_statement: | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' catch_statement { zend_do_bind_catch(&$1, &$6 TSRMLS_CC); } finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); } - | T_THROW expr ';' { zend_do_throw(&$2 TSRMLS_CC); } + | T_THROW expr ';' { AC($2); zend_do_throw(&$2 TSRMLS_CC); } | T_GOTO T_STRING ';' { zend_do_goto(&$2 TSRMLS_CC); } ; @@ -509,7 +509,7 @@ switch_case_list: case_list: /* empty */ { $$.op_type = IS_UNUSED; } - | case_list T_CASE expr case_separator { zend_do_extended_info(TSRMLS_C); zend_do_case_before_statement(&$1, &$2, &$3 TSRMLS_CC); } inner_statement_list { zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } + | case_list T_CASE expr case_separator { AC($3); zend_do_extended_info(TSRMLS_C); zend_do_case_before_statement(&$1, &$2, &$3 TSRMLS_CC); } inner_statement_list { zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } | case_list T_DEFAULT case_separator { zend_do_extended_info(TSRMLS_C); zend_do_default_before_statement(&$1, &$2 TSRMLS_CC); } inner_statement_list { zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } ; @@ -577,47 +577,27 @@ optional_class_type: | fully_qualified_class_name { $$ = $1; } ; - function_call_parameter_list: - '(' ')' { Z_LVAL($$.u.constant) = 0; } - | '(' non_empty_function_call_parameter_list ')' { $$ = $2; } - | '(' yield_expr ')' { zend_do_pass_param(&$2, ZEND_SEND_VAL TSRMLS_CC); } -; - - -non_empty_function_call_parameter_list: - function_call_parameter - | non_empty_function_call_parameter_list ',' function_call_parameter -; - -function_call_parameter: - expr_without_variable { zend_do_pass_param(&$1, ZEND_SEND_VAL TSRMLS_CC); } - | variable { zend_do_pass_param(&$1, ZEND_SEND_VAR TSRMLS_CC); } - | '&' w_variable { zend_do_pass_param(&$2, ZEND_SEND_REF TSRMLS_CC); } - | T_ELLIPSIS expr { zend_do_unpack_params(&$2 TSRMLS_CC); } -; - -function_call_parameter_list_ast: '(' ')' { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); } - | '(' non_empty_function_call_parameter_list_ast ')' { $$.u.ast = $2.u.ast; } + | '(' non_empty_function_call_parameter_list ')' { $$.u.ast = $2.u.ast; } | '(' yield_expr ')' { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); - zend_ast_dynamic_add(&$$.u.ast, AST_ZNODE(&$2)); } + zend_ast_dynamic_add(&$$.u.ast, $2.u.ast); } ; -non_empty_function_call_parameter_list_ast: - function_call_parameter_ast +non_empty_function_call_parameter_list: + function_call_parameter { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); zend_ast_dynamic_add(&$$.u.ast, $1.u.ast); } - | non_empty_function_call_parameter_list_ast ',' function_call_parameter_ast + | non_empty_function_call_parameter_list ',' function_call_parameter { zend_ast_dynamic_add(&$1.u.ast, $3.u.ast); $$.u.ast = $1.u.ast; } ; -function_call_parameter_ast: - expr_without_variable { $$.u.ast = AST_ZNODE(&$1); } +function_call_parameter: + expr_without_variable { $$.u.ast = $1.u.ast; } | variable { $$.u.ast = $1.u.ast; } | '&' w_variable { /* ERROR */ ZEND_ASSERT(0); } - | T_ELLIPSIS expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNPACK, AST_ZNODE(&$2)); } + | T_ELLIPSIS expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNPACK, $2.u.ast); } ; global_var_list: @@ -754,8 +734,8 @@ class_constant_declaration: ; echo_expr_list: - echo_expr_list ',' expr { zend_do_echo(&$3 TSRMLS_CC); } - | expr { zend_do_echo(&$1 TSRMLS_CC); } + echo_expr_list ',' expr { AC($3); zend_do_echo(&$3 TSRMLS_CC); } + | expr { AC($1); zend_do_echo(&$1 TSRMLS_CC); } ; @@ -765,130 +745,132 @@ for_expr: ; non_empty_for_expr: - non_empty_for_expr ',' { zend_do_free(&$1 TSRMLS_CC); } expr { $$ = $4; } - | expr { $$ = $1; } + non_empty_for_expr ',' { zend_do_free(&$1 TSRMLS_CC); } expr { AC($4); $$ = $4; } + | expr { AC($1); $$ = $1; } ; new_expr: - T_NEW class_name_reference { zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$1, &$2 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$$, &$1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} + T_NEW class_name_reference ctor_arguments + { $$.u.ast = zend_ast_create_binary(ZEND_NEW, $2.u.ast, $3.u.ast); } ; expr_without_variable: T_LIST '(' assignment_list ')' '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $3.u.ast, AST_ZNODE(&$6)); - AST_COMPILE(&$$, $$.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $3.u.ast, $6.u.ast); } | variable '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $$.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $1.u.ast, $3.u.ast); } | variable '=' '&' variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.u.ast, $4.u.ast); - AST_COMPILE(&$$, $$.u.ast); } - | variable '=' '&' T_NEW class_name_reference { zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); zend_check_writable_variable(&$1); zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$4, &$5 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$3, &$4 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); zend_do_end_variable_parse(&$1, BP_VAR_W, 0 TSRMLS_CC); $3.EA = ZEND_PARSED_NEW; zend_do_assign_ref(&$$, &$1, &$3 TSRMLS_CC); } - | T_CLONE expr { zend_do_clone(&$$, &$2 TSRMLS_CC); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.u.ast, $4.u.ast); } + | variable '=' '&' T_NEW class_name_reference ctor_arguments + { zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); + $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.u.ast, + zend_ast_create_binary(ZEND_NEW, $5.u.ast, $6.u.ast)); } + | T_CLONE expr { $$.u.ast = zend_ast_create_unary(ZEND_CLONE, $2.u.ast); } | variable T_PLUS_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_ADD, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_ADD, $1.u.ast, $3.u.ast); } | variable T_MINUS_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SUB, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SUB, $1.u.ast, $3.u.ast); } | variable T_MUL_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_MUL, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_MUL, $1.u.ast, $3.u.ast); } | variable T_POW_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_POW, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_POW, $1.u.ast, $3.u.ast); } | variable T_DIV_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_DIV, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_DIV, $1.u.ast, $3.u.ast); } | variable T_CONCAT_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_CONCAT, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_CONCAT, $1.u.ast, $3.u.ast); } | variable T_MOD_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_MOD, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_MOD, $1.u.ast, $3.u.ast); } | variable T_AND_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_AND, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_AND, $1.u.ast, $3.u.ast); } | variable T_OR_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_OR, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_OR, $1.u.ast, $3.u.ast); } | variable T_XOR_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_XOR, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_XOR, $1.u.ast, $3.u.ast); } | variable T_SL_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SL, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SL, $1.u.ast, $3.u.ast); } | variable T_SR_EQUAL expr - { $2.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SR, $1.u.ast, AST_ZNODE(&$3)); - AST_COMPILE(&$$, $2.u.ast); } - | rw_variable T_INC { zend_do_post_incdec(&$$, &$1, ZEND_POST_INC TSRMLS_CC); } - | T_INC rw_variable { zend_do_pre_incdec(&$$, &$2, ZEND_PRE_INC TSRMLS_CC); } - | rw_variable T_DEC { zend_do_post_incdec(&$$, &$1, ZEND_POST_DEC TSRMLS_CC); } - | T_DEC rw_variable { zend_do_pre_incdec(&$$, &$2, ZEND_PRE_DEC TSRMLS_CC); } - | expr T_BOOLEAN_OR { zend_do_boolean_or_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_or_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } - | expr T_BOOLEAN_AND { zend_do_boolean_and_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_and_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } - | expr T_LOGICAL_OR { zend_do_boolean_or_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_or_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } - | expr T_LOGICAL_AND { zend_do_boolean_and_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_and_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } - | expr T_LOGICAL_XOR expr { zend_do_binary_op(ZEND_BOOL_XOR, &$$, &$1, &$3 TSRMLS_CC); } - | expr '|' expr { zend_do_binary_op(ZEND_BW_OR, &$$, &$1, &$3 TSRMLS_CC); } - | expr '&' expr { zend_do_binary_op(ZEND_BW_AND, &$$, &$1, &$3 TSRMLS_CC); } - | expr '^' expr { zend_do_binary_op(ZEND_BW_XOR, &$$, &$1, &$3 TSRMLS_CC); } - | expr '.' expr { zend_do_binary_op(ZEND_CONCAT, &$$, &$1, &$3 TSRMLS_CC); } - | expr '+' expr { zend_do_binary_op(ZEND_ADD, &$$, &$1, &$3 TSRMLS_CC); } - | expr '-' expr { zend_do_binary_op(ZEND_SUB, &$$, &$1, &$3 TSRMLS_CC); } - | expr '*' expr { zend_do_binary_op(ZEND_MUL, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_POW expr { zend_do_binary_op(ZEND_POW, &$$, &$1, &$3 TSRMLS_CC); } - | expr '/' expr { zend_do_binary_op(ZEND_DIV, &$$, &$1, &$3 TSRMLS_CC); } - | expr '%' expr { zend_do_binary_op(ZEND_MOD, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_SL expr { zend_do_binary_op(ZEND_SL, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_SR expr { zend_do_binary_op(ZEND_SR, &$$, &$1, &$3 TSRMLS_CC); } - | '+' expr %prec T_INC { ZVAL_LONG(&$1.u.constant, 0); if ($2.op_type == IS_CONST) { add_function(&$2.u.constant, &$1.u.constant, &$2.u.constant TSRMLS_CC); $$ = $2; } else { $1.op_type = IS_CONST; zend_do_binary_op(ZEND_ADD, &$$, &$1, &$2 TSRMLS_CC); } } - | '-' expr %prec T_INC { ZVAL_LONG(&$1.u.constant, 0); if ($2.op_type == IS_CONST) { sub_function(&$2.u.constant, &$1.u.constant, &$2.u.constant TSRMLS_CC); $$ = $2; } else { $1.op_type = IS_CONST; zend_do_binary_op(ZEND_SUB, &$$, &$1, &$2 TSRMLS_CC); } } - | '!' expr { zend_do_unary_op(ZEND_BOOL_NOT, &$$, &$2 TSRMLS_CC); } - | '~' expr { zend_do_unary_op(ZEND_BW_NOT, &$$, &$2 TSRMLS_CC); } - | expr T_IS_IDENTICAL expr { zend_do_binary_op(ZEND_IS_IDENTICAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_IS_NOT_IDENTICAL expr { zend_do_binary_op(ZEND_IS_NOT_IDENTICAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_IS_EQUAL expr { zend_do_binary_op(ZEND_IS_EQUAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_IS_NOT_EQUAL expr { zend_do_binary_op(ZEND_IS_NOT_EQUAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr '<' expr { zend_do_binary_op(ZEND_IS_SMALLER, &$$, &$1, &$3 TSRMLS_CC); } - | expr T_IS_SMALLER_OR_EQUAL expr { zend_do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$1, &$3 TSRMLS_CC); } - | expr '>' expr { zend_do_binary_op(ZEND_IS_SMALLER, &$$, &$3, &$1 TSRMLS_CC); } - | expr T_IS_GREATER_OR_EQUAL expr { zend_do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$3, &$1 TSRMLS_CC); } - | expr T_INSTANCEOF class_name_reference { zend_do_instanceof(&$$, &$1, &$3, 0 TSRMLS_CC); } - | parenthesis_expr { $$ = $1; } - | new_expr { $$ = $1; } - | expr '?' { zend_do_begin_qm_op(&$1, &$2 TSRMLS_CC); } - expr ':' { zend_do_qm_true(&$4, &$2, &$5 TSRMLS_CC); } - expr { zend_do_qm_false(&$$, &$7, &$2, &$5 TSRMLS_CC); } - | expr '?' ':' { zend_do_jmp_set(&$1, &$2, &$3 TSRMLS_CC); } - expr { zend_do_jmp_set_else(&$$, &$5, &$2, &$3 TSRMLS_CC); } - | internal_functions_in_yacc { $$ = $1; } - | T_INT_CAST expr { zend_do_cast(&$$, &$2, IS_LONG TSRMLS_CC); } - | T_DOUBLE_CAST expr { zend_do_cast(&$$, &$2, IS_DOUBLE TSRMLS_CC); } - | T_STRING_CAST expr { zend_do_cast(&$$, &$2, IS_STRING TSRMLS_CC); } - | T_ARRAY_CAST expr { zend_do_cast(&$$, &$2, IS_ARRAY TSRMLS_CC); } - | T_OBJECT_CAST expr { zend_do_cast(&$$, &$2, IS_OBJECT TSRMLS_CC); } - | T_BOOL_CAST expr { zend_do_cast(&$$, &$2, _IS_BOOL TSRMLS_CC); } - | T_UNSET_CAST expr { zend_do_cast(&$$, &$2, IS_NULL TSRMLS_CC); } - | T_EXIT exit_expr { zend_do_exit(&$$, &$2 TSRMLS_CC); } - | '@' { zend_do_begin_silence(&$1 TSRMLS_CC); } expr { zend_do_end_silence(&$1 TSRMLS_CC); $$ = $3; } - | scalar { $$ = $1; } - | '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); } - | T_PRINT expr { zend_do_print(&$$, &$2 TSRMLS_CC); } - | T_YIELD { zend_do_yield(&$$, NULL, NULL, 0 TSRMLS_CC); } + { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SR, $1.u.ast, $3.u.ast); } + | variable T_INC { $$.u.ast = zend_ast_create_unary(ZEND_POST_INC, $1.u.ast); } + | T_INC variable { $$.u.ast = zend_ast_create_unary(ZEND_PRE_INC, $2.u.ast); } + | variable T_DEC { $$.u.ast = zend_ast_create_unary(ZEND_POST_DEC, $1.u.ast); } + | T_DEC variable { $$.u.ast = zend_ast_create_unary(ZEND_PRE_DEC, $2.u.ast); } + | expr T_BOOLEAN_OR expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_OR, $1.u.ast, $3.u.ast); } + | expr T_BOOLEAN_AND expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } + | expr T_LOGICAL_OR expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_OR, $1.u.ast, $3.u.ast); } + | expr T_LOGICAL_AND expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } + | expr T_LOGICAL_XOR expr + { $$.u.ast = zend_ast_create_binary(ZEND_BOOL_XOR, $1.u.ast, $3.u.ast); } + | expr '|' expr { $$.u.ast = zend_ast_create_binary(ZEND_BW_OR, $1.u.ast, $3.u.ast); } + | expr '&' expr { $$.u.ast = zend_ast_create_binary(ZEND_BW_AND, $1.u.ast, $3.u.ast); } + | expr '^' expr { $$.u.ast = zend_ast_create_binary(ZEND_BW_XOR, $1.u.ast, $3.u.ast); } + | expr '.' expr { $$.u.ast = zend_ast_create_binary(ZEND_CONCAT, $1.u.ast, $3.u.ast); } + | expr '+' expr { $$.u.ast = zend_ast_create_binary(ZEND_ADD, $1.u.ast, $3.u.ast); } + | expr '-' expr { $$.u.ast = zend_ast_create_binary(ZEND_SUB, $1.u.ast, $3.u.ast); } + | expr '*' expr { $$.u.ast = zend_ast_create_binary(ZEND_MUL, $1.u.ast, $3.u.ast); } + | expr T_POW expr { $$.u.ast = zend_ast_create_binary(ZEND_POW, $1.u.ast, $3.u.ast); } + | expr '/' expr { $$.u.ast = zend_ast_create_binary(ZEND_DIV, $1.u.ast, $3.u.ast); } + | expr '%' expr { $$.u.ast = zend_ast_create_binary(ZEND_MOD, $1.u.ast, $3.u.ast); } + | expr T_SL expr { $$.u.ast = zend_ast_create_binary(ZEND_SL, $1.u.ast, $3.u.ast); } + | expr T_SR expr { $$.u.ast = zend_ast_create_binary(ZEND_SR, $1.u.ast, $3.u.ast); } + | '+' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_UNARY_PLUS, $2.u.ast); } + | '-' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_UNARY_MINUS, $2.u.ast); } + | '!' expr { $$.u.ast = zend_ast_create_unary(ZEND_BOOL_NOT, $2.u.ast); } + | '~' expr { $$.u.ast = zend_ast_create_unary(ZEND_BW_NOT, $2.u.ast); } + | expr T_IS_IDENTICAL expr + { $$.u.ast = zend_ast_create_binary(ZEND_IS_IDENTICAL, $1.u.ast, $3.u.ast); } + | expr T_IS_NOT_IDENTICAL expr + { $$.u.ast = zend_ast_create_binary(ZEND_IS_NOT_IDENTICAL, $1.u.ast, $3.u.ast); } + | expr T_IS_EQUAL expr + { $$.u.ast = zend_ast_create_binary(ZEND_IS_EQUAL, $1.u.ast, $3.u.ast); } + | expr T_IS_NOT_EQUAL expr + { $$.u.ast = zend_ast_create_binary(ZEND_IS_NOT_EQUAL, $1.u.ast, $3.u.ast); } + | expr '<' expr + { $$.u.ast = zend_ast_create_binary(ZEND_IS_SMALLER, $1.u.ast, $3.u.ast); } + | expr T_IS_SMALLER_OR_EQUAL expr + { $$.u.ast = zend_ast_create_binary(ZEND_IS_SMALLER_OR_EQUAL, $1.u.ast, $3.u.ast); } + | expr '>' expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_GREATER, $1.u.ast, $3.u.ast); } + | expr T_IS_GREATER_OR_EQUAL expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_GREATER_EQUAL, $1.u.ast, $3.u.ast); } + | expr T_INSTANCEOF class_name_reference + { $$.u.ast = zend_ast_create_binary(ZEND_INSTANCEOF, $1.u.ast, $3.u.ast); } + | parenthesis_expr { $$.u.ast = AST_ZNODE(&$1); } + | new_expr { $$.u.ast = $1.u.ast; } + | expr '?' expr ':' expr + { $$.u.ast = zend_ast_create_ternary( + ZEND_AST_CONDITIONAL, $1.u.ast, $3.u.ast, $5.u.ast); } + | expr '?' ':' expr + { $$.u.ast = zend_ast_create_ternary(ZEND_AST_CONDITIONAL, $1.u.ast, NULL, $4.u.ast); } + | internal_functions_in_yacc { $$.u.ast = AST_ZNODE(&$1); } + | T_INT_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_INT, $2.u.ast); } + | T_DOUBLE_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_DOUBLE, $2.u.ast); } + | T_STRING_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_STRING, $2.u.ast); } + | T_ARRAY_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_ARRAY, $2.u.ast); } + | T_OBJECT_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_OBJECT, $2.u.ast); } + | T_BOOL_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_BOOL, $2.u.ast); } + | T_UNSET_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_NULL, $2.u.ast); } + | T_EXIT exit_expr { $$.u.ast = zend_ast_create_unary(ZEND_EXIT, $2.u.ast); } + | '@' { zend_do_begin_silence(&$1 TSRMLS_CC); } expr { AC($3); zend_do_end_silence(&$1 TSRMLS_CC); $$ = $3; AZ($$); } + | scalar { $$.u.ast = AST_ZNODE(&$1); } + | '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); AZ($$); } + | T_PRINT expr { $$.u.ast = zend_ast_create_unary(ZEND_PRINT, $2.u.ast); } + | T_YIELD { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, NULL, NULL); } | function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); } '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $3; } + '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $3; AZ($$); } | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$ = $4; } + '{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$ = $4; AZ($$); } ; yield_expr: - T_YIELD expr_without_variable { zend_do_yield(&$$, &$2, NULL, 0 TSRMLS_CC); } - | T_YIELD variable { zend_do_yield(&$$, &$2, NULL, 1 TSRMLS_CC); } - | T_YIELD expr T_DOUBLE_ARROW expr_without_variable { zend_do_yield(&$$, &$4, &$2, 0 TSRMLS_CC); } - | T_YIELD expr T_DOUBLE_ARROW variable { zend_do_yield(&$$, &$4, &$2, 1 TSRMLS_CC); } + T_YIELD expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $2.u.ast, NULL); } + | T_YIELD expr T_DOUBLE_ARROW expr + { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } ; function: @@ -908,24 +890,24 @@ lexical_var_list: ; function_call: - namespace_name function_call_parameter_list_ast + namespace_name function_call_parameter_list { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, zend_ast_create_unary(ZEND_AST_NAME, AST_ZVAL(&$1)), $2.u.ast); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name function_call_parameter_list_ast + | T_NAMESPACE T_NS_SEPARATOR namespace_name function_call_parameter_list { ZVAL_EMPTY_STRING(&$1.u.constant); zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, zend_ast_create_unary(ZEND_AST_NAME_FQ, AST_ZVAL(&$1)), $4.u.ast); } - | T_NS_SEPARATOR namespace_name function_call_parameter_list_ast + | T_NS_SEPARATOR namespace_name function_call_parameter_list { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, zend_ast_create_unary(ZEND_AST_NAME_FQ, AST_ZVAL(&$2)), $3.u.ast); } - | class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list_ast + | class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, AST_ZVAL(&$1), $3.u.ast, $4.u.ast); } - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list_ast + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, AST_ZNODE(&$1), $3.u.ast, $4.u.ast); } - | callable_expr function_call_parameter_list_ast + | callable_expr function_call_parameter_list { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.u.ast, $2.u.ast); } ; @@ -945,14 +927,14 @@ fully_qualified_class_name: class_name_reference: - class_name { zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } - | new_variable { AST_COMPILE_VAR(&$1, $1.u.ast, BP_VAR_R); zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } + class_name { $$.u.ast = AST_ZVAL(&$1); } + | new_variable { $$.u.ast = $1.u.ast; } ; exit_expr: - /* empty */ { memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; } - | '(' ')' { memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; } - | parenthesis_expr { $$ = $1; } + /* empty */ { $$.u.ast = NULL; } + | '(' ')' { $$.u.ast = NULL; } + | parenthesis_expr { $$.u.ast = AST_ZNODE(&$1); } ; backticks_expr: @@ -963,8 +945,8 @@ backticks_expr: ctor_arguments: - /* empty */ { Z_LVAL($$.u.constant) = 0; } - | function_call_parameter_list { $$ = $1; } + /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); } + | function_call_parameter_list { $$.u.ast = $1.u.ast; } ; @@ -1083,28 +1065,17 @@ non_empty_static_array_pair_list: ; expr: - r_variable { $$ = $1; } - | expr_without_variable { $$ = $1; } + variable { $$.u.ast = $1.u.ast; } + | expr_without_variable { $$.u.ast = $1.u.ast; } ; parenthesis_expr: - '(' expr ')' { $$ = $2; } - | '(' yield_expr ')' { $$ = $2; } -; - - -r_variable: - variable { zend_compile_var(&$$, $1.u.ast, BP_VAR_R TSRMLS_CC); zend_ast_destroy($1.u.ast); } + '(' expr ')' { AST_COMPILE(&$$, $2.u.ast); } + | '(' yield_expr ')' { AST_COMPILE(&$$, $2.u.ast); } ; w_variable: - variable { zend_compile_var(&$$, $1.u.ast, BP_VAR_W TSRMLS_CC); zend_ast_destroy($1.u.ast); - zend_check_writable_variable(&$1); } -; - -rw_variable: - variable { zend_compile_var(&$$, $1.u.ast, BP_VAR_RW TSRMLS_CC); zend_ast_destroy($1.u.ast); - zend_check_writable_variable(&$$); } + variable { zend_ensure_writable_variable($1.u.ast); AST_COMPILE_VAR(&$$, $1.u.ast, BP_VAR_W); } ; variable_class_name: @@ -1113,13 +1084,13 @@ variable_class_name: dereferencable: variable { $$.u.ast = $1.u.ast; } - | '(' expr ')' { $$.u.ast = AST_ZNODE(&$2); } + | '(' expr ')' { $$.u.ast = $2.u.ast; } | dereferencable_scalar { $$.u.ast = AST_ZNODE(&$1); } ; callable_expr: callable_variable { $$.u.ast = $1.u.ast; } - | '(' expr ')' { $$.u.ast = AST_ZNODE(&$2); } + | '(' expr ')' { $$.u.ast = $2.u.ast; } | dereferencable_scalar { $$.u.ast = AST_ZNODE(&$1); } ; @@ -1129,8 +1100,8 @@ callable_variable: | dereferencable '[' dim_offset ']' { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } | dereferencable '{' expr '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, AST_ZNODE(&$3)); } - | dereferencable T_OBJECT_OPERATOR member_name function_call_parameter_list_ast + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } + | dereferencable T_OBJECT_OPERATOR member_name function_call_parameter_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_METHOD_CALL, $1.u.ast, $3.u.ast, $4.u.ast); } | function_call { $$.u.ast = $1.u.ast; } ; @@ -1148,7 +1119,7 @@ simple_variable: T_VARIABLE { $$.u.ast = AST_ZVAL(&$1); } | '$' '{' expr '}' - { $$.u.ast = zend_ast_create_znode(&$3); } + { $$.u.ast = $3.u.ast; } | '$' simple_variable { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); } ; @@ -1166,7 +1137,7 @@ new_variable: | new_variable '[' dim_offset ']' { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } | new_variable '{' expr '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, AST_ZNODE(&$3)); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } | new_variable T_OBJECT_OPERATOR member_name { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.u.ast, $3.u.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable @@ -1177,12 +1148,12 @@ new_variable: dim_offset: /* empty */ { $$.u.ast = NULL; } - | expr { $$.u.ast = AST_ZNODE(&$1); } + | expr { $$.u.ast = $1.u.ast; } ; member_name: T_STRING { $$.u.ast = AST_ZVAL(&$1); } - | '{' expr '}' { $$.u.ast = AST_ZNODE(&$2); } + | '{' expr '}' { $$.u.ast = $2.u.ast; } | simple_variable { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } ; @@ -1207,13 +1178,13 @@ array_pair_list: ; non_empty_array_pair_list: - non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr { zend_do_add_array_element(&$$, &$5, &$3, 0 TSRMLS_CC); } - | non_empty_array_pair_list ',' expr { zend_do_add_array_element(&$$, &$3, NULL, 0 TSRMLS_CC); } - | expr T_DOUBLE_ARROW expr { zend_do_init_array(&$$, &$3, &$1, 0 TSRMLS_CC); } - | expr { zend_do_init_array(&$$, &$1, NULL, 0 TSRMLS_CC); } - | non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_variable { zend_do_add_array_element(&$$, &$6, &$3, 1 TSRMLS_CC); } + non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr { AC($3); AC($5); zend_do_add_array_element(&$$, &$5, &$3, 0 TSRMLS_CC); } + | non_empty_array_pair_list ',' expr { AC($3); zend_do_add_array_element(&$$, &$3, NULL, 0 TSRMLS_CC); } + | expr T_DOUBLE_ARROW expr { AC($1); AC($3); zend_do_init_array(&$$, &$3, &$1, 0 TSRMLS_CC); } + | expr { AC($1); zend_do_init_array(&$$, &$1, NULL, 0 TSRMLS_CC); } + | non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_variable { AC($3); zend_do_add_array_element(&$$, &$6, &$3, 1 TSRMLS_CC); } | non_empty_array_pair_list ',' '&' w_variable { zend_do_add_array_element(&$$, &$4, NULL, 1 TSRMLS_CC); } - | expr T_DOUBLE_ARROW '&' w_variable { zend_do_init_array(&$$, &$4, &$1, 1 TSRMLS_CC); } + | expr T_DOUBLE_ARROW '&' w_variable { AC($1); zend_do_init_array(&$$, &$4, &$1, 1 TSRMLS_CC); } | '&' w_variable { zend_do_init_array(&$$, &$2, NULL, 1 TSRMLS_CC); } ; @@ -1237,10 +1208,10 @@ encaps_var: { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, zend_ast_create_var(&$1.u.constant), AST_ZNODE(&$3)); } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' - { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, AST_ZNODE(&$2)); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, - zend_ast_create_var(&$2.u.constant), AST_ZNODE(&$4)); } + zend_ast_create_var(&$2.u.constant), $4.u.ast); } | T_CURLY_OPEN variable '}' { $$.u.ast = $2.u.ast; } ; @@ -1254,12 +1225,12 @@ encaps_var_offset: internal_functions_in_yacc: T_ISSET '(' isset_variables ')' { $$ = $3; } | T_EMPTY '(' variable ')' { zend_do_isset_or_isempty(ZEND_ISEMPTY, &$$, &$3 TSRMLS_CC); } - | T_EMPTY '(' expr_without_variable ')' { zend_do_unary_op(ZEND_BOOL_NOT, &$$, &$3 TSRMLS_CC); } - | T_INCLUDE expr { zend_do_include_or_eval(ZEND_INCLUDE, &$$, &$2 TSRMLS_CC); } - | T_INCLUDE_ONCE expr { zend_do_include_or_eval(ZEND_INCLUDE_ONCE, &$$, &$2 TSRMLS_CC); } - | T_EVAL '(' expr ')' { zend_do_include_or_eval(ZEND_EVAL, &$$, &$3 TSRMLS_CC); } - | T_REQUIRE expr { zend_do_include_or_eval(ZEND_REQUIRE, &$$, &$2 TSRMLS_CC); } - | T_REQUIRE_ONCE expr { zend_do_include_or_eval(ZEND_REQUIRE_ONCE, &$$, &$2 TSRMLS_CC); } + | T_EMPTY '(' expr_without_variable ')' { AC($3); zend_do_unary_op(ZEND_BOOL_NOT, &$$, &$3 TSRMLS_CC); } + | T_INCLUDE expr { AC($2); zend_do_include_or_eval(ZEND_INCLUDE, &$$, &$2 TSRMLS_CC); } + | T_INCLUDE_ONCE expr { AC($2); zend_do_include_or_eval(ZEND_INCLUDE_ONCE, &$$, &$2 TSRMLS_CC); } + | T_EVAL '(' expr ')' { AC($3); zend_do_include_or_eval(ZEND_EVAL, &$$, &$3 TSRMLS_CC); } + | T_REQUIRE expr { AC($2); zend_do_include_or_eval(ZEND_REQUIRE, &$$, &$2 TSRMLS_CC); } + | T_REQUIRE_ONCE expr { AC($2); zend_do_include_or_eval(ZEND_REQUIRE_ONCE, &$$, &$2 TSRMLS_CC); } ; isset_variables: -- cgit v1.2.1 From 232a922618203db0541ead2241d4e516cc1a6f96 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 18 Jun 2014 22:32:08 +0200 Subject: Support yield without parens for now => is lowest-prec right-assoc --- Zend/zend_language_parser.y | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index b086c47824..540bd20512 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -188,6 +188,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %token T_EXTENDS "extends (T_EXTENDS)" %token T_IMPLEMENTS "implements (T_IMPLEMENTS)" %token T_OBJECT_OPERATOR "-> (T_OBJECT_OPERATOR)" +%right T_DOUBLE_ARROW %token T_DOUBLE_ARROW "=> (T_DOUBLE_ARROW)" %token T_LIST "list (T_LIST)" %token T_ARRAY "array (T_ARRAY)" @@ -332,7 +333,6 @@ unticked_statement: | T_RETURN ';' { zend_do_return(NULL, 0 TSRMLS_CC); } | T_RETURN expr_without_variable ';' { AC($2); zend_do_return(&$2, 0 TSRMLS_CC); } | T_RETURN variable ';' { zend_do_return(&$2, 1 TSRMLS_CC); } - | yield_expr ';' { AC($1); zend_do_free(&$1 TSRMLS_CC); } | T_GLOBAL global_var_list ';' | T_STATIC static_var_list ';' | T_ECHO echo_expr_list ';' @@ -580,9 +580,6 @@ optional_class_type: function_call_parameter_list: '(' ')' { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); } | '(' non_empty_function_call_parameter_list ')' { $$.u.ast = $2.u.ast; } - | '(' yield_expr ')' - { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); - zend_ast_dynamic_add(&$$.u.ast, $2.u.ast); } ; non_empty_function_call_parameter_list: @@ -859,6 +856,9 @@ expr_without_variable: | '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); AZ($$); } | T_PRINT expr { $$.u.ast = zend_ast_create_unary(ZEND_PRINT, $2.u.ast); } | T_YIELD { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, NULL, NULL); } + | T_YIELD expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $2.u.ast, NULL); } + | T_YIELD expr T_DOUBLE_ARROW expr + { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } | function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); } '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $3; AZ($$); } @@ -867,12 +867,6 @@ expr_without_variable: '{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$ = $4; AZ($$); } ; -yield_expr: - T_YIELD expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $2.u.ast, NULL); } - | T_YIELD expr T_DOUBLE_ARROW expr - { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } -; - function: T_FUNCTION { $$.u.op.opline_num = CG(zend_lineno); } ; @@ -1071,7 +1065,6 @@ expr: parenthesis_expr: '(' expr ')' { AST_COMPILE(&$$, $2.u.ast); } - | '(' yield_expr ')' { AST_COMPILE(&$$, $2.u.ast); } ; w_variable: -- cgit v1.2.1 From 0c81b3eae26bf41fa49b4c3ca538494c2856e3b8 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 14 Jun 2014 21:59:44 +0200 Subject: Remove dead code --- Zend/zend_compile.c | 900 ---------------------------------------------------- Zend/zend_compile.h | 40 --- 2 files changed, 940 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2e69763225..4972ecc15c 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -566,19 +566,6 @@ static inline zend_bool zend_is_function_or_method_call(const znode *variable) / } /* }}} */ -void zend_do_binary_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = op; - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, op1); - SET_NODE(opline->op2, op2); - GET_NODE(result, opline->result); -} -/* }}} */ - void zend_do_unary_op(zend_uchar op, znode *result, znode *op1 TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -602,47 +589,6 @@ static void zend_do_op_data(zend_op *data_op, znode *value TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC) /* {{{ */ -{ - int last_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - if (last_op_number > 0) { - zend_op *last_op = &CG(active_op_array)->opcodes[last_op_number-1]; - - switch (last_op->opcode) { - case ZEND_FETCH_OBJ_RW: - last_op->opcode = op; - last_op->extended_value = ZEND_ASSIGN_OBJ; - - zend_do_op_data(opline, op2 TSRMLS_CC); - SET_UNUSED(opline->result); - GET_NODE(result, last_op->result); - return; - case ZEND_FETCH_DIM_RW: - last_op->opcode = op; - last_op->extended_value = ZEND_ASSIGN_DIM; - - zend_do_op_data(opline, op2 TSRMLS_CC); - opline->op2.var = get_temporary_variable(CG(active_op_array)); - opline->op2_type = IS_VAR; - SET_UNUSED(opline->result); - GET_NODE(result,last_op->result); - return; - default: - break; - } - } - - opline->opcode = op; - SET_NODE(opline->op1, op1); - SET_NODE(opline->op2, op2); - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); -} -/* }}} */ - void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar op TSRMLS_DC) /* {{{ */ { zend_op opline; @@ -701,110 +647,6 @@ void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC) /* { } /* }}} */ -void zend_do_fetch_static_member(znode *result, znode *class_name, znode *member_name TSRMLS_DC) /* {{{ */ -{ - znode class_node; - zend_llist *fetch_list_ptr; - zend_op opline; - - if (class_name->op_type == IS_CONST && - ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant))) { - zend_resolve_class_name(class_name TSRMLS_CC); - class_node = *class_name; - } else { - zend_do_fetch_class(&class_node, class_name TSRMLS_CC); - } - - zend_do_begin_variable_parse(TSRMLS_C); - fetch_list_ptr = zend_stack_top(&CG(bp_stack)); - init_op(&opline TSRMLS_CC); - - opline.opcode = ZEND_FETCH_W; - opline.result_type = IS_VAR; - opline.result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline.op1, member_name); - if (opline.op1_type == IS_CONST) { - GET_POLYMORPHIC_CACHE_SLOT(opline.op1.constant); - } - if (class_node.op_type == IS_CONST) { - opline.op2_type = IS_CONST; - opline.op2.constant = - zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); - } else { - SET_NODE(opline.op2, &class_node); - } - GET_NODE(result,opline.result); - opline.extended_value |= ZEND_FETCH_STATIC_MEMBER; - - zend_llist_add_element(fetch_list_ptr, &opline); -} -/* }}} */ - -void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC) /* {{{ */ -{ - fetch_simple_variable(result, varname, 1 TSRMLS_CC); - - fetch_array_dim(result, result, first_dim TSRMLS_CC); -} -/* }}} */ - -void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC) /* {{{ */ -{ - zend_op opline; - zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); - - if (zend_is_function_or_method_call(parent)) { - init_op(&opline TSRMLS_CC); - opline.opcode = ZEND_SEPARATE; - SET_NODE(opline.op1, parent); - SET_UNUSED(opline.op2); - opline.result_type = IS_VAR; - opline.result.var = opline.op1.var; - zend_llist_add_element(fetch_list_ptr, &opline); - } - - init_op(&opline TSRMLS_CC); - opline.opcode = ZEND_FETCH_DIM_W; /* the backpatching routine assumes W */ - opline.result_type = IS_VAR; - opline.result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline.op1, parent); - SET_NODE(opline.op2, dim); - if (opline.op2_type == IS_CONST && Z_TYPE(CONSTANT(opline.op2.constant)) == IS_STRING) { - ulong index; - int numeric = 0; - - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(CONSTANT(opline.op2.constant)), Z_STRLEN(CONSTANT(opline.op2.constant))+1, index, numeric = 1); - if (numeric) { - zval_dtor(&CONSTANT(opline.op2.constant)); - ZVAL_LONG(&CONSTANT(opline.op2.constant), index); - } - } - - GET_NODE(result, opline.result); - - zend_llist_add_element(fetch_list_ptr, &opline); -} -/* }}} */ - -void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC) /* {{{ */ -{ - fetch_array_dim(result, parent, offset TSRMLS_CC); -} -/* }}} */ - -void zend_do_print(znode *result, znode *arg TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - opline->opcode = ZEND_PRINT; - SET_NODE(opline->op1, arg); - SET_UNUSED(opline->op2); - GET_NODE(result, opline->result); -} -/* }}} */ - void zend_do_echo(znode *arg TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -1929,135 +1771,6 @@ void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, } /* }}} */ -int zend_do_begin_function_call(znode *function_name, zend_bool check_namespace TSRMLS_DC) /* {{{ */ -{ - zend_function *function; - zend_string *lcname; - char *is_compound = memchr(Z_STRVAL(function_name->u.constant), '\\', Z_STRLEN(function_name->u.constant)); - - zend_resolve_function_name(function_name, &check_namespace TSRMLS_CC); - - if (check_namespace && Z_TYPE(CG(current_namespace)) != IS_UNDEF && !is_compound) { - /* We assume we call function from the current namespace - if it is not prefixed. */ - - /* In run-time PHP will check for function with full name and - internal function with short name */ - zend_do_begin_dynamic_function_call(function_name, 1 TSRMLS_CC); - return 1; - } - - lcname = STR_ALLOC(Z_STRLEN(function_name->u.constant), 0); - zend_str_tolower_copy(lcname->val, Z_STRVAL(function_name->u.constant), Z_STRLEN(function_name->u.constant)); - if (((function = zend_hash_find_ptr(CG(function_table), lcname)) == NULL) || - ((CG(compiler_options) & ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS) && - (function->type == ZEND_INTERNAL_FUNCTION))) { - zend_do_begin_dynamic_function_call(function_name, 0 TSRMLS_CC); - efree(lcname); - return 1; /* Dynamic */ - } - STR_RELEASE(Z_STR(function_name->u.constant)); - Z_STR(function_name->u.constant) = lcname; - - zend_push_function_call_entry(function TSRMLS_CC); - if (CG(context).nested_calls + 1 > CG(active_op_array)->nested_calls) { - CG(active_op_array)->nested_calls = CG(context).nested_calls + 1; - } - zend_do_extended_fcall_begin(TSRMLS_C); - return 0; -} -/* }}} */ - -void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC) /* {{{ */ -{ - zend_op *last_op; - int last_op_number; - - zend_do_end_variable_parse(left_bracket, BP_VAR_R, 0 TSRMLS_CC); - zend_do_begin_variable_parse(TSRMLS_C); - - last_op_number = get_next_op_number(CG(active_op_array))-1; - last_op = &CG(active_op_array)->opcodes[last_op_number]; - - if ((last_op->op2_type == IS_CONST) && (Z_TYPE(CONSTANT(last_op->op2.constant)) == IS_STRING) && (Z_STRLEN(CONSTANT(last_op->op2.constant)) == sizeof(ZEND_CLONE_FUNC_NAME)-1) - && !zend_binary_strcasecmp(Z_STRVAL(CONSTANT(last_op->op2.constant)), Z_STRLEN(CONSTANT(last_op->op2.constant)), ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)-1)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot call __clone() method on objects - use 'clone $obj' instead"); - } - - /* Convert ZEND_FETCH_OBJ_R to ZEND_INIT_METHOD_CALL */ - last_op->opcode = ZEND_INIT_METHOD_CALL; - last_op->result_type = IS_UNUSED; - last_op->result.num = CG(context).nested_calls; - Z_LVAL(left_bracket->u.constant) = ZEND_INIT_FCALL_BY_NAME; - if (last_op->op2_type == IS_CONST) { - zval name; - name = CONSTANT(last_op->op2.constant); - if (Z_TYPE(name) != IS_STRING) { - zend_error_noreturn(E_COMPILE_ERROR, "Method name must be a string"); - } - Z_STR(name) = STR_COPY(Z_STR(name)); - FREE_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant); - last_op->op2.constant = - zend_add_func_name_literal(CG(active_op_array), &name TSRMLS_CC); - GET_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant); - } - - zend_push_function_call_entry(NULL TSRMLS_CC); - if (++CG(context).nested_calls > CG(active_op_array)->nested_calls) { - CG(active_op_array)->nested_calls = CG(context).nested_calls; - } - zend_do_extended_fcall_begin(TSRMLS_C); -} -/* }}} */ - -void zend_do_clone(znode *result, znode *expr TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_CLONE; - SET_NODE(opline->op1, expr); - SET_UNUSED(opline->op2); - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); -} -/* }}} */ - -void zend_do_begin_dynamic_function_call(znode *function_name, int ns_call TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - if (ns_call) { - /* In run-time PHP will check for function with full name and - internal function with short name */ - opline->opcode = ZEND_INIT_NS_FCALL_BY_NAME; - opline->result.num = CG(context).nested_calls; - SET_UNUSED(opline->op1); - opline->op2_type = IS_CONST; - opline->op2.constant = zend_add_ns_func_name_literal(CG(active_op_array), &function_name->u.constant TSRMLS_CC); - GET_CACHE_SLOT(opline->op2.constant); - } else { - opline->opcode = ZEND_INIT_FCALL_BY_NAME; - opline->result.num = CG(context).nested_calls; - SET_UNUSED(opline->op1); - if (function_name->op_type == IS_CONST && Z_TYPE(function_name->u.constant) == IS_STRING) { - opline->op2_type = IS_CONST; - opline->op2.constant = zend_add_func_name_literal(CG(active_op_array), &function_name->u.constant TSRMLS_CC); - GET_CACHE_SLOT(opline->op2.constant); - } else { - SET_NODE(opline->op2, function_name); - } - } - - zend_push_function_call_entry(NULL TSRMLS_CC); - if (++CG(context).nested_calls > CG(active_op_array)->nested_calls) { - CG(active_op_array)->nested_calls = CG(context).nested_calls; - } - zend_do_extended_fcall_begin(TSRMLS_C); -} -/* }}} */ - void zend_resolve_non_class_name(znode *element_name, zend_bool *check_namespace, zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC) /* {{{ */ { znode tmp; @@ -2447,66 +2160,6 @@ void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_c } /* }}} */ -int zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC) /* {{{ */ -{ - znode class_node; - zend_op *opline; - - if (method_name->op_type == IS_CONST) { - char *lcname; - if (Z_TYPE(method_name->u.constant) != IS_STRING) { - zend_error_noreturn(E_COMPILE_ERROR, "Method name must be a string"); - } - lcname = zend_str_tolower_dup(Z_STRVAL(method_name->u.constant), Z_STRLEN(method_name->u.constant)); - if ((sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == Z_STRLEN(method_name->u.constant) && - memcmp(lcname, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == 0) { - zval_dtor(&method_name->u.constant); - method_name->op_type = IS_UNUSED; - } - efree(lcname); - } - - if (class_name->op_type == IS_CONST && - ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant))) { - zend_resolve_class_name(class_name TSRMLS_CC); - class_node = *class_name; - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - } else { - zend_do_fetch_class(&class_node, class_name TSRMLS_CC); - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->extended_value = class_node.EA ; - } - opline->opcode = ZEND_INIT_STATIC_METHOD_CALL; - opline->result.num = CG(context).nested_calls; - if (class_node.op_type == IS_CONST) { - opline->op1_type = IS_CONST; - opline->op1.constant = - zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); - } else { - SET_NODE(opline->op1, &class_node); - } - if (method_name->op_type == IS_CONST) { - opline->op2_type = IS_CONST; - opline->op2.constant = - zend_add_func_name_literal(CG(active_op_array), &method_name->u.constant TSRMLS_CC); - if (opline->op1_type == IS_CONST) { - GET_CACHE_SLOT(opline->op2.constant); - } else { - GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); - } - } else { - SET_NODE(opline->op2, method_name); - } - - zend_push_function_call_entry(NULL TSRMLS_CC); - if (++CG(context).nested_calls > CG(active_op_array)->nested_calls) { - CG(active_op_array)->nested_calls = CG(context).nested_calls; - } - zend_do_extended_fcall_begin(TSRMLS_C); - return 1; /* Dynamic */ -} -/* }}} */ - void zend_do_end_function_call(znode *function_name, znode *result, int is_method, int is_dynamic_fcall TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -2556,156 +2209,6 @@ void zend_do_end_function_call(znode *function_name, znode *result, int is_metho static zend_bool zend_is_call(zend_ast *ast); -void zend_do_pass_param(znode *param, zend_uchar op TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - int original_op = op; - zend_function_call_entry *fcall = zend_stack_top(&CG(function_call_stack)); - zend_function *function_ptr = fcall->fbc; - int send_by_reference = 0; - int send_function = 0; - - fcall->arg_num++; - - if (fcall->uses_argument_unpacking) { - zend_error_noreturn(E_COMPILE_ERROR, - "Cannot use positional argument after argument unpacking"); - } - - if (original_op == ZEND_SEND_REF) { - if (function_ptr && - function_ptr->common.function_name && - function_ptr->common.type == ZEND_USER_FUNCTION && - !ARG_SHOULD_BE_SENT_BY_REF(function_ptr, fcall->arg_num)) { - zend_error_noreturn(E_COMPILE_ERROR, - "Call-time pass-by-reference has been removed; " - "If you would like to pass argument by reference, modify the declaration of %s().", - function_ptr->common.function_name->val); - } else { - zend_error_noreturn(E_COMPILE_ERROR, "Call-time pass-by-reference has been removed"); - } - return; - } - - if (function_ptr) { - if (ARG_MAY_BE_SENT_BY_REF(function_ptr, fcall->arg_num)) { - // TODO.AST - if (op == ZEND_SEND_VAR /*&& param->op_type & (IS_VAR|IS_CV)*/) { - send_by_reference = ZEND_ARG_SEND_BY_REF; - if (zend_is_call(param->u.ast)) { - op = ZEND_SEND_VAR_NO_REF; - send_function = ZEND_ARG_SEND_FUNCTION | ZEND_ARG_SEND_SILENT; - } - } else { - op = ZEND_SEND_VAL; - } - } else if (ARG_SHOULD_BE_SENT_BY_REF(function_ptr, fcall->arg_num)) { - send_by_reference = ZEND_ARG_SEND_BY_REF; - } - } - - if (op == ZEND_SEND_VAR && zend_is_call(param->u.ast)) { - op = ZEND_SEND_VAR_NO_REF; - send_function = ZEND_ARG_SEND_FUNCTION; - } else if (op == ZEND_SEND_VAL && (param->op_type & (IS_VAR|IS_CV))) { - op = ZEND_SEND_VAR_NO_REF; - } - - if (op!=ZEND_SEND_VAR_NO_REF && send_by_reference==ZEND_ARG_SEND_BY_REF) { - /* change to passing by reference */ - /*switch (param->op_type) { - case IS_VAR: - case IS_CV: - op = ZEND_SEND_REF; - break; - default: - zend_error_noreturn(E_COMPILE_ERROR, "Only variables can be passed by reference"); - break; - }*/ - // TODO.AST - op = ZEND_SEND_REF; - } - - if (original_op == ZEND_SEND_VAR) { - switch (op) { - case ZEND_SEND_VAR_NO_REF: - AST_COMPILE_VAR(param, param->u.ast, BP_VAR_R); - break; - case ZEND_SEND_VAR: - if (function_ptr) { - AST_COMPILE_VAR(param, param->u.ast, BP_VAR_R); - } else { - // TODO.AST ! - //zend_do_end_variable_parse(param, BP_VAR_FUNC_ARG, fcall->arg_num TSRMLS_CC); - AST_COMPILE_VAR(param, param->u.ast, BP_VAR_R); - } - break; - case ZEND_SEND_REF: - AST_COMPILE_VAR(param, param->u.ast, BP_VAR_W); - break; - } - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - if (op == ZEND_SEND_VAR_NO_REF) { - if (function_ptr) { - opline->extended_value = ZEND_ARG_COMPILE_TIME_BOUND | send_by_reference | send_function; - } else { - opline->extended_value = send_function; - } - } else { - if (function_ptr) { - opline->extended_value = ZEND_DO_FCALL; - } else { - opline->extended_value = ZEND_DO_FCALL_BY_NAME; - } - } - opline->opcode = op; - SET_NODE(opline->op1, param); - opline->op2.opline_num = fcall->arg_num; - SET_UNUSED(opline->op2); - - if (++CG(context).used_stack > CG(active_op_array)->used_stack) { - CG(active_op_array)->used_stack = CG(context).used_stack; - } -} -/* }}} */ - -void zend_do_unpack_params(znode *params TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - zend_function_call_entry *fcall = zend_stack_top(&CG(function_call_stack)); - - fcall->uses_argument_unpacking = 1; - - if (fcall->fbc) { - /* If argument unpacking is used argument numbers and sending modes can no longer be - * computed at compile time, thus we need access to EX(call). In order to have it we - * retroactively emit a ZEND_INIT_FCALL_BY_NAME opcode. */ - zval func_name; - ZVAL_STR(&func_name, STR_COPY(fcall->fbc->common.function_name)); - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_INIT_FCALL_BY_NAME; - opline->result.num = CG(context).nested_calls; - SET_UNUSED(opline->op1); - opline->op2_type = IS_CONST; - opline->op2.constant = zend_add_func_name_literal(CG(active_op_array), &func_name TSRMLS_CC); - GET_CACHE_SLOT(opline->op2.constant); - - ++CG(context).nested_calls; - fcall->fbc = NULL; - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_SEND_UNPACK; - SET_NODE(opline->op1, params); - SET_UNUSED(opline->op2); - opline->op2.num = fcall->arg_num; -} -/* }}} */ - static int generate_free_switch_expr(zend_switch_entry *switch_entry TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -2805,52 +2308,6 @@ void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_yield(znode *result, znode *value, znode *key, zend_bool is_variable TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - zend_bool is_call = 0; - - if (!CG(active_op_array)->function_name) { - zend_error_noreturn(E_COMPILE_ERROR, "The \"yield\" expression can only be used inside a function"); - } - - CG(active_op_array)->fn_flags |= ZEND_ACC_GENERATOR; - - if (is_variable) { - is_call = zend_is_call(value->u.ast); - if ((CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) && !is_call) { - AST_COMPILE_VAR(value, value->u.ast, BP_VAR_REF); - } else { - AST_COMPILE_VAR(value, value->u.ast, BP_VAR_R); - } - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_YIELD; - - if (value) { - SET_NODE(opline->op1, value); - - if (is_call) { - opline->extended_value = ZEND_RETURNS_FUNCTION; - } - } else { - SET_UNUSED(opline->op1); - } - - if (key) { - SET_NODE(opline->op2, key); - } else { - SET_UNUSED(opline->op2); - } - - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); -} -/* }}} */ - static int zend_add_try_element(zend_uint try_op TSRMLS_DC) /* {{{ */ { int try_catch_offset = CG(active_op_array)->last_try_catch++; @@ -5481,77 +4938,6 @@ void zend_do_declare_class_constant(znode *var_name, znode *value TSRMLS_DC) /* } /* }}} */ -void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS_DC) /* {{{ */ -{ - zend_op opline; - zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); - - if (object->op_type == IS_CV) { - if (object->u.op.var == CG(active_op_array)->this_var) { - object->op_type = IS_UNUSED; /* this means $this for objects */ - } - } else if (fetch_list_ptr->count == 1) { - zend_llist_element *le = fetch_list_ptr->head; - zend_op *opline_ptr = (zend_op *) le->data; - - if (opline_is_fetch_this(opline_ptr TSRMLS_CC)) { - zend_del_literal(CG(active_op_array), opline_ptr->op1.constant); - SET_UNUSED(opline_ptr->op1); /* this means $this for objects */ - SET_NODE(opline_ptr->op2, property); - /* if it was usual fetch, we change it to object fetch */ - switch (opline_ptr->opcode) { - case ZEND_FETCH_W: - opline_ptr->opcode = ZEND_FETCH_OBJ_W; - break; - case ZEND_FETCH_R: - opline_ptr->opcode = ZEND_FETCH_OBJ_R; - break; - case ZEND_FETCH_RW: - opline_ptr->opcode = ZEND_FETCH_OBJ_RW; - break; - case ZEND_FETCH_IS: - opline_ptr->opcode = ZEND_FETCH_OBJ_IS; - break; - case ZEND_FETCH_UNSET: - opline_ptr->opcode = ZEND_FETCH_OBJ_UNSET; - break; - case ZEND_FETCH_FUNC_ARG: - opline_ptr->opcode = ZEND_FETCH_OBJ_FUNC_ARG; - break; - } - if (opline_ptr->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline_ptr->op2.constant)) == IS_STRING) { - GET_POLYMORPHIC_CACHE_SLOT(opline_ptr->op2.constant); - } - GET_NODE(result, opline_ptr->result); - return; - } - } - - if (zend_is_function_or_method_call(object)) { - init_op(&opline TSRMLS_CC); - opline.opcode = ZEND_SEPARATE; - SET_NODE(opline.op1, object); - SET_UNUSED(opline.op2); - opline.result_type = IS_VAR; - opline.result.var = opline.op1.var; - zend_llist_add_element(fetch_list_ptr, &opline); - } - - init_op(&opline TSRMLS_CC); - opline.opcode = ZEND_FETCH_OBJ_W; /* the backpatching routine assumes W */ - opline.result_type = IS_VAR; - opline.result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline.op1, object); - SET_NODE(opline.op2, property); - if (opline.op2_type == IS_CONST && Z_TYPE(CONSTANT(opline.op2.constant)) == IS_STRING) { - GET_POLYMORPHIC_CACHE_SLOT(opline.op2.constant); - } - GET_NODE(result, opline.result); - - zend_llist_add_element(fetch_list_ptr, &opline); -} -/* }}} */ - void zend_do_halt_compiler_register(TSRMLS_D) /* {{{ */ { zend_string *name; @@ -5573,38 +4959,6 @@ void zend_do_halt_compiler_register(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_do_begin_new_object(znode *new_token, znode *class_type TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - - new_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_NEW; - opline->extended_value = CG(context).nested_calls; - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, class_type); - SET_UNUSED(opline->op2); - - zend_push_function_call_entry(NULL TSRMLS_CC); - if (++CG(context).nested_calls > CG(active_op_array)->nested_calls) { - CG(active_op_array)->nested_calls = CG(context).nested_calls; - } -} -/* }}} */ - -void zend_do_end_new_object(znode *result, const znode *new_token TSRMLS_DC) /* {{{ */ -{ - znode ctor_result; - - zend_do_end_function_call(NULL, &ctor_result, 1, 0 TSRMLS_CC); - zend_do_free(&ctor_result TSRMLS_CC); - - CG(active_op_array)->opcodes[new_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array)); - GET_NODE(result, CG(active_op_array)->opcodes[new_token->u.op.opline_num].result); -} -/* }}} */ - static zend_constant* zend_get_ct_const(const zval *const_name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */ { zend_constant *c = NULL; @@ -6009,108 +5363,6 @@ str_index: } /* }}} */ -void zend_do_add_list_element(const znode *element TSRMLS_DC) /* {{{ */ -{ - list_llist_element lle; - - if (element) { - zend_check_writable_variable(element); - - lle.var = *element; - zend_llist_copy(&lle.dimensions, &CG(dimension_llist)); - zend_llist_prepend_element(&CG(list_llist), &lle); - } - (*((int *)CG(dimension_llist).tail->data))++; -} -/* }}} */ - -void zend_do_new_list_begin(TSRMLS_D) /* {{{ */ -{ - int current_dimension = 0; - zend_llist_add_element(&CG(dimension_llist), ¤t_dimension); -} -/* }}} */ - -void zend_do_new_list_end(TSRMLS_D) /* {{{ */ -{ - zend_llist_remove_tail(&CG(dimension_llist)); - (*((int *)CG(dimension_llist).tail->data))++; -} -/* }}} */ - -void zend_do_list_init(TSRMLS_D) /* {{{ */ -{ - zend_stack_push(&CG(list_stack), &CG(list_llist)); - zend_stack_push(&CG(list_stack), &CG(dimension_llist)); - zend_llist_init(&CG(list_llist), sizeof(list_llist_element), NULL, 0); - zend_llist_init(&CG(dimension_llist), sizeof(int), NULL, 0); - zend_do_new_list_begin(TSRMLS_C); -} -/* }}} */ - -void zend_do_list_end(znode *result, znode *expr TSRMLS_DC) /* {{{ */ -{ - zend_llist_element *le; - zend_llist_element *dimension; - zend_op *opline; - znode last_container; - - le = CG(list_llist).head; - while (le) { - zend_llist *tmp_dimension_llist = &((list_llist_element *)le->data)->dimensions; - dimension = tmp_dimension_llist->head; - while (dimension) { - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - if (dimension == tmp_dimension_llist->head) { /* first */ - last_container = *expr; - switch (expr->op_type) { - case IS_VAR: - case IS_CV: - opline->opcode = ZEND_FETCH_DIM_R; - break; - case IS_TMP_VAR: - opline->opcode = ZEND_FETCH_DIM_TMP_VAR; - break; - case IS_CONST: /* fetch_dim_tmp_var will handle this bogus fetch */ - zval_copy_ctor(&expr->u.constant); - opline->opcode = ZEND_FETCH_DIM_TMP_VAR; - break; - } - opline->extended_value |= ZEND_FETCH_ADD_LOCK; - } else { - opline->opcode = ZEND_FETCH_DIM_R; - } - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, &last_container); - opline->op2_type = IS_CONST; - LITERAL_LONG(opline->op2, *((int *) dimension->data)); - GET_NODE(&last_container, opline->result); - dimension = dimension->next; - } - ((list_llist_element *) le->data)->value = last_container; - zend_llist_destroy(&((list_llist_element *) le->data)->dimensions); - zend_do_assign(result, &((list_llist_element *) le->data)->var, &((list_llist_element *) le->data)->value TSRMLS_CC); - zend_do_free(result TSRMLS_CC); - le = le->next; - } - zend_llist_destroy(&CG(dimension_llist)); - zend_llist_destroy(&CG(list_llist)); - *result = *expr; - { - zend_llist *p; - - /* restore previous lists */ - p = zend_stack_top(&CG(list_stack)); - CG(dimension_llist) = *p; - zend_stack_del_top(&CG(list_stack)); - p = zend_stack_top(&CG(list_stack)); - CG(list_llist) = *p; - zend_stack_del_top(&CG(list_stack)); - } -} -/* }}} */ - void zend_init_list(void *result, void *item TSRMLS_DC) /* {{{ */ { void** list = emalloc(sizeof(void*) * 2); @@ -6245,20 +5497,6 @@ void zend_do_fetch_global_variable(znode *varname, const znode *static_assignmen } /* }}} */ -void zend_do_cast(znode *result, znode *expr, int type TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_CAST; - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, expr); - SET_UNUSED(opline->op2); - opline->extended_value = type; - GET_NODE(result, opline->result); -} -/* }}} */ - void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC) /* {{{ */ { zend_do_extended_fcall_begin(TSRMLS_C); @@ -6659,19 +5897,6 @@ void zend_do_declare_end(const znode *declare_token TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_exit(znode *result, znode *message TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_EXIT; - SET_NODE(opline->op1, message); - SET_UNUSED(opline->op2); - - result->op_type = IS_CONST; - ZVAL_BOOL(&result->u.constant, 1); -} -/* }}} */ - void zend_do_begin_silence(znode *strudel_token TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -6695,131 +5920,6 @@ void zend_do_end_silence(znode *strudel_token TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_jmp_set(znode *value, znode *jmp_token, znode *colon_token TSRMLS_DC) /* {{{ */ -{ - int op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - if (value->op_type == IS_VAR || value->op_type == IS_CV) { - opline->opcode = ZEND_JMP_SET_VAR; - opline->result_type = IS_VAR; - } else { - opline->opcode = ZEND_JMP_SET; - opline->result_type = IS_TMP_VAR; - } - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, value); - SET_UNUSED(opline->op2); - - GET_NODE(colon_token, opline->result); - - jmp_token->u.op.opline_num = op_number; - - INC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_jmp_set_else(znode *result, znode *false_value, const znode *jmp_token, znode *colon_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - SET_NODE(opline->result, colon_token); - if (colon_token->op_type == IS_TMP_VAR) { - if (false_value->op_type == IS_VAR || false_value->op_type == IS_CV) { - CG(active_op_array)->opcodes[jmp_token->u.op.opline_num].opcode = ZEND_JMP_SET_VAR; - CG(active_op_array)->opcodes[jmp_token->u.op.opline_num].result_type = IS_VAR; - opline->opcode = ZEND_QM_ASSIGN_VAR; - opline->result_type = IS_VAR; - } else { - opline->opcode = ZEND_QM_ASSIGN; - } - } else { - opline->opcode = ZEND_QM_ASSIGN_VAR; - } - opline->extended_value = 0; - SET_NODE(opline->op1, false_value); - SET_UNUSED(opline->op2); - - GET_NODE(result, opline->result); - - CG(active_op_array)->opcodes[jmp_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array)); - - DEC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_begin_qm_op(znode *cond, znode *qm_token TSRMLS_DC) /* {{{ */ -{ - int jmpz_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline; - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMPZ; - SET_NODE(opline->op1, cond); - SET_UNUSED(opline->op2); - opline->op2.opline_num = jmpz_op_number; - GET_NODE(qm_token, opline->op2); - - INC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_qm_true(znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - CG(active_op_array)->opcodes[qm_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array))+1; /* jmp over the ZEND_JMP */ - - if (true_value->op_type == IS_VAR || true_value->op_type == IS_CV) { - opline->opcode = ZEND_QM_ASSIGN_VAR; - opline->result_type = IS_VAR; - } else { - opline->opcode = ZEND_QM_ASSIGN; - opline->result_type = IS_TMP_VAR; - } - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, true_value); - SET_UNUSED(opline->op2); - - GET_NODE(qm_token, opline->result); - colon_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_JMP; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); -} -/* }}} */ - -void zend_do_qm_false(znode *result, znode *false_value, znode *qm_token, const znode *colon_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - SET_NODE(opline->result, qm_token); - if (qm_token->op_type == IS_TMP_VAR) { - if (false_value->op_type == IS_VAR || false_value->op_type == IS_CV) { - CG(active_op_array)->opcodes[colon_token->u.op.opline_num - 1].opcode = ZEND_QM_ASSIGN_VAR; - CG(active_op_array)->opcodes[colon_token->u.op.opline_num - 1].result_type = IS_VAR; - opline->opcode = ZEND_QM_ASSIGN_VAR; - opline->result_type = IS_VAR; - } else { - opline->opcode = ZEND_QM_ASSIGN; - } - } else { - opline->opcode = ZEND_QM_ASSIGN_VAR; - } - SET_NODE(opline->op1, false_value); - SET_UNUSED(opline->op2); - - CG(active_op_array)->opcodes[colon_token->u.op.opline_num].op1.opline_num = get_next_op_number(CG(active_op_array)); - - GET_NODE(result, opline->result); - - DEC_BPC(CG(active_op_array)); -} -/* }}} */ - void zend_do_extended_info(TSRMLS_D) /* {{{ */ { zend_op *opline; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index f814288ccd..bbf2bc7274 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -467,9 +467,7 @@ int zend_get_zendleng(TSRMLS_D); /* parser-driven code generators */ -void zend_do_binary_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC); void zend_do_unary_op(zend_uchar op, znode *result, znode *op1 TSRMLS_DC); -void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC); void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC); void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC); void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC); @@ -478,11 +476,6 @@ void zend_do_indirect_reference(znode *result, znode *variable TSRMLS_DC); void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC); void zend_do_fetch_global_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC); -void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC); -void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC); -void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC); -void zend_do_fetch_static_member(znode *result, znode *class_name, znode *member_name TSRMLS_DC); -void zend_do_print(znode *result, znode *arg TSRMLS_DC); void zend_do_echo(znode *arg TSRMLS_DC); typedef int (*unary_op_type)(zval *, zval * TSRMLS_DC); typedef int (*binary_op_type)(zval *, zval *, zval * TSRMLS_DC); @@ -521,16 +514,10 @@ int zend_do_verify_access_types(const znode *current_access_type, const znode *n void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC); void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC); void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, znode *class_type, zend_bool pass_by_reference, zend_bool is_variadic TSRMLS_DC); -int zend_do_begin_function_call(znode *function_name, zend_bool check_namespace TSRMLS_DC); -void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC); -void zend_do_clone(znode *result, znode *expr TSRMLS_DC); -void zend_do_begin_dynamic_function_call(znode *function_name, int prefix_len TSRMLS_DC); void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC); void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC); -int zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC); void zend_do_end_function_call(znode *function_name, znode *result, int is_method, int is_dynamic_fcall TSRMLS_DC); void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC); -void zend_do_yield(znode *result, znode *value, znode *key, zend_bool is_variable TSRMLS_DC); void zend_do_handle_exception(TSRMLS_D); void zend_do_begin_lambda_function_declaration(znode *result, znode *function_token, int return_reference, int is_static TSRMLS_DC); @@ -564,9 +551,6 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent void zend_do_early_binding(TSRMLS_D); ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS_DC); -void zend_do_pass_param(znode *param, zend_uchar op TSRMLS_DC); -void zend_do_unpack_params(znode *params TSRMLS_DC); - void zend_do_boolean_or_begin(znode *expr1, znode *op_token TSRMLS_DC); void zend_do_boolean_or_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC); @@ -586,17 +570,8 @@ void zend_do_end_class_declaration(const znode *class_token, const znode *parent void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC); void zend_do_declare_class_constant(znode *var_name, znode *value TSRMLS_DC); -void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS_DC); - void zend_do_halt_compiler_register(TSRMLS_D); -void zend_do_push_object(const znode *object TSRMLS_DC); -void zend_do_pop_object(znode *object TSRMLS_DC); - - -void zend_do_begin_new_object(znode *new_token, znode *class_type TSRMLS_DC); -void zend_do_end_new_object(znode *result, const znode *new_token TSRMLS_DC); - void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode, zend_bool check_namespace TSRMLS_DC); void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC); @@ -604,18 +579,12 @@ void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC); void zend_do_init_array(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC); void zend_do_add_array_element(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC); void zend_do_end_array(znode *result, const znode *array_node TSRMLS_DC); -void zend_do_list_init(TSRMLS_D); -void zend_do_list_end(znode *result, znode *expr TSRMLS_DC); -void zend_do_add_list_element(const znode *element TSRMLS_DC); -void zend_do_new_list_begin(TSRMLS_D); -void zend_do_new_list_end(TSRMLS_D); /* Functions for a null terminated pointer list, used for traits parsing and compilation */ void zend_init_list(void *result, void *item TSRMLS_DC); void zend_add_to_list(void *result, void *item TSRMLS_DC); -void zend_do_cast(znode *result, znode *expr, int type TSRMLS_DC); void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC); void zend_do_unset(znode *variable TSRMLS_DC); @@ -631,18 +600,9 @@ void zend_do_declare_begin(TSRMLS_D); void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC); void zend_do_declare_end(const znode *declare_token TSRMLS_DC); -void zend_do_exit(znode *result, znode *message TSRMLS_DC); - void zend_do_begin_silence(znode *strudel_token TSRMLS_DC); void zend_do_end_silence(znode *strudel_token TSRMLS_DC); -void zend_do_jmp_set(znode *value, znode *jmp_token, znode *colon_token TSRMLS_DC); -void zend_do_jmp_set_else(znode *result, znode *false_value, const znode *jmp_token, znode *colon_token TSRMLS_DC); - -void zend_do_begin_qm_op(znode *cond, znode *qm_token TSRMLS_DC); -void zend_do_qm_true(znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC); -void zend_do_qm_false(znode *result, znode *false_value, znode *qm_token, const znode *colon_token TSRMLS_DC); - void zend_do_extended_info(TSRMLS_D); void zend_do_extended_fcall_begin(TSRMLS_D); void zend_do_extended_fcall_end(TSRMLS_D); -- cgit v1.2.1 From 89ecd73a0402a4a0f6bfcf579177b8b3e91b4dc6 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 19 Jun 2014 13:08:21 +0200 Subject: Make ast->children a uint Future optimization: only use uint for dynamic lists and use a uchar or even an introspection function to get the child count. --- Zend/zend_ast.c | 10 +++++++--- Zend/zend_ast.h | 5 +++-- Zend/zend_compile.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index ba0b57fccc..9a795599fe 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -27,7 +27,7 @@ ZEND_API zend_ast *zend_ast_create_constant(zval *zv) { zend_ast_zval *ast = emalloc(sizeof(zend_ast_zval)); ast->kind = ZEND_CONST; - ast->children = 0; + ast->EA = 0; ZVAL_COPY_VALUE(&ast->val, zv); return (zend_ast *) ast; } @@ -36,7 +36,7 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) { zend_ast_znode *ast = emalloc(sizeof(zend_ast_znode)); ast->kind = ZEND_AST_ZNODE; - ast->children = 0; + ast->EA = 0; ast->node = *node; return (zend_ast *) ast; } @@ -45,6 +45,7 @@ ZEND_API zend_ast* zend_ast_create_unary(uint kind, zend_ast *op0) { zend_ast *ast = emalloc(sizeof(zend_ast)); ast->kind = kind; + ast->EA = 0; ast->children = 1; ast->child[0] = op0; return ast; @@ -54,6 +55,7 @@ ZEND_API zend_ast* zend_ast_create_binary(uint kind, zend_ast *op0, zend_ast *op { zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *)); ast->kind = kind; + ast->EA = 0; ast->children = 2; ast->child[0] = op0; ast->child[1] = op1; @@ -64,6 +66,7 @@ ZEND_API zend_ast* zend_ast_create_ternary(uint kind, zend_ast *op0, zend_ast *o { zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 2); ast->kind = kind; + ast->EA = 0; ast->children = 3; ast->child[0] = op0; ast->child[1] = op1; @@ -76,6 +79,7 @@ ZEND_API zend_ast *zend_ast_create_dynamic(uint kind) /* use 4 children as default */ zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 3); ast->kind = kind; + ast->EA = 0; ast->children = 0; return ast; } @@ -396,7 +400,7 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) if (ast->kind == ZEND_CONST) { zval_dtor(zend_ast_get_zval(ast)); - } else { + } else if (ast->kind != ZEND_AST_ZNODE) { for (i = 0; i < ast->children; i++) { if (ast->child[i]) { zend_ast_destroy(ast->child[i]); diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index c89b82c84e..cceb3b0f8f 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -75,13 +75,14 @@ typedef enum _zend_ast_kind { struct _zend_ast { unsigned short kind; - unsigned short children; + unsigned short EA; + zend_uint children; zend_ast *child[1]; }; typedef struct _zend_ast_zval { unsigned short kind; - unsigned short children; + unsigned short EA; zval val; } zend_ast_zval; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index bbf2bc7274..6dfa74f023 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -90,7 +90,7 @@ typedef struct _znode { /* used only during compilation */ /* Temporarily defined here, to avoid header ordering issues */ typedef struct _zend_ast_znode { unsigned short kind; - unsigned short children; + unsigned short EA; znode node; } zend_ast_znode; ZEND_API zend_ast *zend_ast_create_znode(znode *node); -- cgit v1.2.1 From 55ab55c417c3707bc90dc6e66cd84715ef675323 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 19 Jun 2014 13:44:17 +0200 Subject: Add ability to specify additional attr in AST --- Zend/zend_ast.c | 26 ++++++++++++++------------ Zend/zend_ast.h | 43 +++++++++++++++++++++++++++++++------------ Zend/zend_compile.h | 4 ++-- 3 files changed, 47 insertions(+), 26 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 9a795599fe..98aca3c6af 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -27,7 +27,7 @@ ZEND_API zend_ast *zend_ast_create_constant(zval *zv) { zend_ast_zval *ast = emalloc(sizeof(zend_ast_zval)); ast->kind = ZEND_CONST; - ast->EA = 0; + ast->attr = 0; ZVAL_COPY_VALUE(&ast->val, zv); return (zend_ast *) ast; } @@ -36,37 +36,39 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) { zend_ast_znode *ast = emalloc(sizeof(zend_ast_znode)); ast->kind = ZEND_AST_ZNODE; - ast->EA = 0; + ast->attr = 0; ast->node = *node; return (zend_ast *) ast; } -ZEND_API zend_ast* zend_ast_create_unary(uint kind, zend_ast *op0) +ZEND_API zend_ast* zend_ast_create_unary_ex(zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0) { zend_ast *ast = emalloc(sizeof(zend_ast)); ast->kind = kind; - ast->EA = 0; + ast->attr = attr; ast->children = 1; ast->child[0] = op0; return ast; } -ZEND_API zend_ast* zend_ast_create_binary(uint kind, zend_ast *op0, zend_ast *op1) -{ +ZEND_API zend_ast* zend_ast_create_binary_ex( + zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0, zend_ast *op1 +) { zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *)); ast->kind = kind; - ast->EA = 0; + ast->attr = attr; ast->children = 2; ast->child[0] = op0; ast->child[1] = op1; return ast; } -ZEND_API zend_ast* zend_ast_create_ternary(uint kind, zend_ast *op0, zend_ast *op1, zend_ast *op2) -{ +ZEND_API zend_ast* zend_ast_create_ternary_ex( + zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0, zend_ast *op1, zend_ast *op2 +) { zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 2); ast->kind = kind; - ast->EA = 0; + ast->attr = attr; ast->children = 3; ast->child[0] = op0; ast->child[1] = op1; @@ -74,12 +76,12 @@ ZEND_API zend_ast* zend_ast_create_ternary(uint kind, zend_ast *op0, zend_ast *o return ast; } -ZEND_API zend_ast *zend_ast_create_dynamic(uint kind) +ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind) { /* use 4 children as default */ zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 3); ast->kind = kind; - ast->EA = 0; + ast->attr = 0; ast->children = 0; return ast; } diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index cceb3b0f8f..83e1f64bd9 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -24,7 +24,7 @@ #include "zend.h" -typedef enum _zend_ast_kind { +enum _zend_ast_kind { /* first 256 kinds are reserved for opcodes */ ZEND_CONST = 256, /* TODO.AST: Split in constant lookup and literal zval */ ZEND_BOOL_AND, @@ -71,18 +71,21 @@ typedef enum _zend_ast_kind { ZEND_AST_CAST_OBJECT, ZEND_AST_CONDITIONAL, -} zend_ast_kind; +}; + +typedef unsigned short zend_ast_kind; +typedef unsigned short zend_ast_attr; struct _zend_ast { - unsigned short kind; - unsigned short EA; - zend_uint children; - zend_ast *child[1]; + zend_ast_kind kind; /* Type of the node (either opcode or ZEND_AST_* constant) */ + zend_ast_attr attr; /* Additional attribute, use depending on node type */ + zend_uint children; /* Number of children */ + zend_ast *child[1]; /* Array of children (using struct hack) */ }; typedef struct _zend_ast_zval { - unsigned short kind; - unsigned short EA; + zend_ast_kind kind; + zend_ast_attr attr; zval val; } zend_ast_zval; @@ -92,10 +95,14 @@ static inline zval *zend_ast_get_zval(zend_ast *ast) { ZEND_API zend_ast *zend_ast_create_constant(zval *zv); -ZEND_API zend_ast *zend_ast_create_unary(uint kind, zend_ast *op0); -ZEND_API zend_ast *zend_ast_create_binary(uint kind, zend_ast *op0, zend_ast *op1); -ZEND_API zend_ast *zend_ast_create_ternary(uint kind, zend_ast *op0, zend_ast *op1, zend_ast *op2); -ZEND_API zend_ast* zend_ast_create_dynamic(uint kind); +ZEND_API zend_ast *zend_ast_create_unary_ex( + zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0); +ZEND_API zend_ast *zend_ast_create_binary_ex( + zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0, zend_ast *op1); +ZEND_API zend_ast *zend_ast_create_ternary_ex( + zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0, zend_ast *op1, zend_ast *op2); + +ZEND_API zend_ast* zend_ast_create_dynamic(zend_ast_kind kind); ZEND_API void zend_ast_dynamic_add(zend_ast **ast, zend_ast *op); ZEND_API void zend_ast_dynamic_shrink(zend_ast **ast); @@ -106,6 +113,18 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s ZEND_API zend_ast *zend_ast_copy(zend_ast *ast); ZEND_API void zend_ast_destroy(zend_ast *ast); +static inline zend_ast *zend_ast_create_unary(zend_ast_kind kind, zend_ast *op0) { + return zend_ast_create_unary_ex(kind, 0, op0); +} +static inline zend_ast *zend_ast_create_binary(zend_ast_kind kind, zend_ast *op0, zend_ast *op1) { + return zend_ast_create_binary_ex(kind, 0, op0, op1); +} +static inline zend_ast *zend_ast_create_ternary( + zend_ast_kind kind, zend_ast *op0, zend_ast *op1, zend_ast *op2 +) { + return zend_ast_create_ternary_ex(kind, 0, op0, op1, op2); +} + static inline zend_ast *zend_ast_create_var(zval *name) { return zend_ast_create_unary(ZEND_AST_VAR, zend_ast_create_constant(name)); } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 6dfa74f023..d375cf7add 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -89,8 +89,8 @@ typedef struct _znode { /* used only during compilation */ /* Temporarily defined here, to avoid header ordering issues */ typedef struct _zend_ast_znode { - unsigned short kind; - unsigned short EA; + zend_ast_kind kind; + zend_ast_attr attr; znode node; } zend_ast_znode; ZEND_API zend_ast *zend_ast_create_znode(znode *node); -- cgit v1.2.1 From 657762ee2b32fc9bd2145b8cfa4b3d174783bf41 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 19 Jun 2014 13:57:29 +0200 Subject: AST stage 2.4 --- Zend/tests/isset_func_error.phpt | 2 +- Zend/zend_ast.c | 9 + Zend/zend_ast.h | 35 ++- Zend/zend_compile.c | 577 ++++++++++++++++++++++++++++++++------- Zend/zend_compile.h | 1 + Zend/zend_language_parser.y | 280 ++++++++++--------- Zend/zend_opcode.c | 23 -- 7 files changed, 672 insertions(+), 255 deletions(-) diff --git a/Zend/tests/isset_func_error.phpt b/Zend/tests/isset_func_error.phpt index 7d1036def8..7d6616b96d 100644 --- a/Zend/tests/isset_func_error.phpt +++ b/Zend/tests/isset_func_error.phpt @@ -5,4 +5,4 @@ Error message for isset(func()) isset(abc()); ?> --EXPECTF-- -Fatal error: Cannot use isset() on the result of a function call (you can use "null !== func()" instead) in %s on line %d +Fatal error: Cannot use isset() on the result of an expression (you can use "null !== expression" instead) in %s on line %d diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 98aca3c6af..84243c2793 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -41,6 +41,15 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) return (zend_ast *) ast; } +ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) +{ + zend_ast_zval *ast = emalloc(sizeof(zend_ast_zval)); + ast->kind = ZEND_CONST; + ast->attr = attr; + ZVAL_COPY_VALUE(&ast->val, zv); + return (zend_ast *) ast; +} + ZEND_API zend_ast* zend_ast_create_unary_ex(zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0) { zend_ast *ast = emalloc(sizeof(zend_ast)); diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 83e1f64bd9..cfe0ffae14 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -53,8 +53,8 @@ enum _zend_ast_kind { ZEND_AST_PARAMS, ZEND_AST_UNPACK, - ZEND_AST_NAME, - ZEND_AST_NAME_FQ, + ZEND_AST_ASSIGN_OP, + ZEND_AST_BINARY_OP, ZEND_AST_AND, ZEND_AST_OR, @@ -62,15 +62,21 @@ enum _zend_ast_kind { ZEND_AST_GREATER, ZEND_AST_GREATER_EQUAL, - ZEND_AST_CAST_NULL, - ZEND_AST_CAST_BOOL, - ZEND_AST_CAST_INT, - ZEND_AST_CAST_DOUBLE, - ZEND_AST_CAST_STRING, - ZEND_AST_CAST_ARRAY, - ZEND_AST_CAST_OBJECT, + ZEND_AST_CAST, ZEND_AST_CONDITIONAL, + + ZEND_AST_EMPTY, + ZEND_AST_ISSET, + + ZEND_AST_SILENCE, + ZEND_AST_SHELL_EXEC, + ZEND_AST_ARRAY, + ZEND_AST_ARRAY_ELEM, + + ZEND_AST_CONST, + ZEND_AST_CLASS_CONST, + ZEND_AST_RESOLVE_CLASS_NAME, }; typedef unsigned short zend_ast_kind; @@ -95,6 +101,8 @@ static inline zval *zend_ast_get_zval(zend_ast *ast) { ZEND_API zend_ast *zend_ast_create_constant(zval *zv); +ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr); + ZEND_API zend_ast *zend_ast_create_unary_ex( zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0); ZEND_API zend_ast *zend_ast_create_binary_ex( @@ -113,6 +121,9 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s ZEND_API zend_ast *zend_ast_copy(zend_ast *ast); ZEND_API void zend_ast_destroy(zend_ast *ast); +static inline zend_ast *zend_ast_create_zval(zval *zv) { + return zend_ast_create_zval_ex(zv, 0); +} static inline zend_ast *zend_ast_create_unary(zend_ast_kind kind, zend_ast *op0) { return zend_ast_create_unary_ex(kind, 0, op0); } @@ -128,6 +139,12 @@ static inline zend_ast *zend_ast_create_ternary( static inline zend_ast *zend_ast_create_var(zval *name) { return zend_ast_create_unary(ZEND_AST_VAR, zend_ast_create_constant(name)); } +static inline zend_ast *zend_ast_create_binary_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { + return zend_ast_create_binary_ex(ZEND_AST_BINARY_OP, opcode, op0, op1); +} +static inline zend_ast *zend_ast_create_assign_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { + return zend_ast_create_binary_ex(ZEND_AST_ASSIGN_OP, opcode, op0, op1); +} /* Temporary, for porting */ #define AST_COMPILE(res, ast) do { \ diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4972ecc15c..9fc035e0d6 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5637,6 +5637,8 @@ void zend_do_instanceof(znode *result, znode *expr, znode *class_znode, int type } /* }}} */ +static zend_bool zend_can_write_to_variable(zend_ast *ast); + void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, znode *array, znode *as_token, int variable TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -5646,7 +5648,7 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); if (variable) { // TODO.AST or !zend_can_parse_variable_for_write(array TSRMLS_CC) - if (zend_is_call(array->u.ast)) { + if (zend_is_call(array->u.ast) || !zend_can_write_to_variable(array->u.ast)) { is_variable = 0; AST_COMPILE_VAR(array, array->u.ast, BP_VAR_R); } else { @@ -5700,6 +5702,7 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC); static void zend_compile_list_assign(znode *result, zend_ast *list_ast, znode *expr_node TSRMLS_DC); +zend_op *zend_compile_assign_ref_common(znode *result, zend_ast *target_ast, znode *source_node TSRMLS_DC); void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token, const znode *as_token, znode *value, znode *key TSRMLS_DC) /* {{{ */ { @@ -5765,9 +5768,8 @@ void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token zend_ast_destroy(value->u.ast); } else { if (assign_by_ref) { - zend_ast *assign_ast = zend_ast_create_binary( - ZEND_AST_ASSIGN_REF, value->u.ast, AST_ZNODE(&value_node)); - AST_COMPILE(NULL, assign_ast); + zend_compile_assign_ref_common(NULL, value->u.ast, &value_node TSRMLS_CC); + zend_ast_destroy(value->u.ast); } else { zend_ast *assign_ast = zend_ast_create_binary( ZEND_AST_ASSIGN, value->u.ast, AST_ZNODE(&value_node)); @@ -6758,7 +6760,11 @@ static zend_op *emit_op_tmp(znode *result, zend_uchar opcode, znode *op1, znode zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = opcode; - SET_NODE(opline->op1, op1); + if (op1 == NULL) { + SET_UNUSED(opline->op1); + } else { + SET_NODE(opline->op1, op1); + } if (op2 == NULL) { SET_UNUSED(opline->op2); @@ -6774,7 +6780,8 @@ static zend_op *emit_op_tmp(znode *result, zend_uchar opcode, znode *op1, znode } static zend_bool zend_is_variable(zend_ast *ast) { - return ast->kind == ZEND_AST_VAR || ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP + return ast->kind == ZEND_AST_VAR || ast->kind == ZEND_AST_DIM + || ast->kind == ZEND_AST_PROP || ast->kind == ZEND_AST_STATIC_PROP || ast->kind == ZEND_AST_CALL || ast->kind == ZEND_AST_METHOD_CALL || ast->kind == ZEND_AST_STATIC_CALL; } @@ -6785,6 +6792,14 @@ static zend_bool zend_is_call(zend_ast *ast) { || ast->kind == ZEND_AST_STATIC_CALL; } +static zend_bool zend_can_write_to_variable(zend_ast *ast) { + while (ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP) { + ast = ast->child[0]; + } + + return zend_is_variable(ast); +} + static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { zval *name; int fetch_type; @@ -6797,6 +6812,33 @@ static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { return fetch_type == ZEND_FETCH_CLASS_DEFAULT; } +static zend_bool zend_is_compound_name(zval *name) { + return NULL != memchr(Z_STRVAL_P(name), '\\', Z_STRLEN_P(name)); +} + +static void zend_handle_numeric_op2(zend_op *opline TSRMLS_DC) { + if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { + ulong index; + int numeric = 0; + + ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(CONSTANT(opline->op2.constant)), Z_STRLEN(CONSTANT(opline->op2.constant))+1, index, numeric = 1); + if (numeric) { + zval_dtor(&CONSTANT(opline->op2.constant)); + ZVAL_LONG(&CONSTANT(opline->op2.constant), index); + } + } +} + +static void zend_set_class_name_op1(zend_op *opline, znode *class_node TSRMLS_DC) { + if (class_node->op_type == IS_CONST) { + opline->op1_type = IS_CONST; + opline->op1.constant = + zend_add_class_name_literal(CG(active_op_array), &class_node->u.constant TSRMLS_CC); + } else { + SET_NODE(opline->op1, class_node); + } +} + static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_DC) { znode name_node; zend_op *opline; @@ -6836,11 +6878,7 @@ static int zend_try_compile_cv(znode *result, zend_ast *ast TSRMLS_DC) { if (name_ast->kind == ZEND_CONST) { zend_string *name = zval_get_string(zend_ast_get_zval(name_ast)); - if (zend_is_auto_global(name TSRMLS_CC) || - (CG(active_op_array)->last != 0 && - CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode == ZEND_BEGIN_SILENCE) - ) { - // TODO.AST: handle ZEND_BEGIN_SILENCE properly + if (zend_is_auto_global(name TSRMLS_CC)) { STR_RELEASE(name); return FAILURE; } @@ -6893,19 +6931,6 @@ static void zend_compile_simple_var(znode *result, zend_ast *ast, int type TSRML } } -static void handle_numeric_op2(zend_op *opline TSRMLS_DC) { - if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { - ulong index; - int numeric = 0; - - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(CONSTANT(opline->op2.constant)), Z_STRLEN(CONSTANT(opline->op2.constant))+1, index, numeric = 1); - if (numeric) { - zval_dtor(&CONSTANT(opline->op2.constant)); - ZVAL_LONG(&CONSTANT(opline->op2.constant), index); - } - } -} - static void zend_separate_if_call_and_write(znode *node, zend_ast *ast, int type TSRMLS_DC) { if (type != BP_VAR_R && type != BP_VAR_IS && zend_is_call(ast)) { zend_op *opline = emit_op(NULL, ZEND_SEPARATE, node, NULL TSRMLS_CC); @@ -6937,7 +6962,7 @@ zend_op *zend_compile_dim_common(znode *result, zend_ast *ast, int type TSRMLS_D zend_separate_if_call_and_write(&var_node, var_ast, type TSRMLS_CC); opline = emit_op(result, ZEND_FETCH_DIM_R, &var_node, &dim_node TSRMLS_CC); - handle_numeric_op2(opline TSRMLS_CC); + zend_handle_numeric_op2(opline TSRMLS_CC); return opline; } @@ -6985,7 +7010,7 @@ void zend_compile_prop(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_adjust_for_fetch_type(opline, type); } -void zend_compile_static_prop(znode *result, zend_ast *ast, int type TSRMLS_DC) { +zend_op *zend_compile_static_prop_common(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_ast *class_ast = ast->child[0]; zend_ast *prop_ast = ast->child[1]; @@ -7002,7 +7027,6 @@ void zend_compile_static_prop(znode *result, zend_ast *ast, int type TSRMLS_DC) zend_compile_expr(&prop_node, prop_ast TSRMLS_CC); opline = emit_op(result, ZEND_FETCH_R, &prop_node, NULL TSRMLS_CC); - zend_adjust_for_fetch_type(opline, type); if (opline->op1_type == IS_CONST) { GET_POLYMORPHIC_CACHE_SLOT(opline->op1.constant); } @@ -7014,6 +7038,13 @@ void zend_compile_static_prop(znode *result, zend_ast *ast, int type TSRMLS_DC) SET_NODE(opline->op2, &class_node); } opline->extended_value |= ZEND_FETCH_STATIC_MEMBER; + + return opline; +} + +void zend_compile_static_prop(znode *result, zend_ast *ast, zend_uint type TSRMLS_DC) { + zend_op *opline = zend_compile_static_prop_common(result, ast, type TSRMLS_CC); + zend_adjust_for_fetch_type(opline, type); } static zend_uchar get_list_fetch_opcode(zend_uchar op_type) { @@ -7198,6 +7229,7 @@ void zend_compile_assign_ref(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; zend_ast *expr_ast = ast->child[1]; + zend_uint opcode = ast->attr; znode var_node, expr_node; zend_op *opline; @@ -7208,11 +7240,11 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { switch (var_ast->kind) { case ZEND_AST_VAR: zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); - emit_op(result, ast->kind, &var_node, &expr_node TSRMLS_CC); + emit_op(result, opcode, &var_node, &expr_node TSRMLS_CC); return; case ZEND_AST_DIM: opline = zend_compile_dim_common(result, var_ast, BP_VAR_RW TSRMLS_CC); - opline->opcode = ast->kind; + opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_DIM; opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -7223,7 +7255,7 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { return; case ZEND_AST_PROP: opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); - opline->opcode = ast->kind; + opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_OBJ; opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -7360,16 +7392,10 @@ zend_op *zend_compile_call_common(znode *result, zend_ast *params_ast, zend_func } zend_bool zend_compile_function_name(znode *name_node, zend_ast *name_ast TSRMLS_DC) { - zend_bool check_namespace; - char *is_compound; - - zval *name = &name_node->u.constant; - ZVAL_COPY(name, zend_ast_get_zval(name_ast->child[0])); - name_node->op_type = IS_CONST; - - check_namespace = name_ast->kind == ZEND_AST_NAME; - is_compound = memchr(Z_STRVAL_P(name), '\\', Z_STRLEN_P(name)); + zend_bool check_namespace = name_ast->attr; + zend_bool is_compound = zend_is_compound_name(zend_ast_get_zval(name_ast)); + zend_compile_expr(name_node, name_ast TSRMLS_CC); zend_resolve_function_name(name_node, &check_namespace TSRMLS_CC); return check_namespace && Z_TYPE(CG(current_namespace)) != IS_UNDEF && !is_compound; @@ -7421,7 +7447,7 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { znode name_node; - if (name_ast->kind != ZEND_AST_NAME && name_ast->kind != ZEND_AST_NAME_FQ) { + if (name_ast->kind != ZEND_CONST) { zend_compile_expr(&name_node, name_ast TSRMLS_CC); zend_compile_dynamic_call(result, &name_node, params_ast TSRMLS_CC); return; @@ -7536,13 +7562,7 @@ void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) opline->result.num = CG(context).nested_calls; opline->extended_value = extended_value; - if (class_node.op_type == IS_CONST) { - opline->op1_type = IS_CONST; - opline->op1.constant = - zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); - } else { - SET_NODE(opline->op1, &class_node); - } + zend_set_class_name_op1(opline, &class_node TSRMLS_CC); if (method_node.op_type == IS_CONST) { opline->op2_type = IS_CONST; @@ -7623,7 +7643,7 @@ void zend_compile_unset(zend_ast *ast TSRMLS_DC) { zend_op *opline; switch (var_ast->kind) { case ZEND_AST_VAR: - if (zend_try_compile_cv(&var_node, ast TSRMLS_CC) == SUCCESS) { + if (zend_try_compile_cv(&var_node, var_ast TSRMLS_CC) == SUCCESS) { opline = emit_op(NULL, ZEND_UNSET_VAR, &var_node, NULL TSRMLS_CC); opline->extended_value = ZEND_FETCH_LOCAL | ZEND_QUICK_SET; } else { @@ -7639,6 +7659,10 @@ void zend_compile_unset(zend_ast *ast TSRMLS_DC) { opline = zend_compile_prop_common(NULL, var_ast, BP_VAR_UNSET TSRMLS_CC); opline->opcode = ZEND_UNSET_OBJ; return; + case ZEND_AST_STATIC_PROP: + opline = zend_compile_static_prop_common(NULL, var_ast, BP_VAR_UNSET TSRMLS_CC); + opline->opcode = ZEND_UNSET_VAR; + return; EMPTY_SWITCH_DEFAULT_CASE() } } @@ -7646,12 +7670,13 @@ void zend_compile_unset(zend_ast *ast TSRMLS_DC) { 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]; + zend_uint opcode = ast->attr; znode left_node, right_node; zend_compile_expr(&left_node, left_ast TSRMLS_CC); zend_compile_expr(&right_node, right_ast TSRMLS_CC); - emit_op_tmp(result, ast->kind, &left_node, &right_node TSRMLS_CC); + emit_op_tmp(result, opcode, &left_node, &right_node TSRMLS_CC); } /* We do not use zend_compile_binary_op for this because we want to retain the left-to-right @@ -7772,16 +7797,7 @@ void zend_compile_cast(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); opline = emit_op(result, ZEND_CAST, &expr_node, NULL TSRMLS_CC); - switch (ast->kind) { - case ZEND_AST_CAST_NULL: opline->extended_value = IS_NULL; break; - case ZEND_AST_CAST_BOOL: opline->extended_value = _IS_BOOL; break; - case ZEND_AST_CAST_INT: opline->extended_value = IS_LONG; break; - case ZEND_AST_CAST_DOUBLE: opline->extended_value = IS_DOUBLE; break; - case ZEND_AST_CAST_STRING: opline->extended_value = IS_STRING; break; - case ZEND_AST_CAST_ARRAY: opline->extended_value = IS_ARRAY; break; - case ZEND_AST_CAST_OBJECT: opline->extended_value = IS_OBJECT; break; - EMPTY_SWITCH_DEFAULT_CASE() - } + opline->extended_value = ast->attr; } static void zend_compile_shorthand_conditional(znode *result, zend_ast *ast TSRMLS_DC) { @@ -7944,6 +7960,356 @@ void zend_compile_instanceof(znode *result, zend_ast *ast TSRMLS_DC) { emit_op_tmp(result, ZEND_INSTANCEOF, &obj_node, &class_node TSRMLS_CC); } +void zend_compile_include_or_eval(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + znode expr_node; + zend_op *opline; + + zend_do_extended_fcall_begin(TSRMLS_C); + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + opline = emit_op(result, ZEND_INCLUDE_OR_EVAL, &expr_node, NULL TSRMLS_CC); + opline->extended_value = ast->attr; + + zend_do_extended_fcall_end(TSRMLS_C); +} + +void zend_compile_isset_or_empty(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + + znode var_node; + zend_op *opline; + + ZEND_ASSERT(ast->kind == ZEND_AST_ISSET || ast->kind == ZEND_AST_EMPTY); + + if (!zend_is_variable(var_ast) || zend_is_call(var_ast)) { + if (ast->kind == ZEND_AST_EMPTY) { + /* empty(expr) can be transformed to !expr */ + zend_ast *not_ast = zend_ast_create_unary(ZEND_BOOL_NOT, var_ast); + zend_compile_expr(result, not_ast TSRMLS_CC); + efree(not_ast); + return; + } else { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot use isset() on the result of an expression " + "(you can use \"null !== expression\" instead)"); + } + } + + switch (var_ast->kind) { + case ZEND_AST_VAR: + if (zend_try_compile_cv(&var_node, var_ast TSRMLS_CC) == SUCCESS) { + opline = emit_op(result, ZEND_ISSET_ISEMPTY_VAR, &var_node, NULL TSRMLS_CC); + opline->extended_value = ZEND_FETCH_LOCAL | ZEND_QUICK_SET; + } else { + opline = zend_compile_simple_var_no_cv(result, var_ast, BP_VAR_IS TSRMLS_CC); + opline->opcode = ZEND_ISSET_ISEMPTY_VAR; + } + break; + case ZEND_AST_DIM: + opline = zend_compile_dim_common(result, var_ast, BP_VAR_IS TSRMLS_CC); + opline->opcode = ZEND_ISSET_ISEMPTY_DIM_OBJ; + break; + case ZEND_AST_PROP: + opline = zend_compile_prop_common(result, var_ast, BP_VAR_IS TSRMLS_CC); + opline->opcode = ZEND_ISSET_ISEMPTY_PROP_OBJ; + break; + case ZEND_AST_STATIC_PROP: + opline = zend_compile_static_prop_common(result, var_ast, BP_VAR_IS TSRMLS_CC); + opline->opcode = ZEND_ISSET_ISEMPTY_VAR; + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + + opline->result_type = IS_TMP_VAR; + opline->extended_value |= ast->kind == ZEND_AST_ISSET ? ZEND_ISSET : ZEND_ISEMPTY; +} + +void zend_compile_silence(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + znode silence_node; + + emit_op_tmp(&silence_node, ZEND_BEGIN_SILENCE, NULL, NULL TSRMLS_CC); + + if (expr_ast->kind == ZEND_AST_VAR) { + /* For @$var we need to force a FETCH instruction, otherwise the CV access will + * happen outside the silenced section. */ + zend_compile_simple_var_no_cv(result, expr_ast, BP_VAR_R TSRMLS_CC); + } else { + zend_compile_expr(result, expr_ast TSRMLS_CC); + } + + emit_op(NULL, ZEND_END_SILENCE, &silence_node, NULL TSRMLS_CC); +} + +void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + + zval fn_name; + zend_ast *name_ast, *params_ast, *call_ast; + + ZVAL_STRING(&fn_name, "shell_exec"); + name_ast = zend_ast_create_zval(&fn_name); + params_ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); + zend_ast_dynamic_add(¶ms_ast, expr_ast); + call_ast = zend_ast_create_binary(ZEND_AST_CALL, name_ast, params_ast); + + zend_compile_expr(result, call_ast TSRMLS_CC); + + efree(call_ast); + efree(params_ast); + zend_ast_destroy(name_ast); +} + +int zend_try_ct_compile_array(zval *array, zend_ast *ast TSRMLS_DC) { + zend_uint i; + + ZVAL_UNDEF(array); + for (i = 0; i < ast->children; ++i) { + zend_ast *elem_ast = ast->child[i]; + zend_ast *value_ast = elem_ast->child[0]; + zend_ast *key_ast = elem_ast->child[1]; + zend_bool by_ref = elem_ast->attr; + + znode key_node, value_node; + zval *key = &key_node.u.constant, *value = &value_node.u.constant; + + if (by_ref) { + goto failure; + } + + if (FAILURE == zend_compile_expr_maybe_ct(&value_node, value_ast, 1 TSRMLS_CC)) { + goto failure; + } + + if (key_ast) { + if (FAILURE == zend_compile_expr_maybe_ct(&key_node, key_ast, 1 TSRMLS_CC)) { + zval_ptr_dtor(value); + goto failure; + } + } + + if (Z_TYPE_P(array) == IS_UNDEF) { + array_init_size(array, ast->children); + } + + if (key_ast) { + switch (Z_TYPE_P(key)) { + case IS_LONG: + zend_hash_index_update(Z_ARRVAL_P(array), Z_LVAL_P(key), value); + break; + case IS_STRING: + zend_symtable_update(Z_ARRVAL_P(array), Z_STR_P(key), value); + break; + case IS_DOUBLE: + zend_hash_index_update(Z_ARRVAL_P(array), + zend_dval_to_lval(Z_DVAL_P(key)), value); + break; + case IS_FALSE: + zend_hash_index_update(Z_ARRVAL_P(array), 0, value); + break; + case IS_TRUE: + zend_hash_index_update(Z_ARRVAL_P(array), 1, value); + break; + case IS_NULL: + zend_hash_update(Z_ARRVAL_P(array), STR_EMPTY_ALLOC(), value); + break; + default: + zend_error(E_COMPILE_ERROR, "Illegal offset type"); + break; + } + zval_ptr_dtor(key); + } else { + zend_hash_next_index_insert(Z_ARRVAL_P(array), value); + } + } + + if (!ast->children) { + array_init(array); + } + + zend_make_immutable_array(array TSRMLS_CC); + return SUCCESS; + +failure: + zval_dtor(array); + return FAILURE; +} + +int zend_compile_array_maybe_ct(znode *result, zend_ast *ast, zend_bool ct_required TSRMLS_DC) { + zend_op *opline; + zend_uint i, opnum_init; + zend_bool packed = 1; + + zval array; + + if (SUCCESS == zend_try_ct_compile_array(&array, ast TSRMLS_CC)) { + result->op_type = IS_CONST; + ZVAL_COPY_VALUE(&result->u.constant, &array); + return SUCCESS; + } else if (ct_required) { + return FAILURE; + } + + opnum_init = get_next_op_number(CG(active_op_array)); + + for (i = 0; i < ast->children; ++i) { + zend_ast *elem_ast = ast->child[i]; + zend_ast *value_ast = elem_ast->child[0]; + zend_ast *key_ast = elem_ast->child[1]; + zend_bool by_ref = elem_ast->attr; + + znode value_node, key_node, *key_node_ptr = NULL; + + if (key_ast) { + zend_compile_expr(&key_node, key_ast TSRMLS_CC); + key_node_ptr = &key_node; + } + + if (by_ref) { + zend_ensure_writable_variable(value_ast); + zend_compile_var(&value_node, value_ast, BP_VAR_W TSRMLS_CC); + } else { + zend_compile_expr(&value_node, value_ast TSRMLS_CC); + } + + if (i == 0) { + opline = emit_op_tmp(result, ZEND_INIT_ARRAY, &value_node, key_node_ptr TSRMLS_CC); + opline->extended_value = ast->children << ZEND_ARRAY_SIZE_SHIFT; + } else { + opline = emit_op(NULL, ZEND_ADD_ARRAY_ELEMENT, &value_node, key_node_ptr TSRMLS_CC); + SET_NODE(opline->result, result); + } + opline->extended_value |= by_ref; + + if (key_ast) { + if (key_node.op_type == IS_CONST && Z_TYPE(key_node.u.constant) == IS_STRING) { + zend_handle_numeric_op2(opline TSRMLS_CC); + packed = 0; + } + } + } + + /* Handle empty array */ + if (!ast->children) { + emit_op_tmp(result, ZEND_INIT_ARRAY, NULL, NULL TSRMLS_CC); + } + + /* Add a flag to INIT_ARRAY if we know this array cannot be packed */ + if (!packed) { + opline = &CG(active_op_array)->opcodes[opnum_init]; + opline->extended_value |= ZEND_ARRAY_NOT_PACKED; + } + + return FAILURE; +} + +void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *name_ast = ast->child[0]; + zend_bool check_namespace = name_ast->attr; + + zend_bool is_compound = zend_is_compound_name(zend_ast_get_zval(name_ast)); + znode name_node; + zend_op *opline; + + zend_compile_expr(&name_node, name_ast TSRMLS_CC); + zend_resolve_const_name(&name_node, &check_namespace TSRMLS_CC); + + if (zend_constant_ct_subst(result, &name_node.u.constant, 1 TSRMLS_CC)) { + return; + } + + opline = emit_op_tmp(result, ZEND_FETCH_CONSTANT, NULL, NULL TSRMLS_CC); + opline->op2_type = IS_CONST; + + if (is_compound) { + /* the name is unambiguous */ + opline->op2.constant = zend_add_const_name_literal( + CG(active_op_array), &name_node.u.constant, 0 TSRMLS_CC); + } else { + opline->extended_value = IS_CONSTANT_UNQUALIFIED; + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + opline->extended_value |= IS_CONSTANT_IN_NAMESPACE; + opline->op2.constant = zend_add_const_name_literal( + CG(active_op_array), &name_node.u.constant, 1 TSRMLS_CC); + } else { + opline->op2.constant = zend_add_const_name_literal( + CG(active_op_array), &name_node.u.constant, 0 TSRMLS_CC); + } + } + GET_CACHE_SLOT(opline->op2.constant); +} + +void zend_compile_class_const(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *class_ast = ast->child[0]; + zend_ast *const_ast = ast->child[1]; + + znode class_node, const_node; + zend_op *opline; + + if (zend_is_const_default_class_ref(class_ast)) { + zend_compile_expr(&class_node, class_ast TSRMLS_CC); + zend_resolve_class_name(&class_node TSRMLS_CC); + } else { + zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); + } + + zend_compile_expr(&const_node, const_ast TSRMLS_CC); + + opline = emit_op_tmp(result, ZEND_FETCH_CONSTANT, NULL, &const_node TSRMLS_CC); + + zend_set_class_name_op1(opline, &class_node TSRMLS_CC); + + if (opline->op1_type == IS_CONST) { + GET_CACHE_SLOT(opline->op2.constant); + } else { + GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + } +} + +void zend_compile_resolve_class_name(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *name_ast = ast->child[0]; + zval *name = zend_ast_get_zval(name_ast); + int fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); + + switch (fetch_type) { + case ZEND_FETCH_CLASS_SELF: + if (!CG(active_class_entry)) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot access self::class when no class scope is active"); + } + result->op_type = IS_CONST; + ZVAL_STR(&result->u.constant, STR_COPY(CG(active_class_entry)->name)); + break; + case ZEND_FETCH_CLASS_STATIC: + case ZEND_FETCH_CLASS_PARENT: + if (!CG(active_class_entry)) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot access %s::class when no class scope is active", + fetch_type == ZEND_FETCH_CLASS_STATIC ? "static" : "parent"); + } else { + zval class_str_zv; + zend_ast *class_str_ast, *class_const_ast; + + ZVAL_STRING(&class_str_zv, "class"); + class_str_ast = zend_ast_create_zval(&class_str_zv); + class_const_ast = zend_ast_create_binary( + ZEND_AST_CLASS_CONST, name_ast, class_str_ast); + + zend_compile_expr(result, class_const_ast TSRMLS_CC); + + zend_ast_destroy(class_str_ast); + efree(class_const_ast); + } + break; + case ZEND_FETCH_CLASS_DEFAULT: + zend_compile_expr(result, name_ast TSRMLS_CC); + zend_resolve_class_name(result TSRMLS_CC); + break; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { switch (ast->kind) { case ZEND_AST_GLOBAL: @@ -7986,39 +8352,10 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_CLONE: zend_compile_clone(result, ast TSRMLS_CC); return; - case ZEND_ASSIGN_ADD: - case ZEND_ASSIGN_SUB: - case ZEND_ASSIGN_MUL: - case ZEND_ASSIGN_POW: - case ZEND_ASSIGN_DIV: - case ZEND_ASSIGN_CONCAT: - case ZEND_ASSIGN_MOD: - case ZEND_ASSIGN_BW_AND: - case ZEND_ASSIGN_BW_OR: - case ZEND_ASSIGN_BW_XOR: - case ZEND_ASSIGN_SL: - case ZEND_ASSIGN_SR: + case ZEND_AST_ASSIGN_OP: zend_compile_compound_assign(result, ast TSRMLS_CC); return; - case ZEND_BOOL_XOR: - case ZEND_BW_OR: - case ZEND_BW_AND: - case ZEND_BW_XOR: - case ZEND_CONCAT: - case ZEND_ADD: - case ZEND_SUB: - case ZEND_MUL: - case ZEND_POW: - case ZEND_DIV: - case ZEND_MOD: - case ZEND_SL: - case ZEND_SR: - case ZEND_IS_IDENTICAL: - case ZEND_IS_NOT_IDENTICAL: - case ZEND_IS_EQUAL: - case ZEND_IS_NOT_EQUAL: - case ZEND_IS_SMALLER: - case ZEND_IS_SMALLER_OR_EQUAL: + case ZEND_AST_BINARY_OP: zend_compile_binary_op(result, ast TSRMLS_CC); return; case ZEND_AST_GREATER: @@ -8045,13 +8382,7 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_PRE_DEC: zend_compile_pre_incdec(result, ast TSRMLS_CC); return; - case ZEND_AST_CAST_NULL: - case ZEND_AST_CAST_BOOL: - case ZEND_AST_CAST_INT: - case ZEND_AST_CAST_DOUBLE: - case ZEND_AST_CAST_STRING: - case ZEND_AST_CAST_ARRAY: - case ZEND_AST_CAST_OBJECT: + case ZEND_AST_CAST: zend_compile_cast(result, ast TSRMLS_CC); return; case ZEND_AST_CONDITIONAL: @@ -8069,11 +8400,52 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_INSTANCEOF: zend_compile_instanceof(result, ast TSRMLS_CC); return; + case ZEND_INCLUDE_OR_EVAL: + zend_compile_include_or_eval(result, ast TSRMLS_CC); + return; + case ZEND_AST_ISSET: + case ZEND_AST_EMPTY: + zend_compile_isset_or_empty(result, ast TSRMLS_CC); + return; + case ZEND_AST_SILENCE: + zend_compile_silence(result, ast TSRMLS_CC); + return; + case ZEND_AST_SHELL_EXEC: + zend_compile_shell_exec(result, ast TSRMLS_CC); + return; + case ZEND_AST_ARRAY: + zend_compile_array_maybe_ct(result, ast, 0 TSRMLS_CC); + return; + case ZEND_AST_CONST: + zend_compile_const(result, ast TSRMLS_CC); + return; + case ZEND_AST_CLASS_CONST: + zend_compile_class_const(result, ast TSRMLS_CC); + return; + case ZEND_AST_RESOLVE_CLASS_NAME: + zend_compile_resolve_class_name(result, ast TSRMLS_CC); + return; default: ZEND_ASSERT(0 /* not supported */); } } +int zend_compile_expr_maybe_ct(znode *result, zend_ast *ast, zend_bool ct_required TSRMLS_DC) { + switch (ast->kind) { + case ZEND_CONST: + ZVAL_COPY(&result->u.constant, zend_ast_get_zval(ast)); + result->op_type = IS_CONST; + return SUCCESS; + case ZEND_AST_ARRAY: + return zend_compile_array_maybe_ct(result, ast, ct_required TSRMLS_CC); + default: + if (!ct_required) { + zend_compile_expr(result, ast TSRMLS_CC); + } + return FAILURE; + } +} + void zend_compile_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { switch (ast->kind) { case ZEND_AST_VAR: @@ -8098,7 +8470,16 @@ void zend_compile_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_compile_static_call(result, ast, type TSRMLS_CC); return; default: - // TODO.AST check writable + if (type == BP_VAR_W || type == BP_VAR_REF + || type == BP_VAR_RW || type == BP_VAR_UNSET + ) { + /* For BC reasons =& new Foo is allowed */ + if (type != BP_VAR_REF || ast->kind != ZEND_NEW) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot use temporary expression in write context"); + } + } + zend_compile_expr(result, ast TSRMLS_CC); return; } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index d375cf7add..86e552bc1a 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -102,6 +102,7 @@ static inline znode *zend_ast_get_znode(zend_ast *ast) { void zend_ensure_writable_variable(const zend_ast *ast); void zend_compile_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_expr(znode *node, zend_ast *ast TSRMLS_DC); +int zend_compile_expr_maybe_ct(znode *node, zend_ast *ast, zend_bool ct_required TSRMLS_DC); void zend_compile_var(znode *node, zend_ast *ast, int type TSRMLS_DC); typedef struct _zend_execute_data zend_execute_data; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 540bd20512..94fa29727b 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -312,10 +312,10 @@ statement: unticked_statement: '{' inner_statement_list '}' - | T_IF parenthesis_expr { zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); } - | T_IF parenthesis_expr ':' { zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); } - | T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); } - | T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); } + | T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); } + | T_IF parenthesis_expr ':' { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); } + | T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { AC($3); zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); } + | T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { AC($6); zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); } | T_FOR '(' for_expr @@ -325,7 +325,7 @@ unticked_statement: for_expr ')' { zend_do_free(&$9 TSRMLS_CC); zend_do_for_before_statement(&$4, &$7 TSRMLS_CC); } for_statement { zend_do_for_end(&$7 TSRMLS_CC); } - | T_SWITCH parenthesis_expr { zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); } + | T_SWITCH parenthesis_expr { AC($2); zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); } | T_BREAK ';' { zend_do_brk_cont(ZEND_BRK, NULL TSRMLS_CC); } | T_BREAK expr ';' { AC($2); zend_do_brk_cont(ZEND_BRK, &$2 TSRMLS_CC); } | T_CONTINUE ';' { zend_do_brk_cont(ZEND_CONT, NULL TSRMLS_CC); } @@ -529,13 +529,13 @@ while_statement: elseif_list: /* empty */ - | elseif_list T_ELSEIF parenthesis_expr { zend_do_if_cond(&$3, &$2 TSRMLS_CC); } statement { zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } + | elseif_list T_ELSEIF parenthesis_expr { AC($3); zend_do_if_cond(&$3, &$2 TSRMLS_CC); } statement { zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } ; new_elseif_list: /* empty */ - | new_elseif_list T_ELSEIF parenthesis_expr ':' { zend_do_if_cond(&$3, &$2 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } + | new_elseif_list T_ELSEIF parenthesis_expr ':' { AC($3); zend_do_if_cond(&$3, &$2 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } ; @@ -593,7 +593,7 @@ non_empty_function_call_parameter_list: function_call_parameter: expr_without_variable { $$.u.ast = $1.u.ast; } | variable { $$.u.ast = $1.u.ast; } - | '&' w_variable { /* ERROR */ ZEND_ASSERT(0); } + /*| '&' variable { ZEND_ASSERT(0); } */ | T_ELLIPSIS expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNPACK, $2.u.ast); } ; @@ -764,29 +764,29 @@ expr_without_variable: zend_ast_create_binary(ZEND_NEW, $5.u.ast, $6.u.ast)); } | T_CLONE expr { $$.u.ast = zend_ast_create_unary(ZEND_CLONE, $2.u.ast); } | variable T_PLUS_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_ADD, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_ADD, $1.u.ast, $3.u.ast); } | variable T_MINUS_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SUB, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SUB, $1.u.ast, $3.u.ast); } | variable T_MUL_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_MUL, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_MUL, $1.u.ast, $3.u.ast); } | variable T_POW_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_POW, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_POW, $1.u.ast, $3.u.ast); } | variable T_DIV_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_DIV, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_DIV, $1.u.ast, $3.u.ast); } | variable T_CONCAT_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_CONCAT, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_CONCAT, $1.u.ast, $3.u.ast); } | variable T_MOD_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_MOD, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_MOD, $1.u.ast, $3.u.ast); } | variable T_AND_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_AND, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_BW_AND, $1.u.ast, $3.u.ast); } | variable T_OR_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_OR, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_BW_OR, $1.u.ast, $3.u.ast); } | variable T_XOR_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_BW_XOR, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_BW_XOR, $1.u.ast, $3.u.ast); } | variable T_SL_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SL, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SL, $1.u.ast, $3.u.ast); } | variable T_SR_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_ASSIGN_SR, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SR, $1.u.ast, $3.u.ast); } | variable T_INC { $$.u.ast = zend_ast_create_unary(ZEND_POST_INC, $1.u.ast); } | T_INC variable { $$.u.ast = zend_ast_create_unary(ZEND_PRE_INC, $2.u.ast); } | variable T_DEC { $$.u.ast = zend_ast_create_unary(ZEND_POST_DEC, $1.u.ast); } @@ -801,59 +801,66 @@ expr_without_variable: { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } | expr T_LOGICAL_XOR expr { $$.u.ast = zend_ast_create_binary(ZEND_BOOL_XOR, $1.u.ast, $3.u.ast); } - | expr '|' expr { $$.u.ast = zend_ast_create_binary(ZEND_BW_OR, $1.u.ast, $3.u.ast); } - | expr '&' expr { $$.u.ast = zend_ast_create_binary(ZEND_BW_AND, $1.u.ast, $3.u.ast); } - | expr '^' expr { $$.u.ast = zend_ast_create_binary(ZEND_BW_XOR, $1.u.ast, $3.u.ast); } - | expr '.' expr { $$.u.ast = zend_ast_create_binary(ZEND_CONCAT, $1.u.ast, $3.u.ast); } - | expr '+' expr { $$.u.ast = zend_ast_create_binary(ZEND_ADD, $1.u.ast, $3.u.ast); } - | expr '-' expr { $$.u.ast = zend_ast_create_binary(ZEND_SUB, $1.u.ast, $3.u.ast); } - | expr '*' expr { $$.u.ast = zend_ast_create_binary(ZEND_MUL, $1.u.ast, $3.u.ast); } - | expr T_POW expr { $$.u.ast = zend_ast_create_binary(ZEND_POW, $1.u.ast, $3.u.ast); } - | expr '/' expr { $$.u.ast = zend_ast_create_binary(ZEND_DIV, $1.u.ast, $3.u.ast); } - | expr '%' expr { $$.u.ast = zend_ast_create_binary(ZEND_MOD, $1.u.ast, $3.u.ast); } - | expr T_SL expr { $$.u.ast = zend_ast_create_binary(ZEND_SL, $1.u.ast, $3.u.ast); } - | expr T_SR expr { $$.u.ast = zend_ast_create_binary(ZEND_SR, $1.u.ast, $3.u.ast); } + | expr '|' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_OR, $1.u.ast, $3.u.ast); } + | expr '&' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_AND, $1.u.ast, $3.u.ast); } + | expr '^' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_XOR, $1.u.ast, $3.u.ast); } + | expr '.' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_CONCAT, $1.u.ast, $3.u.ast); } + | expr '+' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_ADD, $1.u.ast, $3.u.ast); } + | expr '-' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_SUB, $1.u.ast, $3.u.ast); } + | expr '*' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_MUL, $1.u.ast, $3.u.ast); } + | expr T_POW expr { $$.u.ast = zend_ast_create_binary_op(ZEND_POW, $1.u.ast, $3.u.ast); } + | expr '/' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_DIV, $1.u.ast, $3.u.ast); } + | expr '%' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_MOD, $1.u.ast, $3.u.ast); } + | expr T_SL expr { $$.u.ast = zend_ast_create_binary_op(ZEND_SL, $1.u.ast, $3.u.ast); } + | expr T_SR expr { $$.u.ast = zend_ast_create_binary_op(ZEND_SR, $1.u.ast, $3.u.ast); } | '+' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_UNARY_PLUS, $2.u.ast); } | '-' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_UNARY_MINUS, $2.u.ast); } | '!' expr { $$.u.ast = zend_ast_create_unary(ZEND_BOOL_NOT, $2.u.ast); } | '~' expr { $$.u.ast = zend_ast_create_unary(ZEND_BW_NOT, $2.u.ast); } | expr T_IS_IDENTICAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_IS_IDENTICAL, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, $1.u.ast, $3.u.ast); } | expr T_IS_NOT_IDENTICAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_IS_NOT_IDENTICAL, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_NOT_IDENTICAL, $1.u.ast, $3.u.ast); } | expr T_IS_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_IS_EQUAL, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_EQUAL, $1.u.ast, $3.u.ast); } | expr T_IS_NOT_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_IS_NOT_EQUAL, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_NOT_EQUAL, $1.u.ast, $3.u.ast); } | expr '<' expr - { $$.u.ast = zend_ast_create_binary(ZEND_IS_SMALLER, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER, $1.u.ast, $3.u.ast); } | expr T_IS_SMALLER_OR_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_IS_SMALLER_OR_EQUAL, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $1.u.ast, $3.u.ast); } | expr '>' expr { $$.u.ast = zend_ast_create_binary(ZEND_AST_GREATER, $1.u.ast, $3.u.ast); } | expr T_IS_GREATER_OR_EQUAL expr { $$.u.ast = zend_ast_create_binary(ZEND_AST_GREATER_EQUAL, $1.u.ast, $3.u.ast); } | expr T_INSTANCEOF class_name_reference { $$.u.ast = zend_ast_create_binary(ZEND_INSTANCEOF, $1.u.ast, $3.u.ast); } - | parenthesis_expr { $$.u.ast = AST_ZNODE(&$1); } + | parenthesis_expr { $$.u.ast = $1.u.ast; } | new_expr { $$.u.ast = $1.u.ast; } | expr '?' expr ':' expr { $$.u.ast = zend_ast_create_ternary( ZEND_AST_CONDITIONAL, $1.u.ast, $3.u.ast, $5.u.ast); } | expr '?' ':' expr { $$.u.ast = zend_ast_create_ternary(ZEND_AST_CONDITIONAL, $1.u.ast, NULL, $4.u.ast); } - | internal_functions_in_yacc { $$.u.ast = AST_ZNODE(&$1); } - | T_INT_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_INT, $2.u.ast); } - | T_DOUBLE_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_DOUBLE, $2.u.ast); } - | T_STRING_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_STRING, $2.u.ast); } - | T_ARRAY_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_ARRAY, $2.u.ast); } - | T_OBJECT_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_OBJECT, $2.u.ast); } - | T_BOOL_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_BOOL, $2.u.ast); } - | T_UNSET_CAST expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_CAST_NULL, $2.u.ast); } - | T_EXIT exit_expr { $$.u.ast = zend_ast_create_unary(ZEND_EXIT, $2.u.ast); } - | '@' { zend_do_begin_silence(&$1 TSRMLS_CC); } expr { AC($3); zend_do_end_silence(&$1 TSRMLS_CC); $$ = $3; AZ($$); } - | scalar { $$.u.ast = AST_ZNODE(&$1); } - | '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); AZ($$); } + | internal_functions_in_yacc { $$.u.ast = $1.u.ast; } + | T_INT_CAST expr + { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_LONG, $2.u.ast); } + | T_DOUBLE_CAST expr + { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_DOUBLE, $2.u.ast); } + | T_STRING_CAST expr + { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_STRING, $2.u.ast); } + | T_ARRAY_CAST expr + { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_ARRAY, $2.u.ast); } + | T_OBJECT_CAST expr + { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_OBJECT, $2.u.ast); } + | T_BOOL_CAST expr + { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, _IS_BOOL, $2.u.ast); } + | T_UNSET_CAST expr + { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_NULL, $2.u.ast); } + | T_EXIT exit_expr { $$.u.ast = zend_ast_create_unary(ZEND_EXIT, $2.u.ast); } + | '@' expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_SILENCE, $2.u.ast); } + | scalar { $$.u.ast = $1.u.ast; } + | '`' backticks_expr '`' { $$.u.ast = zend_ast_create_unary(ZEND_AST_SHELL_EXEC, $2.u.ast); } | T_PRINT expr { $$.u.ast = zend_ast_create_unary(ZEND_PRINT, $2.u.ast); } | T_YIELD { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, NULL, NULL); } | T_YIELD expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $2.u.ast, NULL); } @@ -861,10 +868,10 @@ expr_without_variable: { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } | function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); } '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $3; AZ($$); } + '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$3); } | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$ = $4; AZ($$); } + '{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } ; function: @@ -886,21 +893,19 @@ lexical_var_list: function_call: namespace_name function_call_parameter_list { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, - zend_ast_create_unary(ZEND_AST_NAME, AST_ZVAL(&$1)), $2.u.ast); } + zend_ast_create_zval_ex(&$1.u.constant, 1), $2.u.ast); } | T_NAMESPACE T_NS_SEPARATOR namespace_name function_call_parameter_list { ZVAL_EMPTY_STRING(&$1.u.constant); zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); - $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, - zend_ast_create_unary(ZEND_AST_NAME_FQ, AST_ZVAL(&$1)), $4.u.ast); } + $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, AST_ZVAL(&$1), $4.u.ast); } | T_NS_SEPARATOR namespace_name function_call_parameter_list - { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, - zend_ast_create_unary(ZEND_AST_NAME_FQ, AST_ZVAL(&$2)), $3.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, AST_ZVAL(&$2), $3.u.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, AST_ZVAL(&$1), $3.u.ast, $4.u.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, - AST_ZNODE(&$1), $3.u.ast, $4.u.ast); } + $1.u.ast, $3.u.ast, $4.u.ast); } | callable_expr function_call_parameter_list { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.u.ast, $2.u.ast); } ; @@ -928,13 +933,15 @@ class_name_reference: exit_expr: /* empty */ { $$.u.ast = NULL; } | '(' ')' { $$.u.ast = NULL; } - | parenthesis_expr { $$.u.ast = AST_ZNODE(&$1); } + | parenthesis_expr { $$.u.ast = $1.u.ast; } ; backticks_expr: - /* empty */ { ZVAL_EMPTY_STRING(&$$.u.constant); $$.op_type = IS_CONST; } - | T_ENCAPSED_AND_WHITESPACE { $$ = $1; } - | encaps_list { $$ = $1; } + /* empty */ + { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); + $$.u.ast = zend_ast_create_constant(&empty_str); } + | T_ENCAPSED_AND_WHITESPACE { $$.u.ast = AST_ZVAL(&$1); } + | encaps_list { $$.u.ast = AST_ZNODE(&$1); } ; @@ -945,23 +952,25 @@ ctor_arguments: dereferencable_scalar: - T_ARRAY '(' array_pair_list ')' { $$ = $3; } - | '[' array_pair_list ']' { $$ = $2; } - | T_CONSTANT_ENCAPSED_STRING { $$ = $1; } + T_ARRAY '(' array_pair_list ')' { $$.u.ast = $3.u.ast; } + | '[' array_pair_list ']' { $$.u.ast = $2.u.ast; } + | T_CONSTANT_ENCAPSED_STRING { $$.u.ast = AST_ZVAL(&$1); } ; common_scalar: - T_LNUMBER { $$ = $1; } - | T_DNUMBER { $$ = $1; } - | T_LINE { $$ = $1; } - | T_FILE { $$ = $1; } - | T_DIR { $$ = $1; } - | T_TRAIT_C { $$ = $1; } - | T_METHOD_C { $$ = $1; } - | T_FUNC_C { $$ = $1; } - | T_NS_C { $$ = $1; } - | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$ = $2; } - | T_START_HEREDOC T_END_HEREDOC { ZVAL_EMPTY_STRING(&$$.u.constant); $$.op_type = IS_CONST; } + T_LNUMBER { $$.u.ast = AST_ZVAL(&$1); } + | T_DNUMBER { $$.u.ast = AST_ZVAL(&$1); } + | T_LINE { $$.u.ast = AST_ZVAL(&$1); } + | T_FILE { $$.u.ast = AST_ZVAL(&$1); } + | T_DIR { $$.u.ast = AST_ZVAL(&$1); } + | T_TRAIT_C { $$.u.ast = AST_ZVAL(&$1); } + | T_METHOD_C { $$.u.ast = AST_ZVAL(&$1); } + | T_FUNC_C { $$.u.ast = AST_ZVAL(&$1); } + | T_NS_C { $$.u.ast = AST_ZVAL(&$1); } + | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } + | T_START_HEREDOC T_END_HEREDOC + { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); + $$.u.ast = zend_ast_create_constant(&empty_str); } ; static_class_constant: @@ -973,8 +982,7 @@ static_scalar: /* compile-time evaluated scalars */ ; static_scalar_base: - common_scalar { $$ = $1; } - | T_CONSTANT_ENCAPSED_STRING { $$ = $1; } + T_CONSTANT_ENCAPSED_STRING { $$ = $1; } | T_CLASS_C { $$ = $1; } | static_class_name_scalar { $$ = $1; } | static_class_constant { $$ = $1; } @@ -985,6 +993,7 @@ static_scalar_base: static_scalar_value: static_scalar_base { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } + | common_scalar { $$.u.ast = $1.u.ast; } | T_ARRAY '(' static_array_pair_list ')' { $$ = $3; } | '[' static_array_pair_list ']' { $$ = $2; } | static_operation { $$ = $1; } @@ -1027,17 +1036,26 @@ static_operation: scalar: - T_STRING_VARNAME { $$ = $1; } - | class_name_scalar { $$ = $1; } - | class_constant { $$ = $1; } - | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_RT, 1 TSRMLS_CC); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_RT, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_RT, 0 TSRMLS_CC); } - | common_scalar { $$ = $1; } - | '"' encaps_list '"' { $$ = $2; } - | T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = $2; } - | T_CLASS_C { if (Z_TYPE($1.u.constant) == IS_CONSTANT) {zend_do_fetch_constant(&$$, NULL, &$1, ZEND_RT, 1 TSRMLS_CC);} else {$$ = $1;} } - | dereferencable_scalar { $$ = $1; } + T_STRING_VARNAME { $$ = $1; AZ($$); } + | class_name_scalar { $$.u.ast = $1.u.ast; } + | class_constant { $$.u.ast = $1.u.ast; } + | namespace_name + { $$.u.ast = zend_ast_create_unary( + ZEND_AST_CONST, zend_ast_create_zval_ex(&$1.u.constant, 1)); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name + { ZVAL_EMPTY_STRING(&$1.u.constant); + zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); + $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$1)); } + | T_NS_SEPARATOR namespace_name + { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); + if (Z_DELREF($2.u.constant) == 0) { efree(Z_STR($2.u.constant)); } + Z_STR($2.u.constant) = Z_STR(tmp); + $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } + | common_scalar { $$.u.ast = $1.u.ast; } + | '"' encaps_list '"' { $$ = $2; AZ($$); } + | T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = $2; AZ($$); } + | T_CLASS_C { if (Z_TYPE($1.u.constant) == IS_CONSTANT) {zend_do_fetch_constant(&$$, NULL, &$1, ZEND_RT, 1 TSRMLS_CC); AZ($$); } else { $$.u.ast = AST_ZVAL(&$1); } } + | dereferencable_scalar { $$.u.ast = $1.u.ast; } ; @@ -1064,27 +1082,23 @@ expr: ; parenthesis_expr: - '(' expr ')' { AST_COMPILE(&$$, $2.u.ast); } -; - -w_variable: - variable { zend_ensure_writable_variable($1.u.ast); AST_COMPILE_VAR(&$$, $1.u.ast, BP_VAR_W); } + '(' expr ')' { $$.u.ast = $2.u.ast; } ; variable_class_name: - dereferencable { zend_compile_expr(&$$, $1.u.ast TSRMLS_CC); zend_ast_destroy($1.u.ast); } + dereferencable { $$.u.ast = $1.u.ast; } ; dereferencable: variable { $$.u.ast = $1.u.ast; } | '(' expr ')' { $$.u.ast = $2.u.ast; } - | dereferencable_scalar { $$.u.ast = AST_ZNODE(&$1); } + | dereferencable_scalar { $$.u.ast = $1.u.ast; } ; callable_expr: callable_variable { $$.u.ast = $1.u.ast; } | '(' expr ')' { $$.u.ast = $2.u.ast; } - | dereferencable_scalar { $$.u.ast = AST_ZNODE(&$1); } + | dereferencable_scalar { $$.u.ast = $1.u.ast; } ; callable_variable: @@ -1121,7 +1135,7 @@ static_member: class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, AST_ZVAL(&$1), $3.u.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, AST_ZNODE(&$1), $3.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } ; new_variable: @@ -1166,19 +1180,26 @@ assignment_list_element: array_pair_list: - /* empty */ { zend_do_init_array(&$$, NULL, NULL, 0 TSRMLS_CC); zend_do_end_array(&$$, &$$ TSRMLS_CC); } - | non_empty_array_pair_list possible_comma { zend_do_end_array(&$$, &$1 TSRMLS_CC); } + /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_ARRAY); } + | non_empty_array_pair_list possible_comma { $$.u.ast = $1.u.ast; } ; non_empty_array_pair_list: - non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr { AC($3); AC($5); zend_do_add_array_element(&$$, &$5, &$3, 0 TSRMLS_CC); } - | non_empty_array_pair_list ',' expr { AC($3); zend_do_add_array_element(&$$, &$3, NULL, 0 TSRMLS_CC); } - | expr T_DOUBLE_ARROW expr { AC($1); AC($3); zend_do_init_array(&$$, &$3, &$1, 0 TSRMLS_CC); } - | expr { AC($1); zend_do_init_array(&$$, &$1, NULL, 0 TSRMLS_CC); } - | non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_variable { AC($3); zend_do_add_array_element(&$$, &$6, &$3, 1 TSRMLS_CC); } - | non_empty_array_pair_list ',' '&' w_variable { zend_do_add_array_element(&$$, &$4, NULL, 1 TSRMLS_CC); } - | expr T_DOUBLE_ARROW '&' w_variable { AC($1); zend_do_init_array(&$$, &$4, &$1, 1 TSRMLS_CC); } - | '&' w_variable { zend_do_init_array(&$$, &$2, NULL, 1 TSRMLS_CC); } + non_empty_array_pair_list ',' array_pair + { zend_ast_dynamic_add(&$1.u.ast, $3.u.ast); $$.u.ast = $1.u.ast; } + | array_pair + { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_ARRAY); + zend_ast_dynamic_add(&$$.u.ast, $1.u.ast); } +; + +array_pair: + expr T_DOUBLE_ARROW expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $3.u.ast, $1.u.ast); } + | expr { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $1.u.ast, NULL); } + | expr T_DOUBLE_ARROW '&' variable + { $$.u.ast = zend_ast_create_binary_ex(ZEND_AST_ARRAY_ELEM, 1, $4.u.ast, $1.u.ast); } + | '&' variable + { $$.u.ast = zend_ast_create_binary_ex(ZEND_AST_ARRAY_ELEM, 1, $2.u.ast, NULL); } ; encaps_list: @@ -1216,29 +1237,39 @@ encaps_var_offset: internal_functions_in_yacc: - T_ISSET '(' isset_variables ')' { $$ = $3; } - | T_EMPTY '(' variable ')' { zend_do_isset_or_isempty(ZEND_ISEMPTY, &$$, &$3 TSRMLS_CC); } - | T_EMPTY '(' expr_without_variable ')' { AC($3); zend_do_unary_op(ZEND_BOOL_NOT, &$$, &$3 TSRMLS_CC); } - | T_INCLUDE expr { AC($2); zend_do_include_or_eval(ZEND_INCLUDE, &$$, &$2 TSRMLS_CC); } - | T_INCLUDE_ONCE expr { AC($2); zend_do_include_or_eval(ZEND_INCLUDE_ONCE, &$$, &$2 TSRMLS_CC); } - | T_EVAL '(' expr ')' { AC($3); zend_do_include_or_eval(ZEND_EVAL, &$$, &$3 TSRMLS_CC); } - | T_REQUIRE expr { AC($2); zend_do_include_or_eval(ZEND_REQUIRE, &$$, &$2 TSRMLS_CC); } - | T_REQUIRE_ONCE expr { AC($2); zend_do_include_or_eval(ZEND_REQUIRE_ONCE, &$$, &$2 TSRMLS_CC); } + T_ISSET '(' isset_variables ')' { $$.u.ast = $3.u.ast; } + | T_EMPTY '(' expr ')' { $$.u.ast = zend_ast_create_unary(ZEND_AST_EMPTY, $3.u.ast); } + | T_INCLUDE expr + { $$.u.ast = zend_ast_create_unary_ex(ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.u.ast); } + | T_INCLUDE_ONCE expr + { $$.u.ast = zend_ast_create_unary_ex( + ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2.u.ast); } + | T_EVAL '(' expr ')' + { $$.u.ast = zend_ast_create_unary_ex(ZEND_INCLUDE_OR_EVAL, ZEND_EVAL, $3.u.ast); } + | T_REQUIRE expr + { $$.u.ast = zend_ast_create_unary_ex(ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2.u.ast); } + | T_REQUIRE_ONCE expr + { $$.u.ast = zend_ast_create_unary_ex( + ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2.u.ast); } ; isset_variables: - isset_variable { $$ = $1; } - | isset_variables ',' { zend_do_boolean_and_begin(&$1, &$2 TSRMLS_CC); } isset_variable { zend_do_boolean_and_end(&$$, &$1, &$4, &$2 TSRMLS_CC); } + isset_variable { $$.u.ast = $1.u.ast; } + | isset_variables ',' isset_variable + { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } ; isset_variable: - variable { zend_do_isset_or_isempty(ZEND_ISSET, &$$, &$1 TSRMLS_CC); } - | expr_without_variable { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use isset() on the result of an expression (you can use \"null !== expression\" instead)"); } + expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_ISSET, $1.u.ast); } ; class_constant: - class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { zend_do_fetch_constant(&$$, &$1, &$3, ZEND_RT, 0 TSRMLS_CC); } - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { zend_do_fetch_constant(&$$, &$1, &$3, ZEND_RT, 0 TSRMLS_CC); } + class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING + { $$.u.ast = zend_ast_create_binary( + ZEND_AST_CLASS_CONST, AST_ZVAL(&$1), AST_ZVAL(&$3)); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING + { $$.u.ast = zend_ast_create_binary( + ZEND_AST_CLASS_CONST, $1.u.ast, AST_ZVAL(&$3)); } ; static_class_name_scalar: @@ -1246,7 +1277,8 @@ static_class_name_scalar: ; class_name_scalar: - class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS { zend_do_resolve_class_name(&$$, &$1, 0 TSRMLS_CC); } + class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS + { $$.u.ast = zend_ast_create_unary(ZEND_AST_RESOLVE_CLASS_NAME, AST_ZVAL(&$1)); } ; %% diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 37875dca57..e524645e4e 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -733,13 +733,10 @@ ZEND_API unary_op_type get_unary_op(int opcode) switch (opcode) { case ZEND_BW_NOT: return (unary_op_type) bitwise_not_function; - break; case ZEND_BOOL_NOT: return (unary_op_type) boolean_not_function; - break; default: return (unary_op_type) NULL; - break; } } @@ -749,74 +746,54 @@ ZEND_API binary_op_type get_binary_op(int opcode) case ZEND_ADD: case ZEND_ASSIGN_ADD: return (binary_op_type) add_function; - break; case ZEND_SUB: case ZEND_ASSIGN_SUB: return (binary_op_type) sub_function; - break; case ZEND_MUL: case ZEND_ASSIGN_MUL: return (binary_op_type) mul_function; - break; case ZEND_POW: return (binary_op_type) pow_function; - break; case ZEND_DIV: case ZEND_ASSIGN_DIV: return (binary_op_type) div_function; - break; case ZEND_MOD: case ZEND_ASSIGN_MOD: return (binary_op_type) mod_function; - break; case ZEND_SL: case ZEND_ASSIGN_SL: return (binary_op_type) shift_left_function; - break; case ZEND_SR: case ZEND_ASSIGN_SR: return (binary_op_type) shift_right_function; - break; case ZEND_CONCAT: case ZEND_ASSIGN_CONCAT: return (binary_op_type) concat_function; - break; case ZEND_IS_IDENTICAL: return (binary_op_type) is_identical_function; - break; case ZEND_IS_NOT_IDENTICAL: return (binary_op_type) is_not_identical_function; - break; case ZEND_IS_EQUAL: return (binary_op_type) is_equal_function; - break; case ZEND_IS_NOT_EQUAL: return (binary_op_type) is_not_equal_function; - break; case ZEND_IS_SMALLER: return (binary_op_type) is_smaller_function; - break; case ZEND_IS_SMALLER_OR_EQUAL: return (binary_op_type) is_smaller_or_equal_function; - break; case ZEND_BW_OR: case ZEND_ASSIGN_BW_OR: return (binary_op_type) bitwise_or_function; - break; case ZEND_BW_AND: case ZEND_ASSIGN_BW_AND: return (binary_op_type) bitwise_and_function; - break; case ZEND_BW_XOR: case ZEND_ASSIGN_BW_XOR: return (binary_op_type) bitwise_xor_function; - break; case ZEND_BOOL_XOR: return (binary_op_type) boolean_xor_function; - break; default: return (binary_op_type) NULL; - break; } } -- cgit v1.2.1 From 86db3942cf4bbc7728cc149c969c91071580a1c0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 21 Jun 2014 18:44:16 +0200 Subject: Remove dead code --- Zend/zend_compile.c | 432 ---------------------------------------------------- Zend/zend_compile.h | 20 --- 2 files changed, 452 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 9fc035e0d6..c720196f66 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -97,13 +97,6 @@ ZEND_API zend_compiler_globals compiler_globals; ZEND_API zend_executor_globals executor_globals; #endif -static void zend_push_function_call_entry(zend_function *fbc TSRMLS_DC) /* {{{ */ -{ - zend_function_call_entry fcall = { fbc }; - zend_stack_push(&CG(function_call_stack), &fcall); -} -/* }}} */ - static zend_property_info *zend_duplicate_property_info(zend_property_info *property_info) /* {{{ */ { zend_property_info* new_property_info = emalloc(sizeof(zend_property_info)); @@ -566,19 +559,6 @@ static inline zend_bool zend_is_function_or_method_call(const znode *variable) / } /* }}} */ -void zend_do_unary_op(zend_uchar op, znode *result, znode *op1 TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = op; - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, op1); - GET_NODE(result, opline->result); - SET_UNUSED(opline->op2); -} -/* }}} */ - #define MAKE_NOP(opline) { opline->opcode = ZEND_NOP; memset(&opline->result,0,sizeof(opline->result)); memset(&opline->op1,0,sizeof(opline->op1)); memset(&opline->op2,0,sizeof(opline->op2)); opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; } static void zend_do_op_data(zend_op *data_op, znode *value TSRMLS_DC) /* {{{ */ @@ -1076,22 +1056,6 @@ void zend_do_begin_variable_parse(TSRMLS_D) /* {{{ */ } /* }}} */ -static zend_bool zend_can_parse_variable_for_write(znode *variable TSRMLS_DC) /* {{{ */ -{ - zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); - zend_llist_element *le = fetch_list_ptr->head; - for (le = fetch_list_ptr->head; le; le = le->next) { - zend_op *opline = (zend_op *) le->data; - if ((opline->opcode != ZEND_SEPARATE && opline->opcode != ZEND_FETCH_W) - && (opline->op1_type == IS_TMP_VAR || opline->op1_type == IS_CONST) - ) { - return 0; - } - } - return 1; -} -/* }}} */ - void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS_DC) /* {{{ */ { zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); @@ -5130,239 +5094,6 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con } /* }}} */ -void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - switch (cmd->op_type) { - case IS_CONST: - case IS_TMP_VAR: - opline->opcode = ZEND_SEND_VAL; - break; - default: - opline->opcode = ZEND_SEND_VAR; - break; - } - SET_NODE(opline->op1, cmd); - opline->op2.opline_num = 1; - opline->extended_value = ZEND_DO_FCALL; - SET_UNUSED(opline->op2); - - /* FIXME: exception support not added to this op2 */ - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_DO_FCALL; - opline->result.var = get_temporary_variable(CG(active_op_array)); - opline->result_type = IS_VAR; - LITERAL_STR(opline->op1, STR_INIT("shell_exec", sizeof("shell_exec")-1, 0)); - opline->op1_type = IS_CONST; - GET_CACHE_SLOT(opline->op1.constant); - opline->extended_value = 1; - SET_UNUSED(opline->op2); - opline->op2.num = CG(context).nested_calls; - GET_NODE(result, opline->result); - - if (CG(context).nested_calls + 1 > CG(active_op_array)->nested_calls) { - CG(active_op_array)->nested_calls = CG(context).nested_calls + 1; - } - if (CG(context).used_stack + 2 > CG(active_op_array)->used_stack) { - CG(active_op_array)->used_stack = CG(context).used_stack + 2; - } -} -/* }}} */ - -void zend_do_init_array(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC) /* {{{ */ -{ - int op_num = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - result->u.op.opline_num = op_num; - - opline->opcode = ZEND_INIT_ARRAY; - opline->result.var = get_temporary_variable(CG(active_op_array)); - opline->result_type = IS_TMP_VAR; - opline->extended_value = is_ref; /* extval = size << 2 | not_packed << 1 | is_ref */ - - if (expr) { - opline->extended_value += 1 << ZEND_ARRAY_SIZE_SHIFT; /* increment size */ - SET_NODE(opline->op1, expr); - if (offset) { - SET_NODE(opline->op2, offset); - if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { - ulong index; - int numeric = 0; - - opline->extended_value |= ZEND_ARRAY_NOT_PACKED; - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(CONSTANT(opline->op2.constant)), Z_STRLEN(CONSTANT(opline->op2.constant))+1, index, numeric = 1); - if (numeric) { - zval_dtor(&CONSTANT(opline->op2.constant)); - ZVAL_LONG(&CONSTANT(opline->op2.constant), index); - } - } - } else { - SET_UNUSED(opline->op2); - } - } else { - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - } -} -/* }}} */ - -void zend_do_add_array_element(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zend_op *init_opline = &CG(active_op_array)->opcodes[result->u.op.opline_num]; - init_opline->extended_value += 1 << ZEND_ARRAY_SIZE_SHIFT; /* increment size */ - - opline->opcode = ZEND_ADD_ARRAY_ELEMENT; - COPY_NODE(opline->result, init_opline->result); - SET_NODE(opline->op1, expr); - if (offset) { - SET_NODE(opline->op2, offset); - if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { - ulong index; - int numeric = 0; - - init_opline->extended_value |= ZEND_ARRAY_NOT_PACKED; - ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(CONSTANT(opline->op2.constant)), Z_STRLEN(CONSTANT(opline->op2.constant))+1, index, numeric = 1); - if (numeric) { - zval_dtor(&CONSTANT(opline->op2.constant)); - ZVAL_LONG(&CONSTANT(opline->op2.constant), index); - } - } - } else { - SET_UNUSED(opline->op2); - } - opline->extended_value = is_ref; -} -/* }}} */ - -void zend_do_end_array(znode *result, const znode *array_node TSRMLS_DC) /* {{{ */ -{ - int next_op_num = get_next_op_number(CG(active_op_array)); - zend_op *init_opline = &CG(active_op_array)->opcodes[array_node->u.op.opline_num]; - zend_op *opline; - int i; - int constant_array = 0; - zval array; - - /* check if constructed array consists only from constants */ - if ((init_opline->op1_type & (IS_UNUSED | IS_CONST)) && - (init_opline->op2_type & (IS_UNUSED | IS_CONST))) { - if (next_op_num == array_node->u.op.opline_num + 1) { - constant_array = 1; - } else if ((init_opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT) == next_op_num - array_node->u.op.opline_num) { - opline = init_opline + 1; - i = next_op_num - array_node->u.op.opline_num - 1; - while (i > 0) { - if (opline->opcode != ZEND_ADD_ARRAY_ELEMENT || - opline->op1_type != IS_CONST || - !(opline->op2_type & (IS_UNUSED | IS_CONST))) { - break; - } - opline++; - i--; - } - if (i == 0) { - constant_array = 1; - } - } - } - - if (constant_array) { - /* try to construct constant array */ - zend_uint size; - long num; - zend_string *str; - - if (init_opline->op1_type != IS_UNUSED) { - size = init_opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT; - } else { - size = 0; - } - ZVAL_NEW_ARR(&array); - zend_hash_init(Z_ARRVAL(array), size, NULL, ZVAL_PTR_DTOR, 0); - - if (init_opline->op1_type != IS_UNUSED) { - /* Explicitly initialize array as not-packed if flag is set */ - if (init_opline->extended_value & ZEND_ARRAY_NOT_PACKED) { - zend_hash_real_init(Z_ARRVAL(array), 0); - } - - opline = init_opline; - i = next_op_num - array_node->u.op.opline_num; - while (i > 0 && constant_array) { - if (opline->op2_type == IS_CONST) { - switch (Z_TYPE(CONSTANT(opline->op2.constant))) { - case IS_LONG: - num = Z_LVAL(CONSTANT(opline->op2.constant)); -num_index: - zend_hash_index_update(Z_ARRVAL(array), num, &CONSTANT(opline->op1.constant)); - if (Z_REFCOUNTED(CONSTANT(opline->op1.constant))) Z_ADDREF(CONSTANT(opline->op1.constant)); - break; - case IS_STRING: - str = Z_STR(CONSTANT(opline->op2.constant)); -str_index: - zend_hash_update(Z_ARRVAL(array), str, &CONSTANT(opline->op1.constant)); - if (Z_REFCOUNTED(CONSTANT(opline->op1.constant))) Z_ADDREF(CONSTANT(opline->op1.constant)); - break; - case IS_DOUBLE: - num = zend_dval_to_lval(Z_DVAL(CONSTANT(opline->op2.constant))); - goto num_index; - case IS_FALSE: - num = 0; - goto num_index; - case IS_TRUE: - num = 1; - goto num_index; - case IS_NULL: - str = STR_EMPTY_ALLOC(); - goto str_index; - default: - constant_array = 0; - break; - } - } else { - zend_hash_next_index_insert(Z_ARRVAL(array), &CONSTANT(opline->op1.constant)); - if (Z_REFCOUNTED(CONSTANT(opline->op1.constant))) Z_ADDREF(CONSTANT(opline->op1.constant)); - } - opline++; - i--; - } - if (!constant_array) { - zval_dtor(&array); - } - } - } - - if (constant_array) { - /* remove run-time array construction and use constant array instead */ - opline = &CG(active_op_array)->opcodes[next_op_num-1]; - while (opline != init_opline) { - if (opline->op2_type == IS_CONST) { - zend_del_literal(CG(active_op_array), opline->op2.constant); - } - zend_del_literal(CG(active_op_array), opline->op1.constant); - opline--; - } - if (opline->op2_type == IS_CONST) { - zend_del_literal(CG(active_op_array), opline->op2.constant); - } - if (opline->op1_type == IS_CONST) { - zend_del_literal(CG(active_op_array), opline->op1.constant); - } - CG(active_op_array)->last = array_node->u.op.opline_num; - - zend_make_immutable_array(&array TSRMLS_CC); - - result->op_type = IS_CONST; - ZVAL_COPY_VALUE(&result->u.constant, &array); - } else { - GET_NODE(result, init_opline->result); - } -} -/* }}} */ - void zend_init_list(void *result, void *item TSRMLS_DC) /* {{{ */ { void** list = emalloc(sizeof(void*) * 2); @@ -5497,146 +5228,6 @@ void zend_do_fetch_global_variable(znode *varname, const znode *static_assignmen } /* }}} */ -void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC) /* {{{ */ -{ - zend_do_extended_fcall_begin(TSRMLS_C); - { - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_INCLUDE_OR_EVAL; - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, op1); - SET_UNUSED(opline->op2); - opline->extended_value = type; - GET_NODE(result, opline->result); - } - zend_do_extended_fcall_end(TSRMLS_C); -} -/* }}} */ - -void zend_do_indirect_reference(znode *result, znode *variable TSRMLS_DC) /* {{{ */ -{ - fetch_simple_variable_ex(result, variable, 0, ZEND_FETCH_R TSRMLS_CC); - - /* there is a chance someone is accessing $this */ - if (CG(active_op_array)->scope && CG(active_op_array)->this_var == -1) { - zend_string *key = STR_INIT("this", sizeof("this")-1, 0); - CG(active_op_array)->this_var = lookup_cv(CG(active_op_array), key TSRMLS_CC); - } -} -/* }}} */ - -void zend_do_unset(znode *variable TSRMLS_DC) /* {{{ */ -{ - zend_op *last_op; - - zend_check_writable_variable(variable); - - if (variable->op_type == IS_CV) { - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_UNSET_VAR; - SET_NODE(opline->op1, variable); - SET_UNUSED(opline->op2); - SET_UNUSED(opline->result); - opline->extended_value = ZEND_FETCH_LOCAL | ZEND_QUICK_SET; - } else { - last_op = &CG(active_op_array)->opcodes[get_next_op_number(CG(active_op_array))-1]; - - switch (last_op->opcode) { - case ZEND_FETCH_UNSET: - last_op->opcode = ZEND_UNSET_VAR; - SET_UNUSED(last_op->result); - break; - case ZEND_FETCH_DIM_UNSET: - last_op->opcode = ZEND_UNSET_DIM; - SET_UNUSED(last_op->result); - break; - case ZEND_FETCH_OBJ_UNSET: - last_op->opcode = ZEND_UNSET_OBJ; - SET_UNUSED(last_op->result); - break; - - } - } -} -/* }}} */ - -void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC) /* {{{ */ -{ - zend_op *last_op; - - if (zend_is_call(variable->u.ast)) { - if (type == ZEND_ISEMPTY) { - /* empty(func()) can be transformed to !func() */ - AST_COMPILE(variable, variable->u.ast); - zend_do_unary_op(ZEND_BOOL_NOT, result, variable TSRMLS_CC); - } else { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use isset() on the result of a function call (you can use \"null !== func()\" instead)"); - } - - return; - } - - AST_COMPILE_VAR(variable, variable->u.ast, BP_VAR_IS); - - if (variable->op_type == IS_CV) { - last_op = get_next_op(CG(active_op_array) TSRMLS_CC); - last_op->opcode = ZEND_ISSET_ISEMPTY_VAR; - SET_NODE(last_op->op1, variable); - SET_UNUSED(last_op->op2); - last_op->result.var = get_temporary_variable(CG(active_op_array)); - last_op->extended_value = ZEND_FETCH_LOCAL | ZEND_QUICK_SET; - } else { - last_op = &CG(active_op_array)->opcodes[get_next_op_number(CG(active_op_array))-1]; - - switch (last_op->opcode) { - case ZEND_FETCH_IS: - last_op->opcode = ZEND_ISSET_ISEMPTY_VAR; - break; - case ZEND_FETCH_DIM_IS: - last_op->opcode = ZEND_ISSET_ISEMPTY_DIM_OBJ; - break; - case ZEND_FETCH_OBJ_IS: - last_op->opcode = ZEND_ISSET_ISEMPTY_PROP_OBJ; - break; - } - } - last_op->result_type = IS_TMP_VAR; - last_op->extended_value |= type; - - GET_NODE(result, last_op->result); -} -/* }}} */ - -void zend_do_instanceof(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC) /* {{{ */ -{ - int last_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline; - - if (last_op_number > 0) { - opline = &CG(active_op_array)->opcodes[last_op_number-1]; - if (opline->opcode == ZEND_FETCH_CLASS) { - opline->extended_value |= ZEND_FETCH_CLASS_NO_AUTOLOAD; - } - } - - if (expr->op_type == IS_CONST) { - zend_error_noreturn(E_COMPILE_ERROR, "instanceof expects an object instance, constant given"); - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_INSTANCEOF; - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, expr); - - SET_NODE(opline->op2, class_znode); - - GET_NODE(result, opline->result); -} -/* }}} */ - static zend_bool zend_can_write_to_variable(zend_ast *ast); void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, znode *array, znode *as_token, int variable TSRMLS_DC) /* {{{ */ @@ -5899,29 +5490,6 @@ void zend_do_declare_end(const znode *declare_token TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_begin_silence(znode *strudel_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_BEGIN_SILENCE; - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - GET_NODE(strudel_token, opline->result); -} -/* }}} */ - -void zend_do_end_silence(znode *strudel_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_END_SILENCE; - SET_NODE(opline->op1, strudel_token); - SET_UNUSED(opline->op2); -} -/* }}} */ - void zend_do_extended_info(TSRMLS_D) /* {{{ */ { zend_op *opline; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 86e552bc1a..734c677958 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -468,12 +468,10 @@ int zend_get_zendleng(TSRMLS_D); /* parser-driven code generators */ -void zend_do_unary_op(zend_uchar op, znode *result, znode *op1 TSRMLS_DC); void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC); void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC); void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC); void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar op TSRMLS_DC); -void zend_do_indirect_reference(znode *result, znode *variable TSRMLS_DC); void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC); void zend_do_fetch_global_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC); @@ -517,7 +515,6 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC); void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, znode *class_type, zend_bool pass_by_reference, zend_bool is_variadic TSRMLS_DC); void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC); void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC); -void zend_do_end_function_call(znode *function_name, znode *result, int is_method, int is_dynamic_fcall TSRMLS_DC); void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC); void zend_do_handle_exception(TSRMLS_D); @@ -575,24 +572,10 @@ void zend_do_halt_compiler_register(TSRMLS_D); void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode, zend_bool check_namespace TSRMLS_DC); -void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC); - -void zend_do_init_array(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC); -void zend_do_add_array_element(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC); -void zend_do_end_array(znode *result, const znode *array_node TSRMLS_DC); - /* Functions for a null terminated pointer list, used for traits parsing and compilation */ void zend_init_list(void *result, void *item TSRMLS_DC); void zend_add_to_list(void *result, void *item TSRMLS_DC); - -void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC); - -void zend_do_unset(znode *variable TSRMLS_DC); -void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC); - -void zend_do_instanceof(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC); - void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, znode *array, znode *as_token, int variable TSRMLS_DC); void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token, const znode *as_token, znode *value, znode *key TSRMLS_DC); void zend_do_foreach_end(const znode *foreach_token, const znode *as_token TSRMLS_DC); @@ -601,9 +584,6 @@ void zend_do_declare_begin(TSRMLS_D); void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC); void zend_do_declare_end(const znode *declare_token TSRMLS_DC); -void zend_do_begin_silence(znode *strudel_token TSRMLS_DC); -void zend_do_end_silence(znode *strudel_token TSRMLS_DC); - void zend_do_extended_info(TSRMLS_D); void zend_do_extended_fcall_begin(TSRMLS_D); void zend_do_extended_fcall_end(TSRMLS_D); -- cgit v1.2.1 From b6789b1dd6a62c4176b1337658afb34f2e1d973b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 21 Jun 2014 19:26:17 +0200 Subject: zend_ast_dynamic_ast returns new node --- Zend/zend_ast.c | 9 +++++---- Zend/zend_ast.h | 8 ++++++-- Zend/zend_compile.c | 3 +-- Zend/zend_language_parser.y | 29 ++++++++++++++++------------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 84243c2793..c2a9500feb 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -99,12 +99,13 @@ static inline zend_bool is_power_of_two(unsigned short n) { return n == (n & -n); } -ZEND_API void zend_ast_dynamic_add(zend_ast **ast, zend_ast *op) +ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op) { - if ((*ast)->children >= 4 && is_power_of_two((*ast)->children)) { - *ast = erealloc(*ast, sizeof(zend_ast) + sizeof(zend_ast *) * ((*ast)->children * 2 - 1)); + if (ast->children >= 4 && is_power_of_two(ast->children)) { + ast = erealloc(ast, sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children * 2 - 1)); } - (*ast)->child[(*ast)->children++] = op; + ast->child[ast->children++] = op; + return ast; } ZEND_API void zend_ast_dynamic_shrink(zend_ast **ast) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index cfe0ffae14..d789d909d2 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -110,8 +110,8 @@ ZEND_API zend_ast *zend_ast_create_binary_ex( ZEND_API zend_ast *zend_ast_create_ternary_ex( zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0, zend_ast *op1, zend_ast *op2); -ZEND_API zend_ast* zend_ast_create_dynamic(zend_ast_kind kind); -ZEND_API void zend_ast_dynamic_add(zend_ast **ast, zend_ast *op); +ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind); +ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op); ZEND_API void zend_ast_dynamic_shrink(zend_ast **ast); ZEND_API int zend_ast_is_ct_constant(zend_ast *ast); @@ -136,6 +136,10 @@ static inline zend_ast *zend_ast_create_ternary( return zend_ast_create_ternary_ex(kind, 0, op0, op1, op2); } +static inline zend_ast *zend_ast_create_dynamic_and_add(zend_ast_kind kind, zend_ast *op) { + return zend_ast_dynamic_add(zend_ast_create_dynamic(kind), op); +} + static inline zend_ast *zend_ast_create_var(zval *name) { return zend_ast_create_unary(ZEND_AST_VAR, zend_ast_create_constant(name)); } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index c720196f66..017967ec23 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7618,8 +7618,7 @@ void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { ZVAL_STRING(&fn_name, "shell_exec"); name_ast = zend_ast_create_zval(&fn_name); - params_ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); - zend_ast_dynamic_add(¶ms_ast, expr_ast); + params_ast = zend_ast_dynamic_add(zend_ast_create_dynamic(ZEND_AST_PARAMS), expr_ast); call_ast = zend_ast_create_binary(ZEND_AST_CALL, name_ast, params_ast); zend_compile_expr(result, call_ast TSRMLS_CC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 94fa29727b..1b6433ddff 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -584,10 +584,9 @@ function_call_parameter_list: non_empty_function_call_parameter_list: function_call_parameter - { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); - zend_ast_dynamic_add(&$$.u.ast, $1.u.ast); } + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PARAMS, $1.u.ast); } | non_empty_function_call_parameter_list ',' function_call_parameter - { zend_ast_dynamic_add(&$1.u.ast, $3.u.ast); $$.u.ast = $1.u.ast; } + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } ; function_call_parameter: @@ -1070,10 +1069,16 @@ possible_comma: ; non_empty_static_array_pair_list: - non_empty_static_array_pair_list ',' static_scalar_value T_DOUBLE_ARROW static_scalar_value { zend_ast_dynamic_add(&$$.u.ast, $3.u.ast); zend_ast_dynamic_add(&$$.u.ast, $5.u.ast); } - | non_empty_static_array_pair_list ',' static_scalar_value { zend_ast_dynamic_add(&$$.u.ast, NULL); zend_ast_dynamic_add(&$$.u.ast, $3.u.ast); } - | static_scalar_value T_DOUBLE_ARROW static_scalar_value { $$.u.ast = zend_ast_create_dynamic(ZEND_INIT_ARRAY); zend_ast_dynamic_add(&$$.u.ast, $1.u.ast); zend_ast_dynamic_add(&$$.u.ast, $3.u.ast); } - | static_scalar_value { $$.u.ast = zend_ast_create_dynamic(ZEND_INIT_ARRAY); zend_ast_dynamic_add(&$$.u.ast, NULL); zend_ast_dynamic_add(&$$.u.ast, $1.u.ast); } + non_empty_static_array_pair_list ',' static_scalar_value T_DOUBLE_ARROW static_scalar_value + { $$.u.ast = zend_ast_dynamic_add(zend_ast_dynamic_add($1.u.ast, $3.u.ast), $5.u.ast); } + | non_empty_static_array_pair_list ',' static_scalar_value + { $$.u.ast = zend_ast_dynamic_add(zend_ast_dynamic_add($1.u.ast, NULL), $3.u.ast); } + | static_scalar_value T_DOUBLE_ARROW static_scalar_value + { $$.u.ast = zend_ast_dynamic_add(zend_ast_create_dynamic_and_add( + ZEND_INIT_ARRAY, $1.u.ast), $3.u.ast); } + | static_scalar_value + { $$.u.ast = zend_ast_dynamic_add(zend_ast_create_dynamic_and_add( + ZEND_INIT_ARRAY, NULL), $1.u.ast); } ; expr: @@ -1166,10 +1171,9 @@ member_name: assignment_list: assignment_list ',' assignment_list_element - { zend_ast_dynamic_add(&$1.u.ast, $3.u.ast); $$.u.ast = $1.u.ast; } + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } | assignment_list_element - { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_LIST); - zend_ast_dynamic_add(&$$.u.ast, $1.u.ast); } + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_LIST, $1.u.ast); } ; assignment_list_element: @@ -1186,10 +1190,9 @@ array_pair_list: non_empty_array_pair_list: non_empty_array_pair_list ',' array_pair - { zend_ast_dynamic_add(&$1.u.ast, $3.u.ast); $$.u.ast = $1.u.ast; } + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } | array_pair - { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_ARRAY); - zend_ast_dynamic_add(&$$.u.ast, $1.u.ast); } + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARRAY, $1.u.ast); } ; array_pair: -- cgit v1.2.1 From 90d36554e208cea9d5600d1a9bdee909002a2352 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 21 Jun 2014 20:03:29 +0200 Subject: Support string interpolation --- Zend/zend_ast.h | 2 + Zend/zend_compile.c | 105 ++++++++++++++++++++++---------------------- Zend/zend_compile.h | 3 -- Zend/zend_language_parser.y | 18 ++++---- 4 files changed, 65 insertions(+), 63 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index d789d909d2..b1b9c17589 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -77,6 +77,8 @@ enum _zend_ast_kind { ZEND_AST_CONST, ZEND_AST_CLASS_CONST, ZEND_AST_RESOLVE_CLASS_NAME, + + ZEND_AST_ENCAPS_LIST, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 017967ec23..8397843ef1 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1155,58 +1155,6 @@ void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS } /* }}} */ -void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - - if (Z_STRLEN(op2->u.constant) > 1) { - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_ADD_STRING; - } else if (Z_STRLEN(op2->u.constant) == 1) { - int ch = *Z_STRVAL(op2->u.constant); - - /* Free memory and use ZEND_ADD_CHAR in case of 1 character strings */ - STR_FREE(Z_STR(op2->u.constant)); - ZVAL_LONG(&op2->u.constant, ch); - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_ADD_CHAR; - } else { /* String can be empty after a variable at the end of a heredoc */ - STR_FREE(Z_STR(op2->u.constant)); - return; - } - - if (op1) { - SET_NODE(opline->op1, op1); - SET_NODE(opline->result, op1); - } else { - SET_UNUSED(opline->op1); - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - } - SET_NODE(opline->op2, op2); - GET_NODE(result, opline->result); -} -/* }}} */ - -void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_ADD_VAR; - - if (op1) { - SET_NODE(opline->op1, op1); - SET_NODE(opline->result, op1); - } else { - SET_UNUSED(opline->op1); - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - } - SET_NODE(opline->op2, op2); - GET_NODE(result, opline->result); -} -/* }}} */ - void zend_do_free(znode *op1 TSRMLS_DC) /* {{{ */ { if (op1->op_type==IS_TMP_VAR) { @@ -7877,6 +7825,56 @@ void zend_compile_resolve_class_name(znode *result, zend_ast *ast TSRMLS_DC) { } } +void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { + zend_uint i; + + ZEND_ASSERT(ast->children > 0); + + result->op_type = IS_TMP_VAR; + result->u.op.var = get_temporary_variable(CG(active_op_array)); + + for (i = 0; i < ast->children; ++i) { + zend_ast *elem_ast = ast->child[i]; + znode elem_node; + zend_op *opline; + + zend_compile_expr(&elem_node, elem_ast TSRMLS_CC); + + if (elem_ast->kind == ZEND_CONST) { + zval *zv = &elem_node.u.constant; + ZEND_ASSERT(Z_TYPE_P(zv) == IS_STRING); + + if (Z_STRLEN_P(zv) > 1) { + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_ADD_STRING; + } else if (Z_STRLEN_P(zv) == 1) { + char ch = *Z_STRVAL_P(zv); + STR_RELEASE(Z_STR_P(zv)); + ZVAL_LONG(zv, ch); + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_ADD_CHAR; + } else { + /* String can be empty after a variable at the end of a heredoc */ + STR_RELEASE(Z_STR_P(zv)); + continue; + } + } else { + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_ADD_VAR; + ZEND_ASSERT(elem_node.op_type != IS_CONST); + } + + if (i == 0) { + SET_UNUSED(opline->op1); + } else { + SET_NODE(opline->op1, result); + } + SET_NODE(opline->op2, &elem_node); + SET_NODE(opline->result, result); + } +} + void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { switch (ast->kind) { case ZEND_AST_GLOBAL: @@ -7992,6 +7990,9 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_RESOLVE_CLASS_NAME: zend_compile_resolve_class_name(result, ast TSRMLS_CC); return; + case ZEND_AST_ENCAPS_LIST: + zend_compile_encaps_list(result, ast TSRMLS_CC); + return; default: ZEND_ASSERT(0 /* not supported */); } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 734c677958..6e66b9e9d6 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -506,9 +506,6 @@ void zend_check_writable_variable(const znode *variable); void zend_do_free(znode *op1 TSRMLS_DC); -void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC); -void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC); - int zend_do_verify_access_types(const znode *current_access_type, const znode *new_modifier); void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC); void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1b6433ddff..40d887664c 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -940,7 +940,7 @@ backticks_expr: { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); $$.u.ast = zend_ast_create_constant(&empty_str); } | T_ENCAPSED_AND_WHITESPACE { $$.u.ast = AST_ZVAL(&$1); } - | encaps_list { $$.u.ast = AST_ZNODE(&$1); } + | encaps_list { $$.u.ast = $1.u.ast; } ; @@ -1051,8 +1051,8 @@ scalar: Z_STR($2.u.constant) = Z_STR(tmp); $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } | common_scalar { $$.u.ast = $1.u.ast; } - | '"' encaps_list '"' { $$ = $2; AZ($$); } - | T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = $2; AZ($$); } + | '"' encaps_list '"' { $$.u.ast = $2.u.ast; } + | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.u.ast = $2.u.ast; } | T_CLASS_C { if (Z_TYPE($1.u.constant) == IS_CONSTANT) {zend_do_fetch_constant(&$$, NULL, &$1, ZEND_RT, 1 TSRMLS_CC); AZ($$); } else { $$.u.ast = AST_ZVAL(&$1); } } | dereferencable_scalar { $$.u.ast = $1.u.ast; } ; @@ -1207,12 +1207,14 @@ array_pair: encaps_list: encaps_list encaps_var - { AST_COMPILE(&$2, $2.u.ast); zend_do_add_variable(&$$, &$1, &$2 TSRMLS_CC); } - | encaps_list T_ENCAPSED_AND_WHITESPACE { zend_do_add_string(&$$, &$1, &$2 TSRMLS_CC); } - | encaps_var { AST_COMPILE(&$1, $1.u.ast); zend_do_add_variable(&$$, NULL, &$1 TSRMLS_CC); } + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } + | encaps_list T_ENCAPSED_AND_WHITESPACE + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, AST_ZVAL(&$2)); } + | encaps_var + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ENCAPS_LIST, $1.u.ast); } | T_ENCAPSED_AND_WHITESPACE encaps_var - { zend_do_add_string(&$$, NULL, &$1 TSRMLS_CC); - AST_COMPILE(&$2, $2.u.ast); zend_do_add_variable(&$$, &$$, &$2 TSRMLS_CC); } + { $$.u.ast = zend_ast_dynamic_add(zend_ast_create_dynamic_and_add( + ZEND_AST_ENCAPS_LIST, AST_ZVAL(&$1)), $2.u.ast); } ; encaps_var: -- cgit v1.2.1 From 508d146cd318274199b34327b9947b583d601083 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 21 Jun 2014 20:11:31 +0200 Subject: Move T_STRING_VARNAME handling --- Zend/zend_language_parser.y | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 40d887664c..7190f384a9 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1035,8 +1035,7 @@ static_operation: scalar: - T_STRING_VARNAME { $$ = $1; AZ($$); } - | class_name_scalar { $$.u.ast = $1.u.ast; } + class_name_scalar { $$.u.ast = $1.u.ast; } | class_constant { $$.u.ast = $1.u.ast; } | namespace_name { $$.u.ast = zend_ast_create_unary( @@ -1225,9 +1224,11 @@ encaps_var: zend_ast_create_var(&$1.u.constant), $3.u.ast); } | T_VARIABLE T_OBJECT_OPERATOR T_STRING { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, - zend_ast_create_var(&$1.u.constant), AST_ZNODE(&$3)); } + zend_ast_create_var(&$1.u.constant), AST_ZVAL(&$3)); } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); } + | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' + { $$.u.ast = zend_ast_create_var(&$2.u.constant); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, zend_ast_create_var(&$2.u.constant), $4.u.ast); } -- cgit v1.2.1 From 0644fbccf7da03a0c291ddda219b91474befd616 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 22 Jun 2014 15:57:44 +0200 Subject: Implement CT eval of binary expressions I totally hate this approach. It's ugly and I don't think I can share code with the static scalar evaluation. Maybe I should use the approach that static scalars use instead? --- Zend/zend_compile.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8397843ef1..60fe0af475 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5186,7 +5186,6 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); if (variable) { - // TODO.AST or !zend_can_parse_variable_for_write(array TSRMLS_CC) if (zend_is_call(array->u.ast) || !zend_can_write_to_variable(array->u.ast)) { is_variable = 0; AST_COMPILE_VAR(array, array->u.ast, BP_VAR_R); @@ -7183,16 +7182,31 @@ void zend_compile_unset(zend_ast *ast TSRMLS_DC) { } } -void zend_compile_binary_op(znode *result, zend_ast *ast TSRMLS_DC) { +int zend_compile_binary_op_maybe_ct(znode *result, zend_ast *ast, zend_bool ct_required TSRMLS_DC) { zend_ast *left_ast = ast->child[0]; zend_ast *right_ast = ast->child[1]; zend_uint opcode = ast->attr; znode left_node, right_node; - zend_compile_expr(&left_node, left_ast TSRMLS_CC); - zend_compile_expr(&right_node, right_ast TSRMLS_CC); + + int ct_left = zend_compile_expr_maybe_ct(&left_node, left_ast, ct_required TSRMLS_CC); + int ct_right = zend_compile_expr_maybe_ct(&right_node, right_ast, ct_required TSRMLS_CC); + if (ct_left == SUCCESS && ct_right == SUCCESS) { + binary_op_type op = get_binary_op(opcode); + op(&result->u.constant, &left_node.u.constant, &right_node.u.constant TSRMLS_CC); + zval_ptr_dtor(&left_node.u.constant); + zval_ptr_dtor(&right_node.u.constant); + result->op_type = IS_CONST; + return SUCCESS; + } else if (ct_required) { + if (ct_left == SUCCESS) zval_ptr_dtor(&left_node.u.constant); + if (ct_right == SUCCESS) zval_ptr_dtor(&right_node.u.constant); + return FAILURE; + } emit_op_tmp(result, opcode, &left_node, &right_node TSRMLS_CC); + + return FAILURE; } /* We do not use zend_compile_binary_op for this because we want to retain the left-to-right @@ -7921,7 +7935,7 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_compound_assign(result, ast TSRMLS_CC); return; case ZEND_AST_BINARY_OP: - zend_compile_binary_op(result, ast TSRMLS_CC); + zend_compile_binary_op_maybe_ct(result, ast, 0 TSRMLS_CC); return; case ZEND_AST_GREATER: case ZEND_AST_GREATER_EQUAL: @@ -8004,6 +8018,8 @@ int zend_compile_expr_maybe_ct(znode *result, zend_ast *ast, zend_bool ct_requir ZVAL_COPY(&result->u.constant, zend_ast_get_zval(ast)); result->op_type = IS_CONST; return SUCCESS; + case ZEND_AST_BINARY_OP: + return zend_compile_binary_op_maybe_ct(result, ast, ct_required TSRMLS_CC); case ZEND_AST_ARRAY: return zend_compile_array_maybe_ct(result, ast, ct_required TSRMLS_CC); default: -- cgit v1.2.1 From e26c6d663aaef17a9c8555d64782cd4b5bfac116 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 23 Jun 2014 21:30:57 +0200 Subject: Implement constant expression folding as a separate pass --- Zend/zend_ast.c | 2 +- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 232 ++++++++++++++++++++++++---------------------------- Zend/zend_compile.h | 1 + 4 files changed, 109 insertions(+), 127 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index c2a9500feb..c6f5ca8ccc 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -411,7 +411,7 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) int i; if (ast->kind == ZEND_CONST) { - zval_dtor(zend_ast_get_zval(ast)); + zval_ptr_dtor(zend_ast_get_zval(ast)); } else if (ast->kind != ZEND_AST_ZNODE) { for (i = 0; i < ast->children; i++) { if (ast->child[i]) { diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index b1b9c17589..9806790841 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -155,6 +155,7 @@ static inline zend_ast *zend_ast_create_assign_op(zend_uint opcode, zend_ast *op /* Temporary, for porting */ #define AST_COMPILE(res, ast) do { \ zend_ast *_ast = (ast); \ + zend_eval_const_expr(&_ast TSRMLS_CC); \ zend_compile_expr((res), _ast TSRMLS_CC); \ zend_ast_destroy(_ast); \ } while (0) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 60fe0af475..533341db6d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7182,31 +7182,16 @@ void zend_compile_unset(zend_ast *ast TSRMLS_DC) { } } -int zend_compile_binary_op_maybe_ct(znode *result, zend_ast *ast, zend_bool ct_required TSRMLS_DC) { +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]; zend_uint opcode = ast->attr; znode left_node, right_node; - - int ct_left = zend_compile_expr_maybe_ct(&left_node, left_ast, ct_required TSRMLS_CC); - int ct_right = zend_compile_expr_maybe_ct(&right_node, right_ast, ct_required TSRMLS_CC); - if (ct_left == SUCCESS && ct_right == SUCCESS) { - binary_op_type op = get_binary_op(opcode); - op(&result->u.constant, &left_node.u.constant, &right_node.u.constant TSRMLS_CC); - zval_ptr_dtor(&left_node.u.constant); - zval_ptr_dtor(&right_node.u.constant); - result->op_type = IS_CONST; - return SUCCESS; - } else if (ct_required) { - if (ct_left == SUCCESS) zval_ptr_dtor(&left_node.u.constant); - if (ct_right == SUCCESS) zval_ptr_dtor(&right_node.u.constant); - return FAILURE; - } + zend_compile_expr(&left_node, left_ast TSRMLS_CC); + zend_compile_expr(&right_node, right_ast TSRMLS_CC); emit_op_tmp(result, opcode, &left_node, &right_node TSRMLS_CC); - - return FAILURE; } /* We do not use zend_compile_binary_op for this because we want to retain the left-to-right @@ -7590,96 +7575,11 @@ void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast_destroy(name_ast); } -int zend_try_ct_compile_array(zval *array, zend_ast *ast TSRMLS_DC) { - zend_uint i; - - ZVAL_UNDEF(array); - for (i = 0; i < ast->children; ++i) { - zend_ast *elem_ast = ast->child[i]; - zend_ast *value_ast = elem_ast->child[0]; - zend_ast *key_ast = elem_ast->child[1]; - zend_bool by_ref = elem_ast->attr; - - znode key_node, value_node; - zval *key = &key_node.u.constant, *value = &value_node.u.constant; - - if (by_ref) { - goto failure; - } - - if (FAILURE == zend_compile_expr_maybe_ct(&value_node, value_ast, 1 TSRMLS_CC)) { - goto failure; - } - - if (key_ast) { - if (FAILURE == zend_compile_expr_maybe_ct(&key_node, key_ast, 1 TSRMLS_CC)) { - zval_ptr_dtor(value); - goto failure; - } - } - - if (Z_TYPE_P(array) == IS_UNDEF) { - array_init_size(array, ast->children); - } - - if (key_ast) { - switch (Z_TYPE_P(key)) { - case IS_LONG: - zend_hash_index_update(Z_ARRVAL_P(array), Z_LVAL_P(key), value); - break; - case IS_STRING: - zend_symtable_update(Z_ARRVAL_P(array), Z_STR_P(key), value); - break; - case IS_DOUBLE: - zend_hash_index_update(Z_ARRVAL_P(array), - zend_dval_to_lval(Z_DVAL_P(key)), value); - break; - case IS_FALSE: - zend_hash_index_update(Z_ARRVAL_P(array), 0, value); - break; - case IS_TRUE: - zend_hash_index_update(Z_ARRVAL_P(array), 1, value); - break; - case IS_NULL: - zend_hash_update(Z_ARRVAL_P(array), STR_EMPTY_ALLOC(), value); - break; - default: - zend_error(E_COMPILE_ERROR, "Illegal offset type"); - break; - } - zval_ptr_dtor(key); - } else { - zend_hash_next_index_insert(Z_ARRVAL_P(array), value); - } - } - - if (!ast->children) { - array_init(array); - } - - zend_make_immutable_array(array TSRMLS_CC); - return SUCCESS; - -failure: - zval_dtor(array); - return FAILURE; -} - -int zend_compile_array_maybe_ct(znode *result, zend_ast *ast, zend_bool ct_required TSRMLS_DC) { +void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { zend_op *opline; zend_uint i, opnum_init; zend_bool packed = 1; - zval array; - - if (SUCCESS == zend_try_ct_compile_array(&array, ast TSRMLS_CC)) { - result->op_type = IS_CONST; - ZVAL_COPY_VALUE(&result->u.constant, &array); - return SUCCESS; - } else if (ct_required) { - return FAILURE; - } - opnum_init = get_next_op_number(CG(active_op_array)); for (i = 0; i < ast->children; ++i) { @@ -7729,8 +7629,6 @@ int zend_compile_array_maybe_ct(znode *result, zend_ast *ast, zend_bool ct_requi opline = &CG(active_op_array)->opcodes[opnum_init]; opline->extended_value |= ZEND_ARRAY_NOT_PACKED; } - - return FAILURE; } void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { @@ -7935,7 +7833,7 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_compound_assign(result, ast TSRMLS_CC); return; case ZEND_AST_BINARY_OP: - zend_compile_binary_op_maybe_ct(result, ast, 0 TSRMLS_CC); + zend_compile_binary_op(result, ast TSRMLS_CC); return; case ZEND_AST_GREATER: case ZEND_AST_GREATER_EQUAL: @@ -7993,7 +7891,7 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_shell_exec(result, ast TSRMLS_CC); return; case ZEND_AST_ARRAY: - zend_compile_array_maybe_ct(result, ast, 0 TSRMLS_CC); + zend_compile_array(result, ast TSRMLS_CC); return; case ZEND_AST_CONST: zend_compile_const(result, ast TSRMLS_CC); @@ -8012,24 +7910,6 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { } } -int zend_compile_expr_maybe_ct(znode *result, zend_ast *ast, zend_bool ct_required TSRMLS_DC) { - switch (ast->kind) { - case ZEND_CONST: - ZVAL_COPY(&result->u.constant, zend_ast_get_zval(ast)); - result->op_type = IS_CONST; - return SUCCESS; - case ZEND_AST_BINARY_OP: - return zend_compile_binary_op_maybe_ct(result, ast, ct_required TSRMLS_CC); - case ZEND_AST_ARRAY: - return zend_compile_array_maybe_ct(result, ast, ct_required TSRMLS_CC); - default: - if (!ct_required) { - zend_compile_expr(result, ast TSRMLS_CC); - } - return FAILURE; - } -} - void zend_compile_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { switch (ast->kind) { case ZEND_AST_VAR: @@ -8069,6 +7949,106 @@ void zend_compile_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { } } +void zend_eval_const_binary_op(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + zend_ast *left_ast = ast->child[0]; + zend_ast *right_ast = ast->child[1]; + zend_uchar opcode = ast->attr; + + if (left_ast->kind == ZEND_CONST && right_ast->kind == ZEND_CONST) { + binary_op_type op = get_binary_op(opcode); + zval result; + op(&result, zend_ast_get_zval(left_ast), zend_ast_get_zval(right_ast) TSRMLS_CC); + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_constant(&result); + } +} + +void zend_eval_const_array(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + zend_uint i; + zval array; + + /* First ensure that *all* child nodes are constant */ + for (i = 0; i < ast->children; ++i) { + zend_ast *elem_ast = ast->child[i]; + zend_ast *value_ast = elem_ast->child[0]; + zend_ast *key_ast = elem_ast->child[1]; + zend_bool by_ref = elem_ast->attr; + + if (by_ref || (key_ast && key_ast->kind != ZEND_CONST) || value_ast->kind != ZEND_CONST) { + return; + } + } + + array_init_size(&array, ast->children); + for (i = 0; i < ast->children; ++i) { + zend_ast *elem_ast = ast->child[i]; + zend_ast *value_ast = elem_ast->child[0]; + zend_ast *key_ast = elem_ast->child[1]; + + zval *value = zend_ast_get_zval(value_ast); + if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value); + + if (key_ast) { + zval *key = zend_ast_get_zval(key_ast); + switch (Z_TYPE_P(key)) { + case IS_LONG: + zend_hash_index_update(Z_ARRVAL(array), Z_LVAL_P(key), value); + break; + case IS_STRING: + zend_symtable_update(Z_ARRVAL(array), Z_STR_P(key), value); + break; + case IS_DOUBLE: + zend_hash_index_update(Z_ARRVAL(array), + zend_dval_to_lval(Z_DVAL_P(key)), value); + break; + case IS_FALSE: + zend_hash_index_update(Z_ARRVAL(array), 0, value); + break; + case IS_TRUE: + zend_hash_index_update(Z_ARRVAL(array), 1, value); + break; + case IS_NULL: + zend_hash_update(Z_ARRVAL(array), STR_EMPTY_ALLOC(), value); + break; + default: + zend_error(E_COMPILE_ERROR, "Illegal offset type"); + break; + } + } else { + zend_hash_next_index_insert(Z_ARRVAL(array), value); + } + } + + zend_ast_destroy(ast); + zend_make_immutable_array(&array TSRMLS_CC); + *ast_ptr = zend_ast_create_constant(&array); +} + +void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + if (!ast || ast->kind == ZEND_CONST || ast->kind == ZEND_AST_ZNODE) { + return; + } + + { + zend_uint i; + for (i = 0; i < ast->children; ++i) { + zend_eval_const_expr(&ast->child[i] TSRMLS_CC); + } + } + + switch (ast->kind) { + case ZEND_AST_BINARY_OP: + zend_eval_const_binary_op(ast_ptr TSRMLS_CC); + break; + case ZEND_AST_ARRAY: + zend_eval_const_array(ast_ptr TSRMLS_CC); + break; + } +} + /* * Local variables: * tab-width: 4 diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 6e66b9e9d6..be6fca6c7c 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -104,6 +104,7 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_expr(znode *node, zend_ast *ast TSRMLS_DC); int zend_compile_expr_maybe_ct(znode *node, zend_ast *ast, zend_bool ct_required TSRMLS_DC); void zend_compile_var(znode *node, zend_ast *ast, int type TSRMLS_DC); +void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC); typedef struct _zend_execute_data zend_execute_data; -- cgit v1.2.1 From 1b84b87e78d78089d83aad644b451ada5c2892e1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 12:43:20 +0200 Subject: Const eval unary pm (as previously) --- Zend/zend_ast.c | 4 ++-- Zend/zend_ast.h | 11 +++++----- Zend/zend_compile.c | 52 +++++++++++++++++++++++++++++++++++++++++---- Zend/zend_language_parser.y | 8 +++---- 4 files changed, 59 insertions(+), 16 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index c6f5ca8ccc..8256eca8e4 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -353,13 +353,13 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s zval_dtor(&op1); } break; - case ZEND_UNARY_PLUS: + case ZEND_AST_UNARY_PLUS: ZVAL_LONG(&op1, 0); zend_ast_evaluate(&op2, ast->child[0], scope TSRMLS_CC); add_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op2); break; - case ZEND_UNARY_MINUS: + case ZEND_AST_UNARY_MINUS: ZVAL_LONG(&op1, 0); zend_ast_evaluate(&op2, ast->child[0], scope TSRMLS_CC); sub_function(result, &op1, &op2 TSRMLS_CC); diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 9806790841..580ce9c24c 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -30,8 +30,6 @@ enum _zend_ast_kind { ZEND_BOOL_AND, ZEND_BOOL_OR, ZEND_SELECT, - ZEND_UNARY_PLUS, - ZEND_UNARY_MINUS, ZEND_AST_ZNODE, @@ -54,14 +52,15 @@ enum _zend_ast_kind { ZEND_AST_UNPACK, ZEND_AST_ASSIGN_OP, - ZEND_AST_BINARY_OP, - - ZEND_AST_AND, - ZEND_AST_OR, + ZEND_AST_BINARY_OP, ZEND_AST_GREATER, ZEND_AST_GREATER_EQUAL, + ZEND_AST_AND, + ZEND_AST_OR, + ZEND_AST_UNARY_PLUS, + ZEND_AST_UNARY_MINUS, ZEND_AST_CAST, ZEND_AST_CONDITIONAL, diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 533341db6d..48c438d3da 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7223,14 +7223,14 @@ void zend_compile_unary_pm(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *expr_ast = ast->child[0]; znode zero_node, expr_node; - ZEND_ASSERT(ast->kind == ZEND_UNARY_PLUS || ast->kind == ZEND_UNARY_MINUS); + ZEND_ASSERT(ast->kind == ZEND_AST_UNARY_PLUS || ast->kind == ZEND_AST_UNARY_MINUS); zero_node.op_type = IS_CONST; ZVAL_LONG(&zero_node.u.constant, 0); zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - emit_op_tmp(result, ast->kind == ZEND_UNARY_PLUS ? ZEND_ADD : ZEND_SUB, + emit_op_tmp(result, ast->kind == ZEND_AST_UNARY_PLUS ? ZEND_ADD : ZEND_SUB, &zero_node, &expr_node TSRMLS_CC); } @@ -7843,8 +7843,8 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_BW_NOT: zend_compile_unary_op(result, ast TSRMLS_CC); return; - case ZEND_UNARY_PLUS: - case ZEND_UNARY_MINUS: + case ZEND_AST_UNARY_PLUS: + case ZEND_AST_UNARY_MINUS: zend_compile_unary_pm(result, ast TSRMLS_CC); return; case ZEND_AST_AND: @@ -7964,6 +7964,42 @@ void zend_eval_const_binary_op(zend_ast **ast_ptr TSRMLS_DC) { } } +void zend_eval_const_unary_pm(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + zend_ast *expr_ast = ast->child[0]; + + ZEND_ASSERT(ast->kind == ZEND_AST_UNARY_PLUS || ast->kind == ZEND_AST_UNARY_MINUS); + + if (expr_ast->kind == ZEND_CONST) { + binary_op_type op = ast->kind == ZEND_AST_UNARY_PLUS + ? add_function : sub_function; + + zval left, result; + ZVAL_LONG(&left, 0); + op(&result, &left, zend_ast_get_zval(expr_ast) TSRMLS_CC); + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_constant(&result); + } +} + +void zend_eval_const_greater(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + zend_ast *left_ast = ast->child[0]; + zend_ast *right_ast = ast->child[1]; + + ZEND_ASSERT(ast->kind == ZEND_AST_GREATER || ast->kind == ZEND_AST_GREATER_EQUAL); + + if (left_ast->kind == ZEND_CONST && right_ast->kind == ZEND_CONST) { + binary_op_type op = ast->kind == ZEND_AST_GREATER + ? is_smaller_function : is_smaller_or_equal_function; + + zval result; + op(&result, zend_ast_get_zval(right_ast), zend_ast_get_zval(left_ast) TSRMLS_CC); + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_constant(&result); + } +} + void zend_eval_const_array(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zend_uint i; @@ -8043,6 +8079,14 @@ void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { case ZEND_AST_BINARY_OP: zend_eval_const_binary_op(ast_ptr TSRMLS_CC); break; + case ZEND_AST_GREATER: + case ZEND_AST_GREATER_EQUAL: + zend_eval_const_greater(ast_ptr TSRMLS_CC); + break; + case ZEND_AST_UNARY_PLUS: + case ZEND_AST_UNARY_MINUS: + zend_eval_const_unary_pm(ast_ptr TSRMLS_CC); + break; case ZEND_AST_ARRAY: zend_eval_const_array(ast_ptr TSRMLS_CC); break; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 7190f384a9..cb54ae2db3 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -812,8 +812,8 @@ expr_without_variable: | expr '%' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_MOD, $1.u.ast, $3.u.ast); } | expr T_SL expr { $$.u.ast = zend_ast_create_binary_op(ZEND_SL, $1.u.ast, $3.u.ast); } | expr T_SR expr { $$.u.ast = zend_ast_create_binary_op(ZEND_SR, $1.u.ast, $3.u.ast); } - | '+' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_UNARY_PLUS, $2.u.ast); } - | '-' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_UNARY_MINUS, $2.u.ast); } + | '+' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_PLUS, $2.u.ast); } + | '-' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_MINUS, $2.u.ast); } | '!' expr { $$.u.ast = zend_ast_create_unary(ZEND_BOOL_NOT, $2.u.ast); } | '~' expr { $$.u.ast = zend_ast_create_unary(ZEND_BW_NOT, $2.u.ast); } | expr T_IS_IDENTICAL expr @@ -1028,8 +1028,8 @@ static_operation: | static_scalar_value T_IS_GREATER_OR_EQUAL static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_IS_SMALLER_OR_EQUAL, $3.u.ast, $1.u.ast); } | static_scalar_value '?' ':' static_scalar_value { $$.u.ast = zend_ast_create_ternary(ZEND_SELECT, $1.u.ast, NULL, $4.u.ast); } | static_scalar_value '?' static_scalar_value ':' static_scalar_value { $$.u.ast = zend_ast_create_ternary(ZEND_SELECT, $1.u.ast, $3.u.ast, $5.u.ast); } - | '+' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_UNARY_PLUS, $2.u.ast); } - | '-' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_UNARY_MINUS, $2.u.ast); } + | '+' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_PLUS, $2.u.ast); } + | '-' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_MINUS, $2.u.ast); } | '(' static_scalar_value ')' { $$ = $2; } ; -- cgit v1.2.1 From 0237954778de1e235b6b7296068647431134f976 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 13:00:13 +0200 Subject: Bring static scalar AST more in line with normal AST --- Zend/zend_ast.c | 139 +++----------------------------------------- Zend/zend_ast.h | 3 - Zend/zend_language_parser.y | 92 +++++++++++++++++++---------- 3 files changed, 69 insertions(+), 165 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 8256eca8e4..ee8dd662c1 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -168,90 +168,16 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s zval op1, op2; switch (ast->kind) { - case ZEND_ADD: + case ZEND_AST_BINARY_OP: + { + binary_op_type op = get_binary_op(ast->attr); zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - add_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_SUB: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - sub_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_MUL: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - mul_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_POW: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - pow_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_DIV: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - div_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_MOD: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - mod_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_SL: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - shift_left_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_SR: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - shift_right_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_CONCAT: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - concat_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_BW_OR: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - bitwise_or_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_BW_AND: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - bitwise_and_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_BW_XOR: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - bitwise_xor_function(result, &op1, &op2 TSRMLS_CC); + op(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op1); zval_dtor(&op2); break; + } case ZEND_BW_NOT: zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); bitwise_not_function(result, &op1 TSRMLS_CC); @@ -262,62 +188,13 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s boolean_not_function(result, &op1 TSRMLS_CC); zval_dtor(&op1); break; - case ZEND_BOOL_XOR: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - boolean_xor_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_IS_IDENTICAL: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - is_identical_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_IS_NOT_IDENTICAL: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - is_not_identical_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_IS_EQUAL: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - is_equal_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_IS_NOT_EQUAL: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - is_not_equal_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_IS_SMALLER: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - is_smaller_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; - case ZEND_IS_SMALLER_OR_EQUAL: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); - is_smaller_or_equal_function(result, &op1, &op2 TSRMLS_CC); - zval_dtor(&op1); - zval_dtor(&op2); - break; case ZEND_CONST: ZVAL_DUP(result, zend_ast_get_zval(ast)); if (Z_OPT_CONSTANT_P(result)) { zval_update_constant_ex(result, 1, scope TSRMLS_CC); } break; - case ZEND_BOOL_AND: + case ZEND_AST_AND: zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); if (zend_is_true(&op1 TSRMLS_CC)) { zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); @@ -328,7 +205,7 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s } zval_dtor(&op1); break; - case ZEND_BOOL_OR: + case ZEND_AST_OR: zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); if (zend_is_true(&op1 TSRMLS_CC)) { ZVAL_BOOL(result, 1); @@ -339,7 +216,7 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s } zval_dtor(&op1); break; - case ZEND_SELECT: + case ZEND_AST_CONDITIONAL: zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); if (zend_is_true(&op1 TSRMLS_CC)) { if (!ast->child[1]) { diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 580ce9c24c..78bf68cfe6 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -27,9 +27,6 @@ enum _zend_ast_kind { /* first 256 kinds are reserved for opcodes */ ZEND_CONST = 256, /* TODO.AST: Split in constant lookup and literal zval */ - ZEND_BOOL_AND, - ZEND_BOOL_OR, - ZEND_SELECT, ZEND_AST_ZNODE, diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index cb54ae2db3..8564ad9919 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -999,38 +999,68 @@ static_scalar_value: ; static_operation: - static_scalar_value '+' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_ADD, $1.u.ast, $3.u.ast); } - | static_scalar_value '-' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_SUB, $1.u.ast, $3.u.ast); } - | static_scalar_value '*' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_MUL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_POW static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_POW, $1.u.ast, $3.u.ast); } - | static_scalar_value '/' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_DIV, $1.u.ast, $3.u.ast); } - | static_scalar_value '%' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_MOD, $1.u.ast, $3.u.ast); } - | '!' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_BOOL_NOT, $2.u.ast); } + '!' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_BOOL_NOT, $2.u.ast); } | '~' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_BW_NOT, $2.u.ast); } - | static_scalar_value '|' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_BW_OR, $1.u.ast, $3.u.ast); } - | static_scalar_value '&' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_BW_AND, $1.u.ast, $3.u.ast); } - | static_scalar_value '^' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_BW_XOR, $1.u.ast, $3.u.ast); } - | static_scalar_value T_SL static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_SL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_SR static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_SR, $1.u.ast, $3.u.ast); } - | static_scalar_value '.' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_CONCAT, $1.u.ast, $3.u.ast); } - | static_scalar_value T_LOGICAL_XOR static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_BOOL_XOR, $1.u.ast, $3.u.ast); } - | static_scalar_value T_LOGICAL_AND static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_BOOL_AND, $1.u.ast, $3.u.ast); } - | static_scalar_value T_LOGICAL_OR static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_BOOL_OR, $1.u.ast, $3.u.ast); } - | static_scalar_value T_BOOLEAN_AND static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_BOOL_AND, $1.u.ast, $3.u.ast); } - | static_scalar_value T_BOOLEAN_OR static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_BOOL_OR, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_IDENTICAL static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_IS_IDENTICAL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_NOT_IDENTICAL static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_IS_NOT_IDENTICAL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_EQUAL static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_IS_EQUAL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_NOT_EQUAL static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_IS_NOT_EQUAL, $1.u.ast, $3.u.ast); } - | static_scalar_value '<' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_IS_SMALLER, $1.u.ast, $3.u.ast); } - | static_scalar_value '>' static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_IS_SMALLER, $3.u.ast, $1.u.ast); } - | static_scalar_value T_IS_SMALLER_OR_EQUAL static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_IS_SMALLER_OR_EQUAL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_GREATER_OR_EQUAL static_scalar_value { $$.u.ast = zend_ast_create_binary(ZEND_IS_SMALLER_OR_EQUAL, $3.u.ast, $1.u.ast); } - | static_scalar_value '?' ':' static_scalar_value { $$.u.ast = zend_ast_create_ternary(ZEND_SELECT, $1.u.ast, NULL, $4.u.ast); } - | static_scalar_value '?' static_scalar_value ':' static_scalar_value { $$.u.ast = zend_ast_create_ternary(ZEND_SELECT, $1.u.ast, $3.u.ast, $5.u.ast); } - | '+' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_PLUS, $2.u.ast); } - | '-' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_MINUS, $2.u.ast); } - | '(' static_scalar_value ')' { $$ = $2; } + | static_scalar_value '+' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_ADD, $1.u.ast, $3.u.ast); } + | static_scalar_value '-' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_SUB, $1.u.ast, $3.u.ast); } + | static_scalar_value '*' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_MUL, $1.u.ast, $3.u.ast); } + | static_scalar_value T_POW static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_POW, $1.u.ast, $3.u.ast); } + | static_scalar_value '/' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_DIV, $1.u.ast, $3.u.ast); } + | static_scalar_value '%' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_MOD, $1.u.ast, $3.u.ast); } + | static_scalar_value '|' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_OR, $1.u.ast, $3.u.ast); } + | static_scalar_value '&' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_AND, $1.u.ast, $3.u.ast); } + | static_scalar_value '^' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_XOR, $1.u.ast, $3.u.ast); } + | static_scalar_value T_SL static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_SL, $1.u.ast, $3.u.ast); } + | static_scalar_value T_SR static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_SR, $1.u.ast, $3.u.ast); } + | static_scalar_value '.' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_CONCAT, $1.u.ast, $3.u.ast); } + | static_scalar_value T_LOGICAL_XOR static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_BOOL_XOR, $1.u.ast, $3.u.ast); } + | static_scalar_value T_IS_IDENTICAL static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, $1.u.ast, $3.u.ast); } + | static_scalar_value T_IS_NOT_IDENTICAL static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_NOT_IDENTICAL, $1.u.ast, $3.u.ast); } + | static_scalar_value T_IS_EQUAL static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_EQUAL, $1.u.ast, $3.u.ast); } + | static_scalar_value T_IS_NOT_EQUAL static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_NOT_EQUAL, $1.u.ast, $3.u.ast); } + | static_scalar_value '<' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER, $1.u.ast, $3.u.ast); } + | static_scalar_value '>' static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER, $3.u.ast, $1.u.ast); } + | static_scalar_value T_IS_SMALLER_OR_EQUAL static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $1.u.ast, $3.u.ast); } + | static_scalar_value T_IS_GREATER_OR_EQUAL static_scalar_value + { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $3.u.ast, $1.u.ast); } + | static_scalar_value T_LOGICAL_AND static_scalar_value + { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } + | static_scalar_value T_LOGICAL_OR static_scalar_value + { $$.u.ast = zend_ast_create_binary(ZEND_AST_OR, $1.u.ast, $3.u.ast); } + | static_scalar_value T_BOOLEAN_AND static_scalar_value + { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } + | static_scalar_value T_BOOLEAN_OR static_scalar_value + { $$.u.ast = zend_ast_create_binary(ZEND_AST_OR, $1.u.ast, $3.u.ast); } + | static_scalar_value '?' ':' static_scalar_value + { $$.u.ast = zend_ast_create_ternary(ZEND_AST_CONDITIONAL, $1.u.ast, NULL, $4.u.ast); } + | static_scalar_value '?' static_scalar_value ':' static_scalar_value + { $$.u.ast = zend_ast_create_ternary( + ZEND_AST_CONDITIONAL, $1.u.ast, $3.u.ast, $5.u.ast); } + | '+' static_scalar_value + { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_PLUS, $2.u.ast); } + | '-' static_scalar_value + { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_MINUS, $2.u.ast); } + | '(' static_scalar_value ')' { $$.u.ast = $2.u.ast; } ; -- cgit v1.2.1 From 7f01b6fcec81a0b9f418d837943b194e1414c62c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 13:16:31 +0200 Subject: Bring static scalar arrays in line --- Zend/zend_ast.c | 13 +++++++------ Zend/zend_language_parser.y | 31 +++++++++++++++++-------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index ee8dd662c1..ec3e9dbc84 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -242,17 +242,18 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s sub_function(result, &op1, &op2 TSRMLS_CC); zval_dtor(&op2); break; - case ZEND_INIT_ARRAY: + case ZEND_AST_ARRAY: array_init(result); { - int i; - for (i = 0; i < ast->children; i+=2) { - if (ast->child[i]) { - zend_ast_evaluate(&op1, ast->child[i], scope TSRMLS_CC); + zend_uint i; + for (i = 0; i < ast->children; i++) { + zend_ast *elem = ast->child[i]; + if (elem->child[1]) { + zend_ast_evaluate(&op1, elem->child[1], scope TSRMLS_CC); } else { ZVAL_UNDEF(&op1); } - zend_ast_evaluate(&op2, ast->child[i+1], scope TSRMLS_CC); + zend_ast_evaluate(&op2, elem->child[0], scope TSRMLS_CC); zend_ast_add_array_element(result, &op1, &op2 TSRMLS_CC); } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 8564ad9919..5edc41e597 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -993,9 +993,9 @@ static_scalar_base: static_scalar_value: static_scalar_base { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } | common_scalar { $$.u.ast = $1.u.ast; } - | T_ARRAY '(' static_array_pair_list ')' { $$ = $3; } - | '[' static_array_pair_list ']' { $$ = $2; } - | static_operation { $$ = $1; } + | T_ARRAY '(' static_array_pair_list ')' { $$.u.ast = $3.u.ast; } + | '[' static_array_pair_list ']' { $$.u.ast = $2.u.ast; } + | static_operation { $$.u.ast = $1.u.ast; } ; static_operation: @@ -1088,8 +1088,10 @@ scalar: static_array_pair_list: - /* empty */ { $$.op_type = IS_CONST; array_init(&$$.u.constant); $$.u.ast = zend_ast_create_constant(&$$.u.constant); } - | non_empty_static_array_pair_list possible_comma { zend_ast_dynamic_shrink(&$1.u.ast); $$ = $1; } + /* empty */ + { array_init(&$$.u.constant); $$.u.ast = zend_ast_create_constant(&$$.u.constant); } + | non_empty_static_array_pair_list possible_comma + { zend_ast_dynamic_shrink(&$1.u.ast); $$ = $1; } ; possible_comma: @@ -1098,16 +1100,17 @@ possible_comma: ; non_empty_static_array_pair_list: - non_empty_static_array_pair_list ',' static_scalar_value T_DOUBLE_ARROW static_scalar_value - { $$.u.ast = zend_ast_dynamic_add(zend_ast_dynamic_add($1.u.ast, $3.u.ast), $5.u.ast); } - | non_empty_static_array_pair_list ',' static_scalar_value - { $$.u.ast = zend_ast_dynamic_add(zend_ast_dynamic_add($1.u.ast, NULL), $3.u.ast); } - | static_scalar_value T_DOUBLE_ARROW static_scalar_value - { $$.u.ast = zend_ast_dynamic_add(zend_ast_create_dynamic_and_add( - ZEND_INIT_ARRAY, $1.u.ast), $3.u.ast); } + non_empty_static_array_pair_list ',' static_array_pair + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | static_array_pair + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARRAY, $1.u.ast); } +; + +static_array_pair: + static_scalar_value T_DOUBLE_ARROW static_scalar_value + { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $3.u.ast, $1.u.ast); } | static_scalar_value - { $$.u.ast = zend_ast_dynamic_add(zend_ast_create_dynamic_and_add( - ZEND_INIT_ARRAY, NULL), $1.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $1.u.ast, NULL); } ; expr: -- cgit v1.2.1 From 31687ed5c7bc53fdecdc14d2457ab2c69d444014 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 14:00:20 +0200 Subject: Handle trait __CLASS__ in parser --- Zend/zend_language_parser.y | 19 ++- Zend/zend_language_scanner.c | 294 +++++++++++++++++++++---------------------- Zend/zend_language_scanner.l | 6 +- 3 files changed, 165 insertions(+), 154 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 5edc41e597..bf2162b643 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -982,7 +982,6 @@ static_scalar: /* compile-time evaluated scalars */ static_scalar_base: T_CONSTANT_ENCAPSED_STRING { $$ = $1; } - | T_CLASS_C { $$ = $1; } | static_class_name_scalar { $$ = $1; } | static_class_constant { $$ = $1; } | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); } @@ -996,6 +995,15 @@ static_scalar_value: | T_ARRAY '(' static_array_pair_list ')' { $$.u.ast = $3.u.ast; } | '[' static_array_pair_list ']' { $$.u.ast = $2.u.ast; } | static_operation { $$.u.ast = $1.u.ast; } + | T_CLASS_C + { if (Z_TYPE($1.u.constant) == IS_UNDEF) { + zval class_const; + ZVAL_STRING(&class_const, "__CLASS__"); + Z_TYPE_INFO(class_const) = IS_CONSTANT_EX; + $$.u.ast = zend_ast_create_constant(&class_const); + } else { + $$.u.ast = AST_ZVAL(&$1); + } } ; static_operation: @@ -1082,7 +1090,14 @@ scalar: | common_scalar { $$.u.ast = $1.u.ast; } | '"' encaps_list '"' { $$.u.ast = $2.u.ast; } | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.u.ast = $2.u.ast; } - | T_CLASS_C { if (Z_TYPE($1.u.constant) == IS_CONSTANT) {zend_do_fetch_constant(&$$, NULL, &$1, ZEND_RT, 1 TSRMLS_CC); AZ($$); } else { $$.u.ast = AST_ZVAL(&$1); } } + | T_CLASS_C + { if (Z_TYPE($1.u.constant) == IS_UNDEF) { + zval class_const; ZVAL_STRING(&class_const, "__CLASS__"); + $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, + zend_ast_create_constant(&class_const)); + } else { + $$.u.ast = AST_ZVAL(&$1); + } } | dereferencable_scalar { $$.u.ast = $1.u.ast; } ; diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 8858e8be9e..1b42761fa5 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1115,7 +1115,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1779 "Zend/zend_language_scanner.l" +#line 1777 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1194,7 +1194,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1769 "Zend/zend_language_scanner.l" +#line 1767 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1211,7 +1211,7 @@ yy7: if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1750 "Zend/zend_language_scanner.l" +#line 1748 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1407,7 +1407,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1716 "Zend/zend_language_scanner.l" +#line 1714 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1449,7 +1449,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1732 "Zend/zend_language_scanner.l" +#line 1730 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1465,7 +1465,7 @@ yy45: ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1743 "Zend/zend_language_scanner.l" +#line 1741 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); @@ -1498,7 +1498,7 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1761 "Zend/zend_language_scanner.l" +#line 1759 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); @@ -1576,7 +1576,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2222 "Zend/zend_language_scanner.l" +#line 2220 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1628,7 +1628,7 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2166 "Zend/zend_language_scanner.l" +#line 2164 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; @@ -1643,7 +1643,7 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2153 "Zend/zend_language_scanner.l" +#line 2151 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1666,7 +1666,7 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1860 "Zend/zend_language_scanner.l" +#line 1858 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1696,7 +1696,7 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1853 "Zend/zend_language_scanner.l" +#line 1851 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1721,7 +1721,7 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1844 "Zend/zend_language_scanner.l" +#line 1842 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1796,7 +1796,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2172 "Zend/zend_language_scanner.l" +#line 2170 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1856,7 +1856,7 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2161 "Zend/zend_language_scanner.l" +#line 2159 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; @@ -1871,7 +1871,7 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2153 "Zend/zend_language_scanner.l" +#line 2151 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1894,7 +1894,7 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1860 "Zend/zend_language_scanner.l" +#line 1858 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1924,7 +1924,7 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1853 "Zend/zend_language_scanner.l" +#line 1851 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1949,7 +1949,7 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1844 "Zend/zend_language_scanner.l" +#line 1842 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1967,7 +1967,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2139 "Zend/zend_language_scanner.l" +#line 2137 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -2042,7 +2042,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2264 "Zend/zend_language_scanner.l" +#line 2262 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2130,7 +2130,7 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2153 "Zend/zend_language_scanner.l" +#line 2151 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -2153,7 +2153,7 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1860 "Zend/zend_language_scanner.l" +#line 1858 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -2183,7 +2183,7 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1853 "Zend/zend_language_scanner.l" +#line 1851 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -2208,7 +2208,7 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1844 "Zend/zend_language_scanner.l" +#line 1842 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -2398,7 +2398,7 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1882 "Zend/zend_language_scanner.l" +#line 1880 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; @@ -2996,7 +2996,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1888 "Zend/zend_language_scanner.l" +#line 1886 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3037,7 +3037,7 @@ yy178: yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1974 "Zend/zend_language_scanner.l" +#line 1972 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3112,7 +3112,7 @@ yy180: yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2043 "Zend/zend_language_scanner.l" +#line 2041 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3159,7 +3159,7 @@ yy182: ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2133 "Zend/zend_language_scanner.l" +#line 2131 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; @@ -3170,7 +3170,7 @@ yy184: ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2395 "Zend/zend_language_scanner.l" +#line 2393 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3370,7 +3370,7 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1955 "Zend/zend_language_scanner.l" +#line 1953 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); @@ -3410,7 +3410,7 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1860 "Zend/zend_language_scanner.l" +#line 1858 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -3505,7 +3505,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1962 "Zend/zend_language_scanner.l" +#line 1960 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3544,7 +3544,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1922 "Zend/zend_language_scanner.l" +#line 1920 "Zend/zend_language_scanner.l" { int doc_com; @@ -3872,7 +3872,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2085 "Zend/zend_language_scanner.l" +#line 2083 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -4167,7 +4167,7 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1707 "Zend/zend_language_scanner.l" +#line 1705 "Zend/zend_language_scanner.l" { if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { ZVAL_DUP(zendlval, &CG(current_namespace)); @@ -4196,7 +4196,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1682 "Zend/zend_language_scanner.l" +#line 1680 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4246,7 +4246,7 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1666 "Zend/zend_language_scanner.l" +#line 1664 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; @@ -4286,7 +4286,7 @@ yy336: } YYDEBUG(339, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1634 "Zend/zend_language_scanner.l" +#line 1632 "Zend/zend_language_scanner.l" { if (CG(active_class_entry)) { int len = 0; @@ -4369,7 +4369,7 @@ yy347: } YYDEBUG(350, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1624 "Zend/zend_language_scanner.l" +#line 1622 "Zend/zend_language_scanner.l" { zend_op_array *op_array = CG(active_op_array); if (op_array && op_array->function_name) { @@ -4399,7 +4399,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1671 "Zend/zend_language_scanner.l" +#line 1669 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4440,7 +4440,7 @@ yy359: } YYDEBUG(362, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1614 "Zend/zend_language_scanner.l" +#line 1612 "Zend/zend_language_scanner.l" { zend_class_entry *ce = CG(active_class_entry); if (ce && ce->name && ZEND_ACC_TRAIT == (ce->ce_flags & ZEND_ACC_TRAIT)) { @@ -4484,10 +4484,8 @@ yy366: { zend_class_entry *ce = CG(active_class_entry); if (ce && ZEND_ACC_TRAIT == (ce->ce_flags & ZEND_ACC_TRAIT)) { - /* We create a special __CLASS__ constant that is going to be resolved - at run-time */ - ZVAL_STRINGL(zendlval, "__CLASS__", sizeof("__CLASS__") - 1); - Z_TYPE_INFO_P(zendlval) = IS_CONSTANT_EX; + /* Signal that the __CLASS__ needs to be resolved at runtime */ + ZVAL_UNDEF(zendlval); } else { if (ce && ce->name) { ZVAL_STR(zendlval, STR_COPY(ce->name)); @@ -4497,7 +4495,7 @@ yy366: } return T_CLASS_C; } -#line 4501 "Zend/zend_language_scanner.c" +#line 4499 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4563,7 +4561,7 @@ yy381: { return T_HALT_COMPILER; } -#line 4567 "Zend/zend_language_scanner.c" +#line 4565 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4587,7 +4585,7 @@ yy385: { return T_USE; } -#line 4591 "Zend/zend_language_scanner.c" +#line 4589 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4610,7 +4608,7 @@ yy389: { return T_UNSET; } -#line 4614 "Zend/zend_language_scanner.c" +#line 4612 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4786,7 +4784,7 @@ yy406: { return T_INT_CAST; } -#line 4790 "Zend/zend_language_scanner.c" +#line 4788 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4834,7 +4832,7 @@ yy414: { return T_DOUBLE_CAST; } -#line 4838 "Zend/zend_language_scanner.c" +#line 4836 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4908,7 +4906,7 @@ yy428: { return T_STRING_CAST; } -#line 4912 "Zend/zend_language_scanner.c" +#line 4910 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4945,7 +4943,7 @@ yy435: { return T_ARRAY_CAST; } -#line 4949 "Zend/zend_language_scanner.c" +#line 4947 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4987,7 +4985,7 @@ yy443: { return T_OBJECT_CAST; } -#line 4991 "Zend/zend_language_scanner.c" +#line 4989 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -5032,7 +5030,7 @@ yy452: { return T_BOOL_CAST; } -#line 5036 "Zend/zend_language_scanner.c" +#line 5034 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5096,7 +5094,7 @@ yy463: { return T_UNSET_CAST; } -#line 5100 "Zend/zend_language_scanner.c" +#line 5098 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5114,7 +5112,7 @@ yy468: { return T_VAR; } -#line 5118 "Zend/zend_language_scanner.c" +#line 5116 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5138,7 +5136,7 @@ yy472: { return T_NEW; } -#line 5142 "Zend/zend_language_scanner.c" +#line 5140 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5181,7 +5179,7 @@ yy480: { return T_NAMESPACE; } -#line 5185 "Zend/zend_language_scanner.c" +#line 5183 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5207,7 +5205,7 @@ yy484: { return T_CONCAT_EQUAL; } -#line 5211 "Zend/zend_language_scanner.c" +#line 5209 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5220,7 +5218,7 @@ yy486: { return T_ELLIPSIS; } -#line 5224 "Zend/zend_language_scanner.c" +#line 5222 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; @@ -5230,7 +5228,7 @@ yy489: { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5234 "Zend/zend_language_scanner.c" +#line 5232 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5256,7 +5254,7 @@ yy493: { return T_MINUS_EQUAL; } -#line 5260 "Zend/zend_language_scanner.c" +#line 5258 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; @@ -5266,7 +5264,7 @@ yy495: { return T_DEC; } -#line 5270 "Zend/zend_language_scanner.c" +#line 5268 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; @@ -5277,7 +5275,7 @@ yy497: yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5281 "Zend/zend_language_scanner.c" +#line 5279 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5326,7 +5324,7 @@ yy504: { return T_PUBLIC; } -#line 5330 "Zend/zend_language_scanner.c" +#line 5328 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5385,7 +5383,7 @@ yy513: { return T_PROTECTED; } -#line 5389 "Zend/zend_language_scanner.c" +#line 5387 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5419,7 +5417,7 @@ yy519: { return T_PRIVATE; } -#line 5423 "Zend/zend_language_scanner.c" +#line 5421 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5432,7 +5430,7 @@ yy521: { return T_PRINT; } -#line 5436 "Zend/zend_language_scanner.c" +#line 5434 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5461,7 +5459,7 @@ yy526: { return T_GOTO; } -#line 5465 "Zend/zend_language_scanner.c" +#line 5463 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5489,7 +5487,7 @@ yy531: { return T_GLOBAL; } -#line 5493 "Zend/zend_language_scanner.c" +#line 5491 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5530,7 +5528,7 @@ yy539: { return T_BREAK; } -#line 5534 "Zend/zend_language_scanner.c" +#line 5532 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5574,7 +5572,7 @@ yy547: { return T_SWITCH; } -#line 5578 "Zend/zend_language_scanner.c" +#line 5576 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5602,7 +5600,7 @@ yy552: { return T_STATIC; } -#line 5606 "Zend/zend_language_scanner.c" +#line 5604 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5633,7 +5631,7 @@ yy557: { return T_AS; } -#line 5637 "Zend/zend_language_scanner.c" +#line 5635 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5656,7 +5654,7 @@ yy561: { return T_ARRAY; } -#line 5660 "Zend/zend_language_scanner.c" +#line 5658 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5669,7 +5667,7 @@ yy563: { return T_LOGICAL_AND; } -#line 5673 "Zend/zend_language_scanner.c" +#line 5671 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5707,7 +5705,7 @@ yy570: { return T_ABSTRACT; } -#line 5711 "Zend/zend_language_scanner.c" +#line 5709 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5735,7 +5733,7 @@ yy575: { return T_WHILE; } -#line 5739 "Zend/zend_language_scanner.c" +#line 5737 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5748,7 +5746,7 @@ yy577: { return T_IF; } -#line 5752 "Zend/zend_language_scanner.c" +#line 5750 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5804,7 +5802,7 @@ yy584: { return T_ISSET; } -#line 5808 "Zend/zend_language_scanner.c" +#line 5806 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5862,7 +5860,7 @@ yy593: { return T_INCLUDE; } -#line 5866 "Zend/zend_language_scanner.c" +#line 5864 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5895,7 +5893,7 @@ yy598: { return T_INCLUDE_ONCE; } -#line 5899 "Zend/zend_language_scanner.c" +#line 5897 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5933,7 +5931,7 @@ yy605: { return T_INTERFACE; } -#line 5937 "Zend/zend_language_scanner.c" +#line 5935 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5987,7 +5985,7 @@ yy613: { return T_INSTEADOF; } -#line 5991 "Zend/zend_language_scanner.c" +#line 5989 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -6020,7 +6018,7 @@ yy619: { return T_INSTANCEOF; } -#line 6024 "Zend/zend_language_scanner.c" +#line 6022 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6068,7 +6066,7 @@ yy628: { return T_IMPLEMENTS; } -#line 6072 "Zend/zend_language_scanner.c" +#line 6070 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6100,7 +6098,7 @@ yy631: { return T_TRY; } -#line 6104 "Zend/zend_language_scanner.c" +#line 6102 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6123,7 +6121,7 @@ yy636: { return T_TRAIT; } -#line 6127 "Zend/zend_language_scanner.c" +#line 6125 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6146,7 +6144,7 @@ yy640: { return T_THROW; } -#line 6150 "Zend/zend_language_scanner.c" +#line 6148 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6174,7 +6172,7 @@ yy645: { return T_YIELD; } -#line 6178 "Zend/zend_language_scanner.c" +#line 6176 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6239,7 +6237,7 @@ yy654: { return T_REQUIRE; } -#line 6243 "Zend/zend_language_scanner.c" +#line 6241 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6272,7 +6270,7 @@ yy659: { return T_REQUIRE_ONCE; } -#line 6276 "Zend/zend_language_scanner.c" +#line 6274 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6295,7 +6293,7 @@ yy663: { return T_RETURN; } -#line 6299 "Zend/zend_language_scanner.c" +#line 6297 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6389,7 +6387,7 @@ yy674: { return T_CONTINUE; } -#line 6393 "Zend/zend_language_scanner.c" +#line 6391 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6402,7 +6400,7 @@ yy676: { return T_CONST; } -#line 6406 "Zend/zend_language_scanner.c" +#line 6404 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6431,7 +6429,7 @@ yy681: { return T_CLONE; } -#line 6435 "Zend/zend_language_scanner.c" +#line 6433 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6449,7 +6447,7 @@ yy684: { return T_CLASS; } -#line 6453 "Zend/zend_language_scanner.c" +#line 6451 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6499,7 +6497,7 @@ yy693: { return T_CALLABLE; } -#line 6503 "Zend/zend_language_scanner.c" +#line 6501 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6512,7 +6510,7 @@ yy695: { return T_CASE; } -#line 6516 "Zend/zend_language_scanner.c" +#line 6514 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6530,7 +6528,7 @@ yy698: { return T_CATCH; } -#line 6534 "Zend/zend_language_scanner.c" +#line 6532 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6585,7 +6583,7 @@ yy708: { return T_FUNCTION; } -#line 6589 "Zend/zend_language_scanner.c" +#line 6587 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6613,7 +6611,7 @@ yy711: { return T_FOR; } -#line 6617 "Zend/zend_language_scanner.c" +#line 6615 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6641,7 +6639,7 @@ yy715: { return T_FOREACH; } -#line 6645 "Zend/zend_language_scanner.c" +#line 6643 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6679,7 +6677,7 @@ yy720: { return T_FINAL; } -#line 6683 "Zend/zend_language_scanner.c" +#line 6681 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6697,7 +6695,7 @@ yy722: { return T_FINALLY; } -#line 6701 "Zend/zend_language_scanner.c" +#line 6699 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6732,7 +6730,7 @@ yy726: { return T_DO; } -#line 6736 "Zend/zend_language_scanner.c" +#line 6734 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6745,7 +6743,7 @@ yy728: { return T_EXIT; } -#line 6749 "Zend/zend_language_scanner.c" +#line 6747 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6784,7 +6782,7 @@ yy735: { return T_DEFAULT; } -#line 6788 "Zend/zend_language_scanner.c" +#line 6786 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6812,7 +6810,7 @@ yy740: { return T_DECLARE; } -#line 6816 "Zend/zend_language_scanner.c" +#line 6814 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6896,7 +6894,7 @@ yy753: { return T_EXTENDS; } -#line 6900 "Zend/zend_language_scanner.c" +#line 6898 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6909,7 +6907,7 @@ yy755: { return T_EXIT; } -#line 6913 "Zend/zend_language_scanner.c" +#line 6911 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6927,7 +6925,7 @@ yy758: { return T_EVAL; } -#line 6931 "Zend/zend_language_scanner.c" +#line 6929 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -7001,7 +6999,7 @@ yy769: { return T_ENDWHILE; } -#line 7005 "Zend/zend_language_scanner.c" +#line 7003 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -7034,7 +7032,7 @@ yy775: { return T_ENDSWITCH; } -#line 7038 "Zend/zend_language_scanner.c" +#line 7036 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -7047,7 +7045,7 @@ yy777: { return T_ENDIF; } -#line 7051 "Zend/zend_language_scanner.c" +#line 7049 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7080,7 +7078,7 @@ yy781: { return T_ENDFOR; } -#line 7084 "Zend/zend_language_scanner.c" +#line 7082 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7108,7 +7106,7 @@ yy785: { return T_ENDFOREACH; } -#line 7112 "Zend/zend_language_scanner.c" +#line 7110 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7146,7 +7144,7 @@ yy792: { return T_ENDDECLARE; } -#line 7150 "Zend/zend_language_scanner.c" +#line 7148 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7169,7 +7167,7 @@ yy796: { return T_EMPTY; } -#line 7173 "Zend/zend_language_scanner.c" +#line 7171 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7202,7 +7200,7 @@ yy800: { return T_ELSE; } -#line 7206 "Zend/zend_language_scanner.c" +#line 7204 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7220,7 +7218,7 @@ yy802: { return T_ELSEIF; } -#line 7224 "Zend/zend_language_scanner.c" +#line 7222 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7238,7 +7236,7 @@ yy805: { return T_ECHO; } -#line 7242 "Zend/zend_language_scanner.c" +#line 7240 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7317,7 +7315,7 @@ yy810: HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7321 "Zend/zend_language_scanner.c" +#line 7319 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7331,7 +7329,7 @@ yy812: yy_pop_state(TSRMLS_C); goto restart; } -#line 7335 "Zend/zend_language_scanner.c" +#line 7333 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7346,7 +7344,7 @@ yy814: zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7350 "Zend/zend_language_scanner.c" +#line 7348 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7371,7 +7369,7 @@ yy818: { return T_OBJECT_OPERATOR; } -#line 7375 "Zend/zend_language_scanner.c" +#line 7373 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7463,7 +7461,7 @@ yy825: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7467 "Zend/zend_language_scanner.c" +#line 7465 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7496,7 +7494,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7500 "Zend/zend_language_scanner.c" +#line 7498 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7507,7 +7505,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2338 "Zend/zend_language_scanner.l" +#line 2336 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7563,7 +7561,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7567 "Zend/zend_language_scanner.c" +#line 7565 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7679,7 +7677,7 @@ yy839: } return T_NUM_STRING; } -#line 7683 "Zend/zend_language_scanner.c" +#line 7681 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7699,23 +7697,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1870 "Zend/zend_language_scanner.l" +#line 1868 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7708 "Zend/zend_language_scanner.c" +#line 7706 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1865 "Zend/zend_language_scanner.l" +#line 1863 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7719 "Zend/zend_language_scanner.c" +#line 7717 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7725,14 +7723,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1875 "Zend/zend_language_scanner.l" +#line 1873 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7736 "Zend/zend_language_scanner.c" +#line 7734 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7741,18 +7739,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1882 "Zend/zend_language_scanner.l" +#line 1880 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7750 "Zend/zend_language_scanner.c" +#line 7748 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2395 "Zend/zend_language_scanner.l" +#line 2393 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7761,7 +7759,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7765 "Zend/zend_language_scanner.c" +#line 7763 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7797,12 +7795,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1860 "Zend/zend_language_scanner.l" +#line 1858 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7806 "Zend/zend_language_scanner.c" +#line 7804 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7847,7 +7845,7 @@ yy864: ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7851 "Zend/zend_language_scanner.c" +#line 7849 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7870,6 +7868,6 @@ yy867: goto yy864; } } -#line 2404 "Zend/zend_language_scanner.l" +#line 2402 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index b5100860c1..d0ef6307ff 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1597,10 +1597,8 @@ NEWLINE ("\r"|"\n"|"\r\n") "__CLASS__" { zend_class_entry *ce = CG(active_class_entry); if (ce && ZEND_ACC_TRAIT == (ce->ce_flags & ZEND_ACC_TRAIT)) { - /* We create a special __CLASS__ constant that is going to be resolved - at run-time */ - ZVAL_STRINGL(zendlval, "__CLASS__", sizeof("__CLASS__") - 1); - Z_TYPE_INFO_P(zendlval) = IS_CONSTANT_EX; + /* Signal that the __CLASS__ needs to be resolved at runtime */ + ZVAL_UNDEF(zendlval); } else { if (ce && ce->name) { ZVAL_STR(zendlval, STR_COPY(ce->name)); -- cgit v1.2.1 From 9c169d5a4d4f26b5ee785be66a520ac6471a1dbc Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 14:03:31 +0200 Subject: Remove static_scalar_base --- Zend/zend_language_parser.y | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index bf2162b643..5142b465c9 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -980,17 +980,13 @@ static_scalar: /* compile-time evaluated scalars */ static_scalar_value { zend_do_constant_expression(&$$, $1.u.ast TSRMLS_CC); } ; -static_scalar_base: - T_CONSTANT_ENCAPSED_STRING { $$ = $1; } - | static_class_name_scalar { $$ = $1; } - | static_class_constant { $$ = $1; } - | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); } -; - static_scalar_value: - static_scalar_base { $$.u.ast = zend_ast_create_constant(&$1.u.constant); } + T_CONSTANT_ENCAPSED_STRING { $$.u.ast = AST_ZVAL(&$1); } + | static_class_name_scalar { $$.u.ast = AST_ZVAL(&$1); } + | static_class_constant { $$.u.ast = AST_ZVAL(&$1); } + | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); $$.u.ast = AST_ZVAL(&$$); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = AST_ZVAL(&$$); } + | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = AST_ZVAL(&$$); } | common_scalar { $$.u.ast = $1.u.ast; } | T_ARRAY '(' static_array_pair_list ')' { $$.u.ast = $3.u.ast; } | '[' static_array_pair_list ']' { $$.u.ast = $2.u.ast; } -- cgit v1.2.1 From 08c4e01a1bbe84029dc1fafa23073515bb9ef387 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 16:03:15 +0200 Subject: Add compilation state for static scalars --- Zend/zend_compile.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 48c438d3da..98229e21bd 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6106,18 +6106,19 @@ void zend_make_immutable_array_r(zval *zv TSRMLS_DC) /* {{{ */ } /* }}} */ +void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC); + void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ */ { + //zend_eval_const_expr(&ast TSRMLS_CC); if (ast->kind == ZEND_CONST) { ZVAL_COPY_VALUE(&result->u.constant, zend_ast_get_zval(ast)); - efree(ast); - } else if (zend_ast_is_ct_constant(ast)) { - zend_ast_evaluate(&result->u.constant, ast, NULL TSRMLS_CC); - zend_ast_destroy(ast); if (Z_TYPE(result->u.constant) == IS_ARRAY) { zend_make_immutable_array_r(&result->u.constant TSRMLS_CC); } + efree(ast); } else { + zend_compile_const_expr(&ast TSRMLS_CC); ZVAL_NEW_AST(&result->u.constant, ast); } } @@ -7787,6 +7788,33 @@ void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { } } +zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { + return kind == ZEND_CONST || kind == ZEND_AST_BINARY_OP + || kind == ZEND_AST_AND || kind == ZEND_AST_OR + || kind == ZEND_BW_NOT || kind == ZEND_BOOL_NOT + || kind == ZEND_AST_UNARY_PLUS || kind == ZEND_AST_UNARY_MINUS + || kind == ZEND_AST_CONDITIONAL + || kind == ZEND_AST_ARRAY || kind == ZEND_AST_ARRAY_ELEM; +} + +void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + if (ast == NULL || ast->kind == ZEND_CONST) { + return; + } + + if (!zend_is_allowed_in_const_expr(ast->kind)) { + zend_error_noreturn(E_COMPILE_ERROR, "Constant expression contains invalid operations"); + } + + { + zend_uint i; + for (i = 0; i < ast->children; ++i) { + zend_compile_const_expr(&ast->child[i] TSRMLS_CC); + } + } +} + void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { switch (ast->kind) { case ZEND_AST_GLOBAL: -- cgit v1.2.1 From b83c70416b0754834f7505bd8ab57a6476493da0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 16:35:30 +0200 Subject: Compile class const refs to CONST zval --- Zend/zend_compile.c | 49 +++++++++++++++++++++++++++++++++++++++++++-- Zend/zend_language_parser.y | 8 +++----- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 98229e21bd..58b9252e5e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6111,6 +6111,7 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC); void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ */ { //zend_eval_const_expr(&ast TSRMLS_CC); + zend_compile_const_expr(&ast TSRMLS_CC); if (ast->kind == ZEND_CONST) { ZVAL_COPY_VALUE(&result->u.constant, zend_ast_get_zval(ast)); if (Z_TYPE(result->u.constant) == IS_ARRAY) { @@ -6118,7 +6119,6 @@ void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ } efree(ast); } else { - zend_compile_const_expr(&ast TSRMLS_CC); ZVAL_NEW_AST(&result->u.constant, ast); } } @@ -7794,7 +7794,46 @@ zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { || kind == ZEND_BW_NOT || kind == ZEND_BOOL_NOT || kind == ZEND_AST_UNARY_PLUS || kind == ZEND_AST_UNARY_MINUS || kind == ZEND_AST_CONDITIONAL - || kind == ZEND_AST_ARRAY || kind == ZEND_AST_ARRAY_ELEM; + || kind == ZEND_AST_ARRAY || kind == ZEND_AST_ARRAY_ELEM + || kind == ZEND_AST_CLASS_CONST; +} + +void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + zend_ast *class_ast = ast->child[0]; + zend_ast *const_ast = ast->child[1]; + znode class_name, const_name; + zval result; + int fetch_type; + + if (class_ast->kind != ZEND_CONST) { + zend_error_noreturn(E_COMPILE_ERROR, + "Dynamic class names are not allowed in compile-time class constant references"); + } + + zend_compile_expr(&class_name, class_ast TSRMLS_CC); + zend_compile_expr(&const_name, const_ast TSRMLS_CC); + fetch_type = zend_get_class_fetch_type( + Z_STRVAL(class_name.u.constant), Z_STRLEN(class_name.u.constant)); + + if (ZEND_FETCH_CLASS_STATIC == fetch_type) { + zend_error_noreturn(E_COMPILE_ERROR, + "\"static::\" is not allowed in compile-time constants"); + } else if (ZEND_FETCH_CLASS_DEFAULT == fetch_type) { + zend_resolve_class_name(&class_name TSRMLS_CC); + } + + zend_do_build_full_name(NULL, &class_name, &const_name, 1 TSRMLS_CC); + + ZVAL_COPY_VALUE(&result, &class_name.u.constant); + Z_TYPE_INFO(result) = IS_CONSTANT_EX; + if (IS_INTERNED(Z_STR(result))) { + Z_TYPE_FLAGS(result) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); + } + Z_CONST_FLAGS(result) = fetch_type; + + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_constant(&result); } void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { @@ -7813,6 +7852,12 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_compile_const_expr(&ast->child[i] TSRMLS_CC); } } + + switch (ast->kind) { + case ZEND_AST_CLASS_CONST: + zend_compile_const_expr_class_const(ast_ptr TSRMLS_CC); + break; + } } void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 5142b465c9..fc24b7e878 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -972,10 +972,6 @@ common_scalar: $$.u.ast = zend_ast_create_constant(&empty_str); } ; -static_class_constant: - class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { zend_do_fetch_constant(&$$, &$1, &$3, ZEND_CT, 0 TSRMLS_CC); } -; - static_scalar: /* compile-time evaluated scalars */ static_scalar_value { zend_do_constant_expression(&$$, $1.u.ast TSRMLS_CC); } ; @@ -983,7 +979,9 @@ static_scalar: /* compile-time evaluated scalars */ static_scalar_value: T_CONSTANT_ENCAPSED_STRING { $$.u.ast = AST_ZVAL(&$1); } | static_class_name_scalar { $$.u.ast = AST_ZVAL(&$1); } - | static_class_constant { $$.u.ast = AST_ZVAL(&$1); } + | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING + { $$.u.ast = zend_ast_create_binary( + ZEND_AST_CLASS_CONST, AST_ZVAL(&$1), AST_ZVAL(&$3)); } | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); $$.u.ast = AST_ZVAL(&$$); } | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = AST_ZVAL(&$$); } | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = AST_ZVAL(&$$); } -- cgit v1.2.1 From 080e8bffa5a373f662dfb0aa5178e4a8b22312fa Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 16:56:50 +0200 Subject: Compile const refs to CONST --- Zend/zend_compile.c | 37 ++++++++++++++++++++++++++++++++++++- Zend/zend_language_parser.y | 15 ++++++++++++--- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 58b9252e5e..50e6e5f5ff 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7795,7 +7795,7 @@ zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { || kind == ZEND_AST_UNARY_PLUS || kind == ZEND_AST_UNARY_MINUS || kind == ZEND_AST_CONDITIONAL || kind == ZEND_AST_ARRAY || kind == ZEND_AST_ARRAY_ELEM - || kind == ZEND_AST_CLASS_CONST; + || kind == ZEND_AST_CONST || kind == ZEND_AST_CLASS_CONST; } void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { @@ -7836,6 +7836,38 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { *ast_ptr = zend_ast_create_constant(&result); } +void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + zend_ast *const_name_ast = ast->child[0]; + zend_bool check_namespace = const_name_ast->attr; + zend_bool is_compound; + + znode const_name, result; + zend_compile_expr(&const_name, const_name_ast TSRMLS_CC); + + is_compound = zend_is_compound_name(&const_name.u.constant); + + if (zend_constant_ct_subst(&result, &const_name.u.constant, 0 TSRMLS_CC)) { + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_constant(&result.u.constant); + return; + } + + zend_resolve_const_name(&const_name, &check_namespace TSRMLS_CC); + result = const_name; + + Z_TYPE_INFO(result.u.constant) = IS_CONSTANT_EX; + if (IS_INTERNED(Z_STR(result.u.constant))) { + Z_TYPE_FLAGS(result.u.constant) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); + } + if (!is_compound) { + Z_CONST_FLAGS(result.u.constant) = IS_CONSTANT_UNQUALIFIED; + } + + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_constant(&result.u.constant); +} + void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; if (ast == NULL || ast->kind == ZEND_CONST) { @@ -7857,6 +7889,9 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { case ZEND_AST_CLASS_CONST: zend_compile_const_expr_class_const(ast_ptr TSRMLS_CC); break; + case ZEND_AST_CONST: + zend_compile_const_expr_const(ast_ptr TSRMLS_CC); + break; } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index fc24b7e878..6de001a570 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -982,9 +982,18 @@ static_scalar_value: | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { $$.u.ast = zend_ast_create_binary( ZEND_AST_CLASS_CONST, AST_ZVAL(&$1), AST_ZVAL(&$3)); } - | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); $$.u.ast = AST_ZVAL(&$$); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = AST_ZVAL(&$$); } - | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); $$.u.ast = AST_ZVAL(&$$); } + | namespace_name + { $$.u.ast = zend_ast_create_unary( + ZEND_AST_CONST, zend_ast_create_zval_ex(&$1.u.constant, 1)); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name + { ZVAL_EMPTY_STRING(&$1.u.constant); + zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); + $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$1)); } + | T_NS_SEPARATOR namespace_name + { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); + if (Z_DELREF($2.u.constant) == 0) { efree(Z_STR($2.u.constant)); } + Z_STR($2.u.constant) = Z_STR(tmp); + $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } | common_scalar { $$.u.ast = $1.u.ast; } | T_ARRAY '(' static_array_pair_list ')' { $$.u.ast = $3.u.ast; } | '[' static_array_pair_list ']' { $$.u.ast = $2.u.ast; } -- cgit v1.2.1 From dd60b9bb914df8022fc86ad79bc63e19a61988f0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 21:44:46 +0200 Subject: Handle ::class in const expr via ast as well --- Zend/zend_compile.c | 39 ++++++++++++++++++++++++++++++++++++++- Zend/zend_language_parser.y | 7 ++----- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 50e6e5f5ff..1c5c951a4b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7795,7 +7795,8 @@ zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { || kind == ZEND_AST_UNARY_PLUS || kind == ZEND_AST_UNARY_MINUS || kind == ZEND_AST_CONDITIONAL || kind == ZEND_AST_ARRAY || kind == ZEND_AST_ARRAY_ELEM - || kind == ZEND_AST_CONST || kind == ZEND_AST_CLASS_CONST; + || kind == ZEND_AST_CONST || kind == ZEND_AST_CLASS_CONST + || kind == ZEND_AST_RESOLVE_CLASS_NAME; } void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { @@ -7868,6 +7869,39 @@ void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { *ast_ptr = zend_ast_create_constant(&result.u.constant); } +void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + zend_ast *name_ast = ast->child[0]; + zval *name = zend_ast_get_zval(name_ast); + int fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); + znode result; + + switch (fetch_type) { + case ZEND_FETCH_CLASS_SELF: + if (!CG(active_class_entry)) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot access self::class when no class scope is active"); + } + ZVAL_STR(&result.u.constant, STR_COPY(CG(active_class_entry)->name)); + break; + case ZEND_FETCH_CLASS_STATIC: + case ZEND_FETCH_CLASS_PARENT: + zend_error_noreturn(E_COMPILE_ERROR, + "%s::class cannot be used for compile-time class name resolution", + fetch_type == ZEND_FETCH_CLASS_STATIC ? "static" : "parent" + ); + break; + case ZEND_FETCH_CLASS_DEFAULT: + zend_compile_expr(&result, name_ast TSRMLS_CC); + zend_resolve_class_name(&result TSRMLS_CC); + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_constant(&result.u.constant); +} + void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; if (ast == NULL || ast->kind == ZEND_CONST) { @@ -7892,6 +7926,9 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { case ZEND_AST_CONST: zend_compile_const_expr_const(ast_ptr TSRMLS_CC); break; + case ZEND_AST_RESOLVE_CLASS_NAME: + zend_compile_const_expr_resolve_class_name(ast_ptr TSRMLS_CC); + break; } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6de001a570..3dbb27675c 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -978,7 +978,8 @@ static_scalar: /* compile-time evaluated scalars */ static_scalar_value: T_CONSTANT_ENCAPSED_STRING { $$.u.ast = AST_ZVAL(&$1); } - | static_class_name_scalar { $$.u.ast = AST_ZVAL(&$1); } + | class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS + { $$.u.ast = zend_ast_create_unary(ZEND_AST_RESOLVE_CLASS_NAME, AST_ZVAL(&$1)); } | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { $$.u.ast = zend_ast_create_binary( ZEND_AST_CLASS_CONST, AST_ZVAL(&$1), AST_ZVAL(&$3)); } @@ -1329,10 +1330,6 @@ class_constant: ZEND_AST_CLASS_CONST, $1.u.ast, AST_ZVAL(&$3)); } ; -static_class_name_scalar: - class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS { zend_do_resolve_class_name(&$$, &$1, 1 TSRMLS_CC); } -; - class_name_scalar: class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS { $$.u.ast = zend_ast_create_unary(ZEND_AST_RESOLVE_CLASS_NAME, AST_ZVAL(&$1)); } -- cgit v1.2.1 From dd60c8e0f1a8918f08b4733570476e5b08ffaed5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 22:02:54 +0200 Subject: Reuse expr for static_scalar --- Zend/zend_ast.c | 13 +++++++++++++ Zend/zend_compile.c | 1 + Zend/zend_language_parser.y | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index ec3e9dbc84..c84842eeb1 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -178,6 +178,19 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s zval_dtor(&op2); break; } + case ZEND_AST_GREATER: + case ZEND_AST_GREATER_EQUAL: + { + /* op1 > op2 is the same as op2 < op1 */ + binary_op_type op = ast->kind == ZEND_AST_GREATER + ? is_smaller_function : is_smaller_or_equal_function; + zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); + zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); + op(result, &op2, &op1 TSRMLS_CC); + zval_dtor(&op1); + zval_dtor(&op2); + break; + } case ZEND_BW_NOT: zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); bitwise_not_function(result, &op1 TSRMLS_CC); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 1c5c951a4b..ef02d31a5f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7790,6 +7790,7 @@ void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { return kind == ZEND_CONST || kind == ZEND_AST_BINARY_OP + || kind == ZEND_AST_GREATER || kind == ZEND_AST_GREATER_EQUAL || kind == ZEND_AST_AND || kind == ZEND_AST_OR || kind == ZEND_BW_NOT || kind == ZEND_BOOL_NOT || kind == ZEND_AST_UNARY_PLUS || kind == ZEND_AST_UNARY_MINUS diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 3dbb27675c..945a900213 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -799,7 +799,7 @@ expr_without_variable: | expr T_LOGICAL_AND expr { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } | expr T_LOGICAL_XOR expr - { $$.u.ast = zend_ast_create_binary(ZEND_BOOL_XOR, $1.u.ast, $3.u.ast); } + { $$.u.ast = zend_ast_create_binary_op(ZEND_BOOL_XOR, $1.u.ast, $3.u.ast); } | expr '|' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_OR, $1.u.ast, $3.u.ast); } | expr '&' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_AND, $1.u.ast, $3.u.ast); } | expr '^' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_XOR, $1.u.ast, $3.u.ast); } @@ -973,7 +973,7 @@ common_scalar: ; static_scalar: /* compile-time evaluated scalars */ - static_scalar_value { zend_do_constant_expression(&$$, $1.u.ast TSRMLS_CC); } + expr { zend_do_constant_expression(&$$, $1.u.ast TSRMLS_CC); } ; static_scalar_value: -- cgit v1.2.1 From 0e44f4c583e2dbef32ff7e07f4a0c100b609d2c6 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 22:04:09 +0200 Subject: Remove obseleted grammar productions --- Zend/zend_compile.c | 2 +- Zend/zend_language_parser.y | 157 +++++--------------------------------------- 2 files changed, 17 insertions(+), 142 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ef02d31a5f..212bd621f1 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6110,7 +6110,7 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC); void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ */ { - //zend_eval_const_expr(&ast TSRMLS_CC); + zend_eval_const_expr(&ast TSRMLS_CC); zend_compile_const_expr(&ast TSRMLS_CC); if (ast->kind == ZEND_CONST) { ZVAL_COPY_VALUE(&result->u.constant, zend_ast_get_zval(ast)); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 945a900213..17738ef9d5 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -956,7 +956,11 @@ dereferencable_scalar: | T_CONSTANT_ENCAPSED_STRING { $$.u.ast = AST_ZVAL(&$1); } ; -common_scalar: +static_scalar: /* compile-time evaluated scalars */ + expr { zend_do_constant_expression(&$$, $1.u.ast TSRMLS_CC); } +; + +scalar: T_LNUMBER { $$.u.ast = AST_ZVAL(&$1); } | T_DNUMBER { $$.u.ast = AST_ZVAL(&$1); } | T_LINE { $$.u.ast = AST_ZVAL(&$1); } @@ -966,118 +970,22 @@ common_scalar: | T_METHOD_C { $$.u.ast = AST_ZVAL(&$1); } | T_FUNC_C { $$.u.ast = AST_ZVAL(&$1); } | T_NS_C { $$.u.ast = AST_ZVAL(&$1); } - | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } - | T_START_HEREDOC T_END_HEREDOC - { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); - $$.u.ast = zend_ast_create_constant(&empty_str); } -; - -static_scalar: /* compile-time evaluated scalars */ - expr { zend_do_constant_expression(&$$, $1.u.ast TSRMLS_CC); } -; - -static_scalar_value: - T_CONSTANT_ENCAPSED_STRING { $$.u.ast = AST_ZVAL(&$1); } - | class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS - { $$.u.ast = zend_ast_create_unary(ZEND_AST_RESOLVE_CLASS_NAME, AST_ZVAL(&$1)); } - | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.u.ast = zend_ast_create_binary( - ZEND_AST_CLASS_CONST, AST_ZVAL(&$1), AST_ZVAL(&$3)); } - | namespace_name - { $$.u.ast = zend_ast_create_unary( - ZEND_AST_CONST, zend_ast_create_zval_ex(&$1.u.constant, 1)); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name - { ZVAL_EMPTY_STRING(&$1.u.constant); - zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); - $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$1)); } - | T_NS_SEPARATOR namespace_name - { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); - if (Z_DELREF($2.u.constant) == 0) { efree(Z_STR($2.u.constant)); } - Z_STR($2.u.constant) = Z_STR(tmp); - $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } - | common_scalar { $$.u.ast = $1.u.ast; } - | T_ARRAY '(' static_array_pair_list ')' { $$.u.ast = $3.u.ast; } - | '[' static_array_pair_list ']' { $$.u.ast = $2.u.ast; } - | static_operation { $$.u.ast = $1.u.ast; } | T_CLASS_C { if (Z_TYPE($1.u.constant) == IS_UNDEF) { - zval class_const; - ZVAL_STRING(&class_const, "__CLASS__"); - Z_TYPE_INFO(class_const) = IS_CONSTANT_EX; - $$.u.ast = zend_ast_create_constant(&class_const); + zval class_const; ZVAL_STRING(&class_const, "__CLASS__"); + $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, + zend_ast_create_constant(&class_const)); } else { $$.u.ast = AST_ZVAL(&$1); } } -; - -static_operation: - '!' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_BOOL_NOT, $2.u.ast); } - | '~' static_scalar_value { $$.u.ast = zend_ast_create_unary(ZEND_BW_NOT, $2.u.ast); } - | static_scalar_value '+' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_ADD, $1.u.ast, $3.u.ast); } - | static_scalar_value '-' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_SUB, $1.u.ast, $3.u.ast); } - | static_scalar_value '*' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_MUL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_POW static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_POW, $1.u.ast, $3.u.ast); } - | static_scalar_value '/' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_DIV, $1.u.ast, $3.u.ast); } - | static_scalar_value '%' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_MOD, $1.u.ast, $3.u.ast); } - | static_scalar_value '|' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_OR, $1.u.ast, $3.u.ast); } - | static_scalar_value '&' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_AND, $1.u.ast, $3.u.ast); } - | static_scalar_value '^' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_XOR, $1.u.ast, $3.u.ast); } - | static_scalar_value T_SL static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_SL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_SR static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_SR, $1.u.ast, $3.u.ast); } - | static_scalar_value '.' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_CONCAT, $1.u.ast, $3.u.ast); } - | static_scalar_value T_LOGICAL_XOR static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_BOOL_XOR, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_IDENTICAL static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_NOT_IDENTICAL static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_NOT_IDENTICAL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_EQUAL static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_EQUAL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_NOT_EQUAL static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_NOT_EQUAL, $1.u.ast, $3.u.ast); } - | static_scalar_value '<' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER, $1.u.ast, $3.u.ast); } - | static_scalar_value '>' static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER, $3.u.ast, $1.u.ast); } - | static_scalar_value T_IS_SMALLER_OR_EQUAL static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $1.u.ast, $3.u.ast); } - | static_scalar_value T_IS_GREATER_OR_EQUAL static_scalar_value - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $3.u.ast, $1.u.ast); } - | static_scalar_value T_LOGICAL_AND static_scalar_value - { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } - | static_scalar_value T_LOGICAL_OR static_scalar_value - { $$.u.ast = zend_ast_create_binary(ZEND_AST_OR, $1.u.ast, $3.u.ast); } - | static_scalar_value T_BOOLEAN_AND static_scalar_value - { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } - | static_scalar_value T_BOOLEAN_OR static_scalar_value - { $$.u.ast = zend_ast_create_binary(ZEND_AST_OR, $1.u.ast, $3.u.ast); } - | static_scalar_value '?' ':' static_scalar_value - { $$.u.ast = zend_ast_create_ternary(ZEND_AST_CONDITIONAL, $1.u.ast, NULL, $4.u.ast); } - | static_scalar_value '?' static_scalar_value ':' static_scalar_value - { $$.u.ast = zend_ast_create_ternary( - ZEND_AST_CONDITIONAL, $1.u.ast, $3.u.ast, $5.u.ast); } - | '+' static_scalar_value - { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_PLUS, $2.u.ast); } - | '-' static_scalar_value - { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_MINUS, $2.u.ast); } - | '(' static_scalar_value ')' { $$.u.ast = $2.u.ast; } -; - - -scalar: - class_name_scalar { $$.u.ast = $1.u.ast; } + | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } + | T_START_HEREDOC T_END_HEREDOC + { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); + $$.u.ast = zend_ast_create_constant(&empty_str); } + | '"' encaps_list '"' { $$.u.ast = $2.u.ast; } + | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.u.ast = $2.u.ast; } + | dereferencable_scalar { $$.u.ast = $1.u.ast; } + | class_name_scalar { $$.u.ast = $1.u.ast; } | class_constant { $$.u.ast = $1.u.ast; } | namespace_name { $$.u.ast = zend_ast_create_unary( @@ -1091,47 +999,14 @@ scalar: if (Z_DELREF($2.u.constant) == 0) { efree(Z_STR($2.u.constant)); } Z_STR($2.u.constant) = Z_STR(tmp); $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } - | common_scalar { $$.u.ast = $1.u.ast; } - | '"' encaps_list '"' { $$.u.ast = $2.u.ast; } - | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.u.ast = $2.u.ast; } - | T_CLASS_C - { if (Z_TYPE($1.u.constant) == IS_UNDEF) { - zval class_const; ZVAL_STRING(&class_const, "__CLASS__"); - $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, - zend_ast_create_constant(&class_const)); - } else { - $$.u.ast = AST_ZVAL(&$1); - } } - | dereferencable_scalar { $$.u.ast = $1.u.ast; } ; -static_array_pair_list: - /* empty */ - { array_init(&$$.u.constant); $$.u.ast = zend_ast_create_constant(&$$.u.constant); } - | non_empty_static_array_pair_list possible_comma - { zend_ast_dynamic_shrink(&$1.u.ast); $$ = $1; } -; - possible_comma: /* empty */ | ',' ; -non_empty_static_array_pair_list: - non_empty_static_array_pair_list ',' static_array_pair - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } - | static_array_pair - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARRAY, $1.u.ast); } -; - -static_array_pair: - static_scalar_value T_DOUBLE_ARROW static_scalar_value - { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $3.u.ast, $1.u.ast); } - | static_scalar_value - { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $1.u.ast, NULL); } -; - expr: variable { $$.u.ast = $1.u.ast; } | expr_without_variable { $$.u.ast = $1.u.ast; } -- cgit v1.2.1 From 64dab4b914ddc76afa2690f1057aa9fe5aee9799 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 26 Jun 2014 22:17:19 +0200 Subject: Drop dead code --- Zend/zend_compile.c | 232 ---------------------------------------------------- Zend/zend_compile.h | 10 --- 2 files changed, 242 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 212bd621f1..5200f82ec1 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1768,53 +1768,6 @@ void zend_resolve_const_name(znode *element_name, zend_bool *check_namespace TSR } /* }}} */ -void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static TSRMLS_DC) /* {{{ */ -{ - char *lcname; - int lctype; - znode constant_name; - - lcname = zend_str_tolower_dup(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant)); - lctype = zend_get_class_fetch_type(lcname, strlen(lcname)); - switch (lctype) { - case ZEND_FETCH_CLASS_SELF: - if (!CG(active_class_entry)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot access self::class when no class scope is active"); - } - zval_dtor(&class_name->u.constant); - class_name->op_type = IS_CONST; - ZVAL_STR(&class_name->u.constant, STR_COPY(CG(active_class_entry)->name)); - *result = *class_name; - break; - case ZEND_FETCH_CLASS_STATIC: - case ZEND_FETCH_CLASS_PARENT: - if (is_static) { - zend_error_noreturn(E_COMPILE_ERROR, - "%s::class cannot be used for compile-time class name resolution", - lctype == ZEND_FETCH_CLASS_STATIC ? "static" : "parent" - ); - } - if (!CG(active_class_entry)) { - zend_error_noreturn(E_COMPILE_ERROR, - "Cannot access %s::class when no class scope is active", - lctype == ZEND_FETCH_CLASS_STATIC ? "static" : "parent" - ); - } - constant_name.op_type = IS_CONST; - ZVAL_STRINGL(&constant_name.u.constant, "class", sizeof("class")-1); - zend_do_fetch_constant(result, class_name, &constant_name, ZEND_RT, 1 TSRMLS_CC); - break; - case ZEND_FETCH_CLASS_DEFAULT: - zend_resolve_class_name(class_name TSRMLS_CC); - *result = *class_name; - break; - } - - efree(lcname); - -} -/* }}} */ - void zend_resolve_class_name(znode *class_name TSRMLS_DC) /* {{{ */ { char *compound; @@ -4218,76 +4171,6 @@ ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS } /* }}} */ -void zend_do_boolean_or_begin(znode *expr1, znode *op_token TSRMLS_DC) /* {{{ */ -{ - int next_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMPNZ_EX; - if (expr1->op_type == IS_TMP_VAR) { - SET_NODE(opline->result, expr1); - } else { - opline->result.var = get_temporary_variable(CG(active_op_array)); - opline->result_type = IS_TMP_VAR; - } - SET_NODE(opline->op1, expr1); - SET_UNUSED(opline->op2); - - op_token->u.op.opline_num = next_op_number; - - GET_NODE(expr1, opline->result); -} -/* }}} */ - -void zend_do_boolean_or_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - *result = *expr1; /* we saved the original result in expr1 */ - opline->opcode = ZEND_BOOL; - SET_NODE(opline->result, result); - SET_NODE(opline->op1, expr2); - SET_UNUSED(opline->op2); - - CG(active_op_array)->opcodes[op_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array)); -} -/* }}} */ - -void zend_do_boolean_and_begin(znode *expr1, znode *op_token TSRMLS_DC) /* {{{ */ -{ - int next_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMPZ_EX; - if (expr1->op_type == IS_TMP_VAR) { - SET_NODE(opline->result, expr1); - } else { - opline->result.var = get_temporary_variable(CG(active_op_array)); - opline->result_type = IS_TMP_VAR; - } - SET_NODE(opline->op1, expr1); - SET_UNUSED(opline->op2); - - op_token->u.op.opline_num = next_op_number; - - GET_NODE(expr1, opline->result); -} -/* }}} */ - -void zend_do_boolean_and_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - *result = *expr1; /* we saved the original result in expr1 */ - opline->opcode = ZEND_BOOL; - SET_NODE(opline->result, result); - SET_NODE(opline->op1, expr2); - SET_UNUSED(opline->op2); - - CG(active_op_array)->opcodes[op_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array)); -} -/* }}} */ - void zend_do_do_while_begin(TSRMLS_D) /* {{{ */ { do_begin_loop(TSRMLS_C); @@ -4927,121 +4810,6 @@ static int zend_constant_ct_subst(znode *result, zval *const_name, int all_inter } /* }}} */ -void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode, zend_bool check_namespace TSRMLS_DC) /* {{{ */ -{ - znode tmp; - zend_op *opline; - int type; - char *compound; - ulong fetch_type = 0; - - if (constant_container) { - switch (mode) { - case ZEND_CT: - /* this is a class constant */ - type = zend_get_class_fetch_type(Z_STRVAL(constant_container->u.constant), Z_STRLEN(constant_container->u.constant)); - - if (ZEND_FETCH_CLASS_STATIC == type) { - zend_error(E_ERROR, "\"static::\" is not allowed in compile-time constants"); - } else if (ZEND_FETCH_CLASS_DEFAULT == type) { - zend_resolve_class_name(constant_container TSRMLS_CC); - } - zend_do_build_full_name(NULL, constant_container, constant_name, 1 TSRMLS_CC); - *result = *constant_container; - Z_TYPE_INFO(result->u.constant) = IS_CONSTANT_EX; - if (IS_INTERNED(Z_STR(result->u.constant))) { - Z_TYPE_FLAGS(result->u.constant) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); - } - Z_CONST_FLAGS(result->u.constant) = fetch_type; - break; - case ZEND_RT: - if (constant_container->op_type == IS_CONST && - ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(constant_container->u.constant), Z_STRLEN(constant_container->u.constant))) { - zend_resolve_class_name(constant_container TSRMLS_CC); - } else { - zend_do_fetch_class(&tmp, constant_container TSRMLS_CC); - constant_container = &tmp; - } - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_FETCH_CONSTANT; - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - if (constant_container->op_type == IS_CONST) { - opline->op1_type = IS_CONST; - opline->op1.constant = zend_add_class_name_literal(CG(active_op_array), &constant_container->u.constant TSRMLS_CC); - } else { - SET_NODE(opline->op1, constant_container); - } - SET_NODE(opline->op2, constant_name); - if (opline->op1_type == IS_CONST) { - GET_CACHE_SLOT(opline->op2.constant); - } else { - GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); - } - GET_NODE(result, opline->result); - break; - } - return; - } - /* namespace constant */ - /* only one that did not contain \ from the start can be converted to string if unknown */ - switch (mode) { - case ZEND_CT: - compound = memchr(Z_STRVAL(constant_name->u.constant), '\\', Z_STRLEN(constant_name->u.constant)); - /* this is a namespace constant, or an unprefixed constant */ - - if (zend_constant_ct_subst(result, &constant_name->u.constant, 0 TSRMLS_CC)) { - break; - } - - zend_resolve_const_name(constant_name, &check_namespace TSRMLS_CC); - - if(!compound) { - fetch_type |= IS_CONSTANT_UNQUALIFIED; - } - - *result = *constant_name; - Z_TYPE_INFO(result->u.constant) = IS_CONSTANT_EX; - if (IS_INTERNED(Z_STR(result->u.constant))) { - Z_TYPE_FLAGS(result->u.constant) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); - } - Z_CONST_FLAGS(result->u.constant) = fetch_type; - break; - case ZEND_RT: - compound = memchr(Z_STRVAL(constant_name->u.constant), '\\', Z_STRLEN(constant_name->u.constant)); - - zend_resolve_const_name(constant_name, &check_namespace TSRMLS_CC); - - if(zend_constant_ct_subst(result, &constant_name->u.constant, 1 TSRMLS_CC)) { - break; - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_FETCH_CONSTANT; - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); - SET_UNUSED(opline->op1); - opline->op2_type = IS_CONST; - if (compound) { - /* the name is unambiguous */ - opline->extended_value = 0; - opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC); - } else { - opline->extended_value = IS_CONSTANT_UNQUALIFIED; - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - opline->extended_value |= IS_CONSTANT_IN_NAMESPACE; - opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC); - } else { - opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC); - } - } - GET_CACHE_SLOT(opline->op2.constant); - break; - } -} -/* }}} */ - void zend_init_list(void *result, void *item TSRMLS_DC) /* {{{ */ { void** list = emalloc(sizeof(void*) * 2); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index be6fca6c7c..30cd9503e0 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -547,12 +547,6 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent void zend_do_early_binding(TSRMLS_D); ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS_DC); - -void zend_do_boolean_or_begin(znode *expr1, znode *op_token TSRMLS_DC); -void zend_do_boolean_or_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC); -void zend_do_boolean_and_begin(znode *expr1, znode *op_token TSRMLS_DC); -void zend_do_boolean_and_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC); - void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC); void zend_do_switch_cond(const znode *cond TSRMLS_DC); @@ -568,8 +562,6 @@ void zend_do_declare_class_constant(znode *var_name, znode *value TSRMLS_DC); void zend_do_halt_compiler_register(TSRMLS_D); -void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode, zend_bool check_namespace TSRMLS_DC); - /* Functions for a null terminated pointer list, used for traits parsing and compilation */ void zend_init_list(void *result, void *item TSRMLS_DC); void zend_add_to_list(void *result, void *item TSRMLS_DC); @@ -602,8 +594,6 @@ void zend_do_use_const(znode *name, znode *new_name, int is_global TSRMLS_DC); void zend_do_end_compilation(TSRMLS_D); void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC); -void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static TSRMLS_DC); - void zend_do_label(znode *label TSRMLS_DC); void zend_do_goto(znode *label TSRMLS_DC); void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC); -- cgit v1.2.1 From 111ad71d38a62f937cfbf6a49f37b1be43860c81 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 28 Jun 2014 18:03:26 +0200 Subject: Rename ZEND_CONST to ZEND_AST_ZVAL --- Zend/zend_ast.c | 22 ++++++------------- Zend/zend_ast.h | 9 +++----- Zend/zend_compile.c | 52 ++++++++++++++++++++++----------------------- Zend/zend_language_parser.y | 6 +++--- 4 files changed, 39 insertions(+), 50 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index c84842eeb1..59b82e81e2 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -23,15 +23,6 @@ #include "zend_API.h" #include "zend_operators.h" -ZEND_API zend_ast *zend_ast_create_constant(zval *zv) -{ - zend_ast_zval *ast = emalloc(sizeof(zend_ast_zval)); - ast->kind = ZEND_CONST; - ast->attr = 0; - ZVAL_COPY_VALUE(&ast->val, zv); - return (zend_ast *) ast; -} - ZEND_API zend_ast *zend_ast_create_znode(znode *node) { zend_ast_znode *ast = emalloc(sizeof(zend_ast_znode)); @@ -44,7 +35,7 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) { zend_ast_zval *ast = emalloc(sizeof(zend_ast_zval)); - ast->kind = ZEND_CONST; + ast->kind = ZEND_AST_ZVAL; ast->attr = attr; ZVAL_COPY_VALUE(&ast->val, zv); return (zend_ast *) ast; @@ -117,7 +108,7 @@ ZEND_API int zend_ast_is_ct_constant(zend_ast *ast) { int i; - if (ast->kind == ZEND_CONST) { + if (ast->kind == ZEND_AST_ZVAL) { return !Z_CONSTANT_P(zend_ast_get_zval(ast)); } else { for (i = 0; i < ast->children; i++) { @@ -201,7 +192,7 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s boolean_not_function(result, &op1 TSRMLS_CC); zval_dtor(&op1); break; - case ZEND_CONST: + case ZEND_AST_ZVAL: ZVAL_DUP(result, zend_ast_get_zval(ast)); if (Z_OPT_CONSTANT_P(result)) { zval_update_constant_ex(result, 1, scope TSRMLS_CC); @@ -280,14 +271,15 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) { if (ast == NULL) { return NULL; - } else if (ast->kind == ZEND_CONST) { - zend_ast *copy = zend_ast_create_constant(zend_ast_get_zval(ast)); + } else if (ast->kind == ZEND_AST_ZVAL) { + zend_ast *copy = zend_ast_create_zval_ex(zend_ast_get_zval(ast), ast->attr); zval_copy_ctor(zend_ast_get_zval(copy)); return copy; } else if (ast->children) { zend_ast *new = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children - 1)); int i; new->kind = ast->kind; + new->attr = ast->attr; new->children = ast->children; for (i = 0; i < ast->children; i++) { new->child[i] = zend_ast_copy(ast->child[i]); @@ -301,7 +293,7 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) { int i; - if (ast->kind == ZEND_CONST) { + if (ast->kind == ZEND_AST_ZVAL) { zval_ptr_dtor(zend_ast_get_zval(ast)); } else if (ast->kind != ZEND_AST_ZNODE) { for (i = 0; i < ast->children; i++) { diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 78bf68cfe6..2d12ed26bd 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -26,8 +26,7 @@ enum _zend_ast_kind { /* first 256 kinds are reserved for opcodes */ - ZEND_CONST = 256, /* TODO.AST: Split in constant lookup and literal zval */ - + ZEND_AST_ZVAL = 256, ZEND_AST_ZNODE, ZEND_AST_VAR, @@ -97,8 +96,6 @@ static inline zval *zend_ast_get_zval(zend_ast *ast) { return &((zend_ast_zval *) ast)->val; } -ZEND_API zend_ast *zend_ast_create_constant(zval *zv); - ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr); ZEND_API zend_ast *zend_ast_create_unary_ex( @@ -139,7 +136,7 @@ static inline zend_ast *zend_ast_create_dynamic_and_add(zend_ast_kind kind, zend } static inline zend_ast *zend_ast_create_var(zval *name) { - return zend_ast_create_unary(ZEND_AST_VAR, zend_ast_create_constant(name)); + return zend_ast_create_unary(ZEND_AST_VAR, zend_ast_create_zval(name)); } static inline zend_ast *zend_ast_create_binary_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { return zend_ast_create_binary_ex(ZEND_AST_BINARY_OP, opcode, op0, op1); @@ -167,7 +164,7 @@ static inline zend_ast *zend_ast_create_assign_op(zend_uint opcode, zend_ast *op } while (0) #define AST_ZNODE(znode) zend_ast_create_znode((znode)) -#define AST_ZVAL(znode) zend_ast_create_constant(&(znode)->u.constant) +#define AST_ZVAL(znode) zend_ast_create_zval(&(znode)->u.constant) #define AC(znode) AST_COMPILE(&znode, znode.u.ast) #define AZ(znode) ((znode).u.ast = AST_ZNODE(&znode)) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 5200f82ec1..b9cfb3055a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5880,7 +5880,7 @@ void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ { zend_eval_const_expr(&ast TSRMLS_CC); zend_compile_const_expr(&ast TSRMLS_CC); - if (ast->kind == ZEND_CONST) { + if (ast->kind == ZEND_AST_ZVAL) { ZVAL_COPY_VALUE(&result->u.constant, zend_ast_get_zval(ast)); if (Z_TYPE(result->u.constant) == IS_ARRAY) { zend_make_immutable_array_r(&result->u.constant TSRMLS_CC); @@ -6087,7 +6087,7 @@ static zend_bool zend_can_write_to_variable(zend_ast *ast) { static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { zval *name; int fetch_type; - if (name_ast->kind != ZEND_CONST) { + if (name_ast->kind != ZEND_AST_ZVAL) { return 0; } @@ -6159,7 +6159,7 @@ static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_ static int zend_try_compile_cv(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; - if (name_ast->kind == ZEND_CONST) { + if (name_ast->kind == ZEND_AST_ZVAL) { zend_string *name = zval_get_string(zend_ast_get_zval(name_ast)); if (zend_is_auto_global(name TSRMLS_CC)) { @@ -6186,7 +6186,7 @@ static zend_op *zend_compile_simple_var_no_cv(znode *result, zend_ast *ast, int zend_op *opline; /* there is a chance someone is accessing $this */ - if (ast->kind != ZEND_CONST + if (ast->kind != ZEND_AST_ZVAL && CG(active_op_array)->scope && CG(active_op_array)->this_var == -1 ) { zend_string *key = STR_INIT("this", sizeof("this") - 1, 0); @@ -6257,7 +6257,7 @@ 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_CONST) { + if (ast->kind != ZEND_AST_VAR || ast->child[0]->kind != ZEND_AST_ZVAL) { return 0; } @@ -6392,7 +6392,7 @@ void zend_ensure_writable_variable(const zend_ast *ast) { /* Detects $a... = $a pattern */ zend_bool zend_is_assign_to_self(zend_ast *var_ast, zend_ast *expr_ast TSRMLS_DC) { - if (expr_ast->kind != ZEND_AST_VAR || expr_ast->child[0]->kind != ZEND_CONST) { + if (expr_ast->kind != ZEND_AST_VAR || expr_ast->child[0]->kind != ZEND_AST_ZVAL) { return 0; } @@ -6400,7 +6400,7 @@ zend_bool zend_is_assign_to_self(zend_ast *var_ast, zend_ast *expr_ast TSRMLS_DC var_ast = var_ast->child[0]; } - if (var_ast->kind != ZEND_AST_VAR || var_ast->child[0]->kind != ZEND_CONST) { + if (var_ast->kind != ZEND_AST_VAR || var_ast->child[0]->kind != ZEND_AST_ZVAL) { return 0; } @@ -6731,7 +6731,7 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { znode name_node; - if (name_ast->kind != ZEND_CONST) { + if (name_ast->kind != ZEND_AST_ZVAL) { zend_compile_expr(&name_node, name_ast TSRMLS_CC); zend_compile_dynamic_call(result, &name_node, params_ast TSRMLS_CC); return; @@ -7521,7 +7521,7 @@ void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&elem_node, elem_ast TSRMLS_CC); - if (elem_ast->kind == ZEND_CONST) { + if (elem_ast->kind == ZEND_AST_ZVAL) { zval *zv = &elem_node.u.constant; ZEND_ASSERT(Z_TYPE_P(zv) == IS_STRING); @@ -7557,7 +7557,7 @@ void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { } zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { - return kind == ZEND_CONST || kind == ZEND_AST_BINARY_OP + return kind == ZEND_AST_ZVAL || kind == ZEND_AST_BINARY_OP || kind == ZEND_AST_GREATER || kind == ZEND_AST_GREATER_EQUAL || kind == ZEND_AST_AND || kind == ZEND_AST_OR || kind == ZEND_BW_NOT || kind == ZEND_BOOL_NOT @@ -7576,7 +7576,7 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { zval result; int fetch_type; - if (class_ast->kind != ZEND_CONST) { + if (class_ast->kind != ZEND_AST_ZVAL) { zend_error_noreturn(E_COMPILE_ERROR, "Dynamic class names are not allowed in compile-time class constant references"); } @@ -7603,7 +7603,7 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { Z_CONST_FLAGS(result) = fetch_type; zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_constant(&result); + *ast_ptr = zend_ast_create_zval(&result); } void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { @@ -7619,7 +7619,7 @@ void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { if (zend_constant_ct_subst(&result, &const_name.u.constant, 0 TSRMLS_CC)) { zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_constant(&result.u.constant); + *ast_ptr = zend_ast_create_zval(&result.u.constant); return; } @@ -7635,7 +7635,7 @@ void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { } zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_constant(&result.u.constant); + *ast_ptr = zend_ast_create_zval(&result.u.constant); } void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { @@ -7668,12 +7668,12 @@ void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { } zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_constant(&result.u.constant); + *ast_ptr = zend_ast_create_zval(&result.u.constant); } void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; - if (ast == NULL || ast->kind == ZEND_CONST) { + if (ast == NULL || ast->kind == ZEND_AST_ZVAL) { return; } @@ -7715,7 +7715,7 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { switch (ast->kind) { - case ZEND_CONST: + case ZEND_AST_ZVAL: ZVAL_COPY(&result->u.constant, zend_ast_get_zval(ast)); result->op_type = IS_CONST; return; @@ -7869,12 +7869,12 @@ void zend_eval_const_binary_op(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *right_ast = ast->child[1]; zend_uchar opcode = ast->attr; - if (left_ast->kind == ZEND_CONST && right_ast->kind == ZEND_CONST) { + if (left_ast->kind == ZEND_AST_ZVAL && right_ast->kind == ZEND_AST_ZVAL) { binary_op_type op = get_binary_op(opcode); zval result; op(&result, zend_ast_get_zval(left_ast), zend_ast_get_zval(right_ast) TSRMLS_CC); zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_constant(&result); + *ast_ptr = zend_ast_create_zval(&result); } } @@ -7884,7 +7884,7 @@ void zend_eval_const_unary_pm(zend_ast **ast_ptr TSRMLS_DC) { ZEND_ASSERT(ast->kind == ZEND_AST_UNARY_PLUS || ast->kind == ZEND_AST_UNARY_MINUS); - if (expr_ast->kind == ZEND_CONST) { + if (expr_ast->kind == ZEND_AST_ZVAL) { binary_op_type op = ast->kind == ZEND_AST_UNARY_PLUS ? add_function : sub_function; @@ -7892,7 +7892,7 @@ void zend_eval_const_unary_pm(zend_ast **ast_ptr TSRMLS_DC) { ZVAL_LONG(&left, 0); op(&result, &left, zend_ast_get_zval(expr_ast) TSRMLS_CC); zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_constant(&result); + *ast_ptr = zend_ast_create_zval(&result); } } @@ -7903,14 +7903,14 @@ void zend_eval_const_greater(zend_ast **ast_ptr TSRMLS_DC) { ZEND_ASSERT(ast->kind == ZEND_AST_GREATER || ast->kind == ZEND_AST_GREATER_EQUAL); - if (left_ast->kind == ZEND_CONST && right_ast->kind == ZEND_CONST) { + if (left_ast->kind == ZEND_AST_ZVAL && right_ast->kind == ZEND_AST_ZVAL) { binary_op_type op = ast->kind == ZEND_AST_GREATER ? is_smaller_function : is_smaller_or_equal_function; zval result; op(&result, zend_ast_get_zval(right_ast), zend_ast_get_zval(left_ast) TSRMLS_CC); zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_constant(&result); + *ast_ptr = zend_ast_create_zval(&result); } } @@ -7926,7 +7926,7 @@ void zend_eval_const_array(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *key_ast = elem_ast->child[1]; zend_bool by_ref = elem_ast->attr; - if (by_ref || (key_ast && key_ast->kind != ZEND_CONST) || value_ast->kind != ZEND_CONST) { + if (by_ref || (key_ast && key_ast->kind != ZEND_AST_ZVAL) || value_ast->kind != ZEND_AST_ZVAL) { return; } } @@ -7973,12 +7973,12 @@ void zend_eval_const_array(zend_ast **ast_ptr TSRMLS_DC) { zend_ast_destroy(ast); zend_make_immutable_array(&array TSRMLS_CC); - *ast_ptr = zend_ast_create_constant(&array); + *ast_ptr = zend_ast_create_zval(&array); } void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; - if (!ast || ast->kind == ZEND_CONST || ast->kind == ZEND_AST_ZNODE) { + if (!ast || ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_ZNODE) { return; } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 17738ef9d5..4fed735826 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -938,7 +938,7 @@ exit_expr: backticks_expr: /* empty */ { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); - $$.u.ast = zend_ast_create_constant(&empty_str); } + $$.u.ast = zend_ast_create_zval(&empty_str); } | T_ENCAPSED_AND_WHITESPACE { $$.u.ast = AST_ZVAL(&$1); } | encaps_list { $$.u.ast = $1.u.ast; } ; @@ -974,14 +974,14 @@ scalar: { if (Z_TYPE($1.u.constant) == IS_UNDEF) { zval class_const; ZVAL_STRING(&class_const, "__CLASS__"); $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, - zend_ast_create_constant(&class_const)); + zend_ast_create_zval(&class_const)); } else { $$.u.ast = AST_ZVAL(&$1); } } | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } | T_START_HEREDOC T_END_HEREDOC { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); - $$.u.ast = zend_ast_create_constant(&empty_str); } + $$.u.ast = zend_ast_create_zval(&empty_str); } | '"' encaps_list '"' { $$.u.ast = $2.u.ast; } | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.u.ast = $2.u.ast; } | dereferencable_scalar { $$.u.ast = $1.u.ast; } -- cgit v1.2.1 From e198132542de0be17ba25f10f0b880e721c3f67c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 28 Jun 2014 18:22:51 +0200 Subject: Drop addition of weird \ prefix for FQ consts Also fixes a resolution bug --- Zend/tests/use_const/no_global_fallback.phpt | 3 +-- Zend/zend_compile.c | 9 ++------- Zend/zend_language_parser.y | 5 +---- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Zend/tests/use_const/no_global_fallback.phpt b/Zend/tests/use_const/no_global_fallback.phpt index a128f353ed..64e2a154ce 100644 --- a/Zend/tests/use_const/no_global_fallback.phpt +++ b/Zend/tests/use_const/no_global_fallback.phpt @@ -10,5 +10,4 @@ var_dump(baz); ?> --EXPECTF-- -Notice: Use of undefined constant baz - assumed 'baz' in %s on line %d -string(3) "baz" +Fatal error: Undefined constant 'foo\bar\baz' in %s on line %d diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index b9cfb3055a..bf02734e4f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7404,7 +7404,6 @@ void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; zend_bool check_namespace = name_ast->attr; - zend_bool is_compound = zend_is_compound_name(zend_ast_get_zval(name_ast)); znode name_node; zend_op *opline; @@ -7418,8 +7417,7 @@ void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { opline = emit_op_tmp(result, ZEND_FETCH_CONSTANT, NULL, NULL TSRMLS_CC); opline->op2_type = IS_CONST; - if (is_compound) { - /* the name is unambiguous */ + if (!check_namespace || zend_is_compound_name(zend_ast_get_zval(name_ast))) { opline->op2.constant = zend_add_const_name_literal( CG(active_op_array), &name_node.u.constant, 0 TSRMLS_CC); } else { @@ -7610,13 +7608,10 @@ void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zend_ast *const_name_ast = ast->child[0]; zend_bool check_namespace = const_name_ast->attr; - zend_bool is_compound; znode const_name, result; zend_compile_expr(&const_name, const_name_ast TSRMLS_CC); - is_compound = zend_is_compound_name(&const_name.u.constant); - if (zend_constant_ct_subst(&result, &const_name.u.constant, 0 TSRMLS_CC)) { zend_ast_destroy(ast); *ast_ptr = zend_ast_create_zval(&result.u.constant); @@ -7630,7 +7625,7 @@ void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { if (IS_INTERNED(Z_STR(result.u.constant))) { Z_TYPE_FLAGS(result.u.constant) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); } - if (!is_compound) { + if (check_namespace && !zend_is_compound_name(zend_ast_get_zval(const_name_ast))) { Z_CONST_FLAGS(result.u.constant) = IS_CONSTANT_UNQUALIFIED; } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 4fed735826..eeffcf610e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -995,10 +995,7 @@ scalar: zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$1)); } | T_NS_SEPARATOR namespace_name - { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); - if (Z_DELREF($2.u.constant) == 0) { efree(Z_STR($2.u.constant)); } - Z_STR($2.u.constant) = Z_STR(tmp); - $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } ; -- cgit v1.2.1 From fb98dd31a0d4648a254ec635e65e831f0af5fc6f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 28 Jun 2014 22:27:06 +0200 Subject: Some refactoring of fn/const resolution --- Zend/zend_compile.c | 182 ++++++++++++++++++++++---------------------- Zend/zend_compile.h | 6 +- Zend/zend_language_parser.y | 15 ++++ 3 files changed, 111 insertions(+), 92 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index bf02734e4f..239e8f006a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1683,90 +1683,99 @@ void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, } /* }}} */ -void zend_resolve_non_class_name(znode *element_name, zend_bool *check_namespace, zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC) /* {{{ */ -{ - znode tmp; - int len; +zend_string *zend_concat_names(char *name1, size_t name1_len, char *name2, size_t name2_len) { + size_t len = name1_len + name2_len + 1; /* name1\name2 */ + zend_string *res = STR_ALLOC(len, 0); + + memcpy(res->val, name1, name1_len); + res->val[name1_len] = '\\'; + memcpy(res->val + name1_len + 1, name2, name2_len); + res->val[len] = '\0'; + + return res; +} +/* }}} */ + +zend_string *zend_resolve_non_class_name( + zend_string *name, zend_bool *is_fully_qualified, + zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC +) { + char *compound; zval *ns; - zend_string *lookup_name; - char *compound = memchr(Z_STRVAL(element_name->u.constant), '\\', Z_STRLEN(element_name->u.constant)); - if (Z_STRVAL(element_name->u.constant)[0] == '\\') { - /* name starts with \ so it is known and unambiguos, nothing to do here but shorten it */ - memmove(Z_STRVAL(element_name->u.constant), Z_STRVAL(element_name->u.constant)+1, Z_STRLEN(element_name->u.constant)); - --Z_STRLEN(element_name->u.constant); - return; + if (name->val[0] == '\\') { + /* Canonical form does not have a \ prefix */ + return STR_INIT(name->val + 1, name->len - 1, 0); } - if(!*check_namespace) { - return; + if (*is_fully_qualified) { + return STR_COPY(name); } if (current_import_sub) { - len = Z_STRLEN(element_name->u.constant); + zend_string *lookup_name; + if (case_sensitive) { - lookup_name = STR_INIT(Z_STRVAL(element_name->u.constant), len, 0); + lookup_name = STR_COPY(name); } else { - lookup_name = STR_ALLOC(len, 0); - zend_str_tolower_copy(lookup_name->val, Z_STRVAL(element_name->u.constant), len); + lookup_name = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lookup_name->val, name->val, name->len); } + /* Check if function/const matches imported name */ - if ((ns = zend_hash_find(current_import_sub, lookup_name)) != NULL) { - zval_dtor(&element_name->u.constant); - ZVAL_DUP(&element_name->u.constant, ns); - STR_FREE(lookup_name); - *check_namespace = 0; - return; + ns = zend_hash_find(current_import_sub, lookup_name); + STR_RELEASE(lookup_name); + + if (ns) { + *is_fully_qualified = 1; + return STR_COPY(Z_STR_P(ns)); } - STR_FREE(lookup_name); + } + + compound = memchr(name->val, '\\', name->len); + if (compound) { + *is_fully_qualified = 1; } if (compound && CG(current_import)) { - len = compound - Z_STRVAL(element_name->u.constant); /* namespace is always lowercase */ - lookup_name = STR_ALLOC(len, 0); - zend_str_tolower_copy(lookup_name->val, Z_STRVAL(element_name->u.constant), len); + size_t len = compound - name->val; + zend_string *lookup_name = STR_ALLOC(len, 0); + zend_str_tolower_copy(lookup_name->val, name->val, len); + /* Check if first part of compound name is an import name */ - if ((ns = zend_hash_find(CG(current_import), lookup_name)) != NULL) { + ns = zend_hash_find(CG(current_import), lookup_name); + STR_FREE(lookup_name); + + if (ns) { /* Substitute import name */ - tmp.op_type = IS_CONST; - ZVAL_DUP(&tmp.u.constant, ns); - len += 1; - Z_STRLEN(element_name->u.constant) -= len; - memmove(Z_STRVAL(element_name->u.constant), Z_STRVAL(element_name->u.constant)+len, Z_STRLEN(element_name->u.constant)+1); - zend_do_build_namespace_name(&tmp, &tmp, element_name TSRMLS_CC); - *element_name = tmp; - STR_FREE(lookup_name); - *check_namespace = 0; - return; + return zend_concat_names( + Z_STRVAL_P(ns), Z_STRLEN_P(ns), name->val + len + 1, name->len - len - 1); } - STR_FREE(lookup_name); } if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - tmp = *element_name; - Z_STR(tmp.u.constant) = STR_ALLOC(sizeof("\\")-1 + Z_STRLEN(element_name->u.constant) + Z_STRLEN(CG(current_namespace)), 0); - Z_TYPE_FLAGS(tmp.u.constant) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE; - memcpy(Z_STRVAL(tmp.u.constant), Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace))); - memcpy(&(Z_STRVAL(tmp.u.constant)[Z_STRLEN(CG(current_namespace))]), "\\", sizeof("\\")-1); - memcpy(&(Z_STRVAL(tmp.u.constant)[Z_STRLEN(CG(current_namespace)) + sizeof("\\")-1]), Z_STRVAL(element_name->u.constant), Z_STRLEN(element_name->u.constant)+1); - STR_RELEASE(Z_STR(element_name->u.constant)); - *element_name = tmp; + return zend_concat_names( + Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); } + + return STR_COPY(name); } /* }}} */ -void zend_resolve_function_name(znode *element_name, zend_bool *check_namespace TSRMLS_DC) /* {{{ */ -{ - zend_resolve_non_class_name(element_name, check_namespace, 0, CG(current_import_function) TSRMLS_CC); +zend_string *zend_resolve_function_name( + zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC +) { + return zend_resolve_non_class_name( + name, is_fully_qualified, 0, CG(current_import_function) TSRMLS_CC); } -/* }}} */ -void zend_resolve_const_name(znode *element_name, zend_bool *check_namespace TSRMLS_DC) /* {{{ */ -{ - zend_resolve_non_class_name(element_name, check_namespace, 1, CG(current_import_const) TSRMLS_CC); +zend_string *zend_resolve_const_name( + zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC +) { + return zend_resolve_non_class_name( + name, is_fully_qualified, 1, CG(current_import_const) TSRMLS_CC); } -/* }}} */ void zend_resolve_class_name(znode *class_name TSRMLS_DC) /* {{{ */ { @@ -4800,7 +4809,6 @@ static int zend_constant_ct_subst(znode *result, zval *const_name, int all_inter zend_constant *c = zend_get_ct_const(const_name, all_internal_constants_substitution TSRMLS_CC); if (c) { - zval_dtor(const_name); result->op_type = IS_CONST; result->u.constant = c->value; zval_copy_ctor(&result->u.constant); @@ -6096,10 +6104,6 @@ static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { return fetch_type == ZEND_FETCH_CLASS_DEFAULT; } -static zend_bool zend_is_compound_name(zval *name) { - return NULL != memchr(Z_STRVAL_P(name), '\\', Z_STRLEN_P(name)); -} - static void zend_handle_numeric_op2(zend_op *opline TSRMLS_DC) { if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { ulong index; @@ -6676,13 +6680,14 @@ zend_op *zend_compile_call_common(znode *result, zend_ast *params_ast, zend_func } zend_bool zend_compile_function_name(znode *name_node, zend_ast *name_ast TSRMLS_DC) { - zend_bool check_namespace = name_ast->attr; - zend_bool is_compound = zend_is_compound_name(zend_ast_get_zval(name_ast)); + zend_string *orig_name = Z_STR_P(zend_ast_get_zval(name_ast)); + zend_bool is_fully_qualified = !name_ast->attr; - zend_compile_expr(name_node, name_ast TSRMLS_CC); - zend_resolve_function_name(name_node, &check_namespace TSRMLS_CC); + name_node->op_type = IS_CONST; + ZVAL_STR(&name_node->u.constant, zend_resolve_function_name( + orig_name, &is_fully_qualified TSRMLS_CC)); - return check_namespace && Z_TYPE(CG(current_namespace)) != IS_UNDEF && !is_compound; + return !is_fully_qualified && Z_TYPE(CG(current_namespace)) != IS_UNDEF; } void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *params_ast TSRMLS_DC) { @@ -6731,7 +6736,7 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { znode name_node; - if (name_ast->kind != ZEND_AST_ZVAL) { + if (name_ast->kind != ZEND_AST_ZVAL || Z_TYPE_P(zend_ast_get_zval(name_ast)) != IS_STRING) { zend_compile_expr(&name_node, name_ast TSRMLS_CC); zend_compile_dynamic_call(result, &name_node, params_ast TSRMLS_CC); return; @@ -7402,33 +7407,34 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; - zend_bool check_namespace = name_ast->attr; + zend_string *orig_name = Z_STR_P(zend_ast_get_zval(name_ast)); + zend_bool is_fully_qualified = !name_ast->attr; - znode name_node; + zval resolved_name; zend_op *opline; - zend_compile_expr(&name_node, name_ast TSRMLS_CC); - zend_resolve_const_name(&name_node, &check_namespace TSRMLS_CC); + ZVAL_STR(&resolved_name, zend_resolve_const_name(orig_name, &is_fully_qualified TSRMLS_CC)); - if (zend_constant_ct_subst(result, &name_node.u.constant, 1 TSRMLS_CC)) { + if (zend_constant_ct_subst(result, &resolved_name, 1 TSRMLS_CC)) { + zval_dtor(&resolved_name); return; } opline = emit_op_tmp(result, ZEND_FETCH_CONSTANT, NULL, NULL TSRMLS_CC); opline->op2_type = IS_CONST; - if (!check_namespace || zend_is_compound_name(zend_ast_get_zval(name_ast))) { + if (is_fully_qualified) { opline->op2.constant = zend_add_const_name_literal( - CG(active_op_array), &name_node.u.constant, 0 TSRMLS_CC); + CG(active_op_array), &resolved_name, 0 TSRMLS_CC); } else { opline->extended_value = IS_CONSTANT_UNQUALIFIED; if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { opline->extended_value |= IS_CONSTANT_IN_NAMESPACE; opline->op2.constant = zend_add_const_name_literal( - CG(active_op_array), &name_node.u.constant, 1 TSRMLS_CC); + CG(active_op_array), &resolved_name, 1 TSRMLS_CC); } else { opline->op2.constant = zend_add_const_name_literal( - CG(active_op_array), &name_node.u.constant, 0 TSRMLS_CC); + CG(active_op_array), &resolved_name, 0 TSRMLS_CC); } } GET_CACHE_SLOT(opline->op2.constant); @@ -7606,31 +7612,29 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; - zend_ast *const_name_ast = ast->child[0]; - zend_bool check_namespace = const_name_ast->attr; + zend_ast *name_ast = ast->child[0]; + zval *orig_name = zend_ast_get_zval(name_ast); + zend_bool is_fully_qualified = !name_ast->attr; - znode const_name, result; - zend_compile_expr(&const_name, const_name_ast TSRMLS_CC); + znode result; + zval resolved_name; - if (zend_constant_ct_subst(&result, &const_name.u.constant, 0 TSRMLS_CC)) { + if (zend_constant_ct_subst(&result, orig_name, 0 TSRMLS_CC)) { zend_ast_destroy(ast); *ast_ptr = zend_ast_create_zval(&result.u.constant); return; } - zend_resolve_const_name(&const_name, &check_namespace TSRMLS_CC); - result = const_name; + ZVAL_STR(&resolved_name, zend_resolve_const_name( + Z_STR_P(orig_name), &is_fully_qualified TSRMLS_CC)); - Z_TYPE_INFO(result.u.constant) = IS_CONSTANT_EX; - if (IS_INTERNED(Z_STR(result.u.constant))) { - Z_TYPE_FLAGS(result.u.constant) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); - } - if (check_namespace && !zend_is_compound_name(zend_ast_get_zval(const_name_ast))) { - Z_CONST_FLAGS(result.u.constant) = IS_CONSTANT_UNQUALIFIED; + Z_TYPE_INFO(resolved_name) = IS_CONSTANT_EX; + if (!is_fully_qualified) { + Z_CONST_FLAGS(resolved_name) = IS_CONSTANT_UNQUALIFIED; } zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_zval(&result.u.constant); + *ast_ptr = zend_ast_create_zval(&resolved_name); } void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 30cd9503e0..90beb839d8 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -456,9 +456,9 @@ ZEND_API zend_string *zend_get_compiled_filename(TSRMLS_D); ZEND_API int zend_get_compiled_lineno(TSRMLS_D); ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D); -void zend_resolve_non_class_name(znode *element_name, zend_bool *check_namespace, zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC); -void zend_resolve_function_name(znode *element_name, zend_bool *check_namespace TSRMLS_DC); -void zend_resolve_const_name(znode *element_name, zend_bool *check_namespace TSRMLS_DC); +zend_string *zend_resolve_non_class_name(zend_string *name, zend_bool *is_fully_qualified, zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC); +zend_string *zend_resolve_function_name(zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC); +zend_string *zend_resolve_const_name(zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC); void zend_resolve_class_name(znode *class_name TSRMLS_DC); ZEND_API zend_string *zend_get_compiled_variable_name(const zend_op_array *op_array, zend_uint var); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index eeffcf610e..e8a49a71b6 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -916,6 +916,21 @@ class_name: | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); $$ = $2; } ; +/* +class_name: + T_STATIC + { ZVAL_STRING(&$1.u.constant, "static"); + $$.u.ast = AST_ZVAL(&$1); } + | namespace_name { $$.u.ast = zend_ast_create_zval_ex(&$1.u.constant, 1); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name + { ZVAL_EMPTY_STRING(&$1.u.constant); + zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); + $$.u.ast = AST_ZVAL(&$1); } + | T_NS_SEPARATOR namespace_name + { $$.u.ast = AST_ZVAL(&$2); } +; +*/ + fully_qualified_class_name: namespace_name { $$ = $1; } | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } -- cgit v1.2.1 From fdc318849a045dc3538667841ba819fbf40a8c0a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 4 Jul 2014 23:08:05 +0200 Subject: Shared name production for const / fn name --- Zend/zend_language_parser.y | 47 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e8a49a71b6..86b8bfd74e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -234,6 +234,17 @@ namespace_name: | namespace_name T_NS_SEPARATOR T_STRING { zend_do_build_namespace_name(&$$, &$1, &$3 TSRMLS_CC); } ; +name: + namespace_name + { $$.u.ast = zend_ast_create_zval_ex(&$1.u.constant, 1); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name + { ZVAL_EMPTY_STRING(&$1.u.constant); + zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); + $$.u.ast = AST_ZVAL(&$1); } + | T_NS_SEPARATOR namespace_name + { $$.u.ast = AST_ZVAL(&$2); } +; + top_statement: statement { zend_verify_namespace(TSRMLS_C); } | function_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } @@ -890,15 +901,8 @@ lexical_var_list: ; function_call: - namespace_name function_call_parameter_list - { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, - zend_ast_create_zval_ex(&$1.u.constant, 1), $2.u.ast); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name function_call_parameter_list - { ZVAL_EMPTY_STRING(&$1.u.constant); - zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); - $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, AST_ZVAL(&$1), $4.u.ast); } - | T_NS_SEPARATOR namespace_name function_call_parameter_list - { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, AST_ZVAL(&$2), $3.u.ast); } + name function_call_parameter_list + { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.u.ast, $2.u.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, AST_ZVAL(&$1), $3.u.ast, $4.u.ast); } @@ -916,21 +920,6 @@ class_name: | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); $$ = $2; } ; -/* -class_name: - T_STATIC - { ZVAL_STRING(&$1.u.constant, "static"); - $$.u.ast = AST_ZVAL(&$1); } - | namespace_name { $$.u.ast = zend_ast_create_zval_ex(&$1.u.constant, 1); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name - { ZVAL_EMPTY_STRING(&$1.u.constant); - zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); - $$.u.ast = AST_ZVAL(&$1); } - | T_NS_SEPARATOR namespace_name - { $$.u.ast = AST_ZVAL(&$2); } -; -*/ - fully_qualified_class_name: namespace_name { $$ = $1; } | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } @@ -1002,15 +991,7 @@ scalar: | dereferencable_scalar { $$.u.ast = $1.u.ast; } | class_name_scalar { $$.u.ast = $1.u.ast; } | class_constant { $$.u.ast = $1.u.ast; } - | namespace_name - { $$.u.ast = zend_ast_create_unary( - ZEND_AST_CONST, zend_ast_create_zval_ex(&$1.u.constant, 1)); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name - { ZVAL_EMPTY_STRING(&$1.u.constant); - zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); - $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$1)); } - | T_NS_SEPARATOR namespace_name - { $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, AST_ZVAL(&$2)); } + | name { $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, $1.u.ast); } ; -- cgit v1.2.1 From b3336270f65df79d92d2f751f4276893d77720e2 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 4 Jul 2014 23:15:31 +0200 Subject: Hack around global leak for now --- Zend/zend_compile.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 239e8f006a..925527e814 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6914,11 +6914,9 @@ void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { } opline = emit_op(&result, ZEND_FETCH_W, &var_node, NULL TSRMLS_CC); - opline->extended_value = ZEND_FETCH_GLOBAL_LOCK; - if (var_node.op_type == IS_CONST) { - //zval_copy_ctor(&var_node.u.constant); - } + // TODO.AST Avoid double fetch + //opline->extended_value = ZEND_FETCH_GLOBAL_LOCK; zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); -- cgit v1.2.1 From 17c2d16d79e6de9da2a4a616b52402299e7ecd3c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 4 Jul 2014 23:45:20 +0200 Subject: Refactor class name resolution as well --- Zend/zend_compile.c | 141 +++++++++++++++++++++----------------------- Zend/zend_compile.h | 4 +- Zend/zend_language_parser.y | 4 +- 3 files changed, 72 insertions(+), 77 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 925527e814..8d5ae82560 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1651,7 +1651,7 @@ void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, } else { cur_arg_info->type_hint = IS_OBJECT; if (ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_type->u.constant), Z_STRLEN(class_type->u.constant))) { - zend_resolve_class_name(class_type TSRMLS_CC); + zend_resolve_class_name_old(class_type TSRMLS_CC); } Z_STR(class_type->u.constant) = zend_new_interned_string(Z_STR(class_type->u.constant) TSRMLS_CC); if (IS_INTERNED(Z_STR(class_type->u.constant))) { @@ -1777,77 +1777,70 @@ zend_string *zend_resolve_const_name( name, is_fully_qualified, 1, CG(current_import_const) TSRMLS_CC); } -void zend_resolve_class_name(znode *class_name TSRMLS_DC) /* {{{ */ -{ +zend_string *zend_resolve_class_name( + zend_string *name, zend_bool is_fully_qualified TSRMLS_DC +) { char *compound; - zend_string *lcname; zval *ns; - znode tmp; - int len; - compound = memchr(Z_STRVAL(class_name->u.constant), '\\', Z_STRLEN(class_name->u.constant)); - if (compound) { - /* This is a compound class name that contains namespace prefix */ - if (Z_STRVAL(class_name->u.constant)[0] == '\\') { - /* The STRING name has "\" prefix */ - memmove(Z_STRVAL(class_name->u.constant), Z_STRVAL(class_name->u.constant)+1, Z_STRLEN(class_name->u.constant)); - Z_STR(class_name->u.constant) = STR_REALLOC( - Z_STR(class_name->u.constant), - Z_STRLEN(class_name->u.constant) - 1, 0); - Z_TYPE_FLAGS(class_name->u.constant) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE; - - if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant))) { - zend_error_noreturn(E_COMPILE_ERROR, "'\\%s' is an invalid class name", Z_STRVAL(class_name->u.constant)); - } + if (is_fully_qualified || name->val[0] == '\\') { + /* Remove \ prefix (only relevant if this is a string rather than a label) */ + if (name->val[0] == '\\') { + name = STR_INIT(name->val + 1, name->len - 1, 0); } else { - if (CG(current_import)) { - len = compound - Z_STRVAL(class_name->u.constant); - lcname = STR_ALLOC(len, 0); - zend_str_tolower_copy(lcname->val, Z_STRVAL(class_name->u.constant), len); - /* Check if first part of compound name is an import name */ - if ((ns = zend_hash_find(CG(current_import), lcname)) != NULL) { - /* Substitute import name */ - tmp.op_type = IS_CONST; - ZVAL_DUP(&tmp.u.constant, ns); - len += 1; - Z_STRLEN(class_name->u.constant) -= len; - memmove(Z_STRVAL(class_name->u.constant), Z_STRVAL(class_name->u.constant)+len, Z_STRLEN(class_name->u.constant)+1); - zend_do_build_namespace_name(&tmp, &tmp, class_name TSRMLS_CC); - *class_name = tmp; - STR_FREE(lcname); - return; - } - STR_FREE(lcname); + STR_ADDREF(name); + } + /* Ensure that \self, \parent and \static are not used */ + if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name->val, name->len)) { + zend_error_noreturn(E_COMPILE_ERROR, "'\\%s' is an invalid class name", name->val); + } + return name; + } + + if (CG(current_import)) { + compound = memchr(name->val, '\\', name->len); + if (compound) { + /* If the first part of a qualified name is an alias, substitute it. */ + size_t len = compound - name->val; + zend_string *lcname = STR_ALLOC(len, 0); + zend_str_tolower_copy(lcname->val, name->val, len); + + ns = zend_hash_find(CG(current_import), lcname); + STR_FREE(lcname); + + if (ns) { + return zend_concat_names( + Z_STRVAL_P(ns), Z_STRLEN_P(ns), name->val + len + 1, name->len - len - 1); } - /* Here name is not prefixed with \ and not imported */ - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - tmp.op_type = IS_CONST; - ZVAL_DUP(&tmp.u.constant, &CG(current_namespace)); - zend_do_build_namespace_name(&tmp, &tmp, class_name TSRMLS_CC); - *class_name = tmp; + } else { + /* If an unqualified name is an alias, replace it. */ + zend_string *lcname = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lcname->val, name->val, name->len); + + ns = zend_hash_find(CG(current_import), lcname); + STR_FREE(lcname); + + if (ns) { + return STR_COPY(Z_STR_P(ns)); } } - } else if (CG(current_import) || Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - /* this is a plain name (without \) */ - lcname = STR_ALLOC(Z_STRLEN(class_name->u.constant), 0); - zend_str_tolower_copy(lcname->val, Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant)); + } - if (CG(current_import) && - (ns = zend_hash_find(CG(current_import), lcname)) != NULL) { - /* The given name is an import name. Substitute it. */ - zval_dtor(&class_name->u.constant); - ZVAL_DUP(&class_name->u.constant, ns); - } else if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - /* plain name, no import - prepend current namespace to it */ - tmp.op_type = IS_CONST; - ZVAL_DUP(&tmp.u.constant, &CG(current_namespace)); - zend_do_build_namespace_name(&tmp, &tmp, class_name TSRMLS_CC); - *class_name = tmp; - } - STR_FREE(lcname); + /* If not fully qualified and not an alias, prepend the current namespace */ + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + return zend_concat_names( + Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); } + + return STR_COPY(name); +} + +void zend_resolve_class_name_old(znode *class_name TSRMLS_DC) { + zend_string *resolved_name = zend_resolve_class_name( + Z_STR(class_name->u.constant), 0 TSRMLS_CC); + zval_dtor(&class_name->u.constant); + ZVAL_STR(&class_name->u.constant, resolved_name); } -/* }}} */ void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC) /* {{{ */ { @@ -1874,7 +1867,7 @@ void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC) /* {{{ */ zval_dtor(&class_name->u.constant); break; default: - zend_resolve_class_name(class_name TSRMLS_CC); + zend_resolve_class_name_old(class_name TSRMLS_CC); opline->op2_type = IS_CONST; opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), &class_name->u.constant TSRMLS_CC); @@ -2280,7 +2273,7 @@ void zend_do_begin_catch(znode *catch_token, znode *class_name, znode *catch_var if (class_name->op_type == IS_CONST && ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant))) { - zend_resolve_class_name(class_name TSRMLS_CC); + zend_resolve_class_name_old(class_name TSRMLS_CC); catch_class = *class_name; } else { zend_error_noreturn(E_COMPILE_ERROR, "Bad class name in the catch statement"); @@ -3952,7 +3945,7 @@ void zend_prepare_reference(znode *result, znode *class_name, znode *method_name /* REM: There should not be a need for copying, zend_do_begin_class_declaration is also just using that string */ if (class_name) { - zend_resolve_class_name(class_name TSRMLS_CC); + zend_resolve_class_name_old(class_name TSRMLS_CC); method_ref->class_name = Z_STR(class_name->u.constant); } else { method_ref->class_name = NULL; @@ -4564,7 +4557,7 @@ void zend_do_implements_interface(znode *interface_name TSRMLS_DC) /* {{{ */ opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_ADD_INTERFACE; SET_NODE(opline->op1, &CG(implementing_class)); - zend_resolve_class_name(interface_name TSRMLS_CC); + zend_resolve_class_name_old(interface_name TSRMLS_CC); opline->extended_value = (opline->extended_value & ~ZEND_FETCH_CLASS_MASK) | ZEND_FETCH_CLASS_INTERFACE; opline->op2_type = IS_CONST; opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), &interface_name->u.constant TSRMLS_CC); @@ -4596,7 +4589,7 @@ void zend_do_use_trait(znode *trait_name TSRMLS_DC) /* {{{ */ opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_ADD_TRAIT; SET_NODE(opline->op1, &CG(implementing_class)); - zend_resolve_class_name(trait_name TSRMLS_CC); + zend_resolve_class_name_old(trait_name TSRMLS_CC); opline->extended_value = ZEND_FETCH_CLASS_TRAIT; opline->op2_type = IS_CONST; opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), &trait_name->u.constant TSRMLS_CC); @@ -6147,7 +6140,7 @@ static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_ zval_ptr_dtor(name); break; default: - zend_resolve_class_name(&name_node TSRMLS_CC); + zend_resolve_class_name_old(&name_node TSRMLS_CC); opline->op2_type = IS_CONST; opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), name TSRMLS_CC); @@ -6307,7 +6300,7 @@ zend_op *zend_compile_static_prop_common(znode *result, zend_ast *ast, int type if (zend_is_const_default_class_ref(class_ast)) { zend_compile_expr(&class_node, class_ast TSRMLS_CC); - zend_resolve_class_name(&class_node TSRMLS_CC); + zend_resolve_class_name_old(&class_node TSRMLS_CC); } else { zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); } @@ -6828,7 +6821,7 @@ void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) if (zend_is_const_default_class_ref(class_ast)) { zend_compile_expr(&class_node, class_ast TSRMLS_CC); - zend_resolve_class_name(&class_node TSRMLS_CC); + zend_resolve_class_name_old(&class_node TSRMLS_CC); } else { opline = zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); extended_value = opline->extended_value; @@ -7447,7 +7440,7 @@ void zend_compile_class_const(znode *result, zend_ast *ast TSRMLS_DC) { if (zend_is_const_default_class_ref(class_ast)) { zend_compile_expr(&class_node, class_ast TSRMLS_CC); - zend_resolve_class_name(&class_node TSRMLS_CC); + zend_resolve_class_name_old(&class_node TSRMLS_CC); } else { zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); } @@ -7502,7 +7495,7 @@ void zend_compile_resolve_class_name(znode *result, zend_ast *ast TSRMLS_DC) { break; case ZEND_FETCH_CLASS_DEFAULT: zend_compile_expr(result, name_ast TSRMLS_CC); - zend_resolve_class_name(result TSRMLS_CC); + zend_resolve_class_name_old(result TSRMLS_CC); break; EMPTY_SWITCH_DEFAULT_CASE() } @@ -7592,7 +7585,7 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "\"static::\" is not allowed in compile-time constants"); } else if (ZEND_FETCH_CLASS_DEFAULT == fetch_type) { - zend_resolve_class_name(&class_name TSRMLS_CC); + zend_resolve_class_name_old(&class_name TSRMLS_CC); } zend_do_build_full_name(NULL, &class_name, &const_name, 1 TSRMLS_CC); @@ -7659,7 +7652,7 @@ void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { break; case ZEND_FETCH_CLASS_DEFAULT: zend_compile_expr(&result, name_ast TSRMLS_CC); - zend_resolve_class_name(&result TSRMLS_CC); + zend_resolve_class_name_old(&result TSRMLS_CC); break; EMPTY_SWITCH_DEFAULT_CASE() } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 90beb839d8..d0365ac6c4 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -459,9 +459,11 @@ ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D); zend_string *zend_resolve_non_class_name(zend_string *name, zend_bool *is_fully_qualified, zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC); zend_string *zend_resolve_function_name(zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC); zend_string *zend_resolve_const_name(zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC); -void zend_resolve_class_name(znode *class_name TSRMLS_DC); +zend_string *zend_resolve_class_name(zend_string *name, zend_bool is_fully_qualified TSRMLS_DC); ZEND_API zend_string *zend_get_compiled_variable_name(const zend_op_array *op_array, zend_uint var); +void zend_resolve_class_name_old(znode *class_name TSRMLS_DC); + #ifdef ZTS const char *zend_get_zendtext(TSRMLS_D); int zend_get_zendleng(TSRMLS_D); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 86b8bfd74e..2580c585bc 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -676,8 +676,8 @@ trait_precedence: ; trait_reference_list: - fully_qualified_class_name { zend_resolve_class_name(&$1 TSRMLS_CC); zend_init_list(&$$.u.op.ptr, Z_STR($1.u.constant) TSRMLS_CC); } - | trait_reference_list ',' fully_qualified_class_name { zend_resolve_class_name(&$3 TSRMLS_CC); zend_add_to_list(&$1.u.op.ptr, Z_STR($3.u.constant) TSRMLS_CC); $$ = $1; } + fully_qualified_class_name { zend_resolve_class_name_old(&$1 TSRMLS_CC); zend_init_list(&$$.u.op.ptr, Z_STR($1.u.constant) TSRMLS_CC); } + | trait_reference_list ',' fully_qualified_class_name { zend_resolve_class_name_old(&$3 TSRMLS_CC); zend_add_to_list(&$1.u.op.ptr, Z_STR($3.u.constant) TSRMLS_CC); $$ = $1; } ; trait_method_reference: -- cgit v1.2.1 From 77fddc0ca2682b70ea8a03c0c7db09018e494829 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 5 Jul 2014 00:11:00 +0200 Subject: Use zend_string* in some places --- Zend/zend_compile.c | 83 +++++++++++++++++++++++------------------------------ 1 file changed, 36 insertions(+), 47 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8d5ae82560..c407a744f8 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1413,7 +1413,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n } else { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); zval key; - zval *ns_name; + zend_string *ns_name; if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { /* Prefix function name with current namespace name */ @@ -1431,11 +1431,11 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n /* Function name must not conflict with import names */ if (CG(current_import_function) && - (ns_name = zend_hash_find(CG(current_import_function), lcname)) != NULL) { + (ns_name = zend_hash_find_ptr(CG(current_import_function), lcname)) != NULL) { - char *tmp = zend_str_tolower_dup(Z_STRVAL_P(ns_name), Z_STRLEN_P(ns_name)); + char *tmp = zend_str_tolower_dup(ns_name->val, ns_name->len); - if (Z_STRLEN_P(ns_name) != Z_STRLEN(function_name->u.constant) || + if (ns_name->len != Z_STRLEN(function_name->u.constant) || memcmp(tmp, lcname->val, Z_STRLEN(function_name->u.constant))) { zend_error(E_COMPILE_ERROR, "Cannot declare function %s because the name is already in use", Z_STRVAL(function_name->u.constant)); } @@ -1694,17 +1694,24 @@ zend_string *zend_concat_names(char *name1, size_t name1_len, char *name2, size_ return res; } -/* }}} */ + +void *zend_hash_find_ptr_lc(HashTable *ht, char *str, size_t len) { + void *result; + zend_string *lcname = STR_ALLOC(len, 0); + zend_str_tolower_copy(lcname->val, str, len); + result = zend_hash_find_ptr(ht, lcname); + STR_FREE(lcname); + return result; +} zend_string *zend_resolve_non_class_name( zend_string *name, zend_bool *is_fully_qualified, zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC ) { char *compound; - zval *ns; if (name->val[0] == '\\') { - /* Canonical form does not have a \ prefix */ + /* Remove \ prefix (only relevant if this is a string rather than a label) */ return STR_INIT(name->val + 1, name->len - 1, 0); } @@ -1713,22 +1720,17 @@ zend_string *zend_resolve_non_class_name( } if (current_import_sub) { - zend_string *lookup_name; - + /* If an unqualified name is a function/const alias, replace it. */ + zend_string *import_name; if (case_sensitive) { - lookup_name = STR_COPY(name); + import_name = zend_hash_find_ptr(current_import_sub, name); } else { - lookup_name = STR_ALLOC(name->len, 0); - zend_str_tolower_copy(lookup_name->val, name->val, name->len); + import_name = zend_hash_find_ptr_lc(current_import_sub, name->val, name->len); } - /* Check if function/const matches imported name */ - ns = zend_hash_find(current_import_sub, lookup_name); - STR_RELEASE(lookup_name); - - if (ns) { + if (import_name) { *is_fully_qualified = 1; - return STR_COPY(Z_STR_P(ns)); + return STR_COPY(import_name); } } @@ -1738,19 +1740,13 @@ zend_string *zend_resolve_non_class_name( } if (compound && CG(current_import)) { - /* namespace is always lowercase */ + /* If the first part of a qualified name is an alias, substitute it. */ size_t len = compound - name->val; - zend_string *lookup_name = STR_ALLOC(len, 0); - zend_str_tolower_copy(lookup_name->val, name->val, len); + zend_string *import_name = zend_hash_find_ptr_lc(CG(current_import), name->val, len); - /* Check if first part of compound name is an import name */ - ns = zend_hash_find(CG(current_import), lookup_name); - STR_FREE(lookup_name); - - if (ns) { - /* Substitute import name */ + if (import_name) { return zend_concat_names( - Z_STRVAL_P(ns), Z_STRLEN_P(ns), name->val + len + 1, name->len - len - 1); + import_name->val, import_name->len, name->val + len + 1, name->len - len - 1); } } @@ -1781,7 +1777,6 @@ zend_string *zend_resolve_class_name( zend_string *name, zend_bool is_fully_qualified TSRMLS_DC ) { char *compound; - zval *ns; if (is_fully_qualified || name->val[0] == '\\') { /* Remove \ prefix (only relevant if this is a string rather than a label) */ @@ -1802,26 +1797,19 @@ zend_string *zend_resolve_class_name( if (compound) { /* If the first part of a qualified name is an alias, substitute it. */ size_t len = compound - name->val; - zend_string *lcname = STR_ALLOC(len, 0); - zend_str_tolower_copy(lcname->val, name->val, len); - - ns = zend_hash_find(CG(current_import), lcname); - STR_FREE(lcname); + zend_string *import_name = zend_hash_find_ptr_lc(CG(current_import), name->val, len); - if (ns) { + if (import_name) { return zend_concat_names( - Z_STRVAL_P(ns), Z_STRLEN_P(ns), name->val + len + 1, name->len - len - 1); + import_name->val, import_name->len, name->val + len + 1, name->len - len - 1); } } else { /* If an unqualified name is an alias, replace it. */ - zend_string *lcname = STR_ALLOC(name->len, 0); - zend_str_tolower_copy(lcname->val, name->val, name->len); - - ns = zend_hash_find(CG(current_import), lcname); - STR_FREE(lcname); + zend_string *import_name + = zend_hash_find_ptr_lc(CG(current_import), name->val, name->len); - if (ns) { - return STR_COPY(Z_STR_P(ns)); + if (import_name) { + return STR_COPY(import_name); } } } @@ -4356,7 +4344,8 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name zend_class_entry *new_class_entry; zend_string *lcname; int error = 0; - zval *ns_name, key; + zend_string *ns_name; + zval key; if (CG(active_class_entry)) { zend_error_noreturn(E_COMPILE_ERROR, "Class declarations may not be nested"); @@ -4373,7 +4362,7 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name /* Class name must not conflict with import names */ if (CG(current_import) && - (ns_name = zend_hash_find(CG(current_import), lcname)) != NULL) { + (ns_name = zend_hash_find_ptr(CG(current_import), lcname)) != NULL) { error = 1; } @@ -4391,9 +4380,9 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name } if (error) { - char *tmp = zend_str_tolower_dup(Z_STRVAL_P(ns_name), Z_STRLEN_P(ns_name)); + char *tmp = zend_str_tolower_dup(ns_name->val, ns_name->len); - if (Z_STRLEN_P(ns_name) != Z_STRLEN(class_name->u.constant) || + if (ns_name->len != Z_STRLEN(class_name->u.constant) || memcmp(tmp, lcname->val, Z_STRLEN(class_name->u.constant))) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare class %s because the name is already in use", Z_STRVAL(class_name->u.constant)); } -- cgit v1.2.1 From 36c3cf3198a0ac9394af09c985fe71cfc0803cbf Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 7 Jul 2014 21:06:02 +0200 Subject: Port return statement --- Zend/zend_ast.h | 39 +++++++++++++++--------------- Zend/zend_compile.c | 58 +++++++++++++++++++++++++++++++++++++++++++-- Zend/zend_language_parser.y | 7 +++--- 3 files changed, 79 insertions(+), 25 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 2d12ed26bd..b3d6969867 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -37,17 +37,25 @@ enum _zend_ast_kind { ZEND_AST_CALL, ZEND_AST_METHOD_CALL, ZEND_AST_STATIC_CALL, + ZEND_AST_PARAMS, + ZEND_AST_UNPACK, + + ZEND_AST_CONST, + ZEND_AST_CLASS_CONST, + ZEND_AST_RESOLVE_CLASS_NAME, ZEND_AST_ASSIGN, ZEND_AST_ASSIGN_REF, + ZEND_AST_ASSIGN_OP, ZEND_AST_LIST, - ZEND_AST_GLOBAL, - ZEND_AST_UNSET, - ZEND_AST_PARAMS, - ZEND_AST_UNPACK, - - ZEND_AST_ASSIGN_OP, + ZEND_AST_UNARY_PLUS, + ZEND_AST_UNARY_MINUS, + ZEND_AST_CAST, + ZEND_AST_EMPTY, + ZEND_AST_ISSET, + ZEND_AST_SILENCE, + ZEND_AST_SHELL_EXEC, ZEND_AST_BINARY_OP, ZEND_AST_GREATER, @@ -55,25 +63,15 @@ enum _zend_ast_kind { ZEND_AST_AND, ZEND_AST_OR, - ZEND_AST_UNARY_PLUS, - ZEND_AST_UNARY_MINUS, - ZEND_AST_CAST, - ZEND_AST_CONDITIONAL, - ZEND_AST_EMPTY, - ZEND_AST_ISSET, - - ZEND_AST_SILENCE, - ZEND_AST_SHELL_EXEC, ZEND_AST_ARRAY, ZEND_AST_ARRAY_ELEM, - - ZEND_AST_CONST, - ZEND_AST_CLASS_CONST, - ZEND_AST_RESOLVE_CLASS_NAME, - ZEND_AST_ENCAPS_LIST, + + ZEND_AST_GLOBAL, + ZEND_AST_UNSET, + ZEND_AST_RETURN, }; typedef unsigned short zend_ast_kind; @@ -167,6 +165,7 @@ static inline zend_ast *zend_ast_create_assign_op(zend_uint opcode, zend_ast *op #define AST_ZVAL(znode) zend_ast_create_zval(&(znode)->u.constant) #define AC(znode) AST_COMPILE(&znode, znode.u.ast) +#define AS(znode) AST_COMPILE_STMT(znode.u.ast) #define AZ(znode) ((znode).u.ast = AST_ZNODE(&znode)) #endif diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index c407a744f8..e64ba51320 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6886,7 +6886,6 @@ void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; znode var_node, result; - zend_op *opline; zend_compile_expr(&var_node, var_ast TSRMLS_CC); if (var_node.op_type == IS_CONST) { @@ -6895,7 +6894,7 @@ void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { } } - opline = emit_op(&result, ZEND_FETCH_W, &var_node, NULL TSRMLS_CC); + emit_op(&result, ZEND_FETCH_W, &var_node, NULL TSRMLS_CC); // TODO.AST Avoid double fetch //opline->extended_value = ZEND_FETCH_GLOBAL_LOCK; @@ -6936,6 +6935,58 @@ void zend_compile_unset(zend_ast *ast TSRMLS_DC) { } } +static void zend_free_foreach_and_switch_variables(TSRMLS_D) { + zend_uint opnum_start, opnum_end, i; + + opnum_start = get_next_op_number(CG(active_op_array)); + +#ifdef ZTS + zend_stack_apply_with_argument(&CG(switch_cond_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element, void *)) generate_free_switch_expr TSRMLS_CC); + zend_stack_apply_with_argument(&CG(foreach_copy_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element, void *)) generate_free_foreach_copy TSRMLS_CC); +#else + zend_stack_apply(&CG(switch_cond_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element)) generate_free_switch_expr); + zend_stack_apply(&CG(foreach_copy_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element)) generate_free_foreach_copy); +#endif + + opnum_end = get_next_op_number(CG(active_op_array)); + + for (i = opnum_start; i < opnum_end; ++i) { + CG(active_op_array)->opcodes[i].extended_value |= EXT_TYPE_FREE_ON_RETURN; + } +} + +void zend_compile_return(zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + zend_bool by_ref = (CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0; + + znode expr_node; + zend_op *opline; + + if (!expr_ast) { + expr_node.op_type = IS_CONST; + ZVAL_NULL(&expr_node.u.constant); + } else if (by_ref && zend_is_variable(expr_ast) && !zend_is_call(expr_ast)) { + zend_compile_var(&expr_node, expr_ast, BP_VAR_REF TSRMLS_CC); + } else { + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + } + + zend_free_foreach_and_switch_variables(TSRMLS_C); + + if (CG(context).in_finally) { + emit_op(NULL, ZEND_DISCARD_EXCEPTION, NULL, NULL TSRMLS_CC); + } + + opline = emit_op(NULL, by_ref ? ZEND_RETURN_BY_REF : ZEND_RETURN, &expr_node, NULL TSRMLS_CC); + if (expr_ast) { + if (zend_is_call(expr_ast)) { + opline->extended_value = ZEND_RETURNS_FUNCTION; + } else if (!zend_is_variable(expr_ast)) { + opline->extended_value = ZEND_RETURNS_VALUE; + } + } +} + 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]; @@ -7688,6 +7739,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_UNSET: zend_compile_unset(ast TSRMLS_CC); return; + case ZEND_AST_RETURN: + zend_compile_return(ast TSRMLS_CC); + return; EMPTY_SWITCH_DEFAULT_CASE() } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 2580c585bc..1ed1510136 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -341,9 +341,10 @@ unticked_statement: | T_BREAK expr ';' { AC($2); zend_do_brk_cont(ZEND_BRK, &$2 TSRMLS_CC); } | T_CONTINUE ';' { zend_do_brk_cont(ZEND_CONT, NULL TSRMLS_CC); } | T_CONTINUE expr ';' { AC($2); zend_do_brk_cont(ZEND_CONT, &$2 TSRMLS_CC); } - | T_RETURN ';' { zend_do_return(NULL, 0 TSRMLS_CC); } - | T_RETURN expr_without_variable ';' { AC($2); zend_do_return(&$2, 0 TSRMLS_CC); } - | T_RETURN variable ';' { zend_do_return(&$2, 1 TSRMLS_CC); } + | T_RETURN ';' + { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, NULL); AS($$); } + | T_RETURN expr ';' + { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, $2.u.ast); AS($$); } | T_GLOBAL global_var_list ';' | T_STATIC static_var_list ';' | T_ECHO echo_expr_list ';' -- cgit v1.2.1 From 289265402a5cc2e3aa262421ad1a3565a87fcc62 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 7 Jul 2014 21:14:14 +0200 Subject: Port echo --- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 22 ++++++++++++---------- Zend/zend_compile.h | 1 - Zend/zend_language_parser.y | 10 ++++++---- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index b3d6969867..8904d90a97 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -72,6 +72,7 @@ enum _zend_ast_kind { ZEND_AST_GLOBAL, ZEND_AST_UNSET, ZEND_AST_RETURN, + ZEND_AST_ECHO, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e64ba51320..4a19f74d31 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -627,16 +627,6 @@ void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC) /* { } /* }}} */ -void zend_do_echo(znode *arg TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_ECHO; - SET_NODE(opline->op1, arg); - SET_UNUSED(opline->op2); -} -/* }}} */ - void zend_do_abstract_method(const znode *function_name, znode *modifiers, const znode *body TSRMLS_DC) /* {{{ */ { char *method_type; @@ -6987,6 +6977,15 @@ void zend_compile_return(zend_ast *ast TSRMLS_DC) { } } +void zend_compile_echo(zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + + znode expr_node; + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + emit_op(NULL, ZEND_ECHO, &expr_node, NULL TSRMLS_CC); +} + 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]; @@ -7742,6 +7741,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_RETURN: zend_compile_return(ast TSRMLS_CC); return; + case ZEND_AST_ECHO: + zend_compile_echo(ast TSRMLS_CC); + return; EMPTY_SWITCH_DEFAULT_CASE() } } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index d0365ac6c4..c7d3e06a83 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -478,7 +478,6 @@ void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC); void zend_do_fetch_global_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC); -void zend_do_echo(znode *arg TSRMLS_DC); typedef int (*unary_op_type)(zval *, zval * TSRMLS_DC); typedef int (*binary_op_type)(zval *, zval *, zval * TSRMLS_DC); ZEND_API unary_op_type get_unary_op(int opcode); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1ed1510136..9091886422 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -348,7 +348,7 @@ unticked_statement: | T_GLOBAL global_var_list ';' | T_STATIC static_var_list ';' | T_ECHO echo_expr_list ';' - | T_INLINE_HTML { zend_do_echo(&$1 TSRMLS_CC); } + | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_AST_ECHO, AST_ZVAL(&$1)); AS($$); } | expr ';' { AC($1); zend_do_free(&$1 TSRMLS_CC); } | T_UNSET '(' unset_variables ')' ';' | T_FOREACH '(' variable T_AS @@ -742,10 +742,12 @@ class_constant_declaration: ; echo_expr_list: - echo_expr_list ',' expr { AC($3); zend_do_echo(&$3 TSRMLS_CC); } - | expr { AC($1); zend_do_echo(&$1 TSRMLS_CC); } + echo_expr_list ',' echo_expr + | echo_expr +; +echo_expr: + expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_ECHO, $1.u.ast); AS($$); } ; - for_expr: /* empty */ { $$.op_type = IS_CONST; ZVAL_BOOL(&$$.u.constant, 1); } -- cgit v1.2.1 From 5bf0c28fe32ea3bf6e7f5c6271b3ce6c68805af0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 9 Jul 2014 22:47:36 +0200 Subject: Port throw --- Zend/zend_ast.h | 1 - Zend/zend_compile.c | 14 +++++++++++++- Zend/zend_language_parser.y | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 8904d90a97..b3d6969867 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -72,7 +72,6 @@ enum _zend_ast_kind { ZEND_AST_GLOBAL, ZEND_AST_UNSET, ZEND_AST_RETURN, - ZEND_AST_ECHO, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4a19f74d31..aefd99bbd3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6986,6 +6986,15 @@ void zend_compile_echo(zend_ast *ast TSRMLS_DC) { emit_op(NULL, ZEND_ECHO, &expr_node, NULL TSRMLS_CC); } +void zend_compile_throw(zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + + znode expr_node; + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + emit_op(NULL, ZEND_THROW, &expr_node, NULL TSRMLS_CC); +} + 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]; @@ -7741,9 +7750,12 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_RETURN: zend_compile_return(ast TSRMLS_CC); return; - case ZEND_AST_ECHO: + case ZEND_ECHO: zend_compile_echo(ast TSRMLS_CC); return; + case ZEND_THROW: + zend_compile_throw(ast TSRMLS_CC); + return; EMPTY_SWITCH_DEFAULT_CASE() } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 9091886422..1e3153121d 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -348,7 +348,7 @@ unticked_statement: | T_GLOBAL global_var_list ';' | T_STATIC static_var_list ';' | T_ECHO echo_expr_list ';' - | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_AST_ECHO, AST_ZVAL(&$1)); AS($$); } + | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, AST_ZVAL(&$1)); AS($$); } | expr ';' { AC($1); zend_do_free(&$1 TSRMLS_CC); } | T_UNSET '(' unset_variables ')' ';' | T_FOREACH '(' variable T_AS @@ -364,7 +364,7 @@ unticked_statement: | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' catch_statement { zend_do_bind_catch(&$1, &$6 TSRMLS_CC); } finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); } - | T_THROW expr ';' { AC($2); zend_do_throw(&$2 TSRMLS_CC); } + | T_THROW expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_THROW, $2.u.ast); AS($$); } | T_GOTO T_STRING ';' { zend_do_goto(&$2 TSRMLS_CC); } ; @@ -746,7 +746,7 @@ echo_expr_list: | echo_expr ; echo_expr: - expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_ECHO, $1.u.ast); AS($$); } + expr { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, $1.u.ast); AS($$); } ; for_expr: -- cgit v1.2.1 From cc8a6fa91e1bde6fbaf0be397b634405551e9bdc Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 9 Jul 2014 23:05:21 +0200 Subject: Port break/continue --- Zend/zend_compile.c | 34 ++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 8 ++++---- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index aefd99bbd3..f198e429ab 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6995,6 +6995,36 @@ void zend_compile_throw(zend_ast *ast TSRMLS_DC) { emit_op(NULL, ZEND_THROW, &expr_node, NULL TSRMLS_CC); } +void zend_compile_break_continue(zend_ast *ast TSRMLS_DC) { + zend_ast *depth_ast = ast->child[0]; + zend_uint opcode = ast->kind; + + znode depth_node; + zend_op *opline; + + ZEND_ASSERT(opcode == ZEND_BRK || opcode == ZEND_CONT); + + if (depth_ast) { + if (depth_ast->kind != ZEND_AST_ZVAL) { + zend_error_noreturn(E_COMPILE_ERROR, "'%s' operator with non-constant operand " + "is no longer supported", opcode == ZEND_BRK ? "break" : "continue"); + } + + zend_compile_expr(&depth_node, depth_ast TSRMLS_CC); + + if (Z_TYPE(depth_node.u.constant) != IS_LONG || Z_LVAL(depth_node.u.constant) < 1) { + zend_error_noreturn(E_COMPILE_ERROR, "'%s' operator accepts only positive numbers", + opcode == ZEND_BRK ? "break" : "continue"); + } + } else { + depth_node.op_type = IS_CONST; + ZVAL_LONG(&depth_node.u.constant, 1); + } + + opline = emit_op(NULL, opcode, NULL, &depth_node TSRMLS_CC); + opline->op1.opline_num = CG(context).current_brk_cont; +} + 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]; @@ -7756,6 +7786,10 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_THROW: zend_compile_throw(ast TSRMLS_CC); return; + case ZEND_BRK: + case ZEND_CONT: + zend_compile_break_continue(ast TSRMLS_CC); + return; EMPTY_SWITCH_DEFAULT_CASE() } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1e3153121d..1e15c04b39 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -337,10 +337,10 @@ unticked_statement: ')' { zend_do_free(&$9 TSRMLS_CC); zend_do_for_before_statement(&$4, &$7 TSRMLS_CC); } for_statement { zend_do_for_end(&$7 TSRMLS_CC); } | T_SWITCH parenthesis_expr { AC($2); zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); } - | T_BREAK ';' { zend_do_brk_cont(ZEND_BRK, NULL TSRMLS_CC); } - | T_BREAK expr ';' { AC($2); zend_do_brk_cont(ZEND_BRK, &$2 TSRMLS_CC); } - | T_CONTINUE ';' { zend_do_brk_cont(ZEND_CONT, NULL TSRMLS_CC); } - | T_CONTINUE expr ';' { AC($2); zend_do_brk_cont(ZEND_CONT, &$2 TSRMLS_CC); } + | T_BREAK ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, NULL); AS($$); } + | T_BREAK expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, $2.u.ast); AS($$); } + | T_CONTINUE ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, NULL); AS($$); } + | T_CONTINUE expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, $2.u.ast); AS($$); } | T_RETURN ';' { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, NULL); AS($$); } | T_RETURN expr ';' -- cgit v1.2.1 From fc541418f2f77a56409e5d02a86e42bfa8a4ee44 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 9 Jul 2014 23:11:32 +0200 Subject: Port goto --- Zend/zend_compile.c | 14 ++++++++++++++ Zend/zend_language_parser.y | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f198e429ab..4d893f777e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7025,6 +7025,17 @@ void zend_compile_break_continue(zend_ast *ast TSRMLS_DC) { opline->op1.opline_num = CG(context).current_brk_cont; } +void zend_compile_goto(zend_ast *ast TSRMLS_DC) { + zend_ast *label_ast = ast->child[0]; + znode label_node; + zend_op *opline; + + zend_compile_expr(&label_node, label_ast TSRMLS_CC); + opline = emit_op(NULL, ZEND_GOTO, NULL, &label_node TSRMLS_CC); + opline->extended_value = CG(context).current_brk_cont; + zend_resolve_goto_label(CG(active_op_array), opline, 0 TSRMLS_CC); +} + 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]; @@ -7790,6 +7801,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_CONT: zend_compile_break_continue(ast TSRMLS_CC); return; + case ZEND_GOTO: + zend_compile_goto(ast TSRMLS_CC); + return; EMPTY_SWITCH_DEFAULT_CASE() } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1e15c04b39..dbecd9da4a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -365,7 +365,7 @@ unticked_statement: catch_statement { zend_do_bind_catch(&$1, &$6 TSRMLS_CC); } finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); } | T_THROW expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_THROW, $2.u.ast); AS($$); } - | T_GOTO T_STRING ';' { zend_do_goto(&$2 TSRMLS_CC); } + | T_GOTO T_STRING ';' { $$.u.ast = zend_ast_create_unary(ZEND_GOTO, AST_ZVAL(&$2)); AS($$); } ; catch_statement: -- cgit v1.2.1 From d14b763bb9d7ed380c49458f31e6537aff554398 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 9 Jul 2014 23:39:21 +0200 Subject: Make unticked_statement an ast node (usually NULL) --- Zend/zend_ast.h | 5 +++- Zend/zend_compile.c | 14 +++++++++ Zend/zend_language_parser.y | 73 ++++++++++++++++++++++----------------------- 3 files changed, 54 insertions(+), 38 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index b3d6969867..12d51dc137 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -69,6 +69,8 @@ enum _zend_ast_kind { ZEND_AST_ARRAY_ELEM, ZEND_AST_ENCAPS_LIST, + ZEND_AST_STMT_LIST, + ZEND_AST_GLOBAL, ZEND_AST_UNSET, ZEND_AST_RETURN, @@ -158,7 +160,7 @@ static inline zend_ast *zend_ast_create_assign_op(zend_uint opcode, zend_ast *op #define AST_COMPILE_STMT(ast) do { \ zend_ast *_ast = (ast); \ zend_compile_stmt(_ast TSRMLS_CC); \ - zend_ast_destroy(_ast); \ + if (_ast) zend_ast_destroy(_ast); \ } while (0) #define AST_ZNODE(znode) zend_ast_create_znode((znode)) @@ -167,5 +169,6 @@ static inline zend_ast *zend_ast_create_assign_op(zend_uint opcode, zend_ast *op #define AC(znode) AST_COMPILE(&znode, znode.u.ast) #define AS(znode) AST_COMPILE_STMT(znode.u.ast) #define AZ(znode) ((znode).u.ast = AST_ZNODE(&znode)) +#define AN(znode) ((znode).u.ast = NULL) #endif diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4d893f777e..664883657a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7036,6 +7036,13 @@ void zend_compile_goto(zend_ast *ast TSRMLS_DC) { zend_resolve_goto_label(CG(active_op_array), opline, 0 TSRMLS_CC); } +void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { + zend_uint i; + for (i = 0; i < ast->children; ++i) { + zend_compile_stmt(ast->child[i] TSRMLS_CC); + } +} + 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]; @@ -7781,7 +7788,14 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { } void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { + if (!ast) { + return; + } + switch (ast->kind) { + case ZEND_AST_STMT_LIST: + zend_compile_stmt_list(ast TSRMLS_CC); + return; case ZEND_AST_GLOBAL: zend_compile_global_var(ast TSRMLS_CC); return; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index dbecd9da4a..2743288676 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -317,16 +317,16 @@ inner_statement: statement: - unticked_statement { DO_TICKS(); } + unticked_statement { AS($$); DO_TICKS(); } | T_STRING ':' { zend_do_label(&$1 TSRMLS_CC); } ; unticked_statement: - '{' inner_statement_list '}' - | T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); } - | T_IF parenthesis_expr ':' { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); } - | T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { AC($3); zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); } - | T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { AC($6); zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); } + '{' inner_statement_list '}' { AN($$); } + | T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); AN($$); } + | T_IF parenthesis_expr ':' { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); AN($$); } + | T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { AC($3); zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); AN($$); } + | T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { AC($6); zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); AN($$); } | T_FOR '(' for_expr @@ -335,37 +335,37 @@ unticked_statement: ';' { zend_do_extended_info(TSRMLS_C); zend_do_for_cond(&$6, &$7 TSRMLS_CC); } for_expr ')' { zend_do_free(&$9 TSRMLS_CC); zend_do_for_before_statement(&$4, &$7 TSRMLS_CC); } - for_statement { zend_do_for_end(&$7 TSRMLS_CC); } - | T_SWITCH parenthesis_expr { AC($2); zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); } - | T_BREAK ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, NULL); AS($$); } - | T_BREAK expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, $2.u.ast); AS($$); } - | T_CONTINUE ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, NULL); AS($$); } - | T_CONTINUE expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, $2.u.ast); AS($$); } + for_statement { zend_do_for_end(&$7 TSRMLS_CC); AN($$); } + | T_SWITCH parenthesis_expr { AC($2); zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); AN($$); } + | T_BREAK ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, NULL); } + | T_BREAK expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, $2.u.ast); } + | T_CONTINUE ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, NULL); } + | T_CONTINUE expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, $2.u.ast); } | T_RETURN ';' - { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, NULL); AS($$); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, NULL); } | T_RETURN expr ';' - { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, $2.u.ast); AS($$); } - | T_GLOBAL global_var_list ';' - | T_STATIC static_var_list ';' - | T_ECHO echo_expr_list ';' - | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, AST_ZVAL(&$1)); AS($$); } - | expr ';' { AC($1); zend_do_free(&$1 TSRMLS_CC); } - | T_UNSET '(' unset_variables ')' ';' + { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, $2.u.ast); } + | T_GLOBAL global_var_list ';' { $$.u.ast = $2.u.ast; } + | T_STATIC static_var_list ';' { AN($$); } + | T_ECHO echo_expr_list ';' { $$.u.ast = $2.u.ast; } + | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, AST_ZVAL(&$1)); } + | expr ';' { AC($1); zend_do_free(&$1 TSRMLS_CC); AN($$); } + | T_UNSET '(' unset_variables ')' ';' { $$.u.ast = $3.u.ast; } | T_FOREACH '(' variable T_AS { zend_do_foreach_begin(&$1, &$2, &$3, &$4, 1 TSRMLS_CC); } foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$6, &$7 TSRMLS_CC); } - foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); } + foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); AN($$); } | T_FOREACH '(' expr_without_variable T_AS { AC($3); zend_do_foreach_begin(&$1, &$2, &$3, &$4, 0 TSRMLS_CC); } foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$6, &$7 TSRMLS_CC); } - foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); } - | T_DECLARE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); } - | ';' /* empty statement */ + foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); AN($$); } + | T_DECLARE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); AN($$); } + | ';' /* empty statement */ { AN($$); } | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' catch_statement { zend_do_bind_catch(&$1, &$6 TSRMLS_CC); } - finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); } - | T_THROW expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_THROW, $2.u.ast); AS($$); } - | T_GOTO T_STRING ';' { $$.u.ast = zend_ast_create_unary(ZEND_GOTO, AST_ZVAL(&$2)); AS($$); } + finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); AN($$); } + | T_THROW expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_THROW, $2.u.ast); } + | T_GOTO T_STRING ';' { $$.u.ast = zend_ast_create_unary(ZEND_GOTO, AST_ZVAL(&$2)); } ; catch_statement: @@ -396,13 +396,12 @@ additional_catch: ; unset_variables: - unset_variable - | unset_variables ',' unset_variable + unset_variable { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.u.ast); } + | unset_variables ',' unset_variable { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } ; unset_variable: - variable - { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNSET, $1.u.ast); AST_COMPILE_STMT($$.u.ast); } + variable { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNSET, $1.u.ast); } ; function_declaration_statement: @@ -609,13 +608,13 @@ function_call_parameter: ; global_var_list: - global_var_list ',' global_var - | global_var + global_var_list ',' global_var { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | global_var { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.u.ast); } ; global_var: simple_variable - { $$.u.ast = zend_ast_create_unary(ZEND_AST_GLOBAL, $1.u.ast); AST_COMPILE_STMT($$.u.ast); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_GLOBAL, $1.u.ast); } ; @@ -742,11 +741,11 @@ class_constant_declaration: ; echo_expr_list: - echo_expr_list ',' echo_expr - | echo_expr + echo_expr_list ',' echo_expr { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | echo_expr { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.u.ast); } ; echo_expr: - expr { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, $1.u.ast); AS($$); } + expr { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, $1.u.ast); } ; for_expr: -- cgit v1.2.1 From 117714d12210ed702a4caaa9879c29b3190114d4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 9 Jul 2014 23:46:22 +0200 Subject: Port goto label --- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 22 ++++++++++++++++++++++ Zend/zend_language_parser.y | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 12d51dc137..cb731a39da 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -74,6 +74,7 @@ enum _zend_ast_kind { ZEND_AST_GLOBAL, ZEND_AST_UNSET, ZEND_AST_RETURN, + ZEND_AST_LABEL, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 664883657a..83caf8f07f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7036,6 +7036,25 @@ void zend_compile_goto(zend_ast *ast TSRMLS_DC) { zend_resolve_goto_label(CG(active_op_array), opline, 0 TSRMLS_CC); } +void zend_compile_label(zend_ast *ast TSRMLS_DC) { + zval *label = zend_ast_get_zval(ast->child[0]); + zend_label dest; + + ZEND_ASSERT(Z_TYPE_P(label) == IS_STRING); + + if (!CG(context).labels) { + ALLOC_HASHTABLE(CG(context).labels); + zend_hash_init(CG(context).labels, 8, NULL, ptr_dtor, 0); + } + + dest.brk_cont = CG(context).current_brk_cont; + dest.opline_num = get_next_op_number(CG(active_op_array)); + + if (!zend_hash_add_mem(CG(context).labels, Z_STR_P(label), &dest, sizeof(zend_label))) { + zend_error_noreturn(E_COMPILE_ERROR, "Label '%s' already defined", Z_STRVAL_P(label)); + } +} + void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { zend_uint i; for (i = 0; i < ast->children; ++i) { @@ -7818,6 +7837,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_GOTO: zend_compile_goto(ast TSRMLS_CC); return; + case ZEND_AST_LABEL: + zend_compile_label(ast TSRMLS_CC); + return; EMPTY_SWITCH_DEFAULT_CASE() } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 2743288676..e3cd937824 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -318,7 +318,7 @@ inner_statement: statement: unticked_statement { AS($$); DO_TICKS(); } - | T_STRING ':' { zend_do_label(&$1 TSRMLS_CC); } + | T_STRING ':' { $$.u.ast = zend_ast_create_unary(ZEND_AST_LABEL, AST_ZVAL(&$1)); AS($$); } ; unticked_statement: -- cgit v1.2.1 From 1de1bc96a5b281e9ba764b99bb2a487975806cbc Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Jul 2014 00:00:48 +0200 Subject: Make statement asty --- Zend/zend_compile.c | 35 ++++++++++++++++++++++++++--------- Zend/zend_language_parser.y | 24 ++++++++++++------------ 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 83caf8f07f..294ce9b9a7 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6043,6 +6043,15 @@ static zend_op *emit_op_tmp(znode *result, zend_uchar opcode, znode *op1, znode return opline; } +static void zend_emit_tick(TSRMLS_D) { + zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); + + opline->opcode = ZEND_TICKS; + SET_UNUSED(opline->op1); + SET_UNUSED(opline->op2); + opline->extended_value = Z_LVAL(CG(declarables).ticks); +} + static zend_bool zend_is_variable(zend_ast *ast) { return ast->kind == ZEND_AST_VAR || ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP || ast->kind == ZEND_AST_STATIC_PROP @@ -6056,6 +6065,10 @@ static zend_bool zend_is_call(zend_ast *ast) { || ast->kind == ZEND_AST_STATIC_CALL; } +static zend_bool zend_is_unticked_stmt(zend_ast *ast) { + return ast->kind == ZEND_AST_STMT_LIST || ast->kind == ZEND_AST_LABEL; +} + static zend_bool zend_can_write_to_variable(zend_ast *ast) { while (ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP) { ast = ast->child[0]; @@ -7814,34 +7827,38 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { switch (ast->kind) { case ZEND_AST_STMT_LIST: zend_compile_stmt_list(ast TSRMLS_CC); - return; + break; case ZEND_AST_GLOBAL: zend_compile_global_var(ast TSRMLS_CC); - return; + break; case ZEND_AST_UNSET: zend_compile_unset(ast TSRMLS_CC); - return; + break; case ZEND_AST_RETURN: zend_compile_return(ast TSRMLS_CC); - return; + break; case ZEND_ECHO: zend_compile_echo(ast TSRMLS_CC); - return; + break; case ZEND_THROW: zend_compile_throw(ast TSRMLS_CC); - return; + break; case ZEND_BRK: case ZEND_CONT: zend_compile_break_continue(ast TSRMLS_CC); - return; + break; case ZEND_GOTO: zend_compile_goto(ast TSRMLS_CC); - return; + break; case ZEND_AST_LABEL: zend_compile_label(ast TSRMLS_CC); - return; + break; EMPTY_SWITCH_DEFAULT_CASE() } + + if (Z_LVAL(CG(declarables).ticks) && !zend_is_unticked_stmt(ast)) { + zend_emit_tick(TSRMLS_C); + } } void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e3cd937824..f5ea217a1a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -246,7 +246,7 @@ name: ; top_statement: - statement { zend_verify_namespace(TSRMLS_C); } + statement { AS($1); zend_verify_namespace(TSRMLS_C); } | function_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } | class_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } | T_HALT_COMPILER '(' ')' ';' { zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } @@ -309,7 +309,7 @@ inner_statement_list: inner_statement: - statement + statement { AS($1); } | function_declaration_statement | class_declaration_statement | T_HALT_COMPILER '(' ')' ';' { zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); } @@ -317,16 +317,16 @@ inner_statement: statement: - unticked_statement { AS($$); DO_TICKS(); } - | T_STRING ':' { $$.u.ast = zend_ast_create_unary(ZEND_AST_LABEL, AST_ZVAL(&$1)); AS($$); } + unticked_statement { $$.u.ast = $1.u.ast; } + | T_STRING ':' { $$.u.ast = zend_ast_create_unary(ZEND_AST_LABEL, AST_ZVAL(&$1)); } ; unticked_statement: '{' inner_statement_list '}' { AN($$); } - | T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); AN($$); } + | T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { AS($4); zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); AN($$); } | T_IF parenthesis_expr ':' { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); AN($$); } | T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { AC($3); zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); AN($$); } - | T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { AC($6); zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); AN($$); } + | T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { AS($3); $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { AC($6); zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); AN($$); } | T_FOR '(' for_expr @@ -487,19 +487,19 @@ foreach_variable: ; for_statement: - statement + statement { AS($1); } | ':' inner_statement_list T_ENDFOR ';' ; foreach_statement: - statement + statement { AS($1); } | ':' inner_statement_list T_ENDFOREACH ';' ; declare_statement: - statement + statement { AS($1); } | ':' inner_statement_list T_ENDDECLARE ';' ; @@ -532,7 +532,7 @@ case_separator: while_statement: - statement + statement { AS($1); } | ':' inner_statement_list T_ENDWHILE ';' ; @@ -540,7 +540,7 @@ while_statement: elseif_list: /* empty */ - | elseif_list T_ELSEIF parenthesis_expr { AC($3); zend_do_if_cond(&$3, &$2 TSRMLS_CC); } statement { zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } + | elseif_list T_ELSEIF parenthesis_expr { AC($3); zend_do_if_cond(&$3, &$2 TSRMLS_CC); } statement { AS($5); zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } ; @@ -552,7 +552,7 @@ new_elseif_list: else_single: /* empty */ - | T_ELSE statement + | T_ELSE statement { AS($2); } ; -- cgit v1.2.1 From 68777b72b25afd7373d4e2fe3e2980b8fb15da5d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Jul 2014 00:04:27 +0200 Subject: Expr stmts go through ast --- Zend/zend_compile.c | 7 ++++++- Zend/zend_language_parser.y | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 294ce9b9a7..f4ac95e07f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7853,7 +7853,12 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_LABEL: zend_compile_label(ast TSRMLS_CC); break; - EMPTY_SWITCH_DEFAULT_CASE() + default: + { + znode result; + zend_compile_expr(&result, ast TSRMLS_CC); + zend_do_free(&result TSRMLS_CC); + } } if (Z_LVAL(CG(declarables).ticks) && !zend_is_unticked_stmt(ast)) { diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index f5ea217a1a..07039d2d6f 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -349,7 +349,7 @@ unticked_statement: | T_STATIC static_var_list ';' { AN($$); } | T_ECHO echo_expr_list ';' { $$.u.ast = $2.u.ast; } | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, AST_ZVAL(&$1)); } - | expr ';' { AC($1); zend_do_free(&$1 TSRMLS_CC); AN($$); } + | expr ';' { $$.u.ast = $1.u.ast; } | T_UNSET '(' unset_variables ')' ';' { $$.u.ast = $3.u.ast; } | T_FOREACH '(' variable T_AS { zend_do_foreach_begin(&$1, &$2, &$3, &$4, 1 TSRMLS_CC); } -- cgit v1.2.1 From c7656c06cca94132c69c874df720d789b75072ab Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Jul 2014 14:35:59 +0200 Subject: Port while Note: From here on everything is broken --- Zend/zend_ast.h | 2 ++ Zend/zend_compile.c | 29 +++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 8 +++++--- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index cb731a39da..2137740a1d 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -75,6 +75,8 @@ enum _zend_ast_kind { ZEND_AST_UNSET, ZEND_AST_RETURN, ZEND_AST_LABEL, + + ZEND_AST_WHILE, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f4ac95e07f..efda0d69e3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7068,6 +7068,32 @@ void zend_compile_label(zend_ast *ast TSRMLS_DC) { } } +void zend_compile_while(zend_ast *ast TSRMLS_DC) { + zend_ast *cond_ast = ast->child[0]; + zend_ast *stmt_ast = ast->child[1]; + + znode cond_node; + zend_uint opnum_start, opnum_jmpz; + zend_op *opline; + + opnum_start = get_next_op_number(CG(active_op_array)); + zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); + + opnum_jmpz = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMPZ, &cond_node, NULL TSRMLS_CC); + do_begin_loop(TSRMLS_C); + + zend_compile_stmt(stmt_ast TSRMLS_CC); + + opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + opline->op1.opline_num = opnum_start; + + opline = &CG(active_op_array)->opcodes[opnum_jmpz]; + opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + + do_end_loop(opnum_start, 0 TSRMLS_CC); +} + void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { zend_uint i; for (i = 0; i < ast->children; ++i) { @@ -7853,6 +7879,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_LABEL: zend_compile_label(ast TSRMLS_CC); break; + case ZEND_AST_WHILE: + zend_compile_while(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 07039d2d6f..782fc06565 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -325,7 +325,9 @@ unticked_statement: '{' inner_statement_list '}' { AN($$); } | T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { AS($4); zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); AN($$); } | T_IF parenthesis_expr ':' { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); AN($$); } - | T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { AC($3); zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); AN($$); } + | T_WHILE parenthesis_expr while_statement + { $$.u.ast = zend_ast_create_binary(ZEND_AST_WHILE, $2.u.ast, $3.u.ast); } + /*| T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { AC($3); zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); AN($$); }*/ | T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { AS($3); $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { AC($6); zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); AN($$); } | T_FOR '(' @@ -532,8 +534,8 @@ case_separator: while_statement: - statement { AS($1); } - | ':' inner_statement_list T_ENDWHILE ';' + statement { $$.u.ast = $1.u.ast; } + | ':' inner_statement_list T_ENDWHILE ';' { AN($$); } ; -- cgit v1.2.1 From 1738ee7e5a1fed651ac6d7c7dd38b35336d05847 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Jul 2014 14:46:22 +0200 Subject: Port do/while --- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 25 +++++++++++++++++++++++++ Zend/zend_language_parser.y | 4 ++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 2137740a1d..99d8157875 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -77,6 +77,7 @@ enum _zend_ast_kind { ZEND_AST_LABEL, ZEND_AST_WHILE, + ZEND_AST_DO_WHILE, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index efda0d69e3..b08d1a94a7 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7094,6 +7094,28 @@ void zend_compile_while(zend_ast *ast TSRMLS_DC) { do_end_loop(opnum_start, 0 TSRMLS_CC); } +void zend_compile_do_while(zend_ast *ast TSRMLS_DC) { + zend_ast *stmt_ast = ast->child[0]; + zend_ast *cond_ast = ast->child[1]; + + znode cond_node; + zend_op *opline; + zend_uint opnum_start, opnum_cond; + + do_begin_loop(TSRMLS_C); + + opnum_start = get_next_op_number(CG(active_op_array)); + zend_compile_stmt(stmt_ast TSRMLS_CC); + + opnum_cond = get_next_op_number(CG(active_op_array)); + zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); + + opline = emit_op(NULL, ZEND_JMPNZ, &cond_node, NULL TSRMLS_CC); + opline->op2.opline_num = opnum_start; + + do_end_loop(opnum_cond, 0 TSRMLS_CC); +} + void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { zend_uint i; for (i = 0; i < ast->children; ++i) { @@ -7882,6 +7904,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_WHILE: zend_compile_while(ast TSRMLS_CC); break; + case ZEND_AST_DO_WHILE: + zend_compile_do_while(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 782fc06565..a7c03439f7 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -327,8 +327,8 @@ unticked_statement: | T_IF parenthesis_expr ':' { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); AN($$); } | T_WHILE parenthesis_expr while_statement { $$.u.ast = zend_ast_create_binary(ZEND_AST_WHILE, $2.u.ast, $3.u.ast); } - /*| T_WHILE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr { AC($3); zend_do_while_cond(&$3, &$$ TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$4 TSRMLS_CC); AN($$); }*/ - | T_DO { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE { AS($3); $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } parenthesis_expr ';' { AC($6); zend_do_do_while_end(&$1, &$4, &$6 TSRMLS_CC); AN($$); } + | T_DO statement T_WHILE parenthesis_expr ';' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DO_WHILE, $2.u.ast, $4.u.ast); } | T_FOR '(' for_expr -- cgit v1.2.1 From 80c44ad510513fb15d6d118d17e3ab8c577658a3 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Jul 2014 15:18:08 +0200 Subject: Support creating of ast nodes with >3 children --- Zend/zend_ast.c | 52 ++++++++++++++++++++++++++------------------- Zend/zend_ast.h | 26 +++++++++++++---------- Zend/zend_language_parser.y | 48 ++++++++++++++++++++--------------------- 3 files changed, 69 insertions(+), 57 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 59b82e81e2..c07d435529 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -41,38 +41,46 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) return (zend_ast *) ast; } -ZEND_API zend_ast* zend_ast_create_unary_ex(zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0) -{ - zend_ast *ast = emalloc(sizeof(zend_ast)); +static zend_ast *zend_ast_create_from_va_list( + zend_uint children, zend_ast_kind kind, zend_ast_attr attr, va_list va +) { + zend_uint i; + + zend_ast *ast = emalloc(sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *)); ast->kind = kind; ast->attr = attr; - ast->children = 1; - ast->child[0] = op0; + ast->children = children; + + for (i = 0; i < children; ++i) { + ast->child[i] = va_arg(va, zend_ast *); + } + return ast; } -ZEND_API zend_ast* zend_ast_create_binary_ex( - zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0, zend_ast *op1 +ZEND_API zend_ast *zend_ast_create_ex( + zend_uint children, zend_ast_kind kind, zend_ast_attr attr, ... ) { - zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *)); - ast->kind = kind; - ast->attr = attr; - ast->children = 2; - ast->child[0] = op0; - ast->child[1] = op1; + va_list va; + zend_ast *ast; + + va_start(va, attr); + ast = zend_ast_create_from_va_list(children, kind, attr, va); + va_end(va); + return ast; } -ZEND_API zend_ast* zend_ast_create_ternary_ex( - zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0, zend_ast *op1, zend_ast *op2 +ZEND_API zend_ast *zend_ast_create( + zend_uint children, zend_ast_kind kind, ... ) { - zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 2); - ast->kind = kind; - ast->attr = attr; - ast->children = 3; - ast->child[0] = op0; - ast->child[1] = op1; - ast->child[2] = op2; + va_list va; + zend_ast *ast; + + va_start(va, kind); + ast = zend_ast_create_from_va_list(children, kind, 0, va); + va_end(va); + return ast; } diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 99d8157875..0f07b8983f 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -69,6 +69,7 @@ enum _zend_ast_kind { ZEND_AST_ARRAY_ELEM, ZEND_AST_ENCAPS_LIST, + ZEND_AST_EXPR_LIST, ZEND_AST_STMT_LIST, ZEND_AST_GLOBAL, @@ -78,6 +79,7 @@ enum _zend_ast_kind { ZEND_AST_WHILE, ZEND_AST_DO_WHILE, + ZEND_AST_FOR, }; typedef unsigned short zend_ast_kind; @@ -102,12 +104,10 @@ static inline zval *zend_ast_get_zval(zend_ast *ast) { ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr); -ZEND_API zend_ast *zend_ast_create_unary_ex( - zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0); -ZEND_API zend_ast *zend_ast_create_binary_ex( - zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0, zend_ast *op1); -ZEND_API zend_ast *zend_ast_create_ternary_ex( - zend_ast_kind kind, zend_ast_attr attr, zend_ast *op0, zend_ast *op1, zend_ast *op2); +ZEND_API zend_ast *zend_ast_create_ex( + zend_uint children, zend_ast_kind kind, zend_ast_attr attr, ...); +ZEND_API zend_ast *zend_ast_create( + zend_uint children, zend_ast_kind kind, ...); ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind); ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op); @@ -123,16 +123,17 @@ ZEND_API void zend_ast_destroy(zend_ast *ast); static inline zend_ast *zend_ast_create_zval(zval *zv) { return zend_ast_create_zval_ex(zv, 0); } + static inline zend_ast *zend_ast_create_unary(zend_ast_kind kind, zend_ast *op0) { - return zend_ast_create_unary_ex(kind, 0, op0); + return zend_ast_create(1, kind, op0); } static inline zend_ast *zend_ast_create_binary(zend_ast_kind kind, zend_ast *op0, zend_ast *op1) { - return zend_ast_create_binary_ex(kind, 0, op0, op1); + return zend_ast_create(2, kind, op0, op1); } static inline zend_ast *zend_ast_create_ternary( zend_ast_kind kind, zend_ast *op0, zend_ast *op1, zend_ast *op2 ) { - return zend_ast_create_ternary_ex(kind, 0, op0, op1, op2); + return zend_ast_create(3, kind, op0, op1, op2); } static inline zend_ast *zend_ast_create_dynamic_and_add(zend_ast_kind kind, zend_ast *op) { @@ -143,10 +144,13 @@ static inline zend_ast *zend_ast_create_var(zval *name) { return zend_ast_create_unary(ZEND_AST_VAR, zend_ast_create_zval(name)); } static inline zend_ast *zend_ast_create_binary_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { - return zend_ast_create_binary_ex(ZEND_AST_BINARY_OP, opcode, op0, op1); + return zend_ast_create_ex(2, ZEND_AST_BINARY_OP, opcode, op0, op1); } static inline zend_ast *zend_ast_create_assign_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { - return zend_ast_create_binary_ex(ZEND_AST_ASSIGN_OP, opcode, op0, op1); + return zend_ast_create_ex(2, ZEND_AST_ASSIGN_OP, opcode, op0, op1); +} +static inline zend_ast *zend_ast_create_cast(zend_uint type, zend_ast *op0) { + return zend_ast_create_ex(1, ZEND_AST_CAST, type, op0); } /* Temporary, for porting */ diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index a7c03439f7..6879993282 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -329,7 +329,9 @@ unticked_statement: { $$.u.ast = zend_ast_create_binary(ZEND_AST_WHILE, $2.u.ast, $3.u.ast); } | T_DO statement T_WHILE parenthesis_expr ';' { $$.u.ast = zend_ast_create_binary(ZEND_AST_DO_WHILE, $2.u.ast, $4.u.ast); } - | T_FOR + | T_FOR '(' for_expr ';' for_expr ';' for_expr ')' for_statement + { $$.u.ast = NULL; } + /*| T_FOR '(' for_expr ';' { zend_do_free(&$3 TSRMLS_CC); $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } @@ -337,7 +339,7 @@ unticked_statement: ';' { zend_do_extended_info(TSRMLS_C); zend_do_for_cond(&$6, &$7 TSRMLS_CC); } for_expr ')' { zend_do_free(&$9 TSRMLS_CC); zend_do_for_before_statement(&$4, &$7 TSRMLS_CC); } - for_statement { zend_do_for_end(&$7 TSRMLS_CC); AN($$); } + for_statement { zend_do_for_end(&$7 TSRMLS_CC); AN($$); }*/ | T_SWITCH parenthesis_expr { AC($2); zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); AN($$); } | T_BREAK ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, NULL); } | T_BREAK expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, $2.u.ast); } @@ -489,8 +491,8 @@ foreach_variable: ; for_statement: - statement { AS($1); } - | ':' inner_statement_list T_ENDFOR ';' + statement { $$.u.ast = $1.u.ast; } + | ':' inner_statement_list T_ENDFOR ';' { AN($$); } ; @@ -751,13 +753,13 @@ echo_expr: ; for_expr: - /* empty */ { $$.op_type = IS_CONST; ZVAL_BOOL(&$$.u.constant, 1); } - | non_empty_for_expr { $$ = $1; } + /* empty */ { $$.u.ast = NULL; } + | non_empty_for_expr { $$.u.ast = $1.u.ast; } ; non_empty_for_expr: - non_empty_for_expr ',' { zend_do_free(&$1 TSRMLS_CC); } expr { AC($4); $$ = $4; } - | expr { AC($1); $$ = $1; } + non_empty_for_expr ',' expr { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | expr { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_EXPR_LIST, $1.u.ast); } ; new_expr: @@ -858,19 +860,19 @@ expr_without_variable: { $$.u.ast = zend_ast_create_ternary(ZEND_AST_CONDITIONAL, $1.u.ast, NULL, $4.u.ast); } | internal_functions_in_yacc { $$.u.ast = $1.u.ast; } | T_INT_CAST expr - { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_LONG, $2.u.ast); } + { $$.u.ast = zend_ast_create_cast(IS_LONG, $2.u.ast); } | T_DOUBLE_CAST expr - { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_DOUBLE, $2.u.ast); } + { $$.u.ast = zend_ast_create_cast(IS_DOUBLE, $2.u.ast); } | T_STRING_CAST expr - { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_STRING, $2.u.ast); } + { $$.u.ast = zend_ast_create_cast(IS_STRING, $2.u.ast); } | T_ARRAY_CAST expr - { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_ARRAY, $2.u.ast); } + { $$.u.ast = zend_ast_create_cast(IS_ARRAY, $2.u.ast); } | T_OBJECT_CAST expr - { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_OBJECT, $2.u.ast); } + { $$.u.ast = zend_ast_create_cast(IS_OBJECT, $2.u.ast); } | T_BOOL_CAST expr - { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, _IS_BOOL, $2.u.ast); } + { $$.u.ast = zend_ast_create_cast(_IS_BOOL, $2.u.ast); } | T_UNSET_CAST expr - { $$.u.ast = zend_ast_create_unary_ex(ZEND_AST_CAST, IS_NULL, $2.u.ast); } + { $$.u.ast = zend_ast_create_cast(IS_NULL, $2.u.ast); } | T_EXIT exit_expr { $$.u.ast = zend_ast_create_unary(ZEND_EXIT, $2.u.ast); } | '@' expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_SILENCE, $2.u.ast); } | scalar { $$.u.ast = $1.u.ast; } @@ -1123,9 +1125,9 @@ array_pair: { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $3.u.ast, $1.u.ast); } | expr { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $1.u.ast, NULL); } | expr T_DOUBLE_ARROW '&' variable - { $$.u.ast = zend_ast_create_binary_ex(ZEND_AST_ARRAY_ELEM, 1, $4.u.ast, $1.u.ast); } + { $$.u.ast = zend_ast_create_ex(2, ZEND_AST_ARRAY_ELEM, 1, $4.u.ast, $1.u.ast); } | '&' variable - { $$.u.ast = zend_ast_create_binary_ex(ZEND_AST_ARRAY_ELEM, 1, $2.u.ast, NULL); } + { $$.u.ast = zend_ast_create_ex(2, ZEND_AST_ARRAY_ELEM, 1, $2.u.ast, NULL); } ; encaps_list: @@ -1170,17 +1172,15 @@ internal_functions_in_yacc: T_ISSET '(' isset_variables ')' { $$.u.ast = $3.u.ast; } | T_EMPTY '(' expr ')' { $$.u.ast = zend_ast_create_unary(ZEND_AST_EMPTY, $3.u.ast); } | T_INCLUDE expr - { $$.u.ast = zend_ast_create_unary_ex(ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.u.ast); } + { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.u.ast); } | T_INCLUDE_ONCE expr - { $$.u.ast = zend_ast_create_unary_ex( - ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2.u.ast); } + { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2.u.ast); } | T_EVAL '(' expr ')' - { $$.u.ast = zend_ast_create_unary_ex(ZEND_INCLUDE_OR_EVAL, ZEND_EVAL, $3.u.ast); } + { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_EVAL, $3.u.ast); } | T_REQUIRE expr - { $$.u.ast = zend_ast_create_unary_ex(ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2.u.ast); } + { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2.u.ast); } | T_REQUIRE_ONCE expr - { $$.u.ast = zend_ast_create_unary_ex( - ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2.u.ast); } + { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2.u.ast); } ; isset_variables: -- cgit v1.2.1 From 3be63fca48b331766224da07ddeb3f0b78ba9704 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Jul 2014 15:51:47 +0200 Subject: Port for --- Zend/zend_compile.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index b08d1a94a7..964b048c63 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7116,6 +7116,54 @@ void zend_compile_do_while(zend_ast *ast TSRMLS_DC) { do_end_loop(opnum_cond, 0 TSRMLS_CC); } +void zend_compile_expr_list(znode *result, zend_ast *ast TSRMLS_DC) { + zend_uint i; + + result->op_type = IS_UNUSED; + for (i = 0; i < ast->children; ++i) { + zend_ast *expr_ast = ast->child[i]; + + zend_do_free(result TSRMLS_CC); + zend_compile_expr(result, expr_ast TSRMLS_CC); + } +} + +void zend_compile_for(zend_ast *ast TSRMLS_DC) { + zend_ast *init_ast = ast->child[0]; + zend_ast *cond_ast = ast->child[1]; + zend_ast *loop_ast = ast->child[2]; + zend_ast *stmt_ast = ast->child[3]; + + znode result; + zend_uint opnum_cond, opnum_jmpz, opnum_loop; + zend_op *opline; + + zend_compile_expr_list(&result, init_ast TSRMLS_CC); + zend_do_free(&result TSRMLS_CC); + + opnum_cond = get_next_op_number(CG(active_op_array)); + zend_compile_expr_list(&result, cond_ast TSRMLS_CC); + zend_do_extended_info(TSRMLS_C); + + opnum_jmpz = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMPZ, &result, NULL TSRMLS_CC); + do_begin_loop(TSRMLS_C); + + zend_compile_stmt(stmt_ast TSRMLS_CC); + + opnum_loop = get_next_op_number(CG(active_op_array)); + zend_compile_expr_list(&result, loop_ast TSRMLS_CC); + zend_do_free(&result TSRMLS_CC); + + opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + opline->op1.opline_num = opnum_cond; + + opline = &CG(active_op_array)->opcodes[opnum_jmpz]; + opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + + do_end_loop(opnum_loop, 0 TSRMLS_CC); +} + void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { zend_uint i; for (i = 0; i < ast->children; ++i) { @@ -7907,6 +7955,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_DO_WHILE: zend_compile_do_while(ast TSRMLS_CC); break; + case ZEND_AST_FOR: + zend_compile_for(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6879993282..a3bae7f481 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -330,7 +330,7 @@ unticked_statement: | T_DO statement T_WHILE parenthesis_expr ';' { $$.u.ast = zend_ast_create_binary(ZEND_AST_DO_WHILE, $2.u.ast, $4.u.ast); } | T_FOR '(' for_expr ';' for_expr ';' for_expr ')' for_statement - { $$.u.ast = NULL; } + { $$.u.ast = zend_ast_create(4, ZEND_AST_FOR, $3.u.ast, $5.u.ast, $7.u.ast, $9.u.ast); } /*| T_FOR '(' for_expr -- cgit v1.2.1 From 4215969904c4b19c12c2be36da031e4012b6e01d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Jul 2014 16:38:04 +0200 Subject: Port if (partial) --- Zend/zend_ast.h | 2 ++ Zend/zend_compile.c | 43 +++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 38 +++++++++++++++++++------------------- 3 files changed, 64 insertions(+), 19 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 0f07b8983f..2f07cf3b42 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -80,6 +80,8 @@ enum _zend_ast_kind { ZEND_AST_WHILE, ZEND_AST_DO_WHILE, ZEND_AST_FOR, + ZEND_AST_IF, + ZEND_AST_IF_ELEM, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 964b048c63..0556707ca8 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7164,6 +7164,46 @@ void zend_compile_for(zend_ast *ast TSRMLS_DC) { do_end_loop(opnum_loop, 0 TSRMLS_CC); } +void zend_compile_if(zend_ast *ast TSRMLS_DC) { + zend_uint i; + zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), ast->children - 1, 0); + zend_uint opnum_last_jmpz = 0; + zend_op *opline; + + for (i = 0; i < ast->children; ++i) { + zend_ast *elem_ast = ast->child[i]; + zend_ast *cond_ast = elem_ast->child[0]; + zend_ast *stmt_ast = elem_ast->child[1]; + + znode cond_node; + if (cond_ast) { + zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); + + opnum_last_jmpz = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMPZ, &cond_node, NULL TSRMLS_CC); + } + + zend_compile_stmt(stmt_ast TSRMLS_CC); + + if (i != ast->children - 1) { + jmp_opnums[i] = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + } + + if (cond_ast) { + opline = &CG(active_op_array)->opcodes[opnum_last_jmpz]; + opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + } + } + + for (i = 0; i < ast->children - 1; ++i) { + opline = &CG(active_op_array)->opcodes[jmp_opnums[i]]; + opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + } + + efree(jmp_opnums); +} + void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { zend_uint i; for (i = 0; i < ast->children; ++i) { @@ -7958,6 +7998,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_FOR: zend_compile_for(ast TSRMLS_CC); break; + case ZEND_AST_IF: + zend_compile_if(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index a3bae7f481..e561962fd6 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -323,7 +323,8 @@ statement: unticked_statement: '{' inner_statement_list '}' { AN($$); } - | T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { AS($4); zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); AN($$); } + | if_stmt + /*| T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { AS($4); zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); AN($$); }*/ | T_IF parenthesis_expr ':' { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); AN($$); } | T_WHILE parenthesis_expr while_statement { $$.u.ast = zend_ast_create_binary(ZEND_AST_WHILE, $2.u.ast, $3.u.ast); } @@ -331,15 +332,6 @@ unticked_statement: { $$.u.ast = zend_ast_create_binary(ZEND_AST_DO_WHILE, $2.u.ast, $4.u.ast); } | T_FOR '(' for_expr ';' for_expr ';' for_expr ')' for_statement { $$.u.ast = zend_ast_create(4, ZEND_AST_FOR, $3.u.ast, $5.u.ast, $7.u.ast, $9.u.ast); } - /*| T_FOR - '(' - for_expr - ';' { zend_do_free(&$3 TSRMLS_CC); $4.u.op.opline_num = get_next_op_number(CG(active_op_array)); } - for_expr - ';' { zend_do_extended_info(TSRMLS_C); zend_do_for_cond(&$6, &$7 TSRMLS_CC); } - for_expr - ')' { zend_do_free(&$9 TSRMLS_CC); zend_do_for_before_statement(&$4, &$7 TSRMLS_CC); } - for_statement { zend_do_for_end(&$7 TSRMLS_CC); AN($$); }*/ | T_SWITCH parenthesis_expr { AC($2); zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); AN($$); } | T_BREAK ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, NULL); } | T_BREAK expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, $2.u.ast); } @@ -541,12 +533,26 @@ while_statement: ; +if_stmt_without_else: + T_IF parenthesis_expr statement + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_IF, + zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.u.ast, $3.u.ast)); } + | if_stmt_without_else T_ELSEIF parenthesis_expr statement + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, + zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.u.ast, $4.u.ast)); } +; -elseif_list: - /* empty */ - | elseif_list T_ELSEIF parenthesis_expr { AC($3); zend_do_if_cond(&$3, &$2 TSRMLS_CC); } statement { AS($5); zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } +if_stmt: + if_stmt_without_else { $$.u.ast = $1.u.ast; } + | if_stmt_without_else T_ELSE statement + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, + zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $3.u.ast)); } ; +/*elseif_list: + elseif_list T_ELSEIF parenthesis_expr { AC($3); zend_do_if_cond(&$3, &$2 TSRMLS_CC); } statement { AS($5); zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } +;*/ + new_elseif_list: /* empty */ @@ -554,12 +560,6 @@ new_elseif_list: ; -else_single: - /* empty */ - | T_ELSE statement { AS($2); } -; - - new_else_single: /* empty */ | T_ELSE ':' inner_statement_list -- cgit v1.2.1 From 7f151465b2045c3d514fd6c17b8ca299a75e2428 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Jul 2014 23:04:42 +0200 Subject: Make inner_statement_list asty --- Zend/zend_language_parser.y | 75 +++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e561962fd6..c83b2510d9 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -303,16 +303,19 @@ constant_declaration: ; inner_statement_list: - inner_statement_list { zend_do_extended_info(TSRMLS_C); } inner_statement { HANDLE_INTERACTIVE(); } + inner_statement_list inner_statement + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } | /* empty */ + { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } ; inner_statement: - statement { AS($1); } - | function_declaration_statement - | class_declaration_statement - | T_HALT_COMPILER '(' ')' ';' { zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); } + statement { $$.u.ast = $1.u.ast; } + | function_declaration_statement { AN($$); } + | class_declaration_statement { AN($$); } + | T_HALT_COMPILER '(' ')' ';' + { zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); } ; @@ -322,10 +325,9 @@ statement: ; unticked_statement: - '{' inner_statement_list '}' { AN($$); } - | if_stmt - /*| T_IF parenthesis_expr { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } statement { AS($4); zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); AN($$); }*/ - | T_IF parenthesis_expr ':' { AC($2); zend_do_if_cond(&$2, &$1 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$1, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); AN($$); } + '{' inner_statement_list '}' { $$.u.ast = $2.u.ast; } + | if_stmt { $$.u.ast = $1.u.ast; } + | alt_if_stmt { $$.u.ast = $1.u.ast; } | T_WHILE parenthesis_expr while_statement { $$.u.ast = zend_ast_create_binary(ZEND_AST_WHILE, $2.u.ast, $3.u.ast); } | T_DO statement T_WHILE parenthesis_expr ';' @@ -357,8 +359,8 @@ unticked_statement: foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); AN($$); } | T_DECLARE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); AN($$); } | ';' /* empty statement */ { AN($$); } - | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' - catch_statement { zend_do_bind_catch(&$1, &$6 TSRMLS_CC); } + | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); } + catch_statement { zend_do_bind_catch(&$1, &$7 TSRMLS_CC); } finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); AN($$); } | T_THROW expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_THROW, $2.u.ast); } | T_GOTO T_STRING ';' { $$.u.ast = zend_ast_create_unary(ZEND_GOTO, AST_ZVAL(&$2)); } @@ -369,12 +371,12 @@ catch_statement: | T_CATCH '(' { zend_initialize_try_catch_element(&$1 TSRMLS_CC); } fully_qualified_class_name { zend_do_first_catch(&$2 TSRMLS_CC); } T_VARIABLE ')' { zend_do_begin_catch(&$1, &$4, &$6, &$2 TSRMLS_CC); } - '{' inner_statement_list '}' { zend_do_end_catch(&$1 TSRMLS_CC); } + '{' inner_statement_list '}' { AS($10); zend_do_end_catch(&$1 TSRMLS_CC); } additional_catches { zend_do_mark_last_catch(&$2, &$13 TSRMLS_CC); $$ = $1;} finally_statement: /* empty */ { $$.op_type = IS_UNUSED; } - | T_FINALLY { zend_do_finally(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { $$ = $1; } + | T_FINALLY { zend_do_finally(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); $$ = $1; } ; additional_catches: @@ -388,7 +390,7 @@ non_empty_additional_catches: ; additional_catch: - T_CATCH '(' fully_qualified_class_name { $$.u.op.opline_num = get_next_op_number(CG(active_op_array)); } T_VARIABLE ')' { zend_do_begin_catch(&$1, &$3, &$5, NULL TSRMLS_CC); } '{' inner_statement_list '}' { zend_do_end_catch(&$1 TSRMLS_CC); } + T_CATCH '(' fully_qualified_class_name { $$.u.op.opline_num = get_next_op_number(CG(active_op_array)); } T_VARIABLE ')' { zend_do_begin_catch(&$1, &$3, &$5, NULL TSRMLS_CC); } '{' inner_statement_list '}' { AS($9); zend_do_end_catch(&$1 TSRMLS_CC); } ; unset_variables: @@ -421,7 +423,7 @@ is_variadic: unticked_function_declaration_statement: function is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$3, 0, $2.op_type, NULL TSRMLS_CC); } '(' parameter_list ')' - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); } + '{' inner_statement_list '}' { AS($9); zend_do_end_function_declaration(&$1 TSRMLS_CC); } ; unticked_class_declaration_statement: @@ -484,19 +486,19 @@ foreach_variable: for_statement: statement { $$.u.ast = $1.u.ast; } - | ':' inner_statement_list T_ENDFOR ';' { AN($$); } + | ':' inner_statement_list T_ENDFOR ';' { $$.u.ast = $2.u.ast; } ; foreach_statement: statement { AS($1); } - | ':' inner_statement_list T_ENDFOREACH ';' + | ':' inner_statement_list T_ENDFOREACH ';' { AS($2); } ; declare_statement: statement { AS($1); } - | ':' inner_statement_list T_ENDDECLARE ';' + | ':' inner_statement_list T_ENDDECLARE ';' { AS($2); } ; @@ -516,8 +518,8 @@ switch_case_list: case_list: /* empty */ { $$.op_type = IS_UNUSED; } - | case_list T_CASE expr case_separator { AC($3); zend_do_extended_info(TSRMLS_C); zend_do_case_before_statement(&$1, &$2, &$3 TSRMLS_CC); } inner_statement_list { zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } - | case_list T_DEFAULT case_separator { zend_do_extended_info(TSRMLS_C); zend_do_default_before_statement(&$1, &$2 TSRMLS_CC); } inner_statement_list { zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } + | case_list T_CASE expr case_separator { AC($3); zend_do_extended_info(TSRMLS_C); zend_do_case_before_statement(&$1, &$2, &$3 TSRMLS_CC); } inner_statement_list { AS($6); zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } + | case_list T_DEFAULT case_separator { zend_do_extended_info(TSRMLS_C); zend_do_default_before_statement(&$1, &$2 TSRMLS_CC); } inner_statement_list { AS($5); zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } ; @@ -529,7 +531,7 @@ case_separator: while_statement: statement { $$.u.ast = $1.u.ast; } - | ':' inner_statement_list T_ENDWHILE ';' { AN($$); } + | ':' inner_statement_list T_ENDWHILE ';' { $$.u.ast = $2.u.ast; } ; @@ -549,23 +551,22 @@ if_stmt: zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $3.u.ast)); } ; -/*elseif_list: - elseif_list T_ELSEIF parenthesis_expr { AC($3); zend_do_if_cond(&$3, &$2 TSRMLS_CC); } statement { AS($5); zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } -;*/ - - -new_elseif_list: - /* empty */ - | new_elseif_list T_ELSEIF parenthesis_expr ':' { AC($3); zend_do_if_cond(&$3, &$2 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$2, 0 TSRMLS_CC); } +alt_if_stmt_without_else: + T_IF parenthesis_expr ':' inner_statement_list + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_IF, + zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.u.ast, $4.u.ast)); } + | alt_if_stmt_without_else T_ELSEIF parenthesis_expr ':' inner_statement_list + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, + zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.u.ast, $5.u.ast)); } ; - -new_else_single: - /* empty */ - | T_ELSE ':' inner_statement_list +alt_if_stmt: + alt_if_stmt_without_else T_ENDIF ';' { $$.u.ast = $1.u.ast; } + | alt_if_stmt_without_else T_ELSE ':' inner_statement_list T_ENDIF ';' + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, + zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $4.u.ast)); } ; - parameter_list: non_empty_parameter_list | /* empty */ @@ -705,7 +706,7 @@ trait_modifiers: method_body: ';' /* abstract method */ { Z_LVAL($$.u.constant) = ZEND_ACC_ABSTRACT; } - | '{' inner_statement_list '}' { Z_LVAL($$.u.constant) = 0; } + | '{' inner_statement_list '}' { AS($2); Z_LVAL($$.u.constant) = 0; } ; variable_modifiers: @@ -884,10 +885,10 @@ expr_without_variable: { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } | function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); } '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$3); } + '{' inner_statement_list '}' { AS($9); zend_do_end_function_declaration(&$1 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$3); } | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } + '{' inner_statement_list '}' { AS($10); zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } ; function: -- cgit v1.2.1 From f12c1482a3b1785fc319b950c95e36a225f8ee9b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 11 Jul 2014 12:16:21 +0200 Subject: Port foreach --- Zend/zend_ast.h | 2 + Zend/zend_compile.c | 115 ++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 30 ++++++------ 3 files changed, 131 insertions(+), 16 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 2f07cf3b42..3a956717ab 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -80,6 +80,8 @@ enum _zend_ast_kind { ZEND_AST_WHILE, ZEND_AST_DO_WHILE, ZEND_AST_FOR, + ZEND_AST_FOREACH, + ZEND_AST_REF, ZEND_AST_IF, ZEND_AST_IF_ELEM, }; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 0556707ca8..8de27b4430 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7164,6 +7164,118 @@ void zend_compile_for(zend_ast *ast TSRMLS_DC) { do_end_loop(opnum_loop, 0 TSRMLS_CC); } +void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + zend_ast *value_ast = ast->child[1]; + zend_ast *key_ast = ast->child[2]; + zend_ast *stmt_ast = ast->child[3]; + zend_bool by_ref = value_ast->kind == ZEND_AST_REF; + zend_bool is_variable = zend_is_variable(expr_ast) && !zend_is_call(expr_ast) + && zend_can_write_to_variable(expr_ast); + + znode expr_node, reset_node, value_node, key_node, dummy_node; + zend_op *opline; + zend_uint opnum_reset, opnum_fetch; + zend_op foreach_stack_opline; + + if (key_ast) { + if (key_ast->kind == ZEND_AST_REF) { + zend_error_noreturn(E_COMPILE_ERROR, "Key element cannot be a reference"); + } + if (key_ast->kind == ZEND_AST_LIST) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use list as key element"); + } + } + + if (by_ref) { + value_ast = value_ast->child[0]; + } + + if (by_ref && is_variable) { + zend_compile_var(&expr_node, expr_ast, BP_VAR_W TSRMLS_CC); + } else { + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + } + + opnum_reset = get_next_op_number(CG(active_op_array)); + opline = emit_op(&reset_node, ZEND_FE_RESET, &expr_node, NULL TSRMLS_CC); + if (by_ref && is_variable) { + opline->extended_value = ZEND_FE_RESET_VARIABLE; // ??? + } + + SET_NODE(foreach_stack_opline.result, &reset_node); + zend_stack_push(&CG(foreach_copy_stack), &foreach_stack_opline); + + opnum_fetch = get_next_op_number(CG(active_op_array)); + opline = emit_op(&value_node, ZEND_FE_FETCH, &reset_node, NULL TSRMLS_CC); + if (by_ref) { + opline->extended_value |= ZEND_FE_FETCH_BYREF; + } + if (key_ast) { + opline->extended_value |= ZEND_FE_FETCH_WITH_KEY; + } + + opline = emit_op(NULL, ZEND_OP_DATA, NULL, NULL TSRMLS_CC); + + /* Allocate enough space to keep HashPointer on VM stack */ + opline->op1_type = IS_TMP_VAR; + opline->op1.var = get_temporary_variable(CG(active_op_array)); + if (sizeof(HashPointer) > sizeof(zval)) { + /* Make sure 1 zval is enough for HashPointer (2 must be enough) */ + get_temporary_variable(CG(active_op_array)); + } + + if (key_ast) { + opline->result_type = IS_TMP_VAR; + opline->result.opline_num = get_temporary_variable(CG(active_op_array)); + GET_NODE(&key_node, opline->result); + } + + if (value_ast->attr == ZEND_AST_LIST) { + zend_compile_list_assign(&dummy_node, value_ast, &value_node TSRMLS_CC); + zend_do_free(&dummy_node TSRMLS_CC); + } else if (by_ref) { + zend_compile_assign_ref_common(NULL, value_ast, &value_node TSRMLS_CC); + } else { + zend_ast *znode_ast = zend_ast_create_znode(&value_node); + zend_ast *assign_ast = zend_ast_create_binary(ZEND_AST_ASSIGN, value_ast, znode_ast); + zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); + zend_do_free(&dummy_node TSRMLS_CC); + efree(znode_ast); + efree(assign_ast); + } + + if (key_ast) { + zend_ast *znode_ast = zend_ast_create_znode(&key_node); + zend_ast *assign_ast = zend_ast_create_binary(ZEND_AST_ASSIGN, key_ast, znode_ast); + zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); + zend_do_free(&dummy_node TSRMLS_CC); + efree(znode_ast); + efree(assign_ast); + } + + do_begin_loop(TSRMLS_C); + + zend_compile_stmt(stmt_ast TSRMLS_CC); + + opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + opline->op1.opline_num = opnum_fetch; + + opline = &CG(active_op_array)->opcodes[opnum_reset]; + opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + + opline = &CG(active_op_array)->opcodes[opnum_fetch]; + opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + + do_end_loop(opnum_fetch, 1 TSRMLS_CC); + + { + zend_op *container_ptr = zend_stack_top(&CG(foreach_copy_stack)); + generate_free_foreach_copy(container_ptr TSRMLS_CC); + zend_stack_del_top(&CG(foreach_copy_stack)); + } +} + void zend_compile_if(zend_ast *ast TSRMLS_DC) { zend_uint i; zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), ast->children - 1, 0); @@ -7998,6 +8110,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_FOR: zend_compile_for(ast TSRMLS_CC); break; + case ZEND_AST_FOREACH: + zend_compile_foreach(ast TSRMLS_CC); + break; case ZEND_AST_IF: zend_compile_if(ast TSRMLS_CC); break; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index c83b2510d9..eeead1e414 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -349,14 +349,17 @@ unticked_statement: | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, AST_ZVAL(&$1)); } | expr ';' { $$.u.ast = $1.u.ast; } | T_UNSET '(' unset_variables ')' ';' { $$.u.ast = $3.u.ast; } - | T_FOREACH '(' variable T_AS - { zend_do_foreach_begin(&$1, &$2, &$3, &$4, 1 TSRMLS_CC); } - foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$6, &$7 TSRMLS_CC); } - foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); AN($$); } - | T_FOREACH '(' expr_without_variable T_AS + | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement + { $$.u.ast = zend_ast_create(4, ZEND_AST_FOREACH, + $3.u.ast, $5.u.ast, NULL, $7.u.ast); } + | T_FOREACH '(' expr T_AS foreach_variable T_DOUBLE_ARROW foreach_variable ')' + foreach_statement + { $$.u.ast = zend_ast_create(4, ZEND_AST_FOREACH, + $3.u.ast, $7.u.ast, $5.u.ast, $9.u.ast); } + /*| T_FOREACH '(' expr_without_variable T_AS { AC($3); zend_do_foreach_begin(&$1, &$2, &$3, &$4, 0 TSRMLS_CC); } foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$6, &$7 TSRMLS_CC); } - foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); AN($$); } + foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); AN($$); }*/ | T_DECLARE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); AN($$); } | ';' /* empty statement */ { AN($$); } | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); } @@ -473,15 +476,10 @@ interface_list: | interface_list ',' fully_qualified_class_name { zend_do_implements_interface(&$3 TSRMLS_CC); } ; -foreach_optional_arg: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_DOUBLE_ARROW foreach_variable { $$ = $2; } -; - foreach_variable: - variable { $$.u.ast = $1.u.ast; $$.EA = 0; } - | '&' variable { $$.u.ast = $2.u.ast; $$.EA = ZEND_PARSED_REFERENCE_VARIABLE; } - | T_LIST '(' assignment_list ')' { $$.u.ast = $3.u.ast; $$.EA = ZEND_PARSED_LIST_EXPR; } + variable { $$.u.ast = $1.u.ast; } + | '&' variable { $$.u.ast = zend_ast_create_unary(ZEND_AST_REF, $2.u.ast); } + | T_LIST '(' assignment_list ')' { $$.u.ast = $3.u.ast; } ; for_statement: @@ -491,8 +489,8 @@ for_statement: foreach_statement: - statement { AS($1); } - | ':' inner_statement_list T_ENDFOREACH ';' { AS($2); } + statement { $$.u.ast = $1.u.ast; } + | ':' inner_statement_list T_ENDFOREACH ';' { $$.u.ast = $2.u.ast; } ; -- cgit v1.2.1 From dde9faee2e027a57e025319c2379e413caf5fa5d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 11 Jul 2014 15:31:47 +0200 Subject: Port switch --- Zend/zend_ast.h | 3 ++ Zend/zend_compile.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 27 +++++++------- 3 files changed, 104 insertions(+), 12 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 3a956717ab..9869e28a7c 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -84,6 +84,9 @@ enum _zend_ast_kind { ZEND_AST_REF, ZEND_AST_IF, ZEND_AST_IF_ELEM, + ZEND_AST_SWITCH, + ZEND_AST_SWITCH_LIST, + ZEND_AST_SWITCH_CASE, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8de27b4430..aab3f7ebd8 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7316,6 +7316,89 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { efree(jmp_opnums); } +void zend_compile_switch(zend_ast *ast TSRMLS_DC) { + zend_ast *expr_ast = ast->child[0]; + zend_ast *cases_ast = ast->child[1]; + + zend_uint i; + zend_bool has_default_case = 0; + zend_switch_entry switch_entry; + + znode expr_node, case_node; + zend_op *opline; + zend_uint *jmpnz_opnums = safe_emalloc(sizeof(zend_uint), cases_ast->children, 0); + zend_uint opnum_default_jmp; + + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + switch_entry.cond = expr_node; + switch_entry.default_case = -1; + switch_entry.control_var = -1; + zend_stack_push(&CG(switch_cond_stack), (void *) &switch_entry); + + do_begin_loop(TSRMLS_C); + + case_node.op_type = IS_TMP_VAR; + case_node.u.op.var = get_temporary_variable(CG(active_op_array)); + + for (i = 0; i < cases_ast->children; ++i) { + zend_ast *case_ast = cases_ast->child[i]; + zend_ast *cond_ast = case_ast->child[0]; + znode cond_node; + + if (!cond_ast) { + has_default_case = 1; + continue; + } + + zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); + + opline = emit_op(NULL, ZEND_CASE, &expr_node, &cond_node TSRMLS_CC); + SET_NODE(opline->result, &case_node); + if (opline->op1_type == IS_CONST) { + zval_copy_ctor(&CONSTANT(opline->op1.constant)); + } + + jmpnz_opnums[i] = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMPNZ, &case_node, NULL TSRMLS_CC); + } + + opnum_default_jmp = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + + for (i = 0; i < cases_ast->children; ++i) { + zend_ast *case_ast = cases_ast->child[i]; + zend_ast *cond_ast = case_ast->child[0]; + zend_ast *stmt_ast = case_ast->child[1]; + + if (cond_ast) { + opline = &CG(active_op_array)->opcodes[jmpnz_opnums[i]]; + opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + } else { + opline = &CG(active_op_array)->opcodes[opnum_default_jmp]; + opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + } + + zend_compile_stmt(stmt_ast TSRMLS_CC); + } + + if (!has_default_case) { + opline = &CG(active_op_array)->opcodes[opnum_default_jmp]; + opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + } + + do_end_loop(get_next_op_number(CG(active_op_array)), 1 TSRMLS_CC); + + if (expr_node.op_type == IS_VAR || expr_node.op_type == IS_TMP_VAR) { + emit_op(NULL, expr_node.op_type == IS_TMP_VAR ? ZEND_FREE : ZEND_SWITCH_FREE, + &expr_node, NULL TSRMLS_CC); + } else if (expr_node.op_type == IS_CONST) { + zval_dtor(&expr_node.u.constant); + } + + zend_stack_del_top(&CG(switch_cond_stack)); +} + void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { zend_uint i; for (i = 0; i < ast->children; ++i) { @@ -8116,6 +8199,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_IF: zend_compile_if(ast TSRMLS_CC); break; + case ZEND_AST_SWITCH: + zend_compile_switch(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index eeead1e414..c832129a7d 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -334,7 +334,9 @@ unticked_statement: { $$.u.ast = zend_ast_create_binary(ZEND_AST_DO_WHILE, $2.u.ast, $4.u.ast); } | T_FOR '(' for_expr ';' for_expr ';' for_expr ')' for_statement { $$.u.ast = zend_ast_create(4, ZEND_AST_FOR, $3.u.ast, $5.u.ast, $7.u.ast, $9.u.ast); } - | T_SWITCH parenthesis_expr { AC($2); zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); AN($$); } + | T_SWITCH parenthesis_expr switch_case_list + { $$.u.ast = zend_ast_create_binary(ZEND_AST_SWITCH, $2.u.ast, $3.u.ast); } + /*| T_SWITCH parenthesis_expr { AC($2); zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); AN($$); }*/ | T_BREAK ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, NULL); } | T_BREAK expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, $2.u.ast); } | T_CONTINUE ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, NULL); } @@ -356,10 +358,6 @@ unticked_statement: foreach_statement { $$.u.ast = zend_ast_create(4, ZEND_AST_FOREACH, $3.u.ast, $7.u.ast, $5.u.ast, $9.u.ast); } - /*| T_FOREACH '(' expr_without_variable T_AS - { AC($3); zend_do_foreach_begin(&$1, &$2, &$3, &$4, 0 TSRMLS_CC); } - foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$6, &$7 TSRMLS_CC); } - foreach_statement { zend_do_foreach_end(&$1, &$4 TSRMLS_CC); AN($$); }*/ | T_DECLARE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); AN($$); } | ';' /* empty statement */ { AN($$); } | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); } @@ -507,17 +505,22 @@ declare_list: switch_case_list: - '{' case_list '}' { $$ = $2; } - | '{' ';' case_list '}' { $$ = $3; } - | ':' case_list T_ENDSWITCH ';' { $$ = $2; } - | ':' ';' case_list T_ENDSWITCH ';' { $$ = $3; } + '{' case_list '}' { $$.u.ast = $2.u.ast; } + | '{' ';' case_list '}' { $$.u.ast = $3.u.ast; } + | ':' case_list T_ENDSWITCH ';' { $$.u.ast = $2.u.ast; } + | ':' ';' case_list T_ENDSWITCH ';' { $$.u.ast = $3.u.ast; } ; case_list: - /* empty */ { $$.op_type = IS_UNUSED; } - | case_list T_CASE expr case_separator { AC($3); zend_do_extended_info(TSRMLS_C); zend_do_case_before_statement(&$1, &$2, &$3 TSRMLS_CC); } inner_statement_list { AS($6); zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } - | case_list T_DEFAULT case_separator { zend_do_extended_info(TSRMLS_C); zend_do_default_before_statement(&$1, &$2 TSRMLS_CC); } inner_statement_list { AS($5); zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; } + /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_SWITCH_LIST); } + | case_list T_CASE expr case_separator inner_statement_list + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, + zend_ast_create_binary(ZEND_AST_SWITCH_CASE, $3.u.ast, $5.u.ast)); } + | case_list T_DEFAULT case_separator inner_statement_list + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, + zend_ast_create_binary(ZEND_AST_SWITCH_CASE, NULL, $4.u.ast)); } + /*| case_list T_CASE expr case_separator { AC($3); zend_do_extended_info(TSRMLS_C); zend_do_case_before_statement(&$1, &$2, &$3 TSRMLS_CC); } inner_statement_list { AS($6); zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; }*/ ; -- cgit v1.2.1 From 32ca08f249d3012b4fa1a2681d6d5d1f5dfd424d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 11 Jul 2014 15:33:39 +0200 Subject: Fix leak --- Zend/zend_compile.c | 1 + Zend/zend_language_parser.y | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index aab3f7ebd8..1fbfec5896 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7397,6 +7397,7 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { } zend_stack_del_top(&CG(switch_cond_stack)); + efree(jmpnz_opnums); } void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index c832129a7d..44d3f0278f 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -336,7 +336,6 @@ unticked_statement: { $$.u.ast = zend_ast_create(4, ZEND_AST_FOR, $3.u.ast, $5.u.ast, $7.u.ast, $9.u.ast); } | T_SWITCH parenthesis_expr switch_case_list { $$.u.ast = zend_ast_create_binary(ZEND_AST_SWITCH, $2.u.ast, $3.u.ast); } - /*| T_SWITCH parenthesis_expr { AC($2); zend_do_switch_cond(&$2 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$4 TSRMLS_CC); AN($$); }*/ | T_BREAK ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, NULL); } | T_BREAK expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, $2.u.ast); } | T_CONTINUE ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, NULL); } @@ -511,7 +510,6 @@ switch_case_list: | ':' ';' case_list T_ENDSWITCH ';' { $$.u.ast = $3.u.ast; } ; - case_list: /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_SWITCH_LIST); } | case_list T_CASE expr case_separator inner_statement_list @@ -520,10 +518,8 @@ case_list: | case_list T_DEFAULT case_separator inner_statement_list { $$.u.ast = zend_ast_dynamic_add($1.u.ast, zend_ast_create_binary(ZEND_AST_SWITCH_CASE, NULL, $4.u.ast)); } - /*| case_list T_CASE expr case_separator { AC($3); zend_do_extended_info(TSRMLS_C); zend_do_case_before_statement(&$1, &$2, &$3 TSRMLS_CC); } inner_statement_list { AS($6); zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; }*/ ; - case_separator: ':' | ';' -- cgit v1.2.1 From e367e68111bb557c00fc008759b8fc7310587843 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Jul 2014 13:50:58 +0200 Subject: Port try/catch Down to 50 failing Zend tests --- Zend/zend_ast.h | 5 ++ Zend/zend_compile.c | 114 ++++++++++++++++++++++++++++++++++++++++---- Zend/zend_language_parser.y | 40 +++++++--------- 3 files changed, 128 insertions(+), 31 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 9869e28a7c..410fce578a 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -84,9 +84,14 @@ enum _zend_ast_kind { ZEND_AST_REF, ZEND_AST_IF, ZEND_AST_IF_ELEM, + ZEND_AST_SWITCH, ZEND_AST_SWITCH_LIST, ZEND_AST_SWITCH_CASE, + + ZEND_AST_TRY, + ZEND_AST_CATCH_LIST, + ZEND_AST_CATCH, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 1fbfec5896..ccddfd616c 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2153,20 +2153,26 @@ void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC) /* {{{ */ } /* }}} */ -static int zend_add_try_element(zend_uint try_op TSRMLS_DC) /* {{{ */ +static zend_uint zend_add_try_element(zend_uint try_op TSRMLS_DC) /* {{{ */ { - int try_catch_offset = CG(active_op_array)->last_try_catch++; + zend_op_array *op_array = CG(active_op_array); + zend_uint try_catch_offset = op_array->last_try_catch++; + zend_try_catch_element *elem; + + op_array->try_catch_array = safe_erealloc( + op_array->try_catch_array, sizeof(zend_try_catch_element), op_array->last_try_catch, 0); + + elem = &op_array->try_catch_array[try_catch_offset]; + elem->try_op = try_op; + elem->catch_op = 0; + elem->finally_op = 0; + elem->finally_end = 0; - CG(active_op_array)->try_catch_array = erealloc(CG(active_op_array)->try_catch_array, sizeof(zend_try_catch_element)*CG(active_op_array)->last_try_catch); - CG(active_op_array)->try_catch_array[try_catch_offset].try_op = try_op; - CG(active_op_array)->try_catch_array[try_catch_offset].catch_op = 0; - CG(active_op_array)->try_catch_array[try_catch_offset].finally_op = 0; - CG(active_op_array)->try_catch_array[try_catch_offset].finally_end = 0; return try_catch_offset; } /* }}} */ -static void zend_add_catch_element(int offset, zend_uint catch_op TSRMLS_DC) /* {{{ */ +static void zend_add_catch_element(zend_uint offset, zend_uint catch_op TSRMLS_DC) /* {{{ */ { CG(active_op_array)->try_catch_array[offset].catch_op = catch_op; } @@ -7400,6 +7406,95 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { efree(jmpnz_opnums); } +void zend_compile_try(zend_ast *ast TSRMLS_DC) { + zend_ast *try_ast = ast->child[0]; + zend_ast *catches_ast = ast->child[1]; + zend_ast *finally_ast = ast->child[2]; + + zend_uint i; + zend_op *opline; + zend_uint try_catch_offset = zend_add_try_element( + get_next_op_number(CG(active_op_array)) TSRMLS_CC); + zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), catches_ast->children + 1, 0); + + if (catches_ast->children == 0 && !finally_ast) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use try without catch or finally"); + } + + zend_compile_stmt(try_ast TSRMLS_CC); + + jmp_opnums[0] = get_next_op_number(CG(active_op_array)); + opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); // TODO + + for (i = 0; i < catches_ast->children; ++i) { + zend_ast *catch_ast = catches_ast->child[i]; + zend_ast *class_ast = catch_ast->child[0]; + zend_ast *var_ast = catch_ast->child[1]; + zend_ast *stmt_ast = catch_ast->child[2]; + zval *var_name = zend_ast_get_zval(var_ast); + + znode class_node; + zend_uint opnum_catch; + + if (zend_is_const_default_class_ref(class_ast)) { + zend_compile_expr(&class_node, class_ast TSRMLS_CC); + zend_resolve_class_name_old(&class_node TSRMLS_CC); + } else { + zend_error_noreturn(E_COMPILE_ERROR, "Bad class name in the catch statement"); + } + + opnum_catch = get_next_op_number(CG(active_op_array)); + zend_add_catch_element(try_catch_offset, opnum_catch TSRMLS_CC); + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_CATCH; + opline->op1_type = IS_CONST; + opline->op1.constant = zend_add_class_name_literal( + CG(active_op_array), &class_node.u.constant TSRMLS_CC); + opline->op2_type = IS_CV; + opline->op2.var = lookup_cv(CG(active_op_array), Z_STR_P(var_name) TSRMLS_CC); + opline->result.num = (i == ast->children - 1); /* Whether this is the last catch */ + + zend_compile_stmt(stmt_ast TSRMLS_CC); + + jmp_opnums[i + 1] = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + + opline = &CG(active_op_array)->opcodes[opnum_catch]; + opline->extended_value = get_next_op_number(CG(active_op_array)); + } + + for (i = 0; i < catches_ast->children + 1; ++i) { + opline = &CG(active_op_array)->opcodes[jmp_opnums[i]]; + opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + } + + if (finally_ast) { + zend_uint opnum_jmp = get_next_op_number(CG(active_op_array)) + 1; + + opline = emit_op(NULL, ZEND_FAST_CALL, NULL, NULL TSRMLS_CC); + opline->op1.opline_num = opnum_jmp + 1; + + emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + + CG(context).in_finally++; + zend_compile_stmt(finally_ast TSRMLS_CC); + CG(context).in_finally--; + + CG(active_op_array)->try_catch_array[try_catch_offset].finally_op = opnum_jmp + 1; + CG(active_op_array)->try_catch_array[try_catch_offset].finally_end + = get_next_op_number(CG(active_op_array)); + CG(active_op_array)->has_finally_block = 1; + + emit_op(NULL, ZEND_FAST_RET, NULL, NULL TSRMLS_CC); + + opline = &CG(active_op_array)->opcodes[opnum_jmp]; + opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + } + + efree(jmp_opnums); +} + void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { zend_uint i; for (i = 0; i < ast->children; ++i) { @@ -8203,6 +8298,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_SWITCH: zend_compile_switch(ast TSRMLS_CC); break; + case ZEND_AST_TRY: + zend_compile_try(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 44d3f0278f..6170e9aa12 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -358,39 +358,33 @@ unticked_statement: { $$.u.ast = zend_ast_create(4, ZEND_AST_FOREACH, $3.u.ast, $7.u.ast, $5.u.ast, $9.u.ast); } | T_DECLARE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); AN($$); } - | ';' /* empty statement */ { AN($$); } - | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); } + | ';' /* empty statement */ { $$.u.ast = NULL; } + | T_TRY '{' inner_statement_list '}' catch_list finally_statement + { $$.u.ast = zend_ast_create_ternary(ZEND_AST_TRY, $3.u.ast, $5.u.ast, $6.u.ast); } + /*| T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); } catch_statement { zend_do_bind_catch(&$1, &$7 TSRMLS_CC); } - finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); AN($$); } + finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); AN($$); }*/ | T_THROW expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_THROW, $2.u.ast); } | T_GOTO T_STRING ';' { $$.u.ast = zend_ast_create_unary(ZEND_GOTO, AST_ZVAL(&$2)); } ; -catch_statement: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_CATCH '(' { zend_initialize_try_catch_element(&$1 TSRMLS_CC); } +catch_list: + /* empty */ + { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_CATCH_LIST); } + | catch_list T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}' + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, + zend_ast_create_ternary(ZEND_AST_CATCH, $4.u.ast, AST_ZVAL(&$5), $8.u.ast)); } + /*| T_CATCH '(' { zend_initialize_try_catch_element(&$1 TSRMLS_CC); } fully_qualified_class_name { zend_do_first_catch(&$2 TSRMLS_CC); } T_VARIABLE ')' { zend_do_begin_catch(&$1, &$4, &$6, &$2 TSRMLS_CC); } '{' inner_statement_list '}' { AS($10); zend_do_end_catch(&$1 TSRMLS_CC); } - additional_catches { zend_do_mark_last_catch(&$2, &$13 TSRMLS_CC); $$ = $1;} - -finally_statement: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_FINALLY { zend_do_finally(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); $$ = $1; } + additional_catches { zend_do_mark_last_catch(&$2, &$13 TSRMLS_CC); $$ = $1;}*/ ; -additional_catches: - non_empty_additional_catches { $$ = $1; } - | /* empty */ { $$.u.op.opline_num = -1; } -; - -non_empty_additional_catches: - additional_catch { $$ = $1; } - | non_empty_additional_catches additional_catch { $$ = $2; } -; - -additional_catch: - T_CATCH '(' fully_qualified_class_name { $$.u.op.opline_num = get_next_op_number(CG(active_op_array)); } T_VARIABLE ')' { zend_do_begin_catch(&$1, &$3, &$5, NULL TSRMLS_CC); } '{' inner_statement_list '}' { AS($9); zend_do_end_catch(&$1 TSRMLS_CC); } +finally_statement: + /* empty */ { $$.u.ast = NULL; } + | T_FINALLY '{' inner_statement_list '}' { $$.u.ast = $3.u.ast; } + /*| T_FINALLY { zend_do_finally(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); $$ = $1; }*/ ; unset_variables: -- cgit v1.2.1 From 8577f58e525b285e816691668ea714b5b1fc78bc Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Jul 2014 14:03:42 +0200 Subject: Store (bad) estimate of lineno with ast Currently not used yet --- Zend/zend_ast.c | 8 ++++++++ Zend/zend_ast.h | 2 ++ Zend/zend_compile.c | 3 +++ Zend/zend_compile.h | 1 + 4 files changed, 14 insertions(+) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index c07d435529..a1ebf7727d 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -25,18 +25,22 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) { + TSRMLS_FETCH(); zend_ast_znode *ast = emalloc(sizeof(zend_ast_znode)); ast->kind = ZEND_AST_ZNODE; ast->attr = 0; + ast->lineno = CG(zend_lineno); ast->node = *node; return (zend_ast *) ast; } ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) { + TSRMLS_FETCH(); zend_ast_zval *ast = emalloc(sizeof(zend_ast_zval)); ast->kind = ZEND_AST_ZVAL; ast->attr = attr; + ast->lineno = CG(zend_lineno); ZVAL_COPY_VALUE(&ast->val, zv); return (zend_ast *) ast; } @@ -44,11 +48,13 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) static zend_ast *zend_ast_create_from_va_list( zend_uint children, zend_ast_kind kind, zend_ast_attr attr, va_list va ) { + TSRMLS_FETCH(); zend_uint i; zend_ast *ast = emalloc(sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *)); ast->kind = kind; ast->attr = attr; + ast->lineno = CG(zend_lineno); ast->children = children; for (i = 0; i < children; ++i) { @@ -87,9 +93,11 @@ ZEND_API zend_ast *zend_ast_create( ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind) { /* use 4 children as default */ + TSRMLS_FETCH(); zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 3); ast->kind = kind; ast->attr = 0; + ast->lineno = CG(zend_lineno); ast->children = 0; return ast; } diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 410fce578a..59d383a64e 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -100,6 +100,7 @@ typedef unsigned short zend_ast_attr; struct _zend_ast { zend_ast_kind kind; /* Type of the node (either opcode or ZEND_AST_* constant) */ zend_ast_attr attr; /* Additional attribute, use depending on node type */ + zend_uint lineno; /* Line number */ zend_uint children; /* Number of children */ zend_ast *child[1]; /* Array of children (using struct hack) */ }; @@ -107,6 +108,7 @@ struct _zend_ast { typedef struct _zend_ast_zval { zend_ast_kind kind; zend_ast_attr attr; + zend_uint lineno; zval val; } zend_ast_zval; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ccddfd616c..7e36b97018 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -8251,6 +8251,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { return; } + // TODO.AST + //CG(zend_lineno) = ast->lineno; + switch (ast->kind) { case ZEND_AST_STMT_LIST: zend_compile_stmt_list(ast TSRMLS_CC); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index c7d3e06a83..268a793ec5 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -91,6 +91,7 @@ typedef struct _znode { /* used only during compilation */ typedef struct _zend_ast_znode { zend_ast_kind kind; zend_ast_attr attr; + zend_uint lineno; znode node; } zend_ast_znode; ZEND_API zend_ast *zend_ast_create_znode(znode *node); -- cgit v1.2.1 From 86a1cd0d82827d3900e06e7aceaac2b19208413e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Jul 2014 16:25:47 +0200 Subject: Verious fixes --- Zend/zend_compile.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7e36b97018..933ac8ffe8 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7206,7 +7206,7 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { opnum_reset = get_next_op_number(CG(active_op_array)); opline = emit_op(&reset_node, ZEND_FE_RESET, &expr_node, NULL TSRMLS_CC); if (by_ref && is_variable) { - opline->extended_value = ZEND_FE_RESET_VARIABLE; // ??? + opline->extended_value = ZEND_FE_RESET_VARIABLE | ZEND_FE_RESET_REFERENCE; // ??? } SET_NODE(foreach_stack_opline.result, &reset_node); @@ -7444,7 +7444,9 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { } opnum_catch = get_next_op_number(CG(active_op_array)); - zend_add_catch_element(try_catch_offset, opnum_catch TSRMLS_CC); + if (i == 0) { + CG(active_op_array)->try_catch_array[try_catch_offset].catch_op = opnum_catch; + } opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_CATCH; @@ -7452,7 +7454,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { opline->op1.constant = zend_add_class_name_literal( CG(active_op_array), &class_node.u.constant TSRMLS_CC); opline->op2_type = IS_CV; - opline->op2.var = lookup_cv(CG(active_op_array), Z_STR_P(var_name) TSRMLS_CC); + opline->op2.var = lookup_cv(CG(active_op_array), STR_COPY(Z_STR_P(var_name)) TSRMLS_CC); opline->result.num = (i == ast->children - 1); /* Whether this is the last catch */ zend_compile_stmt(stmt_ast TSRMLS_CC); -- cgit v1.2.1 From c58079b4fda6c23f112347ab208038480cfd6704 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Jul 2014 17:00:53 +0200 Subject: Port static vars Need to figure out the constant expr stuff --- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 23 +++++++----------- 3 files changed, 69 insertions(+), 14 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 59d383a64e..0769bfa61b 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -73,6 +73,7 @@ enum _zend_ast_kind { ZEND_AST_STMT_LIST, ZEND_AST_GLOBAL, + ZEND_AST_STATIC, ZEND_AST_UNSET, ZEND_AST_RETURN, ZEND_AST_LABEL, diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 933ac8ffe8..4f190d764a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5878,6 +5878,22 @@ void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ } /* }}} */ +// TODO.AST Sort out the whole constant folding issue +static void _tmp_compile_const_expr(zval *result, zend_ast *ast TSRMLS_DC) { + ast = zend_ast_copy(ast); + zend_eval_const_expr(&ast TSRMLS_CC); + zend_compile_const_expr(&ast TSRMLS_CC); + if (ast->kind == ZEND_AST_ZVAL) { + ZVAL_COPY_VALUE(result, zend_ast_get_zval(ast)); + if (Z_TYPE_P(result) == IS_ARRAY) { + zend_make_immutable_array_r(result TSRMLS_CC); + } + efree(ast); + } else { + ZVAL_NEW_AST(result, ast); + } +} + /* {{{ zend_dirname Returns directory name component of path */ ZEND_API size_t zend_dirname(char *path, size_t len) @@ -6913,6 +6929,46 @@ void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { efree(fetch_ast); } +void zend_compile_static_var(zend_ast *ast TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + zend_ast *value_ast = ast->child[1]; + + znode var_node, result; + zval value_zv; + zend_op *opline; + + zend_compile_expr(&var_node, var_ast TSRMLS_CC); + if (var_node.op_type == IS_CONST) { + if (Z_TYPE(var_node.u.constant) != IS_STRING) { + convert_to_string(&var_node.u.constant); + } + } + + if (value_ast) { + _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); + } else { + ZVAL_NULL(&value_zv); + } + + if (!CG(active_op_array)->static_variables) { + if (CG(active_op_array)->scope) { + CG(active_op_array)->scope->ce_flags |= ZEND_HAS_STATIC_IN_METHODS; + } + ALLOC_HASHTABLE(CG(active_op_array)->static_variables); + zend_hash_init(CG(active_op_array)->static_variables, 8, NULL, ZVAL_PTR_DTOR, 0); + } + + zend_hash_update(CG(active_op_array)->static_variables, + Z_STR(var_node.u.constant), &value_zv); + + opline = emit_op(&result, ZEND_FETCH_W, &var_node, NULL TSRMLS_CC); + opline->extended_value = ZEND_FETCH_STATIC; + + zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); + zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); + efree(fetch_ast); +} + void zend_compile_unset(zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; @@ -8263,6 +8319,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_GLOBAL: zend_compile_global_var(ast TSRMLS_CC); break; + case ZEND_AST_STATIC: + zend_compile_static_var(ast TSRMLS_CC); + break; case ZEND_AST_UNSET: zend_compile_unset(ast TSRMLS_CC); break; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6170e9aa12..7cfcb70d62 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -345,7 +345,7 @@ unticked_statement: | T_RETURN expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, $2.u.ast); } | T_GLOBAL global_var_list ';' { $$.u.ast = $2.u.ast; } - | T_STATIC static_var_list ';' { AN($$); } + | T_STATIC static_var_list ';' { $$.u.ast = $2.u.ast; } | T_ECHO echo_expr_list ';' { $$.u.ast = $2.u.ast; } | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, AST_ZVAL(&$1)); } | expr ';' { $$.u.ast = $1.u.ast; } @@ -361,9 +361,6 @@ unticked_statement: | ';' /* empty statement */ { $$.u.ast = NULL; } | T_TRY '{' inner_statement_list '}' catch_list finally_statement { $$.u.ast = zend_ast_create_ternary(ZEND_AST_TRY, $3.u.ast, $5.u.ast, $6.u.ast); } - /*| T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); } - catch_statement { zend_do_bind_catch(&$1, &$7 TSRMLS_CC); } - finally_statement { zend_do_end_finally(&$1, &$6, &$8 TSRMLS_CC); AN($$); }*/ | T_THROW expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_THROW, $2.u.ast); } | T_GOTO T_STRING ';' { $$.u.ast = zend_ast_create_unary(ZEND_GOTO, AST_ZVAL(&$2)); } ; @@ -374,17 +371,11 @@ catch_list: | catch_list T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}' { $$.u.ast = zend_ast_dynamic_add($1.u.ast, zend_ast_create_ternary(ZEND_AST_CATCH, $4.u.ast, AST_ZVAL(&$5), $8.u.ast)); } - /*| T_CATCH '(' { zend_initialize_try_catch_element(&$1 TSRMLS_CC); } - fully_qualified_class_name { zend_do_first_catch(&$2 TSRMLS_CC); } - T_VARIABLE ')' { zend_do_begin_catch(&$1, &$4, &$6, &$2 TSRMLS_CC); } - '{' inner_statement_list '}' { AS($10); zend_do_end_catch(&$1 TSRMLS_CC); } - additional_catches { zend_do_mark_last_catch(&$2, &$13 TSRMLS_CC); $$ = $1;}*/ ; finally_statement: /* empty */ { $$.u.ast = NULL; } | T_FINALLY '{' inner_statement_list '}' { $$.u.ast = $3.u.ast; } - /*| T_FINALLY { zend_do_finally(&$1 TSRMLS_CC); } '{' inner_statement_list '}' { AS($4); $$ = $1; }*/ ; unset_variables: @@ -615,11 +606,15 @@ global_var: static_var_list: - static_var_list ',' T_VARIABLE { zend_do_fetch_static_variable(&$3, NULL, ZEND_FETCH_STATIC TSRMLS_CC); } - | static_var_list ',' T_VARIABLE '=' static_scalar { Z_CONST_FLAGS($5.u.constant) = 0; zend_do_fetch_static_variable(&$3, &$5, ZEND_FETCH_STATIC TSRMLS_CC); } - | T_VARIABLE { zend_do_fetch_static_variable(&$1, NULL, ZEND_FETCH_STATIC TSRMLS_CC); } - | T_VARIABLE '=' static_scalar { Z_CONST_FLAGS($3.u.constant) = 0; zend_do_fetch_static_variable(&$1, &$3, ZEND_FETCH_STATIC TSRMLS_CC); } + static_var_list ',' static_var { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | static_var { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.u.ast); } +; +static_var: + T_VARIABLE + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC, AST_ZVAL(&$1), NULL); } + | T_VARIABLE '=' expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC, AST_ZVAL(&$1), $3.u.ast); } ; -- cgit v1.2.1 From 069da161cfb6328b512ee07d0c71b8348f54cf96 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Jul 2014 17:10:10 +0200 Subject: approx correct linenos in errors --- Zend/zend_ast.c | 16 ++++++++++++---- Zend/zend_compile.c | 5 ++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index a1ebf7727d..5ef590d2e7 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -48,19 +48,27 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) static zend_ast *zend_ast_create_from_va_list( zend_uint children, zend_ast_kind kind, zend_ast_attr attr, va_list va ) { - TSRMLS_FETCH(); + /*TSRMLS_FETCH();*/ zend_uint i; - - zend_ast *ast = emalloc(sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *)); + zend_ast *ast; + + ast = emalloc(sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *)); ast->kind = kind; ast->attr = attr; - ast->lineno = CG(zend_lineno); + ast->lineno = 0; ast->children = children; for (i = 0; i < children; ++i) { ast->child[i] = va_arg(va, zend_ast *); + if (ast->lineno == 0 && ast->child[i] != NULL) { + ast->lineno = ast->child[i]->lineno; + } } + /*if (ast->lineno == 0) { + ast->lineno = CG(zend_lineno); + }*/ + return ast; } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4f190d764a..b1e5a8c617 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -8310,7 +8310,8 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { } // TODO.AST - //CG(zend_lineno) = ast->lineno; + zend_uint orig_lineno = CG(zend_lineno); + CG(zend_lineno) = ast->lineno; switch (ast->kind) { case ZEND_AST_STMT_LIST: @@ -8376,6 +8377,8 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { if (Z_LVAL(CG(declarables).ticks) && !zend_is_unticked_stmt(ast)) { zend_emit_tick(TSRMLS_C); } + + CG(zend_lineno) = orig_lineno; } void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { -- cgit v1.2.1 From 856e2a05b6a5b443dbed0229c0cd3e712ef7213d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Jul 2014 19:08:09 +0200 Subject: Fix + improve try/catch --- Zend/zend_compile.c | 53 ++++++++++++----------------------------------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index b1e5a8c617..74613af84e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2178,33 +2178,6 @@ static void zend_add_catch_element(zend_uint offset, zend_uint catch_op TSRMLS_D } /* }}} */ -void zend_do_first_catch(znode *open_parentheses TSRMLS_DC) /* {{{ */ -{ - open_parentheses->u.op.opline_num = get_next_op_number(CG(active_op_array)); -} -/* }}} */ - -void zend_initialize_try_catch_element(znode *catch_token TSRMLS_DC) /* {{{ */ -{ - int jmp_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zend_llist jmp_list; - zend_llist *jmp_list_ptr; - - opline->opcode = ZEND_JMP; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - /* save for backpatching */ - - zend_llist_init(&jmp_list, sizeof(int), NULL, 0); - zend_stack_push(&CG(bp_stack), (void *) &jmp_list); - jmp_list_ptr = zend_stack_top(&CG(bp_stack)); - zend_llist_add_element(jmp_list_ptr, &jmp_op_number); - - catch_token->EA = get_next_op_number(CG(active_op_array)); -} -/* }}} */ - void zend_do_mark_last_catch(const znode *first_catch, const znode *last_additional_catch TSRMLS_DC) /* {{{ */ { CG(active_op_array)->last--; @@ -2220,13 +2193,6 @@ void zend_do_mark_last_catch(const znode *first_catch, const znode *last_additio } /* }}} */ -void zend_do_try(znode *try_token TSRMLS_DC) /* {{{ */ -{ - try_token->u.op.opline_num = zend_add_try_element(get_next_op_number(CG(active_op_array)) TSRMLS_CC); - INC_BPC(CG(active_op_array)); -} -/* }}} */ - void zend_do_finally(znode *finally_token TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -7471,7 +7437,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { zend_op *opline; zend_uint try_catch_offset = zend_add_try_element( get_next_op_number(CG(active_op_array)) TSRMLS_CC); - zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), catches_ast->children + 1, 0); + zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), catches_ast->children, 0); if (catches_ast->children == 0 && !finally_ast) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use try without catch or finally"); @@ -7479,8 +7445,10 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { zend_compile_stmt(try_ast TSRMLS_CC); - jmp_opnums[0] = get_next_op_number(CG(active_op_array)); - opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); // TODO + if (catches_ast->children != 0) { + jmp_opnums[0] = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + } for (i = 0; i < catches_ast->children; ++i) { zend_ast *catch_ast = catches_ast->child[i]; @@ -7488,6 +7456,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = catch_ast->child[1]; zend_ast *stmt_ast = catch_ast->child[2]; zval *var_name = zend_ast_get_zval(var_ast); + zend_bool is_last_catch = (i + 1 == catches_ast->children); znode class_node; zend_uint opnum_catch; @@ -7511,18 +7480,20 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { CG(active_op_array), &class_node.u.constant TSRMLS_CC); opline->op2_type = IS_CV; opline->op2.var = lookup_cv(CG(active_op_array), STR_COPY(Z_STR_P(var_name)) TSRMLS_CC); - opline->result.num = (i == ast->children - 1); /* Whether this is the last catch */ + opline->result.num = is_last_catch; zend_compile_stmt(stmt_ast TSRMLS_CC); - jmp_opnums[i + 1] = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + if (!is_last_catch) { + jmp_opnums[i + 1] = get_next_op_number(CG(active_op_array)); + emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + } opline = &CG(active_op_array)->opcodes[opnum_catch]; opline->extended_value = get_next_op_number(CG(active_op_array)); } - for (i = 0; i < catches_ast->children + 1; ++i) { + for (i = 0; i < catches_ast->children; ++i) { opline = &CG(active_op_array)->opcodes[jmp_opnums[i]]; opline->op1.opline_num = get_next_op_number(CG(active_op_array)); } -- cgit v1.2.1 From b934dfe08824638c5ef43b7c4279f4796e786d24 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Jul 2014 19:10:19 +0200 Subject: Remove dead code --- Zend/zend_compile.c | 135 ---------------------------------------------------- Zend/zend_compile.h | 7 --- 2 files changed, 142 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 74613af84e..c26ef963fd 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2172,141 +2172,6 @@ static zend_uint zend_add_try_element(zend_uint try_op TSRMLS_DC) /* {{{ */ } /* }}} */ -static void zend_add_catch_element(zend_uint offset, zend_uint catch_op TSRMLS_DC) /* {{{ */ -{ - CG(active_op_array)->try_catch_array[offset].catch_op = catch_op; -} -/* }}} */ - -void zend_do_mark_last_catch(const znode *first_catch, const znode *last_additional_catch TSRMLS_DC) /* {{{ */ -{ - CG(active_op_array)->last--; - zend_do_if_end(TSRMLS_C); - if (last_additional_catch->u.op.opline_num == -1) { - CG(active_op_array)->opcodes[first_catch->u.op.opline_num].result.num = 1; - CG(active_op_array)->opcodes[first_catch->u.op.opline_num].extended_value = get_next_op_number(CG(active_op_array)); - } else { - CG(active_op_array)->opcodes[last_additional_catch->u.op.opline_num].result.num = 1; - CG(active_op_array)->opcodes[last_additional_catch->u.op.opline_num].extended_value = get_next_op_number(CG(active_op_array)); - } - DEC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_finally(znode *finally_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - finally_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); - /* call the the "finally" block */ - opline->opcode = ZEND_FAST_CALL; - SET_UNUSED(opline->op1); - opline->op1.opline_num = finally_token->u.op.opline_num + 1; - SET_UNUSED(opline->op2); - /* jump to code after the "finally" block, - * the actual jump address is going to be set in zend_do_end_finally() - */ - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_JMP; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - - CG(context).in_finally++; -} -/* }}} */ - -void zend_do_begin_catch(znode *catch_token, znode *class_name, znode *catch_var, znode *first_catch TSRMLS_DC) /* {{{ */ -{ - long catch_op_number; - zend_op *opline; - znode catch_class; - - if (class_name->op_type == IS_CONST && - ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant))) { - zend_resolve_class_name_old(class_name TSRMLS_CC); - catch_class = *class_name; - } else { - zend_error_noreturn(E_COMPILE_ERROR, "Bad class name in the catch statement"); - } - - catch_op_number = get_next_op_number(CG(active_op_array)); - if (first_catch) { - first_catch->u.op.opline_num = catch_op_number; - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_CATCH; - opline->op1_type = IS_CONST; - opline->op1.constant = zend_add_class_name_literal(CG(active_op_array), &catch_class.u.constant TSRMLS_CC); - opline->op2_type = IS_CV; - opline->op2.var = lookup_cv(CG(active_op_array), Z_STR(catch_var->u.constant) TSRMLS_CC); - Z_STR(catch_var->u.constant) = CG(active_op_array)->vars[EX_VAR_TO_NUM(opline->op2.var)]; - opline->result.num = 0; /* 1 means it's the last catch in the block */ - - catch_token->u.op.opline_num = catch_op_number; -} -/* }}} */ - -void zend_do_end_catch(znode *catch_token TSRMLS_DC) /* {{{ */ -{ - int jmp_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zend_llist *jmp_list_ptr; - - opline->opcode = ZEND_JMP; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - /* save for backpatching */ - - jmp_list_ptr = zend_stack_top(&CG(bp_stack)); - zend_llist_add_element(jmp_list_ptr, &jmp_op_number); - - CG(active_op_array)->opcodes[catch_token->u.op.opline_num].extended_value = get_next_op_number(CG(active_op_array)); -} -/* }}} */ - -void zend_do_bind_catch(znode *try_token, znode *catch_token TSRMLS_DC) /* {{{ */ { - if (catch_token->op_type != IS_UNUSED) { - zend_add_catch_element(try_token->u.op.opline_num, catch_token->EA TSRMLS_CC); - } -} -/* }}} */ - -void zend_do_end_finally(znode *try_token, znode* catch_token, znode *finally_token TSRMLS_DC) /* {{{ */ -{ - if (catch_token->op_type == IS_UNUSED && finally_token->op_type == IS_UNUSED) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use try without catch or finally"); - } - if (finally_token->op_type != IS_UNUSED) { - zend_op *opline; - - CG(active_op_array)->try_catch_array[try_token->u.op.opline_num].finally_op = finally_token->u.op.opline_num + 1; - CG(active_op_array)->try_catch_array[try_token->u.op.opline_num].finally_end = get_next_op_number(CG(active_op_array)); - CG(active_op_array)->has_finally_block = 1; - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_FAST_RET; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - - CG(active_op_array)->opcodes[finally_token->u.op.opline_num].op1.opline_num = get_next_op_number(CG(active_op_array)); - - CG(context).in_finally--; - } -} -/* }}} */ - -void zend_do_throw(znode *expr TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_THROW; - SET_NODE(opline->op1, expr); - SET_UNUSED(opline->op2); -} -/* }}} */ - ZEND_API void function_add_ref(zend_function *function) /* {{{ */ { if (function->type == ZEND_USER_FUNCTION) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 268a793ec5..885ba51a15 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -521,13 +521,6 @@ void zend_do_handle_exception(TSRMLS_D); void zend_do_begin_lambda_function_declaration(znode *result, znode *function_token, int return_reference, int is_static TSRMLS_DC); void zend_do_fetch_lexical_variable(znode *varname, zend_bool is_ref TSRMLS_DC); -void zend_do_try(znode *try_token TSRMLS_DC); -void zend_do_begin_catch(znode *try_token, znode *catch_class, znode *catch_var, znode *first_catch TSRMLS_DC); -void zend_do_bind_catch(znode *try_token, znode *catch_token TSRMLS_DC); -void zend_do_end_catch(znode *catch_token TSRMLS_DC); -void zend_do_finally(znode *finally_token TSRMLS_DC); -void zend_do_end_finally(znode *try_token, znode* catch_token, znode *finally_token TSRMLS_DC); -void zend_do_throw(znode *expr TSRMLS_DC); ZEND_API int do_bind_function(const zend_op_array *op_array, zend_op *opline, HashTable *function_table, zend_bool compile_time); ZEND_API zend_class_entry *do_bind_class(const zend_op_array *op_array, const zend_op *opline, HashTable *class_table, zend_bool compile_time TSRMLS_DC); -- cgit v1.2.1 From f9ed83469c78f2897b6db6a17568e928c3081e06 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Jul 2014 19:18:09 +0200 Subject: Remove more dead code --- Zend/zend_compile.c | 520 ---------------------------------------------------- Zend/zend_compile.h | 27 --- 2 files changed, 547 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index c26ef963fd..7db59b7505 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -841,189 +841,6 @@ static inline void do_end_loop(int cont_addr, int has_loop_var TSRMLS_DC) /* {{{ } /* }}} */ -void zend_do_while_cond(znode *expr, znode *close_bracket_token TSRMLS_DC) /* {{{ */ -{ - int while_cond_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMPZ; - SET_NODE(opline->op1, expr); - close_bracket_token->u.op.opline_num = while_cond_op_number; - SET_UNUSED(opline->op2); - - do_begin_loop(TSRMLS_C); - INC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_while_end(const znode *while_token, const znode *close_bracket_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - /* add unconditional jump */ - opline->opcode = ZEND_JMP; - opline->op1.opline_num = while_token->u.op.opline_num; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - - /* update while's conditional jmp */ - CG(active_op_array)->opcodes[close_bracket_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array)); - - do_end_loop(while_token->u.op.opline_num, 0 TSRMLS_CC); - - DEC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_for_cond(znode *expr, znode *second_semicolon_token TSRMLS_DC) /* {{{ */ -{ - int for_cond_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMPZNZ; - SET_NODE(opline->op1, expr); /* the conditional expression */ - second_semicolon_token->u.op.opline_num = for_cond_op_number; - SET_UNUSED(opline->op2); -} -/* }}} */ - -void zend_do_for_before_statement(const znode *cond_start, const znode *second_semicolon_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMP; - opline->op1.opline_num = cond_start->u.op.opline_num; - CG(active_op_array)->opcodes[second_semicolon_token->u.op.opline_num].extended_value = get_next_op_number(CG(active_op_array)); - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - - do_begin_loop(TSRMLS_C); - - INC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_for_end(const znode *second_semicolon_token TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMP; - opline->op1.opline_num = second_semicolon_token->u.op.opline_num+1; - CG(active_op_array)->opcodes[second_semicolon_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array)); - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - - do_end_loop(second_semicolon_token->u.op.opline_num+1, 0 TSRMLS_CC); - - DEC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_pre_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC) /* {{{ */ -{ - int last_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline; - - if (last_op_number > 0) { - zend_op *last_op = &CG(active_op_array)->opcodes[last_op_number-1]; - - if (last_op->opcode == ZEND_FETCH_OBJ_RW) { - last_op->opcode = (op==ZEND_PRE_INC)?ZEND_PRE_INC_OBJ:ZEND_PRE_DEC_OBJ; - last_op->result_type = IS_VAR; - last_op->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, last_op->result); - return; - } - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = op; - SET_NODE(opline->op1, op1); - SET_UNUSED(opline->op2); - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); -} -/* }}} */ - -void zend_do_post_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC) /* {{{ */ -{ - int last_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline; - - if (last_op_number > 0) { - zend_op *last_op = &CG(active_op_array)->opcodes[last_op_number-1]; - - if (last_op->opcode == ZEND_FETCH_OBJ_RW) { - last_op->opcode = (op==ZEND_POST_INC)?ZEND_POST_INC_OBJ:ZEND_POST_DEC_OBJ; - last_op->result_type = IS_TMP_VAR; - last_op->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, last_op->result); - return; - } - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = op; - SET_NODE(opline->op1, op1); - SET_UNUSED(opline->op2); - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); -} -/* }}} */ - -void zend_do_if_cond(znode *cond, znode *closing_bracket_token TSRMLS_DC) /* {{{ */ -{ - int if_cond_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMPZ; - SET_NODE(opline->op1, cond); - closing_bracket_token->u.op.opline_num = if_cond_op_number; - SET_UNUSED(opline->op2); - INC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_if_after_statement(const znode *closing_bracket_token, unsigned char initialize TSRMLS_DC) /* {{{ */ -{ - int if_end_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zend_llist *jmp_list_ptr; - - opline->opcode = ZEND_JMP; - /* save for backpatching */ - if (initialize) { - zend_llist jmp_list; - - zend_llist_init(&jmp_list, sizeof(int), NULL, 0); - zend_stack_push(&CG(bp_stack), (void *) &jmp_list); - } - jmp_list_ptr = zend_stack_top(&CG(bp_stack)); - zend_llist_add_element(jmp_list_ptr, &if_end_op_number); - - CG(active_op_array)->opcodes[closing_bracket_token->u.op.opline_num].op2.opline_num = if_end_op_number+1; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); -} -/* }}} */ - -void zend_do_if_end(TSRMLS_D) /* {{{ */ -{ - int next_op_number = get_next_op_number(CG(active_op_array)); - zend_llist *jmp_list_ptr = zend_stack_top(&CG(bp_stack)); - zend_llist_element *le; - - for (le=jmp_list_ptr->head; le; le = le->next) { - CG(active_op_array)->opcodes[*((int *) le->data)].op1.opline_num = next_op_number; - } - zend_llist_destroy(jmp_list_ptr); - zend_stack_del_top(&CG(bp_stack)); - DEC_BPC(CG(active_op_array)); -} -/* }}} */ - void zend_check_writable_variable(const znode *variable) /* {{{ */ { zend_uint type = variable->EA; @@ -3988,28 +3805,6 @@ ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS } /* }}} */ -void zend_do_do_while_begin(TSRMLS_D) /* {{{ */ -{ - do_begin_loop(TSRMLS_C); - INC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_do_while_end(const znode *do_token, const znode *expr_open_bracket, znode *expr TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMPNZ; - SET_NODE(opline->op1, expr); - opline->op2.opline_num = do_token->u.op.opline_num; - SET_UNUSED(opline->op2); - - do_end_loop(expr_open_bracket->u.op.opline_num, 0 TSRMLS_CC); - - DEC_BPC(CG(active_op_array)); -} -/* }}} */ - void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -4031,139 +3826,6 @@ void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_switch_cond(const znode *cond TSRMLS_DC) /* {{{ */ -{ - zend_switch_entry switch_entry; - - switch_entry.cond = *cond; - switch_entry.default_case = -1; - switch_entry.control_var = -1; - zend_stack_push(&CG(switch_cond_stack), (void *) &switch_entry); - - do_begin_loop(TSRMLS_C); - - INC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_switch_end(const znode *case_list TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - zend_switch_entry *switch_entry_ptr = zend_stack_top(&CG(switch_cond_stack)); - - /* add code to jmp to default case */ - if (switch_entry_ptr->default_case != -1) { - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_JMP; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - opline->op1.opline_num = switch_entry_ptr->default_case; - } - - if (case_list->op_type != IS_UNUSED) { /* non-empty switch */ - int next_op_number = get_next_op_number(CG(active_op_array)); - - CG(active_op_array)->opcodes[case_list->u.op.opline_num].op1.opline_num = next_op_number; - } - - /* remember break/continue loop information */ - CG(active_op_array)->brk_cont_array[CG(context).current_brk_cont].cont = CG(active_op_array)->brk_cont_array[CG(context).current_brk_cont].brk = get_next_op_number(CG(active_op_array)); - CG(context).current_brk_cont = CG(active_op_array)->brk_cont_array[CG(context).current_brk_cont].parent; - - if (switch_entry_ptr->cond.op_type==IS_VAR || switch_entry_ptr->cond.op_type==IS_TMP_VAR) { - /* emit free for the switch condition*/ - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = (switch_entry_ptr->cond.op_type == IS_TMP_VAR) ? ZEND_FREE : ZEND_SWITCH_FREE; - SET_NODE(opline->op1, &switch_entry_ptr->cond); - SET_UNUSED(opline->op2); - } - if (switch_entry_ptr->cond.op_type == IS_CONST) { - zval_dtor(&switch_entry_ptr->cond.u.constant); - } - - zend_stack_del_top(&CG(switch_cond_stack)); - - DEC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_case_before_statement(const znode *case_list, znode *case_token, znode *case_expr TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - int next_op_number; - zend_switch_entry *switch_entry_ptr = zend_stack_top(&CG(switch_cond_stack)); - znode result; - - if (switch_entry_ptr->control_var == -1) { - switch_entry_ptr->control_var = get_temporary_variable(CG(active_op_array)); - } - opline->opcode = ZEND_CASE; - opline->result.var = switch_entry_ptr->control_var; - opline->result_type = IS_TMP_VAR; - SET_NODE(opline->op1, &switch_entry_ptr->cond); - SET_NODE(opline->op2, case_expr); - if (opline->op1_type == IS_CONST) { - zval_copy_ctor(&CONSTANT(opline->op1.constant)); - } - GET_NODE(&result, opline->result); - - next_op_number = get_next_op_number(CG(active_op_array)); - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_JMPZ; - SET_NODE(opline->op1, &result); - SET_UNUSED(opline->op2); - case_token->u.op.opline_num = next_op_number; - - if (case_list->op_type==IS_UNUSED) { - return; - } - next_op_number = get_next_op_number(CG(active_op_array)); - CG(active_op_array)->opcodes[case_list->u.op.opline_num].op1.opline_num = next_op_number; -} -/* }}} */ - -void zend_do_case_after_statement(znode *result, const znode *case_token TSRMLS_DC) /* {{{ */ -{ - int next_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMP; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - result->u.op.opline_num = next_op_number; - - switch (CG(active_op_array)->opcodes[case_token->u.op.opline_num].opcode) { - case ZEND_JMP: - CG(active_op_array)->opcodes[case_token->u.op.opline_num].op1.opline_num = get_next_op_number(CG(active_op_array)); - break; - case ZEND_JMPZ: - CG(active_op_array)->opcodes[case_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array)); - break; - } -} -/* }}} */ - -void zend_do_default_before_statement(const znode *case_list, znode *default_token TSRMLS_DC) /* {{{ */ -{ - int next_op_number = get_next_op_number(CG(active_op_array)); - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zend_switch_entry *switch_entry_ptr = zend_stack_top(&CG(switch_cond_stack)); - - opline->opcode = ZEND_JMP; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - default_token->u.op.opline_num = next_op_number; - - next_op_number = get_next_op_number(CG(active_op_array)); - switch_entry_ptr->default_case = next_op_number; - - if (case_list->op_type==IS_UNUSED) { - return; - } - CG(active_op_array)->opcodes[case_list->u.op.opline_num].op1.opline_num = next_op_number; -} -/* }}} */ - void zend_do_begin_class_declaration(const znode *class_token, znode *class_name, const znode *parent_class_name TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -4761,188 +4423,6 @@ void zend_do_fetch_global_variable(znode *varname, const znode *static_assignmen } /* }}} */ -static zend_bool zend_can_write_to_variable(zend_ast *ast); - -void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, znode *array, znode *as_token, int variable TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - zend_bool is_variable; - zend_op dummy_opline; - - open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); - if (variable) { - if (zend_is_call(array->u.ast) || !zend_can_write_to_variable(array->u.ast)) { - is_variable = 0; - AST_COMPILE_VAR(array, array->u.ast, BP_VAR_R); - } else { - is_variable = 1; - AST_COMPILE_VAR(array, array->u.ast, BP_VAR_W); - } - } else { - is_variable = 0; - } - - /* save the location of FE_RESET */ - foreach_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - /* Preform array reset */ - opline->opcode = ZEND_FE_RESET; - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, array); - SET_UNUSED(opline->op2); - opline->extended_value = is_variable ? ZEND_FE_RESET_VARIABLE : 0; - - COPY_NODE(dummy_opline.result, opline->result); - zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline); - - /* save the location of FE_FETCH */ - as_token->u.op.opline_num = get_next_op_number(CG(active_op_array)); - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_FE_FETCH; - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - COPY_NODE(opline->op1, dummy_opline.result); - opline->extended_value = 0; - SET_UNUSED(opline->op2); - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_OP_DATA; - /* Allocate enough space to keep HashPointer on VM stack */ - opline->op1_type = IS_TMP_VAR; - opline->op1.var = get_temporary_variable(CG(active_op_array)); - if (sizeof(HashPointer) > sizeof(zval)) { - /* Make shure 1 zval is enough for HashPointer (2 must be enough) */ - get_temporary_variable(CG(active_op_array)); - } - SET_UNUSED(opline->op2); - SET_UNUSED(opline->result); -} -/* }}} */ - -void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC); -static void zend_compile_list_assign(znode *result, zend_ast *list_ast, znode *expr_node TSRMLS_DC); -zend_op *zend_compile_assign_ref_common(znode *result, zend_ast *target_ast, znode *source_node TSRMLS_DC); - -void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token, const znode *as_token, znode *value, znode *key TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - znode dummy, value_node; - zend_bool assign_by_ref=0; - - opline = &CG(active_op_array)->opcodes[as_token->u.op.opline_num]; - if (key->op_type != IS_UNUSED) { - znode *tmp; - - /* switch between the key and value... */ - tmp = key; - key = value; - value = tmp; - - /* Mark extended_value in case both key and value are being used */ - opline->extended_value |= ZEND_FE_FETCH_WITH_KEY; - } - - if ((key->op_type != IS_UNUSED)) { - if (key->EA & ZEND_PARSED_REFERENCE_VARIABLE) { - zend_error_noreturn(E_COMPILE_ERROR, "Key element cannot be a reference"); - } - if (key->EA & ZEND_PARSED_LIST_EXPR) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use list as key element"); - } - } - - // TODO.AST check writable - if (value->EA & ZEND_PARSED_REFERENCE_VARIABLE) { - assign_by_ref = 1; - - /* Mark extended_value for assign-by-reference */ - opline->extended_value |= ZEND_FE_FETCH_BYREF; - CG(active_op_array)->opcodes[foreach_token->u.op.opline_num].extended_value |= ZEND_FE_RESET_REFERENCE; - } else { - zend_op *fetch = &CG(active_op_array)->opcodes[foreach_token->u.op.opline_num]; - if (fetch->extended_value == ZEND_FE_RESET_VARIABLE) { - zend_op *end = &CG(active_op_array)->opcodes[open_brackets_token->u.op.opline_num]; - - /* Change "write context" into "read context" */ - fetch->extended_value = 0; /* reset ZEND_FE_RESET_VARIABLE */ - while (fetch != end) { - --fetch; - if (fetch->opcode == ZEND_FETCH_DIM_W && fetch->op2_type == IS_UNUSED) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading"); - } - if (fetch->opcode == ZEND_SEPARATE) { - MAKE_NOP(fetch); - } else { - fetch->opcode -= 3; /* FETCH_W -> FETCH_R */ - } - } - } - } - - GET_NODE(&value_node, opline->result); - - if (value->EA & ZEND_PARSED_LIST_EXPR) { - zend_compile_list_assign(&dummy, value->u.ast, &value_node TSRMLS_CC); - zend_do_free(&dummy TSRMLS_CC); - zend_ast_destroy(value->u.ast); - } else { - if (assign_by_ref) { - zend_compile_assign_ref_common(NULL, value->u.ast, &value_node TSRMLS_CC); - zend_ast_destroy(value->u.ast); - } else { - zend_ast *assign_ast = zend_ast_create_binary( - ZEND_AST_ASSIGN, value->u.ast, AST_ZNODE(&value_node)); - AST_COMPILE(&dummy, assign_ast); - zend_do_free(&dummy TSRMLS_CC); - } - } - - if (key->op_type != IS_UNUSED) { - znode key_node; - - opline = &CG(active_op_array)->opcodes[as_token->u.op.opline_num+1]; - opline->result_type = IS_TMP_VAR; - opline->result.opline_num = get_temporary_variable(CG(active_op_array)); - GET_NODE(&key_node, opline->result); - - zend_ast *assign_ast = zend_ast_create_binary( - ZEND_AST_ASSIGN, key->u.ast, AST_ZNODE(&key_node)); - AST_COMPILE(&dummy, assign_ast); - zend_do_free(&dummy TSRMLS_CC); - } - - do_begin_loop(TSRMLS_C); - INC_BPC(CG(active_op_array)); -} -/* }}} */ - -void zend_do_foreach_end(const znode *foreach_token, const znode *as_token TSRMLS_DC) /* {{{ */ -{ - zend_op *container_ptr; - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_JMP; - opline->op1.opline_num = as_token->u.op.opline_num; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - - CG(active_op_array)->opcodes[foreach_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array)); /* FE_RESET */ - CG(active_op_array)->opcodes[as_token->u.op.opline_num].op2.opline_num = get_next_op_number(CG(active_op_array)); /* FE_FETCH */ - - do_end_loop(as_token->u.op.opline_num, 1 TSRMLS_CC); - - container_ptr = zend_stack_top(&CG(foreach_copy_stack)); - generate_free_foreach_copy(container_ptr TSRMLS_CC); - zend_stack_del_top(&CG(foreach_copy_stack)); - - DEC_BPC(CG(active_op_array)); -} -/* }}} */ - void zend_do_declare_begin(TSRMLS_D) /* {{{ */ { zend_stack_push(&CG(declare_stack), &CG(declarables)); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 885ba51a15..e2171fe6e8 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -485,23 +485,6 @@ ZEND_API unary_op_type get_unary_op(int opcode); ZEND_API binary_op_type get_binary_op(int opcode); ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC); -void zend_do_while_cond(znode *expr, znode *close_bracket_token TSRMLS_DC); -void zend_do_while_end(const znode *while_token, const znode *close_bracket_token TSRMLS_DC); -void zend_do_do_while_begin(TSRMLS_D); -void zend_do_do_while_end(const znode *do_token, const znode *expr_open_bracket, znode *expr TSRMLS_DC); - - -void zend_do_if_cond(znode *cond, znode *closing_bracket_token TSRMLS_DC); -void zend_do_if_after_statement(const znode *closing_bracket_token, unsigned char initialize TSRMLS_DC); -void zend_do_if_end(TSRMLS_D); - -void zend_do_for_cond(znode *expr, znode *second_semicolon_token TSRMLS_DC); -void zend_do_for_before_statement(const znode *cond_start, const znode *second_semicolon_token TSRMLS_DC); -void zend_do_for_end(const znode *second_semicolon_token TSRMLS_DC); - -void zend_do_pre_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC); -void zend_do_post_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC); - void zend_do_begin_variable_parse(TSRMLS_D); void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS_DC); @@ -544,12 +527,6 @@ ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC); -void zend_do_switch_cond(const znode *cond TSRMLS_DC); -void zend_do_switch_end(const znode *case_list TSRMLS_DC); -void zend_do_case_before_statement(const znode *case_list, znode *case_token, znode *case_expr TSRMLS_DC); -void zend_do_case_after_statement(znode *result, const znode *case_token TSRMLS_DC); -void zend_do_default_before_statement(const znode *case_list, znode *default_token TSRMLS_DC); - void zend_do_begin_class_declaration(const znode *class_token, znode *class_name, const znode *parent_class_name TSRMLS_DC); void zend_do_end_class_declaration(const znode *class_token, const znode *parent_token TSRMLS_DC); void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC); @@ -561,10 +538,6 @@ void zend_do_halt_compiler_register(TSRMLS_D); void zend_init_list(void *result, void *item TSRMLS_DC); void zend_add_to_list(void *result, void *item TSRMLS_DC); -void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, znode *array, znode *as_token, int variable TSRMLS_DC); -void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token, const znode *as_token, znode *value, znode *key TSRMLS_DC); -void zend_do_foreach_end(const znode *foreach_token, const znode *as_token TSRMLS_DC); - void zend_do_declare_begin(TSRMLS_D); void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC); void zend_do_declare_end(const znode *declare_token TSRMLS_DC); -- cgit v1.2.1 From 484ad8695827d25abc94b2eec887f7ea5f2d3a24 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 12 Jul 2014 19:20:21 +0200 Subject: Moar removal --- Zend/zend_compile.c | 52 ---------------------------------------------------- Zend/zend_compile.h | 3 --- 2 files changed, 55 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7db59b7505..a801a30c36 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3805,27 +3805,6 @@ ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS } /* }}} */ -void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = op; - opline->op1.opline_num = CG(context).current_brk_cont; - SET_UNUSED(opline->op1); - if (expr) { - if (expr->op_type != IS_CONST) { - zend_error_noreturn(E_COMPILE_ERROR, "'%s' operator with non-constant operand is no longer supported", op == ZEND_BRK ? "break" : "continue"); - } else if (Z_TYPE(expr->u.constant) != IS_LONG || Z_LVAL(expr->u.constant) < 1) { - zend_error_noreturn(E_COMPILE_ERROR, "'%s' operator accepts only positive numbers", op == ZEND_BRK ? "break" : "continue"); - } - SET_NODE(opline->op2, expr); - } else { - LITERAL_LONG(opline->op2, 1); - opline->op2_type = IS_CONST; - } -} -/* }}} */ - void zend_do_begin_class_declaration(const znode *class_token, znode *class_name, const znode *parent_class_name TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -4392,37 +4371,6 @@ void zend_do_fetch_lexical_variable(znode *varname, zend_bool is_ref TSRMLS_DC) } /* }}} */ -void zend_do_fetch_global_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - znode lval; - znode result; - - if (varname->op_type == IS_CONST) { - if (Z_TYPE(varname->u.constant) != IS_STRING) { - convert_to_string(&varname->u.constant); - } - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_FETCH_W; /* the default mode must be Write, since fetch_simple_variable() is used to define function arguments */ - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, varname); - SET_UNUSED(opline->op2); - opline->extended_value = fetch_type; // ZEND_FETCH_GLOBAL_LOCK - GET_NODE(&result, opline->result); - - if (varname->op_type == IS_CONST) { - zval_copy_ctor(&varname->u.constant); - } - fetch_simple_variable(&lval, varname, 0 TSRMLS_CC); /* Relies on the fact that the default fetch is BP_VAR_W */ - - zend_do_assign_ref(NULL, &lval, &result TSRMLS_CC); - CG(active_op_array)->opcodes[CG(active_op_array)->last-1].result_type |= EXT_TYPE_UNUSED; -} -/* }}} */ - void zend_do_declare_begin(TSRMLS_D) /* {{{ */ { zend_stack_push(&CG(declare_stack), &CG(declarables)); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index e2171fe6e8..3d0206a785 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -477,7 +477,6 @@ void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC); void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC); void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar op TSRMLS_DC); void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC); -void zend_do_fetch_global_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC); typedef int (*unary_op_type)(zval *, zval * TSRMLS_DC); typedef int (*binary_op_type)(zval *, zval *, zval * TSRMLS_DC); @@ -525,8 +524,6 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent void zend_do_early_binding(TSRMLS_D); ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS_DC); -void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC); - void zend_do_begin_class_declaration(const znode *class_token, znode *class_name, const znode *parent_class_name TSRMLS_DC); void zend_do_end_class_declaration(const znode *class_token, const znode *parent_token TSRMLS_DC); void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC); -- cgit v1.2.1 From 47f0717a69605ad6a059f5afa59948bebd074c90 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 13 Jul 2014 13:11:55 +0200 Subject: Rename params -> args --- Zend/zend_ast.h | 2 +- Zend/zend_compile.c | 84 ++++++++++++++++++++++----------------------- Zend/zend_language_parser.y | 30 ++++++++-------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 0769bfa61b..4b99cd7bf0 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -37,7 +37,7 @@ enum _zend_ast_kind { ZEND_AST_CALL, ZEND_AST_METHOD_CALL, ZEND_AST_STATIC_CALL, - ZEND_AST_PARAMS, + ZEND_AST_ARG_LIST, ZEND_AST_UNPACK, ZEND_AST_CONST, diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a801a30c36..89cd5c435f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5820,26 +5820,26 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { } } -zend_uint zend_compile_params(zend_ast *params, zend_function *fbc TSRMLS_DC) { +zend_uint zend_compile_args(zend_ast *args, zend_function *fbc TSRMLS_DC) { // TODO.AST &var error zend_uint i; zend_bool uses_arg_unpack = 0; zend_uint arg_count = 0; /* number of arguments not including unpacks */ - for (i = 0; i < params->children; ++i) { - zend_ast *param = params->child[i]; + for (i = 0; i < args->children; ++i) { + zend_ast *arg = args->child[i]; zend_uint arg_num = i + 1; - znode param_node; + znode arg_node; zend_op *opline; zend_uchar opcode; zend_ulong flags = 0; - if (param->kind == ZEND_AST_UNPACK) { + if (arg->kind == ZEND_AST_UNPACK) { uses_arg_unpack = 1; - zend_compile_expr(¶m_node, param->child[0] TSRMLS_CC); - opline = emit_op(NULL, ZEND_SEND_UNPACK, ¶m_node, NULL TSRMLS_CC); + zend_compile_expr(&arg_node, arg->child[0] TSRMLS_CC); + opline = emit_op(NULL, ZEND_SEND_UNPACK, &arg_node, NULL TSRMLS_CC); opline->op2.num = arg_count; continue; } @@ -5850,9 +5850,9 @@ zend_uint zend_compile_params(zend_ast *params, zend_function *fbc TSRMLS_DC) { } arg_count++; - if (zend_is_variable(param)) { - if (zend_is_call(param)) { - zend_compile_var(¶m_node, param, BP_VAR_R TSRMLS_CC); + if (zend_is_variable(arg)) { + if (zend_is_call(arg)) { + zend_compile_var(&arg_node, arg, BP_VAR_R TSRMLS_CC); opcode = ZEND_SEND_VAR_NO_REF; flags |= ZEND_ARG_SEND_FUNCTION; if (fbc && ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { @@ -5863,20 +5863,20 @@ zend_uint zend_compile_params(zend_ast *params, zend_function *fbc TSRMLS_DC) { } } else if (fbc) { if (ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { - zend_compile_var(¶m_node, param, BP_VAR_W TSRMLS_CC); + zend_compile_var(&arg_node, arg, BP_VAR_W TSRMLS_CC); opcode = ZEND_SEND_REF; } else { - zend_compile_var(¶m_node, param, BP_VAR_R TSRMLS_CC); + zend_compile_var(&arg_node, arg, BP_VAR_R TSRMLS_CC); opcode = ZEND_SEND_VAR; } } else { - zend_compile_var(¶m_node, param, + zend_compile_var(&arg_node, arg, BP_VAR_FUNC_ARG | (arg_num << BP_VAR_SHIFT) TSRMLS_CC); opcode = ZEND_SEND_VAR; } } else { - zend_compile_expr(¶m_node, param TSRMLS_CC); - if (param_node.op_type & (IS_VAR|IS_CV)) { + zend_compile_expr(&arg_node, arg TSRMLS_CC); + if (arg_node.op_type & (IS_VAR|IS_CV)) { opcode = ZEND_SEND_VAR_NO_REF; if (fbc && ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { flags |= ZEND_ARG_SEND_BY_REF; @@ -5891,7 +5891,7 @@ zend_uint zend_compile_params(zend_ast *params, zend_function *fbc TSRMLS_DC) { opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = opcode; - SET_NODE(opline->op1, ¶m_node); + SET_NODE(opline->op1, &arg_node); SET_UNUSED(opline->op2); opline->op2.opline_num = arg_num; @@ -5912,7 +5912,7 @@ zend_uint zend_compile_params(zend_ast *params, zend_function *fbc TSRMLS_DC) { return arg_count; } -zend_op *zend_compile_call_common(znode *result, zend_ast *params_ast, zend_function *fbc TSRMLS_DC) { +zend_op *zend_compile_call_common(znode *result, zend_ast *args_ast, zend_function *fbc TSRMLS_DC) { zend_op *opline; zend_uint arg_count; @@ -5922,7 +5922,7 @@ zend_op *zend_compile_call_common(znode *result, zend_ast *params_ast, zend_func CG(context).nested_calls++; } - arg_count = zend_compile_params(params_ast, fbc TSRMLS_CC); + arg_count = zend_compile_args(args_ast, fbc TSRMLS_CC); opline = emit_op(result, fbc ? ZEND_DO_FCALL : ZEND_DO_FCALL_BY_NAME, NULL, NULL TSRMLS_CC); opline->op2.num = CG(context).nested_calls; @@ -5956,7 +5956,7 @@ zend_bool zend_compile_function_name(znode *name_node, zend_ast *name_ast TSRMLS return !is_fully_qualified && Z_TYPE(CG(current_namespace)) != IS_UNDEF; } -void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *params_ast TSRMLS_DC) { +void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *args_ast TSRMLS_DC) { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_INIT_NS_FCALL_BY_NAME; opline->result.num = CG(context).nested_calls; @@ -5966,10 +5966,10 @@ void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *params_ast CG(active_op_array), &name_node->u.constant TSRMLS_CC); GET_CACHE_SLOT(opline->op2.constant); - zend_compile_call_common(result, params_ast, NULL TSRMLS_CC); + zend_compile_call_common(result, args_ast, NULL TSRMLS_CC); } -void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *params_ast TSRMLS_DC) { +void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_ast TSRMLS_DC) { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_INIT_FCALL_BY_NAME; opline->result.num = CG(context).nested_calls; @@ -5983,13 +5983,13 @@ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *params SET_NODE(opline->op2, name_node); } - zend_compile_call_common(result, params_ast, NULL TSRMLS_CC); + zend_compile_call_common(result, args_ast, NULL TSRMLS_CC); } -zend_bool zend_params_contain_unpack(zend_ast *params) { +zend_bool zend_args_contain_unpack(zend_ast *args) { zend_uint i; - for (i = 0; i < params->children; ++i) { - if (params->child[i]->kind == ZEND_AST_UNPACK) { + for (i = 0; i < args->children; ++i) { + if (args->child[i]->kind == ZEND_AST_UNPACK) { return 1; } } @@ -5998,27 +5998,27 @@ zend_bool zend_params_contain_unpack(zend_ast *params) { void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; - zend_ast *params_ast = ast->child[1]; + zend_ast *args_ast = ast->child[1]; znode name_node; if (name_ast->kind != ZEND_AST_ZVAL || Z_TYPE_P(zend_ast_get_zval(name_ast)) != IS_STRING) { zend_compile_expr(&name_node, name_ast TSRMLS_CC); - zend_compile_dynamic_call(result, &name_node, params_ast TSRMLS_CC); + zend_compile_dynamic_call(result, &name_node, args_ast TSRMLS_CC); return; } { zend_bool needs_runtime_resolution = zend_compile_function_name(&name_node, name_ast TSRMLS_CC); if (needs_runtime_resolution) { - zend_compile_ns_call(result, &name_node, params_ast TSRMLS_CC); + zend_compile_ns_call(result, &name_node, args_ast TSRMLS_CC); return; } } /* Arg unpacking needs EX(call), so don't try to optimize it away */ - if (zend_params_contain_unpack(params_ast)) { - zend_compile_dynamic_call(result, &name_node, params_ast TSRMLS_CC); + if (zend_args_contain_unpack(args_ast)) { + zend_compile_dynamic_call(result, &name_node, args_ast TSRMLS_CC); return; } @@ -6034,14 +6034,14 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { fbc->type == ZEND_INTERNAL_FUNCTION) ) { STR_FREE(lcname); - zend_compile_dynamic_call(result, &name_node, params_ast TSRMLS_CC); + zend_compile_dynamic_call(result, &name_node, args_ast TSRMLS_CC); return; } zval_ptr_dtor(&name_node.u.constant); ZVAL_NEW_STR(&name_node.u.constant, lcname); - opline = zend_compile_call_common(result, params_ast, fbc TSRMLS_CC); + opline = zend_compile_call_common(result, args_ast, fbc TSRMLS_CC); SET_NODE(opline->op1, &name_node); GET_CACHE_SLOT(opline->op1.constant); } @@ -6050,7 +6050,7 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { void zend_compile_method_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { //zend_ast *obj_ast = ast->child[0]; //zend_ast *method_ast = ast->child[1]; - zend_ast *params_ast = ast->child[2]; + zend_ast *args_ast = ast->child[2]; // TODO.AST __clone check - WTF is that done in here?! @@ -6072,7 +6072,7 @@ void zend_compile_method_call(znode *result, zend_ast *ast, int type TSRMLS_DC) GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); } - zend_compile_call_common(result, params_ast, NULL TSRMLS_CC); + zend_compile_call_common(result, args_ast, NULL TSRMLS_CC); } zend_bool zend_is_constructor(zend_string *name) { @@ -6086,7 +6086,7 @@ zend_bool zend_is_constructor(zend_string *name) { void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_ast *class_ast = ast->child[0]; zend_ast *method_ast = ast->child[1]; - zend_ast *params_ast = ast->child[2]; + zend_ast *args_ast = ast->child[2]; znode class_node, method_node; zend_op *opline; @@ -6132,12 +6132,12 @@ void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) SET_NODE(opline->op2, &method_node); } - zend_compile_call_common(result, params_ast, NULL TSRMLS_CC); + zend_compile_call_common(result, args_ast, NULL TSRMLS_CC); } void zend_compile_new(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *class_ast = ast->child[0]; - zend_ast *params_ast = ast->child[1]; + zend_ast *args_ast = ast->child[1]; znode class_node, ctor_result; zend_op *opline; @@ -6149,7 +6149,7 @@ void zend_compile_new(znode *result, zend_ast *ast TSRMLS_DC) { opline = emit_op(result, ZEND_NEW, &class_node, NULL TSRMLS_CC); opline->extended_value = CG(context).nested_calls; - zend_compile_call_common(&ctor_result, params_ast, NULL TSRMLS_CC); + zend_compile_call_common(&ctor_result, args_ast, NULL TSRMLS_CC); zend_do_free(&ctor_result TSRMLS_CC); /* New jumps over ctor call if ctor does not exist */ @@ -7203,17 +7203,17 @@ void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *expr_ast = ast->child[0]; zval fn_name; - zend_ast *name_ast, *params_ast, *call_ast; + zend_ast *name_ast, *args_ast, *call_ast; ZVAL_STRING(&fn_name, "shell_exec"); name_ast = zend_ast_create_zval(&fn_name); - params_ast = zend_ast_dynamic_add(zend_ast_create_dynamic(ZEND_AST_PARAMS), expr_ast); - call_ast = zend_ast_create_binary(ZEND_AST_CALL, name_ast, params_ast); + args_ast = zend_ast_dynamic_add(zend_ast_create_dynamic(ZEND_AST_ARG_LIST), expr_ast); + call_ast = zend_ast_create_binary(ZEND_AST_CALL, name_ast, args_ast); zend_compile_expr(result, call_ast TSRMLS_CC); efree(call_ast); - efree(params_ast); + efree(args_ast); zend_ast_destroy(name_ast); } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 7cfcb70d62..22d3c9fbce 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -575,19 +575,19 @@ optional_class_type: | fully_qualified_class_name { $$ = $1; } ; -function_call_parameter_list: - '(' ')' { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); } - | '(' non_empty_function_call_parameter_list ')' { $$.u.ast = $2.u.ast; } +argument_list: + '(' ')' { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_ARG_LIST); } + | '(' non_empty_argument_list ')' { $$.u.ast = $2.u.ast; } ; -non_empty_function_call_parameter_list: - function_call_parameter - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PARAMS, $1.u.ast); } - | non_empty_function_call_parameter_list ',' function_call_parameter +non_empty_argument_list: + argument + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARG_LIST, $1.u.ast); } + | non_empty_argument_list ',' argument { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } ; -function_call_parameter: +argument: expr_without_variable { $$.u.ast = $1.u.ast; } | variable { $$.u.ast = $1.u.ast; } /*| '&' variable { ZEND_ASSERT(0); } */ @@ -894,15 +894,15 @@ lexical_var_list: ; function_call: - name function_call_parameter_list + name argument_list { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.u.ast, $2.u.ast); } - | class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list + | class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, AST_ZVAL(&$1), $3.u.ast, $4.u.ast); } - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name function_call_parameter_list + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, $1.u.ast, $3.u.ast, $4.u.ast); } - | callable_expr function_call_parameter_list + | callable_expr argument_list { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.u.ast, $2.u.ast); } ; @@ -942,8 +942,8 @@ backticks_expr: ctor_arguments: - /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAMS); } - | function_call_parameter_list { $$.u.ast = $1.u.ast; } + /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_ARG_LIST); } + | argument_list { $$.u.ast = $1.u.ast; } ; @@ -1025,7 +1025,7 @@ callable_variable: { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } | dereferencable '{' expr '}' { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } - | dereferencable T_OBJECT_OPERATOR member_name function_call_parameter_list + | dereferencable T_OBJECT_OPERATOR member_name argument_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_METHOD_CALL, $1.u.ast, $3.u.ast, $4.u.ast); } | function_call { $$.u.ast = $1.u.ast; } ; -- cgit v1.2.1 From 1ee3277abac485f248ff9fc4b6ecd907d438b70d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 14 Jul 2014 23:03:53 +0200 Subject: Port parameter defs Has one bug re \self --- Zend/zend_ast.h | 4 ++ Zend/zend_compile.c | 136 ++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_compile.h | 3 + Zend/zend_language_parser.y | 46 ++++++++------- 4 files changed, 168 insertions(+), 21 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 4b99cd7bf0..f0f8e9546a 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -93,6 +93,10 @@ enum _zend_ast_kind { ZEND_AST_TRY, ZEND_AST_CATCH_LIST, ZEND_AST_CATCH, + + ZEND_AST_PARAM_LIST, + ZEND_AST_PARAM, + ZEND_AST_TYPE, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 89cd5c435f..b633d7f1e1 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5361,10 +5361,16 @@ static zend_bool zend_can_write_to_variable(zend_ast *ast) { static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { zval *name; int fetch_type; + if (name_ast->kind != ZEND_AST_ZVAL) { return 0; } + /* Fully qualified names are always default refs */ + /*if (!name_ast->attr) { + return 1; + }*/ + name = zend_ast_get_zval(name_ast); fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); return fetch_type == ZEND_FETCH_CLASS_DEFAULT; @@ -6824,6 +6830,136 @@ void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { } } +void zend_compile_params(zend_ast *ast TSRMLS_DC) { + zend_uint i; + zend_op_array *op_array = CG(active_op_array); + zend_arg_info *arg_infos; + + if (ast->children == 0) { + return; + } + + arg_infos = safe_emalloc(sizeof(zend_arg_info), ast->children, 0); + for (i = 0; i < ast->children; ++i) { + zend_ast *param_ast = ast->child[i]; + zend_ast *type_ast = param_ast->child[0]; + zend_ast *var_ast = param_ast->child[1]; + zend_ast *default_ast = param_ast->child[2]; + zend_string *name = Z_STR_P(zend_ast_get_zval(var_ast)); + zend_bool is_ref = (param_ast->attr & ZEND_PARAM_REF) != 0; + zend_bool is_variadic = (param_ast->attr & ZEND_PARAM_VARIADIC) != 0; + + znode var_node, default_node; + zend_uchar opcode; + zend_op *opline; + zend_arg_info *arg_info; + + if (zend_is_auto_global(name TSRMLS_CC)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign auto-global variable %s", + name->val); + } + + var_node.op_type = IS_CV; + var_node.u.op.var = lookup_cv(CG(active_op_array), STR_COPY(name) TSRMLS_CC); + + if (name->len == sizeof("this") - 1 && !memcmp(name->val, "this", sizeof("this") - 1)) { + if (op_array->scope && (op_array->fn_flags & ZEND_ACC_STATIC) == 0) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); + } + op_array->this_var = var_node.u.op.var; + } + + if (op_array->fn_flags & ZEND_ACC_VARIADIC) { + zend_error_noreturn(E_COMPILE_ERROR, "Only the last parameter can be variadic"); + } + + if (is_variadic) { + opcode = ZEND_RECV_VARIADIC; + default_node.op_type = IS_UNUSED; + op_array->fn_flags |= ZEND_ACC_VARIADIC; + + if (default_ast) { + zend_error_noreturn(E_COMPILE_ERROR, + "Variadic parameter cannot have a default value"); + } + } else if (default_ast) { + opcode = ZEND_RECV_INIT; + default_node.op_type = IS_CONST; + _tmp_compile_const_expr(&default_node.u.constant, default_ast TSRMLS_CC); + } else { + opcode = ZEND_RECV; + default_node.op_type = IS_UNUSED; + op_array->required_num_args = i + 1; + } + + opline = emit_op(NULL, opcode, NULL, &default_node TSRMLS_CC); + SET_NODE(opline->result, &var_node); + opline->op1.num = i + 1; + + arg_info = &arg_infos[i]; + arg_info->name = estrndup(name->val, name->len); + arg_info->name_len = name->len; + arg_info->pass_by_reference = is_ref; + arg_info->is_variadic = is_variadic; + arg_info->type_hint = 0; + arg_info->allow_null = 1; + arg_info->class_name = NULL; + arg_info->class_name_len = 0; + + if (type_ast) { + zend_bool has_null_default = default_ast + && (Z_TYPE(default_node.u.constant) == IS_NULL + || (Z_TYPE(default_node.u.constant) == IS_CONSTANT + && strcasecmp(Z_STRVAL(default_node.u.constant), "NULL")) + || Z_TYPE(default_node.u.constant) == IS_CONSTANT_AST); // ??? + + op_array->fn_flags |= ZEND_ACC_HAS_TYPE_HINTS; + arg_info->allow_null = has_null_default; + + if (type_ast->kind == ZEND_AST_TYPE) { + arg_info->type_hint = type_ast->attr; + if (arg_info->type_hint == IS_ARRAY) { + if (default_ast && !has_null_default + && Z_TYPE(default_node.u.constant) != IS_ARRAY + ) { + zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters " + "with array type hint can only be an array or NULL"); + } + } else if (arg_info->type_hint == IS_CALLABLE && default_ast) { + if (default_ast && !has_null_default) { + zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters " + "with callable type hint can only be NULL"); + } + } + } else { + zend_string *class_name = Z_STR_P(zend_ast_get_zval(type_ast)); + zend_bool is_fully_qualified = !type_ast->attr; + + if (zend_is_const_default_class_ref(type_ast)) { + class_name = zend_resolve_class_name(class_name, is_fully_qualified TSRMLS_CC); + } else { + STR_ADDREF(class_name); + } + + arg_info->type_hint = IS_OBJECT; + arg_info->class_name = estrndup(class_name->val, class_name->len); + arg_info->class_name_len = class_name->len; + + STR_RELEASE(class_name); + + if (default_ast && !has_null_default) { + zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters " + "with a class type hint can only be NULL"); + } + } + } + } + + /* These are assigned at the end to avoid unitialized memory in case of an error */ + op_array->num_args = ast->children; + op_array->arg_info = arg_infos; +} + 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]; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 3d0206a785..8a56b4c3f0 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -661,6 +661,9 @@ int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC); #define ZEND_PARSED_NEW (1<<6) #define ZEND_PARSED_LIST_EXPR (1<<7) +#define ZEND_PARAM_REF (1<<0) +#define ZEND_PARAM_VARIADIC (1<<1) + /* unset types */ #define ZEND_UNSET_REG 0 diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 22d3c9fbce..0a2e1f88af 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -397,18 +397,18 @@ class_declaration_statement: is_reference: /* empty */ { $$.op_type = 0; } - | '&' { $$.op_type = 1; } + | '&' { $$.op_type = ZEND_PARAM_REF; } ; is_variadic: /* empty */ { $$.op_type = 0; } - | T_ELLIPSIS { $$.op_type = 1; } + | T_ELLIPSIS { $$.op_type = ZEND_PARAM_VARIADIC; } ; unticked_function_declaration_statement: function is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$3, 0, $2.op_type, NULL TSRMLS_CC); } - '(' parameter_list ')' - '{' inner_statement_list '}' { AS($9); zend_do_end_function_declaration(&$1 TSRMLS_CC); } + '(' parameter_list ')' { zend_compile_params($6.u.ast TSRMLS_CC); zend_ast_destroy($6.u.ast); } + '{' inner_statement_list '}' { AS($10); zend_do_end_function_declaration(&$1 TSRMLS_CC); } ; unticked_class_declaration_statement: @@ -550,29 +550,33 @@ alt_if_stmt: ; parameter_list: - non_empty_parameter_list - | /* empty */ + non_empty_parameter_list { $$.u.ast = $1.u.ast; } + | /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAM_LIST); } ; non_empty_parameter_list: parameter + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PARAM_LIST, $1.u.ast); } | non_empty_parameter_list ',' parameter + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } ; parameter: - optional_class_type is_reference is_variadic T_VARIABLE - { zend_do_receive_param(ZEND_RECV, &$4, NULL, &$1, $2.op_type, $3.op_type TSRMLS_CC); } - | optional_class_type is_reference is_variadic T_VARIABLE '=' static_scalar - { zend_do_receive_param(ZEND_RECV_INIT, &$4, &$6, &$1, $2.op_type, $3.op_type TSRMLS_CC); } + optional_type is_reference is_variadic T_VARIABLE + { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.op_type | $3.op_type, + $1.u.ast, AST_ZVAL(&$4), NULL); } + | optional_type is_reference is_variadic T_VARIABLE '=' expr + { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.op_type | $3.op_type, + $1.u.ast, AST_ZVAL(&$4), $6.u.ast); } ; -optional_class_type: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_ARRAY { $$.op_type = IS_CONST; Z_TYPE_INFO($$.u.constant)=IS_ARRAY; } - | T_CALLABLE { $$.op_type = IS_CONST; Z_TYPE_INFO($$.u.constant)=IS_CALLABLE; } - | fully_qualified_class_name { $$ = $1; } +optional_type: + /* empty */ { $$.u.ast = NULL; } + | T_ARRAY { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_TYPE, IS_ARRAY); } + | T_CALLABLE { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_TYPE, IS_CALLABLE); } + | name { $$.u.ast = $1.u.ast; } ; argument_list: @@ -629,8 +633,8 @@ class_statement: | class_constant_declaration ';' | trait_use_statement | method_modifiers function is_reference T_STRING { zend_do_begin_function_declaration(&$2, &$4, 1, $3.op_type, &$1 TSRMLS_CC); } - '(' parameter_list ')' - method_body { zend_do_abstract_method(&$4, &$1, &$9 TSRMLS_CC); zend_do_end_function_declaration(&$2 TSRMLS_CC); } + '(' parameter_list ')' { zend_compile_params($7.u.ast TSRMLS_CC); zend_ast_destroy($7.u.ast); } + method_body { zend_do_abstract_method(&$4, &$1, &$10 TSRMLS_CC); zend_do_end_function_declaration(&$2 TSRMLS_CC); } ; trait_use_statement: @@ -870,11 +874,11 @@ expr_without_variable: | T_YIELD expr T_DOUBLE_ARROW expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } | function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); } - '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { AS($9); zend_do_end_function_declaration(&$1 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$3); } + '(' parameter_list ')' { zend_compile_params($5.u.ast TSRMLS_CC); zend_ast_destroy($5.u.ast); } lexical_vars + '{' inner_statement_list '}' { AS($10); zend_do_end_function_declaration(&$1 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$3); } | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } - '(' parameter_list ')' lexical_vars - '{' inner_statement_list '}' { AS($10); zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } + '(' parameter_list ')' { zend_compile_params($6.u.ast TSRMLS_CC); zend_ast_destroy($6.u.ast); } lexical_vars + '{' inner_statement_list '}' { AS($11); zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } ; function: -- cgit v1.2.1 From f589713cc4c078a428aa1bf87d88f837e9d939e2 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 16 Jul 2014 00:06:41 +0200 Subject: Preliminary function decl support Problem: __FUNCTION__ etc don't work anymore, due to lexer/parser interdependency. --- Zend/zend_ast.c | 6 +-- Zend/zend_ast.h | 2 + Zend/zend_compile.c | 117 ++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 14 ++---- Zend/zend_opcode.c | 1 + 5 files changed, 128 insertions(+), 12 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 5ef590d2e7..1e40455022 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -55,17 +55,17 @@ static zend_ast *zend_ast_create_from_va_list( ast = emalloc(sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *)); ast->kind = kind; ast->attr = attr; - ast->lineno = 0; + ast->lineno = UINT_MAX; ast->children = children; for (i = 0; i < children; ++i) { ast->child[i] = va_arg(va, zend_ast *); - if (ast->lineno == 0 && ast->child[i] != NULL) { + if (ast->child[i] != NULL && ast->child[i]->lineno < ast->lineno) { ast->lineno = ast->child[i]->lineno; } } - /*if (ast->lineno == 0) { + /*if (ast->lineno == UINT_MAX) { ast->lineno = CG(zend_lineno); }*/ diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index f0f8e9546a..dde544804e 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -97,6 +97,8 @@ enum _zend_ast_kind { ZEND_AST_PARAM_LIST, ZEND_AST_PARAM, ZEND_AST_TYPE, + + ZEND_AST_FUNC_DECL, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index b633d7f1e1..ef24086a34 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6960,6 +6960,120 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { op_array->arg_info = arg_infos; } +void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { + zend_ast *name_ast = ast->child[0]; + zend_ast *params_ast = ast->child[1]; + zend_ast *stmt_ast = ast->child[2]; + zend_bool returns_ref = ast->attr; + zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); + + zend_op_array *orig_op_array = CG(active_op_array); + zend_op_array *op_array = emalloc(sizeof(zend_op_array)); + zend_string *lcname; + zend_op *opline; + + // TODO.AST interactive (not just here - also bpc etc!) + + init_op_array(op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE TSRMLS_CC); + + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + op_array->function_name = name = zend_concat_names( + Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); + } else { + op_array->function_name = STR_COPY(name); + } + + op_array->line_start = ast->lineno; + if (returns_ref) { + op_array->fn_flags |= ZEND_ACC_RETURN_REFERENCE; + } + + lcname = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lcname->val, name->val, name->len); + + if (CG(current_import_function)) { + zend_string *import_name = zend_hash_find_ptr(CG(current_import_function), lcname); + if (import_name) { + char *import_name_lc = zend_str_tolower_dup(import_name->val, import_name->len); + + if (import_name->len != name->len + || memcmp(import_name_lc, lcname->val, name->len) + ) { + zend_error(E_COMPILE_ERROR, "Cannot declare function %s " + "because the name is already in use", name->val); + } + + efree(import_name_lc); + } + } + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_DECLARE_FUNCTION; + opline->extended_value = ZEND_DECLARE_FUNCTION; + opline->op2_type = IS_CONST; + LITERAL_STR(opline->op2, lcname); + + { + zval key; + build_runtime_defined_function_key(&key, lcname->val, lcname->len TSRMLS_CC); + + opline->op1_type = IS_CONST; + opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); + + zend_hash_update_ptr(CG(function_table), Z_STR(key), op_array); + } + + CG(active_op_array) = op_array; + zend_stack_push(&CG(context_stack), (void *) &CG(context)); + zend_init_compiler_context(TSRMLS_C); + + if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) { + zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); + + opline = emit_op(NULL, ZEND_EXT_NOP, NULL, NULL TSRMLS_CC); + opline->lineno = ast->lineno; + } + + { + /* Push a separator to the switch stack */ + zend_switch_entry switch_entry; + + switch_entry.cond.op_type = IS_UNUSED; + switch_entry.default_case = 0; + switch_entry.control_var = 0; + + zend_stack_push(&CG(switch_cond_stack), (void *) &switch_entry); + } + + { + /* Push a separator to the foreach stack */ + zend_op dummy_opline; + + dummy_opline.result_type = IS_UNUSED; + + zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline); + } + + zend_compile_params(params_ast TSRMLS_CC); + zend_compile_stmt(stmt_ast TSRMLS_CC); + + zend_do_extended_info(TSRMLS_C); + zend_do_return(NULL, 0 TSRMLS_CC); + + pass_two(CG(active_op_array) TSRMLS_CC); + zend_release_labels(0 TSRMLS_CC); + + // TODO.AST __autoload + // TODO.AST end line + // TODO.AST doc comment + + CG(active_op_array) = orig_op_array; + + /* Pop the switch and foreach separators */ + zend_stack_del_top(&CG(switch_cond_stack)); + zend_stack_del_top(&CG(foreach_copy_stack)); +} + 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]; @@ -7766,6 +7880,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_TRY: zend_compile_try(ast TSRMLS_CC); break; + case ZEND_AST_FUNC_DECL: + zend_compile_func_decl(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 0a2e1f88af..6e6dc32bd8 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -247,7 +247,7 @@ name: top_statement: statement { AS($1); zend_verify_namespace(TSRMLS_C); } - | function_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } + | function_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } | class_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } | T_HALT_COMPILER '(' ')' ';' { zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } | T_NAMESPACE namespace_name ';' { zend_do_begin_namespace(&$2, 0 TSRMLS_CC); } @@ -312,7 +312,7 @@ inner_statement_list: inner_statement: statement { $$.u.ast = $1.u.ast; } - | function_declaration_statement { AN($$); } + | function_declaration_statement { $$.u.ast = $1.u.ast; } | class_declaration_statement { AN($$); } | T_HALT_COMPILER '(' ')' ';' { zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); } @@ -388,7 +388,9 @@ unset_variable: ; function_declaration_statement: - unticked_function_declaration_statement { DO_TICKS(); } + function is_reference T_STRING '(' parameter_list ')' '{' inner_statement_list '}' + { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_FUNC_DECL, + $2.op_type, AST_ZVAL(&$3), $5.u.ast, $8.u.ast); } ; class_declaration_statement: @@ -405,12 +407,6 @@ is_variadic: | T_ELLIPSIS { $$.op_type = ZEND_PARAM_VARIADIC; } ; -unticked_function_declaration_statement: - function is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$3, 0, $2.op_type, NULL TSRMLS_CC); } - '(' parameter_list ')' { zend_compile_params($6.u.ast TSRMLS_CC); zend_ast_destroy($6.u.ast); } - '{' inner_statement_list '}' { AS($10); zend_do_end_function_declaration(&$1 TSRMLS_CC); } -; - unticked_class_declaration_statement: class_entry_type T_STRING extends_from { zend_do_begin_class_declaration(&$1, &$2, &$3 TSRMLS_CC); } diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index e524645e4e..f457e7e0d5 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -82,6 +82,7 @@ void init_op_array(zend_op_array *op_array, zend_uchar type, int initial_ops_siz op_array->required_num_args = 0; op_array->scope = NULL; + op_array->prototype = NULL; op_array->brk_cont_array = NULL; op_array->try_catch_array = NULL; -- cgit v1.2.1 From a75921dcb1cb6d55a530e39c7d0c758b4ed9d2a3 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 16 Jul 2014 23:10:16 +0200 Subject: Port __FUNCTION__ to AST --- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 22 +++- Zend/zend_language_parser.y | 18 +-- Zend/zend_language_scanner.c | 296 +++++++++++++++++++++---------------------- Zend/zend_language_scanner.l | 6 - 5 files changed, 176 insertions(+), 167 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index dde544804e..864503db72 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -68,6 +68,7 @@ enum _zend_ast_kind { ZEND_AST_ARRAY, ZEND_AST_ARRAY_ELEM, ZEND_AST_ENCAPS_LIST, + ZEND_AST_MAGIC_CONST, ZEND_AST_EXPR_LIST, ZEND_AST_STMT_LIST, diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ef24086a34..4112414f13 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7678,6 +7678,23 @@ void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { } } +void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { + zend_op_array *op_array = CG(active_op_array); + zval *zv = &result->u.constant; + result->op_type = IS_CONST; + + switch (ast->attr) { + case T_FUNC_C: + if (op_array && op_array->function_name) { + ZVAL_STR(zv, STR_COPY(op_array->function_name)); + } else { + ZVAL_EMPTY_STRING(zv); + } + break; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { return kind == ZEND_AST_ZVAL || kind == ZEND_AST_BINARY_OP || kind == ZEND_AST_GREATER || kind == ZEND_AST_GREATER_EQUAL @@ -7687,7 +7704,7 @@ zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { || kind == ZEND_AST_CONDITIONAL || kind == ZEND_AST_ARRAY || kind == ZEND_AST_ARRAY_ELEM || kind == ZEND_AST_CONST || kind == ZEND_AST_CLASS_CONST - || kind == ZEND_AST_RESOLVE_CLASS_NAME; + || kind == ZEND_AST_RESOLVE_CLASS_NAME || kind == ZEND_AST_MAGIC_CONST; } void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { @@ -8004,6 +8021,9 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_ENCAPS_LIST: zend_compile_encaps_list(result, ast TSRMLS_CC); return; + case ZEND_AST_MAGIC_CONST: + zend_compile_magic_const(result, ast TSRMLS_CC); + return; default: ZEND_ASSERT(0 /* not supported */); } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6e6dc32bd8..507e54a0e8 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -958,15 +958,15 @@ static_scalar: /* compile-time evaluated scalars */ ; scalar: - T_LNUMBER { $$.u.ast = AST_ZVAL(&$1); } - | T_DNUMBER { $$.u.ast = AST_ZVAL(&$1); } - | T_LINE { $$.u.ast = AST_ZVAL(&$1); } - | T_FILE { $$.u.ast = AST_ZVAL(&$1); } - | T_DIR { $$.u.ast = AST_ZVAL(&$1); } - | T_TRAIT_C { $$.u.ast = AST_ZVAL(&$1); } - | T_METHOD_C { $$.u.ast = AST_ZVAL(&$1); } - | T_FUNC_C { $$.u.ast = AST_ZVAL(&$1); } - | T_NS_C { $$.u.ast = AST_ZVAL(&$1); } + T_LNUMBER { $$.u.ast = AST_ZVAL(&$1); } + | T_DNUMBER { $$.u.ast = AST_ZVAL(&$1); } + | T_LINE { $$.u.ast = AST_ZVAL(&$1); } + | T_FILE { $$.u.ast = AST_ZVAL(&$1); } + | T_DIR { $$.u.ast = AST_ZVAL(&$1); } + | T_TRAIT_C { $$.u.ast = AST_ZVAL(&$1); } + | T_METHOD_C { $$.u.ast = AST_ZVAL(&$1); } + | T_FUNC_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); } + | T_NS_C { $$.u.ast = AST_ZVAL(&$1); } | T_CLASS_C { if (Z_TYPE($1.u.constant) == IS_UNDEF) { zval class_const; ZVAL_STRING(&class_const, "__CLASS__"); diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 1b42761fa5..871db0a668 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1115,7 +1115,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1777 "Zend/zend_language_scanner.l" +#line 1771 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1194,7 +1194,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1767 "Zend/zend_language_scanner.l" +#line 1761 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1211,7 +1211,7 @@ yy7: if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1748 "Zend/zend_language_scanner.l" +#line 1742 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1407,7 +1407,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1714 "Zend/zend_language_scanner.l" +#line 1708 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1449,7 +1449,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1730 "Zend/zend_language_scanner.l" +#line 1724 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1465,7 +1465,7 @@ yy45: ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1741 "Zend/zend_language_scanner.l" +#line 1735 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); @@ -1498,7 +1498,7 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1759 "Zend/zend_language_scanner.l" +#line 1753 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); @@ -1576,7 +1576,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2220 "Zend/zend_language_scanner.l" +#line 2214 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1628,7 +1628,7 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2164 "Zend/zend_language_scanner.l" +#line 2158 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; @@ -1643,7 +1643,7 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2151 "Zend/zend_language_scanner.l" +#line 2145 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1666,7 +1666,7 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1858 "Zend/zend_language_scanner.l" +#line 1852 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1696,7 +1696,7 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1851 "Zend/zend_language_scanner.l" +#line 1845 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1721,7 +1721,7 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1842 "Zend/zend_language_scanner.l" +#line 1836 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1796,7 +1796,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2170 "Zend/zend_language_scanner.l" +#line 2164 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1856,7 +1856,7 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2159 "Zend/zend_language_scanner.l" +#line 2153 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; @@ -1871,7 +1871,7 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2151 "Zend/zend_language_scanner.l" +#line 2145 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1894,7 +1894,7 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1858 "Zend/zend_language_scanner.l" +#line 1852 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1924,7 +1924,7 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1851 "Zend/zend_language_scanner.l" +#line 1845 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1949,7 +1949,7 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1842 "Zend/zend_language_scanner.l" +#line 1836 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1967,7 +1967,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2137 "Zend/zend_language_scanner.l" +#line 2131 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -2042,7 +2042,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2262 "Zend/zend_language_scanner.l" +#line 2256 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2130,7 +2130,7 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2151 "Zend/zend_language_scanner.l" +#line 2145 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -2153,7 +2153,7 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1858 "Zend/zend_language_scanner.l" +#line 1852 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -2183,7 +2183,7 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1851 "Zend/zend_language_scanner.l" +#line 1845 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -2208,7 +2208,7 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1842 "Zend/zend_language_scanner.l" +#line 1836 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -2398,7 +2398,7 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1880 "Zend/zend_language_scanner.l" +#line 1874 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; @@ -2996,7 +2996,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1886 "Zend/zend_language_scanner.l" +#line 1880 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3037,7 +3037,7 @@ yy178: yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1972 "Zend/zend_language_scanner.l" +#line 1966 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3112,7 +3112,7 @@ yy180: yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2041 "Zend/zend_language_scanner.l" +#line 2035 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3159,7 +3159,7 @@ yy182: ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2131 "Zend/zend_language_scanner.l" +#line 2125 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; @@ -3170,7 +3170,7 @@ yy184: ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2393 "Zend/zend_language_scanner.l" +#line 2387 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3370,7 +3370,7 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1953 "Zend/zend_language_scanner.l" +#line 1947 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); @@ -3410,7 +3410,7 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1858 "Zend/zend_language_scanner.l" +#line 1852 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -3505,7 +3505,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1960 "Zend/zend_language_scanner.l" +#line 1954 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3544,7 +3544,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1920 "Zend/zend_language_scanner.l" +#line 1914 "Zend/zend_language_scanner.l" { int doc_com; @@ -3872,7 +3872,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2083 "Zend/zend_language_scanner.l" +#line 2077 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -4167,7 +4167,7 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1705 "Zend/zend_language_scanner.l" +#line 1699 "Zend/zend_language_scanner.l" { if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { ZVAL_DUP(zendlval, &CG(current_namespace)); @@ -4196,7 +4196,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1680 "Zend/zend_language_scanner.l" +#line 1674 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4246,7 +4246,7 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1664 "Zend/zend_language_scanner.l" +#line 1658 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; @@ -4286,7 +4286,7 @@ yy336: } YYDEBUG(339, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1632 "Zend/zend_language_scanner.l" +#line 1626 "Zend/zend_language_scanner.l" { if (CG(active_class_entry)) { int len = 0; @@ -4371,15 +4371,9 @@ yy347: yyleng = YYCURSOR - SCNG(yy_text); #line 1622 "Zend/zend_language_scanner.l" { - zend_op_array *op_array = CG(active_op_array); - if (op_array && op_array->function_name) { - ZVAL_STR(zendlval, STR_COPY(op_array->function_name)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_FUNC_C; } -#line 4383 "Zend/zend_language_scanner.c" +#line 4377 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4399,7 +4393,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1669 "Zend/zend_language_scanner.l" +#line 1663 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4410,7 +4404,7 @@ yy352: } return T_FILE; } -#line 4414 "Zend/zend_language_scanner.c" +#line 4408 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4450,7 +4444,7 @@ yy359: } return T_TRAIT_C; } -#line 4454 "Zend/zend_language_scanner.c" +#line 4448 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4495,7 +4489,7 @@ yy366: } return T_CLASS_C; } -#line 4499 "Zend/zend_language_scanner.c" +#line 4493 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4561,7 +4555,7 @@ yy381: { return T_HALT_COMPILER; } -#line 4565 "Zend/zend_language_scanner.c" +#line 4559 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4585,7 +4579,7 @@ yy385: { return T_USE; } -#line 4589 "Zend/zend_language_scanner.c" +#line 4583 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4608,7 +4602,7 @@ yy389: { return T_UNSET; } -#line 4612 "Zend/zend_language_scanner.c" +#line 4606 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4784,7 +4778,7 @@ yy406: { return T_INT_CAST; } -#line 4788 "Zend/zend_language_scanner.c" +#line 4782 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4832,7 +4826,7 @@ yy414: { return T_DOUBLE_CAST; } -#line 4836 "Zend/zend_language_scanner.c" +#line 4830 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4906,7 +4900,7 @@ yy428: { return T_STRING_CAST; } -#line 4910 "Zend/zend_language_scanner.c" +#line 4904 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4943,7 +4937,7 @@ yy435: { return T_ARRAY_CAST; } -#line 4947 "Zend/zend_language_scanner.c" +#line 4941 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4985,7 +4979,7 @@ yy443: { return T_OBJECT_CAST; } -#line 4989 "Zend/zend_language_scanner.c" +#line 4983 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -5030,7 +5024,7 @@ yy452: { return T_BOOL_CAST; } -#line 5034 "Zend/zend_language_scanner.c" +#line 5028 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5094,7 +5088,7 @@ yy463: { return T_UNSET_CAST; } -#line 5098 "Zend/zend_language_scanner.c" +#line 5092 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5112,7 +5106,7 @@ yy468: { return T_VAR; } -#line 5116 "Zend/zend_language_scanner.c" +#line 5110 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5136,7 +5130,7 @@ yy472: { return T_NEW; } -#line 5140 "Zend/zend_language_scanner.c" +#line 5134 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5179,7 +5173,7 @@ yy480: { return T_NAMESPACE; } -#line 5183 "Zend/zend_language_scanner.c" +#line 5177 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5205,7 +5199,7 @@ yy484: { return T_CONCAT_EQUAL; } -#line 5209 "Zend/zend_language_scanner.c" +#line 5203 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5218,7 +5212,7 @@ yy486: { return T_ELLIPSIS; } -#line 5222 "Zend/zend_language_scanner.c" +#line 5216 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; @@ -5228,7 +5222,7 @@ yy489: { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5232 "Zend/zend_language_scanner.c" +#line 5226 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5254,7 +5248,7 @@ yy493: { return T_MINUS_EQUAL; } -#line 5258 "Zend/zend_language_scanner.c" +#line 5252 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; @@ -5264,7 +5258,7 @@ yy495: { return T_DEC; } -#line 5268 "Zend/zend_language_scanner.c" +#line 5262 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; @@ -5275,7 +5269,7 @@ yy497: yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5279 "Zend/zend_language_scanner.c" +#line 5273 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5324,7 +5318,7 @@ yy504: { return T_PUBLIC; } -#line 5328 "Zend/zend_language_scanner.c" +#line 5322 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5383,7 +5377,7 @@ yy513: { return T_PROTECTED; } -#line 5387 "Zend/zend_language_scanner.c" +#line 5381 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5417,7 +5411,7 @@ yy519: { return T_PRIVATE; } -#line 5421 "Zend/zend_language_scanner.c" +#line 5415 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5430,7 +5424,7 @@ yy521: { return T_PRINT; } -#line 5434 "Zend/zend_language_scanner.c" +#line 5428 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5459,7 +5453,7 @@ yy526: { return T_GOTO; } -#line 5463 "Zend/zend_language_scanner.c" +#line 5457 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5487,7 +5481,7 @@ yy531: { return T_GLOBAL; } -#line 5491 "Zend/zend_language_scanner.c" +#line 5485 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5528,7 +5522,7 @@ yy539: { return T_BREAK; } -#line 5532 "Zend/zend_language_scanner.c" +#line 5526 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5572,7 +5566,7 @@ yy547: { return T_SWITCH; } -#line 5576 "Zend/zend_language_scanner.c" +#line 5570 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5600,7 +5594,7 @@ yy552: { return T_STATIC; } -#line 5604 "Zend/zend_language_scanner.c" +#line 5598 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5631,7 +5625,7 @@ yy557: { return T_AS; } -#line 5635 "Zend/zend_language_scanner.c" +#line 5629 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5654,7 +5648,7 @@ yy561: { return T_ARRAY; } -#line 5658 "Zend/zend_language_scanner.c" +#line 5652 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5667,7 +5661,7 @@ yy563: { return T_LOGICAL_AND; } -#line 5671 "Zend/zend_language_scanner.c" +#line 5665 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5705,7 +5699,7 @@ yy570: { return T_ABSTRACT; } -#line 5709 "Zend/zend_language_scanner.c" +#line 5703 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5733,7 +5727,7 @@ yy575: { return T_WHILE; } -#line 5737 "Zend/zend_language_scanner.c" +#line 5731 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5746,7 +5740,7 @@ yy577: { return T_IF; } -#line 5750 "Zend/zend_language_scanner.c" +#line 5744 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5802,7 +5796,7 @@ yy584: { return T_ISSET; } -#line 5806 "Zend/zend_language_scanner.c" +#line 5800 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5860,7 +5854,7 @@ yy593: { return T_INCLUDE; } -#line 5864 "Zend/zend_language_scanner.c" +#line 5858 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5893,7 +5887,7 @@ yy598: { return T_INCLUDE_ONCE; } -#line 5897 "Zend/zend_language_scanner.c" +#line 5891 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5931,7 +5925,7 @@ yy605: { return T_INTERFACE; } -#line 5935 "Zend/zend_language_scanner.c" +#line 5929 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5985,7 +5979,7 @@ yy613: { return T_INSTEADOF; } -#line 5989 "Zend/zend_language_scanner.c" +#line 5983 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -6018,7 +6012,7 @@ yy619: { return T_INSTANCEOF; } -#line 6022 "Zend/zend_language_scanner.c" +#line 6016 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6066,7 +6060,7 @@ yy628: { return T_IMPLEMENTS; } -#line 6070 "Zend/zend_language_scanner.c" +#line 6064 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6098,7 +6092,7 @@ yy631: { return T_TRY; } -#line 6102 "Zend/zend_language_scanner.c" +#line 6096 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6121,7 +6115,7 @@ yy636: { return T_TRAIT; } -#line 6125 "Zend/zend_language_scanner.c" +#line 6119 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6144,7 +6138,7 @@ yy640: { return T_THROW; } -#line 6148 "Zend/zend_language_scanner.c" +#line 6142 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6172,7 +6166,7 @@ yy645: { return T_YIELD; } -#line 6176 "Zend/zend_language_scanner.c" +#line 6170 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6237,7 +6231,7 @@ yy654: { return T_REQUIRE; } -#line 6241 "Zend/zend_language_scanner.c" +#line 6235 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6270,7 +6264,7 @@ yy659: { return T_REQUIRE_ONCE; } -#line 6274 "Zend/zend_language_scanner.c" +#line 6268 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6293,7 +6287,7 @@ yy663: { return T_RETURN; } -#line 6297 "Zend/zend_language_scanner.c" +#line 6291 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6387,7 +6381,7 @@ yy674: { return T_CONTINUE; } -#line 6391 "Zend/zend_language_scanner.c" +#line 6385 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6400,7 +6394,7 @@ yy676: { return T_CONST; } -#line 6404 "Zend/zend_language_scanner.c" +#line 6398 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6429,7 +6423,7 @@ yy681: { return T_CLONE; } -#line 6433 "Zend/zend_language_scanner.c" +#line 6427 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6447,7 +6441,7 @@ yy684: { return T_CLASS; } -#line 6451 "Zend/zend_language_scanner.c" +#line 6445 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6497,7 +6491,7 @@ yy693: { return T_CALLABLE; } -#line 6501 "Zend/zend_language_scanner.c" +#line 6495 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6510,7 +6504,7 @@ yy695: { return T_CASE; } -#line 6514 "Zend/zend_language_scanner.c" +#line 6508 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6528,7 +6522,7 @@ yy698: { return T_CATCH; } -#line 6532 "Zend/zend_language_scanner.c" +#line 6526 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6583,7 +6577,7 @@ yy708: { return T_FUNCTION; } -#line 6587 "Zend/zend_language_scanner.c" +#line 6581 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6611,7 +6605,7 @@ yy711: { return T_FOR; } -#line 6615 "Zend/zend_language_scanner.c" +#line 6609 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6639,7 +6633,7 @@ yy715: { return T_FOREACH; } -#line 6643 "Zend/zend_language_scanner.c" +#line 6637 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6677,7 +6671,7 @@ yy720: { return T_FINAL; } -#line 6681 "Zend/zend_language_scanner.c" +#line 6675 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6695,7 +6689,7 @@ yy722: { return T_FINALLY; } -#line 6699 "Zend/zend_language_scanner.c" +#line 6693 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6730,7 +6724,7 @@ yy726: { return T_DO; } -#line 6734 "Zend/zend_language_scanner.c" +#line 6728 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6743,7 +6737,7 @@ yy728: { return T_EXIT; } -#line 6747 "Zend/zend_language_scanner.c" +#line 6741 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6782,7 +6776,7 @@ yy735: { return T_DEFAULT; } -#line 6786 "Zend/zend_language_scanner.c" +#line 6780 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6810,7 +6804,7 @@ yy740: { return T_DECLARE; } -#line 6814 "Zend/zend_language_scanner.c" +#line 6808 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6894,7 +6888,7 @@ yy753: { return T_EXTENDS; } -#line 6898 "Zend/zend_language_scanner.c" +#line 6892 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6907,7 +6901,7 @@ yy755: { return T_EXIT; } -#line 6911 "Zend/zend_language_scanner.c" +#line 6905 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6925,7 +6919,7 @@ yy758: { return T_EVAL; } -#line 6929 "Zend/zend_language_scanner.c" +#line 6923 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6999,7 +6993,7 @@ yy769: { return T_ENDWHILE; } -#line 7003 "Zend/zend_language_scanner.c" +#line 6997 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -7032,7 +7026,7 @@ yy775: { return T_ENDSWITCH; } -#line 7036 "Zend/zend_language_scanner.c" +#line 7030 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -7045,7 +7039,7 @@ yy777: { return T_ENDIF; } -#line 7049 "Zend/zend_language_scanner.c" +#line 7043 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7078,7 +7072,7 @@ yy781: { return T_ENDFOR; } -#line 7082 "Zend/zend_language_scanner.c" +#line 7076 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7106,7 +7100,7 @@ yy785: { return T_ENDFOREACH; } -#line 7110 "Zend/zend_language_scanner.c" +#line 7104 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7144,7 +7138,7 @@ yy792: { return T_ENDDECLARE; } -#line 7148 "Zend/zend_language_scanner.c" +#line 7142 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7167,7 +7161,7 @@ yy796: { return T_EMPTY; } -#line 7171 "Zend/zend_language_scanner.c" +#line 7165 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7200,7 +7194,7 @@ yy800: { return T_ELSE; } -#line 7204 "Zend/zend_language_scanner.c" +#line 7198 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7218,7 +7212,7 @@ yy802: { return T_ELSEIF; } -#line 7222 "Zend/zend_language_scanner.c" +#line 7216 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7236,7 +7230,7 @@ yy805: { return T_ECHO; } -#line 7240 "Zend/zend_language_scanner.c" +#line 7234 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7315,7 +7309,7 @@ yy810: HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7319 "Zend/zend_language_scanner.c" +#line 7313 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7329,7 +7323,7 @@ yy812: yy_pop_state(TSRMLS_C); goto restart; } -#line 7333 "Zend/zend_language_scanner.c" +#line 7327 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7344,7 +7338,7 @@ yy814: zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7348 "Zend/zend_language_scanner.c" +#line 7342 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7369,7 +7363,7 @@ yy818: { return T_OBJECT_OPERATOR; } -#line 7373 "Zend/zend_language_scanner.c" +#line 7367 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7461,7 +7455,7 @@ yy825: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7465 "Zend/zend_language_scanner.c" +#line 7459 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7494,7 +7488,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7498 "Zend/zend_language_scanner.c" +#line 7492 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7505,7 +7499,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2336 "Zend/zend_language_scanner.l" +#line 2330 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7561,7 +7555,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7565 "Zend/zend_language_scanner.c" +#line 7559 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7677,7 +7671,7 @@ yy839: } return T_NUM_STRING; } -#line 7681 "Zend/zend_language_scanner.c" +#line 7675 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7697,23 +7691,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1868 "Zend/zend_language_scanner.l" +#line 1862 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7706 "Zend/zend_language_scanner.c" +#line 7700 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1863 "Zend/zend_language_scanner.l" +#line 1857 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7717 "Zend/zend_language_scanner.c" +#line 7711 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7723,14 +7717,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1873 "Zend/zend_language_scanner.l" +#line 1867 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7734 "Zend/zend_language_scanner.c" +#line 7728 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7739,18 +7733,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1880 "Zend/zend_language_scanner.l" +#line 1874 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7748 "Zend/zend_language_scanner.c" +#line 7742 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2393 "Zend/zend_language_scanner.l" +#line 2387 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7759,7 +7753,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7763 "Zend/zend_language_scanner.c" +#line 7757 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7795,12 +7789,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1858 "Zend/zend_language_scanner.l" +#line 1852 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7804 "Zend/zend_language_scanner.c" +#line 7798 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7845,7 +7839,7 @@ yy864: ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7849 "Zend/zend_language_scanner.c" +#line 7843 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7868,6 +7862,6 @@ yy867: goto yy864; } } -#line 2402 "Zend/zend_language_scanner.l" +#line 2396 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index d0ef6307ff..1ac86f45e1 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1620,12 +1620,6 @@ NEWLINE ("\r"|"\n"|"\r\n") } "__FUNCTION__" { - zend_op_array *op_array = CG(active_op_array); - if (op_array && op_array->function_name) { - ZVAL_STR(zendlval, STR_COPY(op_array->function_name)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_FUNC_C; } -- cgit v1.2.1 From 64a71321852abd8bbe845cc0ac610c9edb75feb1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 16 Jul 2014 23:23:25 +0200 Subject: Port __METHOD__ --- Zend/zend_compile.c | 31 ++++- Zend/zend_language_parser.y | 2 +- Zend/zend_language_scanner.c | 318 ++++++++++++++++++++----------------------- Zend/zend_language_scanner.l | 28 ---- 4 files changed, 172 insertions(+), 207 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4112414f13..e7a28b2572 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1490,18 +1490,24 @@ void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, } /* }}} */ -zend_string *zend_concat_names(char *name1, size_t name1_len, char *name2, size_t name2_len) { - size_t len = name1_len + name2_len + 1; /* name1\name2 */ +zend_string *zend_concat3( + char *str1, size_t str1_len, char *str2, size_t str2_len, char *str3, size_t str3_len +) { + size_t len = str1_len + str2_len + str3_len; zend_string *res = STR_ALLOC(len, 0); - memcpy(res->val, name1, name1_len); - res->val[name1_len] = '\\'; - memcpy(res->val + name1_len + 1, name2, name2_len); + memcpy(res->val, str1, str1_len); + memcpy(res->val + str1_len, str2, str2_len); + memcpy(res->val + str1_len + str2_len, str3, str3_len); res->val[len] = '\0'; return res; } +zend_string *zend_concat_names(char *name1, size_t name1_len, char *name2, size_t name2_len) { + return zend_concat3(name1, name1_len, "\\", 1, name2, name2_len); +} + void *zend_hash_find_ptr_lc(HashTable *ht, char *str, size_t len) { void *result; zend_string *lcname = STR_ALLOC(len, 0); @@ -7680,6 +7686,7 @@ void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_op_array *op_array = CG(active_op_array); + zend_class_entry *ce = CG(active_class_entry); zval *zv = &result->u.constant; result->op_type = IS_CONST; @@ -7691,6 +7698,20 @@ void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { ZVAL_EMPTY_STRING(zv); } break; + case T_METHOD_C: + if (ce) { + if (op_array && op_array->function_name) { + ZVAL_STR(zv, zend_concat3(ce->name->val, ce->name->len, "::", 2, + op_array->function_name->val, op_array->function_name->len)); + } else { + ZVAL_STR(zv, STR_COPY(ce->name)); + } + } else if (op_array && op_array->function_name) { + ZVAL_STR(zv, STR_COPY(op_array->function_name)); + } else { + ZVAL_EMPTY_STRING(zv); + } + break; EMPTY_SWITCH_DEFAULT_CASE() } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 507e54a0e8..f48cd3285a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -964,7 +964,7 @@ scalar: | T_FILE { $$.u.ast = AST_ZVAL(&$1); } | T_DIR { $$.u.ast = AST_ZVAL(&$1); } | T_TRAIT_C { $$.u.ast = AST_ZVAL(&$1); } - | T_METHOD_C { $$.u.ast = AST_ZVAL(&$1); } + | T_METHOD_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_METHOD_C); } | T_FUNC_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); } | T_NS_C { $$.u.ast = AST_ZVAL(&$1); } | T_CLASS_C diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 871db0a668..4482d2132d 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1115,7 +1115,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1771 "Zend/zend_language_scanner.l" +#line 1743 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1194,7 +1194,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1761 "Zend/zend_language_scanner.l" +#line 1733 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1211,7 +1211,7 @@ yy7: if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1742 "Zend/zend_language_scanner.l" +#line 1714 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1407,7 +1407,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1708 "Zend/zend_language_scanner.l" +#line 1680 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1449,7 +1449,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1724 "Zend/zend_language_scanner.l" +#line 1696 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1465,7 +1465,7 @@ yy45: ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1735 "Zend/zend_language_scanner.l" +#line 1707 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); @@ -1498,7 +1498,7 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1753 "Zend/zend_language_scanner.l" +#line 1725 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); @@ -1576,7 +1576,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2214 "Zend/zend_language_scanner.l" +#line 2186 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1628,7 +1628,7 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2158 "Zend/zend_language_scanner.l" +#line 2130 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; @@ -1643,7 +1643,7 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2145 "Zend/zend_language_scanner.l" +#line 2117 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1666,7 +1666,7 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1852 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1696,7 +1696,7 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1845 "Zend/zend_language_scanner.l" +#line 1817 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1721,7 +1721,7 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1836 "Zend/zend_language_scanner.l" +#line 1808 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1796,7 +1796,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2164 "Zend/zend_language_scanner.l" +#line 2136 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1856,7 +1856,7 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2153 "Zend/zend_language_scanner.l" +#line 2125 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; @@ -1871,7 +1871,7 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2145 "Zend/zend_language_scanner.l" +#line 2117 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1894,7 +1894,7 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1852 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1924,7 +1924,7 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1845 "Zend/zend_language_scanner.l" +#line 1817 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1949,7 +1949,7 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1836 "Zend/zend_language_scanner.l" +#line 1808 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1967,7 +1967,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2131 "Zend/zend_language_scanner.l" +#line 2103 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -2042,7 +2042,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2256 "Zend/zend_language_scanner.l" +#line 2228 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2130,7 +2130,7 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2145 "Zend/zend_language_scanner.l" +#line 2117 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -2153,7 +2153,7 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1852 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -2183,7 +2183,7 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1845 "Zend/zend_language_scanner.l" +#line 1817 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -2208,7 +2208,7 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1836 "Zend/zend_language_scanner.l" +#line 1808 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -2398,7 +2398,7 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1874 "Zend/zend_language_scanner.l" +#line 1846 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; @@ -2996,7 +2996,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1880 "Zend/zend_language_scanner.l" +#line 1852 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3037,7 +3037,7 @@ yy178: yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1966 "Zend/zend_language_scanner.l" +#line 1938 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3112,7 +3112,7 @@ yy180: yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2035 "Zend/zend_language_scanner.l" +#line 2007 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3159,7 +3159,7 @@ yy182: ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2125 "Zend/zend_language_scanner.l" +#line 2097 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; @@ -3170,7 +3170,7 @@ yy184: ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2387 "Zend/zend_language_scanner.l" +#line 2359 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3370,7 +3370,7 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1947 "Zend/zend_language_scanner.l" +#line 1919 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); @@ -3410,7 +3410,7 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1852 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -3505,7 +3505,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1954 "Zend/zend_language_scanner.l" +#line 1926 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3544,7 +3544,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1914 "Zend/zend_language_scanner.l" +#line 1886 "Zend/zend_language_scanner.l" { int doc_com; @@ -3872,7 +3872,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2077 "Zend/zend_language_scanner.l" +#line 2049 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -4167,7 +4167,7 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1699 "Zend/zend_language_scanner.l" +#line 1671 "Zend/zend_language_scanner.l" { if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { ZVAL_DUP(zendlval, &CG(current_namespace)); @@ -4196,7 +4196,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1674 "Zend/zend_language_scanner.l" +#line 1646 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4246,7 +4246,7 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1658 "Zend/zend_language_scanner.l" +#line 1630 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; @@ -4288,37 +4288,9 @@ yy336: yyleng = YYCURSOR - SCNG(yy_text); #line 1626 "Zend/zend_language_scanner.l" { - if (CG(active_class_entry)) { - int len = 0; - - if (CG(active_class_entry)->name) { - len += CG(active_class_entry)->name->len; - } - if (CG(active_op_array) && CG(active_op_array)->function_name) { - len += sizeof("::")-1; - len += CG(active_op_array)->function_name->len; - } - ZVAL_NEW_STR(zendlval, STR_ALLOC(len, 0)); - len = 0; - if (CG(active_class_entry)->name) { - memcpy(Z_STRVAL_P(zendlval), CG(active_class_entry)->name->val, CG(active_class_entry)->name->len); - len += CG(active_class_entry)->name->len; - } - if (CG(active_op_array) && CG(active_op_array)->function_name) { - memcpy(Z_STRVAL_P(zendlval) + len, "::", sizeof("::")-1); - len += sizeof("::")-1; - memcpy(Z_STRVAL_P(zendlval) + len, CG(active_op_array)->function_name->val, CG(active_op_array)->function_name->len); - len += CG(active_op_array)->function_name->len; - } - Z_STRVAL_P(zendlval)[len] = 0; - } else if (CG(active_op_array) && CG(active_op_array)->function_name) { - ZVAL_STR(zendlval, STR_COPY(CG(active_op_array)->function_name)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_METHOD_C; } -#line 4322 "Zend/zend_language_scanner.c" +#line 4294 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; @@ -4373,7 +4345,7 @@ yy347: { return T_FUNC_C; } -#line 4377 "Zend/zend_language_scanner.c" +#line 4349 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4393,7 +4365,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1663 "Zend/zend_language_scanner.l" +#line 1635 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4404,7 +4376,7 @@ yy352: } return T_FILE; } -#line 4408 "Zend/zend_language_scanner.c" +#line 4380 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4444,7 +4416,7 @@ yy359: } return T_TRAIT_C; } -#line 4448 "Zend/zend_language_scanner.c" +#line 4420 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4489,7 +4461,7 @@ yy366: } return T_CLASS_C; } -#line 4493 "Zend/zend_language_scanner.c" +#line 4465 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4555,7 +4527,7 @@ yy381: { return T_HALT_COMPILER; } -#line 4559 "Zend/zend_language_scanner.c" +#line 4531 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4579,7 +4551,7 @@ yy385: { return T_USE; } -#line 4583 "Zend/zend_language_scanner.c" +#line 4555 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4602,7 +4574,7 @@ yy389: { return T_UNSET; } -#line 4606 "Zend/zend_language_scanner.c" +#line 4578 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4778,7 +4750,7 @@ yy406: { return T_INT_CAST; } -#line 4782 "Zend/zend_language_scanner.c" +#line 4754 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4826,7 +4798,7 @@ yy414: { return T_DOUBLE_CAST; } -#line 4830 "Zend/zend_language_scanner.c" +#line 4802 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4900,7 +4872,7 @@ yy428: { return T_STRING_CAST; } -#line 4904 "Zend/zend_language_scanner.c" +#line 4876 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4937,7 +4909,7 @@ yy435: { return T_ARRAY_CAST; } -#line 4941 "Zend/zend_language_scanner.c" +#line 4913 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4979,7 +4951,7 @@ yy443: { return T_OBJECT_CAST; } -#line 4983 "Zend/zend_language_scanner.c" +#line 4955 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -5024,7 +4996,7 @@ yy452: { return T_BOOL_CAST; } -#line 5028 "Zend/zend_language_scanner.c" +#line 5000 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5088,7 +5060,7 @@ yy463: { return T_UNSET_CAST; } -#line 5092 "Zend/zend_language_scanner.c" +#line 5064 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5106,7 +5078,7 @@ yy468: { return T_VAR; } -#line 5110 "Zend/zend_language_scanner.c" +#line 5082 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5130,7 +5102,7 @@ yy472: { return T_NEW; } -#line 5134 "Zend/zend_language_scanner.c" +#line 5106 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5173,7 +5145,7 @@ yy480: { return T_NAMESPACE; } -#line 5177 "Zend/zend_language_scanner.c" +#line 5149 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5199,7 +5171,7 @@ yy484: { return T_CONCAT_EQUAL; } -#line 5203 "Zend/zend_language_scanner.c" +#line 5175 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5212,7 +5184,7 @@ yy486: { return T_ELLIPSIS; } -#line 5216 "Zend/zend_language_scanner.c" +#line 5188 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; @@ -5222,7 +5194,7 @@ yy489: { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5226 "Zend/zend_language_scanner.c" +#line 5198 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5248,7 +5220,7 @@ yy493: { return T_MINUS_EQUAL; } -#line 5252 "Zend/zend_language_scanner.c" +#line 5224 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; @@ -5258,7 +5230,7 @@ yy495: { return T_DEC; } -#line 5262 "Zend/zend_language_scanner.c" +#line 5234 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; @@ -5269,7 +5241,7 @@ yy497: yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5273 "Zend/zend_language_scanner.c" +#line 5245 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5318,7 +5290,7 @@ yy504: { return T_PUBLIC; } -#line 5322 "Zend/zend_language_scanner.c" +#line 5294 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5377,7 +5349,7 @@ yy513: { return T_PROTECTED; } -#line 5381 "Zend/zend_language_scanner.c" +#line 5353 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5411,7 +5383,7 @@ yy519: { return T_PRIVATE; } -#line 5415 "Zend/zend_language_scanner.c" +#line 5387 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5424,7 +5396,7 @@ yy521: { return T_PRINT; } -#line 5428 "Zend/zend_language_scanner.c" +#line 5400 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5453,7 +5425,7 @@ yy526: { return T_GOTO; } -#line 5457 "Zend/zend_language_scanner.c" +#line 5429 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5481,7 +5453,7 @@ yy531: { return T_GLOBAL; } -#line 5485 "Zend/zend_language_scanner.c" +#line 5457 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5522,7 +5494,7 @@ yy539: { return T_BREAK; } -#line 5526 "Zend/zend_language_scanner.c" +#line 5498 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5566,7 +5538,7 @@ yy547: { return T_SWITCH; } -#line 5570 "Zend/zend_language_scanner.c" +#line 5542 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5594,7 +5566,7 @@ yy552: { return T_STATIC; } -#line 5598 "Zend/zend_language_scanner.c" +#line 5570 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5625,7 +5597,7 @@ yy557: { return T_AS; } -#line 5629 "Zend/zend_language_scanner.c" +#line 5601 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5648,7 +5620,7 @@ yy561: { return T_ARRAY; } -#line 5652 "Zend/zend_language_scanner.c" +#line 5624 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5661,7 +5633,7 @@ yy563: { return T_LOGICAL_AND; } -#line 5665 "Zend/zend_language_scanner.c" +#line 5637 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5699,7 +5671,7 @@ yy570: { return T_ABSTRACT; } -#line 5703 "Zend/zend_language_scanner.c" +#line 5675 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5727,7 +5699,7 @@ yy575: { return T_WHILE; } -#line 5731 "Zend/zend_language_scanner.c" +#line 5703 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5740,7 +5712,7 @@ yy577: { return T_IF; } -#line 5744 "Zend/zend_language_scanner.c" +#line 5716 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5796,7 +5768,7 @@ yy584: { return T_ISSET; } -#line 5800 "Zend/zend_language_scanner.c" +#line 5772 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5854,7 +5826,7 @@ yy593: { return T_INCLUDE; } -#line 5858 "Zend/zend_language_scanner.c" +#line 5830 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5887,7 +5859,7 @@ yy598: { return T_INCLUDE_ONCE; } -#line 5891 "Zend/zend_language_scanner.c" +#line 5863 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5925,7 +5897,7 @@ yy605: { return T_INTERFACE; } -#line 5929 "Zend/zend_language_scanner.c" +#line 5901 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5979,7 +5951,7 @@ yy613: { return T_INSTEADOF; } -#line 5983 "Zend/zend_language_scanner.c" +#line 5955 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -6012,7 +5984,7 @@ yy619: { return T_INSTANCEOF; } -#line 6016 "Zend/zend_language_scanner.c" +#line 5988 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6060,7 +6032,7 @@ yy628: { return T_IMPLEMENTS; } -#line 6064 "Zend/zend_language_scanner.c" +#line 6036 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6092,7 +6064,7 @@ yy631: { return T_TRY; } -#line 6096 "Zend/zend_language_scanner.c" +#line 6068 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6115,7 +6087,7 @@ yy636: { return T_TRAIT; } -#line 6119 "Zend/zend_language_scanner.c" +#line 6091 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6138,7 +6110,7 @@ yy640: { return T_THROW; } -#line 6142 "Zend/zend_language_scanner.c" +#line 6114 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6166,7 +6138,7 @@ yy645: { return T_YIELD; } -#line 6170 "Zend/zend_language_scanner.c" +#line 6142 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6231,7 +6203,7 @@ yy654: { return T_REQUIRE; } -#line 6235 "Zend/zend_language_scanner.c" +#line 6207 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6264,7 +6236,7 @@ yy659: { return T_REQUIRE_ONCE; } -#line 6268 "Zend/zend_language_scanner.c" +#line 6240 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6287,7 +6259,7 @@ yy663: { return T_RETURN; } -#line 6291 "Zend/zend_language_scanner.c" +#line 6263 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6381,7 +6353,7 @@ yy674: { return T_CONTINUE; } -#line 6385 "Zend/zend_language_scanner.c" +#line 6357 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6394,7 +6366,7 @@ yy676: { return T_CONST; } -#line 6398 "Zend/zend_language_scanner.c" +#line 6370 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6423,7 +6395,7 @@ yy681: { return T_CLONE; } -#line 6427 "Zend/zend_language_scanner.c" +#line 6399 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6441,7 +6413,7 @@ yy684: { return T_CLASS; } -#line 6445 "Zend/zend_language_scanner.c" +#line 6417 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6491,7 +6463,7 @@ yy693: { return T_CALLABLE; } -#line 6495 "Zend/zend_language_scanner.c" +#line 6467 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6504,7 +6476,7 @@ yy695: { return T_CASE; } -#line 6508 "Zend/zend_language_scanner.c" +#line 6480 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6522,7 +6494,7 @@ yy698: { return T_CATCH; } -#line 6526 "Zend/zend_language_scanner.c" +#line 6498 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6577,7 +6549,7 @@ yy708: { return T_FUNCTION; } -#line 6581 "Zend/zend_language_scanner.c" +#line 6553 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6605,7 +6577,7 @@ yy711: { return T_FOR; } -#line 6609 "Zend/zend_language_scanner.c" +#line 6581 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6633,7 +6605,7 @@ yy715: { return T_FOREACH; } -#line 6637 "Zend/zend_language_scanner.c" +#line 6609 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6671,7 +6643,7 @@ yy720: { return T_FINAL; } -#line 6675 "Zend/zend_language_scanner.c" +#line 6647 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6689,7 +6661,7 @@ yy722: { return T_FINALLY; } -#line 6693 "Zend/zend_language_scanner.c" +#line 6665 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6724,7 +6696,7 @@ yy726: { return T_DO; } -#line 6728 "Zend/zend_language_scanner.c" +#line 6700 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6737,7 +6709,7 @@ yy728: { return T_EXIT; } -#line 6741 "Zend/zend_language_scanner.c" +#line 6713 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6776,7 +6748,7 @@ yy735: { return T_DEFAULT; } -#line 6780 "Zend/zend_language_scanner.c" +#line 6752 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6804,7 +6776,7 @@ yy740: { return T_DECLARE; } -#line 6808 "Zend/zend_language_scanner.c" +#line 6780 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6888,7 +6860,7 @@ yy753: { return T_EXTENDS; } -#line 6892 "Zend/zend_language_scanner.c" +#line 6864 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6901,7 +6873,7 @@ yy755: { return T_EXIT; } -#line 6905 "Zend/zend_language_scanner.c" +#line 6877 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6919,7 +6891,7 @@ yy758: { return T_EVAL; } -#line 6923 "Zend/zend_language_scanner.c" +#line 6895 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6993,7 +6965,7 @@ yy769: { return T_ENDWHILE; } -#line 6997 "Zend/zend_language_scanner.c" +#line 6969 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -7026,7 +6998,7 @@ yy775: { return T_ENDSWITCH; } -#line 7030 "Zend/zend_language_scanner.c" +#line 7002 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -7039,7 +7011,7 @@ yy777: { return T_ENDIF; } -#line 7043 "Zend/zend_language_scanner.c" +#line 7015 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7072,7 +7044,7 @@ yy781: { return T_ENDFOR; } -#line 7076 "Zend/zend_language_scanner.c" +#line 7048 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7100,7 +7072,7 @@ yy785: { return T_ENDFOREACH; } -#line 7104 "Zend/zend_language_scanner.c" +#line 7076 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7138,7 +7110,7 @@ yy792: { return T_ENDDECLARE; } -#line 7142 "Zend/zend_language_scanner.c" +#line 7114 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7161,7 +7133,7 @@ yy796: { return T_EMPTY; } -#line 7165 "Zend/zend_language_scanner.c" +#line 7137 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7194,7 +7166,7 @@ yy800: { return T_ELSE; } -#line 7198 "Zend/zend_language_scanner.c" +#line 7170 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7212,7 +7184,7 @@ yy802: { return T_ELSEIF; } -#line 7216 "Zend/zend_language_scanner.c" +#line 7188 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7230,7 +7202,7 @@ yy805: { return T_ECHO; } -#line 7234 "Zend/zend_language_scanner.c" +#line 7206 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7309,7 +7281,7 @@ yy810: HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7313 "Zend/zend_language_scanner.c" +#line 7285 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7323,7 +7295,7 @@ yy812: yy_pop_state(TSRMLS_C); goto restart; } -#line 7327 "Zend/zend_language_scanner.c" +#line 7299 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7338,7 +7310,7 @@ yy814: zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7342 "Zend/zend_language_scanner.c" +#line 7314 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7363,7 +7335,7 @@ yy818: { return T_OBJECT_OPERATOR; } -#line 7367 "Zend/zend_language_scanner.c" +#line 7339 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7455,7 +7427,7 @@ yy825: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7459 "Zend/zend_language_scanner.c" +#line 7431 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7488,7 +7460,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7492 "Zend/zend_language_scanner.c" +#line 7464 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7499,7 +7471,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2330 "Zend/zend_language_scanner.l" +#line 2302 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7555,7 +7527,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7559 "Zend/zend_language_scanner.c" +#line 7531 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7671,7 +7643,7 @@ yy839: } return T_NUM_STRING; } -#line 7675 "Zend/zend_language_scanner.c" +#line 7647 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7691,23 +7663,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1862 "Zend/zend_language_scanner.l" +#line 1834 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7700 "Zend/zend_language_scanner.c" +#line 7672 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1857 "Zend/zend_language_scanner.l" +#line 1829 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7711 "Zend/zend_language_scanner.c" +#line 7683 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7717,14 +7689,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1867 "Zend/zend_language_scanner.l" +#line 1839 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7728 "Zend/zend_language_scanner.c" +#line 7700 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7733,18 +7705,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1874 "Zend/zend_language_scanner.l" +#line 1846 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7742 "Zend/zend_language_scanner.c" +#line 7714 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2387 "Zend/zend_language_scanner.l" +#line 2359 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7753,7 +7725,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7757 "Zend/zend_language_scanner.c" +#line 7729 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7789,12 +7761,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1852 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7798 "Zend/zend_language_scanner.c" +#line 7770 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7839,7 +7811,7 @@ yy864: ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7843 "Zend/zend_language_scanner.c" +#line 7815 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7862,6 +7834,6 @@ yy867: goto yy864; } } -#line 2396 "Zend/zend_language_scanner.l" +#line 2368 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 1ac86f45e1..17d58c240d 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1624,34 +1624,6 @@ NEWLINE ("\r"|"\n"|"\r\n") } "__METHOD__" { - if (CG(active_class_entry)) { - int len = 0; - - if (CG(active_class_entry)->name) { - len += CG(active_class_entry)->name->len; - } - if (CG(active_op_array) && CG(active_op_array)->function_name) { - len += sizeof("::")-1; - len += CG(active_op_array)->function_name->len; - } - ZVAL_NEW_STR(zendlval, STR_ALLOC(len, 0)); - len = 0; - if (CG(active_class_entry)->name) { - memcpy(Z_STRVAL_P(zendlval), CG(active_class_entry)->name->val, CG(active_class_entry)->name->len); - len += CG(active_class_entry)->name->len; - } - if (CG(active_op_array) && CG(active_op_array)->function_name) { - memcpy(Z_STRVAL_P(zendlval) + len, "::", sizeof("::")-1); - len += sizeof("::")-1; - memcpy(Z_STRVAL_P(zendlval) + len, CG(active_op_array)->function_name->val, CG(active_op_array)->function_name->len); - len += CG(active_op_array)->function_name->len; - } - Z_STRVAL_P(zendlval)[len] = 0; - } else if (CG(active_op_array) && CG(active_op_array)->function_name) { - ZVAL_STR(zendlval, STR_COPY(CG(active_op_array)->function_name)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_METHOD_C; } -- cgit v1.2.1 From 20d2a044eea54847226d8bd3f90355c45038a974 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 16 Jul 2014 23:27:27 +0200 Subject: Lineno corrections --- Zend/zend_ast.c | 6 +++--- Zend/zend_compile.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 1e40455022..85b6448908 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -48,7 +48,7 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) static zend_ast *zend_ast_create_from_va_list( zend_uint children, zend_ast_kind kind, zend_ast_attr attr, va_list va ) { - /*TSRMLS_FETCH();*/ + TSRMLS_FETCH(); zend_uint i; zend_ast *ast; @@ -65,9 +65,9 @@ static zend_ast *zend_ast_create_from_va_list( } } - /*if (ast->lineno == UINT_MAX) { + if (ast->lineno == UINT_MAX) { ast->lineno = CG(zend_lineno); - }*/ + } return ast; } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e7a28b2572..145f98981a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6778,6 +6778,8 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { CG(active_op_array)->try_catch_array[try_catch_offset].catch_op = opnum_catch; } + CG(zend_lineno) = catch_ast->lineno; + opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_CATCH; opline->op1_type = IS_CONST; -- cgit v1.2.1 From abfc8bd89417519f875d3cb9a881d339e3b9f6e0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 12:30:39 +0200 Subject: Port closure use --- Zend/zend_ast.h | 2 ++ Zend/zend_compile.c | 80 ++++++++++++++++++++++++++++++++------------- Zend/zend_language_parser.y | 23 +++++++------ 3 files changed, 73 insertions(+), 32 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 864503db72..7f885ab029 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -100,6 +100,8 @@ enum _zend_ast_kind { ZEND_AST_TYPE, ZEND_AST_FUNC_DECL, + + ZEND_AST_CLOSURE_USES, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 145f98981a..7daa618803 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6200,26 +6200,13 @@ void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { efree(fetch_ast); } -void zend_compile_static_var(zend_ast *ast TSRMLS_DC) { - zend_ast *var_ast = ast->child[0]; - zend_ast *value_ast = ast->child[1]; - +static void zend_compile_static_var_common( + zend_ast *var_ast, zval *value, zend_bool by_ref TSRMLS_DC +) { znode var_node, result; - zval value_zv; zend_op *opline; zend_compile_expr(&var_node, var_ast TSRMLS_CC); - if (var_node.op_type == IS_CONST) { - if (Z_TYPE(var_node.u.constant) != IS_STRING) { - convert_to_string(&var_node.u.constant); - } - } - - if (value_ast) { - _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); - } else { - ZVAL_NULL(&value_zv); - } if (!CG(active_op_array)->static_variables) { if (CG(active_op_array)->scope) { @@ -6229,15 +6216,40 @@ void zend_compile_static_var(zend_ast *ast TSRMLS_DC) { zend_hash_init(CG(active_op_array)->static_variables, 8, NULL, ZVAL_PTR_DTOR, 0); } - zend_hash_update(CG(active_op_array)->static_variables, - Z_STR(var_node.u.constant), &value_zv); + zend_hash_update(CG(active_op_array)->static_variables, Z_STR(var_node.u.constant), value); - opline = emit_op(&result, ZEND_FETCH_W, &var_node, NULL TSRMLS_CC); + opline = emit_op(&result, by_ref ? ZEND_FETCH_W : ZEND_FETCH_R, &var_node, NULL TSRMLS_CC); opline->extended_value = ZEND_FETCH_STATIC; - zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); - zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); - efree(fetch_ast); + if (by_ref) { + zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); + zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); + efree(fetch_ast); + } else { + zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); + zend_ast *znode_ast = zend_ast_create_znode(&result); + zend_ast *assign_ast = zend_ast_create_binary(ZEND_AST_ASSIGN, fetch_ast, znode_ast); + znode dummy_node; + zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); + zend_do_free(&dummy_node TSRMLS_CC); + efree(znode_ast); + efree(assign_ast); + efree(fetch_ast); + } +} + +void zend_compile_static_var(zend_ast *ast TSRMLS_DC) { + zend_ast *var_ast = ast->child[0]; + zend_ast *value_ast = ast->child[1]; + zval value_zv; + + if (value_ast) { + _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); + } else { + ZVAL_NULL(&value_zv); + } + + zend_compile_static_var_common(var_ast, &value_zv, 1 TSRMLS_CC); } void zend_compile_unset(zend_ast *ast TSRMLS_DC) { @@ -6968,6 +6980,30 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { op_array->arg_info = arg_infos; } +void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { + zend_uint i; + + if (!ast) { + return; + } + + for (i = 0; i < ast->children; ++i) { + zend_ast *var_ast = ast->child[i]; + zend_string *name = Z_STR_P(zend_ast_get_zval(var_ast)); + zend_bool by_ref = var_ast->attr; + zval zv; + + if (name->len == sizeof("this") - 1 && !memcmp(name->val, "this", sizeof("this") - 1)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as lexical variable"); + } + + ZVAL_NULL(&zv); + Z_CONST_FLAGS(zv) = by_ref ? IS_LEXICAL_REF : IS_LEXICAL_VAR; + + zend_compile_static_var_common(var_ast, &zv, by_ref TSRMLS_CC); + } +} + void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; zend_ast *params_ast = ast->child[1]; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index f48cd3285a..50263eed8a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -870,11 +870,11 @@ expr_without_variable: | T_YIELD expr T_DOUBLE_ARROW expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } | function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); } - '(' parameter_list ')' { zend_compile_params($5.u.ast TSRMLS_CC); zend_ast_destroy($5.u.ast); } lexical_vars - '{' inner_statement_list '}' { AS($10); zend_do_end_function_declaration(&$1 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$3); } + '(' parameter_list ')' { zend_compile_params($5.u.ast TSRMLS_CC); zend_ast_destroy($5.u.ast); } lexical_vars { zend_compile_closure_uses($8.u.ast TSRMLS_CC); if ($8.u.ast) zend_ast_destroy($8.u.ast); } + '{' inner_statement_list '}' { AS($11); zend_do_end_function_declaration(&$1 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$3); } | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } - '(' parameter_list ')' { zend_compile_params($6.u.ast TSRMLS_CC); zend_ast_destroy($6.u.ast); } lexical_vars - '{' inner_statement_list '}' { AS($11); zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } + '(' parameter_list ')' { zend_compile_params($6.u.ast TSRMLS_CC); zend_ast_destroy($6.u.ast); } lexical_vars { zend_compile_closure_uses($9.u.ast TSRMLS_CC); if ($9.u.ast) zend_ast_destroy($9.u.ast); } + '{' inner_statement_list '}' { AS($12); zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } ; function: @@ -882,15 +882,18 @@ function: ; lexical_vars: - /* empty */ - | T_USE '(' lexical_var_list ')' + /* empty */ { $$.u.ast = NULL; } + | T_USE '(' lexical_var_list ')' { $$.u.ast = $3.u.ast; } ; lexical_var_list: - lexical_var_list ',' T_VARIABLE { zend_do_fetch_lexical_variable(&$3, 0 TSRMLS_CC); } - | lexical_var_list ',' '&' T_VARIABLE { zend_do_fetch_lexical_variable(&$4, 1 TSRMLS_CC); } - | T_VARIABLE { zend_do_fetch_lexical_variable(&$1, 0 TSRMLS_CC); } - | '&' T_VARIABLE { zend_do_fetch_lexical_variable(&$2, 1 TSRMLS_CC); } + lexical_var_list ',' lexical_var { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | lexical_var { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CLOSURE_USES, $1.u.ast); } +; + +lexical_var: + T_VARIABLE { $$.u.ast = AST_ZVAL(&$1); } + | '&' T_VARIABLE { $$.u.ast = zend_ast_create_zval_ex(&$2.u.constant, 1); } ; function_call: -- cgit v1.2.1 From ae5ba9abfbb257af6c0e4e67b179ddcc5d0fe028 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 12:58:24 +0200 Subject: Port closures --- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 75 +++++++++++++++++++++++++++++++++++---------- Zend/zend_language_parser.y | 6 ++-- 3 files changed, 62 insertions(+), 20 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 7f885ab029..3c22fda349 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -101,6 +101,7 @@ enum _zend_ast_kind { ZEND_AST_FUNC_DECL, + ZEND_AST_CLOSURE, ZEND_AST_CLOSURE_USES, }; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7daa618803..2e8e88b00a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7004,14 +7004,9 @@ void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { } } -void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { - zend_ast *name_ast = ast->child[0]; - zend_ast *params_ast = ast->child[1]; - zend_ast *stmt_ast = ast->child[2]; - zend_bool returns_ref = ast->attr; - zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); - - zend_op_array *orig_op_array = CG(active_op_array); +static zend_op *zend_begin_func_decl( + zend_string *name, zend_bool returns_ref, zend_uint start_lineno TSRMLS_DC +) { zend_op_array *op_array = emalloc(sizeof(zend_op_array)); zend_string *lcname; zend_op *opline; @@ -7027,7 +7022,7 @@ void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { op_array->function_name = STR_COPY(name); } - op_array->line_start = ast->lineno; + op_array->line_start = start_lineno; if (returns_ref) { op_array->fn_flags |= ZEND_ACC_RETURN_REFERENCE; } @@ -7072,10 +7067,8 @@ void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { zend_init_compiler_context(TSRMLS_C); if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) { - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline = emit_op(NULL, ZEND_EXT_NOP, NULL, NULL TSRMLS_CC); - opline->lineno = ast->lineno; + zend_op *opline_ext = emit_op(NULL, ZEND_EXT_NOP, NULL, NULL TSRMLS_CC); + opline_ext->lineno = start_lineno; } { @@ -7098,9 +7091,10 @@ void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline); } - zend_compile_params(params_ast TSRMLS_CC); - zend_compile_stmt(stmt_ast TSRMLS_CC); + return opline; +} +static void zend_end_func_decl(TSRMLS_D) { zend_do_extended_info(TSRMLS_C); zend_do_return(NULL, 0 TSRMLS_CC); @@ -7111,13 +7105,57 @@ void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { // TODO.AST end line // TODO.AST doc comment - CG(active_op_array) = orig_op_array; - /* Pop the switch and foreach separators */ zend_stack_del_top(&CG(switch_cond_stack)); zend_stack_del_top(&CG(foreach_copy_stack)); } +void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { + zend_ast *name_ast = ast->child[0]; + zend_ast *params_ast = ast->child[1]; + zend_ast *stmt_ast = ast->child[2]; + zend_bool returns_ref = ast->attr; + zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); + + zend_op_array *orig_op_array = CG(active_op_array); + zend_begin_func_decl(name, returns_ref, ast->lineno TSRMLS_CC); + + zend_compile_params(params_ast TSRMLS_CC); + zend_compile_stmt(stmt_ast TSRMLS_CC); + + zend_end_func_decl(TSRMLS_C); + CG(active_op_array) = orig_op_array; +} + +void zend_compile_closure(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast *params_ast = ast->child[0]; + zend_ast *uses_ast = ast->child[1]; + zend_ast *stmt_ast = ast->child[2]; + zend_bool returns_ref = ast->attr; + zend_string *name = STR_INIT("{closure}", sizeof("{closure}") - 1, 0); + + zend_op_array *orig_op_array = CG(active_op_array); + zend_op *opline = zend_begin_func_decl(name, returns_ref, ast->lineno TSRMLS_CC); + + result->op_type = IS_TMP_VAR; + result->u.op.var = get_temporary_variable(orig_op_array); + + opline->opcode = ZEND_DECLARE_LAMBDA_FUNCTION; + zend_del_literal(orig_op_array, opline->op2.constant); + SET_UNUSED(opline->op2); + SET_NODE(opline->result, result); + CG(active_op_array)->fn_flags |= ZEND_ACC_CLOSURE; + + zend_compile_closure_uses(uses_ast TSRMLS_CC); + zend_compile_params(params_ast TSRMLS_CC); + zend_compile_stmt(stmt_ast TSRMLS_CC); + + zend_end_func_decl(TSRMLS_C); + CG(active_op_array) = orig_op_array; + + STR_RELEASE(name); +} + 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]; @@ -8083,6 +8121,9 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_MAGIC_CONST: zend_compile_magic_const(result, ast TSRMLS_CC); return; + case ZEND_AST_CLOSURE: + zend_compile_closure(result, ast TSRMLS_CC); + return; default: ZEND_ASSERT(0 /* not supported */); } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 50263eed8a..7fdf5eb8e6 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -869,9 +869,9 @@ expr_without_variable: | T_YIELD expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $2.u.ast, NULL); } | T_YIELD expr T_DOUBLE_ARROW expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } - | function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); } - '(' parameter_list ')' { zend_compile_params($5.u.ast TSRMLS_CC); zend_ast_destroy($5.u.ast); } lexical_vars { zend_compile_closure_uses($8.u.ast TSRMLS_CC); if ($8.u.ast) zend_ast_destroy($8.u.ast); } - '{' inner_statement_list '}' { AS($11); zend_do_end_function_declaration(&$1 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$3); } + | function is_reference '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' + { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_CLOSURE, + $2.op_type, $4.u.ast, $6.u.ast, $8.u.ast); } | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } '(' parameter_list ')' { zend_compile_params($6.u.ast TSRMLS_CC); zend_ast_destroy($6.u.ast); } lexical_vars { zend_compile_closure_uses($9.u.ast TSRMLS_CC); if ($9.u.ast) zend_ast_destroy($9.u.ast); } '{' inner_statement_list '}' { AS($12); zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } -- cgit v1.2.1 From 3ad55e001e09592a385bcb6373ebbeb6b585d004 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 13:15:58 +0200 Subject: Small cleanup Current problem: build_runtime_defined_function_key is lexer coupled --- Zend/zend_compile.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2e8e88b00a..17013401f3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7004,12 +7004,13 @@ void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { } } -static zend_op *zend_begin_func_decl( - zend_string *name, zend_bool returns_ref, zend_uint start_lineno TSRMLS_DC +static void zend_begin_func_decl( + znode *result, zend_string *name, zend_uint start_lineno, zend_bool returns_ref TSRMLS_DC ) { zend_op_array *op_array = emalloc(sizeof(zend_op_array)); zend_string *lcname; zend_op *opline; + zend_bool is_closure = result != NULL; // TODO.AST interactive (not just here - also bpc etc!) @@ -7026,6 +7027,9 @@ static zend_op *zend_begin_func_decl( if (returns_ref) { op_array->fn_flags |= ZEND_ACC_RETURN_REFERENCE; } + if (is_closure) { + op_array->fn_flags |= ZEND_ACC_CLOSURE; + } lcname = STR_ALLOC(name->len, 0); zend_str_tolower_copy(lcname->val, name->val, name->len); @@ -7046,11 +7050,15 @@ static zend_op *zend_begin_func_decl( } } - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_DECLARE_FUNCTION; - opline->extended_value = ZEND_DECLARE_FUNCTION; - opline->op2_type = IS_CONST; - LITERAL_STR(opline->op2, lcname); + if (is_closure) { + opline = emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL TSRMLS_CC); + } else { + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_DECLARE_FUNCTION; + opline->extended_value = ZEND_DECLARE_FUNCTION; + opline->op2_type = IS_CONST; + LITERAL_STR(opline->op2, STR_COPY(lcname)); + } { zval key; @@ -7062,6 +7070,8 @@ static zend_op *zend_begin_func_decl( zend_hash_update_ptr(CG(function_table), Z_STR(key), op_array); } + STR_RELEASE(lcname); + CG(active_op_array) = op_array; zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); @@ -7090,8 +7100,6 @@ static zend_op *zend_begin_func_decl( zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline); } - - return opline; } static void zend_end_func_decl(TSRMLS_D) { @@ -7118,7 +7126,7 @@ void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); zend_op_array *orig_op_array = CG(active_op_array); - zend_begin_func_decl(name, returns_ref, ast->lineno TSRMLS_CC); + zend_begin_func_decl(NULL, name, ast->lineno, returns_ref TSRMLS_CC); zend_compile_params(params_ast TSRMLS_CC); zend_compile_stmt(stmt_ast TSRMLS_CC); @@ -7135,16 +7143,7 @@ void zend_compile_closure(znode *result, zend_ast *ast TSRMLS_DC) { zend_string *name = STR_INIT("{closure}", sizeof("{closure}") - 1, 0); zend_op_array *orig_op_array = CG(active_op_array); - zend_op *opline = zend_begin_func_decl(name, returns_ref, ast->lineno TSRMLS_CC); - - result->op_type = IS_TMP_VAR; - result->u.op.var = get_temporary_variable(orig_op_array); - - opline->opcode = ZEND_DECLARE_LAMBDA_FUNCTION; - zend_del_literal(orig_op_array, opline->op2.constant); - SET_UNUSED(opline->op2); - SET_NODE(opline->result, result); - CG(active_op_array)->fn_flags |= ZEND_ACC_CLOSURE; + zend_begin_func_decl(result, name, ast->lineno, returns_ref TSRMLS_CC); zend_compile_closure_uses(uses_ast TSRMLS_CC); zend_compile_params(params_ast TSRMLS_CC); -- cgit v1.2.1 From 359f99fe4850c1338b1b52b5e98705da4de6debd Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 14:57:00 +0200 Subject: Use dedicated func_decl ast node Functions need a bunch of extra info, that becomes inconvenient to handle using the normal ast structure. --- Zend/zend_ast.c | 48 +++++++++++++++++++++++++++++----- Zend/zend_ast.h | 18 ++++++++++++- Zend/zend_compile.c | 63 +++++++++++---------------------------------- Zend/zend_language_parser.y | 11 +++++--- 4 files changed, 81 insertions(+), 59 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 85b6448908..3edc1f9fda 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -45,6 +45,24 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) return (zend_ast *) ast; } +ZEND_API zend_ast *zend_ast_create_func_decl( + zend_ast_kind kind, zend_bool returns_ref, zend_uint start_lineno, zend_uint end_lineno, + zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt +) { + zend_ast_func_decl *ast = emalloc(sizeof(zend_ast_func_decl)); + + ast->kind = kind; + ast->returns_ref = returns_ref; + ast->start_lineno = start_lineno; + ast->end_lineno = end_lineno; + ast->name = name; + ast->params = params; + ast->uses = uses; + ast->stmt = stmt; + + return (zend_ast *) ast; +} + static zend_ast *zend_ast_create_from_va_list( zend_uint children, zend_ast_kind kind, zend_ast_attr attr, va_list va ) { @@ -315,16 +333,34 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) ZEND_API void zend_ast_destroy(zend_ast *ast) { - int i; + if (!ast) { + return; + } - if (ast->kind == ZEND_AST_ZVAL) { - zval_ptr_dtor(zend_ast_get_zval(ast)); - } else if (ast->kind != ZEND_AST_ZNODE) { - for (i = 0; i < ast->children; i++) { - if (ast->child[i]) { + switch (ast->kind) { + case ZEND_AST_ZVAL: + zval_ptr_dtor(zend_ast_get_zval(ast)); + break; + case ZEND_AST_ZNODE: + break; + case ZEND_AST_FUNC_DECL: + case ZEND_AST_CLOSURE: + { + zend_ast_func_decl *fn = (zend_ast_func_decl *) ast; + STR_RELEASE(fn->name); + zend_ast_destroy(fn->params); + zend_ast_destroy(fn->uses); + zend_ast_destroy(fn->stmt); + break; + } + default: + { + zend_uint i; + for (i = 0; i < ast->children; i++) { zend_ast_destroy(ast->child[i]); } } } + efree(ast); } diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 3c22fda349..490046d057 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -100,7 +100,6 @@ enum _zend_ast_kind { ZEND_AST_TYPE, ZEND_AST_FUNC_DECL, - ZEND_AST_CLOSURE, ZEND_AST_CLOSURE_USES, }; @@ -123,6 +122,18 @@ typedef struct _zend_ast_zval { zval val; } zend_ast_zval; +/* Using a separate structure as it needs a bunch of extra information. */ +typedef struct _zend_ast_func_decl { + zend_ast_kind kind; + zend_bool returns_ref; + zend_uint start_lineno; + zend_uint end_lineno; + zend_string *name; + zend_ast *params; + zend_ast *uses; + zend_ast *stmt; +} zend_ast_func_decl; + static inline zval *zend_ast_get_zval(zend_ast *ast) { return &((zend_ast_zval *) ast)->val; } @@ -134,6 +145,11 @@ ZEND_API zend_ast *zend_ast_create_ex( ZEND_API zend_ast *zend_ast_create( zend_uint children, zend_ast_kind kind, ...); +ZEND_API zend_ast *zend_ast_create_func_decl( + zend_ast_kind kind, zend_bool by_ref, zend_uint start_lineno, zend_uint end_lineno, + zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt +); + ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind); ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op); ZEND_API void zend_ast_dynamic_shrink(zend_ast **ast); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 17013401f3..5278abaed0 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7004,13 +7004,13 @@ void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { } } -static void zend_begin_func_decl( - znode *result, zend_string *name, zend_uint start_lineno, zend_bool returns_ref TSRMLS_DC -) { +void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast_func_decl *fn = (zend_ast_func_decl *) ast; + zend_op_array *orig_op_array = CG(active_op_array); zend_op_array *op_array = emalloc(sizeof(zend_op_array)); - zend_string *lcname; + zend_string *name = fn->name, *lcname; zend_op *opline; - zend_bool is_closure = result != NULL; + zend_bool is_closure = ast->kind == ZEND_AST_CLOSURE; // TODO.AST interactive (not just here - also bpc etc!) @@ -7023,8 +7023,9 @@ static void zend_begin_func_decl( op_array->function_name = STR_COPY(name); } - op_array->line_start = start_lineno; - if (returns_ref) { + op_array->line_start = fn->start_lineno; + op_array->line_end = fn->end_lineno; + if (fn->returns_ref) { op_array->fn_flags |= ZEND_ACC_RETURN_REFERENCE; } if (is_closure) { @@ -7078,7 +7079,7 @@ static void zend_begin_func_decl( if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) { zend_op *opline_ext = emit_op(NULL, ZEND_EXT_NOP, NULL, NULL TSRMLS_CC); - opline_ext->lineno = start_lineno; + opline_ext->lineno = fn->start_lineno; } { @@ -7100,9 +7101,11 @@ static void zend_begin_func_decl( zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline); } -} -static void zend_end_func_decl(TSRMLS_D) { + zend_compile_params(fn->params TSRMLS_CC); + zend_compile_closure_uses(fn->uses TSRMLS_CC); + zend_compile_stmt(fn->stmt TSRMLS_CC); + zend_do_extended_info(TSRMLS_C); zend_do_return(NULL, 0 TSRMLS_CC); @@ -7110,49 +7113,13 @@ static void zend_end_func_decl(TSRMLS_D) { zend_release_labels(0 TSRMLS_CC); // TODO.AST __autoload - // TODO.AST end line // TODO.AST doc comment /* Pop the switch and foreach separators */ zend_stack_del_top(&CG(switch_cond_stack)); zend_stack_del_top(&CG(foreach_copy_stack)); -} -void zend_compile_func_decl(zend_ast *ast TSRMLS_DC) { - zend_ast *name_ast = ast->child[0]; - zend_ast *params_ast = ast->child[1]; - zend_ast *stmt_ast = ast->child[2]; - zend_bool returns_ref = ast->attr; - zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); - - zend_op_array *orig_op_array = CG(active_op_array); - zend_begin_func_decl(NULL, name, ast->lineno, returns_ref TSRMLS_CC); - - zend_compile_params(params_ast TSRMLS_CC); - zend_compile_stmt(stmt_ast TSRMLS_CC); - - zend_end_func_decl(TSRMLS_C); - CG(active_op_array) = orig_op_array; -} - -void zend_compile_closure(znode *result, zend_ast *ast TSRMLS_DC) { - zend_ast *params_ast = ast->child[0]; - zend_ast *uses_ast = ast->child[1]; - zend_ast *stmt_ast = ast->child[2]; - zend_bool returns_ref = ast->attr; - zend_string *name = STR_INIT("{closure}", sizeof("{closure}") - 1, 0); - - zend_op_array *orig_op_array = CG(active_op_array); - zend_begin_func_decl(result, name, ast->lineno, returns_ref TSRMLS_CC); - - zend_compile_closure_uses(uses_ast TSRMLS_CC); - zend_compile_params(params_ast TSRMLS_CC); - zend_compile_stmt(stmt_ast TSRMLS_CC); - - zend_end_func_decl(TSRMLS_C); CG(active_op_array) = orig_op_array; - - STR_RELEASE(name); } void zend_compile_binary_op(znode *result, zend_ast *ast TSRMLS_DC) { @@ -7994,7 +7961,7 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { zend_compile_try(ast TSRMLS_CC); break; case ZEND_AST_FUNC_DECL: - zend_compile_func_decl(ast TSRMLS_CC); + zend_compile_func_decl(NULL, ast TSRMLS_CC); break; default: { @@ -8121,7 +8088,7 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_magic_const(result, ast TSRMLS_CC); return; case ZEND_AST_CLOSURE: - zend_compile_closure(result, ast TSRMLS_CC); + zend_compile_func_decl(result, ast TSRMLS_CC); return; default: ZEND_ASSERT(0 /* not supported */); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 7fdf5eb8e6..6798b5ac07 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -389,8 +389,9 @@ unset_variable: function_declaration_statement: function is_reference T_STRING '(' parameter_list ')' '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_FUNC_DECL, - $2.op_type, AST_ZVAL(&$3), $5.u.ast, $8.u.ast); } + { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_FUNC_DECL, $2.op_type, + $1.u.op.opline_num, CG(zend_lineno), Z_STR($3.u.constant), + $5.u.ast, NULL, $8.u.ast); } ; class_declaration_statement: @@ -870,8 +871,10 @@ expr_without_variable: | T_YIELD expr T_DOUBLE_ARROW expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } | function is_reference '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_CLOSURE, - $2.op_type, $4.u.ast, $6.u.ast, $8.u.ast); } + { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_CLOSURE, $2.op_type, + $1.u.op.opline_num, CG(zend_lineno), + STR_INIT("{closure}", sizeof("{closure}") - 1, 0), + $4.u.ast, $6.u.ast, $8.u.ast); } | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } '(' parameter_list ')' { zend_compile_params($6.u.ast TSRMLS_CC); zend_ast_destroy($6.u.ast); } lexical_vars { zend_compile_closure_uses($9.u.ast TSRMLS_CC); if ($9.u.ast) zend_ast_destroy($9.u.ast); } '{' inner_statement_list '}' { AS($12); zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } -- cgit v1.2.1 From cdcf78f73036616a5c9d15537df1b0d5eef1ead9 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 15:05:31 +0200 Subject: Fix lexer/compiler interdependency --- Zend/zend_ast.c | 3 ++- Zend/zend_ast.h | 3 ++- Zend/zend_compile.c | 14 +++++++------- Zend/zend_language_parser.y | 6 +++--- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 3edc1f9fda..4b87712e7c 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -47,7 +47,7 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) ZEND_API zend_ast *zend_ast_create_func_decl( zend_ast_kind kind, zend_bool returns_ref, zend_uint start_lineno, zend_uint end_lineno, - zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt + unsigned char *lex_pos, zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt ) { zend_ast_func_decl *ast = emalloc(sizeof(zend_ast_func_decl)); @@ -55,6 +55,7 @@ ZEND_API zend_ast *zend_ast_create_func_decl( ast->returns_ref = returns_ref; ast->start_lineno = start_lineno; ast->end_lineno = end_lineno; + ast->lex_pos = lex_pos; ast->name = name; ast->params = params; ast->uses = uses; diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 490046d057..87cbe9c98e 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -128,6 +128,7 @@ typedef struct _zend_ast_func_decl { zend_bool returns_ref; zend_uint start_lineno; zend_uint end_lineno; + unsigned char *lex_pos; zend_string *name; zend_ast *params; zend_ast *uses; @@ -147,7 +148,7 @@ ZEND_API zend_ast *zend_ast_create( ZEND_API zend_ast *zend_ast_create_func_decl( zend_ast_kind kind, zend_bool by_ref, zend_uint start_lineno, zend_uint end_lineno, - zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt + unsigned char *lex_pos, zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt ); ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 5278abaed0..9f5c4a6fee 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -139,13 +139,13 @@ static void zend_destroy_property_info_internal(zval *zv) /* {{{ */ } /* }}} */ -static void build_runtime_defined_function_key(zval *result, const char *name, int name_length TSRMLS_DC) /* {{{ */ +static void build_runtime_defined_function_key(zval *result, zend_string *name, unsigned char *lex_pos TSRMLS_DC) /* {{{ */ { char char_pos_buf[32]; uint char_pos_len; const char *filename; - char_pos_len = zend_sprintf(char_pos_buf, "%p", LANG_SCNG(yy_text)); + char_pos_len = zend_sprintf(char_pos_buf, "%p", lex_pos); if (CG(active_op_array)->filename) { filename = CG(active_op_array)->filename->val; } else { @@ -153,11 +153,11 @@ static void build_runtime_defined_function_key(zval *result, const char *name, i } /* NULL, name length, filename length, last accepting char position length */ - ZVAL_NEW_STR(result, STR_ALLOC(1+name_length+strlen(filename)+char_pos_len, 0)); + ZVAL_NEW_STR(result, STR_ALLOC(1 + name->len + strlen(filename) + char_pos_len, 0)); /* must be binary safe */ Z_STRVAL_P(result)[0] = '\0'; - sprintf(Z_STRVAL_P(result)+1, "%s%s%s", name, filename, char_pos_buf); + sprintf(Z_STRVAL_P(result)+1, "%s%s%s", name->val, filename, char_pos_buf); } /* }}} */ @@ -1251,7 +1251,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n opline->opcode = ZEND_DECLARE_FUNCTION; opline->op1_type = IS_CONST; - build_runtime_defined_function_key(&key, lcname->val, lcname->len TSRMLS_CC); + build_runtime_defined_function_key(&key, lcname, LANG_SCNG(yy_text) TSRMLS_CC); opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); opline->op2_type = IS_CONST; LITERAL_STR(opline->op2, STR_COPY(lcname)); @@ -3891,7 +3891,7 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->op1_type = IS_CONST; - build_runtime_defined_function_key(&key, lcname->val, lcname->len TSRMLS_CC); + build_runtime_defined_function_key(&key, lcname, LANG_SCNG(yy_text) TSRMLS_CC); opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); opline->op2_type = IS_CONST; @@ -7063,7 +7063,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { { zval key; - build_runtime_defined_function_key(&key, lcname->val, lcname->len TSRMLS_CC); + build_runtime_defined_function_key(&key, lcname, fn->lex_pos TSRMLS_CC); opline->op1_type = IS_CONST; opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6798b5ac07..f6471008ca 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -390,8 +390,8 @@ unset_variable: function_declaration_statement: function is_reference T_STRING '(' parameter_list ')' '{' inner_statement_list '}' { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_FUNC_DECL, $2.op_type, - $1.u.op.opline_num, CG(zend_lineno), Z_STR($3.u.constant), - $5.u.ast, NULL, $8.u.ast); } + $1.u.op.opline_num, CG(zend_lineno), LANG_SCNG(yy_text), + Z_STR($3.u.constant), $5.u.ast, NULL, $8.u.ast); } ; class_declaration_statement: @@ -872,7 +872,7 @@ expr_without_variable: { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } | function is_reference '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_CLOSURE, $2.op_type, - $1.u.op.opline_num, CG(zend_lineno), + $1.u.op.opline_num, CG(zend_lineno), LANG_SCNG(yy_text), STR_INIT("{closure}", sizeof("{closure}") - 1, 0), $4.u.ast, $6.u.ast, $8.u.ast); } | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } -- cgit v1.2.1 From 405b97e8a9c2f63a8e6d334227aa01b7ee9606ee Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 15:23:16 +0200 Subject: Handle function doc comments --- Zend/zend_ast.c | 7 ++++++- Zend/zend_ast.h | 4 +++- Zend/zend_compile.c | 5 ++++- Zend/zend_language_parser.y | 15 ++++++++++----- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 4b87712e7c..891b36d9af 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -47,7 +47,8 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) ZEND_API zend_ast *zend_ast_create_func_decl( zend_ast_kind kind, zend_bool returns_ref, zend_uint start_lineno, zend_uint end_lineno, - unsigned char *lex_pos, zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt + unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, + zend_ast *params, zend_ast *uses, zend_ast *stmt ) { zend_ast_func_decl *ast = emalloc(sizeof(zend_ast_func_decl)); @@ -56,6 +57,7 @@ ZEND_API zend_ast *zend_ast_create_func_decl( ast->start_lineno = start_lineno; ast->end_lineno = end_lineno; ast->lex_pos = lex_pos; + ast->doc_comment = doc_comment; ast->name = name; ast->params = params; ast->uses = uses; @@ -349,6 +351,9 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) { zend_ast_func_decl *fn = (zend_ast_func_decl *) ast; STR_RELEASE(fn->name); + if (fn->doc_comment) { + STR_RELEASE(fn->doc_comment); + } zend_ast_destroy(fn->params); zend_ast_destroy(fn->uses); zend_ast_destroy(fn->stmt); diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 87cbe9c98e..d3eca8117c 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -129,6 +129,7 @@ typedef struct _zend_ast_func_decl { zend_uint start_lineno; zend_uint end_lineno; unsigned char *lex_pos; + zend_string *doc_comment; zend_string *name; zend_ast *params; zend_ast *uses; @@ -148,7 +149,8 @@ ZEND_API zend_ast *zend_ast_create( ZEND_API zend_ast *zend_ast_create_func_decl( zend_ast_kind kind, zend_bool by_ref, zend_uint start_lineno, zend_uint end_lineno, - unsigned char *lex_pos, zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt + unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, + zend_ast *params, zend_ast *uses, zend_ast *stmt ); ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 9f5c4a6fee..e6e641abf0 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1047,7 +1047,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n { zend_op_array op_array; zend_string *name = Z_STR(function_name->u.constant); - int function_begin_line = function_token->u.op.opline_num; + int function_begin_line = function_token->EA; zend_uint fn_flags; zend_string *lcname; zend_bool orig_interactive; @@ -7025,6 +7025,9 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { op_array->line_start = fn->start_lineno; op_array->line_end = fn->end_lineno; + if (fn->doc_comment) { + op_array->doc_comment = STR_COPY(fn->doc_comment); + } if (fn->returns_ref) { op_array->fn_flags |= ZEND_ACC_RETURN_REFERENCE; } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index f6471008ca..68049e098f 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -390,7 +390,7 @@ unset_variable: function_declaration_statement: function is_reference T_STRING '(' parameter_list ')' '{' inner_statement_list '}' { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_FUNC_DECL, $2.op_type, - $1.u.op.opline_num, CG(zend_lineno), LANG_SCNG(yy_text), + $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $1.u.op.ptr, Z_STR($3.u.constant), $5.u.ast, NULL, $8.u.ast); } ; @@ -629,7 +629,7 @@ class_statement: variable_modifiers { CG(access_type) = Z_LVAL($1.u.constant); } class_variable_declaration ';' | class_constant_declaration ';' | trait_use_statement - | method_modifiers function is_reference T_STRING { zend_do_begin_function_declaration(&$2, &$4, 1, $3.op_type, &$1 TSRMLS_CC); } + | method_modifiers function2 is_reference T_STRING { zend_do_begin_function_declaration(&$2, &$4, 1, $3.op_type, &$1 TSRMLS_CC); } '(' parameter_list ')' { zend_compile_params($7.u.ast TSRMLS_CC); zend_ast_destroy($7.u.ast); } method_body { zend_do_abstract_method(&$4, &$1, &$10 TSRMLS_CC); zend_do_end_function_declaration(&$2 TSRMLS_CC); } ; @@ -872,16 +872,21 @@ expr_without_variable: { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } | function is_reference '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_CLOSURE, $2.op_type, - $1.u.op.opline_num, CG(zend_lineno), LANG_SCNG(yy_text), + $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $1.u.op.ptr, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), $4.u.ast, $6.u.ast, $8.u.ast); } - | T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } + | T_STATIC function2 is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } '(' parameter_list ')' { zend_compile_params($6.u.ast TSRMLS_CC); zend_ast_destroy($6.u.ast); } lexical_vars { zend_compile_closure_uses($9.u.ast TSRMLS_CC); if ($9.u.ast) zend_ast_destroy($9.u.ast); } '{' inner_statement_list '}' { AS($12); zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } ; function: - T_FUNCTION { $$.u.op.opline_num = CG(zend_lineno); } + T_FUNCTION + { $$.EA = CG(zend_lineno); $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } +; + +function2: + T_FUNCTION { $$.EA = CG(zend_lineno); } ; lexical_vars: -- cgit v1.2.1 From adbddf4e5b6ae33c758d239a25488eb692777a0c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 15:47:46 +0200 Subject: Support static closures --- Zend/zend_ast.c | 5 +++-- Zend/zend_ast.h | 5 +++-- Zend/zend_compile.c | 5 +---- Zend/zend_language_parser.y | 24 ++++++++++++++++-------- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 891b36d9af..69321e044d 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -46,16 +46,17 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) } ZEND_API zend_ast *zend_ast_create_func_decl( - zend_ast_kind kind, zend_bool returns_ref, zend_uint start_lineno, zend_uint end_lineno, + zend_ast_kind kind, zend_uint flags, zend_uint start_lineno, zend_uint end_lineno, unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt ) { zend_ast_func_decl *ast = emalloc(sizeof(zend_ast_func_decl)); ast->kind = kind; - ast->returns_ref = returns_ref; + ast->attr = 0; ast->start_lineno = start_lineno; ast->end_lineno = end_lineno; + ast->flags = flags; ast->lex_pos = lex_pos; ast->doc_comment = doc_comment; ast->name = name; diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index d3eca8117c..f20446fd22 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -125,9 +125,10 @@ typedef struct _zend_ast_zval { /* Using a separate structure as it needs a bunch of extra information. */ typedef struct _zend_ast_func_decl { zend_ast_kind kind; - zend_bool returns_ref; + zend_ast_attr attr; /* Unused - for structure compatibility */ zend_uint start_lineno; zend_uint end_lineno; + zend_uint flags; unsigned char *lex_pos; zend_string *doc_comment; zend_string *name; @@ -148,7 +149,7 @@ ZEND_API zend_ast *zend_ast_create( zend_uint children, zend_ast_kind kind, ...); ZEND_API zend_ast *zend_ast_create_func_decl( - zend_ast_kind kind, zend_bool by_ref, zend_uint start_lineno, zend_uint end_lineno, + zend_ast_kind kind, zend_uint flags, zend_uint start_lineno, zend_uint end_lineno, unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, zend_ast *params, zend_ast *uses, zend_ast *stmt ); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e6e641abf0..1d16b9b3d3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7023,14 +7023,12 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { op_array->function_name = STR_COPY(name); } + op_array->fn_flags |= fn->flags; op_array->line_start = fn->start_lineno; op_array->line_end = fn->end_lineno; if (fn->doc_comment) { op_array->doc_comment = STR_COPY(fn->doc_comment); } - if (fn->returns_ref) { - op_array->fn_flags |= ZEND_ACC_RETURN_REFERENCE; - } if (is_closure) { op_array->fn_flags |= ZEND_ACC_CLOSURE; } @@ -7116,7 +7114,6 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { zend_release_labels(0 TSRMLS_CC); // TODO.AST __autoload - // TODO.AST doc comment /* Pop the switch and foreach separators */ zend_stack_del_top(&CG(switch_cond_stack)); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 68049e098f..1dd800e6e4 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -388,8 +388,8 @@ unset_variable: ; function_declaration_statement: - function is_reference T_STRING '(' parameter_list ')' '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_FUNC_DECL, $2.op_type, + function returns_ref T_STRING '(' parameter_list ')' '{' inner_statement_list '}' + { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_FUNC_DECL, $2.EA, $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $1.u.op.ptr, Z_STR($3.u.constant), $5.u.ast, NULL, $8.u.ast); } ; @@ -870,14 +870,17 @@ expr_without_variable: | T_YIELD expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $2.u.ast, NULL); } | T_YIELD expr T_DOUBLE_ARROW expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } - | function is_reference '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_CLOSURE, $2.op_type, + | function returns_ref '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' + { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_CLOSURE, $2.EA, $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $1.u.op.ptr, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), - $4.u.ast, $6.u.ast, $8.u.ast); } - | T_STATIC function2 is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); } - '(' parameter_list ')' { zend_compile_params($6.u.ast TSRMLS_CC); zend_ast_destroy($6.u.ast); } lexical_vars { zend_compile_closure_uses($9.u.ast TSRMLS_CC); if ($9.u.ast) zend_ast_destroy($9.u.ast); } - '{' inner_statement_list '}' { AS($12); zend_do_end_function_declaration(&$2 TSRMLS_CC); $$.u.ast = AST_ZNODE(&$4); } + $4.u.ast, $6.u.ast, $8.u.ast); } + | T_STATIC function returns_ref '(' parameter_list ')' lexical_vars + '{' inner_statement_list '}' + { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_CLOSURE, + $3.EA | ZEND_ACC_STATIC, $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), + $2.u.op.ptr, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), + $5.u.ast, $7.u.ast, $9.u.ast); } ; function: @@ -885,6 +888,11 @@ function: { $$.EA = CG(zend_lineno); $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } ; +returns_ref: + /* empty */ { $$.EA = 0; } + | '&' { $$.EA = ZEND_ACC_RETURN_REFERENCE; } +; + function2: T_FUNCTION { $$.EA = CG(zend_lineno); } ; -- cgit v1.2.1 From 0eab81f32bd88cb683b3e128fa4c75ae7c59c578 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 15:53:38 +0200 Subject: Remove bits of dead code --- Zend/zend_compile.c | 551 ---------------------------------------------------- Zend/zend_compile.h | 18 +- 2 files changed, 1 insertion(+), 568 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 1d16b9b3d3..49ac3a80ac 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -569,64 +569,6 @@ static void zend_do_op_data(zend_op *data_op, znode *value TSRMLS_DC) /* {{{ */ } /* }}} */ -void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar op TSRMLS_DC) /* {{{ */ -{ - zend_op opline; - zend_op *opline_ptr; - - if (varname->op_type == IS_CONST) { - if (Z_TYPE(varname->u.constant) != IS_STRING) { - convert_to_string(&varname->u.constant); - } - - if (!zend_is_auto_global(Z_STR(varname->u.constant) TSRMLS_CC) && - !(Z_STRLEN(varname->u.constant) == (sizeof("this")-1) && - !memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this") - 1)) && - (CG(active_op_array)->last == 0 || - CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode != ZEND_BEGIN_SILENCE)) { - result->op_type = IS_CV; - result->u.op.var = lookup_cv(CG(active_op_array), Z_STR(varname->u.constant) TSRMLS_CC); - Z_STR(varname->u.constant) = CG(active_op_array)->vars[EX_VAR_TO_NUM(result->u.op.var)]; - result->EA = 0; - return; - } - } - - if (bp) { - opline_ptr = &opline; - init_op(opline_ptr TSRMLS_CC); - } else { - opline_ptr = get_next_op(CG(active_op_array) TSRMLS_CC); - } - - opline_ptr->opcode = op; - opline_ptr->result_type = IS_VAR; - opline_ptr->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline_ptr->op1, varname); - GET_NODE(result, opline_ptr->result); - SET_UNUSED(opline_ptr->op2); - opline_ptr->extended_value = ZEND_FETCH_LOCAL; - - if (varname->op_type == IS_CONST) { - if (zend_is_auto_global(Z_STR(varname->u.constant) TSRMLS_CC)) { - opline_ptr->extended_value = ZEND_FETCH_GLOBAL; - } - } - - if (bp) { - zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); - zend_llist_add_element(fetch_list_ptr, opline_ptr); - } -} -/* }}} */ - -void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC) /* {{{ */ -{ - /* the default mode must be Write, since fetch_simple_variable() is used to define function arguments */ - fetch_simple_variable_ex(result, varname, bp, ZEND_FETCH_W TSRMLS_CC); -} -/* }}} */ - void zend_do_abstract_method(const znode *function_name, znode *modifiers, const znode *body TSRMLS_DC) /* {{{ */ { char *method_type; @@ -660,160 +602,6 @@ void zend_do_abstract_method(const znode *function_name, znode *modifiers, const } /* }}} */ -static zend_bool opline_is_fetch_this(const zend_op *opline TSRMLS_DC) /* {{{ */ -{ - if ((opline->opcode == ZEND_FETCH_W) && (opline->op1_type == IS_CONST) - && (Z_TYPE(CONSTANT(opline->op1.constant)) == IS_STRING) - && ((opline->extended_value & ZEND_FETCH_STATIC_MEMBER) != ZEND_FETCH_STATIC_MEMBER) - && (Z_STRHASH(CONSTANT(opline->op1.constant)) == THIS_HASHVAL) - && (Z_STRLEN(CONSTANT(opline->op1.constant)) == (sizeof("this")-1)) - && !memcmp(Z_STRVAL(CONSTANT(opline->op1.constant)), "this", sizeof("this") - 1)) { - return 1; - } else { - return 0; - } -} -/* }}} */ - -void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC) /* {{{ */ -{ - int last_op_number; - zend_op *opline; - - if (value->op_type == IS_CV) { - zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); - if (fetch_list_ptr && fetch_list_ptr->head) { - opline = (zend_op *)fetch_list_ptr->head->data; - - if (opline->opcode == ZEND_FETCH_DIM_W && - opline->op1_type == IS_CV && - opline->op1.var == value->u.op.var) { - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_FETCH_R; - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - opline->op1_type = IS_CONST; - LITERAL_STR(opline->op1, - STR_COPY(CG(active_op_array)->vars[EX_VAR_TO_NUM(value->u.op.var)])); - SET_UNUSED(opline->op2); - opline->extended_value = ZEND_FETCH_LOCAL; - GET_NODE(value, opline->result); - } - } - } - - zend_do_end_variable_parse(variable, BP_VAR_W, 0 TSRMLS_CC); - - last_op_number = get_next_op_number(CG(active_op_array)); - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - if (variable->op_type == IS_CV) { - if (variable->u.op.var == CG(active_op_array)->this_var) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); - } - } else if (variable->op_type == IS_VAR) { - int n = 0; - - while (last_op_number - n > 0) { - zend_op *last_op; - - last_op = &CG(active_op_array)->opcodes[last_op_number-n-1]; - - if (last_op->result_type == IS_VAR && - last_op->result.var == variable->u.op.var) { - if (last_op->opcode == ZEND_FETCH_OBJ_W) { - if (n > 0) { - int opline_no = (opline-CG(active_op_array)->opcodes)/sizeof(*opline); - *opline = *last_op; - MAKE_NOP(last_op); - /* last_op = opline; */ - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - /* get_next_op can realloc, we need to move last_op */ - last_op = &CG(active_op_array)->opcodes[opline_no]; - } - last_op->opcode = ZEND_ASSIGN_OBJ; - zend_do_op_data(opline, value TSRMLS_CC); - SET_UNUSED(opline->result); - GET_NODE(result, last_op->result); - return; - } else if (last_op->opcode == ZEND_FETCH_DIM_W) { - if (n > 0) { - int opline_no = (opline-CG(active_op_array)->opcodes)/sizeof(*opline); - *opline = *last_op; - MAKE_NOP(last_op); - /* last_op = opline; */ - /* TBFixed: this can realloc opcodes, leaving last_op pointing wrong */ - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - /* get_next_op can realloc, we need to move last_op */ - last_op = &CG(active_op_array)->opcodes[opline_no]; - } - last_op->opcode = ZEND_ASSIGN_DIM; - zend_do_op_data(opline, value TSRMLS_CC); - opline->op2.var = get_temporary_variable(CG(active_op_array)); - opline->op2_type = IS_VAR; - SET_UNUSED(opline->result); - GET_NODE(result, last_op->result); - return; - } else if (opline_is_fetch_this(last_op TSRMLS_CC)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); - } else { - break; - } - } - n++; - } - } - - opline->opcode = ZEND_ASSIGN; - SET_NODE(opline->op1, variable); - SET_NODE(opline->op2, value); - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); -} -/* }}} */ - -void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - - if (lvar->op_type == IS_CV) { - if (lvar->u.op.var == CG(active_op_array)->this_var) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); - } - } else if (lvar->op_type == IS_VAR) { - int last_op_number = get_next_op_number(CG(active_op_array)); - - if (last_op_number > 0) { - opline = &CG(active_op_array)->opcodes[last_op_number-1]; - if (opline_is_fetch_this(opline TSRMLS_CC)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); - } - } - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_ASSIGN_REF; - if (zend_is_function_or_method_call(rvar)) { - opline->extended_value = ZEND_RETURNS_FUNCTION; - } else if (rvar->EA & ZEND_PARSED_NEW) { - opline->extended_value = ZEND_RETURNS_NEW; - } else { - opline->extended_value = 0; - } - if (result) { - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); - } else { - opline->result_type = IS_UNUSED | EXT_TYPE_UNUSED; - } - SET_NODE(opline->op1, lvar); - SET_NODE(opline->op2, rvar); -} -/* }}} */ - static inline void do_begin_loop(TSRMLS_D) /* {{{ */ { zend_brk_cont_element *brk_cont_element; @@ -841,127 +629,6 @@ static inline void do_end_loop(int cont_addr, int has_loop_var TSRMLS_DC) /* {{{ } /* }}} */ -void zend_check_writable_variable(const znode *variable) /* {{{ */ -{ - zend_uint type = variable->EA; - - if (type & ZEND_PARSED_METHOD_CALL) { - zend_error_noreturn(E_COMPILE_ERROR, "Can't use method return value in write context"); - } - if (type == ZEND_PARSED_FUNCTION_CALL) { - zend_error_noreturn(E_COMPILE_ERROR, "Can't use function return value in write context"); - } -} -/* }}} */ - -void zend_do_begin_variable_parse(TSRMLS_D) /* {{{ */ -{ - zend_llist fetch_list; - - zend_llist_init(&fetch_list, sizeof(zend_op), NULL, 0); - zend_stack_push(&CG(bp_stack), (void *) &fetch_list); -} -/* }}} */ - -void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS_DC) /* {{{ */ -{ - zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); - zend_llist_element *le = fetch_list_ptr->head; - zend_op *opline = NULL; - zend_op *opline_ptr; - zend_uint this_var = -1; - - /* TODO: $foo->x->y->z = 1 should fetch "x" and "y" for R or RW, not just W */ - - if (le) { - opline_ptr = (zend_op *)le->data; - if (opline_is_fetch_this(opline_ptr TSRMLS_CC)) { - /* convert to FETCH_?(this) into IS_CV */ - if (CG(active_op_array)->last == 0 || - CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode != ZEND_BEGIN_SILENCE) { - - this_var = opline_ptr->result.var; - if (CG(active_op_array)->this_var == -1) { - CG(active_op_array)->this_var = lookup_cv(CG(active_op_array), Z_STR(CONSTANT(opline_ptr->op1.constant)) TSRMLS_CC); - ZVAL_UNDEF(&CONSTANT(opline_ptr->op1.constant)); - } else { - zend_del_literal(CG(active_op_array), opline_ptr->op1.constant); - } - le = le->next; - if (variable->op_type == IS_VAR && - variable->u.op.var == this_var) { - variable->op_type = IS_CV; - variable->u.op.var = CG(active_op_array)->this_var; - } - } else if (CG(active_op_array)->this_var == -1) { - CG(active_op_array)->this_var = lookup_cv(CG(active_op_array), STR_INIT("this", sizeof("this")-1, 0) TSRMLS_CC); - } - } - - while (le) { - opline_ptr = (zend_op *)le->data; - if (opline_ptr->opcode == ZEND_SEPARATE) { - if (type != BP_VAR_R && type != BP_VAR_IS) { - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - memcpy(opline, opline_ptr, sizeof(zend_op)); - } - le = le->next; - continue; - } - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - memcpy(opline, opline_ptr, sizeof(zend_op)); - if (opline->op1_type == IS_VAR && - opline->op1.var == this_var) { - opline->op1_type = IS_CV; - opline->op1.var = CG(active_op_array)->this_var; - } - if (opline->opcode != ZEND_FETCH_W - && (opline->op1_type == IS_TMP_VAR || opline->op1_type == IS_CONST) - && (type != BP_VAR_R && type != BP_VAR_IS && type != BP_VAR_FUNC_ARG) - ) { - zend_error_noreturn(E_COMPILE_ERROR, - "Cannot use temporary expression in write context"); - } - switch (type) { - case BP_VAR_R: - if (opline->opcode == ZEND_FETCH_DIM_W && opline->op2_type == IS_UNUSED) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading"); - } - opline->opcode -= 3; - break; - case BP_VAR_W: - break; - case BP_VAR_RW: - opline->opcode += 3; - break; - case BP_VAR_IS: - if (opline->opcode == ZEND_FETCH_DIM_W && opline->op2_type == IS_UNUSED) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for reading"); - } - opline->opcode += 6; /* 3+3 */ - break; - case BP_VAR_FUNC_ARG: - opline->opcode += 9; /* 3+3+3 */ - opline->extended_value |= arg_offset; - break; - case BP_VAR_UNSET: - if (opline->opcode == ZEND_FETCH_DIM_W && opline->op2_type == IS_UNUSED) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use [] for unsetting"); - } - opline->opcode += 12; /* 3+3+3+3 */ - break; - } - le = le->next; - } - if (opline && type == BP_VAR_W && arg_offset) { - opline->extended_value |= ZEND_FETCH_MAKE_REF; - } - } - zend_llist_destroy(fetch_list_ptr); - zend_stack_del_top(&CG(bp_stack)); -} -/* }}} */ - void zend_do_free(znode *op1 TSRMLS_DC) /* {{{ */ { if (op1->op_type==IS_TMP_VAR) { @@ -1300,33 +967,6 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n } /* }}} */ -void zend_do_begin_lambda_function_declaration(znode *result, znode *function_token, int return_reference, int is_static TSRMLS_DC) /* {{{ */ -{ - znode function_name; - zend_op_array *current_op_array = CG(active_op_array); - int current_op_number = get_next_op_number(CG(active_op_array)); - zend_op *current_op; - - function_name.op_type = IS_CONST; - ZVAL_STRINGL(&function_name.u.constant, "{closure}", sizeof("{closure}")-1); - - zend_do_begin_function_declaration(function_token, &function_name, 0, return_reference, NULL TSRMLS_CC); - - result->op_type = IS_TMP_VAR; - result->u.op.var = get_temporary_variable(current_op_array); - - current_op = ¤t_op_array->opcodes[current_op_number]; - current_op->opcode = ZEND_DECLARE_LAMBDA_FUNCTION; - zend_del_literal(current_op_array, current_op->op2.constant); - SET_UNUSED(current_op->op2); - SET_NODE(current_op->result, result); - if (is_static) { - CG(active_op_array)->fn_flags |= ZEND_ACC_STATIC; - } - CG(active_op_array)->fn_flags |= ZEND_ACC_CLOSURE; -} -/* }}} */ - void zend_do_handle_exception(TSRMLS_D) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -1371,125 +1011,6 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /* } /* }}} */ -void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, znode *class_type, zend_uchar pass_by_reference, zend_bool is_variadic TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - zend_arg_info *cur_arg_info; - znode var; - - if (zend_is_auto_global(Z_STR(varname->u.constant) TSRMLS_CC)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign auto-global variable %s", Z_STRVAL(varname->u.constant)); - } else { - var.op_type = IS_CV; - var.u.op.var = lookup_cv(CG(active_op_array), Z_STR(varname->u.constant) TSRMLS_CC); - Z_STR(varname->u.constant) = CG(active_op_array)->vars[EX_VAR_TO_NUM(var.u.op.var)]; - var.EA = 0; - if (Z_STRHASH(varname->u.constant) == THIS_HASHVAL && - Z_STRLEN(varname->u.constant) == sizeof("this")-1 && - !memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this")-1)) { - if (CG(active_op_array)->scope && - (CG(active_op_array)->fn_flags & ZEND_ACC_STATIC) == 0) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); - } - CG(active_op_array)->this_var = var.u.op.var; - } - } - - if (CG(active_op_array)->fn_flags & ZEND_ACC_VARIADIC) { - zend_error_noreturn(E_COMPILE_ERROR, "Only the last parameter can be variadic"); - } - - if (is_variadic) { - if (op == ZEND_RECV_INIT) { - zend_error_noreturn(E_COMPILE_ERROR, "Variadic parameter cannot have a default value"); - } - - op = ZEND_RECV_VARIADIC; - CG(active_op_array)->fn_flags |= ZEND_ACC_VARIADIC; - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - CG(active_op_array)->num_args++; - opline->opcode = op; - SET_NODE(opline->result, &var); - opline->op1_type = IS_UNUSED; - opline->op1.num = CG(active_op_array)->num_args; - if (op == ZEND_RECV_INIT) { - SET_NODE(opline->op2, initialization); - } else { - SET_UNUSED(opline->op2); - if (!is_variadic) { - CG(active_op_array)->required_num_args = CG(active_op_array)->num_args; - } - } - CG(active_op_array)->arg_info = erealloc(CG(active_op_array)->arg_info, sizeof(zend_arg_info)*(CG(active_op_array)->num_args)); - cur_arg_info = &CG(active_op_array)->arg_info[CG(active_op_array)->num_args-1]; - cur_arg_info->name = estrndup(Z_STRVAL(varname->u.constant), Z_STRLEN(varname->u.constant)); - cur_arg_info->name_len = Z_STRLEN(varname->u.constant); - cur_arg_info->type_hint = 0; - cur_arg_info->pass_by_reference = pass_by_reference; - cur_arg_info->allow_null = 1; - cur_arg_info->is_variadic = is_variadic; - cur_arg_info->class_name = NULL; - cur_arg_info->class_name_len = 0; - - if (class_type->op_type != IS_UNUSED) { - cur_arg_info->allow_null = 0; - - if (Z_TYPE(class_type->u.constant) != IS_NULL) { - if (Z_TYPE(class_type->u.constant) == IS_ARRAY) { - cur_arg_info->type_hint = IS_ARRAY; - if (op == ZEND_RECV_INIT) { - if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) { - cur_arg_info->allow_null = 1; - } else if (Z_TYPE(initialization->u.constant) != IS_ARRAY) { - zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with array type hint can only be an array or NULL"); - } - } - } else if (Z_TYPE(class_type->u.constant) == IS_CALLABLE) { - cur_arg_info->type_hint = IS_CALLABLE; - if (op == ZEND_RECV_INIT) { - if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) { - cur_arg_info->allow_null = 1; - } else { - zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with callable type hint can only be NULL"); - } - } - } else { - cur_arg_info->type_hint = IS_OBJECT; - if (ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_type->u.constant), Z_STRLEN(class_type->u.constant))) { - zend_resolve_class_name_old(class_type TSRMLS_CC); - } - Z_STR(class_type->u.constant) = zend_new_interned_string(Z_STR(class_type->u.constant) TSRMLS_CC); - if (IS_INTERNED(Z_STR(class_type->u.constant))) { - Z_TYPE_FLAGS(class_type->u.constant) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); - } -// TODO: for now we have to copy it ??? -#if 1 - cur_arg_info->class_name = estrndup(Z_STRVAL(class_type->u.constant), Z_STRLEN(class_type->u.constant)); - cur_arg_info->class_name_len = Z_STRLEN(class_type->u.constant); - STR_RELEASE(Z_STR(class_type->u.constant)); -#else - cur_arg_info->class_name = Z_STRVAL(class_type->u.constant); - cur_arg_info->class_name_len = Z_STRLEN(class_type->u.constant); -#endif - if (op == ZEND_RECV_INIT) { - if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) { - cur_arg_info->allow_null = 1; - } else { - zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with a class type hint can only be NULL"); - } - } - } - } - } - - if (cur_arg_info->class_name || cur_arg_info->type_hint) { - CG(active_op_array)->fn_flags |= ZEND_ACC_HAS_TYPE_HINTS; - } -} -/* }}} */ - zend_string *zend_concat3( char *str1, size_t str1_len, char *str2, size_t str2_len, char *str3, size_t str3_len ) { @@ -4305,78 +3826,6 @@ void zend_add_to_list(void *result, void *item TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC) /* {{{ */ -{ - zval tmp; - zend_op *opline; - znode lval; - znode result; - - if (static_assignment) { - ZVAL_COPY_VALUE(&tmp, &static_assignment->u.constant); - } else { - ZVAL_NULL(&tmp); - Z_CONST_FLAGS(tmp) = 0; - } - if (!CG(active_op_array)->static_variables) { - if (CG(active_op_array)->scope) { - CG(active_op_array)->scope->ce_flags |= ZEND_HAS_STATIC_IN_METHODS; - } - ALLOC_HASHTABLE(CG(active_op_array)->static_variables); - zend_hash_init(CG(active_op_array)->static_variables, 8, NULL, ZVAL_PTR_DTOR, 0); - } - zend_hash_update(CG(active_op_array)->static_variables, Z_STR(varname->u.constant), &tmp); - - if (varname->op_type == IS_CONST) { - if (Z_TYPE(varname->u.constant) != IS_STRING) { - convert_to_string(&varname->u.constant); - } - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = (fetch_type == ZEND_FETCH_LEXICAL) ? ZEND_FETCH_R : ZEND_FETCH_W; /* the default mode must be Write, since fetch_simple_variable() is used to define function arguments */ - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - SET_NODE(opline->op1, varname); - SET_UNUSED(opline->op2); - opline->extended_value = ZEND_FETCH_STATIC; - GET_NODE(&result, opline->result); - - if (varname->op_type == IS_CONST) { - zval_copy_ctor(&varname->u.constant); - } - fetch_simple_variable(&lval, varname, 0 TSRMLS_CC); /* Relies on the fact that the default fetch is BP_VAR_W */ - - if (fetch_type == ZEND_FETCH_LEXICAL) { - znode dummy; - - zend_do_begin_variable_parse(TSRMLS_C); - zend_do_assign(&dummy, &lval, &result TSRMLS_CC); - zend_do_free(&dummy TSRMLS_CC); - } else { - zend_do_assign_ref(NULL, &lval, &result TSRMLS_CC); - } - CG(active_op_array)->opcodes[CG(active_op_array)->last-1].result_type |= EXT_TYPE_UNUSED; -} -/* }}} */ - -void zend_do_fetch_lexical_variable(znode *varname, zend_bool is_ref TSRMLS_DC) /* {{{ */ -{ - znode value; - - if (Z_STRLEN(varname->u.constant) == sizeof("this") - 1 && - memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this") - 1) == 0) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as lexical variable"); - return; - } - - value.op_type = IS_CONST; - ZVAL_NULL(&value.u.constant); - Z_CONST_FLAGS(value.u.constant) = is_ref ? IS_LEXICAL_REF : IS_LEXICAL_VAR; - zend_do_fetch_static_variable(varname, &value, is_ref ? ZEND_FETCH_STATIC : ZEND_FETCH_LEXICAL TSRMLS_CC); -} -/* }}} */ - void zend_do_declare_begin(TSRMLS_D) /* {{{ */ { zend_stack_push(&CG(declare_stack), &CG(declarables)); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 8a56b4c3f0..4da186fc3e 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -471,39 +471,23 @@ int zend_get_zendleng(TSRMLS_D); #endif -/* parser-driven code generators */ -void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC); -void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC); -void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC); -void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar op TSRMLS_DC); -void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC); - typedef int (*unary_op_type)(zval *, zval * TSRMLS_DC); typedef int (*binary_op_type)(zval *, zval *, zval * TSRMLS_DC); ZEND_API unary_op_type get_unary_op(int opcode); ZEND_API binary_op_type get_binary_op(int opcode); ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC); -void zend_do_begin_variable_parse(TSRMLS_D); -void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS_DC); - -void zend_check_writable_variable(const znode *variable); - +/* 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_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC); void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC); -void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, znode *class_type, zend_bool pass_by_reference, zend_bool is_variadic TSRMLS_DC); void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC); void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC); void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC); void zend_do_handle_exception(TSRMLS_D); -void zend_do_begin_lambda_function_declaration(znode *result, znode *function_token, int return_reference, int is_static TSRMLS_DC); -void zend_do_fetch_lexical_variable(znode *varname, zend_bool is_ref TSRMLS_DC); - - ZEND_API int do_bind_function(const zend_op_array *op_array, zend_op *opline, HashTable *function_table, zend_bool compile_time); ZEND_API zend_class_entry *do_bind_class(const zend_op_array *op_array, const zend_op *opline, HashTable *class_table, zend_bool compile_time TSRMLS_DC); ZEND_API zend_class_entry *do_bind_inherited_class(const zend_op_array *op_array, const zend_op *opline, HashTable *class_table, zend_class_entry *parent_ce, zend_bool compile_time TSRMLS_DC); -- cgit v1.2.1 From ca7a4907582517c91072c06bddb8b91ec9d2a2d1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 16:11:43 +0200 Subject: zend_update_jump_target --- Zend/zend_compile.c | 60 +++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 49ac3a80ac..fa1c6a5ad8 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1004,7 +1004,6 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /* CG(active_op_array)->line_end = zend_get_compiled_lineno(TSRMLS_C); CG(active_op_array) = function_token->u.op_array; - /* Pop the switch and foreach separators */ zend_stack_del_top(&CG(switch_cond_stack)); zend_stack_del_top(&CG(foreach_copy_stack)); @@ -4788,6 +4787,26 @@ static void zend_emit_tick(TSRMLS_D) { opline->extended_value = Z_LVAL(CG(declarables).ticks); } +static void zend_update_jump_target(zend_uint opnum_jump, zend_uint opnum_target TSRMLS_DC) { + zend_op *opline = &CG(active_op_array)->opcodes[opnum_jump]; + switch (opline->opcode) { + case ZEND_JMP: + opline->op1.opline_num = opnum_target; + break; + case ZEND_JMPZ: + case ZEND_JMPNZ: + case ZEND_JMPZ_EX: + case ZEND_JMPNZ_EX: + opline->op2.opline_num = opnum_target; + break; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + +static void zend_update_jump_target_to_next(zend_uint opnum_jump TSRMLS_DC) { + zend_update_jump_target(opnum_jump, get_next_op_number(CG(active_op_array)) TSRMLS_CC); +} + static zend_bool zend_is_variable(zend_ast *ast) { return ast->kind == ZEND_AST_VAR || ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP || ast->kind == ZEND_AST_STATIC_PROP @@ -5882,8 +5901,7 @@ void zend_compile_while(zend_ast *ast TSRMLS_DC) { opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); opline->op1.opline_num = opnum_start; - opline = &CG(active_op_array)->opcodes[opnum_jmpz]; - opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); do_end_loop(opnum_start, 0 TSRMLS_CC); } @@ -5952,8 +5970,7 @@ void zend_compile_for(zend_ast *ast TSRMLS_DC) { opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); opline->op1.opline_num = opnum_cond; - opline = &CG(active_op_array)->opcodes[opnum_jmpz]; - opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); do_end_loop(opnum_loop, 0 TSRMLS_CC); } @@ -6074,7 +6091,6 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { zend_uint i; zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), ast->children - 1, 0); zend_uint opnum_last_jmpz = 0; - zend_op *opline; for (i = 0; i < ast->children; ++i) { zend_ast *elem_ast = ast->child[i]; @@ -6097,14 +6113,12 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { } if (cond_ast) { - opline = &CG(active_op_array)->opcodes[opnum_last_jmpz]; - opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(opnum_last_jmpz TSRMLS_CC); } } for (i = 0; i < ast->children - 1; ++i) { - opline = &CG(active_op_array)->opcodes[jmp_opnums[i]]; - opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(jmp_opnums[i] TSRMLS_CC); } efree(jmp_opnums); @@ -6166,19 +6180,16 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { zend_ast *stmt_ast = case_ast->child[1]; if (cond_ast) { - opline = &CG(active_op_array)->opcodes[jmpnz_opnums[i]]; - opline->op2.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(jmpnz_opnums[i] TSRMLS_CC); } else { - opline = &CG(active_op_array)->opcodes[opnum_default_jmp]; - opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(opnum_default_jmp TSRMLS_CC); } zend_compile_stmt(stmt_ast TSRMLS_CC); } if (!has_default_case) { - opline = &CG(active_op_array)->opcodes[opnum_default_jmp]; - opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(opnum_default_jmp TSRMLS_CC); } do_end_loop(get_next_op_number(CG(active_op_array)), 1 TSRMLS_CC); @@ -6262,8 +6273,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { } for (i = 0; i < catches_ast->children; ++i) { - opline = &CG(active_op_array)->opcodes[jmp_opnums[i]]; - opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(jmp_opnums[i] TSRMLS_CC); } if (finally_ast) { @@ -6285,8 +6295,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { emit_op(NULL, ZEND_FAST_RET, NULL, NULL TSRMLS_CC); - opline = &CG(active_op_array)->opcodes[opnum_jmp]; - opline->op1.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(opnum_jmp TSRMLS_CC); } efree(jmp_opnums); @@ -6652,8 +6661,7 @@ void zend_compile_short_circuiting(znode *result, zend_ast *ast TSRMLS_DC) { opline_bool = emit_op(NULL, ZEND_BOOL, &right_node, NULL TSRMLS_CC); SET_NODE(opline_bool->result, result); - opline_jmpz = &CG(active_op_array)->opcodes[opnum_jmpz]; - opline_jmpz->op2.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); } void zend_compile_post_incdec(znode *result, zend_ast *ast TSRMLS_DC) { @@ -6743,7 +6751,7 @@ void zend_compile_conditional(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *false_ast = ast->child[2]; znode cond_node, true_node, false_node; - zend_op *opline_jmpz, *opline_jmp, *opline_qm_assign1, *opline_qm_assign2; + zend_op *opline_qm_assign1, *opline_qm_assign2; zend_uint opnum_jmpz, opnum_jmp, opnum_qm_assign1; if (!true_ast) { @@ -6764,8 +6772,7 @@ void zend_compile_conditional(znode *result, zend_ast *ast TSRMLS_DC) { opnum_jmp = get_next_op_number(CG(active_op_array)); emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); - opline_jmpz = &CG(active_op_array)->opcodes[opnum_jmpz]; - opline_jmpz->op2.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); zend_compile_expr(&false_node, false_ast TSRMLS_CC); @@ -6781,8 +6788,7 @@ void zend_compile_conditional(znode *result, zend_ast *ast TSRMLS_DC) { opline_qm_assign2 = emit_op(NULL, opline_qm_assign1->opcode, &false_node, NULL TSRMLS_CC); SET_NODE(opline_qm_assign2->result, result); - opline_jmp = &CG(active_op_array)->opcodes[opnum_jmp]; - opline_jmp->op1.opline_num = get_next_op_number(CG(active_op_array)); + zend_update_jump_target_to_next(opnum_jmp TSRMLS_CC); } void zend_compile_print(znode *result, zend_ast *ast TSRMLS_DC) { -- cgit v1.2.1 From d0b66f3af3e86525861de4bfe10cfbfb33e583fc Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 19:57:38 +0200 Subject: zend_emit_jump and zend_emit_cond_jump --- Zend/zend_compile.c | 62 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index fa1c6a5ad8..4f53a53fed 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4787,6 +4787,22 @@ static void zend_emit_tick(TSRMLS_D) { opline->extended_value = Z_LVAL(CG(declarables).ticks); } +static zend_uint zend_emit_jump(zend_uint opnum_target TSRMLS_DC) { + zend_uint opnum = get_next_op_number(CG(active_op_array)); + zend_op *opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + opline->op1.opline_num = opnum_target; + return opnum; +} + +static zend_uint zend_emit_cond_jump( + zend_uchar opcode, znode *cond, zend_uint opnum_target TSRMLS_DC +) { + zend_uint opnum = get_next_op_number(CG(active_op_array)); + zend_op *opline = emit_op(NULL, opcode, cond, NULL TSRMLS_CC); + opline->op2.opline_num = opnum_target; + return opnum; +} + static void zend_update_jump_target(zend_uint opnum_jump, zend_uint opnum_target TSRMLS_DC) { zend_op *opline = &CG(active_op_array)->opcodes[opnum_jump]; switch (opline->opcode) { @@ -5887,19 +5903,16 @@ void zend_compile_while(zend_ast *ast TSRMLS_DC) { znode cond_node; zend_uint opnum_start, opnum_jmpz; - zend_op *opline; opnum_start = get_next_op_number(CG(active_op_array)); zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); - opnum_jmpz = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMPZ, &cond_node, NULL TSRMLS_CC); + opnum_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &cond_node, 0 TSRMLS_CC); do_begin_loop(TSRMLS_C); zend_compile_stmt(stmt_ast TSRMLS_CC); - opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); - opline->op1.opline_num = opnum_start; + zend_emit_jump(opnum_start TSRMLS_CC); zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); @@ -5911,7 +5924,6 @@ void zend_compile_do_while(zend_ast *ast TSRMLS_DC) { zend_ast *cond_ast = ast->child[1]; znode cond_node; - zend_op *opline; zend_uint opnum_start, opnum_cond; do_begin_loop(TSRMLS_C); @@ -5922,8 +5934,7 @@ void zend_compile_do_while(zend_ast *ast TSRMLS_DC) { opnum_cond = get_next_op_number(CG(active_op_array)); zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); - opline = emit_op(NULL, ZEND_JMPNZ, &cond_node, NULL TSRMLS_CC); - opline->op2.opline_num = opnum_start; + zend_emit_cond_jump(ZEND_JMPNZ, &cond_node, opnum_start TSRMLS_CC); do_end_loop(opnum_cond, 0 TSRMLS_CC); } @@ -5948,7 +5959,6 @@ void zend_compile_for(zend_ast *ast TSRMLS_DC) { znode result; zend_uint opnum_cond, opnum_jmpz, opnum_loop; - zend_op *opline; zend_compile_expr_list(&result, init_ast TSRMLS_CC); zend_do_free(&result TSRMLS_CC); @@ -5957,8 +5967,7 @@ void zend_compile_for(zend_ast *ast TSRMLS_DC) { zend_compile_expr_list(&result, cond_ast TSRMLS_CC); zend_do_extended_info(TSRMLS_C); - opnum_jmpz = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMPZ, &result, NULL TSRMLS_CC); + opnum_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &result, 0 TSRMLS_CC); do_begin_loop(TSRMLS_C); zend_compile_stmt(stmt_ast TSRMLS_CC); @@ -5967,8 +5976,7 @@ void zend_compile_for(zend_ast *ast TSRMLS_DC) { zend_compile_expr_list(&result, loop_ast TSRMLS_CC); zend_do_free(&result TSRMLS_CC); - opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); - opline->op1.opline_num = opnum_cond; + zend_emit_jump(opnum_cond TSRMLS_CC); zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); @@ -6069,8 +6077,7 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { zend_compile_stmt(stmt_ast TSRMLS_CC); - opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); - opline->op1.opline_num = opnum_fetch; + zend_emit_jump(opnum_fetch TSRMLS_CC); opline = &CG(active_op_array)->opcodes[opnum_reset]; opline->op2.opline_num = get_next_op_number(CG(active_op_array)); @@ -6100,16 +6107,13 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { znode cond_node; if (cond_ast) { zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); - - opnum_last_jmpz = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMPZ, &cond_node, NULL TSRMLS_CC); + opnum_last_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &cond_node, 0 TSRMLS_CC); } zend_compile_stmt(stmt_ast TSRMLS_CC); if (i != ast->children - 1) { - jmp_opnums[i] = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + jmp_opnums[i] = zend_emit_jump(0 TSRMLS_CC); } if (cond_ast) { @@ -6167,12 +6171,10 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { zval_copy_ctor(&CONSTANT(opline->op1.constant)); } - jmpnz_opnums[i] = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMPNZ, &case_node, NULL TSRMLS_CC); + jmpnz_opnums[i] = zend_emit_cond_jump(ZEND_JMPNZ, &case_node, 0 TSRMLS_CC); } - opnum_default_jmp = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + opnum_default_jmp = zend_emit_jump(0 TSRMLS_CC); for (i = 0; i < cases_ast->children; ++i) { zend_ast *case_ast = cases_ast->child[i]; @@ -6223,8 +6225,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { zend_compile_stmt(try_ast TSRMLS_CC); if (catches_ast->children != 0) { - jmp_opnums[0] = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + jmp_opnums[0] = zend_emit_jump(0 TSRMLS_CC); } for (i = 0; i < catches_ast->children; ++i) { @@ -6264,8 +6265,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { zend_compile_stmt(stmt_ast TSRMLS_CC); if (!is_last_catch) { - jmp_opnums[i + 1] = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + jmp_opnums[i + 1] = zend_emit_jump(0 TSRMLS_CC); } opline = &CG(active_op_array)->opcodes[opnum_catch]; @@ -6761,16 +6761,14 @@ void zend_compile_conditional(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); - opnum_jmpz = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMPZ, &cond_node, NULL TSRMLS_CC); + opnum_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &cond_node, 0 TSRMLS_CC); zend_compile_expr(&true_node, true_ast TSRMLS_CC); opnum_qm_assign1 = get_next_op_number(CG(active_op_array)); emit_op(result, ZEND_QM_ASSIGN, &true_node, NULL TSRMLS_CC); - opnum_jmp = get_next_op_number(CG(active_op_array)); - emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + opnum_jmp = zend_emit_jump(0 TSRMLS_CC); zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); -- cgit v1.2.1 From b9f62be2e6dda239fd7098e3a3b0e4d164049c03 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Jul 2014 20:24:44 +0200 Subject: Cleanup --- Zend/zend_compile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4f53a53fed..6b5daf971d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6046,7 +6046,7 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { if (key_ast) { opline->result_type = IS_TMP_VAR; - opline->result.opline_num = get_temporary_variable(CG(active_op_array)); + opline->result.var = get_temporary_variable(CG(active_op_array)); GET_NODE(&key_node, opline->result); } @@ -6515,7 +6515,6 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { } else { opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_DECLARE_FUNCTION; - opline->extended_value = ZEND_DECLARE_FUNCTION; opline->op2_type = IS_CONST; LITERAL_STR(opline->op2, STR_COPY(lcname)); } -- cgit v1.2.1 From 547331d24d8df741b6b18a2e437729b8fabc2c29 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 12:52:44 +0200 Subject: Port methods The duplicated magic method checks are ugly --- Zend/zend_ast.c | 1 + Zend/zend_ast.h | 1 + Zend/zend_compile.c | 278 ++++++++++++++++++++++++++++++++++++++------ Zend/zend_language_parser.y | 19 ++- 4 files changed, 252 insertions(+), 47 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 69321e044d..f92d45faaf 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -349,6 +349,7 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) break; case ZEND_AST_FUNC_DECL: case ZEND_AST_CLOSURE: + case ZEND_AST_METHOD: { zend_ast_func_decl *fn = (zend_ast_func_decl *) ast; STR_RELEASE(fn->name); diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index f20446fd22..1e942ece34 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -102,6 +102,7 @@ enum _zend_ast_kind { ZEND_AST_FUNC_DECL, ZEND_AST_CLOSURE, ZEND_AST_CLOSURE_USES, + ZEND_AST_METHOD, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 6b5daf971d..a4bd629687 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6462,6 +6462,200 @@ void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { } } +static inline zend_bool zend_str_equals(zend_string *str, char *c) { + size_t len = strlen(c); + return str->len == len && !memcmp(str->val, c, len); +} + +void zend_begin_method_decl( + zend_op_array *op_array, zend_string *name, zend_bool has_body TSRMLS_DC +) { + zend_class_entry *ce = CG(active_class_entry); + zend_bool in_interface = (ce->ce_flags & ZEND_ACC_INTERFACE) != 0; + zend_bool in_trait = (ce->ce_flags & ZEND_ACC_TRAIT) != 0; + zend_bool is_public = (op_array->fn_flags & ZEND_ACC_PUBLIC) != 0; + zend_bool is_static = (op_array->fn_flags & ZEND_ACC_STATIC) != 0; + + zend_string *lcname; + + if (in_interface) { + if (op_array->fn_flags & ~(ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)) { + zend_error_noreturn(E_COMPILE_ERROR, "Access type for interface method " + "%s::%s() must be omitted", ce->name->val, name->val); + } + op_array->fn_flags |= ZEND_ACC_ABSTRACT; + } else if (is_static && (op_array->fn_flags & ZEND_ACC_ABSTRACT)) { + zend_error(E_STRICT, "Static function %s::%s() should not be abstract", + ce->name->val, name->val); + } + + if (op_array->fn_flags & ZEND_ACC_ABSTRACT) { + //zend_op *opline; + + if (op_array->fn_flags & ZEND_ACC_PRIVATE) { + zend_error_noreturn(E_COMPILE_ERROR, "%s function %s::%s() cannot be declared private", + in_interface ? "Interface" : "Abstract", ce->name->val, name->val); + } + + if (has_body) { + zend_error_noreturn(E_COMPILE_ERROR, "%s function %s::%s() cannot contain body", + in_interface ? "Interface" : "Abstract", ce->name->val, name->val); + } + + ce->ce_flags |= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS; + + /*opline = get_next_op(op_array TSRMLS_CC); + opline->opcode = ZEND_RAISE_ABSTRACT_ERROR; + SET_UNUSED(opline->op1); + SET_UNUSED(opline->op2);*/ + } else if (!has_body) { + zend_error_noreturn(E_COMPILE_ERROR, "Non-abstract method %s::%s() must contain body", + ce->name->val, name->val); + } + + op_array->scope = ce; + op_array->function_name = STR_COPY(name); + + lcname = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lcname->val, name->val, name->len); + lcname = zend_new_interned_string(lcname TSRMLS_CC); + + if (zend_hash_add_ptr(&ce->function_table, lcname, op_array) == NULL) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare %s::%s()", + ce->name->val, name->val); + } + + if (in_interface) { + if (zend_str_equals(lcname, ZEND_CALL_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __call() must have " + "public visibility and cannot be static"); + } + } else if (zend_str_equals(lcname, ZEND_CALLSTATIC_FUNC_NAME)) { + if (!is_public || !is_static) { + zend_error(E_WARNING, "The magic method __callStatic() must have " + "public visibility and be static"); + } + } else if (zend_str_equals(lcname, ZEND_GET_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __get() must have " + "public visibility and cannot be static"); + } + } else if (zend_str_equals(lcname, ZEND_SET_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __set() must have " + "public visibility and cannot be static"); + } + } else if (zend_str_equals(lcname, ZEND_UNSET_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __unset() must have " + "public visibility and cannot be static"); + } + } else if (zend_str_equals(lcname, ZEND_ISSET_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __isset() must have " + "public visibility and cannot be static"); + } + } else if (zend_str_equals(lcname, ZEND_TOSTRING_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __toString() must have " + "public visibility and cannot be static"); + } + } else if (zend_str_equals(lcname, ZEND_INVOKE_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __invoke() must have " + "public visibility and cannot be static"); + } + } else if (zend_str_equals(lcname, ZEND_DEBUGINFO_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __debugInfo() must have " + "public visibility and cannot be static"); + } + } + } else { + ALLOCA_FLAG(use_heap); + char *class_lcname = do_alloca(ce->name->len + 1, use_heap); + zend_str_tolower_copy(class_lcname, ce->name->val, ce->name->len); + + if (!in_trait && lcname->len == ce->name->len + && !memcmp(class_lcname, lcname->val, lcname->len) + ) { + if (!ce->constructor) { + ce->constructor = (zend_function *) op_array; + } + } else if (zend_str_equals(lcname, ZEND_CONSTRUCTOR_FUNC_NAME)) { + if (CG(active_class_entry)->constructor) { + zend_error(E_STRICT, "Redefining already defined constructor for class %s", + ce->name->val); + } + ce->constructor = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_DESTRUCTOR_FUNC_NAME)) { + ce->destructor = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_CLONE_FUNC_NAME)) { + ce->clone = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_CALL_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __call() must have " + "public visibility and cannot be static"); + } + ce->__call = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_CALLSTATIC_FUNC_NAME)) { + if (!is_public || !is_static) { + zend_error(E_WARNING, "The magic method __callStatic() must have " + "public visibility and be static"); + } + ce->__callstatic = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_GET_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __get() must have " + "public visibility and cannot be static"); + } + ce->__get = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_SET_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __set() must have " + "public visibility and cannot be static"); + } + ce->__set = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_UNSET_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __unset() must have " + "public visibility and cannot be static"); + } + ce->__unset = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_ISSET_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __isset() must have " + "public visibility and cannot be static"); + } + ce->__isset = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_TOSTRING_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __toString() must have " + "public visibility and cannot be static"); + } + ce->__tostring = (zend_function *) op_array; + } else if (zend_str_equals(lcname, ZEND_INVOKE_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __invoke() must have " + "public visibility and cannot be static"); + } + } else if (zend_str_equals(lcname, ZEND_DEBUGINFO_FUNC_NAME)) { + if (!is_public || is_static) { + zend_error(E_WARNING, "The magic method __debugInfo() must have " + "public visibility and cannot be static"); + } + ce->__debugInfo = (zend_function *) op_array; + } else if (!is_static) { + op_array->fn_flags |= ZEND_ACC_ALLOW_STATIC; + } + + free_alloca(class_lcname, use_heap); + } + + STR_RELEASE(lcname); +} + void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast_func_decl *fn = (zend_ast_func_decl *) ast; zend_op_array *orig_op_array = CG(active_op_array); @@ -6469,18 +6663,12 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { zend_string *name = fn->name, *lcname; zend_op *opline; zend_bool is_closure = ast->kind == ZEND_AST_CLOSURE; + zend_bool is_method = ast->kind == ZEND_AST_METHOD; // TODO.AST interactive (not just here - also bpc etc!) init_op_array(op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE TSRMLS_CC); - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - op_array->function_name = name = zend_concat_names( - Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); - } else { - op_array->function_name = STR_COPY(name); - } - op_array->fn_flags |= fn->flags; op_array->line_start = fn->start_lineno; op_array->line_end = fn->end_lineno; @@ -6491,46 +6679,58 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { op_array->fn_flags |= ZEND_ACC_CLOSURE; } - lcname = STR_ALLOC(name->len, 0); - zend_str_tolower_copy(lcname->val, name->val, name->len); + if (is_method) { + zend_bool has_body = fn->stmt != NULL; + zend_begin_method_decl(op_array, name, has_body TSRMLS_CC); + } else { + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + op_array->function_name = name = zend_concat_names( + Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); + } else { + op_array->function_name = STR_COPY(name); + } - if (CG(current_import_function)) { - zend_string *import_name = zend_hash_find_ptr(CG(current_import_function), lcname); - if (import_name) { - char *import_name_lc = zend_str_tolower_dup(import_name->val, import_name->len); + lcname = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lcname->val, name->val, name->len); - if (import_name->len != name->len - || memcmp(import_name_lc, lcname->val, name->len) - ) { - zend_error(E_COMPILE_ERROR, "Cannot declare function %s " - "because the name is already in use", name->val); + if (CG(current_import_function)) { + zend_string *import_name = zend_hash_find_ptr(CG(current_import_function), lcname); + if (import_name) { + char *import_name_lc = zend_str_tolower_dup(import_name->val, import_name->len); + + if (import_name->len != name->len + || memcmp(import_name_lc, lcname->val, name->len) + ) { + zend_error(E_COMPILE_ERROR, "Cannot declare function %s " + "because the name is already in use", name->val); + } + + efree(import_name_lc); } + } - efree(import_name_lc); + if (is_closure) { + opline = emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL TSRMLS_CC); + } else { + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_DECLARE_FUNCTION; + opline->op2_type = IS_CONST; + LITERAL_STR(opline->op2, STR_COPY(lcname)); } - } - if (is_closure) { - opline = emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL TSRMLS_CC); - } else { - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_DECLARE_FUNCTION; - opline->op2_type = IS_CONST; - LITERAL_STR(opline->op2, STR_COPY(lcname)); - } + { + zval key; + build_runtime_defined_function_key(&key, lcname, fn->lex_pos TSRMLS_CC); - { - zval key; - build_runtime_defined_function_key(&key, lcname, fn->lex_pos TSRMLS_CC); + opline->op1_type = IS_CONST; + opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); - opline->op1_type = IS_CONST; - opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); + zend_hash_update_ptr(CG(function_table), Z_STR(key), op_array); + } - zend_hash_update_ptr(CG(function_table), Z_STR(key), op_array); + STR_RELEASE(lcname); } - STR_RELEASE(lcname); - CG(active_op_array) = op_array; zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); @@ -6564,6 +6764,11 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_closure_uses(fn->uses TSRMLS_CC); zend_compile_stmt(fn->stmt TSRMLS_CC); + if (is_method) { + zend_check_magic_method_implementation( + CG(active_class_entry), (zend_function *) op_array, E_COMPILE_ERROR TSRMLS_CC); + } + zend_do_extended_info(TSRMLS_C); zend_do_return(NULL, 0 TSRMLS_CC); @@ -7413,6 +7618,7 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { zend_compile_try(ast TSRMLS_CC); break; case ZEND_AST_FUNC_DECL: + case ZEND_AST_METHOD: zend_compile_func_decl(NULL, ast TSRMLS_CC); break; default: diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1dd800e6e4..40c4061ec1 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -629,9 +629,10 @@ class_statement: variable_modifiers { CG(access_type) = Z_LVAL($1.u.constant); } class_variable_declaration ';' | class_constant_declaration ';' | trait_use_statement - | method_modifiers function2 is_reference T_STRING { zend_do_begin_function_declaration(&$2, &$4, 1, $3.op_type, &$1 TSRMLS_CC); } - '(' parameter_list ')' { zend_compile_params($7.u.ast TSRMLS_CC); zend_ast_destroy($7.u.ast); } - method_body { zend_do_abstract_method(&$4, &$1, &$10 TSRMLS_CC); zend_do_end_function_declaration(&$2 TSRMLS_CC); } + | method_modifiers function returns_ref T_STRING '(' parameter_list ')' method_body + { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_METHOD, $3.EA | Z_LVAL($1.u.constant), + $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), $2.u.op.ptr, + Z_STR($4.u.constant), $6.u.ast, NULL, $8.u.ast); AS($$); } ; trait_use_statement: @@ -692,8 +693,8 @@ trait_modifiers: ; method_body: - ';' /* abstract method */ { Z_LVAL($$.u.constant) = ZEND_ACC_ABSTRACT; } - | '{' inner_statement_list '}' { AS($2); Z_LVAL($$.u.constant) = 0; } + ';' /* abstract method */ { $$.u.ast = NULL; } + | '{' inner_statement_list '}' { $$.u.ast = $2.u.ast; } ; variable_modifiers: @@ -702,8 +703,8 @@ variable_modifiers: ; 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 */ { 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; } } ; non_empty_member_modifiers: @@ -893,10 +894,6 @@ returns_ref: | '&' { $$.EA = ZEND_ACC_RETURN_REFERENCE; } ; -function2: - T_FUNCTION { $$.EA = CG(zend_lineno); } -; - lexical_vars: /* empty */ { $$.u.ast = NULL; } | T_USE '(' lexical_var_list ')' { $$.u.ast = $3.u.ast; } -- cgit v1.2.1 From 74dba7e4dbac69531ed1fe896dcc20177247d02f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 12:57:31 +0200 Subject: __autoload error --- Zend/zend_compile.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a4bd629687..ef0f878694 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6709,6 +6709,11 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { } } + if (zend_str_equals(lcname, ZEND_AUTOLOAD_FUNC_NAME) && fn->params->children != 1) { + zend_error_noreturn(E_COMPILE_ERROR, "%s() must take exactly 1 argument", + ZEND_AUTOLOAD_FUNC_NAME); + } + if (is_closure) { opline = emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL TSRMLS_CC); } else { @@ -6775,8 +6780,6 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { pass_two(CG(active_op_array) TSRMLS_CC); zend_release_labels(0 TSRMLS_CC); - // TODO.AST __autoload - /* Pop the switch and foreach separators */ zend_stack_del_top(&CG(switch_cond_stack)); zend_stack_del_top(&CG(foreach_copy_stack)); -- cgit v1.2.1 From 09309a543f154dd1c755b4e8fe692fe0dbf4a843 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 13:00:57 +0200 Subject: Remove dead code --- Zend/zend_compile.c | 290 ---------------------------------------------------- Zend/zend_compile.h | 2 - 2 files changed, 292 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ef0f878694..d54ee6e26b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -710,263 +710,6 @@ int zend_do_verify_access_types(const znode *current_access_type, const znode *n } /* }}} */ -void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC) /* {{{ */ -{ - zend_op_array op_array; - zend_string *name = Z_STR(function_name->u.constant); - int function_begin_line = function_token->EA; - zend_uint fn_flags; - zend_string *lcname; - zend_bool orig_interactive; - ALLOCA_FLAG(use_heap) - - if (is_method) { - if (CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE) { - if ((Z_LVAL(fn_flags_znode->u.constant) & ~(ZEND_ACC_STATIC|ZEND_ACC_PUBLIC))) { - zend_error_noreturn(E_COMPILE_ERROR, "Access type for interface method %s::%s() must be omitted", CG(active_class_entry)->name->val, Z_STRVAL(function_name->u.constant)); - } - Z_LVAL(fn_flags_znode->u.constant) |= ZEND_ACC_ABSTRACT; /* propagates to the rest of the parser */ - } - fn_flags = Z_LVAL(fn_flags_znode->u.constant); /* must be done *after* the above check */ - } else { - fn_flags = 0; - } - if ((fn_flags & ZEND_ACC_STATIC) && (fn_flags & ZEND_ACC_ABSTRACT) && !(CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE)) { - zend_error(E_STRICT, "Static function %s%s%s() should not be abstract", is_method ? CG(active_class_entry)->name->val : "", is_method ? "::" : "", Z_STRVAL(function_name->u.constant)); - } - - function_token->u.op_array = CG(active_op_array); - - orig_interactive = CG(interactive); - CG(interactive) = 0; - init_op_array(&op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE TSRMLS_CC); - CG(interactive) = orig_interactive; - - op_array.function_name = name; - if (return_reference) { - op_array.fn_flags |= ZEND_ACC_RETURN_REFERENCE; - } - op_array.fn_flags |= fn_flags; - - op_array.scope = is_method?CG(active_class_entry):NULL; - op_array.prototype = NULL; - - op_array.line_start = zend_get_compiled_lineno(TSRMLS_C); - - if (is_method) { - lcname = STR_ALLOC(name->len, 0); - zend_str_tolower_copy(lcname->val, name->val, name->len); - lcname = zend_new_interned_string(lcname TSRMLS_CC); - CG(active_op_array) = emalloc(sizeof(zend_op_array)); - memcpy(CG(active_op_array), &op_array, sizeof(zend_op_array)); - if (zend_hash_add_ptr(&CG(active_class_entry)->function_table, lcname, CG(active_op_array)) == NULL) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare %s::%s()", CG(active_class_entry)->name->val, name->val); - } - - zend_stack_push(&CG(context_stack), (void *) &CG(context)); - zend_init_compiler_context(TSRMLS_C); - - if (fn_flags & ZEND_ACC_ABSTRACT) { - CG(active_class_entry)->ce_flags |= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS; - } - - if (!(fn_flags & ZEND_ACC_PPP_MASK)) { - fn_flags |= ZEND_ACC_PUBLIC; - } - - if (CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE) { - if ((name->len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __call() must have public visibility and cannot be static"); - } - } else if ((name->len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1))) { - if ((fn_flags & (ZEND_ACC_PPP_MASK ^ ZEND_ACC_PUBLIC)) || (fn_flags & ZEND_ACC_STATIC) == 0) { - zend_error(E_WARNING, "The magic method __callStatic() must have public visibility and be static"); - } - } else if ((name->len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __get() must have public visibility and cannot be static"); - } - } else if ((name->len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __set() must have public visibility and cannot be static"); - } - } else if ((name->len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __unset() must have public visibility and cannot be static"); - } - } else if ((name->len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __isset() must have public visibility and cannot be static"); - } - } else if ((name->len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __toString() must have public visibility and cannot be static"); - } - } else if ((name->len == sizeof(ZEND_INVOKE_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_INVOKE_FUNC_NAME, sizeof(ZEND_INVOKE_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __invoke() must have public visibility and cannot be static"); - } - - } else if ((name->len == sizeof(ZEND_DEBUGINFO_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_DEBUGINFO_FUNC_NAME, sizeof(ZEND_DEBUGINFO_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __debugInfo() must have public visibility and cannot be static"); - } - } - } else { - char *class_lcname; - - class_lcname = do_alloca(CG(active_class_entry)->name->len + 1, use_heap); - zend_str_tolower_copy(class_lcname, CG(active_class_entry)->name->val, CG(active_class_entry)->name->len); - /* Improve after RC: cache the lowercase class name */ - - if ((CG(active_class_entry)->name->len == name->len) && ((CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) != ZEND_ACC_TRAIT) && (!memcmp(class_lcname, lcname->val, name->len))) { - if (!CG(active_class_entry)->constructor) { - CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array); - } - } else if ((name->len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1))) { - if (CG(active_class_entry)->constructor) { - zend_error(E_STRICT, "Redefining already defined constructor for class %s", CG(active_class_entry)->name->val); - } - CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_DESTRUCTOR_FUNC_NAME, sizeof(ZEND_DESTRUCTOR_FUNC_NAME)-1))) { - CG(active_class_entry)->destructor = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_CLONE_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)-1))) { - CG(active_class_entry)->clone = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __call() must have public visibility and cannot be static"); - } - CG(active_class_entry)->__call = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1))) { - if ((fn_flags & (ZEND_ACC_PPP_MASK ^ ZEND_ACC_PUBLIC)) || (fn_flags & ZEND_ACC_STATIC) == 0) { - zend_error(E_WARNING, "The magic method __callStatic() must have public visibility and be static"); - } - CG(active_class_entry)->__callstatic = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __get() must have public visibility and cannot be static"); - } - CG(active_class_entry)->__get = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __set() must have public visibility and cannot be static"); - } - CG(active_class_entry)->__set = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __unset() must have public visibility and cannot be static"); - } - CG(active_class_entry)->__unset = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __isset() must have public visibility and cannot be static"); - } - CG(active_class_entry)->__isset = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __toString() must have public visibility and cannot be static"); - } - CG(active_class_entry)->__tostring = (zend_function *) CG(active_op_array); - } else if ((name->len == sizeof(ZEND_INVOKE_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_INVOKE_FUNC_NAME, sizeof(ZEND_INVOKE_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __invoke() must have public visibility and cannot be static"); - } - } else if ((name->len == sizeof(ZEND_DEBUGINFO_FUNC_NAME)-1) && (!memcmp(lcname->val, ZEND_DEBUGINFO_FUNC_NAME, sizeof(ZEND_DEBUGINFO_FUNC_NAME)-1))) { - if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) { - zend_error(E_WARNING, "The magic method __debugInfo() must have public visibility and cannot be static"); - } - CG(active_class_entry)->__debugInfo = (zend_function *) CG(active_op_array); - } else if (!(fn_flags & ZEND_ACC_STATIC)) { - CG(active_op_array)->fn_flags |= ZEND_ACC_ALLOW_STATIC; - } - free_alloca(class_lcname, use_heap); - } - - STR_RELEASE(lcname); - } else { - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zval key; - zend_string *ns_name; - - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - /* Prefix function name with current namespace name */ - znode tmp; - - ZVAL_DUP(&tmp.u.constant, &CG(current_namespace)); - zend_do_build_namespace_name(&tmp, &tmp, function_name TSRMLS_CC); - op_array.function_name = Z_STR(tmp.u.constant); - lcname = STR_ALLOC(Z_STRLEN(tmp.u.constant), 0); - zend_str_tolower_copy(lcname->val, Z_STRVAL(tmp.u.constant), Z_STRLEN(tmp.u.constant)); - } else { - lcname = STR_ALLOC(name->len, 0); - zend_str_tolower_copy(lcname->val, name->val, name->len); - } - - /* Function name must not conflict with import names */ - if (CG(current_import_function) && - (ns_name = zend_hash_find_ptr(CG(current_import_function), lcname)) != NULL) { - - char *tmp = zend_str_tolower_dup(ns_name->val, ns_name->len); - - if (ns_name->len != Z_STRLEN(function_name->u.constant) || - memcmp(tmp, lcname->val, Z_STRLEN(function_name->u.constant))) { - zend_error(E_COMPILE_ERROR, "Cannot declare function %s because the name is already in use", Z_STRVAL(function_name->u.constant)); - } - efree(tmp); - } - - opline->opcode = ZEND_DECLARE_FUNCTION; - opline->op1_type = IS_CONST; - build_runtime_defined_function_key(&key, lcname, LANG_SCNG(yy_text) TSRMLS_CC); - opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); - opline->op2_type = IS_CONST; - LITERAL_STR(opline->op2, STR_COPY(lcname)); - opline->extended_value = ZEND_DECLARE_FUNCTION; - CG(active_op_array) = emalloc(sizeof(zend_op_array)); - memcpy(CG(active_op_array), &op_array, sizeof(zend_op_array)); - zend_hash_update_ptr(CG(function_table), Z_STR(key), CG(active_op_array)); - zend_stack_push(&CG(context_stack), (void *) &CG(context)); - zend_init_compiler_context(TSRMLS_C); - STR_RELEASE(lcname); - } - - if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) { - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_EXT_NOP; - opline->lineno = function_begin_line; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - } - - { - /* Push a separator to the switch stack */ - zend_switch_entry switch_entry; - - switch_entry.cond.op_type = IS_UNUSED; - switch_entry.default_case = 0; - switch_entry.control_var = 0; - - zend_stack_push(&CG(switch_cond_stack), (void *) &switch_entry); - } - - { - /* Push a separator to the foreach stack */ - zend_op dummy_opline; - - dummy_opline.result_type = IS_UNUSED; - - zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline); - } - - if (CG(doc_comment)) { - CG(active_op_array)->doc_comment = CG(doc_comment); - CG(doc_comment) = NULL; - } -} -/* }}} */ - void zend_do_handle_exception(TSRMLS_D) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -977,39 +720,6 @@ void zend_do_handle_exception(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /* {{{ */ -{ - char lcname[16]; - int name_len; - - zend_do_extended_info(TSRMLS_C); - zend_do_return(NULL, 0 TSRMLS_CC); - - pass_two(CG(active_op_array) TSRMLS_CC); - zend_release_labels(0 TSRMLS_CC); - - if (CG(active_class_entry)) { - zend_check_magic_method_implementation(CG(active_class_entry), (zend_function*)CG(active_op_array), E_COMPILE_ERROR TSRMLS_CC); - } else { - /* we don't care if the function name is longer, in fact lowercasing only - * the beginning of the name speeds up the check process */ - name_len = CG(active_op_array)->function_name->len; - zend_str_tolower_copy(lcname, CG(active_op_array)->function_name->val, MIN(name_len, sizeof(lcname)-1)); - lcname[sizeof(lcname)-1] = '\0'; /* zend_str_tolower_copy won't necessarily set the zero byte */ - if (name_len == sizeof(ZEND_AUTOLOAD_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME)) && CG(active_op_array)->num_args != 1) { - zend_error_noreturn(E_COMPILE_ERROR, "%s() must take exactly 1 argument", ZEND_AUTOLOAD_FUNC_NAME); - } - } - - CG(active_op_array)->line_end = zend_get_compiled_lineno(TSRMLS_C); - CG(active_op_array) = function_token->u.op_array; - - /* Pop the switch and foreach separators */ - zend_stack_del_top(&CG(switch_cond_stack)); - zend_stack_del_top(&CG(foreach_copy_stack)); -} -/* }}} */ - zend_string *zend_concat3( char *str1, size_t str1_len, char *str2, size_t str2_len, char *str3, size_t str3_len ) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 4da186fc3e..1361b5288c 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -481,8 +481,6 @@ ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC); 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_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC); -void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC); void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC); void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC); void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC); -- cgit v1.2.1 From 446cf29ab792b7f884a366b419f7f5cb7611acfe Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 13:03:58 +0200 Subject: Fix compound assign to static property --- Zend/zend_compile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d54ee6e26b..f634eb7b37 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4999,6 +4999,7 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { switch (var_ast->kind) { case ZEND_AST_VAR: + case ZEND_AST_STATIC_PROP: zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); emit_op(result, opcode, &var_node, &expr_node TSRMLS_CC); return; -- cgit v1.2.1 From ef26f956769de6c6f1c485f2df04739bde56d89b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 13:13:58 +0200 Subject: Load lineno when compiling exprs --- Zend/zend_compile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f634eb7b37..e30bb4d123 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7351,6 +7351,8 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { } void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { + CG(zend_lineno) = ast->lineno; + switch (ast->kind) { case ZEND_AST_ZVAL: ZVAL_COPY(&result->u.constant, zend_ast_get_zval(ast)); -- cgit v1.2.1 From 6513e959d6dc3fa58d1f9746bbd710d57e3184a4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 13:21:12 +0200 Subject: Fix for with empty expression lists --- Zend/zend_compile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e30bb4d123..f5734563a0 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5653,7 +5653,12 @@ void zend_compile_do_while(zend_ast *ast TSRMLS_DC) { void zend_compile_expr_list(znode *result, zend_ast *ast TSRMLS_DC) { zend_uint i; - result->op_type = IS_UNUSED; + result->op_type = IS_CONST; + ZVAL_TRUE(&result->u.constant); + + if (!ast) { + return; + } for (i = 0; i < ast->children; ++i) { zend_ast *expr_ast = ast->child[i]; -- cgit v1.2.1 From 1aaaedc1ebd1126758989ada88b9f3c3ed79f643 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 13:23:25 +0200 Subject: Dead code --- Zend/zend_compile.c | 33 --------------------------------- Zend/zend_compile.h | 2 -- 2 files changed, 35 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f5734563a0..50fa914c90 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -920,27 +920,6 @@ static void ptr_dtor(zval *zv) /* {{{ */ } /* }}} */ -void zend_do_label(znode *label TSRMLS_DC) /* {{{ */ -{ - zend_label dest; - - if (!CG(context).labels) { - ALLOC_HASHTABLE(CG(context).labels); - zend_hash_init(CG(context).labels, 8, NULL, ptr_dtor, 0); - } - - dest.brk_cont = CG(context).current_brk_cont; - dest.opline_num = get_next_op_number(CG(active_op_array)); - - if (zend_hash_add_mem(CG(context).labels, Z_STR(label->u.constant), &dest, sizeof(zend_label)) == NULL) { - zend_error_noreturn(E_COMPILE_ERROR, "Label '%s' already defined", Z_STRVAL(label->u.constant)); - } - - /* Done with label now */ - zval_dtor(&label->u.constant); -} -/* }}} */ - void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC) /* {{{ */ { zend_label *dest; @@ -1001,18 +980,6 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 } /* }}} */ -void zend_do_goto(znode *label TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_GOTO; - opline->extended_value = CG(context).current_brk_cont; - SET_UNUSED(opline->op1); - SET_NODE(opline->op2, label); - zend_resolve_goto_label(CG(active_op_array), opline, 0 TSRMLS_CC); -} -/* }}} */ - void zend_release_labels(int temporary TSRMLS_DC) /* {{{ */ { if (CG(context).labels) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 1361b5288c..7ff620dcef 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -541,8 +541,6 @@ void zend_do_use_const(znode *name, znode *new_name, int is_global TSRMLS_DC); void zend_do_end_compilation(TSRMLS_D); void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC); -void zend_do_label(znode *label TSRMLS_DC); -void zend_do_goto(znode *label TSRMLS_DC); void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC); void zend_release_labels(int temporary TSRMLS_DC); -- cgit v1.2.1 From 43d6e599cf96e1b056dbb4ed1ac35c9f7215521c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 14:54:56 +0200 Subject: Port property declarations --- Zend/zend_ast.h | 3 +++ Zend/zend_compile.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 17 +++++++++++------ 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 1e942ece34..01f83d6694 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -103,6 +103,9 @@ enum _zend_ast_kind { ZEND_AST_CLOSURE, ZEND_AST_CLOSURE_USES, ZEND_AST_METHOD, + + ZEND_AST_PROP_DECL, + ZEND_AST_PROP_ELEM, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 50fa914c90..4697a4255d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6470,6 +6470,48 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { CG(active_op_array) = orig_op_array; } +void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { + zend_uint flags = ast->attr; + zend_class_entry *ce = CG(active_class_entry); + zend_uint i; + + if (ce->ce_flags & ZEND_ACC_INTERFACE) { + zend_error_noreturn(E_COMPILE_ERROR, "Interfaces may not include member variables"); + } + + if (flags & ZEND_ACC_ABSTRACT) { + zend_error_noreturn(E_COMPILE_ERROR, "Properties cannot be declared abstract"); + } + + for (i = 0; i < ast->children; ++i) { + zend_ast *prop_ast = ast->child[i]; + zend_ast *name_ast = prop_ast->child[0]; + zend_ast *value_ast = prop_ast->child[1]; + zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); + zval value_zv; + + if (flags & ZEND_ACC_FINAL) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare property %s::$%s final, " + "the final modifier is allowed only for methods and classes", + ce->name->val, name->val); + } + + if (zend_hash_exists(&ce->properties_info, name)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare %s::$%s", + ce->name->val, name->val); + } + + if (value_ast) { + _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); + } else { + ZVAL_NULL(&value_zv); + } + + name = zend_new_interned_string(name TSRMLS_CC); + zend_declare_property_ex(ce, name, &value_zv, flags, NULL /* TODO.AST doc comment */ TSRMLS_CC); + } +} + 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]; @@ -7307,6 +7349,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_METHOD: zend_compile_func_decl(NULL, ast TSRMLS_CC); break; + case ZEND_AST_PROP_DECL: + zend_compile_prop_decl(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 40c4061ec1..9febbc52a8 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -626,7 +626,8 @@ class_statement_list: class_statement: - variable_modifiers { CG(access_type) = Z_LVAL($1.u.constant); } class_variable_declaration ';' + variable_modifiers property_list ';' + { $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); AS($$); } | class_constant_declaration ';' | trait_use_statement | method_modifiers function returns_ref T_STRING '(' parameter_list ')' method_body @@ -721,11 +722,15 @@ member_modifier: | T_FINAL { Z_LVAL($$.u.constant) = ZEND_ACC_FINAL; } ; -class_variable_declaration: - class_variable_declaration ',' T_VARIABLE { zend_do_declare_property(&$3, NULL, CG(access_type) TSRMLS_CC); } - | class_variable_declaration ',' T_VARIABLE '=' static_scalar { zend_do_declare_property(&$3, &$5, CG(access_type) TSRMLS_CC); } - | T_VARIABLE { zend_do_declare_property(&$1, NULL, CG(access_type) TSRMLS_CC); } - | T_VARIABLE '=' static_scalar { zend_do_declare_property(&$1, &$3, CG(access_type) TSRMLS_CC); } +property_list: + property_list ',' property { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | property { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PROP_DECL, $1.u.ast); } +; + +property: + T_VARIABLE { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, AST_ZVAL(&$1), NULL); } + | T_VARIABLE '=' expr + { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, AST_ZVAL(&$1), $3.u.ast); } ; class_constant_declaration: -- cgit v1.2.1 From 222430d99cd6dc8e31228a9c91e615a2c2987b6d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 15:13:50 +0200 Subject: Port class const decl --- Zend/zend_ast.h | 3 +++ Zend/zend_compile.c | 41 +++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 14 ++++++++++---- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 01f83d6694..bb184cd9a8 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -106,6 +106,9 @@ enum _zend_ast_kind { ZEND_AST_PROP_DECL, ZEND_AST_PROP_ELEM, + + ZEND_AST_CLASS_CONST_DECL, + ZEND_AST_CONST_ELEM, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4697a4255d..66eb470100 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6512,6 +6512,44 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { } } +void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { + zend_class_entry *ce = CG(active_class_entry); + 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)); + zval value_zv; + + if (ce->ce_flags & ZEND_ACC_TRAIT) { + zend_error_noreturn(E_COMPILE_ERROR, "Traits cannot have constants"); + return; + } + + if (value_ast) { + _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); + } else { + ZVAL_NULL(&value_zv); + } + + if (Z_TYPE(value_zv) == IS_ARRAY + || (Z_TYPE(value_zv) == IS_CONSTANT_AST && Z_ASTVAL(value_zv)->kind == ZEND_AST_ARRAY) + ) { + zend_error_noreturn(E_COMPILE_ERROR, "Arrays are not allowed in class constants"); + } + + name = zend_new_interned_string(name TSRMLS_CC); + if (zend_hash_add(&ce->constants_table, name, &value_zv) == NULL) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", + ce->name->val, name); + } + + // TODO.AST doc comment + } +} + 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]; @@ -7352,6 +7390,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_PROP_DECL: zend_compile_prop_decl(ast TSRMLS_CC); break; + case ZEND_AST_CLASS_CONST_DECL: + zend_compile_class_const_decl(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 9febbc52a8..e2018e517a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -628,7 +628,7 @@ class_statement_list: class_statement: variable_modifiers property_list ';' { $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); AS($$); } - | class_constant_declaration ';' + | class_const_list ';' { $$.u.ast = $1.u.ast; AS($$); } | trait_use_statement | method_modifiers function returns_ref T_STRING '(' parameter_list ')' method_body { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_METHOD, $3.EA | Z_LVAL($1.u.constant), @@ -733,9 +733,15 @@ property: { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, AST_ZVAL(&$1), $3.u.ast); } ; -class_constant_declaration: - class_constant_declaration ',' T_STRING '=' static_scalar { zend_do_declare_class_constant(&$3, &$5 TSRMLS_CC); } - | T_CONST T_STRING '=' static_scalar { zend_do_declare_class_constant(&$2, &$4 TSRMLS_CC); } +class_const_list: + class_const_list ',' class_const { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + | class_const + { $$.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); } ; echo_expr_list: -- cgit v1.2.1 From fd7387a7619a6fab09bc63ac4bfae77eb6ca9ebc Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 15:18:06 +0200 Subject: Handle class const doc comment Property doc comments not yet handled --- Zend/zend_compile.c | 2 -- Zend/zend_language_parser.y | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 66eb470100..d19e377d68 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6545,8 +6545,6 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", ce->name->val, name); } - - // TODO.AST doc comment } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e2018e517a..7380949084 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -628,7 +628,10 @@ class_statement_list: class_statement: variable_modifiers property_list ';' { $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); AS($$); } - | class_const_list ';' { $$.u.ast = $1.u.ast; AS($$); } + | class_const_list ';' + { $$.u.ast = $1.u.ast; + if (CG(doc_comment)) { STR_RELEASE(CG(doc_comment)); CG(doc_comment) = NULL; } + AS($$); } | trait_use_statement | method_modifiers function returns_ref T_STRING '(' parameter_list ')' method_body { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_METHOD, $3.EA | Z_LVAL($1.u.constant), -- cgit v1.2.1 From 291bcfe4f1bdcc60814047f3f2e819d1d48af197 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 22:39:01 +0200 Subject: Port trait uses --- Zend/zend_ast.h | 8 ++- Zend/zend_compile.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 67 +++++++++++----------- 3 files changed, 174 insertions(+), 36 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index bb184cd9a8..dd260249a4 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -109,6 +109,13 @@ enum _zend_ast_kind { ZEND_AST_CLASS_CONST_DECL, ZEND_AST_CONST_ELEM, + + ZEND_AST_USE_TRAIT, + ZEND_AST_NAME_LIST, + ZEND_AST_TRAIT_ADAPTATIONS, + ZEND_AST_TRAIT_PRECEDENCE, + ZEND_AST_TRAIT_ALIAS, + ZEND_AST_METHOD_REFERENCE, }; typedef unsigned short zend_ast_kind; @@ -228,7 +235,6 @@ static inline zend_ast *zend_ast_create_cast(zend_uint type, zend_ast *op0) { #define AC(znode) AST_COMPILE(&znode, znode.u.ast) #define AS(znode) AST_COMPILE_STMT(znode.u.ast) -#define AZ(znode) ((znode).u.ast = AST_ZNODE(&znode)) #define AN(znode) ((znode).u.ast = NULL) #endif diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d19e377d68..2579329395 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6548,6 +6548,138 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { } } +static zend_trait_method_reference *zend_compile_method_ref(zend_ast *ast TSRMLS_DC) { + zend_ast *class_ast = ast->child[0]; + zend_ast *method_ast = ast->child[1]; + + zend_trait_method_reference *method_ref = emalloc(sizeof(zend_trait_method_reference)); + method_ref->ce = NULL; + method_ref->method_name = STR_COPY(Z_STR_P(zend_ast_get_zval(method_ast))); + + if (class_ast) { + zend_string *name = Z_STR_P(zend_ast_get_zval(class_ast)); + zend_bool is_fully_qualified = class_ast->attr; + method_ref->class_name = zend_resolve_class_name(name, is_fully_qualified TSRMLS_CC); + } else { + method_ref->class_name = NULL; + } + + return method_ref; +} + +static zend_string **zend_compile_name_list(zend_ast *ast TSRMLS_DC) { + zend_string **names = safe_emalloc(sizeof(zend_string *), ast->children + 1, 0); + zend_uint i; + + for (i = 0; i < ast->children; ++i) { + zend_ast *name_ast = ast->child[i]; + zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); + zend_bool is_fully_qualified = name_ast->attr; + names[i] = zend_resolve_class_name(name, is_fully_qualified TSRMLS_CC); + } + + names[ast->children] = NULL; + + return names; +} + +static void zend_compile_trait_precedence(zend_ast *ast TSRMLS_DC) { + zend_ast *method_ref_ast = ast->child[0]; + zend_ast *insteadof_ast = ast->child[1]; + + zend_trait_precedence *precedence = emalloc(sizeof(zend_trait_precedence)); + precedence->trait_method = zend_compile_method_ref(method_ref_ast TSRMLS_CC); + precedence->exclude_from_classes + = (void *) zend_compile_name_list(insteadof_ast TSRMLS_CC); + + zend_add_to_list(&CG(active_class_entry)->trait_precedences, precedence TSRMLS_CC); +} + +static void zend_compile_trait_alias(zend_ast *ast TSRMLS_DC) { + zend_ast *method_ref_ast = ast->child[0]; + zend_ast *alias_ast = ast->child[1]; + zend_uint modifiers = ast->attr; + + zend_trait_alias *alias; + + if (modifiers == ZEND_ACC_STATIC) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use 'static' as method modifier"); + } else if (modifiers == ZEND_ACC_ABSTRACT) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use 'abstract' as method modifier"); + } else if (modifiers == ZEND_ACC_FINAL) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use 'final' as method modifier"); + } + + alias = emalloc(sizeof(zend_trait_alias)); + alias->trait_method = zend_compile_method_ref(method_ref_ast TSRMLS_CC); + alias->modifiers = modifiers; + + if (alias_ast) { + alias->alias = STR_COPY(Z_STR_P(zend_ast_get_zval(alias_ast))); + } else { + alias->alias = NULL; + } + + zend_add_to_list(&CG(active_class_entry)->trait_aliases, alias TSRMLS_CC); +} + +void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { + zend_ast *traits_ast = ast->child[0]; + zend_ast *adaptations_ast = ast->child[1]; + zend_class_entry *ce = CG(active_class_entry); + zend_op *opline; + zend_uint i; + + for (i = 0; i < traits_ast->children; ++i) { + zend_ast *trait_ast = traits_ast->child[i]; + zend_string *name = Z_STR_P(zend_ast_get_zval(trait_ast)); + + znode name_node; + + if (ce->ce_flags & ZEND_ACC_INTERFACE) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use traits inside of interfaces. " + "%s is used in %s", name->val, ce->name->val); + } + + switch (zend_get_class_fetch_type(name->val, name->len)) { + case ZEND_FETCH_CLASS_SELF: + case ZEND_FETCH_CLASS_PARENT: + case ZEND_FETCH_CLASS_STATIC: + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as trait name " + "as it is reserved", name->val); + break; + } + + zend_compile_expr(&name_node, trait_ast TSRMLS_CC); + zend_resolve_class_name_old(&name_node TSRMLS_CC); + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_ADD_TRAIT; + SET_NODE(opline->op1, &CG(implementing_class)); + opline->extended_value = ZEND_FETCH_CLASS_TRAIT; + opline->op2_type = IS_CONST; + opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), &name_node.u.constant TSRMLS_CC); + ce->num_traits++; + } + + if (!adaptations_ast) { + return; + } + + for (i = 0; i < adaptations_ast->children; ++i) { + zend_ast *adaptation_ast = adaptations_ast->child[i]; + switch (adaptation_ast->kind) { + case ZEND_AST_TRAIT_PRECEDENCE: + zend_compile_trait_precedence(adaptation_ast TSRMLS_CC); + break; + case ZEND_AST_TRAIT_ALIAS: + zend_compile_trait_alias(adaptation_ast TSRMLS_CC); + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + } +} + 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]; @@ -7391,6 +7523,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_CLASS_CONST_DECL: zend_compile_class_const_decl(ast TSRMLS_CC); break; + case ZEND_AST_USE_TRAIT: + zend_compile_use_trait(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 7380949084..373dfef21d 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -632,68 +632,65 @@ class_statement: { $$.u.ast = $1.u.ast; if (CG(doc_comment)) { STR_RELEASE(CG(doc_comment)); CG(doc_comment) = NULL; } AS($$); } - | trait_use_statement + | T_USE name_list trait_adaptations + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_TRAIT, $2.u.ast, $3.u.ast); AS($$); } | method_modifiers function returns_ref T_STRING '(' parameter_list ')' method_body { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_METHOD, $3.EA | Z_LVAL($1.u.constant), $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), $2.u.op.ptr, Z_STR($4.u.constant), $6.u.ast, NULL, $8.u.ast); AS($$); } ; -trait_use_statement: - T_USE trait_list trait_adaptations -; - -trait_list: - fully_qualified_class_name { zend_do_use_trait(&$1 TSRMLS_CC); } - | trait_list ',' fully_qualified_class_name { zend_do_use_trait(&$3 TSRMLS_CC); } +name_list: + name { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_NAME_LIST, $1.u.ast); } + | name_list ',' name { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } ; trait_adaptations: - ';' - | '{' trait_adaptation_list '}' + ';' { $$.u.ast = NULL; } + | '{' '}' { $$.u.ast = NULL; } + | '{' trait_adaptation_list '}' { $$.u.ast = $2.u.ast; } ; trait_adaptation_list: - /* empty */ - | non_empty_trait_adaptation_list -; - -non_empty_trait_adaptation_list: - trait_adaptation_statement - | non_empty_trait_adaptation_list trait_adaptation_statement + trait_adaptation + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_TRAIT_ADAPTATIONS, $1.u.ast); } + | trait_adaptation_list trait_adaptation + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } ; -trait_adaptation_statement: - trait_precedence ';' - | trait_alias ';' +trait_adaptation: + trait_precedence ';' { $$.u.ast = $1.u.ast; } + | trait_alias ';' { $$.u.ast = $1.u.ast; } ; trait_precedence: - trait_method_reference_fully_qualified T_INSTEADOF trait_reference_list { zend_add_trait_precedence(&$1, &$3 TSRMLS_CC); } + absolute_trait_method_reference T_INSTEADOF name_list + { $$.u.ast = zend_ast_create_binary(ZEND_AST_TRAIT_PRECEDENCE, $1.u.ast, $3.u.ast); } ; -trait_reference_list: - fully_qualified_class_name { zend_resolve_class_name_old(&$1 TSRMLS_CC); zend_init_list(&$$.u.op.ptr, Z_STR($1.u.constant) TSRMLS_CC); } - | trait_reference_list ',' fully_qualified_class_name { zend_resolve_class_name_old(&$3 TSRMLS_CC); zend_add_to_list(&$1.u.op.ptr, Z_STR($3.u.constant) TSRMLS_CC); $$ = $1; } +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, AST_ZVAL(&$4)); } + | 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); } ; trait_method_reference: - T_STRING { zend_prepare_reference(&$$, NULL, &$1 TSRMLS_CC); } - | trait_method_reference_fully_qualified { $$ = $1; } + T_STRING + { $$.u.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, NULL, AST_ZVAL(&$1)); } + | absolute_trait_method_reference { $$.u.ast = $1.u.ast; } ; -trait_method_reference_fully_qualified: - fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { zend_prepare_reference(&$$, &$1, &$3 TSRMLS_CC); } -; - -trait_alias: - trait_method_reference T_AS trait_modifiers T_STRING { zend_add_trait_alias(&$1, &$3, &$4 TSRMLS_CC); } - | trait_method_reference T_AS member_modifier { zend_add_trait_alias(&$1, &$3, NULL TSRMLS_CC); } +absolute_trait_method_reference: + name T_PAAMAYIM_NEKUDOTAYIM T_STRING + { $$.u.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, $1.u.ast, AST_ZVAL(&$3)); } ; trait_modifiers: - /* empty */ { Z_LVAL($$.u.constant) = 0x0; } /* No change of methods visibility */ - | member_modifier { $$ = $1; } /* REM: Keep in mind, there are not only visibility modifiers */ + /* empty */ { Z_LVAL($$.u.constant) = 0; } + | member_modifier { $$ = $1; } ; method_body: -- cgit v1.2.1 From e572a32657d8f7054262a944830372b70f3c6de8 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 22:46:22 +0200 Subject: Dead code --- Zend/zend_compile.c | 99 ++++------------------------------------------------- Zend/zend_compile.h | 6 ---- 2 files changed, 6 insertions(+), 99 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2579329395..f71fc5e826 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -866,6 +866,12 @@ zend_string *zend_resolve_class_name( return STR_COPY(name); } +zend_string *zend_resolve_class_name_ast(zend_ast *ast TSRMLS_DC) { + zend_string *name = Z_STR_P(zend_ast_get_zval(ast)); + zend_bool is_fully_qualified = ast->attr; + return zend_resolve_class_name(name, is_fully_qualified TSRMLS_CC); +} + void zend_resolve_class_name_old(znode *class_name TSRMLS_DC) { zend_string *resolved_name = zend_resolve_class_name( Z_STR(class_name->u.constant), 0 TSRMLS_CC); @@ -2772,67 +2778,6 @@ ZEND_API int do_bind_function(const zend_op_array *op_array, zend_op *opline, Ha } /* }}} */ -void zend_prepare_reference(znode *result, znode *class_name, znode *method_name TSRMLS_DC) /* {{{ */ -{ - zend_trait_method_reference *method_ref = emalloc(sizeof(zend_trait_method_reference)); - method_ref->ce = NULL; - - /* REM: There should not be a need for copying, - zend_do_begin_class_declaration is also just using that string */ - if (class_name) { - zend_resolve_class_name_old(class_name TSRMLS_CC); - method_ref->class_name = Z_STR(class_name->u.constant); - } else { - method_ref->class_name = NULL; - } - - method_ref->method_name = Z_STR(method_name->u.constant); - - result->u.op.ptr = method_ref; - result->op_type = IS_TMP_VAR; -} -/* }}} */ - -void zend_add_trait_alias(znode *method_reference, znode *modifiers, znode *alias TSRMLS_DC) /* {{{ */ -{ - zend_class_entry *ce = CG(active_class_entry); - zend_trait_alias *trait_alias; - - if (Z_LVAL(modifiers->u.constant) == ZEND_ACC_STATIC) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use 'static' as method modifier"); - return; - } else if (Z_LVAL(modifiers->u.constant) == ZEND_ACC_ABSTRACT) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use 'abstract' as method modifier"); - return; - } else if (Z_LVAL(modifiers->u.constant) == ZEND_ACC_FINAL) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use 'final' as method modifier"); - return; - } - - trait_alias = emalloc(sizeof(zend_trait_alias)); - trait_alias->trait_method = (zend_trait_method_reference*)method_reference->u.op.ptr; - trait_alias->modifiers = Z_LVAL(modifiers->u.constant); - if (alias) { - trait_alias->alias = Z_STR(alias->u.constant); - } else { - trait_alias->alias = NULL; - } - zend_add_to_list(&ce->trait_aliases, trait_alias TSRMLS_CC); -} -/* }}} */ - -void zend_add_trait_precedence(znode *method_reference, znode *trait_list TSRMLS_DC) /* {{{ */ -{ - zend_class_entry *ce = CG(active_class_entry); - zend_trait_precedence *trait_precedence = emalloc(sizeof(zend_trait_precedence)); - - trait_precedence->trait_method = (zend_trait_method_reference*)method_reference->u.op.ptr; - trait_precedence->exclude_from_classes = trait_list->u.op.ptr; - - zend_add_to_list(&ce->trait_precedences, trait_precedence TSRMLS_CC); -} -/* }}} */ - ZEND_API zend_class_entry *do_bind_class(const zend_op_array* op_array, const zend_op *opline, HashTable *class_table, zend_bool compile_time TSRMLS_DC) /* {{{ */ { zend_class_entry *ce; @@ -3225,38 +3170,6 @@ void zend_do_implements_interface(znode *interface_name TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_use_trait(znode *trait_name TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - - if ((CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE)) { - zend_error_noreturn(E_COMPILE_ERROR, - "Cannot use traits inside of interfaces. %s is used in %s", - Z_STRVAL(trait_name->u.constant), CG(active_class_entry)->name->val); - } - - - switch (zend_get_class_fetch_type(Z_STRVAL(trait_name->u.constant), Z_STRLEN(trait_name->u.constant))) { - case ZEND_FETCH_CLASS_SELF: - case ZEND_FETCH_CLASS_PARENT: - case ZEND_FETCH_CLASS_STATIC: - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as trait name as it is reserved", Z_STRVAL(trait_name->u.constant)); - break; - default: - break; - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_ADD_TRAIT; - SET_NODE(opline->op1, &CG(implementing_class)); - zend_resolve_class_name_old(trait_name TSRMLS_CC); - opline->extended_value = ZEND_FETCH_CLASS_TRAIT; - opline->op2_type = IS_CONST; - opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), &trait_name->u.constant TSRMLS_CC); - CG(active_class_entry)->num_traits++; -} -/* }}} */ - ZEND_API zend_string *zend_mangle_property_name(const char *src1, int src1_length, const char *src2, int src2_length, int internal) /* {{{ */ { zend_string *prop_name; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 7ff620dcef..4da6303520 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -493,12 +493,6 @@ ZEND_API void zend_do_inherit_interfaces(zend_class_entry *ce, const zend_class_ ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface TSRMLS_DC); void zend_do_implements_interface(znode *interface_znode TSRMLS_DC); -/* Trait related functions */ -void zend_do_use_trait(znode *trait_znode TSRMLS_DC); -void zend_prepare_reference(znode *result, znode *class_name, znode *method_name TSRMLS_DC); -void zend_add_trait_precedence(znode *method_reference, znode *trait_list TSRMLS_DC); -void zend_add_trait_alias(znode *method_reference, znode *modifiers, znode *alias TSRMLS_DC); - ZEND_API void zend_do_implement_trait(zend_class_entry *ce, zend_class_entry *trait TSRMLS_DC); ZEND_API void zend_do_bind_traits(zend_class_entry *ce TSRMLS_DC); -- cgit v1.2.1 From 86f1004c4e7d3f52bb9737ee73536118782cd901 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 23:30:07 +0200 Subject: Improve class name handling --- Zend/zend_compile.c | 137 +++++++++++++++++++------------------------- Zend/zend_language_parser.y | 20 +++---- 2 files changed, 70 insertions(+), 87 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f71fc5e826..41382c4f81 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -419,30 +419,25 @@ static int zend_add_ns_func_name_literal(zend_op_array *op_array, zval *zv TSRML } /* }}} */ -static int zend_add_class_name_literal(zend_op_array *op_array, zval *zv TSRMLS_DC) /* {{{ */ -{ +static int zend_add_class_name_literal(zend_op_array *op_array, zend_string *name TSRMLS_DC) { int ret; zend_string *lc_name; - zval c; - if (op_array->last_literal > 0 && - &op_array->literals[op_array->last_literal - 1] == zv && - Z_CACHE_SLOT(op_array->literals[op_array->last_literal - 1]) == -1) { - /* we already have function name as last literal (do nothing) */ - ret = op_array->last_literal - 1; - } else { - ret = zend_add_literal(op_array, zv TSRMLS_CC); - } + zval zv; + ZVAL_STR(&zv, name); - if (Z_STRVAL_P(zv)[0] == '\\') { - lc_name = STR_ALLOC(Z_STRLEN_P(zv) - 1, 0); - zend_str_tolower_copy(lc_name->val, Z_STRVAL_P(zv) + 1, Z_STRLEN_P(zv) - 1); + ret = zend_add_literal(op_array, &zv TSRMLS_CC); + + if (name->val[0] == '\\') { + lc_name = STR_ALLOC(name->len - 1, 0); + zend_str_tolower_copy(lc_name->val, name->val + 1, name->len - 1); } else { - lc_name = STR_ALLOC(Z_STRLEN_P(zv), 0); - zend_str_tolower_copy(lc_name->val, Z_STRVAL_P(zv), Z_STRLEN_P(zv)); + lc_name = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lc_name->val, name->val, name->len); } - ZVAL_NEW_STR(&c, lc_name); - zend_add_literal(CG(active_op_array), &c TSRMLS_CC); + + ZVAL_NEW_STR(&zv, lc_name); + zend_add_literal(CG(active_op_array), &zv TSRMLS_CC); GET_CACHE_SLOT(ret); @@ -868,7 +863,7 @@ zend_string *zend_resolve_class_name( zend_string *zend_resolve_class_name_ast(zend_ast *ast TSRMLS_DC) { zend_string *name = Z_STR_P(zend_ast_get_zval(ast)); - zend_bool is_fully_qualified = ast->attr; + zend_bool is_fully_qualified = !ast->attr; return zend_resolve_class_name(name, is_fully_qualified TSRMLS_CC); } @@ -907,7 +902,7 @@ void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC) /* {{{ */ zend_resolve_class_name_old(class_name TSRMLS_CC); opline->op2_type = IS_CONST; opline->op2.constant = - zend_add_class_name_literal(CG(active_op_array), &class_name->u.constant TSRMLS_CC); + zend_add_class_name_literal(CG(active_op_array), Z_STR(class_name->u.constant) TSRMLS_CC); break; } } else { @@ -3165,7 +3160,7 @@ void zend_do_implements_interface(znode *interface_name TSRMLS_DC) /* {{{ */ zend_resolve_class_name_old(interface_name TSRMLS_CC); opline->extended_value = (opline->extended_value & ~ZEND_FETCH_CLASS_MASK) | ZEND_FETCH_CLASS_INTERFACE; opline->op2_type = IS_CONST; - opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), &interface_name->u.constant TSRMLS_CC); + opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), Z_STR(interface_name->u.constant) TSRMLS_CC); CG(active_class_entry)->num_interfaces++; } /* }}} */ @@ -4472,40 +4467,31 @@ static void zend_handle_numeric_op2(zend_op *opline TSRMLS_DC) { static void zend_set_class_name_op1(zend_op *opline, znode *class_node TSRMLS_DC) { if (class_node->op_type == IS_CONST) { opline->op1_type = IS_CONST; - opline->op1.constant = - zend_add_class_name_literal(CG(active_op_array), &class_node->u.constant TSRMLS_CC); + opline->op1.constant = zend_add_class_name_literal( + CG(active_op_array), Z_STR(class_node->u.constant) TSRMLS_CC); } else { SET_NODE(opline->op1, class_node); } } static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_DC) { - znode name_node; zend_op *opline; - zend_compile_expr(&name_node, name_ast TSRMLS_CC); - - if (name_node.op_type == IS_CONST) { - zval *name = &name_node.u.constant; + if (name_ast->kind == ZEND_AST_ZVAL) { + zval *name = zend_ast_get_zval(name_ast); int fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); opline = emit_op(result, ZEND_FETCH_CLASS, NULL, NULL TSRMLS_CC); opline->extended_value = fetch_type; - switch (fetch_type) { - case ZEND_FETCH_CLASS_SELF: - case ZEND_FETCH_CLASS_PARENT: - case ZEND_FETCH_CLASS_STATIC: - zval_ptr_dtor(name); - break; - default: - zend_resolve_class_name_old(&name_node TSRMLS_CC); - opline->op2_type = IS_CONST; - opline->op2.constant = - zend_add_class_name_literal(CG(active_op_array), name TSRMLS_CC); - break; + if (fetch_type == ZEND_FETCH_CLASS_DEFAULT) { + opline->op2_type = IS_CONST; + opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), + zend_resolve_class_name_ast(name_ast TSRMLS_CC) TSRMLS_CC); } } else { + znode name_node; + zend_compile_expr(&name_node, name_ast TSRMLS_CC); opline = emit_op(result, ZEND_FETCH_CLASS, NULL, &name_node TSRMLS_CC); opline->extended_value = ZEND_FETCH_CLASS_DEFAULT; } @@ -4658,8 +4644,8 @@ zend_op *zend_compile_static_prop_common(znode *result, zend_ast *ast, int type zend_op *opline; if (zend_is_const_default_class_ref(class_ast)) { - zend_compile_expr(&class_node, class_ast TSRMLS_CC); - zend_resolve_class_name_old(&class_node TSRMLS_CC); + class_node.op_type = IS_CONST; + ZVAL_STR(&class_node.u.constant, zend_resolve_class_name_ast(class_ast TSRMLS_CC)); } else { zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); } @@ -4672,8 +4658,8 @@ zend_op *zend_compile_static_prop_common(znode *result, zend_ast *ast, int type } if (class_node.op_type == IS_CONST) { opline->op2_type = IS_CONST; - opline->op2.constant = - zend_add_class_name_literal(CG(active_op_array), &class_node.u.constant TSRMLS_CC); + opline->op2.constant = zend_add_class_name_literal( + CG(active_op_array), Z_STR(class_node.u.constant) TSRMLS_CC); } else { SET_NODE(opline->op2, &class_node); } @@ -5180,8 +5166,8 @@ void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) zend_ulong extended_value = 0; if (zend_is_const_default_class_ref(class_ast)) { - zend_compile_expr(&class_node, class_ast TSRMLS_CC); - zend_resolve_class_name_old(&class_node TSRMLS_CC); + class_node.op_type = IS_CONST; + ZVAL_STR(&class_node.u.constant, zend_resolve_class_name_ast(class_ast TSRMLS_CC)); } else { opline = zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); extended_value = opline->extended_value; @@ -5832,13 +5818,9 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { zval *var_name = zend_ast_get_zval(var_ast); zend_bool is_last_catch = (i + 1 == catches_ast->children); - znode class_node; zend_uint opnum_catch; - if (zend_is_const_default_class_ref(class_ast)) { - zend_compile_expr(&class_node, class_ast TSRMLS_CC); - zend_resolve_class_name_old(&class_node TSRMLS_CC); - } else { + if (!zend_is_const_default_class_ref(class_ast)) { zend_error_noreturn(E_COMPILE_ERROR, "Bad class name in the catch statement"); } @@ -5852,8 +5834,9 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_CATCH; opline->op1_type = IS_CONST; - opline->op1.constant = zend_add_class_name_literal( - CG(active_op_array), &class_node.u.constant TSRMLS_CC); + opline->op1.constant = zend_add_class_name_literal(CG(active_op_array), + zend_resolve_class_name_ast(class_ast TSRMLS_CC) TSRMLS_CC); + opline->op2_type = IS_CV; opline->op2.var = lookup_cv(CG(active_op_array), STR_COPY(Z_STR_P(var_name)) TSRMLS_CC); opline->result.num = is_last_catch; @@ -6547,8 +6530,6 @@ void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { zend_ast *trait_ast = traits_ast->child[i]; zend_string *name = Z_STR_P(zend_ast_get_zval(trait_ast)); - znode name_node; - if (ce->ce_flags & ZEND_ACC_INTERFACE) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use traits inside of interfaces. " "%s is used in %s", name->val, ce->name->val); @@ -6563,15 +6544,14 @@ void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { break; } - zend_compile_expr(&name_node, trait_ast TSRMLS_CC); - zend_resolve_class_name_old(&name_node TSRMLS_CC); - opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_ADD_TRAIT; SET_NODE(opline->op1, &CG(implementing_class)); opline->extended_value = ZEND_FETCH_CLASS_TRAIT; opline->op2_type = IS_CONST; - opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), &name_node.u.constant TSRMLS_CC); + opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), + zend_resolve_class_name_ast(trait_ast TSRMLS_CC) TSRMLS_CC); + ce->num_traits++; } @@ -7080,8 +7060,8 @@ void zend_compile_class_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_op *opline; if (zend_is_const_default_class_ref(class_ast)) { - zend_compile_expr(&class_node, class_ast TSRMLS_CC); - zend_resolve_class_name_old(&class_node TSRMLS_CC); + class_node.op_type = IS_CONST; + ZVAL_STR(&class_node.u.constant, zend_resolve_class_name_ast(class_ast TSRMLS_CC)); } else { zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); } @@ -7135,8 +7115,8 @@ void zend_compile_resolve_class_name(znode *result, zend_ast *ast TSRMLS_DC) { } break; case ZEND_FETCH_CLASS_DEFAULT: - zend_compile_expr(result, name_ast TSRMLS_CC); - zend_resolve_class_name_old(result TSRMLS_CC); + result->op_type = IS_CONST; + ZVAL_STR(&result->u.constant, zend_resolve_class_name_ast(name_ast TSRMLS_CC)); break; EMPTY_SWITCH_DEFAULT_CASE() } @@ -7240,7 +7220,8 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zend_ast *class_ast = ast->child[0]; zend_ast *const_ast = ast->child[1]; - znode class_name, const_name; + zend_string *class_name = Z_STR_P(zend_ast_get_zval(class_ast)); + zend_string *const_name = Z_STR_P(zend_ast_get_zval(const_ast)); zval result; int fetch_type; @@ -7249,21 +7230,22 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { "Dynamic class names are not allowed in compile-time class constant references"); } - zend_compile_expr(&class_name, class_ast TSRMLS_CC); - zend_compile_expr(&const_name, const_ast TSRMLS_CC); - fetch_type = zend_get_class_fetch_type( - Z_STRVAL(class_name.u.constant), Z_STRLEN(class_name.u.constant)); + fetch_type = zend_get_class_fetch_type(class_name->val, class_name->len); if (ZEND_FETCH_CLASS_STATIC == fetch_type) { zend_error_noreturn(E_COMPILE_ERROR, "\"static::\" is not allowed in compile-time constants"); - } else if (ZEND_FETCH_CLASS_DEFAULT == fetch_type) { - zend_resolve_class_name_old(&class_name TSRMLS_CC); + } + + if (ZEND_FETCH_CLASS_DEFAULT == fetch_type) { + class_name = zend_resolve_class_name_ast(class_ast TSRMLS_CC); + } else { + STR_ADDREF(class_name); } - zend_do_build_full_name(NULL, &class_name, &const_name, 1 TSRMLS_CC); + Z_STR(result) = zend_concat3( + class_name->val, class_name->len, "::", 2, const_name->val, const_name->len); - ZVAL_COPY_VALUE(&result, &class_name.u.constant); Z_TYPE_INFO(result) = IS_CONSTANT_EX; if (IS_INTERNED(Z_STR(result))) { Z_TYPE_FLAGS(result) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); @@ -7271,6 +7253,8 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { Z_CONST_FLAGS(result) = fetch_type; zend_ast_destroy(ast); + STR_RELEASE(class_name); + *ast_ptr = zend_ast_create_zval(&result); } @@ -7306,7 +7290,7 @@ void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; zval *name = zend_ast_get_zval(name_ast); int fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); - znode result; + zval result; switch (fetch_type) { case ZEND_FETCH_CLASS_SELF: @@ -7314,7 +7298,7 @@ void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot access self::class when no class scope is active"); } - ZVAL_STR(&result.u.constant, STR_COPY(CG(active_class_entry)->name)); + ZVAL_STR(&result, STR_COPY(CG(active_class_entry)->name)); break; case ZEND_FETCH_CLASS_STATIC: case ZEND_FETCH_CLASS_PARENT: @@ -7324,14 +7308,13 @@ void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { ); break; case ZEND_FETCH_CLASS_DEFAULT: - zend_compile_expr(&result, name_ast TSRMLS_CC); - zend_resolve_class_name_old(&result TSRMLS_CC); + ZVAL_STR(&result, zend_resolve_class_name_ast(name_ast TSRMLS_CC)); break; EMPTY_SWITCH_DEFAULT_CASE() } zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_zval(&result.u.constant); + *ast_ptr = zend_ast_create_zval(&result); } void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 373dfef21d..e9ae99c3ca 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -925,7 +925,7 @@ function_call: { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.u.ast, $2.u.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, - AST_ZVAL(&$1), $3.u.ast, $4.u.ast); } + $1.u.ast, $3.u.ast, $4.u.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, $1.u.ast, $3.u.ast, $4.u.ast); } @@ -934,10 +934,10 @@ function_call: ; class_name: - T_STATIC { $$.op_type = IS_CONST; ZVAL_STRINGL(&$$.u.constant, "static", sizeof("static")-1);} - | namespace_name { $$ = $1; } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); $$ = $2; } + T_STATIC + { zval zv; ZVAL_STRINGL(&zv, "static", sizeof("static")-1); + $$.u.ast = zend_ast_create_zval(&zv); } + | name { $$.u.ast = $1.u.ast; } ; fully_qualified_class_name: @@ -949,7 +949,7 @@ fully_qualified_class_name: class_name_reference: - class_name { $$.u.ast = AST_ZVAL(&$1); } + class_name { $$.u.ast = $1.u.ast; } | new_variable { $$.u.ast = $1.u.ast; } ; @@ -1077,7 +1077,7 @@ simple_variable: static_member: class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, AST_ZVAL(&$1), $3.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } ; @@ -1092,7 +1092,7 @@ new_variable: | new_variable T_OBJECT_OPERATOR member_name { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.u.ast, $3.u.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, AST_ZVAL(&$1), $3.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } ; @@ -1210,7 +1210,7 @@ isset_variable: class_constant: class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { $$.u.ast = zend_ast_create_binary( - ZEND_AST_CLASS_CONST, AST_ZVAL(&$1), AST_ZVAL(&$3)); } + ZEND_AST_CLASS_CONST, $1.u.ast, AST_ZVAL(&$3)); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { $$.u.ast = zend_ast_create_binary( ZEND_AST_CLASS_CONST, $1.u.ast, AST_ZVAL(&$3)); } @@ -1218,7 +1218,7 @@ class_constant: class_name_scalar: class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS - { $$.u.ast = zend_ast_create_unary(ZEND_AST_RESOLVE_CLASS_NAME, AST_ZVAL(&$1)); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_RESOLVE_CLASS_NAME, $1.u.ast); } ; %% -- cgit v1.2.1 From e6e8867550c9519cbdcbe541bb9137ed52649be4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 23:36:01 +0200 Subject: Fix class name resolution in traits --- Zend/zend_compile.c | 11 +++-------- Zend/zend_language_parser.y | 1 - 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 41382c4f81..5e28da48f2 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5990,10 +5990,9 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { } } else { zend_string *class_name = Z_STR_P(zend_ast_get_zval(type_ast)); - zend_bool is_fully_qualified = !type_ast->attr; if (zend_is_const_default_class_ref(type_ast)) { - class_name = zend_resolve_class_name(class_name, is_fully_qualified TSRMLS_CC); + class_name = zend_resolve_class_name_ast(type_ast TSRMLS_CC); } else { STR_ADDREF(class_name); } @@ -6453,9 +6452,7 @@ static zend_trait_method_reference *zend_compile_method_ref(zend_ast *ast TSRMLS method_ref->method_name = STR_COPY(Z_STR_P(zend_ast_get_zval(method_ast))); if (class_ast) { - zend_string *name = Z_STR_P(zend_ast_get_zval(class_ast)); - zend_bool is_fully_qualified = class_ast->attr; - method_ref->class_name = zend_resolve_class_name(name, is_fully_qualified TSRMLS_CC); + method_ref->class_name = zend_resolve_class_name_ast(class_ast TSRMLS_CC); } else { method_ref->class_name = NULL; } @@ -6469,9 +6466,7 @@ static zend_string **zend_compile_name_list(zend_ast *ast TSRMLS_DC) { for (i = 0; i < ast->children; ++i) { zend_ast *name_ast = ast->child[i]; - zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); - zend_bool is_fully_qualified = name_ast->attr; - names[i] = zend_resolve_class_name(name, is_fully_qualified TSRMLS_CC); + names[i] = zend_resolve_class_name_ast(name_ast TSRMLS_CC); } names[ast->children] = NULL; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e9ae99c3ca..fad4643963 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -947,7 +947,6 @@ fully_qualified_class_name: ; - class_name_reference: class_name { $$.u.ast = $1.u.ast; } | new_variable { $$.u.ast = $1.u.ast; } -- cgit v1.2.1 From c8d99a1333069edbf0fb2c84b8c3167ca5cb384d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 23:39:51 +0200 Subject: No need to handle leading \ in class_name_literal --- Zend/zend_compile.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 5e28da48f2..ccbccffb9b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -428,13 +428,8 @@ static int zend_add_class_name_literal(zend_op_array *op_array, zend_string *nam ret = zend_add_literal(op_array, &zv TSRMLS_CC); - if (name->val[0] == '\\') { - lc_name = STR_ALLOC(name->len - 1, 0); - zend_str_tolower_copy(lc_name->val, name->val + 1, name->len - 1); - } else { - lc_name = STR_ALLOC(name->len, 0); - zend_str_tolower_copy(lc_name->val, name->val, name->len); - } + lc_name = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lc_name->val, name->val, name->len); ZVAL_NEW_STR(&zv, lc_name); zend_add_literal(CG(active_op_array), &zv TSRMLS_CC); -- cgit v1.2.1 From 028c7d20fbe090d8c19b708c16e43b5fcc49fd58 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 19 Jul 2014 23:44:33 +0200 Subject: Throw \self etc error Could only enable this now that everything uses the new format --- Zend/zend_compile.c | 4 ++-- Zend/zend_language_parser.y | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ccbccffb9b..94b3deef29 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4437,9 +4437,9 @@ static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { } /* Fully qualified names are always default refs */ - /*if (!name_ast->attr) { + if (!name_ast->attr) { return 1; - }*/ + } name = zend_ast_get_zval(name_ast); fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index fad4643963..ae3edf3c08 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -936,7 +936,7 @@ function_call: class_name: T_STATIC { zval zv; ZVAL_STRINGL(&zv, "static", sizeof("static")-1); - $$.u.ast = zend_ast_create_zval(&zv); } + $$.u.ast = zend_ast_create_zval_ex(&zv, 1); } | name { $$.u.ast = $1.u.ast; } ; -- cgit v1.2.1 From 09564ebacf48179143ac8413b0a45faa7203f3b5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 15:22:13 +0200 Subject: zend_begin_func_decl --- Zend/zend_compile.c | 118 +++++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 56 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 94b3deef29..2763f143d3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6229,13 +6229,69 @@ void zend_begin_method_decl( STR_RELEASE(lcname); } +static void zend_begin_func_decl( + znode *result, zend_op_array *op_array, zend_ast_func_decl *fn TSRMLS_DC +) { + zend_string *name = fn->name, *lcname; + zend_op *opline; + + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + op_array->function_name = name = zend_concat_names( + Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); + } else { + op_array->function_name = STR_COPY(name); + } + + lcname = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lcname->val, name->val, name->len); + + if (CG(current_import_function)) { + zend_string *import_name = zend_hash_find_ptr(CG(current_import_function), lcname); + if (import_name) { + char *import_name_lc = zend_str_tolower_dup(import_name->val, import_name->len); + + if (import_name->len != name->len + || memcmp(import_name_lc, lcname->val, name->len) + ) { + zend_error(E_COMPILE_ERROR, "Cannot declare function %s " + "because the name is already in use", name->val); + } + + efree(import_name_lc); + } + } + + if (zend_str_equals(lcname, ZEND_AUTOLOAD_FUNC_NAME) && fn->params->children != 1) { + zend_error_noreturn(E_COMPILE_ERROR, "%s() must take exactly 1 argument", + ZEND_AUTOLOAD_FUNC_NAME); + } + + if (op_array->fn_flags & ZEND_ACC_CLOSURE) { + opline = emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL TSRMLS_CC); + } else { + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->opcode = ZEND_DECLARE_FUNCTION; + opline->op2_type = IS_CONST; + LITERAL_STR(opline->op2, STR_COPY(lcname)); + } + + { + zval key; + build_runtime_defined_function_key(&key, lcname, fn->lex_pos TSRMLS_CC); + + opline->op1_type = IS_CONST; + opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); + + zend_hash_update_ptr(CG(function_table), Z_STR(key), op_array); + } + + STR_RELEASE(lcname); +} + void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast_func_decl *fn = (zend_ast_func_decl *) ast; zend_op_array *orig_op_array = CG(active_op_array); zend_op_array *op_array = emalloc(sizeof(zend_op_array)); - zend_string *name = fn->name, *lcname; - zend_op *opline; - zend_bool is_closure = ast->kind == ZEND_AST_CLOSURE; zend_bool is_method = ast->kind == ZEND_AST_METHOD; // TODO.AST interactive (not just here - also bpc etc!) @@ -6248,65 +6304,15 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { if (fn->doc_comment) { op_array->doc_comment = STR_COPY(fn->doc_comment); } - if (is_closure) { + if (ast->kind == ZEND_AST_CLOSURE) { op_array->fn_flags |= ZEND_ACC_CLOSURE; } if (is_method) { zend_bool has_body = fn->stmt != NULL; - zend_begin_method_decl(op_array, name, has_body TSRMLS_CC); + zend_begin_method_decl(op_array, fn->name, has_body TSRMLS_CC); } else { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - op_array->function_name = name = zend_concat_names( - Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); - } else { - op_array->function_name = STR_COPY(name); - } - - lcname = STR_ALLOC(name->len, 0); - zend_str_tolower_copy(lcname->val, name->val, name->len); - - if (CG(current_import_function)) { - zend_string *import_name = zend_hash_find_ptr(CG(current_import_function), lcname); - if (import_name) { - char *import_name_lc = zend_str_tolower_dup(import_name->val, import_name->len); - - if (import_name->len != name->len - || memcmp(import_name_lc, lcname->val, name->len) - ) { - zend_error(E_COMPILE_ERROR, "Cannot declare function %s " - "because the name is already in use", name->val); - } - - efree(import_name_lc); - } - } - - if (zend_str_equals(lcname, ZEND_AUTOLOAD_FUNC_NAME) && fn->params->children != 1) { - zend_error_noreturn(E_COMPILE_ERROR, "%s() must take exactly 1 argument", - ZEND_AUTOLOAD_FUNC_NAME); - } - - if (is_closure) { - opline = emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL TSRMLS_CC); - } else { - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_DECLARE_FUNCTION; - opline->op2_type = IS_CONST; - LITERAL_STR(opline->op2, STR_COPY(lcname)); - } - - { - zval key; - build_runtime_defined_function_key(&key, lcname, fn->lex_pos TSRMLS_CC); - - opline->op1_type = IS_CONST; - opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); - - zend_hash_update_ptr(CG(function_table), Z_STR(key), op_array); - } - - STR_RELEASE(lcname); + zend_begin_func_decl(result, op_array, fn TSRMLS_CC); } CG(active_op_array) = op_array; -- cgit v1.2.1 From 461bce522241e0fcdc6c03cfb56c83c2c0c40f41 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 15:38:21 +0200 Subject: Prepare zend_ast_decl for reuse with classes --- Zend/zend_ast.c | 26 +++++++++++++------------- Zend/zend_ast.h | 14 ++++++-------- Zend/zend_compile.c | 43 ++++++++++++++++++++++++------------------- Zend/zend_language_parser.y | 8 ++++---- 4 files changed, 47 insertions(+), 44 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index f92d45faaf..b62bae9c85 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -45,12 +45,12 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) return (zend_ast *) ast; } -ZEND_API zend_ast *zend_ast_create_func_decl( +ZEND_API zend_ast *zend_ast_create_decl( zend_ast_kind kind, zend_uint flags, zend_uint start_lineno, zend_uint end_lineno, unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, - zend_ast *params, zend_ast *uses, zend_ast *stmt + zend_ast *child0, zend_ast *child1, zend_ast *child2 ) { - zend_ast_func_decl *ast = emalloc(sizeof(zend_ast_func_decl)); + zend_ast_decl *ast = emalloc(sizeof(zend_ast_decl)); ast->kind = kind; ast->attr = 0; @@ -60,9 +60,9 @@ ZEND_API zend_ast *zend_ast_create_func_decl( ast->lex_pos = lex_pos; ast->doc_comment = doc_comment; ast->name = name; - ast->params = params; - ast->uses = uses; - ast->stmt = stmt; + ast->child[0] = child0; + ast->child[1] = child1; + ast->child[2] = child2; return (zend_ast *) ast; } @@ -351,14 +351,14 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) case ZEND_AST_CLOSURE: case ZEND_AST_METHOD: { - zend_ast_func_decl *fn = (zend_ast_func_decl *) ast; - STR_RELEASE(fn->name); - if (fn->doc_comment) { - STR_RELEASE(fn->doc_comment); + zend_ast_decl *decl = (zend_ast_decl *) ast; + STR_RELEASE(decl->name); + if (decl->doc_comment) { + STR_RELEASE(decl->doc_comment); } - zend_ast_destroy(fn->params); - zend_ast_destroy(fn->uses); - zend_ast_destroy(fn->stmt); + zend_ast_destroy(decl->child[0]); + zend_ast_destroy(decl->child[1]); + zend_ast_destroy(decl->child[2]); break; } default: diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index dd260249a4..32316afa3c 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -136,8 +136,8 @@ typedef struct _zend_ast_zval { zval val; } zend_ast_zval; -/* Using a separate structure as it needs a bunch of extra information. */ -typedef struct _zend_ast_func_decl { +/* Separate structure for function and class declaration, as they need extra information. */ +typedef struct _zend_ast_decl { zend_ast_kind kind; zend_ast_attr attr; /* Unused - for structure compatibility */ zend_uint start_lineno; @@ -146,10 +146,8 @@ typedef struct _zend_ast_func_decl { unsigned char *lex_pos; zend_string *doc_comment; zend_string *name; - zend_ast *params; - zend_ast *uses; - zend_ast *stmt; -} zend_ast_func_decl; + zend_ast *child[3]; +} zend_ast_decl; static inline zval *zend_ast_get_zval(zend_ast *ast) { return &((zend_ast_zval *) ast)->val; @@ -162,10 +160,10 @@ ZEND_API zend_ast *zend_ast_create_ex( ZEND_API zend_ast *zend_ast_create( zend_uint children, zend_ast_kind kind, ...); -ZEND_API zend_ast *zend_ast_create_func_decl( +ZEND_API zend_ast *zend_ast_create_decl( zend_ast_kind kind, zend_uint flags, zend_uint start_lineno, zend_uint end_lineno, unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, - zend_ast *params, zend_ast *uses, zend_ast *stmt + zend_ast *child0, zend_ast *child1, zend_ast *child2 ); ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2763f143d3..d21dde7732 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6230,9 +6230,10 @@ void zend_begin_method_decl( } static void zend_begin_func_decl( - znode *result, zend_op_array *op_array, zend_ast_func_decl *fn TSRMLS_DC + znode *result, zend_op_array *op_array, zend_ast_decl *decl TSRMLS_DC ) { - zend_string *name = fn->name, *lcname; + zend_ast *params_ast = decl->child[0]; + zend_string *name = decl->name, *lcname; zend_op *opline; if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { @@ -6261,7 +6262,7 @@ static void zend_begin_func_decl( } } - if (zend_str_equals(lcname, ZEND_AUTOLOAD_FUNC_NAME) && fn->params->children != 1) { + if (zend_str_equals(lcname, ZEND_AUTOLOAD_FUNC_NAME) && params_ast->children != 1) { zend_error_noreturn(E_COMPILE_ERROR, "%s() must take exactly 1 argument", ZEND_AUTOLOAD_FUNC_NAME); } @@ -6277,7 +6278,7 @@ static void zend_begin_func_decl( { zval key; - build_runtime_defined_function_key(&key, lcname, fn->lex_pos TSRMLS_CC); + build_runtime_defined_function_key(&key, lcname, decl->lex_pos TSRMLS_CC); opline->op1_type = IS_CONST; opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); @@ -6289,30 +6290,34 @@ static void zend_begin_func_decl( } void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { - zend_ast_func_decl *fn = (zend_ast_func_decl *) ast; + zend_ast_decl *decl = (zend_ast_decl *) ast; + zend_ast *params_ast = decl->child[0]; + zend_ast *uses_ast = decl->child[1]; + zend_ast *stmt_ast = decl->child[2]; + zend_bool is_method = decl->kind == ZEND_AST_METHOD; + zend_op_array *orig_op_array = CG(active_op_array); zend_op_array *op_array = emalloc(sizeof(zend_op_array)); - zend_bool is_method = ast->kind == ZEND_AST_METHOD; // TODO.AST interactive (not just here - also bpc etc!) init_op_array(op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE TSRMLS_CC); - op_array->fn_flags |= fn->flags; - op_array->line_start = fn->start_lineno; - op_array->line_end = fn->end_lineno; - if (fn->doc_comment) { - op_array->doc_comment = STR_COPY(fn->doc_comment); + op_array->fn_flags |= decl->flags; + op_array->line_start = decl->start_lineno; + op_array->line_end = decl->end_lineno; + if (decl->doc_comment) { + op_array->doc_comment = STR_COPY(decl->doc_comment); } - if (ast->kind == ZEND_AST_CLOSURE) { + if (decl->kind == ZEND_AST_CLOSURE) { op_array->fn_flags |= ZEND_ACC_CLOSURE; } if (is_method) { - zend_bool has_body = fn->stmt != NULL; - zend_begin_method_decl(op_array, fn->name, has_body TSRMLS_CC); + zend_bool has_body = stmt_ast != NULL; + zend_begin_method_decl(op_array, decl->name, has_body TSRMLS_CC); } else { - zend_begin_func_decl(result, op_array, fn TSRMLS_CC); + zend_begin_func_decl(result, op_array, decl TSRMLS_CC); } CG(active_op_array) = op_array; @@ -6321,7 +6326,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) { zend_op *opline_ext = emit_op(NULL, ZEND_EXT_NOP, NULL, NULL TSRMLS_CC); - opline_ext->lineno = fn->start_lineno; + opline_ext->lineno = decl->start_lineno; } { @@ -6344,9 +6349,9 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline); } - zend_compile_params(fn->params TSRMLS_CC); - zend_compile_closure_uses(fn->uses TSRMLS_CC); - zend_compile_stmt(fn->stmt TSRMLS_CC); + zend_compile_params(params_ast TSRMLS_CC); + zend_compile_closure_uses(uses_ast TSRMLS_CC); + zend_compile_stmt(stmt_ast TSRMLS_CC); if (is_method) { zend_check_magic_method_implementation( diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index ae3edf3c08..77c4ef614c 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -389,7 +389,7 @@ unset_variable: function_declaration_statement: function returns_ref T_STRING '(' parameter_list ')' '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_FUNC_DECL, $2.EA, + { $$.u.ast = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2.EA, $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $1.u.op.ptr, Z_STR($3.u.constant), $5.u.ast, NULL, $8.u.ast); } ; @@ -635,7 +635,7 @@ class_statement: | T_USE name_list trait_adaptations { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_TRAIT, $2.u.ast, $3.u.ast); AS($$); } | method_modifiers function returns_ref T_STRING '(' parameter_list ')' method_body - { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_METHOD, $3.EA | Z_LVAL($1.u.constant), + { $$.u.ast = zend_ast_create_decl(ZEND_AST_METHOD, $3.EA | Z_LVAL($1.u.constant), $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), $2.u.op.ptr, Z_STR($4.u.constant), $6.u.ast, NULL, $8.u.ast); AS($$); } ; @@ -883,13 +883,13 @@ expr_without_variable: | T_YIELD expr T_DOUBLE_ARROW expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } | function returns_ref '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_CLOSURE, $2.EA, + { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $2.EA, $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $1.u.op.ptr, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), $4.u.ast, $6.u.ast, $8.u.ast); } | T_STATIC function returns_ref '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_func_decl(ZEND_AST_CLOSURE, + { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $3.EA | ZEND_ACC_STATIC, $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), $2.u.op.ptr, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), $5.u.ast, $7.u.ast, $9.u.ast); } -- cgit v1.2.1 From b24bda6be1723aa7428e1558ecbfcc9ca9fb4817 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 16:34:45 +0200 Subject: Partial port of class declarations --- Zend/zend_ast.c | 1 + Zend/zend_ast.h | 2 + Zend/zend_compile.c | 112 ++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 46 +++++++++--------- 4 files changed, 136 insertions(+), 25 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index b62bae9c85..aea1c81740 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -350,6 +350,7 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) case ZEND_AST_FUNC_DECL: case ZEND_AST_CLOSURE: case ZEND_AST_METHOD: + case ZEND_AST_CLASS: { zend_ast_decl *decl = (zend_ast_decl *) ast; STR_RELEASE(decl->name); diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 32316afa3c..784e43adec 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -116,6 +116,8 @@ enum _zend_ast_kind { ZEND_AST_TRAIT_PRECEDENCE, ZEND_AST_TRAIT_ALIAS, ZEND_AST_METHOD_REFERENCE, + + ZEND_AST_CLASS, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d21dde7732..f15044c265 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6574,6 +6574,115 @@ void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { } } +void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { + zend_ast_decl *decl = (zend_ast_decl *) ast; + zend_ast *extends_ast = decl->child[0]; + zend_ast *implements_ast = decl->child[1]; + zend_ast *stmt_ast = decl->child[2]; + + zend_string *name = decl->name, *lcname, *import_name = NULL; + zend_class_entry *ce = emalloc(sizeof(zend_class_entry)); + zend_op *opline; + znode extends_node; + + if (CG(active_class_entry)) { + zend_error_noreturn(E_COMPILE_ERROR, "Class declarations may not be nested"); + return; + } + + if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name->val, name->len)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", + name->val); + } + + lcname = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lcname->val, name->val, name->len); + + if (CG(current_import)) { + import_name = zend_hash_find_ptr(CG(current_import), lcname); + } + + 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); + + STR_RELEASE(lcname); + lcname = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lcname->val, name->val, name->len); + } else { + STR_ADDREF(name); + } + + if (import_name) { + char *import_name_lc = zend_str_tolower_dup(import_name->val, import_name->len); + if (lcname->len != import_name->len + || memcmp(import_name_lc, lcname->val, lcname->len) + ) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare class %s " + "because the name is already in use", name->val); + } + efree(import_name_lc); + } + + ce->type = ZEND_USER_CLASS; + ce->name = zend_new_interned_string(name TSRMLS_CC); + zend_initialize_class_data(ce, 1 TSRMLS_CC); + + ce->ce_flags |= decl->flags; + ce->info.user.filename = zend_get_compiled_filename(TSRMLS_C); + ce->info.user.line_start = decl->start_lineno; + ce->info.user.line_end = decl->end_lineno; + if (decl->doc_comment) { + ce->info.user.doc_comment = STR_COPY(decl->doc_comment); + } + + if (extends_ast) { + if (ce->ce_flags & ZEND_ACC_TRAIT) { + zend_error_noreturn(E_COMPILE_ERROR, "A trait (%s) cannot extend a class. " + "Traits can only be composed from other traits with the 'use' keyword. Error", + name->val); + } + + if (!zend_is_const_default_class_ref(extends_ast)) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot use '%s' as class name as it is reserved", name->val); + } + + zend_compile_class_ref(&extends_node, extends_ast TSRMLS_CC); + } + + + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + opline->result.var = get_temporary_variable(CG(active_op_array)); + opline->result_type = IS_VAR; + opline->op2_type = IS_CONST; + LITERAL_STR(opline->op2, lcname); + + if (extends_ast) { + opline->opcode = ZEND_DECLARE_INHERITED_CLASS; + opline->extended_value = extends_node.u.op.var; + } else { + opline->opcode = ZEND_DECLARE_CLASS; + } + + { + zval key; + build_runtime_defined_function_key(&key, lcname, decl->lex_pos TSRMLS_CC); + opline->op1_type = IS_CONST; + opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); + + zend_hash_update_ptr(CG(class_table), Z_STR(key), ce); + } + + CG(active_class_entry) = ce; + + zend_compile_stmt(stmt_ast TSRMLS_CC); + + // TODO.AST traits, interfaces, extends, etc + + CG(active_class_entry) = NULL; +} + 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]; @@ -7423,6 +7532,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_USE_TRAIT: zend_compile_use_trait(ast TSRMLS_CC); break; + case ZEND_AST_CLASS: + zend_compile_class_decl(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 77c4ef614c..67d0504cd4 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -409,18 +409,18 @@ is_variadic: ; unticked_class_declaration_statement: - class_entry_type T_STRING extends_from - { zend_do_begin_class_declaration(&$1, &$2, &$3 TSRMLS_CC); } - implements_list - '{' - class_statement_list - '}' { zend_do_end_class_declaration(&$1, &$3 TSRMLS_CC); } - | interface_entry T_STRING + class_entry_type T_STRING extends_from implements_list + { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + '{' class_statement_list '}' + { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num, + CG(zend_lineno), LANG_SCNG(yy_text), $5.u.op.ptr, + Z_STR($2.u.constant), $3.u.ast, $4.u.ast, $7.u.ast); AS($$); } + /*| interface_entry T_STRING { zend_do_begin_class_declaration(&$1, &$2, NULL TSRMLS_CC); } interface_extends_list '{' class_statement_list - '}' { zend_do_end_class_declaration(&$1, NULL TSRMLS_CC); } + '}' { AS($6); zend_do_end_class_declaration(&$1, NULL TSRMLS_CC); }*/ ; @@ -432,27 +432,22 @@ class_entry_type: ; extends_from: - /* empty */ { $$.op_type = IS_UNUSED; } - | T_EXTENDS fully_qualified_class_name { zend_do_fetch_class(&$$, &$2 TSRMLS_CC); } + /* empty */ { $$.u.ast = NULL; } + | T_EXTENDS name { $$.u.ast = $2.u.ast; } ; interface_entry: T_INTERFACE { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_INTERFACE; } ; -interface_extends_list: - /* empty */ +/*interface_extends_list: + /* empty / | T_EXTENDS interface_list -; +;*/ implements_list: - /* empty */ - | T_IMPLEMENTS interface_list -; - -interface_list: - fully_qualified_class_name { zend_do_implements_interface(&$1 TSRMLS_CC); } - | interface_list ',' fully_qualified_class_name { zend_do_implements_interface(&$3 TSRMLS_CC); } + /* empty */ { $$.u.ast = NULL; } + | T_IMPLEMENTS name_list { $$.u.ast = $2.u.ast; } ; foreach_variable: @@ -621,23 +616,24 @@ static_var: class_statement_list: class_statement_list class_statement + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } | /* empty */ + { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } ; class_statement: variable_modifiers property_list ';' - { $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); AS($$); } + { $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); } | class_const_list ';' { $$.u.ast = $1.u.ast; - if (CG(doc_comment)) { STR_RELEASE(CG(doc_comment)); CG(doc_comment) = NULL; } - AS($$); } + 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); AS($$); } + { $$.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), $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), $2.u.op.ptr, - Z_STR($4.u.constant), $6.u.ast, NULL, $8.u.ast); AS($$); } + Z_STR($4.u.constant), $6.u.ast, NULL, $8.u.ast); } ; name_list: -- cgit v1.2.1 From 005315510a6c4ef2974c9927609db36e4cc2407c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 17:14:01 +0200 Subject: Mostly finish class declarations (~50 failing tests) --- Zend/zend_compile.c | 79 +++++++++++++++++++++++++++++++++++++++++---- Zend/zend_compile.h | 2 ++ Zend/zend_language_parser.y | 33 ++++++++----------- 3 files changed, 88 insertions(+), 26 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f15044c265..1ca4397668 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6045,7 +6045,7 @@ void zend_begin_method_decl( ) { zend_class_entry *ce = CG(active_class_entry); zend_bool in_interface = (ce->ce_flags & ZEND_ACC_INTERFACE) != 0; - zend_bool in_trait = (ce->ce_flags & ZEND_ACC_TRAIT) != 0; + zend_bool in_trait = ZEND_CE_IS_TRAIT(ce); zend_bool is_public = (op_array->fn_flags & ZEND_ACC_PUBLIC) != 0; zend_bool is_static = (op_array->fn_flags & ZEND_ACC_STATIC) != 0; @@ -6424,7 +6424,7 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); zval value_zv; - if (ce->ce_flags & ZEND_ACC_TRAIT) { + if (ZEND_CE_IS_TRAIT(ce)) { zend_error_noreturn(E_COMPILE_ERROR, "Traits cannot have constants"); return; } @@ -6574,6 +6574,35 @@ void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { } } +void zend_compile_implements(znode *class_node, zend_ast *ast TSRMLS_DC) { + zend_uint i; + for (i = 0; i < ast->children; ++i) { + zend_ast *class_ast = ast->child[i]; + zend_string *name = Z_STR_P(zend_ast_get_zval(class_ast)); + + zend_op *opline; + + /* Traits can not implement interfaces */ + if (ZEND_CE_IS_TRAIT(CG(active_class_entry))) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as interface on '%s' " + "since it is a Trait", name->val, CG(active_class_entry)->name->val); + } + + if (!zend_is_const_default_class_ref(class_ast)) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot use '%s' as interface name as it is reserved", name->val); + } + + opline = emit_op(NULL, ZEND_ADD_INTERFACE, class_node, NULL TSRMLS_CC); + opline->extended_value = ZEND_FETCH_CLASS_INTERFACE; + opline->op2_type = IS_CONST; + opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), + zend_resolve_class_name_ast(class_ast TSRMLS_CC) TSRMLS_CC); + + CG(active_class_entry)->num_interfaces++; + } +} + void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { zend_ast_decl *decl = (zend_ast_decl *) ast; zend_ast *extends_ast = decl->child[0]; @@ -6583,7 +6612,7 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { zend_string *name = decl->name, *lcname, *import_name = NULL; zend_class_entry *ce = emalloc(sizeof(zend_class_entry)); zend_op *opline; - znode extends_node; + znode declare_node, extends_node; if (CG(active_class_entry)) { zend_error_noreturn(E_COMPILE_ERROR, "Class declarations may not be nested"); @@ -6637,7 +6666,7 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { } if (extends_ast) { - if (ce->ce_flags & ZEND_ACC_TRAIT) { + if (ZEND_CE_IS_TRAIT(ce)) { zend_error_noreturn(E_COMPILE_ERROR, "A trait (%s) cannot extend a class. " "Traits can only be composed from other traits with the 'use' keyword. Error", name->val); @@ -6651,10 +6680,14 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { zend_compile_class_ref(&extends_node, extends_ast TSRMLS_CC); } - opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->result.var = get_temporary_variable(CG(active_op_array)); opline->result_type = IS_VAR; + GET_NODE(&declare_node, opline->result); + + // TODO.AST drop this + GET_NODE(&CG(implementing_class), opline->result); + opline->op2_type = IS_CONST; LITERAL_STR(opline->op2, lcname); @@ -6676,9 +6709,43 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { CG(active_class_entry) = ce; + if (implements_ast) { + zend_compile_implements(&declare_node, implements_ast TSRMLS_CC); + } + zend_compile_stmt(stmt_ast TSRMLS_CC); - // TODO.AST traits, interfaces, extends, etc + // TODO.AST validity checks + + /* Check for traits and proceed like with interfaces. + * The only difference will be a combined handling of them in the end. + * Thus, we need another opcode here. */ + if (ce->num_traits > 0) { + ce->traits = NULL; + ce->num_traits = 0; + ce->ce_flags |= ZEND_ACC_IMPLEMENT_TRAITS; + + emit_op(NULL, ZEND_BIND_TRAITS, &declare_node, NULL TSRMLS_CC); + } + + if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) + && (extends_ast || ce->num_interfaces > 0) + ) { + zend_verify_abstract_class(ce TSRMLS_CC); + if (ce->num_interfaces && !(ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS)) { + do_verify_abstract_class(TSRMLS_C); + } + } + + /* Inherit interfaces; reset number to zero, we need it for above check and + * will restore it during actual implementation. + * The ZEND_ACC_IMPLEMENT_INTERFACES flag disables double call to + * zend_verify_abstract_class() */ + if (ce->num_interfaces > 0) { + ce->interfaces = NULL; + ce->num_interfaces = 0; + ce->ce_flags |= ZEND_ACC_IMPLEMENT_INTERFACES; + } CG(active_class_entry) = NULL; } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 4da6303520..382535be33 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -226,6 +226,8 @@ typedef struct _zend_try_catch_element { /* function has arguments with type hinting */ #define ZEND_ACC_HAS_TYPE_HINTS 0x10000000 +#define ZEND_CE_IS_TRAIT(ce) (((ce)->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) + char *zend_visibility_string(zend_uint fn_flags); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 67d0504cd4..ca1d16cc12 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -415,12 +415,12 @@ unticked_class_declaration_statement: { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num, CG(zend_lineno), LANG_SCNG(yy_text), $5.u.op.ptr, Z_STR($2.u.constant), $3.u.ast, $4.u.ast, $7.u.ast); AS($$); } - /*| interface_entry T_STRING - { zend_do_begin_class_declaration(&$1, &$2, NULL TSRMLS_CC); } - interface_extends_list - '{' - class_statement_list - '}' { AS($6); zend_do_end_class_declaration(&$1, NULL TSRMLS_CC); }*/ + | interface_entry T_STRING interface_extends_list + { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + '{' class_statement_list '}' + { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num, + CG(zend_lineno), LANG_SCNG(yy_text), $4.u.op.ptr, + Z_STR($2.u.constant), NULL, $3.u.ast, $6.u.ast); AS($$); } ; @@ -431,20 +431,20 @@ class_entry_type: | T_FINAL T_CLASS { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_FINAL_CLASS; } ; +interface_entry: + T_INTERFACE { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_INTERFACE; } +; + extends_from: /* empty */ { $$.u.ast = NULL; } | T_EXTENDS name { $$.u.ast = $2.u.ast; } ; -interface_entry: - T_INTERFACE { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_INTERFACE; } +interface_extends_list: + /* empty */ { $$.u.ast = NULL; } + | T_EXTENDS name_list { $$.u.ast = $2.u.ast; } ; -/*interface_extends_list: - /* empty / - | T_EXTENDS interface_list -;*/ - implements_list: /* empty */ { $$.u.ast = NULL; } | T_IMPLEMENTS name_list { $$.u.ast = $2.u.ast; } @@ -936,13 +936,6 @@ class_name: | name { $$.u.ast = $1.u.ast; } ; -fully_qualified_class_name: - namespace_name { $$ = $1; } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { zval tmp; ZVAL_NEW_STR(&tmp, STR_ALLOC(Z_STRLEN($2.u.constant)+1, 0)); Z_STRVAL(tmp)[0] = '\\'; memcpy(Z_STRVAL(tmp) + 1, Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); if (Z_DELREF($2.u.constant) == 0) {efree(Z_STR($2.u.constant));} Z_STR($2.u.constant) = Z_STR(tmp); $$ = $2; } -; - - class_name_reference: class_name { $$.u.ast = $1.u.ast; } | new_variable { $$.u.ast = $1.u.ast; } -- cgit v1.2.1 From 18fd2a18979cbd41248c90467ab921d6dd49a989 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 17:34:00 +0200 Subject: Port __TRAIT__ and __CLASS__ to AST --- Zend/zend_compile.c | 24 ++++ Zend/zend_language_parser.y | 25 +--- Zend/zend_language_scanner.c | 307 ++++++++++++++++++++----------------------- Zend/zend_language_scanner.l | 17 --- 4 files changed, 176 insertions(+), 197 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 1ca4397668..10024d7394 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7377,6 +7377,30 @@ void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { ZVAL_EMPTY_STRING(zv); } break; + case T_CLASS_C: + if (ce) { + if (ZEND_CE_IS_TRAIT(ce)) { + zval const_zv; + ZVAL_STRING(&const_zv, "__CLASS__"); + zend_ast *const_ast = zend_ast_create_unary(ZEND_AST_CONST, + zend_ast_create_zval(&const_zv)); + zend_compile_const(result, const_ast TSRMLS_CC); + efree(const_ast); + zval_ptr_dtor(&const_zv); + } else { + ZVAL_STR(zv, STR_COPY(ce->name)); + } + } else { + ZVAL_EMPTY_STRING(zv); + } + break; + case T_TRAIT_C: + if (ce && ZEND_CE_IS_TRAIT(ce)) { + ZVAL_STR(zv, STR_COPY(ce->name)); + } else { + ZVAL_EMPTY_STRING(zv); + } + break; EMPTY_SWITCH_DEFAULT_CASE() } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index ca1d16cc12..08972aa55a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -248,7 +248,7 @@ name: top_statement: statement { AS($1); zend_verify_namespace(TSRMLS_C); } | function_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } - | class_declaration_statement { zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } + | class_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } | T_HALT_COMPILER '(' ')' ';' { zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } | T_NAMESPACE namespace_name ';' { zend_do_begin_namespace(&$2, 0 TSRMLS_CC); } | T_NAMESPACE namespace_name '{' { zend_do_begin_namespace(&$2, 1 TSRMLS_CC); } @@ -313,7 +313,7 @@ inner_statement_list: inner_statement: statement { $$.u.ast = $1.u.ast; } | function_declaration_statement { $$.u.ast = $1.u.ast; } - | class_declaration_statement { AN($$); } + | class_declaration_statement { $$.u.ast = $1.u.ast; } | T_HALT_COMPILER '(' ')' ';' { zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); } ; @@ -394,10 +394,6 @@ function_declaration_statement: Z_STR($3.u.constant), $5.u.ast, NULL, $8.u.ast); } ; -class_declaration_statement: - unticked_class_declaration_statement { DO_TICKS(); } -; - is_reference: /* empty */ { $$.op_type = 0; } | '&' { $$.op_type = ZEND_PARAM_REF; } @@ -408,19 +404,19 @@ is_variadic: | T_ELLIPSIS { $$.op_type = ZEND_PARAM_VARIADIC; } ; -unticked_class_declaration_statement: +class_declaration_statement: class_entry_type T_STRING extends_from implements_list { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } '{' class_statement_list '}' { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num, CG(zend_lineno), LANG_SCNG(yy_text), $5.u.op.ptr, - Z_STR($2.u.constant), $3.u.ast, $4.u.ast, $7.u.ast); AS($$); } + Z_STR($2.u.constant), $3.u.ast, $4.u.ast, $7.u.ast); } | interface_entry T_STRING interface_extends_list { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } '{' class_statement_list '}' { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num, CG(zend_lineno), LANG_SCNG(yy_text), $4.u.op.ptr, - Z_STR($2.u.constant), NULL, $3.u.ast, $6.u.ast); AS($$); } + Z_STR($2.u.constant), NULL, $3.u.ast, $6.u.ast); } ; @@ -978,18 +974,11 @@ scalar: | T_LINE { $$.u.ast = AST_ZVAL(&$1); } | T_FILE { $$.u.ast = AST_ZVAL(&$1); } | T_DIR { $$.u.ast = AST_ZVAL(&$1); } - | T_TRAIT_C { $$.u.ast = AST_ZVAL(&$1); } + | T_TRAIT_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_TRAIT_C); } | T_METHOD_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_METHOD_C); } | T_FUNC_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); } | T_NS_C { $$.u.ast = AST_ZVAL(&$1); } - | T_CLASS_C - { if (Z_TYPE($1.u.constant) == IS_UNDEF) { - zval class_const; ZVAL_STRING(&class_const, "__CLASS__"); - $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, - zend_ast_create_zval(&class_const)); - } else { - $$.u.ast = AST_ZVAL(&$1); - } } + | T_CLASS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_CLASS_C); } | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } | T_START_HEREDOC T_END_HEREDOC { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 4482d2132d..d6ef79aa48 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1115,7 +1115,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1743 "Zend/zend_language_scanner.l" +#line 1726 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1194,7 +1194,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1733 "Zend/zend_language_scanner.l" +#line 1716 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1211,7 +1211,7 @@ yy7: if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1714 "Zend/zend_language_scanner.l" +#line 1697 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1407,7 +1407,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1680 "Zend/zend_language_scanner.l" +#line 1663 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1449,7 +1449,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1696 "Zend/zend_language_scanner.l" +#line 1679 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1465,7 +1465,7 @@ yy45: ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1707 "Zend/zend_language_scanner.l" +#line 1690 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); @@ -1498,7 +1498,7 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1725 "Zend/zend_language_scanner.l" +#line 1708 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); @@ -1576,7 +1576,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2186 "Zend/zend_language_scanner.l" +#line 2169 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1628,7 +1628,7 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2130 "Zend/zend_language_scanner.l" +#line 2113 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; @@ -1643,7 +1643,7 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2117 "Zend/zend_language_scanner.l" +#line 2100 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1666,7 +1666,7 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1824 "Zend/zend_language_scanner.l" +#line 1807 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1696,7 +1696,7 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1817 "Zend/zend_language_scanner.l" +#line 1800 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1721,7 +1721,7 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1808 "Zend/zend_language_scanner.l" +#line 1791 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1796,7 +1796,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2136 "Zend/zend_language_scanner.l" +#line 2119 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1856,7 +1856,7 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2125 "Zend/zend_language_scanner.l" +#line 2108 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; @@ -1871,7 +1871,7 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2117 "Zend/zend_language_scanner.l" +#line 2100 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1894,7 +1894,7 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1824 "Zend/zend_language_scanner.l" +#line 1807 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1924,7 +1924,7 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1817 "Zend/zend_language_scanner.l" +#line 1800 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1949,7 +1949,7 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1808 "Zend/zend_language_scanner.l" +#line 1791 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1967,7 +1967,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2103 "Zend/zend_language_scanner.l" +#line 2086 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -2042,7 +2042,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2228 "Zend/zend_language_scanner.l" +#line 2211 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2130,7 +2130,7 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2117 "Zend/zend_language_scanner.l" +#line 2100 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -2153,7 +2153,7 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1824 "Zend/zend_language_scanner.l" +#line 1807 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -2183,7 +2183,7 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1817 "Zend/zend_language_scanner.l" +#line 1800 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -2208,7 +2208,7 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1808 "Zend/zend_language_scanner.l" +#line 1791 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -2398,7 +2398,7 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1846 "Zend/zend_language_scanner.l" +#line 1829 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; @@ -2996,7 +2996,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1852 "Zend/zend_language_scanner.l" +#line 1835 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3037,7 +3037,7 @@ yy178: yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1938 "Zend/zend_language_scanner.l" +#line 1921 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3112,7 +3112,7 @@ yy180: yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2007 "Zend/zend_language_scanner.l" +#line 1990 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3159,7 +3159,7 @@ yy182: ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2097 "Zend/zend_language_scanner.l" +#line 2080 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; @@ -3170,7 +3170,7 @@ yy184: ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2359 "Zend/zend_language_scanner.l" +#line 2342 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3370,7 +3370,7 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1919 "Zend/zend_language_scanner.l" +#line 1902 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); @@ -3410,7 +3410,7 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1824 "Zend/zend_language_scanner.l" +#line 1807 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -3505,7 +3505,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1926 "Zend/zend_language_scanner.l" +#line 1909 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3544,7 +3544,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1886 "Zend/zend_language_scanner.l" +#line 1869 "Zend/zend_language_scanner.l" { int doc_com; @@ -3872,7 +3872,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2049 "Zend/zend_language_scanner.l" +#line 2032 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -4167,7 +4167,7 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1671 "Zend/zend_language_scanner.l" +#line 1654 "Zend/zend_language_scanner.l" { if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { ZVAL_DUP(zendlval, &CG(current_namespace)); @@ -4196,7 +4196,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1646 "Zend/zend_language_scanner.l" +#line 1629 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4246,7 +4246,7 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1630 "Zend/zend_language_scanner.l" +#line 1613 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; @@ -4286,7 +4286,7 @@ yy336: } YYDEBUG(339, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1626 "Zend/zend_language_scanner.l" +#line 1609 "Zend/zend_language_scanner.l" { return T_METHOD_C; } @@ -4341,7 +4341,7 @@ yy347: } YYDEBUG(350, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1622 "Zend/zend_language_scanner.l" +#line 1605 "Zend/zend_language_scanner.l" { return T_FUNC_C; } @@ -4365,7 +4365,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1635 "Zend/zend_language_scanner.l" +#line 1618 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4406,17 +4406,11 @@ yy359: } YYDEBUG(362, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1612 "Zend/zend_language_scanner.l" +#line 1601 "Zend/zend_language_scanner.l" { - zend_class_entry *ce = CG(active_class_entry); - if (ce && ce->name && ZEND_ACC_TRAIT == (ce->ce_flags & ZEND_ACC_TRAIT)) { - ZVAL_STR(zendlval, STR_COPY(ce->name)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_TRAIT_C; } -#line 4420 "Zend/zend_language_scanner.c" +#line 4414 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4448,20 +4442,9 @@ yy366: yyleng = YYCURSOR - SCNG(yy_text); #line 1597 "Zend/zend_language_scanner.l" { - zend_class_entry *ce = CG(active_class_entry); - if (ce && ZEND_ACC_TRAIT == (ce->ce_flags & ZEND_ACC_TRAIT)) { - /* Signal that the __CLASS__ needs to be resolved at runtime */ - ZVAL_UNDEF(zendlval); - } else { - if (ce && ce->name) { - ZVAL_STR(zendlval, STR_COPY(ce->name)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } - } return T_CLASS_C; } -#line 4465 "Zend/zend_language_scanner.c" +#line 4448 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4527,7 +4510,7 @@ yy381: { return T_HALT_COMPILER; } -#line 4531 "Zend/zend_language_scanner.c" +#line 4514 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4551,7 +4534,7 @@ yy385: { return T_USE; } -#line 4555 "Zend/zend_language_scanner.c" +#line 4538 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4574,7 +4557,7 @@ yy389: { return T_UNSET; } -#line 4578 "Zend/zend_language_scanner.c" +#line 4561 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4750,7 +4733,7 @@ yy406: { return T_INT_CAST; } -#line 4754 "Zend/zend_language_scanner.c" +#line 4737 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4798,7 +4781,7 @@ yy414: { return T_DOUBLE_CAST; } -#line 4802 "Zend/zend_language_scanner.c" +#line 4785 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4872,7 +4855,7 @@ yy428: { return T_STRING_CAST; } -#line 4876 "Zend/zend_language_scanner.c" +#line 4859 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4909,7 +4892,7 @@ yy435: { return T_ARRAY_CAST; } -#line 4913 "Zend/zend_language_scanner.c" +#line 4896 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4951,7 +4934,7 @@ yy443: { return T_OBJECT_CAST; } -#line 4955 "Zend/zend_language_scanner.c" +#line 4938 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -4996,7 +4979,7 @@ yy452: { return T_BOOL_CAST; } -#line 5000 "Zend/zend_language_scanner.c" +#line 4983 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5060,7 +5043,7 @@ yy463: { return T_UNSET_CAST; } -#line 5064 "Zend/zend_language_scanner.c" +#line 5047 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5078,7 +5061,7 @@ yy468: { return T_VAR; } -#line 5082 "Zend/zend_language_scanner.c" +#line 5065 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5102,7 +5085,7 @@ yy472: { return T_NEW; } -#line 5106 "Zend/zend_language_scanner.c" +#line 5089 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5145,7 +5128,7 @@ yy480: { return T_NAMESPACE; } -#line 5149 "Zend/zend_language_scanner.c" +#line 5132 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5171,7 +5154,7 @@ yy484: { return T_CONCAT_EQUAL; } -#line 5175 "Zend/zend_language_scanner.c" +#line 5158 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5184,7 +5167,7 @@ yy486: { return T_ELLIPSIS; } -#line 5188 "Zend/zend_language_scanner.c" +#line 5171 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; @@ -5194,7 +5177,7 @@ yy489: { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5198 "Zend/zend_language_scanner.c" +#line 5181 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5220,7 +5203,7 @@ yy493: { return T_MINUS_EQUAL; } -#line 5224 "Zend/zend_language_scanner.c" +#line 5207 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; @@ -5230,7 +5213,7 @@ yy495: { return T_DEC; } -#line 5234 "Zend/zend_language_scanner.c" +#line 5217 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; @@ -5241,7 +5224,7 @@ yy497: yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5245 "Zend/zend_language_scanner.c" +#line 5228 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5290,7 +5273,7 @@ yy504: { return T_PUBLIC; } -#line 5294 "Zend/zend_language_scanner.c" +#line 5277 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5349,7 +5332,7 @@ yy513: { return T_PROTECTED; } -#line 5353 "Zend/zend_language_scanner.c" +#line 5336 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5383,7 +5366,7 @@ yy519: { return T_PRIVATE; } -#line 5387 "Zend/zend_language_scanner.c" +#line 5370 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5396,7 +5379,7 @@ yy521: { return T_PRINT; } -#line 5400 "Zend/zend_language_scanner.c" +#line 5383 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5425,7 +5408,7 @@ yy526: { return T_GOTO; } -#line 5429 "Zend/zend_language_scanner.c" +#line 5412 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5453,7 +5436,7 @@ yy531: { return T_GLOBAL; } -#line 5457 "Zend/zend_language_scanner.c" +#line 5440 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5494,7 +5477,7 @@ yy539: { return T_BREAK; } -#line 5498 "Zend/zend_language_scanner.c" +#line 5481 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5538,7 +5521,7 @@ yy547: { return T_SWITCH; } -#line 5542 "Zend/zend_language_scanner.c" +#line 5525 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5566,7 +5549,7 @@ yy552: { return T_STATIC; } -#line 5570 "Zend/zend_language_scanner.c" +#line 5553 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5597,7 +5580,7 @@ yy557: { return T_AS; } -#line 5601 "Zend/zend_language_scanner.c" +#line 5584 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5620,7 +5603,7 @@ yy561: { return T_ARRAY; } -#line 5624 "Zend/zend_language_scanner.c" +#line 5607 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5633,7 +5616,7 @@ yy563: { return T_LOGICAL_AND; } -#line 5637 "Zend/zend_language_scanner.c" +#line 5620 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5671,7 +5654,7 @@ yy570: { return T_ABSTRACT; } -#line 5675 "Zend/zend_language_scanner.c" +#line 5658 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5699,7 +5682,7 @@ yy575: { return T_WHILE; } -#line 5703 "Zend/zend_language_scanner.c" +#line 5686 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5712,7 +5695,7 @@ yy577: { return T_IF; } -#line 5716 "Zend/zend_language_scanner.c" +#line 5699 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5768,7 +5751,7 @@ yy584: { return T_ISSET; } -#line 5772 "Zend/zend_language_scanner.c" +#line 5755 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5826,7 +5809,7 @@ yy593: { return T_INCLUDE; } -#line 5830 "Zend/zend_language_scanner.c" +#line 5813 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5859,7 +5842,7 @@ yy598: { return T_INCLUDE_ONCE; } -#line 5863 "Zend/zend_language_scanner.c" +#line 5846 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5897,7 +5880,7 @@ yy605: { return T_INTERFACE; } -#line 5901 "Zend/zend_language_scanner.c" +#line 5884 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5951,7 +5934,7 @@ yy613: { return T_INSTEADOF; } -#line 5955 "Zend/zend_language_scanner.c" +#line 5938 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -5984,7 +5967,7 @@ yy619: { return T_INSTANCEOF; } -#line 5988 "Zend/zend_language_scanner.c" +#line 5971 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6032,7 +6015,7 @@ yy628: { return T_IMPLEMENTS; } -#line 6036 "Zend/zend_language_scanner.c" +#line 6019 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6064,7 +6047,7 @@ yy631: { return T_TRY; } -#line 6068 "Zend/zend_language_scanner.c" +#line 6051 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6087,7 +6070,7 @@ yy636: { return T_TRAIT; } -#line 6091 "Zend/zend_language_scanner.c" +#line 6074 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6110,7 +6093,7 @@ yy640: { return T_THROW; } -#line 6114 "Zend/zend_language_scanner.c" +#line 6097 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6138,7 +6121,7 @@ yy645: { return T_YIELD; } -#line 6142 "Zend/zend_language_scanner.c" +#line 6125 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6203,7 +6186,7 @@ yy654: { return T_REQUIRE; } -#line 6207 "Zend/zend_language_scanner.c" +#line 6190 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6236,7 +6219,7 @@ yy659: { return T_REQUIRE_ONCE; } -#line 6240 "Zend/zend_language_scanner.c" +#line 6223 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6259,7 +6242,7 @@ yy663: { return T_RETURN; } -#line 6263 "Zend/zend_language_scanner.c" +#line 6246 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6353,7 +6336,7 @@ yy674: { return T_CONTINUE; } -#line 6357 "Zend/zend_language_scanner.c" +#line 6340 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6366,7 +6349,7 @@ yy676: { return T_CONST; } -#line 6370 "Zend/zend_language_scanner.c" +#line 6353 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6395,7 +6378,7 @@ yy681: { return T_CLONE; } -#line 6399 "Zend/zend_language_scanner.c" +#line 6382 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6413,7 +6396,7 @@ yy684: { return T_CLASS; } -#line 6417 "Zend/zend_language_scanner.c" +#line 6400 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6463,7 +6446,7 @@ yy693: { return T_CALLABLE; } -#line 6467 "Zend/zend_language_scanner.c" +#line 6450 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6476,7 +6459,7 @@ yy695: { return T_CASE; } -#line 6480 "Zend/zend_language_scanner.c" +#line 6463 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6494,7 +6477,7 @@ yy698: { return T_CATCH; } -#line 6498 "Zend/zend_language_scanner.c" +#line 6481 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6549,7 +6532,7 @@ yy708: { return T_FUNCTION; } -#line 6553 "Zend/zend_language_scanner.c" +#line 6536 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6577,7 +6560,7 @@ yy711: { return T_FOR; } -#line 6581 "Zend/zend_language_scanner.c" +#line 6564 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6605,7 +6588,7 @@ yy715: { return T_FOREACH; } -#line 6609 "Zend/zend_language_scanner.c" +#line 6592 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6643,7 +6626,7 @@ yy720: { return T_FINAL; } -#line 6647 "Zend/zend_language_scanner.c" +#line 6630 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6661,7 +6644,7 @@ yy722: { return T_FINALLY; } -#line 6665 "Zend/zend_language_scanner.c" +#line 6648 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6696,7 +6679,7 @@ yy726: { return T_DO; } -#line 6700 "Zend/zend_language_scanner.c" +#line 6683 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6709,7 +6692,7 @@ yy728: { return T_EXIT; } -#line 6713 "Zend/zend_language_scanner.c" +#line 6696 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6748,7 +6731,7 @@ yy735: { return T_DEFAULT; } -#line 6752 "Zend/zend_language_scanner.c" +#line 6735 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6776,7 +6759,7 @@ yy740: { return T_DECLARE; } -#line 6780 "Zend/zend_language_scanner.c" +#line 6763 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6860,7 +6843,7 @@ yy753: { return T_EXTENDS; } -#line 6864 "Zend/zend_language_scanner.c" +#line 6847 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6873,7 +6856,7 @@ yy755: { return T_EXIT; } -#line 6877 "Zend/zend_language_scanner.c" +#line 6860 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6891,7 +6874,7 @@ yy758: { return T_EVAL; } -#line 6895 "Zend/zend_language_scanner.c" +#line 6878 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6965,7 +6948,7 @@ yy769: { return T_ENDWHILE; } -#line 6969 "Zend/zend_language_scanner.c" +#line 6952 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -6998,7 +6981,7 @@ yy775: { return T_ENDSWITCH; } -#line 7002 "Zend/zend_language_scanner.c" +#line 6985 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -7011,7 +6994,7 @@ yy777: { return T_ENDIF; } -#line 7015 "Zend/zend_language_scanner.c" +#line 6998 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7044,7 +7027,7 @@ yy781: { return T_ENDFOR; } -#line 7048 "Zend/zend_language_scanner.c" +#line 7031 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7072,7 +7055,7 @@ yy785: { return T_ENDFOREACH; } -#line 7076 "Zend/zend_language_scanner.c" +#line 7059 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7110,7 +7093,7 @@ yy792: { return T_ENDDECLARE; } -#line 7114 "Zend/zend_language_scanner.c" +#line 7097 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7133,7 +7116,7 @@ yy796: { return T_EMPTY; } -#line 7137 "Zend/zend_language_scanner.c" +#line 7120 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7166,7 +7149,7 @@ yy800: { return T_ELSE; } -#line 7170 "Zend/zend_language_scanner.c" +#line 7153 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7184,7 +7167,7 @@ yy802: { return T_ELSEIF; } -#line 7188 "Zend/zend_language_scanner.c" +#line 7171 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7202,7 +7185,7 @@ yy805: { return T_ECHO; } -#line 7206 "Zend/zend_language_scanner.c" +#line 7189 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7281,7 +7264,7 @@ yy810: HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7285 "Zend/zend_language_scanner.c" +#line 7268 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7295,7 +7278,7 @@ yy812: yy_pop_state(TSRMLS_C); goto restart; } -#line 7299 "Zend/zend_language_scanner.c" +#line 7282 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7310,7 +7293,7 @@ yy814: zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7314 "Zend/zend_language_scanner.c" +#line 7297 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7335,7 +7318,7 @@ yy818: { return T_OBJECT_OPERATOR; } -#line 7339 "Zend/zend_language_scanner.c" +#line 7322 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7427,7 +7410,7 @@ yy825: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7431 "Zend/zend_language_scanner.c" +#line 7414 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7460,7 +7443,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7464 "Zend/zend_language_scanner.c" +#line 7447 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7471,7 +7454,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2302 "Zend/zend_language_scanner.l" +#line 2285 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7527,7 +7510,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7531 "Zend/zend_language_scanner.c" +#line 7514 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7643,7 +7626,7 @@ yy839: } return T_NUM_STRING; } -#line 7647 "Zend/zend_language_scanner.c" +#line 7630 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7663,23 +7646,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1834 "Zend/zend_language_scanner.l" +#line 1817 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7672 "Zend/zend_language_scanner.c" +#line 7655 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1829 "Zend/zend_language_scanner.l" +#line 1812 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7683 "Zend/zend_language_scanner.c" +#line 7666 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7689,14 +7672,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1839 "Zend/zend_language_scanner.l" +#line 1822 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7700 "Zend/zend_language_scanner.c" +#line 7683 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7705,18 +7688,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1846 "Zend/zend_language_scanner.l" +#line 1829 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7714 "Zend/zend_language_scanner.c" +#line 7697 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2359 "Zend/zend_language_scanner.l" +#line 2342 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7725,7 +7708,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7729 "Zend/zend_language_scanner.c" +#line 7712 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7761,12 +7744,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1824 "Zend/zend_language_scanner.l" +#line 1807 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7770 "Zend/zend_language_scanner.c" +#line 7753 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7811,7 +7794,7 @@ yy864: ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7815 "Zend/zend_language_scanner.c" +#line 7798 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7834,6 +7817,6 @@ yy867: goto yy864; } } -#line 2368 "Zend/zend_language_scanner.l" +#line 2351 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 17d58c240d..4a4dc48f6e 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1595,27 +1595,10 @@ NEWLINE ("\r"|"\n"|"\r\n") } "__CLASS__" { - zend_class_entry *ce = CG(active_class_entry); - if (ce && ZEND_ACC_TRAIT == (ce->ce_flags & ZEND_ACC_TRAIT)) { - /* Signal that the __CLASS__ needs to be resolved at runtime */ - ZVAL_UNDEF(zendlval); - } else { - if (ce && ce->name) { - ZVAL_STR(zendlval, STR_COPY(ce->name)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } - } return T_CLASS_C; } "__TRAIT__" { - zend_class_entry *ce = CG(active_class_entry); - if (ce && ce->name && ZEND_ACC_TRAIT == (ce->ce_flags & ZEND_ACC_TRAIT)) { - ZVAL_STR(zendlval, STR_COPY(ce->name)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_TRAIT_C; } -- cgit v1.2.1 From df970e9fc20fa720298d478fd652f1785623793b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 18:02:31 +0200 Subject: Pre-evaluate magic constants --- Zend/zend_ast.c | 3 +-- Zend/zend_compile.c | 47 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index aea1c81740..a528dc3767 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -321,7 +321,7 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) zend_ast *copy = zend_ast_create_zval_ex(zend_ast_get_zval(ast), ast->attr); zval_copy_ctor(zend_ast_get_zval(copy)); return copy; - } else if (ast->children) { + } else { zend_ast *new = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children - 1)); int i; new->kind = ast->kind; @@ -332,7 +332,6 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) } return new; } - return zend_ast_create_dynamic(ast->kind); } ZEND_API void zend_ast_destroy(zend_ast *ast) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 10024d7394..90316aa167 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7349,11 +7349,9 @@ void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { } } -void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { +zend_bool zend_try_ct_compile_magic_const(zval *zv, zend_ast *ast TSRMLS_DC) { zend_op_array *op_array = CG(active_op_array); zend_class_entry *ce = CG(active_class_entry); - zval *zv = &result->u.constant; - result->op_type = IS_CONST; switch (ast->attr) { case T_FUNC_C: @@ -7380,13 +7378,7 @@ void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { case T_CLASS_C: if (ce) { if (ZEND_CE_IS_TRAIT(ce)) { - zval const_zv; - ZVAL_STRING(&const_zv, "__CLASS__"); - zend_ast *const_ast = zend_ast_create_unary(ZEND_AST_CONST, - zend_ast_create_zval(&const_zv)); - zend_compile_const(result, const_ast TSRMLS_CC); - efree(const_ast); - zval_ptr_dtor(&const_zv); + return 0; } else { ZVAL_STR(zv, STR_COPY(ce->name)); } @@ -7403,6 +7395,28 @@ void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { break; EMPTY_SWITCH_DEFAULT_CASE() } + + return 1; +} + +void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { + zend_class_entry *ce = CG(active_class_entry); + + if (zend_try_ct_compile_magic_const(&result->u.constant, ast TSRMLS_CC)) { + result->op_type = IS_CONST; + return; + } + + 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_unary(ZEND_AST_CONST, + zend_ast_create_zval(&const_zv)); + zend_compile_const(result, const_ast TSRMLS_CC); + zend_ast_destroy(const_ast); + } } zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { @@ -7912,6 +7926,16 @@ void zend_eval_const_array(zend_ast **ast_ptr TSRMLS_DC) { *ast_ptr = zend_ast_create_zval(&array); } +void zend_eval_const_magic_const(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + zval result; + + if (zend_try_ct_compile_magic_const(&result, ast TSRMLS_CC)) { + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_zval(&result); + } +} + void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; if (!ast || ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_ZNODE) { @@ -7940,6 +7964,9 @@ void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { case ZEND_AST_ARRAY: zend_eval_const_array(ast_ptr TSRMLS_CC); break; + case ZEND_AST_MAGIC_CONST: + zend_eval_const_magic_const(ast_ptr TSRMLS_CC); + break; } } -- cgit v1.2.1 From 61a6083e99c4f0d836f9488985a35e63a735d703 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 18:15:09 +0200 Subject: Fix some remaining class declaration issues --- Zend/tests/bug44414.phpt | 2 +- Zend/zend_compile.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Zend/tests/bug44414.phpt b/Zend/tests/bug44414.phpt index 1f3a2583d7..e9e6de7b45 100644 --- a/Zend/tests/bug44414.phpt +++ b/Zend/tests/bug44414.phpt @@ -12,4 +12,4 @@ class C extends A implements B { } ?> --EXPECTF-- -Fatal error: Class C contains 2 abstract methods and must therefore be declared abstract or implement the remaining methods (A::foo, B::bar) in %sbug44414.php on line 9 +Fatal error: Class C contains 2 abstract methods and must therefore be declared abstract or implement the remaining methods (A::foo, B::bar) in %sbug44414.php on line 8 diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 90316aa167..5139a11a31 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6673,8 +6673,9 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { } if (!zend_is_const_default_class_ref(extends_ast)) { + zend_string *extends_name = Z_STR_P(zend_ast_get_zval(extends_ast)); zend_error_noreturn(E_COMPILE_ERROR, - "Cannot use '%s' as class name as it is reserved", name->val); + "Cannot use '%s' as class name as it is reserved", extends_name->val); } zend_compile_class_ref(&extends_node, extends_ast TSRMLS_CC); @@ -6715,7 +6716,27 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { zend_compile_stmt(stmt_ast TSRMLS_CC); - // TODO.AST validity checks + if (ce->constructor) { + ce->constructor->common.fn_flags |= ZEND_ACC_CTOR; + if (ce->constructor->common.fn_flags & ZEND_ACC_STATIC) { + zend_error_noreturn(E_COMPILE_ERROR, "Constructor %s::%s() cannot be static", + ce->name->val, ce->constructor->common.function_name->val); + } + } + if (ce->destructor) { + ce->destructor->common.fn_flags |= ZEND_ACC_DTOR; + if (ce->destructor->common.fn_flags & ZEND_ACC_STATIC) { + zend_error_noreturn(E_COMPILE_ERROR, "Destructor %s::%s() cannot be static", + ce->name->val, ce->destructor->common.function_name->val); + } + } + if (ce->clone) { + ce->clone->common.fn_flags |= ZEND_ACC_CLONE; + if (ce->clone->common.fn_flags & ZEND_ACC_STATIC) { + zend_error_noreturn(E_COMPILE_ERROR, "Clone method %s::%s() cannot be static", + ce->name->val, ce->clone->common.function_name->val); + } + } /* Check for traits and proceed like with interfaces. * The only difference will be a combined handling of them in the end. -- cgit v1.2.1 From f8ce5e6efc427fddb7f38a2288667825bb5fe9d2 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 18:21:13 +0200 Subject: Handle const expr __CLASS__ in trait --- Zend/zend_compile.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 5139a11a31..a1ad07fc00 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7553,6 +7553,23 @@ void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { *ast_ptr = zend_ast_create_zval(&result); } +void zend_compile_const_expr_magic_const(zend_ast **ast_ptr TSRMLS_DC) { + zend_ast *ast = *ast_ptr; + zend_class_entry *ce = CG(active_class_entry); + + /* Other cases already resolved by constant folding */ + ZEND_ASSERT(ast->attr == T_CLASS_C && ce && ZEND_CE_IS_TRAIT(ce)); + + { + zval const_zv; + ZVAL_STRING(&const_zv, "__CLASS__"); + Z_TYPE_INFO(const_zv) = IS_CONSTANT_EX; + + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_zval(&const_zv); + } +} + void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; if (ast == NULL || ast->kind == ZEND_AST_ZVAL) { @@ -7580,6 +7597,9 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { case ZEND_AST_RESOLVE_CLASS_NAME: zend_compile_const_expr_resolve_class_name(ast_ptr TSRMLS_CC); break; + case ZEND_AST_MAGIC_CONST: + zend_compile_const_expr_magic_const(ast_ptr TSRMLS_CC); + break; } } -- cgit v1.2.1 From 6c6dd84c509ec24b18e76e0ed00d41a552335b69 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 18:24:10 +0200 Subject: Dead code --- Zend/zend_compile.c | 283 ---------------------------------------------------- Zend/zend_compile.h | 6 -- 2 files changed, 289 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a1ad07fc00..062097872f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2943,119 +2943,6 @@ ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS } /* }}} */ -void zend_do_begin_class_declaration(const znode *class_token, znode *class_name, const znode *parent_class_name TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - int doing_inheritance = 0; - zend_class_entry *new_class_entry; - zend_string *lcname; - int error = 0; - zend_string *ns_name; - zval key; - - if (CG(active_class_entry)) { - zend_error_noreturn(E_COMPILE_ERROR, "Class declarations may not be nested"); - return; - } - - lcname = STR_ALLOC(Z_STRLEN(class_name->u.constant), 0); - zend_str_tolower_copy(lcname->val, Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant)); - - if (!(strcmp(lcname->val, "self") && strcmp(lcname->val, "parent"))) { - STR_FREE(lcname); - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", Z_STRVAL(class_name->u.constant)); - } - - /* Class name must not conflict with import names */ - if (CG(current_import) && - (ns_name = zend_hash_find_ptr(CG(current_import), lcname)) != NULL) { - error = 1; - } - - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - /* Prefix class name with name of current namespace */ - znode tmp; - - tmp.op_type = IS_CONST; - ZVAL_DUP(&tmp.u.constant, &CG(current_namespace)); - zend_do_build_namespace_name(&tmp, &tmp, class_name TSRMLS_CC); - *class_name = tmp; - STR_FREE(lcname); - lcname = STR_ALLOC(Z_STRLEN(class_name->u.constant), 0); - zend_str_tolower_copy(lcname->val, Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant)); - } - - if (error) { - char *tmp = zend_str_tolower_dup(ns_name->val, ns_name->len); - - if (ns_name->len != Z_STRLEN(class_name->u.constant) || - memcmp(tmp, lcname->val, Z_STRLEN(class_name->u.constant))) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare class %s because the name is already in use", Z_STRVAL(class_name->u.constant)); - } - efree(tmp); - } - - new_class_entry = emalloc(sizeof(zend_class_entry)); - new_class_entry->type = ZEND_USER_CLASS; - new_class_entry->name = zend_new_interned_string(Z_STR(class_name->u.constant) TSRMLS_CC); - - zend_initialize_class_data(new_class_entry, 1 TSRMLS_CC); - new_class_entry->info.user.filename = zend_get_compiled_filename(TSRMLS_C); - new_class_entry->info.user.line_start = class_token->u.op.opline_num; - new_class_entry->ce_flags |= class_token->EA; - - if (parent_class_name && parent_class_name->op_type != IS_UNUSED) { - switch (parent_class_name->EA) { - case ZEND_FETCH_CLASS_SELF: - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use 'self' as class name as it is reserved"); - break; - case ZEND_FETCH_CLASS_PARENT: - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use 'parent' as class name as it is reserved"); - break; - case ZEND_FETCH_CLASS_STATIC: - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use 'static' as class name as it is reserved"); - break; - default: - break; - } - doing_inheritance = 1; - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->op1_type = IS_CONST; - build_runtime_defined_function_key(&key, lcname, LANG_SCNG(yy_text) TSRMLS_CC); - opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); - - opline->op2_type = IS_CONST; - - if (doing_inheritance) { - /* Make sure a trait does not try to extend a class */ - if ((new_class_entry->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) { - zend_error_noreturn(E_COMPILE_ERROR, "A trait (%s) cannot extend a class. Traits can only be composed from other traits with the 'use' keyword. Error", new_class_entry->name->val); - } - - opline->extended_value = parent_class_name->u.op.var; - opline->opcode = ZEND_DECLARE_INHERITED_CLASS; - } else { - opline->opcode = ZEND_DECLARE_CLASS; - } - - LITERAL_STR(opline->op2, lcname); - - zend_hash_update_ptr(CG(class_table), Z_STR(key), new_class_entry); - CG(active_class_entry) = new_class_entry; - - opline->result.var = get_temporary_variable(CG(active_op_array)); - opline->result_type = IS_VAR; - GET_NODE(&CG(implementing_class), opline->result); - - if (CG(doc_comment)) { - CG(active_class_entry)->info.user.doc_comment = CG(doc_comment); - CG(doc_comment) = NULL; - } -} -/* }}} */ - static void do_verify_abstract_class(TSRMLS_D) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -3066,100 +2953,6 @@ static void do_verify_abstract_class(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_do_end_class_declaration(const znode *class_token, const znode *parent_token TSRMLS_DC) /* {{{ */ -{ - zend_class_entry *ce = CG(active_class_entry); - - if (ce->constructor) { - ce->constructor->common.fn_flags |= ZEND_ACC_CTOR; - if (ce->constructor->common.fn_flags & ZEND_ACC_STATIC) { - zend_error_noreturn(E_COMPILE_ERROR, "Constructor %s::%s() cannot be static", ce->name->val, ce->constructor->common.function_name->val); - } - } - if (ce->destructor) { - ce->destructor->common.fn_flags |= ZEND_ACC_DTOR; - if (ce->destructor->common.fn_flags & ZEND_ACC_STATIC) { - zend_error_noreturn(E_COMPILE_ERROR, "Destructor %s::%s() cannot be static", ce->name->val, ce->destructor->common.function_name->val); - } - } - if (ce->clone) { - ce->clone->common.fn_flags |= ZEND_ACC_CLONE; - if (ce->clone->common.fn_flags & ZEND_ACC_STATIC) { - zend_error_noreturn(E_COMPILE_ERROR, "Clone method %s::%s() cannot be static", ce->name->val, ce->clone->common.function_name->val); - } - } - - ce->info.user.line_end = zend_get_compiled_lineno(TSRMLS_C); - - /* Check for traits and proceed like with interfaces. - * The only difference will be a combined handling of them in the end. - * Thus, we need another opcode here. */ - if (ce->num_traits > 0) { - zend_op *opline; - - ce->traits = NULL; - ce->num_traits = 0; - ce->ce_flags |= ZEND_ACC_IMPLEMENT_TRAITS; - - /* opcode generation: */ - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_BIND_TRAITS; - SET_NODE(opline->op1, &CG(implementing_class)); - } - - if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) - && (parent_token || (ce->num_interfaces > 0))) { - zend_verify_abstract_class(ce TSRMLS_CC); - if (ce->num_interfaces && !(ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS)) { - do_verify_abstract_class(TSRMLS_C); - } - } - /* Inherit interfaces; reset number to zero, we need it for above check and - * will restore it during actual implementation. - * The ZEND_ACC_IMPLEMENT_INTERFACES flag disables double call to - * zend_verify_abstract_class() */ - if (ce->num_interfaces > 0) { - ce->interfaces = NULL; - ce->num_interfaces = 0; - ce->ce_flags |= ZEND_ACC_IMPLEMENT_INTERFACES; - } - - CG(active_class_entry) = NULL; -} -/* }}} */ - -void zend_do_implements_interface(znode *interface_name TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - - /* Traits can not implement interfaces */ - if ((CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as interface on '%s' since it is a Trait", - Z_STRVAL(interface_name->u.constant), - CG(active_class_entry)->name->val); - } - - switch (zend_get_class_fetch_type(Z_STRVAL(interface_name->u.constant), Z_STRLEN(interface_name->u.constant))) { - case ZEND_FETCH_CLASS_SELF: - case ZEND_FETCH_CLASS_PARENT: - case ZEND_FETCH_CLASS_STATIC: - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as interface name as it is reserved", Z_STRVAL(interface_name->u.constant)); - break; - default: - break; - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_ADD_INTERFACE; - SET_NODE(opline->op1, &CG(implementing_class)); - zend_resolve_class_name_old(interface_name TSRMLS_CC); - opline->extended_value = (opline->extended_value & ~ZEND_FETCH_CLASS_MASK) | ZEND_FETCH_CLASS_INTERFACE; - opline->op2_type = IS_CONST; - opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), Z_STR(interface_name->u.constant) TSRMLS_CC); - CG(active_class_entry)->num_interfaces++; -} -/* }}} */ - ZEND_API zend_string *zend_mangle_property_name(const char *src1, int src1_length, const char *src2, int src2_length, int internal) /* {{{ */ { zend_string *prop_name; @@ -3222,82 +3015,6 @@ ZEND_API int zend_unmangle_property_name_ex(const char *mangled_property, int le } /* }}} */ -void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC) /* {{{ */ -{ - zval property; - zend_property_info *existing_property_info; - zend_string *comment = NULL; - - if (CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE) { - zend_error_noreturn(E_COMPILE_ERROR, "Interfaces may not include member variables"); - } - - if (access_type & ZEND_ACC_ABSTRACT) { - zend_error_noreturn(E_COMPILE_ERROR, "Properties cannot be declared abstract"); - } - - if (access_type & ZEND_ACC_FINAL) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare property %s::$%s final, the final modifier is allowed only for methods and classes", - CG(active_class_entry)->name->val, Z_STRVAL(var_name->u.constant)); - } - - if ((existing_property_info = zend_hash_find_ptr(&CG(active_class_entry)->properties_info, Z_STR(var_name->u.constant))) != NULL) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare %s::$%s", CG(active_class_entry)->name->val, Z_STRVAL(var_name->u.constant)); - } - - if (value) { - ZVAL_COPY_VALUE(&property, &value->u.constant); - } else { - ZVAL_NULL(&property); - } - - if (CG(doc_comment)) { - comment = CG(doc_comment); - CG(doc_comment) = NULL; - } - - Z_STR(var_name->u.constant) = zend_new_interned_string(Z_STR(var_name->u.constant) TSRMLS_CC); - if (IS_INTERNED(Z_STR(var_name->u.constant))) { - Z_TYPE_FLAGS(var_name->u.constant) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); - } - zend_declare_property_ex(CG(active_class_entry), Z_STR(var_name->u.constant), &property, access_type, comment TSRMLS_CC); - STR_RELEASE(Z_STR(var_name->u.constant)); -} -/* }}} */ - -void zend_do_declare_class_constant(znode *var_name, znode *value TSRMLS_DC) /* {{{ */ -{ - zval property; - - 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 in class constants"); - return; - } - if ((CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) { - zend_error_noreturn(E_COMPILE_ERROR, "Traits cannot have constants"); - return; - } - - ZVAL_COPY_VALUE(&property, &value->u.constant); - - Z_STR(var_name->u.constant) = zend_new_interned_string(Z_STR(var_name->u.constant) TSRMLS_CC); - if (IS_INTERNED(Z_STR(var_name->u.constant))) { - Z_TYPE_FLAGS(var_name->u.constant) &= ~ (IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE); - } - if (zend_hash_add(&CG(active_class_entry)->constants_table, Z_STR(var_name->u.constant), &property) == NULL) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", CG(active_class_entry)->name->val, Z_STRVAL(var_name->u.constant)); - } - FREE_PNODE(var_name); - - if (CG(doc_comment)) { - STR_RELEASE(CG(doc_comment)); - CG(doc_comment) = NULL; - } -} -/* }}} */ - void zend_do_halt_compiler_register(TSRMLS_D) /* {{{ */ { zend_string *name; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 382535be33..d602893e1d 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -493,7 +493,6 @@ ZEND_API zend_class_entry *do_bind_class(const zend_op_array *op_array, const ze ZEND_API zend_class_entry *do_bind_inherited_class(const zend_op_array *op_array, const zend_op *opline, HashTable *class_table, zend_class_entry *parent_ce, zend_bool compile_time TSRMLS_DC); ZEND_API void zend_do_inherit_interfaces(zend_class_entry *ce, const zend_class_entry *iface TSRMLS_DC); ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface TSRMLS_DC); -void zend_do_implements_interface(znode *interface_znode TSRMLS_DC); ZEND_API void zend_do_implement_trait(zend_class_entry *ce, zend_class_entry *trait TSRMLS_DC); ZEND_API void zend_do_bind_traits(zend_class_entry *ce TSRMLS_DC); @@ -502,11 +501,6 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent void zend_do_early_binding(TSRMLS_D); ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS_DC); -void zend_do_begin_class_declaration(const znode *class_token, znode *class_name, const znode *parent_class_name TSRMLS_DC); -void zend_do_end_class_declaration(const znode *class_token, const znode *parent_token TSRMLS_DC); -void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC); -void zend_do_declare_class_constant(znode *var_name, znode *value TSRMLS_DC); - void zend_do_halt_compiler_register(TSRMLS_D); /* Functions for a null terminated pointer list, used for traits parsing and compilation */ -- cgit v1.2.1 From 94d5d7d01b91a2f033dfccbcbf5d227a3ea35f39 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 18:25:46 +0200 Subject: Remove one usage of implementing_class --- Zend/zend_compile.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 062097872f..970a0c7e13 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2943,16 +2943,6 @@ ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS } /* }}} */ -static void do_verify_abstract_class(TSRMLS_D) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_VERIFY_ABSTRACT_CLASS; - SET_NODE(opline->op1, &CG(implementing_class)); - SET_UNUSED(opline->op2); -} -/* }}} */ - ZEND_API zend_string *zend_mangle_property_name(const char *src1, int src1_length, const char *src2, int src2_length, int internal) /* {{{ */ { zend_string *prop_name; @@ -6471,7 +6461,7 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { ) { zend_verify_abstract_class(ce TSRMLS_CC); if (ce->num_interfaces && !(ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS)) { - do_verify_abstract_class(TSRMLS_C); + emit_op(NULL, ZEND_VERIFY_ABSTRACT_CLASS, &declare_node, NULL TSRMLS_CC); } } -- cgit v1.2.1 From c60cd3e8eff747f7538328363dfc1d1877298dd1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 18:47:03 +0200 Subject: Remove __clone test (not reason it should error) --- Zend/tests/errmsg_014.phpt | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Zend/tests/errmsg_014.phpt diff --git a/Zend/tests/errmsg_014.phpt b/Zend/tests/errmsg_014.phpt deleted file mode 100644 index 77e12b05e9..0000000000 --- a/Zend/tests/errmsg_014.phpt +++ /dev/null @@ -1,17 +0,0 @@ ---TEST-- -errmsg: cannot call __clone() method on objects ---FILE-- -__clone(); - -echo "Done\n"; -?> ---EXPECTF-- -Fatal error: Cannot call __clone() method on objects - use 'clone $obj' instead in %s on line %d -- cgit v1.2.1 From 37ac1b96ed1a553e5de78401f8024372d7207e37 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 22:49:31 +0200 Subject: Port use statement --- Zend/zend_ast.h | 3 ++ Zend/zend_compile.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ Zend/zend_language_parser.y | 16 +++++--- 3 files changed, 112 insertions(+), 5 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 784e43adec..c89b4af03c 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -118,6 +118,9 @@ enum _zend_ast_kind { ZEND_AST_METHOD_REFERENCE, ZEND_AST_CLASS, + + ZEND_AST_USE, + ZEND_AST_USE_ELEM, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 970a0c7e13..dccdf7f380 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -916,6 +916,10 @@ static void ptr_dtor(zval *zv) /* {{{ */ } /* }}} */ +static void str_dtor(zval *zv) { + STR_RELEASE(Z_STR_P(zv)); +} + void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC) /* {{{ */ { zend_label *dest; @@ -6478,6 +6482,97 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { CG(active_class_entry) = NULL; } +void zend_compile_use(zend_ast *ast TSRMLS_DC) { + zend_uint i; + zend_string *current_ns = Z_TYPE(CG(current_namespace)) != IS_UNDEF + ? Z_STR(CG(current_namespace)) : NULL; + + for (i = 0; i < ast->children; ++i) { + zend_ast *use_ast = ast->child[i]; + zend_ast *old_name_ast = use_ast->child[0]; + zend_ast *new_name_ast = use_ast->child[1]; + zend_string *old_name = Z_STR_P(zend_ast_get_zval(old_name_ast)); + zend_string *new_name, *lcname; + zend_class_entry *ce; + + if (new_name_ast) { + new_name = STR_COPY(Z_STR_P(zend_ast_get_zval(new_name_ast))); + } else { + /* The form "use A\B" is eqivalent to "use A\B as B" */ + const char *p = zend_memrchr(old_name->val, '\\', old_name->len); + if (p) { + new_name = STR_INIT(p + 1, old_name->len - (p - old_name->val + 1), 0); + } else { + new_name = STR_COPY(old_name); + + if (!current_ns) { + if (zend_str_equals(new_name, "strict")) { + zend_error_noreturn(E_COMPILE_ERROR, + "You seem to be trying to use a different language..."); + } + + zend_error(E_WARNING, "The use statement with non-compound name '%s' " + "has no effect", new_name->val); + } + } + } + + lcname = STR_ALLOC(new_name->len, 0); + zend_str_tolower_copy(lcname->val, new_name->val, new_name->len); + + if (zend_str_equals(lcname, "self") || zend_str_equals(lcname, "parent")) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because '%s' " + "is a special class name", old_name->val, new_name->val, new_name->val); + } + + if (current_ns) { + zend_string *ns_name = STR_ALLOC(current_ns->len + 1 + new_name->len, 0); + zend_str_tolower_copy(ns_name->val, current_ns->val, current_ns->len); + ns_name->val[current_ns->len] = '\\'; + memcpy(ns_name->val + current_ns->len + 1, lcname->val, lcname->len); + + if (zend_hash_exists(CG(class_table), ns_name)) { + char *tmp = zend_str_tolower_dup(old_name->val, old_name->len); + + if (old_name->len != ns_name->len || memcmp(tmp, ns_name->val, ns_name->len)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because the name " + "is already in use", old_name->val, new_name->val); + } + + efree(tmp); + } + + STR_FREE(ns_name); + } else if ((ce = zend_hash_find_ptr(CG(class_table), lcname)) + && ce->type == ZEND_USER_CLASS + && ce->info.user.filename == CG(compiled_filename) + ) { + char *tmp = zend_str_tolower_dup(old_name->val, old_name->len); + + if (old_name->len != lcname->len || memcmp(tmp, lcname->val, lcname->len)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because the name " + "is already in use", old_name->val, new_name->val); + } + + efree(tmp); + } + + if (!CG(current_import)) { + CG(current_import) = emalloc(sizeof(HashTable)); + zend_hash_init(CG(current_import), 8, NULL, str_dtor, 0); + } + + STR_ADDREF(old_name); + if (!zend_hash_add_ptr(CG(current_import), lcname, old_name)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because the name " + "is already in use", old_name->val, new_name->val); + } + + STR_RELEASE(lcname); + STR_RELEASE(new_name); + } +} + 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]; @@ -7388,6 +7483,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_CLASS: zend_compile_class_decl(ast TSRMLS_CC); break; + case ZEND_AST_USE: + zend_compile_use(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 08972aa55a..f4bfd7b106 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -255,7 +255,7 @@ top_statement: top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } | T_NAMESPACE '{' { zend_do_begin_namespace(NULL, 1 TSRMLS_CC); } top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } - | T_USE use_declarations ';' { zend_verify_namespace(TSRMLS_C); } + | T_USE use_declarations ';' { AS($2); zend_verify_namespace(TSRMLS_C); } | T_USE T_FUNCTION use_function_declarations ';' { zend_verify_namespace(TSRMLS_C); } | T_USE T_CONST use_const_declarations ';' { zend_verify_namespace(TSRMLS_C); } | constant_declaration ';' { zend_verify_namespace(TSRMLS_C); } @@ -263,14 +263,20 @@ top_statement: use_declarations: use_declarations ',' use_declaration + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } | use_declaration + { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_USE, $1.u.ast); } ; use_declaration: - namespace_name { zend_do_use(&$1, NULL, 0 TSRMLS_CC); } - | namespace_name T_AS T_STRING { zend_do_use(&$1, &$3, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { zend_do_use(&$2, NULL, 1 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use(&$2, &$4, 1 TSRMLS_CC); } + namespace_name + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$1), NULL); } + | namespace_name T_AS T_STRING + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$1), AST_ZVAL(&$3)); } + | T_NS_SEPARATOR namespace_name + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), NULL); } + | T_NS_SEPARATOR namespace_name T_AS T_STRING + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), AST_ZVAL(&$4)); } ; use_function_declarations: -- cgit v1.2.1 From 573d25b5e7c2c9a9524efed33ce135ae3d9ad82a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 22:58:38 +0200 Subject: Drop dead code --- Zend/zend_compile.c | 83 ----------------------------------------------------- Zend/zend_compile.h | 1 - 2 files changed, 84 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index dccdf7f380..bb967b9cb3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3548,89 +3548,6 @@ void zend_do_begin_namespace(znode *name, zend_bool with_bracket TSRMLS_DC) /* { } /* }}} */ -void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */ -{ - zend_string *lcname; - zval *name, ns, tmp; - zend_bool warn = 0; - zend_class_entry *ce; - - if (!CG(current_import)) { - CG(current_import) = emalloc(sizeof(HashTable)); - zend_hash_init(CG(current_import), 8, NULL, ZVAL_PTR_DTOR, 0); - } - - ZVAL_ZVAL(&ns, &ns_name->u.constant, 0, 0); - if (new_name) { - name = &new_name->u.constant; - } else { - const char *p; - - /* The form "use A\B" is eqivalent to "use A\B as B". - So we extract the last part of compound name to use as a new_name */ - name = &tmp; - p = zend_memrchr(Z_STRVAL(ns), '\\', Z_STRLEN(ns)); - if (p) { - ZVAL_STRING(name, p+1); - } else { - ZVAL_ZVAL(name, &ns, 1, 0); - warn = !is_global && Z_TYPE(CG(current_namespace)) == IS_UNDEF; - } - } - - lcname = STR_ALLOC(Z_STRLEN_P(name), 0); - zend_str_tolower_copy(lcname->val, Z_STRVAL_P(name), Z_STRLEN_P(name)); - - if (((Z_STRLEN_P(name) == sizeof("self")-1) && - !memcmp(lcname->val, "self", sizeof("self")-1)) || - ((Z_STRLEN_P(name) == sizeof("parent")-1) && - !memcmp(lcname->val, "parent", sizeof("parent")-1))) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because '%s' is a special class name", Z_STRVAL(ns), Z_STRVAL_P(name), Z_STRVAL_P(name)); - } - - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - /* Prefix import name with current namespace name to avoid conflicts with classes */ - zend_string *c_ns_name = STR_ALLOC(Z_STRLEN(CG(current_namespace)) + 1 + Z_STRLEN_P(name), 0); - - zend_str_tolower_copy(c_ns_name->val, Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace))); - c_ns_name->val[Z_STRLEN(CG(current_namespace))] = '\\'; - memcpy(c_ns_name->val+Z_STRLEN(CG(current_namespace))+1, lcname->val, Z_STRLEN_P(name)+1); - if (zend_hash_exists(CG(class_table), c_ns_name)) { - char *tmp2 = zend_str_tolower_dup(Z_STRVAL(ns), Z_STRLEN(ns)); - - if (Z_STRLEN(ns) != Z_STRLEN(CG(current_namespace)) + 1 + Z_STRLEN_P(name) || - memcmp(tmp2, c_ns_name->val, Z_STRLEN(ns))) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because the name is already in use", Z_STRVAL(ns), Z_STRVAL_P(name)); - } - efree(tmp2); - } - STR_FREE(c_ns_name); - } else if ((ce = zend_hash_find_ptr(CG(class_table), lcname)) != NULL && - ce->type == ZEND_USER_CLASS && - ce->info.user.filename == CG(compiled_filename)) { - char *c_tmp = zend_str_tolower_dup(Z_STRVAL(ns), Z_STRLEN(ns)); - - if (Z_STRLEN(ns) != Z_STRLEN_P(name) || - memcmp(c_tmp, lcname->val, Z_STRLEN(ns))) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because the name is already in use", Z_STRVAL(ns), Z_STRVAL_P(name)); - } - efree(c_tmp); - } - - if (zend_hash_add(CG(current_import), lcname, &ns) == NULL) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because the name is already in use", Z_STRVAL(ns), Z_STRVAL_P(name)); - } - if (warn) { - if (!strcmp(Z_STRVAL_P(name), "strict")) { - zend_error_noreturn(E_COMPILE_ERROR, "You seem to be trying to use a different language..."); - } - zend_error(E_WARNING, "The use statement with non-compound name '%s' has no effect", Z_STRVAL_P(name)); - } - STR_RELEASE(lcname); - zval_dtor(name); -} -/* }}} */ - void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC) /* {{{ */ { zend_string *lookup_name; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index d602893e1d..2432580e05 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -524,7 +524,6 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM void zend_do_begin_namespace(znode *name, zend_bool with_brackets TSRMLS_DC); void zend_do_end_namespace(TSRMLS_D); void zend_verify_namespace(TSRMLS_D); -void zend_do_use(znode *name, znode *new_name, int is_global TSRMLS_DC); void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC); void zend_do_use_function(znode *name, znode *new_name, int is_global TSRMLS_DC); void zend_do_use_const(znode *name, znode *new_name, int is_global TSRMLS_DC); -- cgit v1.2.1 From 64151ec37a0ddb14aed32a6fe8c327bdb26d105b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 21 Jul 2014 23:41:11 +0200 Subject: Port function/const use --- Zend/zend_compile.c | 244 ++++++++++++++++++-------------------------- Zend/zend_compile.h | 3 - Zend/zend_language_parser.y | 33 ++---- 3 files changed, 108 insertions(+), 172 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index bb967b9cb3..a938900f44 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3548,113 +3548,6 @@ void zend_do_begin_namespace(znode *name, zend_bool with_bracket TSRMLS_DC) /* { } /* }}} */ -void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC) /* {{{ */ -{ - zend_string *lookup_name; - zval *name, ns, tmp; - zend_bool warn = 0; - - ZVAL_ZVAL(&ns, &ns_name->u.constant, 0, 0); - if (new_name) { - name = &new_name->u.constant; - } else { - const char *p; - - /* The form "use A\B" is eqivalent to "use A\B as B". - So we extract the last part of compound name to use as a new_name */ - name = &tmp; - p = zend_memrchr(Z_STRVAL(ns), '\\', Z_STRLEN(ns)); - if (p) { - ZVAL_STRING(name, p+1); - } else { - ZVAL_ZVAL(name, &ns, 1, 0); - warn = !is_global && Z_TYPE(CG(current_namespace)) == IS_UNDEF; - } - } - - if (case_sensitive) { - lookup_name = STR_COPY(Z_STR_P(name)); - } else { - lookup_name = STR_ALLOC(Z_STRLEN_P(name), 0); - zend_str_tolower_copy(lookup_name->val, Z_STRVAL_P(name), Z_STRLEN_P(name)); - } - - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - /* Prefix import name with current namespace name to avoid conflicts with functions/consts */ - zend_string *c_ns_name = STR_ALLOC(Z_STRLEN(CG(current_namespace)) + 1 + Z_STRLEN_P(name), 0); - - zend_str_tolower_copy(c_ns_name->val, Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace))); - c_ns_name->val[Z_STRLEN(CG(current_namespace))] = '\\'; - memcpy(c_ns_name->val+Z_STRLEN(CG(current_namespace))+1, lookup_name, Z_STRLEN_P(name)+1); - if (zend_hash_exists(lookup_table, c_ns_name)) { - char *tmp2 = zend_str_tolower_dup(Z_STRVAL(ns), Z_STRLEN(ns)); - - if (Z_STRLEN(ns) != Z_STRLEN(CG(current_namespace)) + 1 + Z_STRLEN_P(name) || - memcmp(tmp2, c_ns_name->val, Z_STRLEN(ns))) { - zend_error(E_COMPILE_ERROR, "Cannot use %s %s as %s because the name is already in use", is_function ? "function" : "const", Z_STRVAL(ns), Z_STRVAL_P(name)); - } - efree(tmp2); - } - STR_FREE(c_ns_name); - } else if (is_function) { - zend_function *function; - - if ((function = zend_hash_find_ptr(lookup_table, lookup_name)) != NULL && function->type == ZEND_USER_FUNCTION && strcmp(function->op_array.filename->val, CG(compiled_filename)->val) == 0) { - char *c_tmp = zend_str_tolower_dup(Z_STRVAL(ns), Z_STRLEN(ns)); - - if (Z_STRLEN(ns) != Z_STRLEN_P(name) || - memcmp(c_tmp, lookup_name->val, Z_STRLEN(ns))) { - zend_error(E_COMPILE_ERROR, "Cannot use function %s as %s because the name is already in use", Z_STRVAL(ns), Z_STRVAL_P(name)); - } - efree(c_tmp); - } - } else { - zend_string *filename; - - if ((filename = zend_hash_find_ptr(lookup_table, lookup_name)) != NULL && strcmp(filename->val, CG(compiled_filename)->val) == 0) { - char *c_tmp = zend_str_tolower_dup(Z_STRVAL(ns), Z_STRLEN(ns)); - - if (Z_STRLEN(ns) != Z_STRLEN_P(name) || - memcmp(c_tmp, lookup_name->val, Z_STRLEN(ns))) { - zend_error(E_COMPILE_ERROR, "Cannot use const %s as %s because the name is already in use", Z_STRVAL(ns), Z_STRVAL_P(name)); - } - efree(c_tmp); - } - } - - if (zend_hash_add(current_import_sub, lookup_name, &ns) == NULL) { - zend_error(E_COMPILE_ERROR, "Cannot use %s %s as %s because the name is already in use", is_function ? "function" : "const", Z_STRVAL(ns), Z_STRVAL_P(name)); - } - if (warn) { - zend_error(E_WARNING, "The use %s statement with non-compound name '%s' has no effect", is_function ? "function" : "const", Z_STRVAL_P(name)); - } - STR_RELEASE(lookup_name); - zval_dtor(name); -} -/* }}} */ - -void zend_do_use_function(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */ -{ - if (!CG(current_import_function)) { - CG(current_import_function) = emalloc(sizeof(HashTable)); - zend_hash_init(CG(current_import_function), 8, NULL, ZVAL_PTR_DTOR, 0); - } - - zend_do_use_non_class(ns_name, new_name, is_global, 1, 0, CG(current_import_function), CG(function_table) TSRMLS_CC); -} -/* }}} */ - -void zend_do_use_const(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */ -{ - if (!CG(current_import_const)) { - CG(current_import_const) = emalloc(sizeof(HashTable)); - zend_hash_init(CG(current_import_const), 8, NULL, ZVAL_PTR_DTOR, 0); - } - - zend_do_use_non_class(ns_name, new_name, is_global, 0, 1, CG(current_import_const), &CG(const_filenames) TSRMLS_CC); -} -/* }}} */ - void zend_do_declare_constant(znode *name, znode *value TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -6399,18 +6292,71 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { CG(active_class_entry) = NULL; } +static HashTable *zend_get_import_ht(zend_uint type TSRMLS_DC) { + switch (type) { + case T_CLASS: + if (!CG(current_import)) { + CG(current_import) = emalloc(sizeof(HashTable)); + zend_hash_init(CG(current_import), 8, NULL, str_dtor, 0); + } + return CG(current_import); + case T_FUNCTION: + if (!CG(current_import_function)) { + CG(current_import_function) = emalloc(sizeof(HashTable)); + zend_hash_init(CG(current_import_function), 8, NULL, str_dtor, 0); + } + return CG(current_import_function); + case T_CONST: + if (!CG(current_import_const)) { + CG(current_import_const) = emalloc(sizeof(HashTable)); + zend_hash_init(CG(current_import_const), 8, NULL, str_dtor, 0); + } + return CG(current_import_const); + EMPTY_SWITCH_DEFAULT_CASE() + } +} + +static char *zend_get_use_type_str(zend_uint type) { + switch (type) { + case T_CLASS: + return ""; + case T_FUNCTION: + return " function"; + case T_CONST: + return " const"; + EMPTY_SWITCH_DEFAULT_CASE() + } +} + +static void zend_check_already_in_use( + zend_uint type, zend_string *old_name, zend_string *new_name, zend_string *check_name +) { + if (old_name->len == check_name->len) { + char *old_name_lc = zend_str_tolower_dup(old_name->val, old_name->len); + if (!memcmp(old_name_lc, check_name->val, check_name->len)) { + efree(old_name_lc); + return; + } + } + + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use%s %s as %s because the name " + "is already in use", zend_get_use_type_str(type), old_name->val, new_name->val); +} + void zend_compile_use(zend_ast *ast TSRMLS_DC) { zend_uint i; zend_string *current_ns = Z_TYPE(CG(current_namespace)) != IS_UNDEF ? Z_STR(CG(current_namespace)) : NULL; + zend_uint type = ast->attr; + HashTable *current_import = zend_get_import_ht(type TSRMLS_CC); + zend_bool case_sensitive = type == T_CONST; for (i = 0; i < ast->children; ++i) { zend_ast *use_ast = ast->child[i]; zend_ast *old_name_ast = use_ast->child[0]; zend_ast *new_name_ast = use_ast->child[1]; zend_string *old_name = Z_STR_P(zend_ast_get_zval(old_name_ast)); - zend_string *new_name, *lcname; - zend_class_entry *ce; + zend_string *new_name, *lookup_name; if (new_name_ast) { new_name = STR_COPY(Z_STR_P(zend_ast_get_zval(new_name_ast))); @@ -6423,7 +6369,7 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { new_name = STR_COPY(old_name); if (!current_ns) { - if (zend_str_equals(new_name, "strict")) { + if (type == T_CLASS && zend_str_equals(new_name, "strict")) { zend_error_noreturn(E_COMPILE_ERROR, "You seem to be trying to use a different language..."); } @@ -6434,10 +6380,16 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { } } - lcname = STR_ALLOC(new_name->len, 0); - zend_str_tolower_copy(lcname->val, new_name->val, new_name->len); + if (case_sensitive) { + lookup_name = STR_COPY(new_name); + } else { + lookup_name = STR_ALLOC(new_name->len, 0); + zend_str_tolower_copy(lookup_name->val, new_name->val, new_name->len); + } - if (zend_str_equals(lcname, "self") || zend_str_equals(lcname, "parent")) { + if (type == T_CLASS + && (zend_str_equals(lookup_name, "self") || zend_str_equals(lookup_name, "parent")) + ) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because '%s' " "is a special class name", old_name->val, new_name->val, new_name->val); } @@ -6446,46 +6398,54 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { zend_string *ns_name = STR_ALLOC(current_ns->len + 1 + new_name->len, 0); zend_str_tolower_copy(ns_name->val, current_ns->val, current_ns->len); ns_name->val[current_ns->len] = '\\'; - memcpy(ns_name->val + current_ns->len + 1, lcname->val, lcname->len); + memcpy(ns_name->val + current_ns->len + 1, lookup_name->val, lookup_name->len); if (zend_hash_exists(CG(class_table), ns_name)) { - char *tmp = zend_str_tolower_dup(old_name->val, old_name->len); - - if (old_name->len != ns_name->len || memcmp(tmp, ns_name->val, ns_name->len)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because the name " - "is already in use", old_name->val, new_name->val); - } - - efree(tmp); + zend_check_already_in_use(type, old_name, new_name, ns_name); } STR_FREE(ns_name); - } else if ((ce = zend_hash_find_ptr(CG(class_table), lcname)) - && ce->type == ZEND_USER_CLASS - && ce->info.user.filename == CG(compiled_filename) - ) { - char *tmp = zend_str_tolower_dup(old_name->val, old_name->len); - - if (old_name->len != lcname->len || memcmp(tmp, lcname->val, lcname->len)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because the name " - "is already in use", old_name->val, new_name->val); + } else { + switch (type) { + case T_CLASS: + { + zend_class_entry *ce = zend_hash_find_ptr(CG(class_table), lookup_name); + if (ce && ce->type == ZEND_USER_CLASS + && ce->info.user.filename == CG(compiled_filename) + ) { + zend_check_already_in_use(type, old_name, new_name, lookup_name); + } + break; + } + case T_FUNCTION: + { + zend_function *fn = zend_hash_find_ptr(CG(function_table), lookup_name); + if (fn && fn->type == ZEND_USER_FUNCTION + && !strcmp(fn->op_array.filename->val, CG(compiled_filename)->val) + ) { + zend_check_already_in_use(type, old_name, new_name, lookup_name); + } + break; + } + case T_CONST: + { + zend_string *filename = zend_hash_find_ptr(&CG(const_filenames), lookup_name); + if (filename && !strcmp(filename->val, CG(compiled_filename)->val)) { + zend_check_already_in_use(type, old_name, new_name, lookup_name); + } + break; + } + EMPTY_SWITCH_DEFAULT_CASE() } - - efree(tmp); - } - - if (!CG(current_import)) { - CG(current_import) = emalloc(sizeof(HashTable)); - zend_hash_init(CG(current_import), 8, NULL, str_dtor, 0); } STR_ADDREF(old_name); - if (!zend_hash_add_ptr(CG(current_import), lcname, old_name)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because the name " - "is already in use", old_name->val, new_name->val); + if (!zend_hash_add_ptr(current_import, lookup_name, old_name)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use%s %s as %s because the name " + "is already in use", zend_get_use_type_str(type), old_name->val, new_name->val); } - STR_RELEASE(lcname); + STR_RELEASE(lookup_name); STR_RELEASE(new_name); } } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 2432580e05..c79ef2c6bc 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -524,9 +524,6 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM void zend_do_begin_namespace(znode *name, zend_bool with_brackets TSRMLS_DC); void zend_do_end_namespace(TSRMLS_D); void zend_verify_namespace(TSRMLS_D); -void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC); -void zend_do_use_function(znode *name, znode *new_name, int is_global TSRMLS_DC); -void zend_do_use_const(znode *name, znode *new_name, int is_global TSRMLS_DC); void zend_do_end_compilation(TSRMLS_D); void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index f4bfd7b106..3ba256c6d1 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -255,9 +255,12 @@ top_statement: top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } | T_NAMESPACE '{' { zend_do_begin_namespace(NULL, 1 TSRMLS_CC); } top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } - | T_USE use_declarations ';' { AS($2); zend_verify_namespace(TSRMLS_C); } - | T_USE T_FUNCTION use_function_declarations ';' { zend_verify_namespace(TSRMLS_C); } - | T_USE T_CONST use_const_declarations ';' { zend_verify_namespace(TSRMLS_C); } + | T_USE use_declarations ';' + { $2.u.ast->attr = T_CLASS; AS($2); zend_verify_namespace(TSRMLS_C); } + | T_USE T_FUNCTION use_declarations ';' + { $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); } ; @@ -279,30 +282,6 @@ use_declaration: { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), AST_ZVAL(&$4)); } ; -use_function_declarations: - use_function_declarations ',' use_function_declaration - | use_function_declaration -; - -use_function_declaration: - namespace_name { zend_do_use_function(&$1, NULL, 0 TSRMLS_CC); } - | namespace_name T_AS T_STRING { zend_do_use_function(&$1, &$3, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { zend_do_use_function(&$2, NULL, 1 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use_function(&$2, &$4, 1 TSRMLS_CC); } -; - -use_const_declarations: - use_const_declarations ',' use_const_declaration - | use_const_declaration -; - -use_const_declaration: - namespace_name { zend_do_use_const(&$1, NULL, 0 TSRMLS_CC); } - | namespace_name T_AS T_STRING { zend_do_use_const(&$1, &$3, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { zend_do_use_const(&$2, NULL, 1 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use_const(&$2, &$4, 1 TSRMLS_CC); } -; - 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); } -- cgit v1.2.1 From b6c9eb21d46200648c01205cc8ac87941a08b802 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 11:55:07 +0200 Subject: Port constant declaration --- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 146 ++++++++++++++++++++++---------------------- Zend/zend_compile.h | 1 - Zend/zend_language_parser.y | 23 +++---- 4 files changed, 87 insertions(+), 84 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index c89b4af03c..c992e3ecef 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 a938900f44..6c2b7b6866 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 c79ef2c6bc..11e355093a 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 3ba256c6d1..5ecdfb85a2 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: -- cgit v1.2.1 From 8a2ff6b53dd84bd8bff20469fd283f76ae6e60a4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 12:45:44 +0200 Subject: Partial NS port (semicolon, no errors) --- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 72 +++++++++++ Zend/zend_language_parser.y | 5 +- Zend/zend_language_scanner.c | 293 +++++++++++++++++++++---------------------- Zend/zend_language_scanner.l | 5 - 5 files changed, 220 insertions(+), 156 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index c992e3ecef..7d72d4ec4e 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -122,6 +122,7 @@ enum _zend_ast_kind { ZEND_AST_USE, ZEND_AST_USE_ELEM, + ZEND_AST_NAMESPACE, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 6c2b7b6866..7c0c97c708 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6449,6 +6449,68 @@ void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { } } +static void zend_reset_import_tables(TSRMLS_D) { + if (CG(current_import)) { + zend_hash_destroy(CG(current_import)); + efree(CG(current_import)); + CG(current_import) = NULL; + } + + if (CG(current_import_function)) { + zend_hash_destroy(CG(current_import_function)); + efree(CG(current_import_function)); + CG(current_import_function) = NULL; + } + + if (CG(current_import_const)) { + zend_hash_destroy(CG(current_import_const)); + efree(CG(current_import_const)); + CG(current_import_const) = NULL; + } +} + +void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { + zend_ast *name_ast = ast->child[0]; + zend_ast *stmt_ast = ast->child[1]; + zend_string *name; + + // TODO.AST errors! + + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + zval_dtor(&CG(current_namespace)); + } + + if (name_ast) { + name = Z_STR_P(zend_ast_get_zval(name_ast)); + + if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name->val, name->len)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as namespace name", name->val); + } + + ZVAL_STR(&CG(current_namespace), STR_COPY(name)); + } else { + ZVAL_UNDEF(&CG(current_namespace)); + } + + zend_reset_import_tables(TSRMLS_C); + + // TODO.AST reset doc comment + + CG(in_namespace) = 1; + + if (stmt_ast) { + zend_compile_stmt(stmt_ast TSRMLS_CC); + + CG(in_namespace) = 0; + zend_reset_import_tables(TSRMLS_C); + + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + zval_dtor(&CG(current_namespace)); + ZVAL_UNDEF(&CG(current_namespace)); + } + } +} + 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]; @@ -7092,6 +7154,13 @@ zend_bool zend_try_ct_compile_magic_const(zval *zv, zend_ast *ast TSRMLS_DC) { ZVAL_EMPTY_STRING(zv); } break; + case T_NS_C: + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + ZVAL_DUP(zv, &CG(current_namespace)); + } else { + ZVAL_EMPTY_STRING(zv); + } + break; EMPTY_SWITCH_DEFAULT_CASE() } @@ -7365,6 +7434,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_CONST_DECL: zend_compile_const_decl(ast TSRMLS_CC); break; + case ZEND_AST_NAMESPACE: + zend_compile_namespace(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 5ecdfb85a2..278a885454 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -250,7 +250,8 @@ top_statement: | function_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } | class_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } | T_HALT_COMPILER '(' ')' ';' { zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } - | T_NAMESPACE namespace_name ';' { zend_do_begin_namespace(&$2, 0 TSRMLS_CC); } + | T_NAMESPACE namespace_name ';' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); AS($$); } | T_NAMESPACE namespace_name '{' { zend_do_begin_namespace(&$2, 1 TSRMLS_CC); } top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } | T_NAMESPACE '{' { zend_do_begin_namespace(NULL, 1 TSRMLS_CC); } @@ -963,7 +964,7 @@ scalar: | T_TRAIT_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_TRAIT_C); } | T_METHOD_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_METHOD_C); } | T_FUNC_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); } - | T_NS_C { $$.u.ast = AST_ZVAL(&$1); } + | T_NS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_NS_C); } | T_CLASS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_CLASS_C); } | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } | T_START_HEREDOC T_END_HEREDOC diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index d6ef79aa48..cd39be3564 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1115,7 +1115,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1726 "Zend/zend_language_scanner.l" +#line 1721 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1194,7 +1194,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1716 "Zend/zend_language_scanner.l" +#line 1711 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1211,7 +1211,7 @@ yy7: if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1697 "Zend/zend_language_scanner.l" +#line 1692 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1407,7 +1407,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1663 "Zend/zend_language_scanner.l" +#line 1658 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1449,7 +1449,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1679 "Zend/zend_language_scanner.l" +#line 1674 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1465,7 +1465,7 @@ yy45: ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1690 "Zend/zend_language_scanner.l" +#line 1685 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); @@ -1498,7 +1498,7 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1708 "Zend/zend_language_scanner.l" +#line 1703 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); @@ -1576,7 +1576,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2169 "Zend/zend_language_scanner.l" +#line 2164 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1628,7 +1628,7 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2113 "Zend/zend_language_scanner.l" +#line 2108 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; @@ -1643,7 +1643,7 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2100 "Zend/zend_language_scanner.l" +#line 2095 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1666,7 +1666,7 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1696,7 +1696,7 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1800 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1721,7 +1721,7 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1791 "Zend/zend_language_scanner.l" +#line 1786 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1796,7 +1796,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2119 "Zend/zend_language_scanner.l" +#line 2114 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1856,7 +1856,7 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2108 "Zend/zend_language_scanner.l" +#line 2103 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; @@ -1871,7 +1871,7 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2100 "Zend/zend_language_scanner.l" +#line 2095 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1894,7 +1894,7 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1924,7 +1924,7 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1800 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1949,7 +1949,7 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1791 "Zend/zend_language_scanner.l" +#line 1786 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1967,7 +1967,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2086 "Zend/zend_language_scanner.l" +#line 2081 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -2042,7 +2042,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2211 "Zend/zend_language_scanner.l" +#line 2206 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2130,7 +2130,7 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2100 "Zend/zend_language_scanner.l" +#line 2095 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -2153,7 +2153,7 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -2183,7 +2183,7 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1800 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -2208,7 +2208,7 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1791 "Zend/zend_language_scanner.l" +#line 1786 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -2398,7 +2398,7 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1829 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; @@ -2996,7 +2996,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1835 "Zend/zend_language_scanner.l" +#line 1830 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3037,7 +3037,7 @@ yy178: yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1921 "Zend/zend_language_scanner.l" +#line 1916 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3112,7 +3112,7 @@ yy180: yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1990 "Zend/zend_language_scanner.l" +#line 1985 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3159,7 +3159,7 @@ yy182: ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2080 "Zend/zend_language_scanner.l" +#line 2075 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; @@ -3170,7 +3170,7 @@ yy184: ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2342 "Zend/zend_language_scanner.l" +#line 2337 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3370,7 +3370,7 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1902 "Zend/zend_language_scanner.l" +#line 1897 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); @@ -3410,7 +3410,7 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -3505,7 +3505,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1909 "Zend/zend_language_scanner.l" +#line 1904 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3544,7 +3544,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1869 "Zend/zend_language_scanner.l" +#line 1864 "Zend/zend_language_scanner.l" { int doc_com; @@ -3872,7 +3872,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2032 "Zend/zend_language_scanner.l" +#line 2027 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -4169,14 +4169,9 @@ yy317: yyleng = YYCURSOR - SCNG(yy_text); #line 1654 "Zend/zend_language_scanner.l" { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - ZVAL_DUP(zendlval, &CG(current_namespace)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_NS_C; } -#line 4180 "Zend/zend_language_scanner.c" +#line 4175 "Zend/zend_language_scanner.c" yy321: YYDEBUG(321, *YYCURSOR); yych = *++YYCURSOR; @@ -4221,7 +4216,7 @@ yy322: ZVAL_STR(zendlval, dirname); return T_DIR; } -#line 4225 "Zend/zend_language_scanner.c" +#line 4220 "Zend/zend_language_scanner.c" yy326: YYDEBUG(326, *YYCURSOR); yych = *++YYCURSOR; @@ -4251,7 +4246,7 @@ yy328: ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; } -#line 4255 "Zend/zend_language_scanner.c" +#line 4250 "Zend/zend_language_scanner.c" yy332: YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; @@ -4290,7 +4285,7 @@ yy336: { return T_METHOD_C; } -#line 4294 "Zend/zend_language_scanner.c" +#line 4289 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; @@ -4345,7 +4340,7 @@ yy347: { return T_FUNC_C; } -#line 4349 "Zend/zend_language_scanner.c" +#line 4344 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4376,7 +4371,7 @@ yy352: } return T_FILE; } -#line 4380 "Zend/zend_language_scanner.c" +#line 4375 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4410,7 +4405,7 @@ yy359: { return T_TRAIT_C; } -#line 4414 "Zend/zend_language_scanner.c" +#line 4409 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4444,7 +4439,7 @@ yy366: { return T_CLASS_C; } -#line 4448 "Zend/zend_language_scanner.c" +#line 4443 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4510,7 +4505,7 @@ yy381: { return T_HALT_COMPILER; } -#line 4514 "Zend/zend_language_scanner.c" +#line 4509 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4534,7 +4529,7 @@ yy385: { return T_USE; } -#line 4538 "Zend/zend_language_scanner.c" +#line 4533 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4557,7 +4552,7 @@ yy389: { return T_UNSET; } -#line 4561 "Zend/zend_language_scanner.c" +#line 4556 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4733,7 +4728,7 @@ yy406: { return T_INT_CAST; } -#line 4737 "Zend/zend_language_scanner.c" +#line 4732 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4781,7 +4776,7 @@ yy414: { return T_DOUBLE_CAST; } -#line 4785 "Zend/zend_language_scanner.c" +#line 4780 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4855,7 +4850,7 @@ yy428: { return T_STRING_CAST; } -#line 4859 "Zend/zend_language_scanner.c" +#line 4854 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4892,7 +4887,7 @@ yy435: { return T_ARRAY_CAST; } -#line 4896 "Zend/zend_language_scanner.c" +#line 4891 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4934,7 +4929,7 @@ yy443: { return T_OBJECT_CAST; } -#line 4938 "Zend/zend_language_scanner.c" +#line 4933 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -4979,7 +4974,7 @@ yy452: { return T_BOOL_CAST; } -#line 4983 "Zend/zend_language_scanner.c" +#line 4978 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5043,7 +5038,7 @@ yy463: { return T_UNSET_CAST; } -#line 5047 "Zend/zend_language_scanner.c" +#line 5042 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5061,7 +5056,7 @@ yy468: { return T_VAR; } -#line 5065 "Zend/zend_language_scanner.c" +#line 5060 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5085,7 +5080,7 @@ yy472: { return T_NEW; } -#line 5089 "Zend/zend_language_scanner.c" +#line 5084 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5128,7 +5123,7 @@ yy480: { return T_NAMESPACE; } -#line 5132 "Zend/zend_language_scanner.c" +#line 5127 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5154,7 +5149,7 @@ yy484: { return T_CONCAT_EQUAL; } -#line 5158 "Zend/zend_language_scanner.c" +#line 5153 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5167,7 +5162,7 @@ yy486: { return T_ELLIPSIS; } -#line 5171 "Zend/zend_language_scanner.c" +#line 5166 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; @@ -5177,7 +5172,7 @@ yy489: { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5181 "Zend/zend_language_scanner.c" +#line 5176 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5203,7 +5198,7 @@ yy493: { return T_MINUS_EQUAL; } -#line 5207 "Zend/zend_language_scanner.c" +#line 5202 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; @@ -5213,7 +5208,7 @@ yy495: { return T_DEC; } -#line 5217 "Zend/zend_language_scanner.c" +#line 5212 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; @@ -5224,7 +5219,7 @@ yy497: yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5228 "Zend/zend_language_scanner.c" +#line 5223 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5273,7 +5268,7 @@ yy504: { return T_PUBLIC; } -#line 5277 "Zend/zend_language_scanner.c" +#line 5272 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5332,7 +5327,7 @@ yy513: { return T_PROTECTED; } -#line 5336 "Zend/zend_language_scanner.c" +#line 5331 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5366,7 +5361,7 @@ yy519: { return T_PRIVATE; } -#line 5370 "Zend/zend_language_scanner.c" +#line 5365 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5379,7 +5374,7 @@ yy521: { return T_PRINT; } -#line 5383 "Zend/zend_language_scanner.c" +#line 5378 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5408,7 +5403,7 @@ yy526: { return T_GOTO; } -#line 5412 "Zend/zend_language_scanner.c" +#line 5407 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5436,7 +5431,7 @@ yy531: { return T_GLOBAL; } -#line 5440 "Zend/zend_language_scanner.c" +#line 5435 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5477,7 +5472,7 @@ yy539: { return T_BREAK; } -#line 5481 "Zend/zend_language_scanner.c" +#line 5476 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5521,7 +5516,7 @@ yy547: { return T_SWITCH; } -#line 5525 "Zend/zend_language_scanner.c" +#line 5520 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5549,7 +5544,7 @@ yy552: { return T_STATIC; } -#line 5553 "Zend/zend_language_scanner.c" +#line 5548 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5580,7 +5575,7 @@ yy557: { return T_AS; } -#line 5584 "Zend/zend_language_scanner.c" +#line 5579 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5603,7 +5598,7 @@ yy561: { return T_ARRAY; } -#line 5607 "Zend/zend_language_scanner.c" +#line 5602 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5616,7 +5611,7 @@ yy563: { return T_LOGICAL_AND; } -#line 5620 "Zend/zend_language_scanner.c" +#line 5615 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5654,7 +5649,7 @@ yy570: { return T_ABSTRACT; } -#line 5658 "Zend/zend_language_scanner.c" +#line 5653 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5682,7 +5677,7 @@ yy575: { return T_WHILE; } -#line 5686 "Zend/zend_language_scanner.c" +#line 5681 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5695,7 +5690,7 @@ yy577: { return T_IF; } -#line 5699 "Zend/zend_language_scanner.c" +#line 5694 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5751,7 +5746,7 @@ yy584: { return T_ISSET; } -#line 5755 "Zend/zend_language_scanner.c" +#line 5750 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5809,7 +5804,7 @@ yy593: { return T_INCLUDE; } -#line 5813 "Zend/zend_language_scanner.c" +#line 5808 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5842,7 +5837,7 @@ yy598: { return T_INCLUDE_ONCE; } -#line 5846 "Zend/zend_language_scanner.c" +#line 5841 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5880,7 +5875,7 @@ yy605: { return T_INTERFACE; } -#line 5884 "Zend/zend_language_scanner.c" +#line 5879 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5934,7 +5929,7 @@ yy613: { return T_INSTEADOF; } -#line 5938 "Zend/zend_language_scanner.c" +#line 5933 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -5967,7 +5962,7 @@ yy619: { return T_INSTANCEOF; } -#line 5971 "Zend/zend_language_scanner.c" +#line 5966 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6015,7 +6010,7 @@ yy628: { return T_IMPLEMENTS; } -#line 6019 "Zend/zend_language_scanner.c" +#line 6014 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6047,7 +6042,7 @@ yy631: { return T_TRY; } -#line 6051 "Zend/zend_language_scanner.c" +#line 6046 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6070,7 +6065,7 @@ yy636: { return T_TRAIT; } -#line 6074 "Zend/zend_language_scanner.c" +#line 6069 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6093,7 +6088,7 @@ yy640: { return T_THROW; } -#line 6097 "Zend/zend_language_scanner.c" +#line 6092 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6121,7 +6116,7 @@ yy645: { return T_YIELD; } -#line 6125 "Zend/zend_language_scanner.c" +#line 6120 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6186,7 +6181,7 @@ yy654: { return T_REQUIRE; } -#line 6190 "Zend/zend_language_scanner.c" +#line 6185 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6219,7 +6214,7 @@ yy659: { return T_REQUIRE_ONCE; } -#line 6223 "Zend/zend_language_scanner.c" +#line 6218 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6242,7 +6237,7 @@ yy663: { return T_RETURN; } -#line 6246 "Zend/zend_language_scanner.c" +#line 6241 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6336,7 +6331,7 @@ yy674: { return T_CONTINUE; } -#line 6340 "Zend/zend_language_scanner.c" +#line 6335 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6349,7 +6344,7 @@ yy676: { return T_CONST; } -#line 6353 "Zend/zend_language_scanner.c" +#line 6348 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6378,7 +6373,7 @@ yy681: { return T_CLONE; } -#line 6382 "Zend/zend_language_scanner.c" +#line 6377 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6396,7 +6391,7 @@ yy684: { return T_CLASS; } -#line 6400 "Zend/zend_language_scanner.c" +#line 6395 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6446,7 +6441,7 @@ yy693: { return T_CALLABLE; } -#line 6450 "Zend/zend_language_scanner.c" +#line 6445 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6459,7 +6454,7 @@ yy695: { return T_CASE; } -#line 6463 "Zend/zend_language_scanner.c" +#line 6458 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6477,7 +6472,7 @@ yy698: { return T_CATCH; } -#line 6481 "Zend/zend_language_scanner.c" +#line 6476 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6532,7 +6527,7 @@ yy708: { return T_FUNCTION; } -#line 6536 "Zend/zend_language_scanner.c" +#line 6531 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6560,7 +6555,7 @@ yy711: { return T_FOR; } -#line 6564 "Zend/zend_language_scanner.c" +#line 6559 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6588,7 +6583,7 @@ yy715: { return T_FOREACH; } -#line 6592 "Zend/zend_language_scanner.c" +#line 6587 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6626,7 +6621,7 @@ yy720: { return T_FINAL; } -#line 6630 "Zend/zend_language_scanner.c" +#line 6625 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6644,7 +6639,7 @@ yy722: { return T_FINALLY; } -#line 6648 "Zend/zend_language_scanner.c" +#line 6643 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6679,7 +6674,7 @@ yy726: { return T_DO; } -#line 6683 "Zend/zend_language_scanner.c" +#line 6678 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6692,7 +6687,7 @@ yy728: { return T_EXIT; } -#line 6696 "Zend/zend_language_scanner.c" +#line 6691 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6731,7 +6726,7 @@ yy735: { return T_DEFAULT; } -#line 6735 "Zend/zend_language_scanner.c" +#line 6730 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6759,7 +6754,7 @@ yy740: { return T_DECLARE; } -#line 6763 "Zend/zend_language_scanner.c" +#line 6758 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6843,7 +6838,7 @@ yy753: { return T_EXTENDS; } -#line 6847 "Zend/zend_language_scanner.c" +#line 6842 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6856,7 +6851,7 @@ yy755: { return T_EXIT; } -#line 6860 "Zend/zend_language_scanner.c" +#line 6855 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6874,7 +6869,7 @@ yy758: { return T_EVAL; } -#line 6878 "Zend/zend_language_scanner.c" +#line 6873 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6948,7 +6943,7 @@ yy769: { return T_ENDWHILE; } -#line 6952 "Zend/zend_language_scanner.c" +#line 6947 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -6981,7 +6976,7 @@ yy775: { return T_ENDSWITCH; } -#line 6985 "Zend/zend_language_scanner.c" +#line 6980 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -6994,7 +6989,7 @@ yy777: { return T_ENDIF; } -#line 6998 "Zend/zend_language_scanner.c" +#line 6993 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7027,7 +7022,7 @@ yy781: { return T_ENDFOR; } -#line 7031 "Zend/zend_language_scanner.c" +#line 7026 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7055,7 +7050,7 @@ yy785: { return T_ENDFOREACH; } -#line 7059 "Zend/zend_language_scanner.c" +#line 7054 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7093,7 +7088,7 @@ yy792: { return T_ENDDECLARE; } -#line 7097 "Zend/zend_language_scanner.c" +#line 7092 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7116,7 +7111,7 @@ yy796: { return T_EMPTY; } -#line 7120 "Zend/zend_language_scanner.c" +#line 7115 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7149,7 +7144,7 @@ yy800: { return T_ELSE; } -#line 7153 "Zend/zend_language_scanner.c" +#line 7148 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7167,7 +7162,7 @@ yy802: { return T_ELSEIF; } -#line 7171 "Zend/zend_language_scanner.c" +#line 7166 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7185,7 +7180,7 @@ yy805: { return T_ECHO; } -#line 7189 "Zend/zend_language_scanner.c" +#line 7184 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7264,7 +7259,7 @@ yy810: HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7268 "Zend/zend_language_scanner.c" +#line 7263 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7278,7 +7273,7 @@ yy812: yy_pop_state(TSRMLS_C); goto restart; } -#line 7282 "Zend/zend_language_scanner.c" +#line 7277 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7293,7 +7288,7 @@ yy814: zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7297 "Zend/zend_language_scanner.c" +#line 7292 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7318,7 +7313,7 @@ yy818: { return T_OBJECT_OPERATOR; } -#line 7322 "Zend/zend_language_scanner.c" +#line 7317 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7410,7 +7405,7 @@ yy825: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7414 "Zend/zend_language_scanner.c" +#line 7409 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7443,7 +7438,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7447 "Zend/zend_language_scanner.c" +#line 7442 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7454,7 +7449,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2285 "Zend/zend_language_scanner.l" +#line 2280 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7510,7 +7505,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7514 "Zend/zend_language_scanner.c" +#line 7509 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7626,7 +7621,7 @@ yy839: } return T_NUM_STRING; } -#line 7630 "Zend/zend_language_scanner.c" +#line 7625 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7646,23 +7641,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1817 "Zend/zend_language_scanner.l" +#line 1812 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7655 "Zend/zend_language_scanner.c" +#line 7650 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1812 "Zend/zend_language_scanner.l" +#line 1807 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7666 "Zend/zend_language_scanner.c" +#line 7661 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7672,14 +7667,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1822 "Zend/zend_language_scanner.l" +#line 1817 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7683 "Zend/zend_language_scanner.c" +#line 7678 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7688,18 +7683,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1829 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7697 "Zend/zend_language_scanner.c" +#line 7692 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2342 "Zend/zend_language_scanner.l" +#line 2337 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7708,7 +7703,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7712 "Zend/zend_language_scanner.c" +#line 7707 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7744,12 +7739,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7753 "Zend/zend_language_scanner.c" +#line 7748 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7794,7 +7789,7 @@ yy864: ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7798 "Zend/zend_language_scanner.c" +#line 7793 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7817,6 +7812,6 @@ yy867: goto yy864; } } -#line 2351 "Zend/zend_language_scanner.l" +#line 2346 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 4a4dc48f6e..8d148e6269 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1652,11 +1652,6 @@ NEWLINE ("\r"|"\n"|"\r\n") } "__NAMESPACE__" { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - ZVAL_DUP(zendlval, &CG(current_namespace)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_NS_C; } -- cgit v1.2.1 From 9c69c41a6420ee3e8bef882d26945ef4930fed9d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 13:02:51 +0200 Subject: Port top level stmt Problem: namespace\foo no longer works :/ --- Zend/zend_compile.c | 26 +++++++++++++++++++++----- Zend/zend_compile.h | 1 + Zend/zend_language_parser.y | 33 +++++++++++++++++---------------- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7c0c97c708..7af3c4c7be 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6499,7 +6499,7 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { CG(in_namespace) = 1; if (stmt_ast) { - zend_compile_stmt(stmt_ast TSRMLS_CC); + zend_compile_top_stmt(stmt_ast TSRMLS_CC); CG(in_namespace) = 0; zend_reset_import_tables(TSRMLS_C); @@ -7350,13 +7350,31 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { } } +/* Same as compile_stmt, but with early binding */ +void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC) { + if (!ast) { + return; + } + + if (ast->kind == ZEND_AST_STMT_LIST) { + zend_uint i; + for (i = 0; i < ast->children; ++i) { + zend_compile_top_stmt(ast->child[i] TSRMLS_CC); + } + return; + } + + zend_compile_stmt(ast TSRMLS_CC); + if (ast->kind == ZEND_AST_FUNC_DECL || ast->kind == ZEND_AST_CLASS) { + zend_do_early_binding(TSRMLS_C); + } +} + void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { if (!ast) { return; } - // TODO.AST - zend_uint orig_lineno = CG(zend_lineno); CG(zend_lineno) = ast->lineno; switch (ast->kind) { @@ -7448,8 +7466,6 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { if (Z_LVAL(CG(declarables).ticks) && !zend_is_unticked_stmt(ast)) { zend_emit_tick(TSRMLS_C); } - - CG(zend_lineno) = orig_lineno; } void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 11e355093a..70bea8e914 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -101,6 +101,7 @@ static inline znode *zend_ast_get_znode(zend_ast *ast) { } void zend_ensure_writable_variable(const zend_ast *ast); +void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_expr(znode *node, zend_ast *ast TSRMLS_DC); int zend_compile_expr_maybe_ct(znode *node, zend_ast *ast, zend_bool ct_required TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 278a885454..0d4528314b 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -221,12 +221,12 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %% /* Rules */ start: - top_statement_list { zend_do_end_compilation(TSRMLS_C); } + top_statement_list { zend_compile_top_stmt($1.u.ast TSRMLS_CC); zend_ast_destroy($1.u.ast); zend_do_end_compilation(TSRMLS_C); } ; top_statement_list: - top_statement_list { zend_do_extended_info(TSRMLS_C); } top_statement { HANDLE_INTERACTIVE(); } - | /* empty */ + top_statement_list top_statement { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } + | /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } ; namespace_name: @@ -245,24 +245,25 @@ name: { $$.u.ast = AST_ZVAL(&$2); } ; +/* TODO.AST early binding! */ top_statement: - statement { AS($1); zend_verify_namespace(TSRMLS_C); } - | function_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } - | class_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } - | T_HALT_COMPILER '(' ')' ';' { zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } + statement { $$.u.ast = $1.u.ast; } + | function_declaration_statement { $$.u.ast = $1.u.ast; } + | class_declaration_statement { $$.u.ast = $1.u.ast; } + | T_HALT_COMPILER '(' ')' ';' { AN($$); zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } | T_NAMESPACE namespace_name ';' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); AS($$); } - | T_NAMESPACE namespace_name '{' { zend_do_begin_namespace(&$2, 1 TSRMLS_CC); } - top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } - | T_NAMESPACE '{' { zend_do_begin_namespace(NULL, 1 TSRMLS_CC); } - top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); } + | T_NAMESPACE namespace_name '{' top_statement_list '}' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), $4.u.ast); } + | T_NAMESPACE '{' top_statement_list '}' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $3.u.ast); } | T_USE use_declarations ';' - { $2.u.ast->attr = T_CLASS; AS($2); zend_verify_namespace(TSRMLS_C); } + { $$.u.ast = $2.u.ast; $$.u.ast->attr = T_CLASS; } | T_USE T_FUNCTION use_declarations ';' - { $3.u.ast->attr = T_FUNCTION; AS($3); zend_verify_namespace(TSRMLS_C); } + { $$.u.ast = $3.u.ast; $$.u.ast->attr = T_FUNCTION; } | T_USE T_CONST use_declarations ';' - { $3.u.ast->attr = T_CONST; AS($3); zend_verify_namespace(TSRMLS_C); } - | T_CONST const_list ';' { AS($2); zend_verify_namespace(TSRMLS_C); } + { $$.u.ast = $3.u.ast; $$.u.ast->attr = T_CONST; } + | T_CONST const_list ';' { $$.u.ast = $2.u.ast; } ; use_declarations: -- cgit v1.2.1 From cc0bef6636a1a850f9171c1cf578d1fd6a63a94b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 13:25:47 +0200 Subject: Fix namespace\, maybe --- Zend/zend_compile.c | 55 +++++++++++++++++++++++++++++++-------------- Zend/zend_compile.h | 8 +++---- Zend/zend_language_parser.y | 10 ++++----- 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7af3c4c7be..85224d69e3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -738,20 +738,32 @@ void *zend_hash_find_ptr_lc(HashTable *ht, char *str, size_t len) { } zend_string *zend_resolve_non_class_name( - zend_string *name, zend_bool *is_fully_qualified, + zend_string *name, zend_uint type, zend_bool *is_fully_qualified, zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC ) { char *compound; + *is_fully_qualified = 0; if (name->val[0] == '\\') { /* Remove \ prefix (only relevant if this is a string rather than a label) */ return STR_INIT(name->val + 1, name->len - 1, 0); } - if (*is_fully_qualified) { + if (type == ZEND_NAME_FQ) { + *is_fully_qualified = 1; return STR_COPY(name); } + if (type == ZEND_NAME_RELATIVE) { + *is_fully_qualified = 1; + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + return zend_concat_names(Z_STRVAL(CG(current_namespace)), + Z_STRLEN(CG(current_namespace)), name->val, name->len); + } else { + return STR_COPY(name); + } + } + if (current_import_sub) { /* If an unqualified name is a function/const alias, replace it. */ zend_string *import_name; @@ -793,25 +805,34 @@ zend_string *zend_resolve_non_class_name( /* }}} */ zend_string *zend_resolve_function_name( - zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC + zend_string *name, zend_uint type, zend_bool *is_fully_qualified TSRMLS_DC ) { return zend_resolve_non_class_name( - name, is_fully_qualified, 0, CG(current_import_function) TSRMLS_CC); + name, type, is_fully_qualified, 0, CG(current_import_function) TSRMLS_CC); } zend_string *zend_resolve_const_name( - zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC + zend_string *name, zend_uint type, zend_bool *is_fully_qualified TSRMLS_DC ) { return zend_resolve_non_class_name( - name, is_fully_qualified, 1, CG(current_import_const) TSRMLS_CC); + name, type, is_fully_qualified, 1, CG(current_import_const) TSRMLS_CC); } zend_string *zend_resolve_class_name( - zend_string *name, zend_bool is_fully_qualified TSRMLS_DC + zend_string *name, zend_uint type TSRMLS_DC ) { char *compound; - if (is_fully_qualified || name->val[0] == '\\') { + if (type == ZEND_NAME_RELATIVE) { + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + return zend_concat_names(Z_STRVAL(CG(current_namespace)), + Z_STRLEN(CG(current_namespace)), name->val, name->len); + } else { + return STR_COPY(name); + } + } + + if (type == ZEND_NAME_FQ || name->val[0] == '\\') { /* Remove \ prefix (only relevant if this is a string rather than a label) */ if (name->val[0] == '\\') { name = STR_INIT(name->val + 1, name->len - 1, 0); @@ -858,13 +879,12 @@ zend_string *zend_resolve_class_name( zend_string *zend_resolve_class_name_ast(zend_ast *ast TSRMLS_DC) { zend_string *name = Z_STR_P(zend_ast_get_zval(ast)); - zend_bool is_fully_qualified = !ast->attr; - return zend_resolve_class_name(name, is_fully_qualified TSRMLS_CC); + return zend_resolve_class_name(name, ast->attr TSRMLS_CC); } void zend_resolve_class_name_old(znode *class_name TSRMLS_DC) { zend_string *resolved_name = zend_resolve_class_name( - Z_STR(class_name->u.constant), 0 TSRMLS_CC); + Z_STR(class_name->u.constant), ZEND_NAME_NOT_FQ TSRMLS_CC); zval_dtor(&class_name->u.constant); ZVAL_STR(&class_name->u.constant, resolved_name); } @@ -4488,11 +4508,11 @@ zend_op *zend_compile_call_common(znode *result, zend_ast *args_ast, zend_functi zend_bool zend_compile_function_name(znode *name_node, zend_ast *name_ast TSRMLS_DC) { zend_string *orig_name = Z_STR_P(zend_ast_get_zval(name_ast)); - zend_bool is_fully_qualified = !name_ast->attr; + zend_bool is_fully_qualified; name_node->op_type = IS_CONST; ZVAL_STR(&name_node->u.constant, zend_resolve_function_name( - orig_name, &is_fully_qualified TSRMLS_CC)); + orig_name, name_ast->attr, &is_fully_qualified TSRMLS_CC)); return !is_fully_qualified && Z_TYPE(CG(current_namespace)) != IS_UNDEF; } @@ -6958,12 +6978,13 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; zend_string *orig_name = Z_STR_P(zend_ast_get_zval(name_ast)); - zend_bool is_fully_qualified = !name_ast->attr; + zend_bool is_fully_qualified; zval resolved_name; zend_op *opline; - ZVAL_STR(&resolved_name, zend_resolve_const_name(orig_name, &is_fully_qualified TSRMLS_CC)); + ZVAL_STR(&resolved_name, zend_resolve_const_name( + orig_name, name_ast->attr, &is_fully_qualified TSRMLS_CC)); if (zend_constant_ct_subst(result, &resolved_name, 1 TSRMLS_CC)) { zval_dtor(&resolved_name); @@ -7245,7 +7266,7 @@ void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zend_ast *name_ast = ast->child[0]; zval *orig_name = zend_ast_get_zval(name_ast); - zend_bool is_fully_qualified = !name_ast->attr; + zend_bool is_fully_qualified; znode result; zval resolved_name; @@ -7257,7 +7278,7 @@ void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { } ZVAL_STR(&resolved_name, zend_resolve_const_name( - Z_STR_P(orig_name), &is_fully_qualified TSRMLS_CC)); + Z_STR_P(orig_name), name_ast->attr, &is_fully_qualified TSRMLS_CC)); Z_TYPE_INFO(resolved_name) = IS_CONSTANT_EX; if (!is_fully_qualified) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 70bea8e914..59f2f6b706 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -460,10 +460,7 @@ ZEND_API zend_string *zend_get_compiled_filename(TSRMLS_D); ZEND_API int zend_get_compiled_lineno(TSRMLS_D); ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D); -zend_string *zend_resolve_non_class_name(zend_string *name, zend_bool *is_fully_qualified, zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC); -zend_string *zend_resolve_function_name(zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC); -zend_string *zend_resolve_const_name(zend_string *name, zend_bool *is_fully_qualified TSRMLS_DC); -zend_string *zend_resolve_class_name(zend_string *name, zend_bool is_fully_qualified TSRMLS_DC); +zend_string *zend_resolve_class_name(zend_string *name, zend_uint type TSRMLS_DC); ZEND_API zend_string *zend_get_compiled_variable_name(const zend_op_array *op_array, zend_uint var); void zend_resolve_class_name_old(znode *class_name TSRMLS_DC); @@ -630,6 +627,9 @@ int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC); #define ZEND_PARAM_REF (1<<0) #define ZEND_PARAM_VARIADIC (1<<1) +#define ZEND_NAME_FQ 0 +#define ZEND_NAME_NOT_FQ 1 +#define ZEND_NAME_RELATIVE 2 /* unset types */ #define ZEND_UNSET_REG 0 diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 0d4528314b..9025e912ea 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -236,13 +236,11 @@ namespace_name: name: namespace_name - { $$.u.ast = zend_ast_create_zval_ex(&$1.u.constant, 1); } + { $$.u.ast = zend_ast_create_zval_ex(&$1.u.constant, ZEND_NAME_NOT_FQ); } | T_NAMESPACE T_NS_SEPARATOR namespace_name - { ZVAL_EMPTY_STRING(&$1.u.constant); - zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); - $$.u.ast = AST_ZVAL(&$1); } + { $$.u.ast = zend_ast_create_zval_ex(&$3.u.constant, ZEND_NAME_RELATIVE); } | T_NS_SEPARATOR namespace_name - { $$.u.ast = AST_ZVAL(&$2); } + { $$.u.ast = zend_ast_create_zval_ex(&$2.u.constant, ZEND_NAME_FQ); } ; /* TODO.AST early binding! */ @@ -916,7 +914,7 @@ function_call: class_name: T_STATIC { zval zv; ZVAL_STRINGL(&zv, "static", sizeof("static")-1); - $$.u.ast = zend_ast_create_zval_ex(&zv, 1); } + $$.u.ast = zend_ast_create_zval_ex(&zv, ZEND_NAME_NOT_FQ); } | name { $$.u.ast = $1.u.ast; } ; -- cgit v1.2.1 From 130b6340d2986a0c679291d6d0bf830dd9ac1100 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 13:30:26 +0200 Subject: Code cleanup --- Zend/zend_compile.c | 99 ++++++++--------------------------------------------- Zend/zend_compile.h | 4 --- 2 files changed, 15 insertions(+), 88 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 85224d69e3..77be3d6482 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -728,6 +728,15 @@ zend_string *zend_concat_names(char *name1, size_t name1_len, char *name2, size_ return zend_concat3(name1, name1_len, "\\", 1, name2, name2_len); } +zend_string *zend_prefix_with_ns(zend_string *name TSRMLS_DC) { + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + zend_string *ns = Z_STR(CG(current_namespace)); + return zend_concat_names(ns->val, ns->len, name->val, name->len); + } else { + return STR_COPY(name); + } +} + void *zend_hash_find_ptr_lc(HashTable *ht, char *str, size_t len) { void *result; zend_string *lcname = STR_ALLOC(len, 0); @@ -756,12 +765,7 @@ zend_string *zend_resolve_non_class_name( if (type == ZEND_NAME_RELATIVE) { *is_fully_qualified = 1; - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - return zend_concat_names(Z_STRVAL(CG(current_namespace)), - Z_STRLEN(CG(current_namespace)), name->val, name->len); - } else { - return STR_COPY(name); - } + return zend_prefix_with_ns(name TSRMLS_CC); } if (current_import_sub) { @@ -795,12 +799,7 @@ zend_string *zend_resolve_non_class_name( } } - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - return zend_concat_names( - Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); - } - - return STR_COPY(name); + return zend_prefix_with_ns(name TSRMLS_CC); } /* }}} */ @@ -824,12 +823,7 @@ zend_string *zend_resolve_class_name( char *compound; if (type == ZEND_NAME_RELATIVE) { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - return zend_concat_names(Z_STRVAL(CG(current_namespace)), - Z_STRLEN(CG(current_namespace)), name->val, name->len); - } else { - return STR_COPY(name); - } + return zend_prefix_with_ns(name TSRMLS_CC); } if (type == ZEND_NAME_FQ || name->val[0] == '\\') { @@ -869,12 +863,7 @@ zend_string *zend_resolve_class_name( } /* If not fully qualified and not an alias, prepend the current namespace */ - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - return zend_concat_names( - Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); - } - - return STR_COPY(name); + return zend_prefix_with_ns(name TSRMLS_CC); } zend_string *zend_resolve_class_name_ast(zend_ast *ast TSRMLS_DC) { @@ -882,54 +871,6 @@ zend_string *zend_resolve_class_name_ast(zend_ast *ast TSRMLS_DC) { return zend_resolve_class_name(name, ast->attr TSRMLS_CC); } -void zend_resolve_class_name_old(znode *class_name TSRMLS_DC) { - zend_string *resolved_name = zend_resolve_class_name( - Z_STR(class_name->u.constant), ZEND_NAME_NOT_FQ TSRMLS_CC); - zval_dtor(&class_name->u.constant); - ZVAL_STR(&class_name->u.constant, resolved_name); -} - -void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC) /* {{{ */ -{ - long fetch_class_op_number; - zend_op *opline; - - fetch_class_op_number = get_next_op_number(CG(active_op_array)); - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_FETCH_CLASS; - SET_UNUSED(opline->op1); - opline->extended_value = ZEND_FETCH_CLASS_DEFAULT; - CG(catch_begin) = fetch_class_op_number; - if (class_name->op_type == IS_CONST) { - int fetch_type; - - fetch_type = zend_get_class_fetch_type(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant)); - switch (fetch_type) { - case ZEND_FETCH_CLASS_SELF: - case ZEND_FETCH_CLASS_PARENT: - case ZEND_FETCH_CLASS_STATIC: - SET_UNUSED(opline->op2); - opline->extended_value = fetch_type; - zval_dtor(&class_name->u.constant); - break; - default: - zend_resolve_class_name_old(class_name TSRMLS_CC); - opline->op2_type = IS_CONST; - opline->op2.constant = - zend_add_class_name_literal(CG(active_op_array), Z_STR(class_name->u.constant) TSRMLS_CC); - break; - } - } else { - SET_NODE(opline->op2, class_name); - } - opline->result.var = get_temporary_variable(CG(active_op_array)); - opline->result_type = IS_VAR; /* FIXME: Hack so that INIT_FCALL_BY_NAME still knows this is a class */ - GET_NODE(result, opline->result); - result->EA = opline->extended_value; -} -/* }}} */ - static void ptr_dtor(zval *zv) /* {{{ */ { efree(Z_PTR_P(zv)); @@ -5729,12 +5670,7 @@ static void zend_begin_func_decl( zend_string *name = decl->name, *lcname; zend_op *opline; - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - op_array->function_name = name = zend_concat_names( - Z_STRVAL(CG(current_namespace)), Z_STRLEN(CG(current_namespace)), name->val, name->len); - } else { - op_array->function_name = STR_COPY(name); - } + op_array->function_name = name = zend_prefix_with_ns(name TSRMLS_CC); lcname = STR_ALLOC(name->len, 0); zend_str_tolower_copy(lcname->val, name->val, name->len); @@ -6444,12 +6380,7 @@ void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { 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); - } + name = zend_prefix_with_ns(name TSRMLS_CC); if (CG(current_import_const) && (import_name = zend_hash_find_ptr(CG(current_import_const), name)) diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 59f2f6b706..ce9c0062f1 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -460,11 +460,8 @@ ZEND_API zend_string *zend_get_compiled_filename(TSRMLS_D); ZEND_API int zend_get_compiled_lineno(TSRMLS_D); ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D); -zend_string *zend_resolve_class_name(zend_string *name, zend_uint type TSRMLS_DC); ZEND_API zend_string *zend_get_compiled_variable_name(const zend_op_array *op_array, zend_uint var); -void zend_resolve_class_name_old(znode *class_name TSRMLS_DC); - #ifdef ZTS const char *zend_get_zendtext(TSRMLS_D); int zend_get_zendleng(TSRMLS_D); @@ -481,7 +478,6 @@ ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC); 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_fetch_class(znode *result, znode *class_name TSRMLS_DC); void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC); void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC); void zend_do_handle_exception(TSRMLS_D); -- cgit v1.2.1 From 776800b0a01793df0e907bc1dc0976ba8dd378d0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 13:52:35 +0200 Subject: Discard NS doc comments --- Zend/zend_compile.c | 7 +++++++ Zend/zend_compile.h | 2 ++ Zend/zend_language_parser.y | 16 +++++++++------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 77be3d6482..696845cf40 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -551,6 +551,13 @@ static inline zend_bool zend_is_function_or_method_call(const znode *variable) / #define MAKE_NOP(opline) { opline->opcode = ZEND_NOP; memset(&opline->result,0,sizeof(opline->result)); memset(&opline->op1,0,sizeof(opline->op1)); memset(&opline->op2,0,sizeof(opline->op2)); opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; } +void zend_discard_doc_comment(TSRMLS_D) { + if (CG(doc_comment)) { + STR_RELEASE(CG(doc_comment)); + CG(doc_comment) = NULL; + } +} + static void zend_do_op_data(zend_op *data_op, znode *value TSRMLS_DC) /* {{{ */ { data_op->opcode = ZEND_OP_DATA; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index ce9c0062f1..db7573a5fa 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -474,6 +474,8 @@ ZEND_API unary_op_type get_unary_op(int opcode); ZEND_API binary_op_type get_binary_op(int opcode); ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC); +void zend_discard_doc_comment(TSRMLS_D); + /* parser-driven code generators */ void zend_do_free(znode *op1 TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 9025e912ea..a47ffbb2bb 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -250,11 +250,14 @@ top_statement: | class_declaration_statement { $$.u.ast = $1.u.ast; } | T_HALT_COMPILER '(' ')' ';' { AN($$); zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } | T_NAMESPACE namespace_name ';' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); } - | T_NAMESPACE namespace_name '{' top_statement_list '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), $4.u.ast); } - | T_NAMESPACE '{' top_statement_list '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $3.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); + zend_discard_doc_comment(TSRMLS_C); } + | T_NAMESPACE namespace_name { zend_discard_doc_comment(TSRMLS_C); } + '{' top_statement_list '}' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), $5.u.ast); } + | T_NAMESPACE { zend_discard_doc_comment(TSRMLS_C); } + '{' top_statement_list '}' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $4.u.ast); } | T_USE use_declarations ';' { $$.u.ast = $2.u.ast; $$.u.ast->attr = T_CLASS; } | T_USE T_FUNCTION use_declarations ';' @@ -608,8 +611,7 @@ class_statement: variable_modifiers property_list ';' { $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); } | T_CONST class_const_list ';' - { $$.u.ast = $2.u.ast; - if (CG(doc_comment)) { STR_RELEASE(CG(doc_comment)); CG(doc_comment) = NULL; } } + { $$.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 -- cgit v1.2.1 From de2f132f33aedb0945d99ac1b9ccf079795c6d28 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 14:08:52 +0200 Subject: Add NS error checks Those can probably be implemented in a better way now... --- Zend/zend_compile.c | 128 ++++++++++++++------------------------------ Zend/zend_compile.h | 1 - Zend/zend_language_parser.y | 1 - 3 files changed, 41 insertions(+), 89 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 696845cf40..eb7a8f1fd5 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3432,91 +3432,6 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM } /* }}} */ -void zend_do_begin_namespace(znode *name, zend_bool with_bracket TSRMLS_DC) /* {{{ */ -{ - char *lcname; - - /* handle mixed syntax declaration or nested namespaces */ - if (!CG(has_bracketed_namespaces)) { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - /* previous namespace declarations were unbracketed */ - if (with_bracket) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot mix bracketed namespace declarations with unbracketed namespace declarations"); - } - } - } else { - /* previous namespace declarations were bracketed */ - if (!with_bracket) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot mix bracketed namespace declarations with unbracketed namespace declarations"); - } else if (Z_TYPE(CG(current_namespace)) != IS_UNDEF || CG(in_namespace)) { - zend_error_noreturn(E_COMPILE_ERROR, "Namespace declarations cannot be nested"); - } - } - - if (((!with_bracket && Z_TYPE(CG(current_namespace)) == IS_UNDEF) || (with_bracket && !CG(has_bracketed_namespaces))) && CG(active_op_array)->last > 0) { - /* ignore ZEND_EXT_STMT and ZEND_TICKS */ - int num = CG(active_op_array)->last; - while (num > 0 && - (CG(active_op_array)->opcodes[num-1].opcode == ZEND_EXT_STMT || - CG(active_op_array)->opcodes[num-1].opcode == ZEND_TICKS)) { - --num; - } - if (num > 0) { - zend_error_noreturn(E_COMPILE_ERROR, "Namespace declaration statement has to be the very first statement in the script"); - } - } - - CG(in_namespace) = 1; - if (with_bracket) { - CG(has_bracketed_namespaces) = 1; - } - - if (name) { - lcname = zend_str_tolower_dup(Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant)); - if (((Z_STRLEN(name->u.constant) == sizeof("self")-1) && - !memcmp(lcname, "self", sizeof("self")-1)) || - ((Z_STRLEN(name->u.constant) == sizeof("parent")-1) && - !memcmp(lcname, "parent", sizeof("parent")-1))) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as namespace name", Z_STRVAL(name->u.constant)); - } - efree(lcname); - - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - zval_dtor(&CG(current_namespace)); - } - ZVAL_COPY_VALUE(&CG(current_namespace), &name->u.constant); - } else { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - zval_dtor(&CG(current_namespace)); - ZVAL_UNDEF(&CG(current_namespace)); - } - } - - if (CG(current_import)) { - zend_hash_destroy(CG(current_import)); - efree(CG(current_import)); - CG(current_import) = NULL; - } - - if (CG(current_import_function)) { - zend_hash_destroy(CG(current_import_function)); - efree(CG(current_import_function)); - CG(current_import_function) = NULL; - } - - if (CG(current_import_const)) { - zend_hash_destroy(CG(current_import_const)); - efree(CG(current_import_const)); - CG(current_import_const) = NULL; - } - - if (CG(doc_comment)) { - STR_RELEASE(CG(doc_comment)); - CG(doc_comment) = NULL; - } -} -/* }}} */ - void zend_verify_namespace(TSRMLS_D) /* {{{ */ { if (CG(has_bracketed_namespaces) && !CG(in_namespace)) { @@ -6431,9 +6346,44 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; zend_ast *stmt_ast = ast->child[1]; zend_string *name; + zend_bool with_bracket = stmt_ast != NULL; // TODO.AST errors! + /* handle mixed syntax declaration or nested namespaces */ + if (!CG(has_bracketed_namespaces)) { + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + /* previous namespace declarations were unbracketed */ + if (with_bracket) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot mix bracketed namespace declarations " + "with unbracketed namespace declarations"); + } + } + } else { + /* previous namespace declarations were bracketed */ + if (!with_bracket) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot mix bracketed namespace declarations " + "with unbracketed namespace declarations"); + } else if (Z_TYPE(CG(current_namespace)) != IS_UNDEF || CG(in_namespace)) { + zend_error_noreturn(E_COMPILE_ERROR, "Namespace declarations cannot be nested"); + } + } + + if (((!with_bracket && Z_TYPE(CG(current_namespace)) == IS_UNDEF) + || (with_bracket && !CG(has_bracketed_namespaces))) && CG(active_op_array)->last > 0 + ) { + /* ignore ZEND_EXT_STMT and ZEND_TICKS */ + zend_uint num = CG(active_op_array)->last; + while (num > 0 && + (CG(active_op_array)->opcodes[num-1].opcode == ZEND_EXT_STMT || + CG(active_op_array)->opcodes[num-1].opcode == ZEND_TICKS)) { + --num; + } + if (num > 0) { + zend_error_noreturn(E_COMPILE_ERROR, "Namespace declaration statement has to be the very first statement in the script"); + } + } + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { zval_dtor(&CG(current_namespace)); } @@ -6452,9 +6402,10 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { zend_reset_import_tables(TSRMLS_C); - // TODO.AST reset doc comment - CG(in_namespace) = 1; + if (with_bracket) { + CG(has_bracketed_namespaces) = 1; + } if (stmt_ast) { zend_compile_top_stmt(stmt_ast TSRMLS_CC); @@ -7324,6 +7275,9 @@ void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC) { } zend_compile_stmt(ast TSRMLS_CC); + if (ast->kind != ZEND_AST_NAMESPACE) { + zend_verify_namespace(TSRMLS_C); + } if (ast->kind == ZEND_AST_FUNC_DECL || ast->kind == ZEND_AST_CLASS) { zend_do_early_binding(TSRMLS_C); } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index db7573a5fa..9ee197050b 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -516,7 +516,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_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); void zend_verify_namespace(TSRMLS_D); void zend_do_end_compilation(TSRMLS_D); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index a47ffbb2bb..81e961dede 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -243,7 +243,6 @@ name: { $$.u.ast = zend_ast_create_zval_ex(&$2.u.constant, ZEND_NAME_FQ); } ; -/* TODO.AST early binding! */ top_statement: statement { $$.u.ast = $1.u.ast; } | function_declaration_statement { $$.u.ast = $1.u.ast; } -- cgit v1.2.1 From 3becdb3376b5ce171383c164a98a89ce36d20126 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 14:22:59 +0200 Subject: __halt_compiler() without haling compiler --- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 24 ++++++++++++++++++++++-- Zend/zend_language_parser.y | 6 +++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 7d72d4ec4e..1937703f0b 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -123,6 +123,7 @@ enum _zend_ast_kind { ZEND_AST_USE, ZEND_AST_USE_ELEM, ZEND_AST_NAMESPACE, + ZEND_AST_HALT_COMPILER, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index eb7a8f1fd5..381580c4e6 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6348,8 +6348,6 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { zend_string *name; zend_bool with_bracket = stmt_ast != NULL; - // TODO.AST errors! - /* handle mixed syntax declaration or nested namespaces */ if (!CG(has_bracketed_namespaces)) { if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { @@ -6420,6 +6418,25 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { } } +void zend_compile_halt_compiler(zend_ast *ast TSRMLS_DC) { + zend_ast *offset_ast = ast->child[0]; + long offset = Z_LVAL_P(zend_ast_get_zval(offset_ast)); + + zend_string *filename, *name; + const char const_name[] = "__COMPILER_HALT_OFFSET__"; + + if (CG(has_bracketed_namespaces) && CG(in_namespace)) { + zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); + } + + filename = zend_get_compiled_filename(TSRMLS_C); + name = zend_mangle_property_name(const_name, sizeof(const_name) - 1, + filename->val, filename->len, 0); + + zend_register_long_constant(name->val, name->len, offset, CONST_CS, 0 TSRMLS_CC); + STR_RELEASE(name); +} + 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]; @@ -7368,6 +7385,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_NAMESPACE: zend_compile_namespace(ast TSRMLS_CC); break; + case ZEND_AST_HALT_COMPILER: + zend_compile_halt_compiler(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 81e961dede..c0d50622e7 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -247,7 +247,11 @@ top_statement: statement { $$.u.ast = $1.u.ast; } | function_declaration_statement { $$.u.ast = $1.u.ast; } | class_declaration_statement { $$.u.ast = $1.u.ast; } - | T_HALT_COMPILER '(' ')' ';' { AN($$); zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } + | T_HALT_COMPILER '(' ')' ';' + { zval offset_zv; ZVAL_LONG(&offset_zv, zend_get_scanned_file_offset(TSRMLS_C)); + $$.u.ast = zend_ast_create_unary(ZEND_AST_HALT_COMPILER, + zend_ast_create_zval(&offset_zv)); + /*YYACCEPT;*/ } | T_NAMESPACE namespace_name ';' { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); zend_discard_doc_comment(TSRMLS_C); } -- cgit v1.2.1 From 2653b8b5dcc12ffeb99372a4ea9748f2a83bdf1e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 15:50:23 +0200 Subject: Handle __halt_compiler() --- Zend/tests/bug60099.phpt | 2 +- Zend/zend_compile.c | 7 ++++++- Zend/zend_compile.h | 1 + Zend/zend_language_parser.y | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Zend/tests/bug60099.phpt b/Zend/tests/bug60099.phpt index 13e2f54b09..8cca3440fb 100644 --- a/Zend/tests/bug60099.phpt +++ b/Zend/tests/bug60099.phpt @@ -7,4 +7,4 @@ namespace foo { ?> --EXPECTF-- -Fatal error: __HALT_COMPILER() can only be used from the outermost scope in %s on line %d +Parse error: syntax error, unexpected end of file in %s on line %d diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 381580c4e6..436e2e9858 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -558,6 +558,10 @@ void zend_discard_doc_comment(TSRMLS_D) { } } +void zend_stop_lexing(TSRMLS_D) { + LANG_SCNG(yy_cursor) = LANG_SCNG(yy_limit); +} + static void zend_do_op_data(zend_op *data_op, znode *value TSRMLS_DC) /* {{{ */ { data_op->opcode = ZEND_OP_DATA; @@ -7292,7 +7296,8 @@ void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC) { } zend_compile_stmt(ast TSRMLS_CC); - if (ast->kind != ZEND_AST_NAMESPACE) { + + if (ast->kind != ZEND_AST_NAMESPACE && ast->kind != ZEND_AST_HALT_COMPILER) { zend_verify_namespace(TSRMLS_C); } if (ast->kind == ZEND_AST_FUNC_DECL || ast->kind == ZEND_AST_CLASS) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 9ee197050b..aa9a85bccd 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -475,6 +475,7 @@ ZEND_API binary_op_type get_binary_op(int opcode); ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC); void zend_discard_doc_comment(TSRMLS_D); +void zend_stop_lexing(TSRMLS_D); /* parser-driven code generators */ void zend_do_free(znode *op1 TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index c0d50622e7..070b12f59a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -251,7 +251,7 @@ top_statement: { zval offset_zv; ZVAL_LONG(&offset_zv, zend_get_scanned_file_offset(TSRMLS_C)); $$.u.ast = zend_ast_create_unary(ZEND_AST_HALT_COMPILER, zend_ast_create_zval(&offset_zv)); - /*YYACCEPT;*/ } + zend_stop_lexing(TSRMLS_C); } | T_NAMESPACE namespace_name ';' { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); zend_discard_doc_comment(TSRMLS_C); } -- cgit v1.2.1 From b9be66ebf2fa59b18dc248c64e8052b1d783b779 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 16:11:19 +0200 Subject: Implement declare() --- Zend/tests/bug43323.phpt | 2 +- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 90 ++++++++++++++++++++++ Zend/zend_language_parser.y | 18 +---- ext/standard/tests/general_functions/bug41037.phpt | 9 +-- 5 files changed, 100 insertions(+), 20 deletions(-) diff --git a/Zend/tests/bug43323.phpt b/Zend/tests/bug43323.phpt index d366a6dd1f..f2d279ddd3 100644 --- a/Zend/tests/bug43323.phpt +++ b/Zend/tests/bug43323.phpt @@ -9,4 +9,4 @@ abstract class bar { class foo extends bar { } --EXPECTF-- -Fatal error: Class foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (bar::bar) in %sbug43323.php on line 7 +Fatal error: Class foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (bar::bar) in %sbug43323.php on line 6 diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 1937703f0b..d4d4933af0 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -94,6 +94,7 @@ enum _zend_ast_kind { ZEND_AST_TRY, ZEND_AST_CATCH_LIST, ZEND_AST_CATCH, + ZEND_AST_DECLARE, ZEND_AST_PARAM_LIST, ZEND_AST_PARAM, diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 436e2e9858..4b37613acf 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5235,6 +5235,93 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { efree(jmp_opnums); } +void zend_compile_declare(zend_ast *ast TSRMLS_DC) { + zend_ast *declares_ast = ast->child[0]; + zend_ast *stmt_ast = ast->child[1]; + zend_uint i; + + zend_stack_push(&CG(declare_stack), &CG(declarables)); + + for (i = 0; i < declares_ast->children; ++i) { + zend_ast *declare_ast = declares_ast->child[i]; + zend_ast *name_ast = declare_ast->child[0]; + zend_ast *value_ast = declare_ast->child[1]; + + zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); + zval value_zv; + + _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); + + if (!zend_binary_strcasecmp(name->val, name->len, "ticks", sizeof("ticks") - 1)) { + convert_to_long(&value_zv); + ZVAL_COPY_VALUE(&CG(declarables).ticks, &value_zv); + } else if (!zend_binary_strcasecmp(name->val, name->len, "encoding", sizeof("encoding") - 1)) { + if (Z_TYPE(value_zv) == IS_CONSTANT) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use constants as encoding"); + } + + /* + * Check that the pragma comes before any opcodes. If the compilation + * got as far as this, the previous portion of the script must have been + * parseable according to the .ini script_encoding setting. We still + * want to tell them to put declare() at the top. + */ + { + zend_uint num = CG(active_op_array)->last; + /* ignore ZEND_EXT_STMT and ZEND_TICKS */ + while (num > 0 && + (CG(active_op_array)->opcodes[num-1].opcode == ZEND_EXT_STMT || + CG(active_op_array)->opcodes[num-1].opcode == ZEND_TICKS)) { + --num; + } + + if (num > 0) { + zend_error_noreturn(E_COMPILE_ERROR, "Encoding declaration pragma must be " + "the very first statement in the script"); + } + } + + if (CG(multibyte)) { + const zend_encoding *new_encoding, *old_encoding; + zend_encoding_filter old_input_filter; + + CG(encoding_declared) = 1; + + convert_to_string(&value_zv); + new_encoding = zend_multibyte_fetch_encoding(Z_STRVAL(value_zv) TSRMLS_CC); + if (!new_encoding) { + zend_error(E_COMPILE_WARNING, "Unsupported encoding [%s]", Z_STRVAL(value_zv)); + } else { + old_input_filter = LANG_SCNG(input_filter); + old_encoding = LANG_SCNG(script_encoding); + zend_multibyte_set_filter(new_encoding TSRMLS_CC); + + /* need to re-scan if input filter changed */ + if (old_input_filter != LANG_SCNG(input_filter) || + (old_input_filter && new_encoding != old_encoding)) { + zend_multibyte_yyinput_again(old_input_filter, old_encoding TSRMLS_CC); + } + } + } else { + zend_error(E_COMPILE_WARNING, "declare(encoding=...) ignored because " + "Zend multibyte feature is turned off by settings"); + } + zval_dtor(&value_zv); + } else { + zend_error(E_COMPILE_WARNING, "Unsupported declare '%s'", name->val); + zval_dtor(&value_zv); + } + } + + if (stmt_ast) { + zend_declarables *declarables = zend_stack_top(&CG(declare_stack)); + + zend_compile_stmt(stmt_ast TSRMLS_CC); + + CG(declarables) = *declarables; + } +} + void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { zend_uint i; for (i = 0; i < ast->children; ++i) { @@ -7365,6 +7452,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_TRY: zend_compile_try(ast TSRMLS_CC); break; + case ZEND_AST_DECLARE: + zend_compile_declare(ast TSRMLS_CC); + break; case ZEND_AST_FUNC_DECL: case ZEND_AST_METHOD: zend_compile_func_decl(NULL, ast TSRMLS_CC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 070b12f59a..603ecd86b1 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -349,7 +349,8 @@ unticked_statement: foreach_statement { $$.u.ast = zend_ast_create(4, ZEND_AST_FOREACH, $3.u.ast, $7.u.ast, $5.u.ast, $9.u.ast); } - | T_DECLARE { $1.u.op.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); AN($$); } + | T_DECLARE '(' const_list ')' declare_statement + { $$.u.ast = zend_ast_create_binary(ZEND_AST_DECLARE, $3.u.ast, $5.u.ast); } | ';' /* empty statement */ { $$.u.ast = NULL; } | T_TRY '{' inner_statement_list '}' catch_list finally_statement { $$.u.ast = zend_ast_create_ternary(ZEND_AST_TRY, $3.u.ast, $5.u.ast, $6.u.ast); } @@ -457,17 +458,10 @@ foreach_statement: declare_statement: - statement { AS($1); } - | ':' inner_statement_list T_ENDDECLARE ';' { AS($2); } -; - - -declare_list: - T_STRING '=' static_scalar { zend_do_declare_stmt(&$1, &$3 TSRMLS_CC); } - | declare_list ',' T_STRING '=' static_scalar { zend_do_declare_stmt(&$3, &$5 TSRMLS_CC); } + statement { $$.u.ast = $1.u.ast; } + | ':' inner_statement_list T_ENDDECLARE ';' { $$.u.ast = $2.u.ast; } ; - switch_case_list: '{' case_list '}' { $$.u.ast = $2.u.ast; } | '{' ';' case_list '}' { $$.u.ast = $3.u.ast; } @@ -955,10 +949,6 @@ dereferencable_scalar: | T_CONSTANT_ENCAPSED_STRING { $$.u.ast = AST_ZVAL(&$1); } ; -static_scalar: /* compile-time evaluated scalars */ - expr { zend_do_constant_expression(&$$, $1.u.ast TSRMLS_CC); } -; - scalar: T_LNUMBER { $$.u.ast = AST_ZVAL(&$1); } | T_DNUMBER { $$.u.ast = AST_ZVAL(&$1); } diff --git a/ext/standard/tests/general_functions/bug41037.phpt b/ext/standard/tests/general_functions/bug41037.phpt index eab2c334c9..0ffc8d58f6 100644 --- a/ext/standard/tests/general_functions/bug41037.phpt +++ b/ext/standard/tests/general_functions/bug41037.phpt @@ -8,10 +8,11 @@ function a() { unregister_tick_function('a'); } -declare (ticks=1); -register_tick_function('a'); +declare (ticks=1) { + register_tick_function('a'); -echo "Done\n"; + echo "Done\n"; +} ?> --EXPECTF-- hello @@ -19,5 +20,3 @@ Warning: unregister_tick_function(): Unable to delete tick function executed at Done hello Warning: unregister_tick_function(): Unable to delete tick function executed at the moment in %s on line %d -hello -Warning: unregister_tick_function(): Unable to delete tick function executed at the moment in %s on line %d -- cgit v1.2.1 From a7fc995fa2c4fb2af8ebe176b42524a95c9c46df Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 16:11:54 +0200 Subject: Dead code --- Zend/zend_compile.c | 79 ----------------------------------------------------- Zend/zend_compile.h | 4 --- 2 files changed, 83 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4b37613acf..dd9b49bcf9 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3089,85 +3089,6 @@ void zend_add_to_list(void *result, void *item TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_declare_begin(TSRMLS_D) /* {{{ */ -{ - zend_stack_push(&CG(declare_stack), &CG(declarables)); -} -/* }}} */ - -void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC) /* {{{ */ -{ - if (!zend_binary_strcasecmp(Z_STRVAL(var->u.constant), Z_STRLEN(var->u.constant), "ticks", sizeof("ticks")-1)) { - convert_to_long(&val->u.constant); - CG(declarables).ticks = val->u.constant; - } else if (!zend_binary_strcasecmp(Z_STRVAL(var->u.constant), Z_STRLEN(var->u.constant), "encoding", sizeof("encoding")-1)) { - if (Z_TYPE(val->u.constant) == IS_CONSTANT) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use constants as encoding"); - } - - /* - * Check that the pragma comes before any opcodes. If the compilation - * got as far as this, the previous portion of the script must have been - * parseable according to the .ini script_encoding setting. We still - * want to tell them to put declare() at the top. - */ - { - int num = CG(active_op_array)->last; - /* ignore ZEND_EXT_STMT and ZEND_TICKS */ - while (num > 0 && - (CG(active_op_array)->opcodes[num-1].opcode == ZEND_EXT_STMT || - CG(active_op_array)->opcodes[num-1].opcode == ZEND_TICKS)) { - --num; - } - - if (num > 0) { - zend_error_noreturn(E_COMPILE_ERROR, "Encoding declaration pragma must be the very first statement in the script"); - } - } - - if (CG(multibyte)) { - const zend_encoding *new_encoding, *old_encoding; - zend_encoding_filter old_input_filter; - - CG(encoding_declared) = 1; - - convert_to_string(&val->u.constant); - new_encoding = zend_multibyte_fetch_encoding(Z_STRVAL(val->u.constant) TSRMLS_CC); - if (!new_encoding) { - zend_error(E_COMPILE_WARNING, "Unsupported encoding [%s]", Z_STRVAL(val->u.constant)); - } else { - old_input_filter = LANG_SCNG(input_filter); - old_encoding = LANG_SCNG(script_encoding); - zend_multibyte_set_filter(new_encoding TSRMLS_CC); - - /* need to re-scan if input filter changed */ - if (old_input_filter != LANG_SCNG(input_filter) || - (old_input_filter && new_encoding != old_encoding)) { - zend_multibyte_yyinput_again(old_input_filter, old_encoding TSRMLS_CC); - } - } - } else { - zend_error(E_COMPILE_WARNING, "declare(encoding=...) ignored because Zend multibyte feature is turned off by settings"); - } - zval_dtor(&val->u.constant); - } else { - zend_error(E_COMPILE_WARNING, "Unsupported declare '%s'", Z_STRVAL(var->u.constant)); - zval_dtor(&val->u.constant); - } - zval_dtor(&var->u.constant); -} -/* }}} */ - -void zend_do_declare_end(const znode *declare_token TSRMLS_DC) /* {{{ */ -{ - zend_declarables *declarables = zend_stack_top(&CG(declare_stack)); - /* We should restore if there was more than (current - start) - (ticks?1:0) opcodes */ - if ((get_next_op_number(CG(active_op_array)) - declare_token->u.op.opline_num) - ((Z_LVAL(CG(declarables).ticks))?1:0)) { - CG(declarables) = *declarables; - } -} -/* }}} */ - void zend_do_extended_info(TSRMLS_D) /* {{{ */ { zend_op *opline; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index aa9a85bccd..1402df53a3 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -504,10 +504,6 @@ void zend_do_halt_compiler_register(TSRMLS_D); void zend_init_list(void *result, void *item TSRMLS_DC); void zend_add_to_list(void *result, void *item TSRMLS_DC); -void zend_do_declare_begin(TSRMLS_D); -void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC); -void zend_do_declare_end(const znode *declare_token TSRMLS_DC); - void zend_do_extended_info(TSRMLS_D); void zend_do_extended_fcall_begin(TSRMLS_D); void zend_do_extended_fcall_end(TSRMLS_D); -- cgit v1.2.1 From 43b2973ee75b7256dfce0dd18b725951aac6baf4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 16:18:13 +0200 Subject: Remove declare_stack --- Zend/zend.c | 3 --- Zend/zend_compile.c | 9 ++------- Zend/zend_globals.h | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index aec5b331ee..2b794455c0 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1036,7 +1036,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ zend_stack function_call_stack; zend_stack switch_cond_stack; zend_stack foreach_copy_stack; - zend_stack declare_stack; zend_stack list_stack; zend_stack context_stack; TSRMLS_FETCH(); @@ -1191,7 +1190,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ SAVE_STACK(function_call_stack); SAVE_STACK(switch_cond_stack); SAVE_STACK(foreach_copy_stack); - SAVE_STACK(declare_stack); SAVE_STACK(list_stack); SAVE_STACK(context_stack); CG(in_compilation) = 0; @@ -1216,7 +1214,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ RESTORE_STACK(function_call_stack); RESTORE_STACK(switch_cond_stack); RESTORE_STACK(foreach_copy_stack); - RESTORE_STACK(declare_stack); RESTORE_STACK(list_stack); RESTORE_STACK(context_stack); CG(in_compilation) = 1; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index dd9b49bcf9..d2306c47ce 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -187,7 +187,6 @@ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */ zend_stack_init(&CG(function_call_stack), sizeof(zend_function_call_entry)); zend_stack_init(&CG(switch_cond_stack), sizeof(zend_switch_entry)); zend_stack_init(&CG(foreach_copy_stack), sizeof(zend_op)); - zend_stack_init(&CG(declare_stack), sizeof(zend_declarables)); CG(active_class_entry) = NULL; zend_llist_init(&CG(list_llist), sizeof(list_llist_element), NULL, 0); zend_llist_init(&CG(dimension_llist), sizeof(int), NULL, 0); @@ -234,7 +233,6 @@ void shutdown_compiler(TSRMLS_D) /* {{{ */ zend_stack_destroy(&CG(function_call_stack)); zend_stack_destroy(&CG(switch_cond_stack)); zend_stack_destroy(&CG(foreach_copy_stack)); - zend_stack_destroy(&CG(declare_stack)); zend_stack_destroy(&CG(list_stack)); zend_hash_destroy(&CG(filenames_table)); zend_hash_destroy(&CG(const_filenames)); @@ -5159,10 +5157,9 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { void zend_compile_declare(zend_ast *ast TSRMLS_DC) { zend_ast *declares_ast = ast->child[0]; zend_ast *stmt_ast = ast->child[1]; + zend_declarables orig_declarables = CG(declarables); zend_uint i; - zend_stack_push(&CG(declare_stack), &CG(declarables)); - for (i = 0; i < declares_ast->children; ++i) { zend_ast *declare_ast = declares_ast->child[i]; zend_ast *name_ast = declare_ast->child[0]; @@ -5235,11 +5232,9 @@ void zend_compile_declare(zend_ast *ast TSRMLS_DC) { } if (stmt_ast) { - zend_declarables *declarables = zend_stack_top(&CG(declare_stack)); - zend_compile_stmt(stmt_ast TSRMLS_CC); - CG(declarables) = *declarables; + CG(declarables) = orig_declarables; } } diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index ee68a7be96..9b016380bc 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -74,7 +74,6 @@ struct _zend_compiler_globals { zend_stack switch_cond_stack; zend_stack foreach_copy_stack; zend_stack object_stack; /* TODO: remove */ - zend_stack declare_stack; zend_class_entry *active_class_entry; -- cgit v1.2.1 From 1859674061615f0f925c17f31c5953b5e727994f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 20:24:47 +0200 Subject: Port ZEND_BIND_GLOBAL optimization --- Zend/zend_compile.c | 25 ++++++++++++++----------- Zend/zend_language_parser.y | 3 ++- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 1100fc0f29..cc89a22e5b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4453,24 +4453,27 @@ void zend_compile_clone(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; + zend_ast *name_ast = var_ast->child[0]; - znode var_node, result; + znode name_node, result; - zend_compile_expr(&var_node, var_ast TSRMLS_CC); - if (var_node.op_type == IS_CONST) { - if (Z_TYPE(var_node.u.constant) != IS_STRING) { - convert_to_string(&var_node.u.constant); + zend_compile_expr(&name_node, name_ast TSRMLS_CC); + if (name_node.op_type == IS_CONST) { + if (Z_TYPE(name_node.u.constant) != IS_STRING) { + convert_to_string(&name_node.u.constant); } } - emit_op(&result, ZEND_FETCH_W, &var_node, NULL TSRMLS_CC); + if (zend_try_compile_cv(&result, var_ast TSRMLS_CC) == SUCCESS) { + emit_op(NULL, ZEND_BIND_GLOBAL, &result, &name_node TSRMLS_CC); + } else { + emit_op(&result, ZEND_FETCH_W, &name_node, NULL TSRMLS_CC); - // TODO.AST Avoid double fetch - //opline->extended_value = ZEND_FETCH_GLOBAL_LOCK; + // TODO.AST Avoid double fetch + //opline->extended_value = ZEND_FETCH_GLOBAL_LOCK; - zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); - zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); - efree(fetch_ast); + zend_compile_assign_ref_common(NULL, var_ast, &result TSRMLS_CC); + } } static void zend_compile_static_var_common( diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 603ecd86b1..6e92b2a9b0 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -579,7 +579,8 @@ global_var_list: global_var: simple_variable - { $$.u.ast = zend_ast_create_unary(ZEND_AST_GLOBAL, $1.u.ast); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_GLOBAL, + zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast)); } ; -- cgit v1.2.1 From f21d8bc23b11d016bc56382538c7b4faea318eff Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 20:41:45 +0200 Subject: CT bind args before unpack --- Zend/zend_compile.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index cc89a22e5b..a20e24c49e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4139,6 +4139,7 @@ zend_uint zend_compile_args(zend_ast *args, zend_function *fbc TSRMLS_DC) { if (arg->kind == ZEND_AST_UNPACK) { uses_arg_unpack = 1; + fbc = NULL; zend_compile_expr(&arg_node, arg->child[0] TSRMLS_CC); opline = emit_op(NULL, ZEND_SEND_UNPACK, &arg_node, NULL TSRMLS_CC); @@ -4303,12 +4304,6 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { } } - /* Arg unpacking needs EX(call), so don't try to optimize it away */ - if (zend_args_contain_unpack(args_ast)) { - zend_compile_dynamic_call(result, &name_node, args_ast TSRMLS_CC); - return; - } - { zval *name = &name_node.u.constant; zend_string *lcname = STR_ALLOC(Z_STRLEN_P(name), 0); @@ -4316,6 +4311,7 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_op *opline; zend_str_tolower_copy(lcname->val, Z_STRVAL_P(name), Z_STRLEN_P(name)); + if (!(fbc = zend_hash_find_ptr(CG(function_table), lcname)) || ((CG(compiler_options) & ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS) && fbc->type == ZEND_INTERNAL_FUNCTION) -- cgit v1.2.1 From 2ee490ba3abb6cbccb3c8c4eead0f03cf8ceff17 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 22:57:38 +0200 Subject: Implement ZEND_STRLEN optimization --- Zend/zend_compile.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a20e24c49e..8c217a4237 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3517,6 +3517,12 @@ ZEND_API size_t zend_dirname(char *path, size_t len) } /* }}} */ +static inline zend_bool zend_str_equals(zend_string *str, char *c) { + size_t len = strlen(c); + return str->len == len && !memcmp(str->val, c, len); +} + + static void zend_adjust_for_fetch_type(zend_op *opline, zend_uint type) { switch (type & BP_VAR_MASK) { case BP_VAR_R: @@ -4284,6 +4290,12 @@ zend_bool zend_args_contain_unpack(zend_ast *args) { return 0; } +void zend_compile_func_strlen(znode *result, zend_ast *ast TSRMLS_DC) { + znode expr_node; + zend_compile_expr(&expr_node, ast TSRMLS_CC); + emit_op(result, ZEND_STRLEN, &expr_node, NULL TSRMLS_CC); +} + void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; zend_ast *args_ast = ast->child[1]; @@ -4312,6 +4324,17 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_str_tolower_copy(lcname->val, Z_STRVAL_P(name), Z_STRLEN_P(name)); + if (zend_str_equals(lcname, "strlen")) { + if (!(CG(compiler_options) & ZEND_COMPILE_NO_BUILTIN_STRLEN) + && args_ast->children == 1 && args_ast->child[0]->kind != ZEND_AST_UNPACK + ) { + STR_FREE(lcname); + zval_ptr_dtor(&name_node.u.constant); + zend_compile_func_strlen(result, args_ast->child[0] TSRMLS_CC); + return; + } + } + if (!(fbc = zend_hash_find_ptr(CG(function_table), lcname)) || ((CG(compiler_options) & ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS) && fbc->type == ZEND_INTERNAL_FUNCTION) @@ -5340,11 +5363,6 @@ void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { } } -static inline zend_bool zend_str_equals(zend_string *str, char *c) { - size_t len = strlen(c); - return str->len == len && !memcmp(str->val, c, len); -} - void zend_begin_method_decl( zend_op_array *op_array, zend_string *name, zend_bool has_body TSRMLS_DC ) { -- cgit v1.2.1 From 7892b89465fd0639047d0857a21f6157080b0c5c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 23:11:12 +0200 Subject: Implement ZEND_TYPE_CHECK optimization --- Zend/zend_compile.c | 68 ++++++++++++++++++++++++++++++++++++++++---------- Zend/zend_vm_def.h | 2 +- Zend/zend_vm_execute.h | 8 +++--- 3 files changed, 60 insertions(+), 18 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8c217a4237..120f029ee8 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4290,10 +4290,57 @@ zend_bool zend_args_contain_unpack(zend_ast *args) { return 0; } -void zend_compile_func_strlen(znode *result, zend_ast *ast TSRMLS_DC) { - znode expr_node; - zend_compile_expr(&expr_node, ast TSRMLS_CC); - emit_op(result, ZEND_STRLEN, &expr_node, NULL TSRMLS_CC); +int zend_compile_func_strlen(znode *result, zend_ast *args_ast TSRMLS_DC) { + znode arg_node; + + if ((CG(compiler_options) & ZEND_COMPILE_NO_BUILTIN_STRLEN) + || args_ast->children != 1 || args_ast->child[0]->kind == ZEND_AST_UNPACK + ) { + return FAILURE; + } + + zend_compile_expr(&arg_node, args_ast->child[0] TSRMLS_CC); + emit_op(result, ZEND_STRLEN, &arg_node, NULL TSRMLS_CC); + return SUCCESS; +} + +int zend_compile_func_typecheck(znode *result, zend_ast *args_ast, zend_uint type TSRMLS_DC) { + znode arg_node; + zend_op *opline; + + if (args_ast->children != 1 || args_ast->child[0]->kind == ZEND_AST_UNPACK) { + return FAILURE; + } + + zend_compile_expr(&arg_node, args_ast->child[0] TSRMLS_CC); + opline = emit_op(result, ZEND_TYPE_CHECK, &arg_node, NULL TSRMLS_CC); + opline->extended_value = type; + return SUCCESS; +} + +int zend_try_compile_special_func( + znode *result, zend_string *lcname, zend_ast *args_ast TSRMLS_DC +) { + if (zend_str_equals(lcname, "strlen")) { + return zend_compile_func_strlen(result, args_ast TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_null")) { + return zend_compile_func_typecheck(result, args_ast, IS_NULL TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_bool")) { + return zend_compile_func_typecheck(result, args_ast, _IS_BOOL TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_long")) { + return zend_compile_func_typecheck(result, args_ast, IS_LONG TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_float")) { + return zend_compile_func_typecheck(result, args_ast, IS_DOUBLE TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_string")) { + return zend_compile_func_typecheck(result, args_ast, IS_STRING TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_array")) { + return zend_compile_func_typecheck(result, args_ast, IS_ARRAY TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_object")) { + return zend_compile_func_typecheck(result, args_ast, IS_OBJECT TSRMLS_CC); + } else if (zend_str_equals(lcname, "is_resource")) { + return zend_compile_func_typecheck(result, args_ast, IS_RESOURCE TSRMLS_CC); + } + return FAILURE; } void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { @@ -4324,15 +4371,10 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_str_tolower_copy(lcname->val, Z_STRVAL_P(name), Z_STRLEN_P(name)); - if (zend_str_equals(lcname, "strlen")) { - if (!(CG(compiler_options) & ZEND_COMPILE_NO_BUILTIN_STRLEN) - && args_ast->children == 1 && args_ast->child[0]->kind != ZEND_AST_UNPACK - ) { - STR_FREE(lcname); - zval_ptr_dtor(&name_node.u.constant); - zend_compile_func_strlen(result, args_ast->child[0] TSRMLS_CC); - return; - } + if (zend_try_compile_special_func(result, lcname, args_ast TSRMLS_CC) == SUCCESS) { + STR_FREE(lcname); + zval_ptr_dtor(&name_node.u.constant); + return; } if (!(fbc = zend_hash_find_ptr(CG(function_table), lcname)) || diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c89b6ad83d..f45882e52f 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -5936,8 +5936,8 @@ ZEND_VM_HANDLER(123, ZEND_TYPE_CHECK, CONST|TMP|VAR|CV, ANY) } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } FREE_OP1(); CHECK_EXCEPTION(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 8cc2ca8d6e..263f729962 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -3438,8 +3438,8 @@ static int ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } CHECK_EXCEPTION(); @@ -10201,8 +10201,8 @@ static int ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_A } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } zval_dtor(free_op1.var); CHECK_EXCEPTION(); @@ -16960,8 +16960,8 @@ static int ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_A } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } zval_ptr_dtor_nogc(free_op1.var); CHECK_EXCEPTION(); @@ -34161,8 +34161,8 @@ static int ZEND_FASTCALL ZEND_TYPE_CHECK_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_AR } else { ZVAL_FALSE(EX_VAR(opline->result.var)); } + break; EMPTY_SWITCH_DEFAULT_CASE() - } CHECK_EXCEPTION(); -- cgit v1.2.1 From 0356e07a05b9c677a91f99413f92421f850574a0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Jul 2014 23:27:00 +0200 Subject: Implement ZEND_DEFINED optimization --- Zend/zend_compile.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 120f029ee8..569e7c3040 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4318,6 +4318,36 @@ int zend_compile_func_typecheck(znode *result, zend_ast *args_ast, zend_uint typ return SUCCESS; } +int zend_compile_func_defined(znode *result, zend_ast *args_ast TSRMLS_DC) { + zend_string *name; + zend_op *opline; + + if (args_ast->children != 1 || args_ast->child[0]->kind != ZEND_AST_ZVAL) { + return FAILURE; + } + + name = zval_get_string(zend_ast_get_zval(args_ast->child[0])); + if (zend_memrchr(name->val, '\\', name->len) || zend_memrchr(name->val, ':', name->len)) { + STR_RELEASE(name); + return FAILURE; + } + + opline = emit_op(result, ZEND_DEFINED, NULL, NULL TSRMLS_CC); + opline->op1_type = IS_CONST; + LITERAL_STR(opline->op1, name); + GET_CACHE_SLOT(opline->op1.constant); + + /* Lowercase constant name in a separate literal */ + { + zval c; + zend_string *lcname = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lcname->val, name->val, name->len); + ZVAL_NEW_STR(&c, lcname); + zend_add_literal(CG(active_op_array), &c TSRMLS_CC); + } + return SUCCESS; +} + int zend_try_compile_special_func( znode *result, zend_string *lcname, zend_ast *args_ast TSRMLS_DC ) { @@ -4339,8 +4369,11 @@ int zend_try_compile_special_func( return zend_compile_func_typecheck(result, args_ast, IS_OBJECT TSRMLS_CC); } else if (zend_str_equals(lcname, "is_resource")) { return zend_compile_func_typecheck(result, args_ast, IS_RESOURCE TSRMLS_CC); + } else if (zend_str_equals(lcname, "defined")) { + return zend_compile_func_defined(result, args_ast TSRMLS_CC); + } else { + return FAILURE; } - return FAILURE; } void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { -- cgit v1.2.1 From cec747234d069c1f5dfa41a3e267a16de5470496 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 24 Jul 2014 19:22:46 +0200 Subject: Implement call_user_func_array optimization --- Zend/zend_compile.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 10 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 569e7c3040..14e16d278a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4280,7 +4280,7 @@ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_a zend_compile_call_common(result, args_ast, NULL TSRMLS_CC); } -zend_bool zend_args_contain_unpack(zend_ast *args) { +static zend_bool zend_args_contain_unpack(zend_ast *args) { zend_uint i; for (i = 0; i < args->children; ++i) { if (args->child[i]->kind == ZEND_AST_UNPACK) { @@ -4348,6 +4348,70 @@ int zend_compile_func_defined(znode *result, zend_ast *args_ast TSRMLS_DC) { return SUCCESS; } +static int zend_try_compile_ct_bound_init_user_func( + znode *result, zend_ast *name_ast, zend_uint num_args TSRMLS_DC +) { + zend_string *name, *lcname; + zend_function *fbc; + zend_op *opline; + + if (name_ast->kind != ZEND_AST_CONST || Z_TYPE_P(zend_ast_get_zval(name_ast)) != IS_STRING) { + return FAILURE; + } + + name = Z_STR_P(zend_ast_get_zval(name_ast)); + lcname = STR_ALLOC(name->len, 0); + zend_str_tolower_copy(lcname->val, name->val, name->len); + + fbc = zend_hash_find_ptr(CG(function_table), lcname); + if (!fbc || (fbc->type == ZEND_INTERNAL_FUNCTION && + (CG(compiler_options) & ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS)) + ) { + STR_FREE(lcname); + return FAILURE; + } + + opline = emit_op(NULL, ZEND_INIT_FCALL, NULL, NULL TSRMLS_CC); + opline->op2_type = IS_CONST; + LITERAL_STR(opline->op2, lcname); + opline->extended_value = num_args; + + return SUCCESS; +} + +static void zend_compile_init_user_func( + znode *result, zend_ast *name_ast, zend_uint num_args, zend_string *orig_func_name TSRMLS_DC +) { + zend_op *opline; + znode name_node; + + if (zend_try_compile_ct_bound_init_user_func(result, name_ast, num_args TSRMLS_CC) == SUCCESS) { + return; + } + + zend_compile_expr(&name_node, name_ast TSRMLS_CC); + + opline = emit_op(NULL, ZEND_INIT_USER_CALL, NULL, &name_node TSRMLS_CC); + opline->op1_type = IS_CONST; + LITERAL_STR(opline->op1, STR_COPY(orig_func_name)); + opline->extended_value = num_args; +} + +int zend_compile_func_cufa(znode *result, zend_ast *args_ast, zend_string *lcname TSRMLS_DC) { + znode arg_node; + + if (args_ast->children != 2 || zend_args_contain_unpack(args_ast)) { + return FAILURE; + } + + zend_compile_init_user_func(NULL, args_ast->child[0], 1, lcname TSRMLS_CC); + zend_compile_expr(&arg_node, args_ast->child[1] TSRMLS_CC); + emit_op(NULL, ZEND_SEND_ARRAY, &arg_node, NULL TSRMLS_CC); + emit_op(result, ZEND_DO_FCALL, NULL, NULL TSRMLS_CC); + + return SUCCESS; +} + int zend_try_compile_special_func( znode *result, zend_string *lcname, zend_ast *args_ast TSRMLS_DC ) { @@ -4371,6 +4435,8 @@ int zend_try_compile_special_func( return zend_compile_func_typecheck(result, args_ast, IS_RESOURCE TSRMLS_CC); } else if (zend_str_equals(lcname, "defined")) { return zend_compile_func_defined(result, args_ast TSRMLS_CC); + } else if (zend_str_equals(lcname, "call_user_func_array")) { + return zend_compile_func_cufa(result, args_ast, lcname TSRMLS_CC); } else { return FAILURE; } @@ -4404,18 +4470,18 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_str_tolower_copy(lcname->val, Z_STRVAL_P(name), Z_STRLEN_P(name)); - if (zend_try_compile_special_func(result, lcname, args_ast TSRMLS_CC) == SUCCESS) { - STR_FREE(lcname); - zval_ptr_dtor(&name_node.u.constant); + fbc = zend_hash_find_ptr(CG(function_table), lcname); + if (!fbc || (fbc->type == ZEND_INTERNAL_FUNCTION && + (CG(compiler_options) & ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS)) + ) { + STR_RELEASE(lcname); + zend_compile_dynamic_call(result, &name_node, args_ast TSRMLS_CC); return; } - if (!(fbc = zend_hash_find_ptr(CG(function_table), lcname)) || - ((CG(compiler_options) & ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS) && - fbc->type == ZEND_INTERNAL_FUNCTION) - ) { - STR_FREE(lcname); - zend_compile_dynamic_call(result, &name_node, args_ast TSRMLS_CC); + if (zend_try_compile_special_func(result, lcname, args_ast TSRMLS_CC) == SUCCESS) { + STR_RELEASE(lcname); + zval_ptr_dtor(&name_node.u.constant); return; } -- cgit v1.2.1 From 24ca6bb928233932c36f8101140cd49e0e7e12a3 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 24 Jul 2014 20:35:18 +0200 Subject: Add call_user_func optimization --- Zend/zend_compile.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 14e16d278a..d68aa175a7 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4397,6 +4397,7 @@ static void zend_compile_init_user_func( opline->extended_value = num_args; } +/* cufa = call_user_func_array */ int zend_compile_func_cufa(znode *result, zend_ast *args_ast, zend_string *lcname TSRMLS_DC) { znode arg_node; @@ -4412,6 +4413,44 @@ int zend_compile_func_cufa(znode *result, zend_ast *args_ast, zend_string *lcnam return SUCCESS; } +/* cuf = call_user_func */ +int zend_compile_func_cuf(znode *result, zend_ast *args_ast, zend_string *lcname TSRMLS_DC) { + zend_uint i; + + if (args_ast->children < 1 || zend_args_contain_unpack(args_ast)) { + return FAILURE; + } + + zend_compile_init_user_func(NULL, args_ast->child[0], args_ast->children - 1, lcname TSRMLS_CC); + for (i = 1; i < args_ast->children; ++i) { + zend_ast *arg_ast = args_ast->child[i]; + znode arg_node; + zend_op *opline; + zend_bool send_user = 0; + + if (zend_is_variable(arg_ast) && !zend_is_call(arg_ast)) { + zend_compile_var(&arg_node, arg_ast, BP_VAR_FUNC_ARG | (i << BP_VAR_SHIFT) TSRMLS_CC); + send_user = 1; + } else { + zend_compile_expr(&arg_node, arg_ast TSRMLS_CC); + if (arg_node.op_type & (IS_VAR|IS_CV)) { + send_user = 1; + } + } + + if (send_user) { + opline = emit_op(NULL, ZEND_SEND_USER, &arg_node, NULL TSRMLS_CC); + } else { + opline = emit_op(NULL, ZEND_SEND_VAL, &arg_node, NULL TSRMLS_CC); + } + + opline->op2.opline_num = i; + } + emit_op(result, ZEND_DO_FCALL, NULL, NULL TSRMLS_CC); + + return SUCCESS; +} + int zend_try_compile_special_func( znode *result, zend_string *lcname, zend_ast *args_ast TSRMLS_DC ) { @@ -4437,6 +4476,8 @@ int zend_try_compile_special_func( return zend_compile_func_defined(result, args_ast TSRMLS_CC); } else if (zend_str_equals(lcname, "call_user_func_array")) { return zend_compile_func_cufa(result, args_ast, lcname TSRMLS_CC); + } else if (zend_str_equals(lcname, "call_user_func")) { + return zend_compile_func_cuf(result, args_ast, lcname TSRMLS_CC); } else { return FAILURE; } -- cgit v1.2.1 From 689891c2b291ca56fb72667b6e40640bc0702588 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 24 Jul 2014 20:51:01 +0200 Subject: Expose ast via CG(ast) --- Zend/zend_globals.h | 2 + Zend/zend_language_parser.y | 2 +- Zend/zend_language_scanner.c | 710 ++++++++++++++++++++++--------------------- Zend/zend_language_scanner.l | 10 +- 4 files changed, 369 insertions(+), 355 deletions(-) diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 3349b1d876..39d9dab89b 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -157,6 +157,8 @@ struct _zend_compiler_globals { zval **static_members_table; int last_static_member; #endif + + zend_ast *ast; }; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6e92b2a9b0..69424c8eca 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -221,7 +221,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %% /* Rules */ start: - top_statement_list { zend_compile_top_stmt($1.u.ast TSRMLS_CC); zend_ast_destroy($1.u.ast); zend_do_end_compilation(TSRMLS_C); } + top_statement_list { CG(ast) = $1.u.ast; } ; top_statement_list: diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index cd39be3564..0bd8dffe75 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -586,11 +586,14 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); compiler_result = zendparse(TSRMLS_C); - zend_do_return(&retval_znode, 0 TSRMLS_CC); - CG(in_compilation) = original_in_compilation; if (compiler_result != 0) { /* parser error */ zend_bailout(); } + zend_compile_top_stmt(CG(ast) TSRMLS_CC); + zend_ast_destroy(CG(ast)); + zend_do_end_compilation(TSRMLS_C); + zend_do_return(&retval_znode, 0 TSRMLS_CC); + CG(in_compilation) = original_in_compilation; compilation_successful=1; } @@ -766,6 +769,9 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) efree(op_array); retval = NULL; } else { + zend_compile_top_stmt(CG(ast) TSRMLS_CC); + zend_ast_destroy(CG(ast)); + zend_do_end_compilation(TSRMLS_C); zend_do_return(NULL, 0 TSRMLS_CC); CG(active_op_array) = original_active_op_array; pass_two(op_array TSRMLS_CC); @@ -1016,7 +1022,7 @@ restart: yymore_restart: -#line 1020 "Zend/zend_language_scanner.c" +#line 1026 "Zend/zend_language_scanner.c" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -1115,7 +1121,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1721 "Zend/zend_language_scanner.l" +#line 1727 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1176,7 +1182,7 @@ inline_html: HANDLE_NEWLINES(yytext, yyleng); return T_INLINE_HTML; } -#line 1180 "Zend/zend_language_scanner.c" +#line 1186 "Zend/zend_language_scanner.c" yy4: YYDEBUG(4, *YYCURSOR); yych = *++YYCURSOR; @@ -1194,7 +1200,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1711 "Zend/zend_language_scanner.l" +#line 1717 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1204,14 +1210,14 @@ yy6: goto inline_char_handler; } } -#line 1208 "Zend/zend_language_scanner.c" +#line 1214 "Zend/zend_language_scanner.c" yy7: YYDEBUG(7, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1692 "Zend/zend_language_scanner.l" +#line 1698 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1221,7 +1227,7 @@ yy7: goto inline_char_handler; } } -#line 1225 "Zend/zend_language_scanner.c" +#line 1231 "Zend/zend_language_scanner.c" yy9: YYDEBUG(9, *YYCURSOR); yych = *++YYCURSOR; @@ -1407,7 +1413,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1658 "Zend/zend_language_scanner.l" +#line 1664 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1422,7 +1428,7 @@ yy35: BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1426 "Zend/zend_language_scanner.c" +#line 1432 "Zend/zend_language_scanner.c" yy39: YYDEBUG(39, *YYCURSOR); yych = *++YYCURSOR; @@ -1449,7 +1455,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1674 "Zend/zend_language_scanner.l" +#line 1680 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1459,19 +1465,19 @@ yy43: goto inline_char_handler; } } -#line 1463 "Zend/zend_language_scanner.c" +#line 1469 "Zend/zend_language_scanner.c" yy45: YYDEBUG(45, *YYCURSOR); ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1685 "Zend/zend_language_scanner.l" +#line 1691 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG_WITH_ECHO; } -#line 1475 "Zend/zend_language_scanner.c" +#line 1481 "Zend/zend_language_scanner.c" yy47: YYDEBUG(47, *YYCURSOR); yych = *++YYCURSOR; @@ -1498,14 +1504,14 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1703 "Zend/zend_language_scanner.l" +#line 1709 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1509 "Zend/zend_language_scanner.c" +#line 1515 "Zend/zend_language_scanner.c" yy52: YYDEBUG(52, *YYCURSOR); ++YYCURSOR; @@ -1576,7 +1582,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2164 "Zend/zend_language_scanner.l" +#line 2170 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1617,7 +1623,7 @@ yy56: zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1621 "Zend/zend_language_scanner.c" +#line 1627 "Zend/zend_language_scanner.c" yy57: YYDEBUG(57, *YYCURSOR); yych = *++YYCURSOR; @@ -1628,12 +1634,12 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2108 "Zend/zend_language_scanner.l" +#line 2114 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; } -#line 1637 "Zend/zend_language_scanner.c" +#line 1643 "Zend/zend_language_scanner.c" yy60: YYDEBUG(60, *YYCURSOR); yych = *++YYCURSOR; @@ -1643,14 +1649,14 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2095 "Zend/zend_language_scanner.l" +#line 2101 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1654 "Zend/zend_language_scanner.c" +#line 1660 "Zend/zend_language_scanner.c" yy63: YYDEBUG(63, *YYCURSOR); yyaccept = 0; @@ -1666,23 +1672,23 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1802 "Zend/zend_language_scanner.l" +#line 1808 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1675 "Zend/zend_language_scanner.c" +#line 1681 "Zend/zend_language_scanner.c" yy66: YYDEBUG(66, *YYCURSOR); ++YYCURSOR; YYDEBUG(67, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1483 "Zend/zend_language_scanner.l" +#line 1489 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1686 "Zend/zend_language_scanner.c" +#line 1692 "Zend/zend_language_scanner.c" yy68: YYDEBUG(68, *YYCURSOR); yych = *++YYCURSOR; @@ -1696,14 +1702,14 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1795 "Zend/zend_language_scanner.l" +#line 1801 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1707 "Zend/zend_language_scanner.c" +#line 1713 "Zend/zend_language_scanner.c" yy72: YYDEBUG(72, *YYCURSOR); yych = *++YYCURSOR; @@ -1721,14 +1727,14 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1786 "Zend/zend_language_scanner.l" +#line 1792 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1732 "Zend/zend_language_scanner.c" +#line 1738 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_DOUBLE_QUOTES: @@ -1796,7 +1802,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2114 "Zend/zend_language_scanner.l" +#line 2120 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1845,7 +1851,7 @@ double_quotes_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1849 "Zend/zend_language_scanner.c" +#line 1855 "Zend/zend_language_scanner.c" yy79: YYDEBUG(79, *YYCURSOR); yych = *++YYCURSOR; @@ -1856,12 +1862,12 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2103 "Zend/zend_language_scanner.l" +#line 2109 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; } -#line 1865 "Zend/zend_language_scanner.c" +#line 1871 "Zend/zend_language_scanner.c" yy82: YYDEBUG(82, *YYCURSOR); yych = *++YYCURSOR; @@ -1871,14 +1877,14 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2095 "Zend/zend_language_scanner.l" +#line 2101 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1882 "Zend/zend_language_scanner.c" +#line 1888 "Zend/zend_language_scanner.c" yy85: YYDEBUG(85, *YYCURSOR); yyaccept = 0; @@ -1894,23 +1900,23 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1802 "Zend/zend_language_scanner.l" +#line 1808 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1903 "Zend/zend_language_scanner.c" +#line 1909 "Zend/zend_language_scanner.c" yy88: YYDEBUG(88, *YYCURSOR); ++YYCURSOR; YYDEBUG(89, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1483 "Zend/zend_language_scanner.l" +#line 1489 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1914 "Zend/zend_language_scanner.c" +#line 1920 "Zend/zend_language_scanner.c" yy90: YYDEBUG(90, *YYCURSOR); yych = *++YYCURSOR; @@ -1924,14 +1930,14 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1795 "Zend/zend_language_scanner.l" +#line 1801 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1935 "Zend/zend_language_scanner.c" +#line 1941 "Zend/zend_language_scanner.c" yy94: YYDEBUG(94, *YYCURSOR); yych = *++YYCURSOR; @@ -1949,14 +1955,14 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1786 "Zend/zend_language_scanner.l" +#line 1792 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1960 "Zend/zend_language_scanner.c" +#line 1966 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_END_HEREDOC: @@ -1967,7 +1973,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2081 "Zend/zend_language_scanner.l" +#line 2087 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -1980,7 +1986,7 @@ yyc_ST_END_HEREDOC: BEGIN(ST_IN_SCRIPTING); return T_END_HEREDOC; } -#line 1984 "Zend/zend_language_scanner.c" +#line 1990 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_HEREDOC: { @@ -2042,7 +2048,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2206 "Zend/zend_language_scanner.l" +#line 2212 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2115,7 +2121,7 @@ heredoc_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 2119 "Zend/zend_language_scanner.c" +#line 2125 "Zend/zend_language_scanner.c" yy105: YYDEBUG(105, *YYCURSOR); yych = *++YYCURSOR; @@ -2130,14 +2136,14 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2095 "Zend/zend_language_scanner.l" +#line 2101 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 2141 "Zend/zend_language_scanner.c" +#line 2147 "Zend/zend_language_scanner.c" yy109: YYDEBUG(109, *YYCURSOR); yyaccept = 0; @@ -2153,23 +2159,23 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1802 "Zend/zend_language_scanner.l" +#line 1808 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2162 "Zend/zend_language_scanner.c" +#line 2168 "Zend/zend_language_scanner.c" yy112: YYDEBUG(112, *YYCURSOR); ++YYCURSOR; YYDEBUG(113, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1483 "Zend/zend_language_scanner.l" +#line 1489 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 2173 "Zend/zend_language_scanner.c" +#line 2179 "Zend/zend_language_scanner.c" yy114: YYDEBUG(114, *YYCURSOR); yych = *++YYCURSOR; @@ -2183,14 +2189,14 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1795 "Zend/zend_language_scanner.l" +#line 1801 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2194 "Zend/zend_language_scanner.c" +#line 2200 "Zend/zend_language_scanner.c" yy118: YYDEBUG(118, *YYCURSOR); yych = *++YYCURSOR; @@ -2208,14 +2214,14 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1786 "Zend/zend_language_scanner.l" +#line 1792 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2219 "Zend/zend_language_scanner.c" +#line 2225 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_IN_SCRIPTING: @@ -2398,12 +2404,12 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1824 "Zend/zend_language_scanner.l" +#line 1830 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 2407 "Zend/zend_language_scanner.c" +#line 2413 "Zend/zend_language_scanner.c" yy125: YYDEBUG(125, *YYCURSOR); yych = *++YYCURSOR; @@ -2635,11 +2641,11 @@ yy138: yy139: YYDEBUG(139, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1472 "Zend/zend_language_scanner.l" +#line 1478 "Zend/zend_language_scanner.l" { return yytext[0]; } -#line 2643 "Zend/zend_language_scanner.c" +#line 2649 "Zend/zend_language_scanner.c" yy140: YYDEBUG(140, *YYCURSOR); ++YYCURSOR; @@ -2648,13 +2654,13 @@ yy140: yy141: YYDEBUG(141, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1194 "Zend/zend_language_scanner.l" +#line 1200 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 2658 "Zend/zend_language_scanner.c" +#line 2664 "Zend/zend_language_scanner.c" yy142: YYDEBUG(142, *YYCURSOR); yych = *++YYCURSOR; @@ -2665,11 +2671,11 @@ yy143: ++YYCURSOR; YYDEBUG(144, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1220 "Zend/zend_language_scanner.l" +#line 1226 "Zend/zend_language_scanner.l" { return T_NS_SEPARATOR; } -#line 2673 "Zend/zend_language_scanner.c" +#line 2679 "Zend/zend_language_scanner.c" yy145: YYDEBUG(145, *YYCURSOR); yyaccept = 1; @@ -2903,18 +2909,18 @@ yy168: ++YYCURSOR; YYDEBUG(169, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1477 "Zend/zend_language_scanner.l" +#line 1483 "Zend/zend_language_scanner.l" { yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return '{'; } -#line 2912 "Zend/zend_language_scanner.c" +#line 2918 "Zend/zend_language_scanner.c" yy170: YYDEBUG(170, *YYCURSOR); ++YYCURSOR; YYDEBUG(171, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1489 "Zend/zend_language_scanner.l" +#line 1495 "Zend/zend_language_scanner.l" { RESET_DOC_COMMENT(); if (!zend_stack_is_empty(&SCNG(state_stack))) { @@ -2922,7 +2928,7 @@ yy170: } return '}'; } -#line 2926 "Zend/zend_language_scanner.c" +#line 2932 "Zend/zend_language_scanner.c" yy172: YYDEBUG(172, *YYCURSOR); yyaccept = 2; @@ -2950,7 +2956,7 @@ yy172: yy173: YYDEBUG(173, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1537 "Zend/zend_language_scanner.l" +#line 1543 "Zend/zend_language_scanner.l" { if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */ ZVAL_LONG(zendlval, strtol(yytext, NULL, 0)); @@ -2968,7 +2974,7 @@ yy173: } return T_LNUMBER; } -#line 2972 "Zend/zend_language_scanner.c" +#line 2978 "Zend/zend_language_scanner.c" yy174: YYDEBUG(174, *YYCURSOR); yyaccept = 2; @@ -2996,7 +3002,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1830 "Zend/zend_language_scanner.l" +#line 1836 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3030,14 +3036,14 @@ yy177: return T_COMMENT; } -#line 3034 "Zend/zend_language_scanner.c" +#line 3040 "Zend/zend_language_scanner.c" yy178: YYDEBUG(178, *YYCURSOR); ++YYCURSOR; yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1916 "Zend/zend_language_scanner.l" +#line 1922 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3105,14 +3111,14 @@ yy179: } return T_CONSTANT_ENCAPSED_STRING; } -#line 3109 "Zend/zend_language_scanner.c" +#line 3115 "Zend/zend_language_scanner.c" yy180: YYDEBUG(180, *YYCURSOR); ++YYCURSOR; yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1985 "Zend/zend_language_scanner.l" +#line 1991 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3153,24 +3159,24 @@ yy181: BEGIN(ST_DOUBLE_QUOTES); return '"'; } -#line 3157 "Zend/zend_language_scanner.c" +#line 3163 "Zend/zend_language_scanner.c" yy182: YYDEBUG(182, *YYCURSOR); ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2075 "Zend/zend_language_scanner.l" +#line 2081 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; } -#line 3168 "Zend/zend_language_scanner.c" +#line 3174 "Zend/zend_language_scanner.c" yy184: YYDEBUG(184, *YYCURSOR); ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2337 "Zend/zend_language_scanner.l" +#line 2343 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3179,7 +3185,7 @@ yy184: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 3183 "Zend/zend_language_scanner.c" +#line 3189 "Zend/zend_language_scanner.c" yy186: YYDEBUG(186, *YYCURSOR); ++YYCURSOR; @@ -3206,12 +3212,12 @@ yy188: yy190: YYDEBUG(190, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1592 "Zend/zend_language_scanner.l" +#line 1598 "Zend/zend_language_scanner.l" { ZVAL_DOUBLE(zendlval, zend_strtod(yytext, NULL)); return T_DNUMBER; } -#line 3215 "Zend/zend_language_scanner.c" +#line 3221 "Zend/zend_language_scanner.c" yy191: YYDEBUG(191, *YYCURSOR); yyaccept = 2; @@ -3303,7 +3309,7 @@ yy200: } YYDEBUG(202, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1514 "Zend/zend_language_scanner.l" +#line 1520 "Zend/zend_language_scanner.l" { char *bin = yytext + 2; /* Skip "0b" */ int len = yyleng - 2; @@ -3326,7 +3332,7 @@ yy200: return T_DNUMBER; } } -#line 3330 "Zend/zend_language_scanner.c" +#line 3336 "Zend/zend_language_scanner.c" yy203: YYDEBUG(203, *YYCURSOR); ++YYCURSOR; @@ -3338,7 +3344,7 @@ yy203: } YYDEBUG(205, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1555 "Zend/zend_language_scanner.l" +#line 1561 "Zend/zend_language_scanner.l" { char *hex = yytext + 2; /* Skip "0x" */ int len = yyleng - 2; @@ -3361,7 +3367,7 @@ yy203: return T_DNUMBER; } } -#line 3365 "Zend/zend_language_scanner.c" +#line 3371 "Zend/zend_language_scanner.c" yy206: YYDEBUG(206, *YYCURSOR); ++YYCURSOR; @@ -3370,13 +3376,13 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1897 "Zend/zend_language_scanner.l" +#line 1903 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } -#line 3380 "Zend/zend_language_scanner.c" +#line 3386 "Zend/zend_language_scanner.c" yy208: YYDEBUG(208, *YYCURSOR); yych = *++YYCURSOR; @@ -3410,12 +3416,12 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1802 "Zend/zend_language_scanner.l" +#line 1808 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 3419 "Zend/zend_language_scanner.c" +#line 3425 "Zend/zend_language_scanner.c" yy213: YYDEBUG(213, *YYCURSOR); yych = *++YYCURSOR; @@ -3429,11 +3435,11 @@ yy214: } YYDEBUG(215, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1460 "Zend/zend_language_scanner.l" +#line 1466 "Zend/zend_language_scanner.l" { return T_LOGICAL_XOR; } -#line 3437 "Zend/zend_language_scanner.c" +#line 3443 "Zend/zend_language_scanner.c" yy216: YYDEBUG(216, *YYCURSOR); ++YYCURSOR; @@ -3442,61 +3448,61 @@ yy216: } YYDEBUG(217, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1452 "Zend/zend_language_scanner.l" +#line 1458 "Zend/zend_language_scanner.l" { return T_LOGICAL_OR; } -#line 3450 "Zend/zend_language_scanner.c" +#line 3456 "Zend/zend_language_scanner.c" yy218: YYDEBUG(218, *YYCURSOR); ++YYCURSOR; YYDEBUG(219, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1440 "Zend/zend_language_scanner.l" +#line 1446 "Zend/zend_language_scanner.l" { return T_XOR_EQUAL; } -#line 3460 "Zend/zend_language_scanner.c" +#line 3466 "Zend/zend_language_scanner.c" yy220: YYDEBUG(220, *YYCURSOR); ++YYCURSOR; YYDEBUG(221, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1444 "Zend/zend_language_scanner.l" +#line 1450 "Zend/zend_language_scanner.l" { return T_BOOLEAN_OR; } -#line 3470 "Zend/zend_language_scanner.c" +#line 3476 "Zend/zend_language_scanner.c" yy222: YYDEBUG(222, *YYCURSOR); ++YYCURSOR; YYDEBUG(223, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1436 "Zend/zend_language_scanner.l" +#line 1442 "Zend/zend_language_scanner.l" { return T_OR_EQUAL; } -#line 3480 "Zend/zend_language_scanner.c" +#line 3486 "Zend/zend_language_scanner.c" yy224: YYDEBUG(224, *YYCURSOR); ++YYCURSOR; YYDEBUG(225, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1448 "Zend/zend_language_scanner.l" +#line 1454 "Zend/zend_language_scanner.l" { return T_BOOLEAN_AND; } -#line 3490 "Zend/zend_language_scanner.c" +#line 3496 "Zend/zend_language_scanner.c" yy226: YYDEBUG(226, *YYCURSOR); ++YYCURSOR; YYDEBUG(227, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1432 "Zend/zend_language_scanner.l" +#line 1438 "Zend/zend_language_scanner.l" { return T_AND_EQUAL; } -#line 3500 "Zend/zend_language_scanner.c" +#line 3506 "Zend/zend_language_scanner.c" yy228: YYDEBUG(228, *YYCURSOR); ++YYCURSOR; @@ -3505,7 +3511,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1904 "Zend/zend_language_scanner.l" +#line 1910 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3516,17 +3522,17 @@ yy229: return yytext[0]; } } -#line 3520 "Zend/zend_language_scanner.c" +#line 3526 "Zend/zend_language_scanner.c" yy230: YYDEBUG(230, *YYCURSOR); ++YYCURSOR; YYDEBUG(231, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1420 "Zend/zend_language_scanner.l" +#line 1426 "Zend/zend_language_scanner.l" { return T_MOD_EQUAL; } -#line 3530 "Zend/zend_language_scanner.c" +#line 3536 "Zend/zend_language_scanner.c" yy232: YYDEBUG(232, *YYCURSOR); yych = *++YYCURSOR; @@ -3544,7 +3550,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1864 "Zend/zend_language_scanner.l" +#line 1870 "Zend/zend_language_scanner.l" { int doc_com; @@ -3577,7 +3583,7 @@ yy235: return T_COMMENT; } -#line 3581 "Zend/zend_language_scanner.c" +#line 3587 "Zend/zend_language_scanner.c" yy236: YYDEBUG(236, *YYCURSOR); yych = *++YYCURSOR; @@ -3587,11 +3593,11 @@ yy237: ++YYCURSOR; YYDEBUG(238, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1412 "Zend/zend_language_scanner.l" +#line 1418 "Zend/zend_language_scanner.l" { return T_DIV_EQUAL; } -#line 3595 "Zend/zend_language_scanner.c" +#line 3601 "Zend/zend_language_scanner.c" yy239: YYDEBUG(239, *YYCURSOR); yych = *++YYCURSOR; @@ -3615,62 +3621,62 @@ yy242: if ((yych = *YYCURSOR) == '=') goto yy246; YYDEBUG(243, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1404 "Zend/zend_language_scanner.l" +#line 1410 "Zend/zend_language_scanner.l" { return T_POW; } -#line 3623 "Zend/zend_language_scanner.c" +#line 3629 "Zend/zend_language_scanner.c" yy244: YYDEBUG(244, *YYCURSOR); ++YYCURSOR; YYDEBUG(245, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1400 "Zend/zend_language_scanner.l" +#line 1406 "Zend/zend_language_scanner.l" { return T_MUL_EQUAL; } -#line 3633 "Zend/zend_language_scanner.c" +#line 3639 "Zend/zend_language_scanner.c" yy246: YYDEBUG(246, *YYCURSOR); ++YYCURSOR; YYDEBUG(247, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1408 "Zend/zend_language_scanner.l" +#line 1414 "Zend/zend_language_scanner.l" { return T_POW_EQUAL; } -#line 3643 "Zend/zend_language_scanner.c" +#line 3649 "Zend/zend_language_scanner.c" yy248: YYDEBUG(248, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy252; YYDEBUG(249, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1468 "Zend/zend_language_scanner.l" +#line 1474 "Zend/zend_language_scanner.l" { return T_SR; } -#line 3654 "Zend/zend_language_scanner.c" +#line 3660 "Zend/zend_language_scanner.c" yy250: YYDEBUG(250, *YYCURSOR); ++YYCURSOR; YYDEBUG(251, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1388 "Zend/zend_language_scanner.l" +#line 1394 "Zend/zend_language_scanner.l" { return T_IS_GREATER_OR_EQUAL; } -#line 3664 "Zend/zend_language_scanner.c" +#line 3670 "Zend/zend_language_scanner.c" yy252: YYDEBUG(252, *YYCURSOR); ++YYCURSOR; YYDEBUG(253, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1428 "Zend/zend_language_scanner.l" +#line 1434 "Zend/zend_language_scanner.l" { return T_SR_EQUAL; } -#line 3674 "Zend/zend_language_scanner.c" +#line 3680 "Zend/zend_language_scanner.c" yy254: YYDEBUG(254, *YYCURSOR); yyaccept = 5; @@ -3681,11 +3687,11 @@ yy254: yy255: YYDEBUG(255, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1464 "Zend/zend_language_scanner.l" +#line 1470 "Zend/zend_language_scanner.l" { return T_SL; } -#line 3689 "Zend/zend_language_scanner.c" +#line 3695 "Zend/zend_language_scanner.c" yy256: YYDEBUG(256, *YYCURSOR); yych = *++YYCURSOR; @@ -3697,22 +3703,22 @@ yy257: ++YYCURSOR; YYDEBUG(258, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1384 "Zend/zend_language_scanner.l" +#line 1390 "Zend/zend_language_scanner.l" { return T_IS_SMALLER_OR_EQUAL; } -#line 3705 "Zend/zend_language_scanner.c" +#line 3711 "Zend/zend_language_scanner.c" yy259: YYDEBUG(259, *YYCURSOR); ++YYCURSOR; yy260: YYDEBUG(260, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1380 "Zend/zend_language_scanner.l" +#line 1386 "Zend/zend_language_scanner.l" { return T_IS_NOT_EQUAL; } -#line 3716 "Zend/zend_language_scanner.c" +#line 3722 "Zend/zend_language_scanner.c" yy261: YYDEBUG(261, *YYCURSOR); yych = *++YYCURSOR; @@ -3763,11 +3769,11 @@ yy268: ++YYCURSOR; YYDEBUG(269, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1424 "Zend/zend_language_scanner.l" +#line 1430 "Zend/zend_language_scanner.l" { return T_SL_EQUAL; } -#line 3771 "Zend/zend_language_scanner.c" +#line 3777 "Zend/zend_language_scanner.c" yy270: YYDEBUG(270, *YYCURSOR); ++YYCURSOR; @@ -3872,7 +3878,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2027 "Zend/zend_language_scanner.l" +#line 2033 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -3919,7 +3925,7 @@ yy280: return T_START_HEREDOC; } -#line 3923 "Zend/zend_language_scanner.c" +#line 3929 "Zend/zend_language_scanner.c" yy281: YYDEBUG(281, *YYCURSOR); yych = *++YYCURSOR; @@ -3959,31 +3965,31 @@ yy284: ++YYCURSOR; YYDEBUG(286, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1372 "Zend/zend_language_scanner.l" +#line 1378 "Zend/zend_language_scanner.l" { return T_IS_NOT_IDENTICAL; } -#line 3967 "Zend/zend_language_scanner.c" +#line 3973 "Zend/zend_language_scanner.c" yy287: YYDEBUG(287, *YYCURSOR); ++YYCURSOR; YYDEBUG(288, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1392 "Zend/zend_language_scanner.l" +#line 1398 "Zend/zend_language_scanner.l" { return T_PLUS_EQUAL; } -#line 3977 "Zend/zend_language_scanner.c" +#line 3983 "Zend/zend_language_scanner.c" yy289: YYDEBUG(289, *YYCURSOR); ++YYCURSOR; YYDEBUG(290, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1360 "Zend/zend_language_scanner.l" +#line 1366 "Zend/zend_language_scanner.l" { return T_INC; } -#line 3987 "Zend/zend_language_scanner.c" +#line 3993 "Zend/zend_language_scanner.c" yy291: YYDEBUG(291, *YYCURSOR); yych = *++YYCURSOR; @@ -4002,42 +4008,42 @@ yy293: } YYDEBUG(294, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1348 "Zend/zend_language_scanner.l" +#line 1354 "Zend/zend_language_scanner.l" { return T_LIST; } -#line 4010 "Zend/zend_language_scanner.c" +#line 4016 "Zend/zend_language_scanner.c" yy295: YYDEBUG(295, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy299; YYDEBUG(296, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1376 "Zend/zend_language_scanner.l" +#line 1382 "Zend/zend_language_scanner.l" { return T_IS_EQUAL; } -#line 4021 "Zend/zend_language_scanner.c" +#line 4027 "Zend/zend_language_scanner.c" yy297: YYDEBUG(297, *YYCURSOR); ++YYCURSOR; YYDEBUG(298, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1344 "Zend/zend_language_scanner.l" +#line 1350 "Zend/zend_language_scanner.l" { return T_DOUBLE_ARROW; } -#line 4031 "Zend/zend_language_scanner.c" +#line 4037 "Zend/zend_language_scanner.c" yy299: YYDEBUG(299, *YYCURSOR); ++YYCURSOR; YYDEBUG(300, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1368 "Zend/zend_language_scanner.l" +#line 1374 "Zend/zend_language_scanner.l" { return T_IS_IDENTICAL; } -#line 4041 "Zend/zend_language_scanner.c" +#line 4047 "Zend/zend_language_scanner.c" yy301: YYDEBUG(301, *YYCURSOR); yych = *++YYCURSOR; @@ -4167,11 +4173,11 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1654 "Zend/zend_language_scanner.l" +#line 1660 "Zend/zend_language_scanner.l" { return T_NS_C; } -#line 4175 "Zend/zend_language_scanner.c" +#line 4181 "Zend/zend_language_scanner.c" yy321: YYDEBUG(321, *YYCURSOR); yych = *++YYCURSOR; @@ -4191,7 +4197,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1629 "Zend/zend_language_scanner.l" +#line 1635 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4216,7 +4222,7 @@ yy322: ZVAL_STR(zendlval, dirname); return T_DIR; } -#line 4220 "Zend/zend_language_scanner.c" +#line 4226 "Zend/zend_language_scanner.c" yy326: YYDEBUG(326, *YYCURSOR); yych = *++YYCURSOR; @@ -4241,12 +4247,12 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1613 "Zend/zend_language_scanner.l" +#line 1619 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; } -#line 4250 "Zend/zend_language_scanner.c" +#line 4256 "Zend/zend_language_scanner.c" yy332: YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; @@ -4281,11 +4287,11 @@ yy336: } YYDEBUG(339, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1609 "Zend/zend_language_scanner.l" +#line 1615 "Zend/zend_language_scanner.l" { return T_METHOD_C; } -#line 4289 "Zend/zend_language_scanner.c" +#line 4295 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; @@ -4336,11 +4342,11 @@ yy347: } YYDEBUG(350, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1605 "Zend/zend_language_scanner.l" +#line 1611 "Zend/zend_language_scanner.l" { return T_FUNC_C; } -#line 4344 "Zend/zend_language_scanner.c" +#line 4350 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4360,7 +4366,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1618 "Zend/zend_language_scanner.l" +#line 1624 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4371,7 +4377,7 @@ yy352: } return T_FILE; } -#line 4375 "Zend/zend_language_scanner.c" +#line 4381 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4401,11 +4407,11 @@ yy359: } YYDEBUG(362, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1601 "Zend/zend_language_scanner.l" +#line 1607 "Zend/zend_language_scanner.l" { return T_TRAIT_C; } -#line 4409 "Zend/zend_language_scanner.c" +#line 4415 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4435,11 +4441,11 @@ yy366: } YYDEBUG(369, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1597 "Zend/zend_language_scanner.l" +#line 1603 "Zend/zend_language_scanner.l" { return T_CLASS_C; } -#line 4443 "Zend/zend_language_scanner.c" +#line 4449 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4501,11 +4507,11 @@ yy381: } YYDEBUG(382, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1312 "Zend/zend_language_scanner.l" +#line 1318 "Zend/zend_language_scanner.l" { return T_HALT_COMPILER; } -#line 4509 "Zend/zend_language_scanner.c" +#line 4515 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4525,11 +4531,11 @@ yy385: } YYDEBUG(386, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1292 "Zend/zend_language_scanner.l" +#line 1298 "Zend/zend_language_scanner.l" { return T_USE; } -#line 4533 "Zend/zend_language_scanner.c" +#line 4539 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4548,11 +4554,11 @@ yy389: } YYDEBUG(390, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1340 "Zend/zend_language_scanner.l" +#line 1346 "Zend/zend_language_scanner.l" { return T_UNSET; } -#line 4556 "Zend/zend_language_scanner.c" +#line 4562 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4724,11 +4730,11 @@ yy406: ++YYCURSOR; YYDEBUG(408, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1240 "Zend/zend_language_scanner.l" +#line 1246 "Zend/zend_language_scanner.l" { return T_INT_CAST; } -#line 4732 "Zend/zend_language_scanner.c" +#line 4738 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4772,11 +4778,11 @@ yy414: ++YYCURSOR; YYDEBUG(417, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1244 "Zend/zend_language_scanner.l" +#line 1250 "Zend/zend_language_scanner.l" { return T_DOUBLE_CAST; } -#line 4780 "Zend/zend_language_scanner.c" +#line 4786 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4846,11 +4852,11 @@ yy428: ++YYCURSOR; YYDEBUG(431, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1248 "Zend/zend_language_scanner.l" +#line 1254 "Zend/zend_language_scanner.l" { return T_STRING_CAST; } -#line 4854 "Zend/zend_language_scanner.c" +#line 4860 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4883,11 +4889,11 @@ yy435: ++YYCURSOR; YYDEBUG(438, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1252 "Zend/zend_language_scanner.l" +#line 1258 "Zend/zend_language_scanner.l" { return T_ARRAY_CAST; } -#line 4891 "Zend/zend_language_scanner.c" +#line 4897 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4925,11 +4931,11 @@ yy443: ++YYCURSOR; YYDEBUG(446, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1256 "Zend/zend_language_scanner.l" +#line 1262 "Zend/zend_language_scanner.l" { return T_OBJECT_CAST; } -#line 4933 "Zend/zend_language_scanner.c" +#line 4939 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -4970,11 +4976,11 @@ yy452: ++YYCURSOR; YYDEBUG(454, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1260 "Zend/zend_language_scanner.l" +#line 1266 "Zend/zend_language_scanner.l" { return T_BOOL_CAST; } -#line 4978 "Zend/zend_language_scanner.c" +#line 4984 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5034,11 +5040,11 @@ yy463: ++YYCURSOR; YYDEBUG(466, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1264 "Zend/zend_language_scanner.l" +#line 1270 "Zend/zend_language_scanner.l" { return T_UNSET_CAST; } -#line 5042 "Zend/zend_language_scanner.c" +#line 5048 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5052,11 +5058,11 @@ yy468: } YYDEBUG(469, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1236 "Zend/zend_language_scanner.l" +#line 1242 "Zend/zend_language_scanner.l" { return T_VAR; } -#line 5060 "Zend/zend_language_scanner.c" +#line 5066 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5076,11 +5082,11 @@ yy472: } YYDEBUG(473, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1228 "Zend/zend_language_scanner.l" +#line 1234 "Zend/zend_language_scanner.l" { return T_NEW; } -#line 5084 "Zend/zend_language_scanner.c" +#line 5090 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5119,11 +5125,11 @@ yy480: } YYDEBUG(481, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1288 "Zend/zend_language_scanner.l" +#line 1294 "Zend/zend_language_scanner.l" { return T_NAMESPACE; } -#line 5127 "Zend/zend_language_scanner.c" +#line 5133 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5145,11 +5151,11 @@ yy484: ++YYCURSOR; YYDEBUG(485, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1416 "Zend/zend_language_scanner.l" +#line 1422 "Zend/zend_language_scanner.l" { return T_CONCAT_EQUAL; } -#line 5153 "Zend/zend_language_scanner.c" +#line 5159 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5158,21 +5164,21 @@ yy486: ++YYCURSOR; YYDEBUG(488, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1224 "Zend/zend_language_scanner.l" +#line 1230 "Zend/zend_language_scanner.l" { return T_ELLIPSIS; } -#line 5166 "Zend/zend_language_scanner.c" +#line 5172 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; YYDEBUG(490, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1216 "Zend/zend_language_scanner.l" +#line 1222 "Zend/zend_language_scanner.l" { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5176 "Zend/zend_language_scanner.c" +#line 5182 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5194,32 +5200,32 @@ yy493: ++YYCURSOR; YYDEBUG(494, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1396 "Zend/zend_language_scanner.l" +#line 1402 "Zend/zend_language_scanner.l" { return T_MINUS_EQUAL; } -#line 5202 "Zend/zend_language_scanner.c" +#line 5208 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; YYDEBUG(496, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1364 "Zend/zend_language_scanner.l" +#line 1370 "Zend/zend_language_scanner.l" { return T_DEC; } -#line 5212 "Zend/zend_language_scanner.c" +#line 5218 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; YYDEBUG(498, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1189 "Zend/zend_language_scanner.l" +#line 1195 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5223 "Zend/zend_language_scanner.c" +#line 5229 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5264,11 +5270,11 @@ yy504: } YYDEBUG(505, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1336 "Zend/zend_language_scanner.l" +#line 1342 "Zend/zend_language_scanner.l" { return T_PUBLIC; } -#line 5272 "Zend/zend_language_scanner.c" +#line 5278 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5323,11 +5329,11 @@ yy513: } YYDEBUG(514, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1332 "Zend/zend_language_scanner.l" +#line 1338 "Zend/zend_language_scanner.l" { return T_PROTECTED; } -#line 5331 "Zend/zend_language_scanner.c" +#line 5337 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5357,11 +5363,11 @@ yy519: } YYDEBUG(520, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1328 "Zend/zend_language_scanner.l" +#line 1334 "Zend/zend_language_scanner.l" { return T_PRIVATE; } -#line 5365 "Zend/zend_language_scanner.c" +#line 5371 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5370,11 +5376,11 @@ yy521: } YYDEBUG(522, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1165 "Zend/zend_language_scanner.l" +#line 1171 "Zend/zend_language_scanner.l" { return T_PRINT; } -#line 5378 "Zend/zend_language_scanner.c" +#line 5384 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5399,11 +5405,11 @@ yy526: } YYDEBUG(527, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1157 "Zend/zend_language_scanner.l" +#line 1163 "Zend/zend_language_scanner.l" { return T_GOTO; } -#line 5407 "Zend/zend_language_scanner.c" +#line 5413 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5427,11 +5433,11 @@ yy531: } YYDEBUG(532, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1300 "Zend/zend_language_scanner.l" +#line 1306 "Zend/zend_language_scanner.l" { return T_GLOBAL; } -#line 5435 "Zend/zend_language_scanner.c" +#line 5441 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5468,11 +5474,11 @@ yy539: } YYDEBUG(540, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1149 "Zend/zend_language_scanner.l" +#line 1155 "Zend/zend_language_scanner.l" { return T_BREAK; } -#line 5476 "Zend/zend_language_scanner.c" +#line 5482 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5512,11 +5518,11 @@ yy547: } YYDEBUG(548, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1133 "Zend/zend_language_scanner.l" +#line 1139 "Zend/zend_language_scanner.l" { return T_SWITCH; } -#line 5520 "Zend/zend_language_scanner.c" +#line 5526 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5540,11 +5546,11 @@ yy552: } YYDEBUG(553, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1316 "Zend/zend_language_scanner.l" +#line 1322 "Zend/zend_language_scanner.l" { return T_STATIC; } -#line 5548 "Zend/zend_language_scanner.c" +#line 5554 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5571,11 +5577,11 @@ yy557: } YYDEBUG(558, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1129 "Zend/zend_language_scanner.l" +#line 1135 "Zend/zend_language_scanner.l" { return T_AS; } -#line 5579 "Zend/zend_language_scanner.c" +#line 5585 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5594,11 +5600,11 @@ yy561: } YYDEBUG(562, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1352 "Zend/zend_language_scanner.l" +#line 1358 "Zend/zend_language_scanner.l" { return T_ARRAY; } -#line 5602 "Zend/zend_language_scanner.c" +#line 5608 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5607,11 +5613,11 @@ yy563: } YYDEBUG(564, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1456 "Zend/zend_language_scanner.l" +#line 1462 "Zend/zend_language_scanner.l" { return T_LOGICAL_AND; } -#line 5615 "Zend/zend_language_scanner.c" +#line 5621 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5645,11 +5651,11 @@ yy570: } YYDEBUG(571, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1320 "Zend/zend_language_scanner.l" +#line 1326 "Zend/zend_language_scanner.l" { return T_ABSTRACT; } -#line 5653 "Zend/zend_language_scanner.c" +#line 5659 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5673,11 +5679,11 @@ yy575: } YYDEBUG(576, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1089 "Zend/zend_language_scanner.l" +#line 1095 "Zend/zend_language_scanner.l" { return T_WHILE; } -#line 5681 "Zend/zend_language_scanner.c" +#line 5687 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5686,11 +5692,11 @@ yy577: } YYDEBUG(578, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1073 "Zend/zend_language_scanner.l" +#line 1079 "Zend/zend_language_scanner.l" { return T_IF; } -#line 5694 "Zend/zend_language_scanner.c" +#line 5700 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5742,11 +5748,11 @@ yy584: } YYDEBUG(585, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1304 "Zend/zend_language_scanner.l" +#line 1310 "Zend/zend_language_scanner.l" { return T_ISSET; } -#line 5750 "Zend/zend_language_scanner.c" +#line 5756 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5800,11 +5806,11 @@ yy592: yy593: YYDEBUG(593, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1272 "Zend/zend_language_scanner.l" +#line 1278 "Zend/zend_language_scanner.l" { return T_INCLUDE; } -#line 5808 "Zend/zend_language_scanner.c" +#line 5814 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5833,11 +5839,11 @@ yy598: } YYDEBUG(599, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1276 "Zend/zend_language_scanner.l" +#line 1282 "Zend/zend_language_scanner.l" { return T_INCLUDE_ONCE; } -#line 5841 "Zend/zend_language_scanner.c" +#line 5847 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5871,11 +5877,11 @@ yy605: } YYDEBUG(606, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1173 "Zend/zend_language_scanner.l" +#line 1179 "Zend/zend_language_scanner.l" { return T_INTERFACE; } -#line 5879 "Zend/zend_language_scanner.c" +#line 5885 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5925,11 +5931,11 @@ yy613: } YYDEBUG(614, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1296 "Zend/zend_language_scanner.l" +#line 1302 "Zend/zend_language_scanner.l" { return T_INSTEADOF; } -#line 5933 "Zend/zend_language_scanner.c" +#line 5939 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -5958,11 +5964,11 @@ yy619: } YYDEBUG(620, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1125 "Zend/zend_language_scanner.l" +#line 1131 "Zend/zend_language_scanner.l" { return T_INSTANCEOF; } -#line 5966 "Zend/zend_language_scanner.c" +#line 5972 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6006,11 +6012,11 @@ yy628: } YYDEBUG(629, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1185 "Zend/zend_language_scanner.l" +#line 1191 "Zend/zend_language_scanner.l" { return T_IMPLEMENTS; } -#line 6014 "Zend/zend_language_scanner.c" +#line 6020 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6038,11 +6044,11 @@ yy631: } YYDEBUG(633, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1057 "Zend/zend_language_scanner.l" +#line 1063 "Zend/zend_language_scanner.l" { return T_TRY; } -#line 6046 "Zend/zend_language_scanner.c" +#line 6052 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6061,11 +6067,11 @@ yy636: } YYDEBUG(637, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1177 "Zend/zend_language_scanner.l" +#line 1183 "Zend/zend_language_scanner.l" { return T_TRAIT; } -#line 6069 "Zend/zend_language_scanner.c" +#line 6075 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6084,11 +6090,11 @@ yy640: } YYDEBUG(641, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1069 "Zend/zend_language_scanner.l" +#line 1075 "Zend/zend_language_scanner.l" { return T_THROW; } -#line 6092 "Zend/zend_language_scanner.c" +#line 6098 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6112,11 +6118,11 @@ yy645: } YYDEBUG(646, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1053 "Zend/zend_language_scanner.l" +#line 1059 "Zend/zend_language_scanner.l" { return T_YIELD; } -#line 6120 "Zend/zend_language_scanner.c" +#line 6126 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6177,11 +6183,11 @@ yy653: yy654: YYDEBUG(654, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1280 "Zend/zend_language_scanner.l" +#line 1286 "Zend/zend_language_scanner.l" { return T_REQUIRE; } -#line 6185 "Zend/zend_language_scanner.c" +#line 6191 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6210,11 +6216,11 @@ yy659: } YYDEBUG(660, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1284 "Zend/zend_language_scanner.l" +#line 1290 "Zend/zend_language_scanner.l" { return T_REQUIRE_ONCE; } -#line 6218 "Zend/zend_language_scanner.c" +#line 6224 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6233,11 +6239,11 @@ yy663: } YYDEBUG(664, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1049 "Zend/zend_language_scanner.l" +#line 1055 "Zend/zend_language_scanner.l" { return T_RETURN; } -#line 6241 "Zend/zend_language_scanner.c" +#line 6247 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6327,11 +6333,11 @@ yy674: } YYDEBUG(675, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1153 "Zend/zend_language_scanner.l" +#line 1159 "Zend/zend_language_scanner.l" { return T_CONTINUE; } -#line 6335 "Zend/zend_language_scanner.c" +#line 6341 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6340,11 +6346,11 @@ yy676: } YYDEBUG(677, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1045 "Zend/zend_language_scanner.l" +#line 1051 "Zend/zend_language_scanner.l" { return T_CONST; } -#line 6348 "Zend/zend_language_scanner.c" +#line 6354 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6369,11 +6375,11 @@ yy681: } YYDEBUG(682, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1232 "Zend/zend_language_scanner.l" +#line 1238 "Zend/zend_language_scanner.l" { return T_CLONE; } -#line 6377 "Zend/zend_language_scanner.c" +#line 6383 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6387,11 +6393,11 @@ yy684: } YYDEBUG(685, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1169 "Zend/zend_language_scanner.l" +#line 1175 "Zend/zend_language_scanner.l" { return T_CLASS; } -#line 6395 "Zend/zend_language_scanner.c" +#line 6401 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6437,11 +6443,11 @@ yy693: } YYDEBUG(694, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1356 "Zend/zend_language_scanner.l" +#line 1362 "Zend/zend_language_scanner.l" { return T_CALLABLE; } -#line 6445 "Zend/zend_language_scanner.c" +#line 6451 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6450,11 +6456,11 @@ yy695: } YYDEBUG(696, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1141 "Zend/zend_language_scanner.l" +#line 1147 "Zend/zend_language_scanner.l" { return T_CASE; } -#line 6458 "Zend/zend_language_scanner.c" +#line 6464 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6468,11 +6474,11 @@ yy698: } YYDEBUG(699, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1061 "Zend/zend_language_scanner.l" +#line 1067 "Zend/zend_language_scanner.l" { return T_CATCH; } -#line 6476 "Zend/zend_language_scanner.c" +#line 6482 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6523,11 +6529,11 @@ yy708: } YYDEBUG(709, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1041 "Zend/zend_language_scanner.l" +#line 1047 "Zend/zend_language_scanner.l" { return T_FUNCTION; } -#line 6531 "Zend/zend_language_scanner.c" +#line 6537 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6551,11 +6557,11 @@ yy710: yy711: YYDEBUG(711, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1101 "Zend/zend_language_scanner.l" +#line 1107 "Zend/zend_language_scanner.l" { return T_FOR; } -#line 6559 "Zend/zend_language_scanner.c" +#line 6565 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6579,11 +6585,11 @@ yy715: } YYDEBUG(716, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1109 "Zend/zend_language_scanner.l" +#line 1115 "Zend/zend_language_scanner.l" { return T_FOREACH; } -#line 6587 "Zend/zend_language_scanner.c" +#line 6593 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6617,11 +6623,11 @@ yy719: yy720: YYDEBUG(720, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1324 "Zend/zend_language_scanner.l" +#line 1330 "Zend/zend_language_scanner.l" { return T_FINAL; } -#line 6625 "Zend/zend_language_scanner.c" +#line 6631 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6635,11 +6641,11 @@ yy722: } YYDEBUG(723, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1065 "Zend/zend_language_scanner.l" +#line 1071 "Zend/zend_language_scanner.l" { return T_FINALLY; } -#line 6643 "Zend/zend_language_scanner.c" +#line 6649 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6670,11 +6676,11 @@ yy726: } YYDEBUG(727, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1097 "Zend/zend_language_scanner.l" +#line 1103 "Zend/zend_language_scanner.l" { return T_DO; } -#line 6678 "Zend/zend_language_scanner.c" +#line 6684 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6683,11 +6689,11 @@ yy728: } YYDEBUG(729, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1037 "Zend/zend_language_scanner.l" +#line 1043 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6691 "Zend/zend_language_scanner.c" +#line 6697 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6722,11 +6728,11 @@ yy735: } YYDEBUG(736, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1145 "Zend/zend_language_scanner.l" +#line 1151 "Zend/zend_language_scanner.l" { return T_DEFAULT; } -#line 6730 "Zend/zend_language_scanner.c" +#line 6736 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6750,11 +6756,11 @@ yy740: } YYDEBUG(741, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1117 "Zend/zend_language_scanner.l" +#line 1123 "Zend/zend_language_scanner.l" { return T_DECLARE; } -#line 6758 "Zend/zend_language_scanner.c" +#line 6764 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6834,11 +6840,11 @@ yy753: } YYDEBUG(754, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1181 "Zend/zend_language_scanner.l" +#line 1187 "Zend/zend_language_scanner.l" { return T_EXTENDS; } -#line 6842 "Zend/zend_language_scanner.c" +#line 6848 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6847,11 +6853,11 @@ yy755: } YYDEBUG(756, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1033 "Zend/zend_language_scanner.l" +#line 1039 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6855 "Zend/zend_language_scanner.c" +#line 6861 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6865,11 +6871,11 @@ yy758: } YYDEBUG(759, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1268 "Zend/zend_language_scanner.l" +#line 1274 "Zend/zend_language_scanner.l" { return T_EVAL; } -#line 6873 "Zend/zend_language_scanner.c" +#line 6879 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6939,11 +6945,11 @@ yy769: } YYDEBUG(770, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1093 "Zend/zend_language_scanner.l" +#line 1099 "Zend/zend_language_scanner.l" { return T_ENDWHILE; } -#line 6947 "Zend/zend_language_scanner.c" +#line 6953 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -6972,11 +6978,11 @@ yy775: } YYDEBUG(776, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1137 "Zend/zend_language_scanner.l" +#line 1143 "Zend/zend_language_scanner.l" { return T_ENDSWITCH; } -#line 6980 "Zend/zend_language_scanner.c" +#line 6986 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -6985,11 +6991,11 @@ yy777: } YYDEBUG(778, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1081 "Zend/zend_language_scanner.l" +#line 1087 "Zend/zend_language_scanner.l" { return T_ENDIF; } -#line 6993 "Zend/zend_language_scanner.c" +#line 6999 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7018,11 +7024,11 @@ yy780: yy781: YYDEBUG(781, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1105 "Zend/zend_language_scanner.l" +#line 1111 "Zend/zend_language_scanner.l" { return T_ENDFOR; } -#line 7026 "Zend/zend_language_scanner.c" +#line 7032 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7046,11 +7052,11 @@ yy785: } YYDEBUG(786, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1113 "Zend/zend_language_scanner.l" +#line 1119 "Zend/zend_language_scanner.l" { return T_ENDFOREACH; } -#line 7054 "Zend/zend_language_scanner.c" +#line 7060 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7084,11 +7090,11 @@ yy792: } YYDEBUG(793, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1121 "Zend/zend_language_scanner.l" +#line 1127 "Zend/zend_language_scanner.l" { return T_ENDDECLARE; } -#line 7092 "Zend/zend_language_scanner.c" +#line 7098 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7107,11 +7113,11 @@ yy796: } YYDEBUG(797, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1308 "Zend/zend_language_scanner.l" +#line 1314 "Zend/zend_language_scanner.l" { return T_EMPTY; } -#line 7115 "Zend/zend_language_scanner.c" +#line 7121 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7140,11 +7146,11 @@ yy799: yy800: YYDEBUG(800, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1085 "Zend/zend_language_scanner.l" +#line 1091 "Zend/zend_language_scanner.l" { return T_ELSE; } -#line 7148 "Zend/zend_language_scanner.c" +#line 7154 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7158,11 +7164,11 @@ yy802: } YYDEBUG(803, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1077 "Zend/zend_language_scanner.l" +#line 1083 "Zend/zend_language_scanner.l" { return T_ELSEIF; } -#line 7166 "Zend/zend_language_scanner.c" +#line 7172 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7176,11 +7182,11 @@ yy805: } YYDEBUG(806, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1161 "Zend/zend_language_scanner.l" +#line 1167 "Zend/zend_language_scanner.l" { return T_ECHO; } -#line 7184 "Zend/zend_language_scanner.c" +#line 7190 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7253,13 +7259,13 @@ yy809: yy810: YYDEBUG(810, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1194 "Zend/zend_language_scanner.l" +#line 1200 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7263 "Zend/zend_language_scanner.c" +#line 7269 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7267,13 +7273,13 @@ yy811: yy812: YYDEBUG(812, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1210 "Zend/zend_language_scanner.l" +#line 1216 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); goto restart; } -#line 7277 "Zend/zend_language_scanner.c" +#line 7283 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7282,13 +7288,13 @@ yy813: yy814: YYDEBUG(814, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1204 "Zend/zend_language_scanner.l" +#line 1210 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7292 "Zend/zend_language_scanner.c" +#line 7298 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7309,11 +7315,11 @@ yy818: ++YYCURSOR; YYDEBUG(819, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1200 "Zend/zend_language_scanner.l" +#line 1206 "Zend/zend_language_scanner.l" { return T_OBJECT_OPERATOR; } -#line 7317 "Zend/zend_language_scanner.c" +#line 7323 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7398,14 +7404,14 @@ yy824: yy825: YYDEBUG(825, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1507 "Zend/zend_language_scanner.l" +#line 1513 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7409 "Zend/zend_language_scanner.c" +#line 7415 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7430,7 +7436,7 @@ yy830: ++YYCURSOR; YYDEBUG(831, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1498 "Zend/zend_language_scanner.l" +#line 1504 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); zend_copy_value(zendlval, yytext, yyleng); @@ -7438,7 +7444,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7442 "Zend/zend_language_scanner.c" +#line 7448 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7449,7 +7455,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2280 "Zend/zend_language_scanner.l" +#line 2286 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7505,7 +7511,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7509 "Zend/zend_language_scanner.c" +#line 7515 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7612,7 +7618,7 @@ yy838: yy839: YYDEBUG(839, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1578 "Zend/zend_language_scanner.l" +#line 1584 "Zend/zend_language_scanner.l" { /* Offset could be treated as a long */ if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) { ZVAL_LONG(zendlval, strtol(yytext, NULL, 10)); @@ -7621,7 +7627,7 @@ yy839: } return T_NUM_STRING; } -#line 7625 "Zend/zend_language_scanner.c" +#line 7631 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7641,23 +7647,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1812 "Zend/zend_language_scanner.l" +#line 1818 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7650 "Zend/zend_language_scanner.c" +#line 7656 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1813 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7661 "Zend/zend_language_scanner.c" +#line 7667 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7667,14 +7673,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1817 "Zend/zend_language_scanner.l" +#line 1823 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7678 "Zend/zend_language_scanner.c" +#line 7684 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7683,18 +7689,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1824 "Zend/zend_language_scanner.l" +#line 1830 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7692 "Zend/zend_language_scanner.c" +#line 7698 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2337 "Zend/zend_language_scanner.l" +#line 2343 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7703,7 +7709,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7707 "Zend/zend_language_scanner.c" +#line 7713 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7739,12 +7745,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1802 "Zend/zend_language_scanner.l" +#line 1808 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7748 "Zend/zend_language_scanner.c" +#line 7754 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7784,12 +7790,12 @@ yy862: yy864: YYDEBUG(864, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1587 "Zend/zend_language_scanner.l" +#line 1593 "Zend/zend_language_scanner.l" { /* Offset must be treated as a string */ ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7793 "Zend/zend_language_scanner.c" +#line 7799 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7812,6 +7818,6 @@ yy867: goto yy864; } } -#line 2346 "Zend/zend_language_scanner.l" +#line 2352 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 8d148e6269..c25e7f0288 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -584,11 +584,14 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); compiler_result = zendparse(TSRMLS_C); - zend_do_return(&retval_znode, 0 TSRMLS_CC); - CG(in_compilation) = original_in_compilation; if (compiler_result != 0) { /* parser error */ zend_bailout(); } + zend_compile_top_stmt(CG(ast) TSRMLS_CC); + zend_ast_destroy(CG(ast)); + zend_do_end_compilation(TSRMLS_C); + zend_do_return(&retval_znode, 0 TSRMLS_CC); + CG(in_compilation) = original_in_compilation; compilation_successful=1; } @@ -764,6 +767,9 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) efree(op_array); retval = NULL; } else { + zend_compile_top_stmt(CG(ast) TSRMLS_CC); + zend_ast_destroy(CG(ast)); + zend_do_end_compilation(TSRMLS_C); zend_do_return(NULL, 0 TSRMLS_CC); CG(active_op_array) = original_active_op_array; pass_two(op_array TSRMLS_CC); -- cgit v1.2.1 From c777427c0851bbfeb2b5c842265779233a24fd96 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 24 Jul 2014 21:07:37 +0200 Subject: Fix interning bug --- Zend/zend_compile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d68aa175a7..d402ff7814 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6153,8 +6153,11 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { efree(import_name_lc); } + name = zend_new_interned_string(name TSRMLS_CC); + lcname = zend_new_interned_string(lcname TSRMLS_CC); + ce->type = ZEND_USER_CLASS; - ce->name = zend_new_interned_string(name TSRMLS_CC); + ce->name = name; zend_initialize_class_data(ce, 1 TSRMLS_CC); ce->ce_flags |= decl->flags; -- cgit v1.2.1 From 1644bf01da71f89170093932cd96d81cc0a32c3c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 24 Jul 2014 21:35:57 +0200 Subject: Resolve futher interning issues Not sure if this is the right way to do it ... --- Zend/zend_compile.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d402ff7814..82e428c35c 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -140,6 +140,19 @@ static void zend_destroy_property_info_internal(zval *zv) /* {{{ */ } /* }}} */ +static zend_string *zend_new_interned_string_safe(zend_string *str TSRMLS_DC) { + zend_string *interned_str; + + STR_ADDREF(str); + interned_str = zend_new_interned_string(str TSRMLS_CC); + if (str != interned_str) { + return interned_str; + } else { + STR_RELEASE(str); + return str; + } +} + static void build_runtime_defined_function_key(zval *result, zend_string *name, unsigned char *lex_pos TSRMLS_DC) /* {{{ */ { char char_pos_buf[32]; @@ -5908,7 +5921,7 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { ZVAL_NULL(&value_zv); } - name = zend_new_interned_string(name TSRMLS_CC); + name = zend_new_interned_string_safe(name TSRMLS_CC); zend_declare_property_ex(ce, name, &value_zv, flags, NULL /* TODO.AST doc comment */ TSRMLS_CC); } } @@ -5937,7 +5950,7 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "Arrays are not allowed in class constants"); } - name = zend_new_interned_string(name TSRMLS_CC); + name = zend_new_interned_string_safe(name TSRMLS_CC); if (zend_hash_add(&ce->constants_table, name, &value_zv) == NULL) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", ce->name->val, name); -- cgit v1.2.1 From d46f67a3a759e759cc8c0892909e08ceb7d2d076 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 25 Jul 2014 20:24:15 +0200 Subject: Use arena allocator (currently leaky!) --- Zend/zend_ast.c | 27 +- Zend/zend_compile.c | 25 +- Zend/zend_globals.h | 1 + Zend/zend_language_scanner.c | 704 ++++++++++++++++++++++--------------------- Zend/zend_language_scanner.l | 4 + 5 files changed, 383 insertions(+), 378 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 177fa002c2..fa46301f5a 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -26,7 +26,7 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) { TSRMLS_FETCH(); - zend_ast_znode *ast = emalloc(sizeof(zend_ast_znode)); + zend_ast_znode *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast_znode)); ast->kind = ZEND_AST_ZNODE; ast->attr = 0; ast->lineno = CG(zend_lineno); @@ -37,7 +37,7 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) { TSRMLS_FETCH(); - zend_ast_zval *ast = emalloc(sizeof(zend_ast_zval)); + zend_ast_zval *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast_zval)); ast->kind = ZEND_AST_ZVAL; ast->attr = attr; ast->lineno = CG(zend_lineno); @@ -50,7 +50,7 @@ ZEND_API zend_ast *zend_ast_create_decl( unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2 ) { - zend_ast_decl *ast = emalloc(sizeof(zend_ast_decl)); + zend_ast_decl *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast_decl)); ast->kind = kind; ast->attr = 0; @@ -74,7 +74,7 @@ static zend_ast *zend_ast_create_from_va_list( zend_uint i; zend_ast *ast; - ast = emalloc(sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *)); + ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *)); ast->kind = kind; ast->attr = attr; ast->lineno = UINT_MAX; @@ -124,7 +124,7 @@ ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind) { /* use 4 children as default */ TSRMLS_FETCH(); - zend_ast *ast = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * 3); + zend_ast *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast) + sizeof(zend_ast *) * 3); ast->kind = kind; ast->attr = 0; ast->lineno = CG(zend_lineno); @@ -139,7 +139,11 @@ static inline zend_bool is_power_of_two(unsigned short n) { ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op) { if (ast->children >= 4 && is_power_of_two(ast->children)) { - ast = erealloc(ast, sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children * 2 - 1)); + size_t old_size = sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children - 1); + zend_ast *new_ast = zend_arena_alloc(&CG(ast_arena), + sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children * 2 - 1)); + memcpy(new_ast, ast, old_size); + ast = new_ast; } ast->child[ast->children++] = op; return ast; @@ -332,9 +336,12 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) if (ast == NULL) { return NULL; } else if (ast->kind == ZEND_AST_ZVAL) { - zend_ast *copy = zend_ast_create_zval_ex(zend_ast_get_zval(ast), ast->attr); - zval_copy_ctor(zend_ast_get_zval(copy)); - return copy; + zend_ast_zval *copy = emalloc(sizeof(zend_ast_zval)); + copy->kind = ZEND_AST_ZVAL; + copy->attr = ast->attr; + copy->lineno = ast->lineno; + ZVAL_DUP(©->val, zend_ast_get_zval(ast)); + return (zend_ast *) copy; } else { zend_ast *new = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children - 1)); int i; @@ -384,5 +391,5 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) } } - efree(ast); + //efree(ast); } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 82e428c35c..b14bda0e0d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3422,16 +3422,17 @@ void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ // TODO.AST Sort out the whole constant folding issue static void _tmp_compile_const_expr(zval *result, zend_ast *ast TSRMLS_DC) { - ast = zend_ast_copy(ast); + zend_ast *orig_ast = ast; zend_eval_const_expr(&ast TSRMLS_CC); zend_compile_const_expr(&ast TSRMLS_CC); if (ast->kind == ZEND_AST_ZVAL) { - ZVAL_COPY_VALUE(result, zend_ast_get_zval(ast)); + ZVAL_COPY(result, zend_ast_get_zval(ast)); if (Z_TYPE_P(result) == IS_ARRAY) { zend_make_immutable_array_r(result TSRMLS_CC); } - efree(ast); + orig_ast->kind = ZEND_AST_ZNODE; } else { + ast = zend_ast_copy(ast); ZVAL_NEW_AST(result, ast); } } @@ -4714,7 +4715,6 @@ static void zend_compile_static_var_common( if (by_ref) { zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); - efree(fetch_ast); } else { zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); zend_ast *znode_ast = zend_ast_create_znode(&result); @@ -4722,9 +4722,6 @@ static void zend_compile_static_var_common( znode dummy_node; zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); - efree(znode_ast); - efree(assign_ast); - efree(fetch_ast); } } @@ -5071,8 +5068,6 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { zend_ast *assign_ast = zend_ast_create_binary(ZEND_AST_ASSIGN, value_ast, znode_ast); zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); - efree(znode_ast); - efree(assign_ast); } if (key_ast) { @@ -5080,8 +5075,6 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { zend_ast *assign_ast = zend_ast_create_binary(ZEND_AST_ASSIGN, key_ast, znode_ast); zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); - efree(znode_ast); - efree(assign_ast); } do_begin_loop(TSRMLS_C); @@ -6921,7 +6914,6 @@ void zend_compile_isset_or_empty(znode *result, zend_ast *ast TSRMLS_DC) { /* empty(expr) can be transformed to !expr */ zend_ast *not_ast = zend_ast_create_unary(ZEND_BOOL_NOT, var_ast); zend_compile_expr(result, not_ast TSRMLS_CC); - efree(not_ast); return; } else { zend_error_noreturn(E_COMPILE_ERROR, @@ -6989,9 +6981,7 @@ void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(result, call_ast TSRMLS_CC); - efree(call_ast); - efree(args_ast); - zend_ast_destroy(name_ast); + zval_ptr_dtor(&fn_name); } void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { @@ -7144,8 +7134,7 @@ void zend_compile_resolve_class_name(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(result, class_const_ast TSRMLS_CC); - zend_ast_destroy(class_str_ast); - efree(class_const_ast); + zval_ptr_dtor(&class_str_zv); } break; case ZEND_FETCH_CLASS_DEFAULT: @@ -7279,7 +7268,7 @@ void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *const_ast = zend_ast_create_unary(ZEND_AST_CONST, zend_ast_create_zval(&const_zv)); zend_compile_const(result, const_ast TSRMLS_CC); - zend_ast_destroy(const_ast); + zval_ptr_dtor(&const_zv); } } diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 39d9dab89b..dd8098e78b 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -159,6 +159,7 @@ struct _zend_compiler_globals { #endif zend_ast *ast; + zend_arena *ast_arena; }; diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 0bd8dffe75..65bdcf23d9 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -585,12 +585,14 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR CG(active_op_array) = op_array; zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); + CG(ast_arena) = zend_arena_create(1024 * 32 TSRMLS_CC); compiler_result = zendparse(TSRMLS_C); if (compiler_result != 0) { /* parser error */ zend_bailout(); } zend_compile_top_stmt(CG(ast) TSRMLS_CC); zend_ast_destroy(CG(ast)); + zend_arena_destroy(CG(ast_arena)); zend_do_end_compilation(TSRMLS_C); zend_do_return(&retval_znode, 0 TSRMLS_CC); CG(in_compilation) = original_in_compilation; @@ -755,6 +757,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); BEGIN(ST_IN_SCRIPTING); + CG(ast_arena) = zend_arena_create(1024 * 32 TSRMLS_CC); compiler_result = zendparse(TSRMLS_C); if (SCNG(script_filtered)) { @@ -771,6 +774,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) } else { zend_compile_top_stmt(CG(ast) TSRMLS_CC); zend_ast_destroy(CG(ast)); + zend_arena_destroy(CG(ast_arena)); zend_do_end_compilation(TSRMLS_C); zend_do_return(NULL, 0 TSRMLS_CC); CG(active_op_array) = original_active_op_array; @@ -1022,7 +1026,7 @@ restart: yymore_restart: -#line 1026 "Zend/zend_language_scanner.c" +#line 1030 "Zend/zend_language_scanner.c" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -1121,7 +1125,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1727 "Zend/zend_language_scanner.l" +#line 1731 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1182,7 +1186,7 @@ inline_html: HANDLE_NEWLINES(yytext, yyleng); return T_INLINE_HTML; } -#line 1186 "Zend/zend_language_scanner.c" +#line 1190 "Zend/zend_language_scanner.c" yy4: YYDEBUG(4, *YYCURSOR); yych = *++YYCURSOR; @@ -1200,7 +1204,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1717 "Zend/zend_language_scanner.l" +#line 1721 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1210,14 +1214,14 @@ yy6: goto inline_char_handler; } } -#line 1214 "Zend/zend_language_scanner.c" +#line 1218 "Zend/zend_language_scanner.c" yy7: YYDEBUG(7, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1698 "Zend/zend_language_scanner.l" +#line 1702 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1227,7 +1231,7 @@ yy7: goto inline_char_handler; } } -#line 1231 "Zend/zend_language_scanner.c" +#line 1235 "Zend/zend_language_scanner.c" yy9: YYDEBUG(9, *YYCURSOR); yych = *++YYCURSOR; @@ -1413,7 +1417,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1664 "Zend/zend_language_scanner.l" +#line 1668 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1428,7 +1432,7 @@ yy35: BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1432 "Zend/zend_language_scanner.c" +#line 1436 "Zend/zend_language_scanner.c" yy39: YYDEBUG(39, *YYCURSOR); yych = *++YYCURSOR; @@ -1455,7 +1459,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1680 "Zend/zend_language_scanner.l" +#line 1684 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1465,19 +1469,19 @@ yy43: goto inline_char_handler; } } -#line 1469 "Zend/zend_language_scanner.c" +#line 1473 "Zend/zend_language_scanner.c" yy45: YYDEBUG(45, *YYCURSOR); ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1691 "Zend/zend_language_scanner.l" +#line 1695 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG_WITH_ECHO; } -#line 1481 "Zend/zend_language_scanner.c" +#line 1485 "Zend/zend_language_scanner.c" yy47: YYDEBUG(47, *YYCURSOR); yych = *++YYCURSOR; @@ -1504,14 +1508,14 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1709 "Zend/zend_language_scanner.l" +#line 1713 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1515 "Zend/zend_language_scanner.c" +#line 1519 "Zend/zend_language_scanner.c" yy52: YYDEBUG(52, *YYCURSOR); ++YYCURSOR; @@ -1582,7 +1586,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2170 "Zend/zend_language_scanner.l" +#line 2174 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1623,7 +1627,7 @@ yy56: zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1627 "Zend/zend_language_scanner.c" +#line 1631 "Zend/zend_language_scanner.c" yy57: YYDEBUG(57, *YYCURSOR); yych = *++YYCURSOR; @@ -1634,12 +1638,12 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2114 "Zend/zend_language_scanner.l" +#line 2118 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; } -#line 1643 "Zend/zend_language_scanner.c" +#line 1647 "Zend/zend_language_scanner.c" yy60: YYDEBUG(60, *YYCURSOR); yych = *++YYCURSOR; @@ -1649,14 +1653,14 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2101 "Zend/zend_language_scanner.l" +#line 2105 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1660 "Zend/zend_language_scanner.c" +#line 1664 "Zend/zend_language_scanner.c" yy63: YYDEBUG(63, *YYCURSOR); yyaccept = 0; @@ -1672,23 +1676,23 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1808 "Zend/zend_language_scanner.l" +#line 1812 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1681 "Zend/zend_language_scanner.c" +#line 1685 "Zend/zend_language_scanner.c" yy66: YYDEBUG(66, *YYCURSOR); ++YYCURSOR; YYDEBUG(67, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1489 "Zend/zend_language_scanner.l" +#line 1493 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1692 "Zend/zend_language_scanner.c" +#line 1696 "Zend/zend_language_scanner.c" yy68: YYDEBUG(68, *YYCURSOR); yych = *++YYCURSOR; @@ -1702,14 +1706,14 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1801 "Zend/zend_language_scanner.l" +#line 1805 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1713 "Zend/zend_language_scanner.c" +#line 1717 "Zend/zend_language_scanner.c" yy72: YYDEBUG(72, *YYCURSOR); yych = *++YYCURSOR; @@ -1727,14 +1731,14 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1792 "Zend/zend_language_scanner.l" +#line 1796 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1738 "Zend/zend_language_scanner.c" +#line 1742 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_DOUBLE_QUOTES: @@ -1802,7 +1806,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2120 "Zend/zend_language_scanner.l" +#line 2124 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1851,7 +1855,7 @@ double_quotes_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1855 "Zend/zend_language_scanner.c" +#line 1859 "Zend/zend_language_scanner.c" yy79: YYDEBUG(79, *YYCURSOR); yych = *++YYCURSOR; @@ -1862,12 +1866,12 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2109 "Zend/zend_language_scanner.l" +#line 2113 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; } -#line 1871 "Zend/zend_language_scanner.c" +#line 1875 "Zend/zend_language_scanner.c" yy82: YYDEBUG(82, *YYCURSOR); yych = *++YYCURSOR; @@ -1877,14 +1881,14 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2101 "Zend/zend_language_scanner.l" +#line 2105 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1888 "Zend/zend_language_scanner.c" +#line 1892 "Zend/zend_language_scanner.c" yy85: YYDEBUG(85, *YYCURSOR); yyaccept = 0; @@ -1900,23 +1904,23 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1808 "Zend/zend_language_scanner.l" +#line 1812 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1909 "Zend/zend_language_scanner.c" +#line 1913 "Zend/zend_language_scanner.c" yy88: YYDEBUG(88, *YYCURSOR); ++YYCURSOR; YYDEBUG(89, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1489 "Zend/zend_language_scanner.l" +#line 1493 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1920 "Zend/zend_language_scanner.c" +#line 1924 "Zend/zend_language_scanner.c" yy90: YYDEBUG(90, *YYCURSOR); yych = *++YYCURSOR; @@ -1930,14 +1934,14 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1801 "Zend/zend_language_scanner.l" +#line 1805 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1941 "Zend/zend_language_scanner.c" +#line 1945 "Zend/zend_language_scanner.c" yy94: YYDEBUG(94, *YYCURSOR); yych = *++YYCURSOR; @@ -1955,14 +1959,14 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1792 "Zend/zend_language_scanner.l" +#line 1796 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1966 "Zend/zend_language_scanner.c" +#line 1970 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_END_HEREDOC: @@ -1973,7 +1977,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2087 "Zend/zend_language_scanner.l" +#line 2091 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -1986,7 +1990,7 @@ yyc_ST_END_HEREDOC: BEGIN(ST_IN_SCRIPTING); return T_END_HEREDOC; } -#line 1990 "Zend/zend_language_scanner.c" +#line 1994 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_HEREDOC: { @@ -2048,7 +2052,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2212 "Zend/zend_language_scanner.l" +#line 2216 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2121,7 +2125,7 @@ heredoc_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 2125 "Zend/zend_language_scanner.c" +#line 2129 "Zend/zend_language_scanner.c" yy105: YYDEBUG(105, *YYCURSOR); yych = *++YYCURSOR; @@ -2136,14 +2140,14 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2101 "Zend/zend_language_scanner.l" +#line 2105 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 2147 "Zend/zend_language_scanner.c" +#line 2151 "Zend/zend_language_scanner.c" yy109: YYDEBUG(109, *YYCURSOR); yyaccept = 0; @@ -2159,23 +2163,23 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1808 "Zend/zend_language_scanner.l" +#line 1812 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2168 "Zend/zend_language_scanner.c" +#line 2172 "Zend/zend_language_scanner.c" yy112: YYDEBUG(112, *YYCURSOR); ++YYCURSOR; YYDEBUG(113, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1489 "Zend/zend_language_scanner.l" +#line 1493 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 2179 "Zend/zend_language_scanner.c" +#line 2183 "Zend/zend_language_scanner.c" yy114: YYDEBUG(114, *YYCURSOR); yych = *++YYCURSOR; @@ -2189,14 +2193,14 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1801 "Zend/zend_language_scanner.l" +#line 1805 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2200 "Zend/zend_language_scanner.c" +#line 2204 "Zend/zend_language_scanner.c" yy118: YYDEBUG(118, *YYCURSOR); yych = *++YYCURSOR; @@ -2214,14 +2218,14 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1792 "Zend/zend_language_scanner.l" +#line 1796 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2225 "Zend/zend_language_scanner.c" +#line 2229 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_IN_SCRIPTING: @@ -2404,12 +2408,12 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1830 "Zend/zend_language_scanner.l" +#line 1834 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 2413 "Zend/zend_language_scanner.c" +#line 2417 "Zend/zend_language_scanner.c" yy125: YYDEBUG(125, *YYCURSOR); yych = *++YYCURSOR; @@ -2641,11 +2645,11 @@ yy138: yy139: YYDEBUG(139, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1478 "Zend/zend_language_scanner.l" +#line 1482 "Zend/zend_language_scanner.l" { return yytext[0]; } -#line 2649 "Zend/zend_language_scanner.c" +#line 2653 "Zend/zend_language_scanner.c" yy140: YYDEBUG(140, *YYCURSOR); ++YYCURSOR; @@ -2654,13 +2658,13 @@ yy140: yy141: YYDEBUG(141, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1200 "Zend/zend_language_scanner.l" +#line 1204 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 2664 "Zend/zend_language_scanner.c" +#line 2668 "Zend/zend_language_scanner.c" yy142: YYDEBUG(142, *YYCURSOR); yych = *++YYCURSOR; @@ -2671,11 +2675,11 @@ yy143: ++YYCURSOR; YYDEBUG(144, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1226 "Zend/zend_language_scanner.l" +#line 1230 "Zend/zend_language_scanner.l" { return T_NS_SEPARATOR; } -#line 2679 "Zend/zend_language_scanner.c" +#line 2683 "Zend/zend_language_scanner.c" yy145: YYDEBUG(145, *YYCURSOR); yyaccept = 1; @@ -2909,18 +2913,18 @@ yy168: ++YYCURSOR; YYDEBUG(169, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1483 "Zend/zend_language_scanner.l" +#line 1487 "Zend/zend_language_scanner.l" { yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return '{'; } -#line 2918 "Zend/zend_language_scanner.c" +#line 2922 "Zend/zend_language_scanner.c" yy170: YYDEBUG(170, *YYCURSOR); ++YYCURSOR; YYDEBUG(171, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1495 "Zend/zend_language_scanner.l" +#line 1499 "Zend/zend_language_scanner.l" { RESET_DOC_COMMENT(); if (!zend_stack_is_empty(&SCNG(state_stack))) { @@ -2928,7 +2932,7 @@ yy170: } return '}'; } -#line 2932 "Zend/zend_language_scanner.c" +#line 2936 "Zend/zend_language_scanner.c" yy172: YYDEBUG(172, *YYCURSOR); yyaccept = 2; @@ -2956,7 +2960,7 @@ yy172: yy173: YYDEBUG(173, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1543 "Zend/zend_language_scanner.l" +#line 1547 "Zend/zend_language_scanner.l" { if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */ ZVAL_LONG(zendlval, strtol(yytext, NULL, 0)); @@ -2974,7 +2978,7 @@ yy173: } return T_LNUMBER; } -#line 2978 "Zend/zend_language_scanner.c" +#line 2982 "Zend/zend_language_scanner.c" yy174: YYDEBUG(174, *YYCURSOR); yyaccept = 2; @@ -3002,7 +3006,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1836 "Zend/zend_language_scanner.l" +#line 1840 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3036,14 +3040,14 @@ yy177: return T_COMMENT; } -#line 3040 "Zend/zend_language_scanner.c" +#line 3044 "Zend/zend_language_scanner.c" yy178: YYDEBUG(178, *YYCURSOR); ++YYCURSOR; yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1922 "Zend/zend_language_scanner.l" +#line 1926 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3111,14 +3115,14 @@ yy179: } return T_CONSTANT_ENCAPSED_STRING; } -#line 3115 "Zend/zend_language_scanner.c" +#line 3119 "Zend/zend_language_scanner.c" yy180: YYDEBUG(180, *YYCURSOR); ++YYCURSOR; yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1991 "Zend/zend_language_scanner.l" +#line 1995 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3159,24 +3163,24 @@ yy181: BEGIN(ST_DOUBLE_QUOTES); return '"'; } -#line 3163 "Zend/zend_language_scanner.c" +#line 3167 "Zend/zend_language_scanner.c" yy182: YYDEBUG(182, *YYCURSOR); ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2081 "Zend/zend_language_scanner.l" +#line 2085 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; } -#line 3174 "Zend/zend_language_scanner.c" +#line 3178 "Zend/zend_language_scanner.c" yy184: YYDEBUG(184, *YYCURSOR); ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2343 "Zend/zend_language_scanner.l" +#line 2347 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3185,7 +3189,7 @@ yy184: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 3189 "Zend/zend_language_scanner.c" +#line 3193 "Zend/zend_language_scanner.c" yy186: YYDEBUG(186, *YYCURSOR); ++YYCURSOR; @@ -3212,12 +3216,12 @@ yy188: yy190: YYDEBUG(190, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1598 "Zend/zend_language_scanner.l" +#line 1602 "Zend/zend_language_scanner.l" { ZVAL_DOUBLE(zendlval, zend_strtod(yytext, NULL)); return T_DNUMBER; } -#line 3221 "Zend/zend_language_scanner.c" +#line 3225 "Zend/zend_language_scanner.c" yy191: YYDEBUG(191, *YYCURSOR); yyaccept = 2; @@ -3309,7 +3313,7 @@ yy200: } YYDEBUG(202, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1520 "Zend/zend_language_scanner.l" +#line 1524 "Zend/zend_language_scanner.l" { char *bin = yytext + 2; /* Skip "0b" */ int len = yyleng - 2; @@ -3332,7 +3336,7 @@ yy200: return T_DNUMBER; } } -#line 3336 "Zend/zend_language_scanner.c" +#line 3340 "Zend/zend_language_scanner.c" yy203: YYDEBUG(203, *YYCURSOR); ++YYCURSOR; @@ -3344,7 +3348,7 @@ yy203: } YYDEBUG(205, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1561 "Zend/zend_language_scanner.l" +#line 1565 "Zend/zend_language_scanner.l" { char *hex = yytext + 2; /* Skip "0x" */ int len = yyleng - 2; @@ -3367,7 +3371,7 @@ yy203: return T_DNUMBER; } } -#line 3371 "Zend/zend_language_scanner.c" +#line 3375 "Zend/zend_language_scanner.c" yy206: YYDEBUG(206, *YYCURSOR); ++YYCURSOR; @@ -3376,13 +3380,13 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1903 "Zend/zend_language_scanner.l" +#line 1907 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } -#line 3386 "Zend/zend_language_scanner.c" +#line 3390 "Zend/zend_language_scanner.c" yy208: YYDEBUG(208, *YYCURSOR); yych = *++YYCURSOR; @@ -3416,12 +3420,12 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1808 "Zend/zend_language_scanner.l" +#line 1812 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 3425 "Zend/zend_language_scanner.c" +#line 3429 "Zend/zend_language_scanner.c" yy213: YYDEBUG(213, *YYCURSOR); yych = *++YYCURSOR; @@ -3435,11 +3439,11 @@ yy214: } YYDEBUG(215, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1466 "Zend/zend_language_scanner.l" +#line 1470 "Zend/zend_language_scanner.l" { return T_LOGICAL_XOR; } -#line 3443 "Zend/zend_language_scanner.c" +#line 3447 "Zend/zend_language_scanner.c" yy216: YYDEBUG(216, *YYCURSOR); ++YYCURSOR; @@ -3448,61 +3452,61 @@ yy216: } YYDEBUG(217, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1458 "Zend/zend_language_scanner.l" +#line 1462 "Zend/zend_language_scanner.l" { return T_LOGICAL_OR; } -#line 3456 "Zend/zend_language_scanner.c" +#line 3460 "Zend/zend_language_scanner.c" yy218: YYDEBUG(218, *YYCURSOR); ++YYCURSOR; YYDEBUG(219, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1446 "Zend/zend_language_scanner.l" +#line 1450 "Zend/zend_language_scanner.l" { return T_XOR_EQUAL; } -#line 3466 "Zend/zend_language_scanner.c" +#line 3470 "Zend/zend_language_scanner.c" yy220: YYDEBUG(220, *YYCURSOR); ++YYCURSOR; YYDEBUG(221, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1450 "Zend/zend_language_scanner.l" +#line 1454 "Zend/zend_language_scanner.l" { return T_BOOLEAN_OR; } -#line 3476 "Zend/zend_language_scanner.c" +#line 3480 "Zend/zend_language_scanner.c" yy222: YYDEBUG(222, *YYCURSOR); ++YYCURSOR; YYDEBUG(223, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1442 "Zend/zend_language_scanner.l" +#line 1446 "Zend/zend_language_scanner.l" { return T_OR_EQUAL; } -#line 3486 "Zend/zend_language_scanner.c" +#line 3490 "Zend/zend_language_scanner.c" yy224: YYDEBUG(224, *YYCURSOR); ++YYCURSOR; YYDEBUG(225, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1454 "Zend/zend_language_scanner.l" +#line 1458 "Zend/zend_language_scanner.l" { return T_BOOLEAN_AND; } -#line 3496 "Zend/zend_language_scanner.c" +#line 3500 "Zend/zend_language_scanner.c" yy226: YYDEBUG(226, *YYCURSOR); ++YYCURSOR; YYDEBUG(227, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1438 "Zend/zend_language_scanner.l" +#line 1442 "Zend/zend_language_scanner.l" { return T_AND_EQUAL; } -#line 3506 "Zend/zend_language_scanner.c" +#line 3510 "Zend/zend_language_scanner.c" yy228: YYDEBUG(228, *YYCURSOR); ++YYCURSOR; @@ -3511,7 +3515,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1910 "Zend/zend_language_scanner.l" +#line 1914 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3522,17 +3526,17 @@ yy229: return yytext[0]; } } -#line 3526 "Zend/zend_language_scanner.c" +#line 3530 "Zend/zend_language_scanner.c" yy230: YYDEBUG(230, *YYCURSOR); ++YYCURSOR; YYDEBUG(231, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1426 "Zend/zend_language_scanner.l" +#line 1430 "Zend/zend_language_scanner.l" { return T_MOD_EQUAL; } -#line 3536 "Zend/zend_language_scanner.c" +#line 3540 "Zend/zend_language_scanner.c" yy232: YYDEBUG(232, *YYCURSOR); yych = *++YYCURSOR; @@ -3550,7 +3554,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1870 "Zend/zend_language_scanner.l" +#line 1874 "Zend/zend_language_scanner.l" { int doc_com; @@ -3583,7 +3587,7 @@ yy235: return T_COMMENT; } -#line 3587 "Zend/zend_language_scanner.c" +#line 3591 "Zend/zend_language_scanner.c" yy236: YYDEBUG(236, *YYCURSOR); yych = *++YYCURSOR; @@ -3593,11 +3597,11 @@ yy237: ++YYCURSOR; YYDEBUG(238, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1418 "Zend/zend_language_scanner.l" +#line 1422 "Zend/zend_language_scanner.l" { return T_DIV_EQUAL; } -#line 3601 "Zend/zend_language_scanner.c" +#line 3605 "Zend/zend_language_scanner.c" yy239: YYDEBUG(239, *YYCURSOR); yych = *++YYCURSOR; @@ -3621,62 +3625,62 @@ yy242: if ((yych = *YYCURSOR) == '=') goto yy246; YYDEBUG(243, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1410 "Zend/zend_language_scanner.l" +#line 1414 "Zend/zend_language_scanner.l" { return T_POW; } -#line 3629 "Zend/zend_language_scanner.c" +#line 3633 "Zend/zend_language_scanner.c" yy244: YYDEBUG(244, *YYCURSOR); ++YYCURSOR; YYDEBUG(245, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1406 "Zend/zend_language_scanner.l" +#line 1410 "Zend/zend_language_scanner.l" { return T_MUL_EQUAL; } -#line 3639 "Zend/zend_language_scanner.c" +#line 3643 "Zend/zend_language_scanner.c" yy246: YYDEBUG(246, *YYCURSOR); ++YYCURSOR; YYDEBUG(247, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1414 "Zend/zend_language_scanner.l" +#line 1418 "Zend/zend_language_scanner.l" { return T_POW_EQUAL; } -#line 3649 "Zend/zend_language_scanner.c" +#line 3653 "Zend/zend_language_scanner.c" yy248: YYDEBUG(248, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy252; YYDEBUG(249, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1474 "Zend/zend_language_scanner.l" +#line 1478 "Zend/zend_language_scanner.l" { return T_SR; } -#line 3660 "Zend/zend_language_scanner.c" +#line 3664 "Zend/zend_language_scanner.c" yy250: YYDEBUG(250, *YYCURSOR); ++YYCURSOR; YYDEBUG(251, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1394 "Zend/zend_language_scanner.l" +#line 1398 "Zend/zend_language_scanner.l" { return T_IS_GREATER_OR_EQUAL; } -#line 3670 "Zend/zend_language_scanner.c" +#line 3674 "Zend/zend_language_scanner.c" yy252: YYDEBUG(252, *YYCURSOR); ++YYCURSOR; YYDEBUG(253, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1434 "Zend/zend_language_scanner.l" +#line 1438 "Zend/zend_language_scanner.l" { return T_SR_EQUAL; } -#line 3680 "Zend/zend_language_scanner.c" +#line 3684 "Zend/zend_language_scanner.c" yy254: YYDEBUG(254, *YYCURSOR); yyaccept = 5; @@ -3687,11 +3691,11 @@ yy254: yy255: YYDEBUG(255, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1470 "Zend/zend_language_scanner.l" +#line 1474 "Zend/zend_language_scanner.l" { return T_SL; } -#line 3695 "Zend/zend_language_scanner.c" +#line 3699 "Zend/zend_language_scanner.c" yy256: YYDEBUG(256, *YYCURSOR); yych = *++YYCURSOR; @@ -3703,22 +3707,22 @@ yy257: ++YYCURSOR; YYDEBUG(258, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1390 "Zend/zend_language_scanner.l" +#line 1394 "Zend/zend_language_scanner.l" { return T_IS_SMALLER_OR_EQUAL; } -#line 3711 "Zend/zend_language_scanner.c" +#line 3715 "Zend/zend_language_scanner.c" yy259: YYDEBUG(259, *YYCURSOR); ++YYCURSOR; yy260: YYDEBUG(260, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1386 "Zend/zend_language_scanner.l" +#line 1390 "Zend/zend_language_scanner.l" { return T_IS_NOT_EQUAL; } -#line 3722 "Zend/zend_language_scanner.c" +#line 3726 "Zend/zend_language_scanner.c" yy261: YYDEBUG(261, *YYCURSOR); yych = *++YYCURSOR; @@ -3769,11 +3773,11 @@ yy268: ++YYCURSOR; YYDEBUG(269, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1430 "Zend/zend_language_scanner.l" +#line 1434 "Zend/zend_language_scanner.l" { return T_SL_EQUAL; } -#line 3777 "Zend/zend_language_scanner.c" +#line 3781 "Zend/zend_language_scanner.c" yy270: YYDEBUG(270, *YYCURSOR); ++YYCURSOR; @@ -3878,7 +3882,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2033 "Zend/zend_language_scanner.l" +#line 2037 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -3925,7 +3929,7 @@ yy280: return T_START_HEREDOC; } -#line 3929 "Zend/zend_language_scanner.c" +#line 3933 "Zend/zend_language_scanner.c" yy281: YYDEBUG(281, *YYCURSOR); yych = *++YYCURSOR; @@ -3965,31 +3969,31 @@ yy284: ++YYCURSOR; YYDEBUG(286, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1378 "Zend/zend_language_scanner.l" +#line 1382 "Zend/zend_language_scanner.l" { return T_IS_NOT_IDENTICAL; } -#line 3973 "Zend/zend_language_scanner.c" +#line 3977 "Zend/zend_language_scanner.c" yy287: YYDEBUG(287, *YYCURSOR); ++YYCURSOR; YYDEBUG(288, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1398 "Zend/zend_language_scanner.l" +#line 1402 "Zend/zend_language_scanner.l" { return T_PLUS_EQUAL; } -#line 3983 "Zend/zend_language_scanner.c" +#line 3987 "Zend/zend_language_scanner.c" yy289: YYDEBUG(289, *YYCURSOR); ++YYCURSOR; YYDEBUG(290, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1366 "Zend/zend_language_scanner.l" +#line 1370 "Zend/zend_language_scanner.l" { return T_INC; } -#line 3993 "Zend/zend_language_scanner.c" +#line 3997 "Zend/zend_language_scanner.c" yy291: YYDEBUG(291, *YYCURSOR); yych = *++YYCURSOR; @@ -4008,42 +4012,42 @@ yy293: } YYDEBUG(294, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1354 "Zend/zend_language_scanner.l" +#line 1358 "Zend/zend_language_scanner.l" { return T_LIST; } -#line 4016 "Zend/zend_language_scanner.c" +#line 4020 "Zend/zend_language_scanner.c" yy295: YYDEBUG(295, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy299; YYDEBUG(296, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1382 "Zend/zend_language_scanner.l" +#line 1386 "Zend/zend_language_scanner.l" { return T_IS_EQUAL; } -#line 4027 "Zend/zend_language_scanner.c" +#line 4031 "Zend/zend_language_scanner.c" yy297: YYDEBUG(297, *YYCURSOR); ++YYCURSOR; YYDEBUG(298, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1350 "Zend/zend_language_scanner.l" +#line 1354 "Zend/zend_language_scanner.l" { return T_DOUBLE_ARROW; } -#line 4037 "Zend/zend_language_scanner.c" +#line 4041 "Zend/zend_language_scanner.c" yy299: YYDEBUG(299, *YYCURSOR); ++YYCURSOR; YYDEBUG(300, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1374 "Zend/zend_language_scanner.l" +#line 1378 "Zend/zend_language_scanner.l" { return T_IS_IDENTICAL; } -#line 4047 "Zend/zend_language_scanner.c" +#line 4051 "Zend/zend_language_scanner.c" yy301: YYDEBUG(301, *YYCURSOR); yych = *++YYCURSOR; @@ -4173,11 +4177,11 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1660 "Zend/zend_language_scanner.l" +#line 1664 "Zend/zend_language_scanner.l" { return T_NS_C; } -#line 4181 "Zend/zend_language_scanner.c" +#line 4185 "Zend/zend_language_scanner.c" yy321: YYDEBUG(321, *YYCURSOR); yych = *++YYCURSOR; @@ -4197,7 +4201,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1635 "Zend/zend_language_scanner.l" +#line 1639 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4222,7 +4226,7 @@ yy322: ZVAL_STR(zendlval, dirname); return T_DIR; } -#line 4226 "Zend/zend_language_scanner.c" +#line 4230 "Zend/zend_language_scanner.c" yy326: YYDEBUG(326, *YYCURSOR); yych = *++YYCURSOR; @@ -4247,12 +4251,12 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1619 "Zend/zend_language_scanner.l" +#line 1623 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; } -#line 4256 "Zend/zend_language_scanner.c" +#line 4260 "Zend/zend_language_scanner.c" yy332: YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; @@ -4287,11 +4291,11 @@ yy336: } YYDEBUG(339, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1615 "Zend/zend_language_scanner.l" +#line 1619 "Zend/zend_language_scanner.l" { return T_METHOD_C; } -#line 4295 "Zend/zend_language_scanner.c" +#line 4299 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; @@ -4342,11 +4346,11 @@ yy347: } YYDEBUG(350, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1611 "Zend/zend_language_scanner.l" +#line 1615 "Zend/zend_language_scanner.l" { return T_FUNC_C; } -#line 4350 "Zend/zend_language_scanner.c" +#line 4354 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4366,7 +4370,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1624 "Zend/zend_language_scanner.l" +#line 1628 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4377,7 +4381,7 @@ yy352: } return T_FILE; } -#line 4381 "Zend/zend_language_scanner.c" +#line 4385 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4407,11 +4411,11 @@ yy359: } YYDEBUG(362, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1607 "Zend/zend_language_scanner.l" +#line 1611 "Zend/zend_language_scanner.l" { return T_TRAIT_C; } -#line 4415 "Zend/zend_language_scanner.c" +#line 4419 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4441,11 +4445,11 @@ yy366: } YYDEBUG(369, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1603 "Zend/zend_language_scanner.l" +#line 1607 "Zend/zend_language_scanner.l" { return T_CLASS_C; } -#line 4449 "Zend/zend_language_scanner.c" +#line 4453 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4507,11 +4511,11 @@ yy381: } YYDEBUG(382, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1318 "Zend/zend_language_scanner.l" +#line 1322 "Zend/zend_language_scanner.l" { return T_HALT_COMPILER; } -#line 4515 "Zend/zend_language_scanner.c" +#line 4519 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4531,11 +4535,11 @@ yy385: } YYDEBUG(386, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1298 "Zend/zend_language_scanner.l" +#line 1302 "Zend/zend_language_scanner.l" { return T_USE; } -#line 4539 "Zend/zend_language_scanner.c" +#line 4543 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4554,11 +4558,11 @@ yy389: } YYDEBUG(390, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1346 "Zend/zend_language_scanner.l" +#line 1350 "Zend/zend_language_scanner.l" { return T_UNSET; } -#line 4562 "Zend/zend_language_scanner.c" +#line 4566 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4730,11 +4734,11 @@ yy406: ++YYCURSOR; YYDEBUG(408, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1246 "Zend/zend_language_scanner.l" +#line 1250 "Zend/zend_language_scanner.l" { return T_INT_CAST; } -#line 4738 "Zend/zend_language_scanner.c" +#line 4742 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4778,11 +4782,11 @@ yy414: ++YYCURSOR; YYDEBUG(417, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1250 "Zend/zend_language_scanner.l" +#line 1254 "Zend/zend_language_scanner.l" { return T_DOUBLE_CAST; } -#line 4786 "Zend/zend_language_scanner.c" +#line 4790 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4852,11 +4856,11 @@ yy428: ++YYCURSOR; YYDEBUG(431, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1254 "Zend/zend_language_scanner.l" +#line 1258 "Zend/zend_language_scanner.l" { return T_STRING_CAST; } -#line 4860 "Zend/zend_language_scanner.c" +#line 4864 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4889,11 +4893,11 @@ yy435: ++YYCURSOR; YYDEBUG(438, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1258 "Zend/zend_language_scanner.l" +#line 1262 "Zend/zend_language_scanner.l" { return T_ARRAY_CAST; } -#line 4897 "Zend/zend_language_scanner.c" +#line 4901 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4931,11 +4935,11 @@ yy443: ++YYCURSOR; YYDEBUG(446, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1262 "Zend/zend_language_scanner.l" +#line 1266 "Zend/zend_language_scanner.l" { return T_OBJECT_CAST; } -#line 4939 "Zend/zend_language_scanner.c" +#line 4943 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -4976,11 +4980,11 @@ yy452: ++YYCURSOR; YYDEBUG(454, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1266 "Zend/zend_language_scanner.l" +#line 1270 "Zend/zend_language_scanner.l" { return T_BOOL_CAST; } -#line 4984 "Zend/zend_language_scanner.c" +#line 4988 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5040,11 +5044,11 @@ yy463: ++YYCURSOR; YYDEBUG(466, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1270 "Zend/zend_language_scanner.l" +#line 1274 "Zend/zend_language_scanner.l" { return T_UNSET_CAST; } -#line 5048 "Zend/zend_language_scanner.c" +#line 5052 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5058,11 +5062,11 @@ yy468: } YYDEBUG(469, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1242 "Zend/zend_language_scanner.l" +#line 1246 "Zend/zend_language_scanner.l" { return T_VAR; } -#line 5066 "Zend/zend_language_scanner.c" +#line 5070 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5082,11 +5086,11 @@ yy472: } YYDEBUG(473, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1234 "Zend/zend_language_scanner.l" +#line 1238 "Zend/zend_language_scanner.l" { return T_NEW; } -#line 5090 "Zend/zend_language_scanner.c" +#line 5094 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5125,11 +5129,11 @@ yy480: } YYDEBUG(481, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1294 "Zend/zend_language_scanner.l" +#line 1298 "Zend/zend_language_scanner.l" { return T_NAMESPACE; } -#line 5133 "Zend/zend_language_scanner.c" +#line 5137 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5151,11 +5155,11 @@ yy484: ++YYCURSOR; YYDEBUG(485, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1422 "Zend/zend_language_scanner.l" +#line 1426 "Zend/zend_language_scanner.l" { return T_CONCAT_EQUAL; } -#line 5159 "Zend/zend_language_scanner.c" +#line 5163 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5164,21 +5168,21 @@ yy486: ++YYCURSOR; YYDEBUG(488, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1230 "Zend/zend_language_scanner.l" +#line 1234 "Zend/zend_language_scanner.l" { return T_ELLIPSIS; } -#line 5172 "Zend/zend_language_scanner.c" +#line 5176 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; YYDEBUG(490, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1222 "Zend/zend_language_scanner.l" +#line 1226 "Zend/zend_language_scanner.l" { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5182 "Zend/zend_language_scanner.c" +#line 5186 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5200,32 +5204,32 @@ yy493: ++YYCURSOR; YYDEBUG(494, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1402 "Zend/zend_language_scanner.l" +#line 1406 "Zend/zend_language_scanner.l" { return T_MINUS_EQUAL; } -#line 5208 "Zend/zend_language_scanner.c" +#line 5212 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; YYDEBUG(496, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1370 "Zend/zend_language_scanner.l" +#line 1374 "Zend/zend_language_scanner.l" { return T_DEC; } -#line 5218 "Zend/zend_language_scanner.c" +#line 5222 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; YYDEBUG(498, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1195 "Zend/zend_language_scanner.l" +#line 1199 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5229 "Zend/zend_language_scanner.c" +#line 5233 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5270,11 +5274,11 @@ yy504: } YYDEBUG(505, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1342 "Zend/zend_language_scanner.l" +#line 1346 "Zend/zend_language_scanner.l" { return T_PUBLIC; } -#line 5278 "Zend/zend_language_scanner.c" +#line 5282 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5329,11 +5333,11 @@ yy513: } YYDEBUG(514, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1338 "Zend/zend_language_scanner.l" +#line 1342 "Zend/zend_language_scanner.l" { return T_PROTECTED; } -#line 5337 "Zend/zend_language_scanner.c" +#line 5341 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5363,11 +5367,11 @@ yy519: } YYDEBUG(520, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1334 "Zend/zend_language_scanner.l" +#line 1338 "Zend/zend_language_scanner.l" { return T_PRIVATE; } -#line 5371 "Zend/zend_language_scanner.c" +#line 5375 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5376,11 +5380,11 @@ yy521: } YYDEBUG(522, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1171 "Zend/zend_language_scanner.l" +#line 1175 "Zend/zend_language_scanner.l" { return T_PRINT; } -#line 5384 "Zend/zend_language_scanner.c" +#line 5388 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5405,11 +5409,11 @@ yy526: } YYDEBUG(527, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1163 "Zend/zend_language_scanner.l" +#line 1167 "Zend/zend_language_scanner.l" { return T_GOTO; } -#line 5413 "Zend/zend_language_scanner.c" +#line 5417 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5433,11 +5437,11 @@ yy531: } YYDEBUG(532, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1306 "Zend/zend_language_scanner.l" +#line 1310 "Zend/zend_language_scanner.l" { return T_GLOBAL; } -#line 5441 "Zend/zend_language_scanner.c" +#line 5445 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5474,11 +5478,11 @@ yy539: } YYDEBUG(540, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1155 "Zend/zend_language_scanner.l" +#line 1159 "Zend/zend_language_scanner.l" { return T_BREAK; } -#line 5482 "Zend/zend_language_scanner.c" +#line 5486 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5518,11 +5522,11 @@ yy547: } YYDEBUG(548, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1139 "Zend/zend_language_scanner.l" +#line 1143 "Zend/zend_language_scanner.l" { return T_SWITCH; } -#line 5526 "Zend/zend_language_scanner.c" +#line 5530 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5546,11 +5550,11 @@ yy552: } YYDEBUG(553, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1322 "Zend/zend_language_scanner.l" +#line 1326 "Zend/zend_language_scanner.l" { return T_STATIC; } -#line 5554 "Zend/zend_language_scanner.c" +#line 5558 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5577,11 +5581,11 @@ yy557: } YYDEBUG(558, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1135 "Zend/zend_language_scanner.l" +#line 1139 "Zend/zend_language_scanner.l" { return T_AS; } -#line 5585 "Zend/zend_language_scanner.c" +#line 5589 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5600,11 +5604,11 @@ yy561: } YYDEBUG(562, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1358 "Zend/zend_language_scanner.l" +#line 1362 "Zend/zend_language_scanner.l" { return T_ARRAY; } -#line 5608 "Zend/zend_language_scanner.c" +#line 5612 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5613,11 +5617,11 @@ yy563: } YYDEBUG(564, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1462 "Zend/zend_language_scanner.l" +#line 1466 "Zend/zend_language_scanner.l" { return T_LOGICAL_AND; } -#line 5621 "Zend/zend_language_scanner.c" +#line 5625 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5651,11 +5655,11 @@ yy570: } YYDEBUG(571, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1326 "Zend/zend_language_scanner.l" +#line 1330 "Zend/zend_language_scanner.l" { return T_ABSTRACT; } -#line 5659 "Zend/zend_language_scanner.c" +#line 5663 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5679,11 +5683,11 @@ yy575: } YYDEBUG(576, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1095 "Zend/zend_language_scanner.l" +#line 1099 "Zend/zend_language_scanner.l" { return T_WHILE; } -#line 5687 "Zend/zend_language_scanner.c" +#line 5691 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5692,11 +5696,11 @@ yy577: } YYDEBUG(578, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1079 "Zend/zend_language_scanner.l" +#line 1083 "Zend/zend_language_scanner.l" { return T_IF; } -#line 5700 "Zend/zend_language_scanner.c" +#line 5704 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5748,11 +5752,11 @@ yy584: } YYDEBUG(585, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1310 "Zend/zend_language_scanner.l" +#line 1314 "Zend/zend_language_scanner.l" { return T_ISSET; } -#line 5756 "Zend/zend_language_scanner.c" +#line 5760 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5806,11 +5810,11 @@ yy592: yy593: YYDEBUG(593, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1278 "Zend/zend_language_scanner.l" +#line 1282 "Zend/zend_language_scanner.l" { return T_INCLUDE; } -#line 5814 "Zend/zend_language_scanner.c" +#line 5818 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5839,11 +5843,11 @@ yy598: } YYDEBUG(599, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1282 "Zend/zend_language_scanner.l" +#line 1286 "Zend/zend_language_scanner.l" { return T_INCLUDE_ONCE; } -#line 5847 "Zend/zend_language_scanner.c" +#line 5851 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5877,11 +5881,11 @@ yy605: } YYDEBUG(606, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1179 "Zend/zend_language_scanner.l" +#line 1183 "Zend/zend_language_scanner.l" { return T_INTERFACE; } -#line 5885 "Zend/zend_language_scanner.c" +#line 5889 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5931,11 +5935,11 @@ yy613: } YYDEBUG(614, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1302 "Zend/zend_language_scanner.l" +#line 1306 "Zend/zend_language_scanner.l" { return T_INSTEADOF; } -#line 5939 "Zend/zend_language_scanner.c" +#line 5943 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -5964,11 +5968,11 @@ yy619: } YYDEBUG(620, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1131 "Zend/zend_language_scanner.l" +#line 1135 "Zend/zend_language_scanner.l" { return T_INSTANCEOF; } -#line 5972 "Zend/zend_language_scanner.c" +#line 5976 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6012,11 +6016,11 @@ yy628: } YYDEBUG(629, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1191 "Zend/zend_language_scanner.l" +#line 1195 "Zend/zend_language_scanner.l" { return T_IMPLEMENTS; } -#line 6020 "Zend/zend_language_scanner.c" +#line 6024 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6044,11 +6048,11 @@ yy631: } YYDEBUG(633, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1063 "Zend/zend_language_scanner.l" +#line 1067 "Zend/zend_language_scanner.l" { return T_TRY; } -#line 6052 "Zend/zend_language_scanner.c" +#line 6056 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6067,11 +6071,11 @@ yy636: } YYDEBUG(637, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1183 "Zend/zend_language_scanner.l" +#line 1187 "Zend/zend_language_scanner.l" { return T_TRAIT; } -#line 6075 "Zend/zend_language_scanner.c" +#line 6079 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6090,11 +6094,11 @@ yy640: } YYDEBUG(641, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1075 "Zend/zend_language_scanner.l" +#line 1079 "Zend/zend_language_scanner.l" { return T_THROW; } -#line 6098 "Zend/zend_language_scanner.c" +#line 6102 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6118,11 +6122,11 @@ yy645: } YYDEBUG(646, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1059 "Zend/zend_language_scanner.l" +#line 1063 "Zend/zend_language_scanner.l" { return T_YIELD; } -#line 6126 "Zend/zend_language_scanner.c" +#line 6130 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6183,11 +6187,11 @@ yy653: yy654: YYDEBUG(654, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1286 "Zend/zend_language_scanner.l" +#line 1290 "Zend/zend_language_scanner.l" { return T_REQUIRE; } -#line 6191 "Zend/zend_language_scanner.c" +#line 6195 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6216,11 +6220,11 @@ yy659: } YYDEBUG(660, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1290 "Zend/zend_language_scanner.l" +#line 1294 "Zend/zend_language_scanner.l" { return T_REQUIRE_ONCE; } -#line 6224 "Zend/zend_language_scanner.c" +#line 6228 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6239,11 +6243,11 @@ yy663: } YYDEBUG(664, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1055 "Zend/zend_language_scanner.l" +#line 1059 "Zend/zend_language_scanner.l" { return T_RETURN; } -#line 6247 "Zend/zend_language_scanner.c" +#line 6251 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6333,11 +6337,11 @@ yy674: } YYDEBUG(675, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1159 "Zend/zend_language_scanner.l" +#line 1163 "Zend/zend_language_scanner.l" { return T_CONTINUE; } -#line 6341 "Zend/zend_language_scanner.c" +#line 6345 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6346,11 +6350,11 @@ yy676: } YYDEBUG(677, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1051 "Zend/zend_language_scanner.l" +#line 1055 "Zend/zend_language_scanner.l" { return T_CONST; } -#line 6354 "Zend/zend_language_scanner.c" +#line 6358 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6375,11 +6379,11 @@ yy681: } YYDEBUG(682, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1238 "Zend/zend_language_scanner.l" +#line 1242 "Zend/zend_language_scanner.l" { return T_CLONE; } -#line 6383 "Zend/zend_language_scanner.c" +#line 6387 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6393,11 +6397,11 @@ yy684: } YYDEBUG(685, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1175 "Zend/zend_language_scanner.l" +#line 1179 "Zend/zend_language_scanner.l" { return T_CLASS; } -#line 6401 "Zend/zend_language_scanner.c" +#line 6405 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6443,11 +6447,11 @@ yy693: } YYDEBUG(694, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1362 "Zend/zend_language_scanner.l" +#line 1366 "Zend/zend_language_scanner.l" { return T_CALLABLE; } -#line 6451 "Zend/zend_language_scanner.c" +#line 6455 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6456,11 +6460,11 @@ yy695: } YYDEBUG(696, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1147 "Zend/zend_language_scanner.l" +#line 1151 "Zend/zend_language_scanner.l" { return T_CASE; } -#line 6464 "Zend/zend_language_scanner.c" +#line 6468 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6474,11 +6478,11 @@ yy698: } YYDEBUG(699, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1067 "Zend/zend_language_scanner.l" +#line 1071 "Zend/zend_language_scanner.l" { return T_CATCH; } -#line 6482 "Zend/zend_language_scanner.c" +#line 6486 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6529,11 +6533,11 @@ yy708: } YYDEBUG(709, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1047 "Zend/zend_language_scanner.l" +#line 1051 "Zend/zend_language_scanner.l" { return T_FUNCTION; } -#line 6537 "Zend/zend_language_scanner.c" +#line 6541 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6557,11 +6561,11 @@ yy710: yy711: YYDEBUG(711, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1107 "Zend/zend_language_scanner.l" +#line 1111 "Zend/zend_language_scanner.l" { return T_FOR; } -#line 6565 "Zend/zend_language_scanner.c" +#line 6569 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6585,11 +6589,11 @@ yy715: } YYDEBUG(716, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1115 "Zend/zend_language_scanner.l" +#line 1119 "Zend/zend_language_scanner.l" { return T_FOREACH; } -#line 6593 "Zend/zend_language_scanner.c" +#line 6597 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6623,11 +6627,11 @@ yy719: yy720: YYDEBUG(720, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1330 "Zend/zend_language_scanner.l" +#line 1334 "Zend/zend_language_scanner.l" { return T_FINAL; } -#line 6631 "Zend/zend_language_scanner.c" +#line 6635 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6641,11 +6645,11 @@ yy722: } YYDEBUG(723, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1071 "Zend/zend_language_scanner.l" +#line 1075 "Zend/zend_language_scanner.l" { return T_FINALLY; } -#line 6649 "Zend/zend_language_scanner.c" +#line 6653 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6676,11 +6680,11 @@ yy726: } YYDEBUG(727, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1103 "Zend/zend_language_scanner.l" +#line 1107 "Zend/zend_language_scanner.l" { return T_DO; } -#line 6684 "Zend/zend_language_scanner.c" +#line 6688 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6689,11 +6693,11 @@ yy728: } YYDEBUG(729, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1043 "Zend/zend_language_scanner.l" +#line 1047 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6697 "Zend/zend_language_scanner.c" +#line 6701 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6728,11 +6732,11 @@ yy735: } YYDEBUG(736, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1151 "Zend/zend_language_scanner.l" +#line 1155 "Zend/zend_language_scanner.l" { return T_DEFAULT; } -#line 6736 "Zend/zend_language_scanner.c" +#line 6740 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6756,11 +6760,11 @@ yy740: } YYDEBUG(741, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1123 "Zend/zend_language_scanner.l" +#line 1127 "Zend/zend_language_scanner.l" { return T_DECLARE; } -#line 6764 "Zend/zend_language_scanner.c" +#line 6768 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6840,11 +6844,11 @@ yy753: } YYDEBUG(754, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1187 "Zend/zend_language_scanner.l" +#line 1191 "Zend/zend_language_scanner.l" { return T_EXTENDS; } -#line 6848 "Zend/zend_language_scanner.c" +#line 6852 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6853,11 +6857,11 @@ yy755: } YYDEBUG(756, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1039 "Zend/zend_language_scanner.l" +#line 1043 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6861 "Zend/zend_language_scanner.c" +#line 6865 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6871,11 +6875,11 @@ yy758: } YYDEBUG(759, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1274 "Zend/zend_language_scanner.l" +#line 1278 "Zend/zend_language_scanner.l" { return T_EVAL; } -#line 6879 "Zend/zend_language_scanner.c" +#line 6883 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6945,11 +6949,11 @@ yy769: } YYDEBUG(770, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1099 "Zend/zend_language_scanner.l" +#line 1103 "Zend/zend_language_scanner.l" { return T_ENDWHILE; } -#line 6953 "Zend/zend_language_scanner.c" +#line 6957 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -6978,11 +6982,11 @@ yy775: } YYDEBUG(776, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1143 "Zend/zend_language_scanner.l" +#line 1147 "Zend/zend_language_scanner.l" { return T_ENDSWITCH; } -#line 6986 "Zend/zend_language_scanner.c" +#line 6990 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -6991,11 +6995,11 @@ yy777: } YYDEBUG(778, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1087 "Zend/zend_language_scanner.l" +#line 1091 "Zend/zend_language_scanner.l" { return T_ENDIF; } -#line 6999 "Zend/zend_language_scanner.c" +#line 7003 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7024,11 +7028,11 @@ yy780: yy781: YYDEBUG(781, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1111 "Zend/zend_language_scanner.l" +#line 1115 "Zend/zend_language_scanner.l" { return T_ENDFOR; } -#line 7032 "Zend/zend_language_scanner.c" +#line 7036 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7052,11 +7056,11 @@ yy785: } YYDEBUG(786, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1119 "Zend/zend_language_scanner.l" +#line 1123 "Zend/zend_language_scanner.l" { return T_ENDFOREACH; } -#line 7060 "Zend/zend_language_scanner.c" +#line 7064 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7090,11 +7094,11 @@ yy792: } YYDEBUG(793, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1127 "Zend/zend_language_scanner.l" +#line 1131 "Zend/zend_language_scanner.l" { return T_ENDDECLARE; } -#line 7098 "Zend/zend_language_scanner.c" +#line 7102 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7113,11 +7117,11 @@ yy796: } YYDEBUG(797, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1314 "Zend/zend_language_scanner.l" +#line 1318 "Zend/zend_language_scanner.l" { return T_EMPTY; } -#line 7121 "Zend/zend_language_scanner.c" +#line 7125 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7146,11 +7150,11 @@ yy799: yy800: YYDEBUG(800, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1091 "Zend/zend_language_scanner.l" +#line 1095 "Zend/zend_language_scanner.l" { return T_ELSE; } -#line 7154 "Zend/zend_language_scanner.c" +#line 7158 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7164,11 +7168,11 @@ yy802: } YYDEBUG(803, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1083 "Zend/zend_language_scanner.l" +#line 1087 "Zend/zend_language_scanner.l" { return T_ELSEIF; } -#line 7172 "Zend/zend_language_scanner.c" +#line 7176 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7182,11 +7186,11 @@ yy805: } YYDEBUG(806, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1167 "Zend/zend_language_scanner.l" +#line 1171 "Zend/zend_language_scanner.l" { return T_ECHO; } -#line 7190 "Zend/zend_language_scanner.c" +#line 7194 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7259,13 +7263,13 @@ yy809: yy810: YYDEBUG(810, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1200 "Zend/zend_language_scanner.l" +#line 1204 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7269 "Zend/zend_language_scanner.c" +#line 7273 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7273,13 +7277,13 @@ yy811: yy812: YYDEBUG(812, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1216 "Zend/zend_language_scanner.l" +#line 1220 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); goto restart; } -#line 7283 "Zend/zend_language_scanner.c" +#line 7287 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7288,13 +7292,13 @@ yy813: yy814: YYDEBUG(814, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1210 "Zend/zend_language_scanner.l" +#line 1214 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7298 "Zend/zend_language_scanner.c" +#line 7302 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7315,11 +7319,11 @@ yy818: ++YYCURSOR; YYDEBUG(819, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1206 "Zend/zend_language_scanner.l" +#line 1210 "Zend/zend_language_scanner.l" { return T_OBJECT_OPERATOR; } -#line 7323 "Zend/zend_language_scanner.c" +#line 7327 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7404,14 +7408,14 @@ yy824: yy825: YYDEBUG(825, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1513 "Zend/zend_language_scanner.l" +#line 1517 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7415 "Zend/zend_language_scanner.c" +#line 7419 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7436,7 +7440,7 @@ yy830: ++YYCURSOR; YYDEBUG(831, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1504 "Zend/zend_language_scanner.l" +#line 1508 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); zend_copy_value(zendlval, yytext, yyleng); @@ -7444,7 +7448,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7448 "Zend/zend_language_scanner.c" +#line 7452 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7455,7 +7459,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2286 "Zend/zend_language_scanner.l" +#line 2290 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7511,7 +7515,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7515 "Zend/zend_language_scanner.c" +#line 7519 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7618,7 +7622,7 @@ yy838: yy839: YYDEBUG(839, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1584 "Zend/zend_language_scanner.l" +#line 1588 "Zend/zend_language_scanner.l" { /* Offset could be treated as a long */ if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) { ZVAL_LONG(zendlval, strtol(yytext, NULL, 10)); @@ -7627,7 +7631,7 @@ yy839: } return T_NUM_STRING; } -#line 7631 "Zend/zend_language_scanner.c" +#line 7635 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7647,23 +7651,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1818 "Zend/zend_language_scanner.l" +#line 1822 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7656 "Zend/zend_language_scanner.c" +#line 7660 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1813 "Zend/zend_language_scanner.l" +#line 1817 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7667 "Zend/zend_language_scanner.c" +#line 7671 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7673,14 +7677,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1823 "Zend/zend_language_scanner.l" +#line 1827 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7684 "Zend/zend_language_scanner.c" +#line 7688 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7689,18 +7693,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1830 "Zend/zend_language_scanner.l" +#line 1834 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7698 "Zend/zend_language_scanner.c" +#line 7702 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2343 "Zend/zend_language_scanner.l" +#line 2347 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7709,7 +7713,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7713 "Zend/zend_language_scanner.c" +#line 7717 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7745,12 +7749,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1808 "Zend/zend_language_scanner.l" +#line 1812 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7754 "Zend/zend_language_scanner.c" +#line 7758 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7790,12 +7794,12 @@ yy862: yy864: YYDEBUG(864, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1593 "Zend/zend_language_scanner.l" +#line 1597 "Zend/zend_language_scanner.l" { /* Offset must be treated as a string */ ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7799 "Zend/zend_language_scanner.c" +#line 7803 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7818,6 +7822,6 @@ yy867: goto yy864; } } -#line 2352 "Zend/zend_language_scanner.l" +#line 2356 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index c25e7f0288..aec871fd8f 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -583,12 +583,14 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR CG(active_op_array) = op_array; zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); + CG(ast_arena) = zend_arena_create(1024 * 32 TSRMLS_CC); compiler_result = zendparse(TSRMLS_C); if (compiler_result != 0) { /* parser error */ zend_bailout(); } zend_compile_top_stmt(CG(ast) TSRMLS_CC); zend_ast_destroy(CG(ast)); + zend_arena_destroy(CG(ast_arena)); zend_do_end_compilation(TSRMLS_C); zend_do_return(&retval_znode, 0 TSRMLS_CC); CG(in_compilation) = original_in_compilation; @@ -753,6 +755,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); BEGIN(ST_IN_SCRIPTING); + CG(ast_arena) = zend_arena_create(1024 * 32 TSRMLS_CC); compiler_result = zendparse(TSRMLS_C); if (SCNG(script_filtered)) { @@ -769,6 +772,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) } else { zend_compile_top_stmt(CG(ast) TSRMLS_CC); zend_ast_destroy(CG(ast)); + zend_arena_destroy(CG(ast_arena)); zend_do_end_compilation(TSRMLS_C); zend_do_return(NULL, 0 TSRMLS_CC); CG(active_op_array) = original_active_op_array; -- cgit v1.2.1 From edd9fcab1e2da36e9f6e0261bb7c3187548759c0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 18:08:31 +0200 Subject: Fix leaks Must find a good way to handle constant expressions... --- Zend/zend_ast.c | 24 +++++++++++++++++------- Zend/zend_ast.h | 1 + Zend/zend_compile.c | 5 ++--- Zend/zend_execute_API.c | 2 +- Zend/zend_language_scanner.c | 4 ++-- Zend/zend_language_scanner.l | 4 ++-- Zend/zend_variables.c | 4 ++-- 7 files changed, 27 insertions(+), 17 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index fa46301f5a..62b98ff93f 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -50,6 +50,7 @@ ZEND_API zend_ast *zend_ast_create_decl( unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2 ) { + TSRMLS_FETCH(); zend_ast_decl *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast_decl)); ast->kind = kind; @@ -139,6 +140,7 @@ static inline zend_bool is_power_of_two(unsigned short n) { ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op) { if (ast->children >= 4 && is_power_of_two(ast->children)) { + TSRMLS_FETCH(); size_t old_size = sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children - 1); zend_ast *new_ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children * 2 - 1)); @@ -355,8 +357,7 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) } } -ZEND_API void zend_ast_destroy(zend_ast *ast) -{ +static void zend_ast_destroy_ex(zend_ast *ast, zend_bool free) { if (!ast) { return; } @@ -377,19 +378,28 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) if (decl->doc_comment) { STR_RELEASE(decl->doc_comment); } - zend_ast_destroy(decl->child[0]); - zend_ast_destroy(decl->child[1]); - zend_ast_destroy(decl->child[2]); + zend_ast_destroy_ex(decl->child[0], free); + zend_ast_destroy_ex(decl->child[1], free); + zend_ast_destroy_ex(decl->child[2], free); break; } default: { zend_uint i; for (i = 0; i < ast->children; i++) { - zend_ast_destroy(ast->child[i]); + zend_ast_destroy_ex(ast->child[i], free); } } } - //efree(ast); + if (free) { + efree(ast); + } +} + +ZEND_API void zend_ast_destroy(zend_ast *ast) { + zend_ast_destroy_ex(ast, 0); +} +ZEND_API void zend_ast_destroy_and_free(zend_ast *ast) { + zend_ast_destroy_ex(ast, 1); } diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index d4d4933af0..da34eb1a5f 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -185,6 +185,7 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s ZEND_API zend_ast *zend_ast_copy(zend_ast *ast); ZEND_API void zend_ast_destroy(zend_ast *ast); +ZEND_API void zend_ast_destroy_and_free(zend_ast *ast); static inline zend_ast *zend_ast_create_zval(zval *zv) { return zend_ast_create_zval_ex(zv, 0); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index b14bda0e0d..2ae0e7ce2d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3426,14 +3426,13 @@ static void _tmp_compile_const_expr(zval *result, zend_ast *ast TSRMLS_DC) { zend_eval_const_expr(&ast TSRMLS_CC); zend_compile_const_expr(&ast TSRMLS_CC); if (ast->kind == ZEND_AST_ZVAL) { - ZVAL_COPY(result, zend_ast_get_zval(ast)); + ZVAL_COPY_VALUE(result, zend_ast_get_zval(ast)); if (Z_TYPE_P(result) == IS_ARRAY) { zend_make_immutable_array_r(result TSRMLS_CC); } orig_ast->kind = ZEND_AST_ZNODE; } else { - ast = zend_ast_copy(ast); - ZVAL_NEW_AST(result, ast); + ZVAL_NEW_AST(result, zend_ast_copy(ast)); } } diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 308d54b31d..5ac8eab068 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -606,7 +606,7 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_bool inline_change, zend_clas zend_ast_evaluate(&tmp, Z_ASTVAL_P(p), scope TSRMLS_CC); if (inline_change) { - zend_ast_destroy(Z_ASTVAL_P(p)); + zend_ast_destroy_and_free(Z_ASTVAL_P(p)); efree(Z_AST_P(p)); } ZVAL_COPY_VALUE(p, &tmp); diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 65bdcf23d9..938930e481 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -585,7 +585,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR CG(active_op_array) = op_array; zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); - CG(ast_arena) = zend_arena_create(1024 * 32 TSRMLS_CC); + CG(ast_arena) = zend_arena_create(1024 * 32); compiler_result = zendparse(TSRMLS_C); if (compiler_result != 0) { /* parser error */ zend_bailout(); @@ -757,7 +757,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); BEGIN(ST_IN_SCRIPTING); - CG(ast_arena) = zend_arena_create(1024 * 32 TSRMLS_CC); + CG(ast_arena) = zend_arena_create(1024 * 32); compiler_result = zendparse(TSRMLS_C); if (SCNG(script_filtered)) { diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index aec871fd8f..31b76e9076 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -583,7 +583,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR CG(active_op_array) = op_array; zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); - CG(ast_arena) = zend_arena_create(1024 * 32 TSRMLS_CC); + CG(ast_arena) = zend_arena_create(1024 * 32); compiler_result = zendparse(TSRMLS_C); if (compiler_result != 0) { /* parser error */ zend_bailout(); @@ -755,7 +755,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) zend_stack_push(&CG(context_stack), (void *) &CG(context)); zend_init_compiler_context(TSRMLS_C); BEGIN(ST_IN_SCRIPTING); - CG(ast_arena) = zend_arena_create(1024 * 32 TSRMLS_CC); + CG(ast_arena) = zend_arena_create(1024 * 32); compiler_result = zendparse(TSRMLS_C); if (SCNG(script_filtered)) { diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 9f76d9f812..c02e3c410b 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -53,7 +53,7 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) case IS_CONSTANT_AST: { zend_ast_ref *ast = (zend_ast_ref*)p; - zend_ast_destroy(ast->ast); + zend_ast_destroy_and_free(ast->ast); efree(ast); break; } @@ -113,7 +113,7 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC) case IS_CONSTANT_AST: { zend_ast_ref *ast = (zend_ast_ref*)p; - zend_ast_destroy(ast->ast); + zend_ast_destroy_and_free(ast->ast); efree(ast); break; } -- cgit v1.2.1 From 1bdc433259e7b27f739dc7846df37f84054acf50 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 18:23:46 +0200 Subject: Fix bugs --- Zend/zend_compile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2ae0e7ce2d..57781cbc89 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5562,7 +5562,7 @@ void zend_begin_method_decl( zend_string *lcname; if (in_interface) { - if (op_array->fn_flags & ~(ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)) { + if ((op_array->fn_flags & ZEND_ACC_PPP_MASK) != ZEND_ACC_PUBLIC) { zend_error_noreturn(E_COMPILE_ERROR, "Access type for interface method " "%s::%s() must be omitted", ce->name->val, name->val); } @@ -5945,7 +5945,7 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { name = zend_new_interned_string_safe(name TSRMLS_CC); if (zend_hash_add(&ce->constants_table, name, &value_zv) == NULL) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", - ce->name->val, name); + ce->name->val, name->val); } if (Z_CONSTANT(value_zv)) { -- cgit v1.2.1 From 17234d7895367d722b65fd3d1911eca039769c03 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 18:36:57 +0200 Subject: Replicate old linenos for class binding --- Zend/tests/bug43323.phpt | 2 +- Zend/zend_compile.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Zend/tests/bug43323.phpt b/Zend/tests/bug43323.phpt index f2d279ddd3..d366a6dd1f 100644 --- a/Zend/tests/bug43323.phpt +++ b/Zend/tests/bug43323.phpt @@ -9,4 +9,4 @@ abstract class bar { class foo extends bar { } --EXPECTF-- -Fatal error: Class foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (bar::bar) in %sbug43323.php on line 6 +Fatal error: Class foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (bar::bar) in %sbug43323.php on line 7 diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 57781cbc89..31a35903a3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7454,6 +7454,7 @@ void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC) { zend_verify_namespace(TSRMLS_C); } if (ast->kind == ZEND_AST_FUNC_DECL || ast->kind == ZEND_AST_CLASS) { + CG(zend_lineno) = ((zend_ast_decl *) ast)->end_lineno; zend_do_early_binding(TSRMLS_C); } } -- cgit v1.2.1 From 0406b4d49439a20d04bcf9c3ab4d1ec3c2248e58 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 18:38:54 +0200 Subject: Update error message --- tests/classes/constants_error_005.phpt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/classes/constants_error_005.phpt b/tests/classes/constants_error_005.phpt index 1283783de7..25f36460b7 100644 --- a/tests/classes/constants_error_005.phpt +++ b/tests/classes/constants_error_005.phpt @@ -8,5 +8,4 @@ Error case: class constant as an encapsed containing a variable } ?> --EXPECTF-- - -Parse error: %s in %s on line %d +Fatal error: Constant expression contains invalid operations in %s on line %d -- cgit v1.2.1 From 60d96d51170cb86396d6292edf7ed693697d8827 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 18:39:40 +0200 Subject: Fix code in test --- tests/classes/interface_method.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/classes/interface_method.phpt b/tests/classes/interface_method.phpt index 3570b35928..f80bd756f3 100644 --- a/tests/classes/interface_method.phpt +++ b/tests/classes/interface_method.phpt @@ -6,7 +6,7 @@ ZE2 An interface method must be abstract -- cgit v1.2.1 From 9344a95ac9d982c1cbeb65a8c22ecd500f0b4243 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 18:51:28 +0200 Subject: Remove dead code --- Zend/zend_compile.c | 16 ---------------- Zend/zend_compile.h | 1 - 2 files changed, 17 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 31a35903a3..91990a48cc 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3404,22 +3404,6 @@ void zend_make_immutable_array_r(zval *zv TSRMLS_DC) /* {{{ */ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC); -void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ */ -{ - zend_eval_const_expr(&ast TSRMLS_CC); - zend_compile_const_expr(&ast TSRMLS_CC); - if (ast->kind == ZEND_AST_ZVAL) { - ZVAL_COPY_VALUE(&result->u.constant, zend_ast_get_zval(ast)); - if (Z_TYPE(result->u.constant) == IS_ARRAY) { - zend_make_immutable_array_r(&result->u.constant TSRMLS_CC); - } - efree(ast); - } else { - ZVAL_NEW_AST(&result->u.constant, ast); - } -} -/* }}} */ - // TODO.AST Sort out the whole constant folding issue static void _tmp_compile_const_expr(zval *result, zend_ast *ast TSRMLS_DC) { zend_ast *orig_ast = ast; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 52d01abd50..790b915e24 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -506,7 +506,6 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM void zend_do_end_namespace(TSRMLS_D); void zend_verify_namespace(TSRMLS_D); void zend_do_end_compilation(TSRMLS_D); -void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC); void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC); void zend_release_labels(int temporary TSRMLS_DC); -- cgit v1.2.1 From a51e00a8cd4b5dba261115f3c14e6fd86ee684af Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 19:01:14 +0200 Subject: Add functions for create str/long ast directly --- Zend/zend.h | 2 +- Zend/zend_ast.h | 10 ++++++++++ Zend/zend_language_parser.y | 11 ++++------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Zend/zend.h b/Zend/zend.h index 1021829c3b..5548c7be1b 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -309,7 +309,6 @@ void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((nore #endif #include "zend_object_handlers.h" -#include "zend_ast.h" /* overloaded elements data types */ #define OE_IS_ARRAY (1<<0) @@ -401,6 +400,7 @@ void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((nore #endif #include "zend_string.h" +#include "zend_ast.h" static zend_always_inline zend_uint zval_refcount_p(zval* pz) { ZEND_ASSERT(Z_REFCOUNTED_P(pz) || Z_IMMUTABLE_P(pz)); diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index da34eb1a5f..49a0a27d4d 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -190,6 +190,16 @@ ZEND_API void zend_ast_destroy_and_free(zend_ast *ast); static inline zend_ast *zend_ast_create_zval(zval *zv) { return zend_ast_create_zval_ex(zv, 0); } +static inline zend_ast *zend_ast_create_zval_from_str(zend_string *str) { + zval zv; + ZVAL_STR(&zv, str); + return zend_ast_create_zval(&zv); +} +static inline zend_ast *zend_ast_create_zval_from_long(long lval) { + zval zv; + ZVAL_LONG(&zv, lval); + return zend_ast_create_zval(&zv); +} static inline zend_ast *zend_ast_create_unary(zend_ast_kind kind, zend_ast *op0) { return zend_ast_create(1, kind, op0); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 69424c8eca..a0fa111f55 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -248,9 +248,8 @@ top_statement: | function_declaration_statement { $$.u.ast = $1.u.ast; } | class_declaration_statement { $$.u.ast = $1.u.ast; } | T_HALT_COMPILER '(' ')' ';' - { zval offset_zv; ZVAL_LONG(&offset_zv, zend_get_scanned_file_offset(TSRMLS_C)); - $$.u.ast = zend_ast_create_unary(ZEND_AST_HALT_COMPILER, - zend_ast_create_zval(&offset_zv)); + { $$.u.ast = zend_ast_create_unary(ZEND_AST_HALT_COMPILER, + zend_ast_create_zval_from_long(zend_get_scanned_file_offset(TSRMLS_C))); zend_stop_lexing(TSRMLS_C); } | T_NAMESPACE namespace_name ';' { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); @@ -931,8 +930,7 @@ exit_expr: backticks_expr: /* empty */ - { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); - $$.u.ast = zend_ast_create_zval(&empty_str); } + { $$.u.ast = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } | T_ENCAPSED_AND_WHITESPACE { $$.u.ast = AST_ZVAL(&$1); } | encaps_list { $$.u.ast = $1.u.ast; } ; @@ -963,8 +961,7 @@ scalar: | T_CLASS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_CLASS_C); } | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } | T_START_HEREDOC T_END_HEREDOC - { zval empty_str; ZVAL_EMPTY_STRING(&empty_str); - $$.u.ast = zend_ast_create_zval(&empty_str); } + { $$.u.ast = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } | '"' encaps_list '"' { $$.u.ast = $2.u.ast; } | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.u.ast = $2.u.ast; } | dereferencable_scalar { $$.u.ast = $1.u.ast; } -- cgit v1.2.1 From 8c8839c2a1429b0a984ce090e283ebfc378fb025 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 19:03:36 +0200 Subject: Remove DUMMY_STRINGL What is that for? --- Zend/zend_language_scanner.c | 622 +++++++++++++++++++++---------------------- Zend/zend_language_scanner.l | 18 -- 2 files changed, 306 insertions(+), 334 deletions(-) diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 938930e481..faa90dd5f8 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1125,7 +1125,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1731 "Zend/zend_language_scanner.l" +#line 1724 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1204,34 +1204,32 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1721 "Zend/zend_language_scanner.l" +#line 1715 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } else { goto inline_char_handler; } } -#line 1218 "Zend/zend_language_scanner.c" +#line 1217 "Zend/zend_language_scanner.c" yy7: YYDEBUG(7, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1702 "Zend/zend_language_scanner.l" +#line 1698 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } else { goto inline_char_handler; } } -#line 1235 "Zend/zend_language_scanner.c" +#line 1233 "Zend/zend_language_scanner.c" yy9: YYDEBUG(9, *YYCURSOR); yych = *++YYCURSOR; @@ -1417,7 +1415,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1668 "Zend/zend_language_scanner.l" +#line 1667 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1428,11 +1426,10 @@ yy35: } HANDLE_NEWLINES(yytext, yyleng); - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1436 "Zend/zend_language_scanner.c" +#line 1433 "Zend/zend_language_scanner.c" yy39: YYDEBUG(39, *YYCURSOR); yych = *++YYCURSOR; @@ -1459,29 +1456,27 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1684 "Zend/zend_language_scanner.l" +#line 1682 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG_WITH_ECHO; } else { goto inline_char_handler; } } -#line 1473 "Zend/zend_language_scanner.c" +#line 1469 "Zend/zend_language_scanner.c" yy45: YYDEBUG(45, *YYCURSOR); ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1695 "Zend/zend_language_scanner.l" +#line 1692 "Zend/zend_language_scanner.l" { - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG_WITH_ECHO; } -#line 1485 "Zend/zend_language_scanner.c" +#line 1480 "Zend/zend_language_scanner.c" yy47: YYDEBUG(47, *YYCURSOR); yych = *++YYCURSOR; @@ -1508,14 +1503,13 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1713 "Zend/zend_language_scanner.l" +#line 1708 "Zend/zend_language_scanner.l" { - DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1519 "Zend/zend_language_scanner.c" +#line 1513 "Zend/zend_language_scanner.c" yy52: YYDEBUG(52, *YYCURSOR); ++YYCURSOR; @@ -1586,7 +1580,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2174 "Zend/zend_language_scanner.l" +#line 2165 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1627,7 +1621,7 @@ yy56: zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1631 "Zend/zend_language_scanner.c" +#line 1625 "Zend/zend_language_scanner.c" yy57: YYDEBUG(57, *YYCURSOR); yych = *++YYCURSOR; @@ -1638,12 +1632,12 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2118 "Zend/zend_language_scanner.l" +#line 2109 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; } -#line 1647 "Zend/zend_language_scanner.c" +#line 1641 "Zend/zend_language_scanner.c" yy60: YYDEBUG(60, *YYCURSOR); yych = *++YYCURSOR; @@ -1653,14 +1647,14 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2105 "Zend/zend_language_scanner.l" +#line 2096 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1664 "Zend/zend_language_scanner.c" +#line 1658 "Zend/zend_language_scanner.c" yy63: YYDEBUG(63, *YYCURSOR); yyaccept = 0; @@ -1676,23 +1670,23 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1812 "Zend/zend_language_scanner.l" +#line 1805 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1685 "Zend/zend_language_scanner.c" +#line 1679 "Zend/zend_language_scanner.c" yy66: YYDEBUG(66, *YYCURSOR); ++YYCURSOR; YYDEBUG(67, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1493 "Zend/zend_language_scanner.l" +#line 1492 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1696 "Zend/zend_language_scanner.c" +#line 1690 "Zend/zend_language_scanner.c" yy68: YYDEBUG(68, *YYCURSOR); yych = *++YYCURSOR; @@ -1706,14 +1700,14 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1805 "Zend/zend_language_scanner.l" +#line 1798 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1717 "Zend/zend_language_scanner.c" +#line 1711 "Zend/zend_language_scanner.c" yy72: YYDEBUG(72, *YYCURSOR); yych = *++YYCURSOR; @@ -1731,14 +1725,14 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1796 "Zend/zend_language_scanner.l" +#line 1789 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1742 "Zend/zend_language_scanner.c" +#line 1736 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_DOUBLE_QUOTES: @@ -1806,7 +1800,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2124 "Zend/zend_language_scanner.l" +#line 2115 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1855,7 +1849,7 @@ double_quotes_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1859 "Zend/zend_language_scanner.c" +#line 1853 "Zend/zend_language_scanner.c" yy79: YYDEBUG(79, *YYCURSOR); yych = *++YYCURSOR; @@ -1866,12 +1860,12 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2113 "Zend/zend_language_scanner.l" +#line 2104 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; } -#line 1875 "Zend/zend_language_scanner.c" +#line 1869 "Zend/zend_language_scanner.c" yy82: YYDEBUG(82, *YYCURSOR); yych = *++YYCURSOR; @@ -1881,14 +1875,14 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2105 "Zend/zend_language_scanner.l" +#line 2096 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1892 "Zend/zend_language_scanner.c" +#line 1886 "Zend/zend_language_scanner.c" yy85: YYDEBUG(85, *YYCURSOR); yyaccept = 0; @@ -1904,23 +1898,23 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1812 "Zend/zend_language_scanner.l" +#line 1805 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1913 "Zend/zend_language_scanner.c" +#line 1907 "Zend/zend_language_scanner.c" yy88: YYDEBUG(88, *YYCURSOR); ++YYCURSOR; YYDEBUG(89, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1493 "Zend/zend_language_scanner.l" +#line 1492 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1924 "Zend/zend_language_scanner.c" +#line 1918 "Zend/zend_language_scanner.c" yy90: YYDEBUG(90, *YYCURSOR); yych = *++YYCURSOR; @@ -1934,14 +1928,14 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1805 "Zend/zend_language_scanner.l" +#line 1798 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1945 "Zend/zend_language_scanner.c" +#line 1939 "Zend/zend_language_scanner.c" yy94: YYDEBUG(94, *YYCURSOR); yych = *++YYCURSOR; @@ -1959,14 +1953,14 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1796 "Zend/zend_language_scanner.l" +#line 1789 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1970 "Zend/zend_language_scanner.c" +#line 1964 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_END_HEREDOC: @@ -1977,7 +1971,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2091 "Zend/zend_language_scanner.l" +#line 2082 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -1990,7 +1984,7 @@ yyc_ST_END_HEREDOC: BEGIN(ST_IN_SCRIPTING); return T_END_HEREDOC; } -#line 1994 "Zend/zend_language_scanner.c" +#line 1988 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_HEREDOC: { @@ -2052,7 +2046,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2216 "Zend/zend_language_scanner.l" +#line 2207 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2125,7 +2119,7 @@ heredoc_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 2129 "Zend/zend_language_scanner.c" +#line 2123 "Zend/zend_language_scanner.c" yy105: YYDEBUG(105, *YYCURSOR); yych = *++YYCURSOR; @@ -2140,14 +2134,14 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2105 "Zend/zend_language_scanner.l" +#line 2096 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 2151 "Zend/zend_language_scanner.c" +#line 2145 "Zend/zend_language_scanner.c" yy109: YYDEBUG(109, *YYCURSOR); yyaccept = 0; @@ -2163,23 +2157,23 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1812 "Zend/zend_language_scanner.l" +#line 1805 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2172 "Zend/zend_language_scanner.c" +#line 2166 "Zend/zend_language_scanner.c" yy112: YYDEBUG(112, *YYCURSOR); ++YYCURSOR; YYDEBUG(113, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1493 "Zend/zend_language_scanner.l" +#line 1492 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 2183 "Zend/zend_language_scanner.c" +#line 2177 "Zend/zend_language_scanner.c" yy114: YYDEBUG(114, *YYCURSOR); yych = *++YYCURSOR; @@ -2193,14 +2187,14 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1805 "Zend/zend_language_scanner.l" +#line 1798 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2204 "Zend/zend_language_scanner.c" +#line 2198 "Zend/zend_language_scanner.c" yy118: YYDEBUG(118, *YYCURSOR); yych = *++YYCURSOR; @@ -2218,14 +2212,14 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1796 "Zend/zend_language_scanner.l" +#line 1789 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2229 "Zend/zend_language_scanner.c" +#line 2223 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_IN_SCRIPTING: @@ -2408,12 +2402,12 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1834 "Zend/zend_language_scanner.l" +#line 1827 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 2417 "Zend/zend_language_scanner.c" +#line 2411 "Zend/zend_language_scanner.c" yy125: YYDEBUG(125, *YYCURSOR); yych = *++YYCURSOR; @@ -2645,11 +2639,11 @@ yy138: yy139: YYDEBUG(139, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1482 "Zend/zend_language_scanner.l" +#line 1481 "Zend/zend_language_scanner.l" { return yytext[0]; } -#line 2653 "Zend/zend_language_scanner.c" +#line 2647 "Zend/zend_language_scanner.c" yy140: YYDEBUG(140, *YYCURSOR); ++YYCURSOR; @@ -2660,11 +2654,10 @@ yy141: yyleng = YYCURSOR - SCNG(yy_text); #line 1204 "Zend/zend_language_scanner.l" { - DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 2668 "Zend/zend_language_scanner.c" +#line 2661 "Zend/zend_language_scanner.c" yy142: YYDEBUG(142, *YYCURSOR); yych = *++YYCURSOR; @@ -2675,11 +2668,11 @@ yy143: ++YYCURSOR; YYDEBUG(144, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1230 "Zend/zend_language_scanner.l" +#line 1229 "Zend/zend_language_scanner.l" { return T_NS_SEPARATOR; } -#line 2683 "Zend/zend_language_scanner.c" +#line 2676 "Zend/zend_language_scanner.c" yy145: YYDEBUG(145, *YYCURSOR); yyaccept = 1; @@ -2913,18 +2906,18 @@ yy168: ++YYCURSOR; YYDEBUG(169, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1487 "Zend/zend_language_scanner.l" +#line 1486 "Zend/zend_language_scanner.l" { yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return '{'; } -#line 2922 "Zend/zend_language_scanner.c" +#line 2915 "Zend/zend_language_scanner.c" yy170: YYDEBUG(170, *YYCURSOR); ++YYCURSOR; YYDEBUG(171, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1499 "Zend/zend_language_scanner.l" +#line 1498 "Zend/zend_language_scanner.l" { RESET_DOC_COMMENT(); if (!zend_stack_is_empty(&SCNG(state_stack))) { @@ -2932,7 +2925,7 @@ yy170: } return '}'; } -#line 2936 "Zend/zend_language_scanner.c" +#line 2929 "Zend/zend_language_scanner.c" yy172: YYDEBUG(172, *YYCURSOR); yyaccept = 2; @@ -2960,7 +2953,7 @@ yy172: yy173: YYDEBUG(173, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1547 "Zend/zend_language_scanner.l" +#line 1546 "Zend/zend_language_scanner.l" { if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */ ZVAL_LONG(zendlval, strtol(yytext, NULL, 0)); @@ -2978,7 +2971,7 @@ yy173: } return T_LNUMBER; } -#line 2982 "Zend/zend_language_scanner.c" +#line 2975 "Zend/zend_language_scanner.c" yy174: YYDEBUG(174, *YYCURSOR); yyaccept = 2; @@ -3006,7 +2999,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1840 "Zend/zend_language_scanner.l" +#line 1833 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3040,14 +3033,14 @@ yy177: return T_COMMENT; } -#line 3044 "Zend/zend_language_scanner.c" +#line 3037 "Zend/zend_language_scanner.c" yy178: YYDEBUG(178, *YYCURSOR); ++YYCURSOR; yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1926 "Zend/zend_language_scanner.l" +#line 1917 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3115,14 +3108,14 @@ yy179: } return T_CONSTANT_ENCAPSED_STRING; } -#line 3119 "Zend/zend_language_scanner.c" +#line 3112 "Zend/zend_language_scanner.c" yy180: YYDEBUG(180, *YYCURSOR); ++YYCURSOR; yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1995 "Zend/zend_language_scanner.l" +#line 1986 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3163,24 +3156,24 @@ yy181: BEGIN(ST_DOUBLE_QUOTES); return '"'; } -#line 3167 "Zend/zend_language_scanner.c" +#line 3160 "Zend/zend_language_scanner.c" yy182: YYDEBUG(182, *YYCURSOR); ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2085 "Zend/zend_language_scanner.l" +#line 2076 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; } -#line 3178 "Zend/zend_language_scanner.c" +#line 3171 "Zend/zend_language_scanner.c" yy184: YYDEBUG(184, *YYCURSOR); ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2347 "Zend/zend_language_scanner.l" +#line 2338 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3189,7 +3182,7 @@ yy184: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 3193 "Zend/zend_language_scanner.c" +#line 3186 "Zend/zend_language_scanner.c" yy186: YYDEBUG(186, *YYCURSOR); ++YYCURSOR; @@ -3216,12 +3209,12 @@ yy188: yy190: YYDEBUG(190, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1602 "Zend/zend_language_scanner.l" +#line 1601 "Zend/zend_language_scanner.l" { ZVAL_DOUBLE(zendlval, zend_strtod(yytext, NULL)); return T_DNUMBER; } -#line 3225 "Zend/zend_language_scanner.c" +#line 3218 "Zend/zend_language_scanner.c" yy191: YYDEBUG(191, *YYCURSOR); yyaccept = 2; @@ -3313,7 +3306,7 @@ yy200: } YYDEBUG(202, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1524 "Zend/zend_language_scanner.l" +#line 1523 "Zend/zend_language_scanner.l" { char *bin = yytext + 2; /* Skip "0b" */ int len = yyleng - 2; @@ -3336,7 +3329,7 @@ yy200: return T_DNUMBER; } } -#line 3340 "Zend/zend_language_scanner.c" +#line 3333 "Zend/zend_language_scanner.c" yy203: YYDEBUG(203, *YYCURSOR); ++YYCURSOR; @@ -3348,7 +3341,7 @@ yy203: } YYDEBUG(205, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1565 "Zend/zend_language_scanner.l" +#line 1564 "Zend/zend_language_scanner.l" { char *hex = yytext + 2; /* Skip "0x" */ int len = yyleng - 2; @@ -3371,7 +3364,7 @@ yy203: return T_DNUMBER; } } -#line 3375 "Zend/zend_language_scanner.c" +#line 3368 "Zend/zend_language_scanner.c" yy206: YYDEBUG(206, *YYCURSOR); ++YYCURSOR; @@ -3380,13 +3373,12 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1907 "Zend/zend_language_scanner.l" +#line 1900 "Zend/zend_language_scanner.l" { - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } -#line 3390 "Zend/zend_language_scanner.c" +#line 3382 "Zend/zend_language_scanner.c" yy208: YYDEBUG(208, *YYCURSOR); yych = *++YYCURSOR; @@ -3420,12 +3412,12 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1812 "Zend/zend_language_scanner.l" +#line 1805 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 3429 "Zend/zend_language_scanner.c" +#line 3421 "Zend/zend_language_scanner.c" yy213: YYDEBUG(213, *YYCURSOR); yych = *++YYCURSOR; @@ -3439,11 +3431,11 @@ yy214: } YYDEBUG(215, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1470 "Zend/zend_language_scanner.l" +#line 1469 "Zend/zend_language_scanner.l" { return T_LOGICAL_XOR; } -#line 3447 "Zend/zend_language_scanner.c" +#line 3439 "Zend/zend_language_scanner.c" yy216: YYDEBUG(216, *YYCURSOR); ++YYCURSOR; @@ -3452,61 +3444,61 @@ yy216: } YYDEBUG(217, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1462 "Zend/zend_language_scanner.l" +#line 1461 "Zend/zend_language_scanner.l" { return T_LOGICAL_OR; } -#line 3460 "Zend/zend_language_scanner.c" +#line 3452 "Zend/zend_language_scanner.c" yy218: YYDEBUG(218, *YYCURSOR); ++YYCURSOR; YYDEBUG(219, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1450 "Zend/zend_language_scanner.l" +#line 1449 "Zend/zend_language_scanner.l" { return T_XOR_EQUAL; } -#line 3470 "Zend/zend_language_scanner.c" +#line 3462 "Zend/zend_language_scanner.c" yy220: YYDEBUG(220, *YYCURSOR); ++YYCURSOR; YYDEBUG(221, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1454 "Zend/zend_language_scanner.l" +#line 1453 "Zend/zend_language_scanner.l" { return T_BOOLEAN_OR; } -#line 3480 "Zend/zend_language_scanner.c" +#line 3472 "Zend/zend_language_scanner.c" yy222: YYDEBUG(222, *YYCURSOR); ++YYCURSOR; YYDEBUG(223, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1446 "Zend/zend_language_scanner.l" +#line 1445 "Zend/zend_language_scanner.l" { return T_OR_EQUAL; } -#line 3490 "Zend/zend_language_scanner.c" +#line 3482 "Zend/zend_language_scanner.c" yy224: YYDEBUG(224, *YYCURSOR); ++YYCURSOR; YYDEBUG(225, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1458 "Zend/zend_language_scanner.l" +#line 1457 "Zend/zend_language_scanner.l" { return T_BOOLEAN_AND; } -#line 3500 "Zend/zend_language_scanner.c" +#line 3492 "Zend/zend_language_scanner.c" yy226: YYDEBUG(226, *YYCURSOR); ++YYCURSOR; YYDEBUG(227, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1442 "Zend/zend_language_scanner.l" +#line 1441 "Zend/zend_language_scanner.l" { return T_AND_EQUAL; } -#line 3510 "Zend/zend_language_scanner.c" +#line 3502 "Zend/zend_language_scanner.c" yy228: YYDEBUG(228, *YYCURSOR); ++YYCURSOR; @@ -3515,28 +3507,27 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1914 "Zend/zend_language_scanner.l" +#line 1906 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); - DUMMY_STRINGL(zendlval, yytext, yyleng); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } else { yyless(1); return yytext[0]; } } -#line 3530 "Zend/zend_language_scanner.c" +#line 3521 "Zend/zend_language_scanner.c" yy230: YYDEBUG(230, *YYCURSOR); ++YYCURSOR; YYDEBUG(231, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1430 "Zend/zend_language_scanner.l" +#line 1429 "Zend/zend_language_scanner.l" { return T_MOD_EQUAL; } -#line 3540 "Zend/zend_language_scanner.c" +#line 3531 "Zend/zend_language_scanner.c" yy232: YYDEBUG(232, *YYCURSOR); yych = *++YYCURSOR; @@ -3554,7 +3545,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1874 "Zend/zend_language_scanner.l" +#line 1867 "Zend/zend_language_scanner.l" { int doc_com; @@ -3587,7 +3578,7 @@ yy235: return T_COMMENT; } -#line 3591 "Zend/zend_language_scanner.c" +#line 3582 "Zend/zend_language_scanner.c" yy236: YYDEBUG(236, *YYCURSOR); yych = *++YYCURSOR; @@ -3597,11 +3588,11 @@ yy237: ++YYCURSOR; YYDEBUG(238, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1422 "Zend/zend_language_scanner.l" +#line 1421 "Zend/zend_language_scanner.l" { return T_DIV_EQUAL; } -#line 3605 "Zend/zend_language_scanner.c" +#line 3596 "Zend/zend_language_scanner.c" yy239: YYDEBUG(239, *YYCURSOR); yych = *++YYCURSOR; @@ -3625,62 +3616,62 @@ yy242: if ((yych = *YYCURSOR) == '=') goto yy246; YYDEBUG(243, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1414 "Zend/zend_language_scanner.l" +#line 1413 "Zend/zend_language_scanner.l" { return T_POW; } -#line 3633 "Zend/zend_language_scanner.c" +#line 3624 "Zend/zend_language_scanner.c" yy244: YYDEBUG(244, *YYCURSOR); ++YYCURSOR; YYDEBUG(245, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1410 "Zend/zend_language_scanner.l" +#line 1409 "Zend/zend_language_scanner.l" { return T_MUL_EQUAL; } -#line 3643 "Zend/zend_language_scanner.c" +#line 3634 "Zend/zend_language_scanner.c" yy246: YYDEBUG(246, *YYCURSOR); ++YYCURSOR; YYDEBUG(247, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1418 "Zend/zend_language_scanner.l" +#line 1417 "Zend/zend_language_scanner.l" { return T_POW_EQUAL; } -#line 3653 "Zend/zend_language_scanner.c" +#line 3644 "Zend/zend_language_scanner.c" yy248: YYDEBUG(248, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy252; YYDEBUG(249, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1478 "Zend/zend_language_scanner.l" +#line 1477 "Zend/zend_language_scanner.l" { return T_SR; } -#line 3664 "Zend/zend_language_scanner.c" +#line 3655 "Zend/zend_language_scanner.c" yy250: YYDEBUG(250, *YYCURSOR); ++YYCURSOR; YYDEBUG(251, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1398 "Zend/zend_language_scanner.l" +#line 1397 "Zend/zend_language_scanner.l" { return T_IS_GREATER_OR_EQUAL; } -#line 3674 "Zend/zend_language_scanner.c" +#line 3665 "Zend/zend_language_scanner.c" yy252: YYDEBUG(252, *YYCURSOR); ++YYCURSOR; YYDEBUG(253, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1438 "Zend/zend_language_scanner.l" +#line 1437 "Zend/zend_language_scanner.l" { return T_SR_EQUAL; } -#line 3684 "Zend/zend_language_scanner.c" +#line 3675 "Zend/zend_language_scanner.c" yy254: YYDEBUG(254, *YYCURSOR); yyaccept = 5; @@ -3691,11 +3682,11 @@ yy254: yy255: YYDEBUG(255, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1474 "Zend/zend_language_scanner.l" +#line 1473 "Zend/zend_language_scanner.l" { return T_SL; } -#line 3699 "Zend/zend_language_scanner.c" +#line 3690 "Zend/zend_language_scanner.c" yy256: YYDEBUG(256, *YYCURSOR); yych = *++YYCURSOR; @@ -3707,22 +3698,22 @@ yy257: ++YYCURSOR; YYDEBUG(258, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1394 "Zend/zend_language_scanner.l" +#line 1393 "Zend/zend_language_scanner.l" { return T_IS_SMALLER_OR_EQUAL; } -#line 3715 "Zend/zend_language_scanner.c" +#line 3706 "Zend/zend_language_scanner.c" yy259: YYDEBUG(259, *YYCURSOR); ++YYCURSOR; yy260: YYDEBUG(260, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1390 "Zend/zend_language_scanner.l" +#line 1389 "Zend/zend_language_scanner.l" { return T_IS_NOT_EQUAL; } -#line 3726 "Zend/zend_language_scanner.c" +#line 3717 "Zend/zend_language_scanner.c" yy261: YYDEBUG(261, *YYCURSOR); yych = *++YYCURSOR; @@ -3773,11 +3764,11 @@ yy268: ++YYCURSOR; YYDEBUG(269, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1434 "Zend/zend_language_scanner.l" +#line 1433 "Zend/zend_language_scanner.l" { return T_SL_EQUAL; } -#line 3781 "Zend/zend_language_scanner.c" +#line 3772 "Zend/zend_language_scanner.c" yy270: YYDEBUG(270, *YYCURSOR); ++YYCURSOR; @@ -3882,7 +3873,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2037 "Zend/zend_language_scanner.l" +#line 2028 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -3929,7 +3920,7 @@ yy280: return T_START_HEREDOC; } -#line 3933 "Zend/zend_language_scanner.c" +#line 3924 "Zend/zend_language_scanner.c" yy281: YYDEBUG(281, *YYCURSOR); yych = *++YYCURSOR; @@ -3969,31 +3960,31 @@ yy284: ++YYCURSOR; YYDEBUG(286, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1382 "Zend/zend_language_scanner.l" +#line 1381 "Zend/zend_language_scanner.l" { return T_IS_NOT_IDENTICAL; } -#line 3977 "Zend/zend_language_scanner.c" +#line 3968 "Zend/zend_language_scanner.c" yy287: YYDEBUG(287, *YYCURSOR); ++YYCURSOR; YYDEBUG(288, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1402 "Zend/zend_language_scanner.l" +#line 1401 "Zend/zend_language_scanner.l" { return T_PLUS_EQUAL; } -#line 3987 "Zend/zend_language_scanner.c" +#line 3978 "Zend/zend_language_scanner.c" yy289: YYDEBUG(289, *YYCURSOR); ++YYCURSOR; YYDEBUG(290, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1370 "Zend/zend_language_scanner.l" +#line 1369 "Zend/zend_language_scanner.l" { return T_INC; } -#line 3997 "Zend/zend_language_scanner.c" +#line 3988 "Zend/zend_language_scanner.c" yy291: YYDEBUG(291, *YYCURSOR); yych = *++YYCURSOR; @@ -4012,42 +4003,42 @@ yy293: } YYDEBUG(294, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1358 "Zend/zend_language_scanner.l" +#line 1357 "Zend/zend_language_scanner.l" { return T_LIST; } -#line 4020 "Zend/zend_language_scanner.c" +#line 4011 "Zend/zend_language_scanner.c" yy295: YYDEBUG(295, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy299; YYDEBUG(296, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1386 "Zend/zend_language_scanner.l" +#line 1385 "Zend/zend_language_scanner.l" { return T_IS_EQUAL; } -#line 4031 "Zend/zend_language_scanner.c" +#line 4022 "Zend/zend_language_scanner.c" yy297: YYDEBUG(297, *YYCURSOR); ++YYCURSOR; YYDEBUG(298, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1354 "Zend/zend_language_scanner.l" +#line 1353 "Zend/zend_language_scanner.l" { return T_DOUBLE_ARROW; } -#line 4041 "Zend/zend_language_scanner.c" +#line 4032 "Zend/zend_language_scanner.c" yy299: YYDEBUG(299, *YYCURSOR); ++YYCURSOR; YYDEBUG(300, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1378 "Zend/zend_language_scanner.l" +#line 1377 "Zend/zend_language_scanner.l" { return T_IS_IDENTICAL; } -#line 4051 "Zend/zend_language_scanner.c" +#line 4042 "Zend/zend_language_scanner.c" yy301: YYDEBUG(301, *YYCURSOR); yych = *++YYCURSOR; @@ -4177,11 +4168,11 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1664 "Zend/zend_language_scanner.l" +#line 1663 "Zend/zend_language_scanner.l" { return T_NS_C; } -#line 4185 "Zend/zend_language_scanner.c" +#line 4176 "Zend/zend_language_scanner.c" yy321: YYDEBUG(321, *YYCURSOR); yych = *++YYCURSOR; @@ -4201,7 +4192,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1639 "Zend/zend_language_scanner.l" +#line 1638 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4226,7 +4217,7 @@ yy322: ZVAL_STR(zendlval, dirname); return T_DIR; } -#line 4230 "Zend/zend_language_scanner.c" +#line 4221 "Zend/zend_language_scanner.c" yy326: YYDEBUG(326, *YYCURSOR); yych = *++YYCURSOR; @@ -4251,12 +4242,12 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1623 "Zend/zend_language_scanner.l" +#line 1622 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; } -#line 4260 "Zend/zend_language_scanner.c" +#line 4251 "Zend/zend_language_scanner.c" yy332: YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; @@ -4291,11 +4282,11 @@ yy336: } YYDEBUG(339, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1619 "Zend/zend_language_scanner.l" +#line 1618 "Zend/zend_language_scanner.l" { return T_METHOD_C; } -#line 4299 "Zend/zend_language_scanner.c" +#line 4290 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; @@ -4346,11 +4337,11 @@ yy347: } YYDEBUG(350, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1615 "Zend/zend_language_scanner.l" +#line 1614 "Zend/zend_language_scanner.l" { return T_FUNC_C; } -#line 4354 "Zend/zend_language_scanner.c" +#line 4345 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4370,7 +4361,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1628 "Zend/zend_language_scanner.l" +#line 1627 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4381,7 +4372,7 @@ yy352: } return T_FILE; } -#line 4385 "Zend/zend_language_scanner.c" +#line 4376 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4411,11 +4402,11 @@ yy359: } YYDEBUG(362, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1611 "Zend/zend_language_scanner.l" +#line 1610 "Zend/zend_language_scanner.l" { return T_TRAIT_C; } -#line 4419 "Zend/zend_language_scanner.c" +#line 4410 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4445,11 +4436,11 @@ yy366: } YYDEBUG(369, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1607 "Zend/zend_language_scanner.l" +#line 1606 "Zend/zend_language_scanner.l" { return T_CLASS_C; } -#line 4453 "Zend/zend_language_scanner.c" +#line 4444 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4511,11 +4502,11 @@ yy381: } YYDEBUG(382, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1322 "Zend/zend_language_scanner.l" +#line 1321 "Zend/zend_language_scanner.l" { return T_HALT_COMPILER; } -#line 4519 "Zend/zend_language_scanner.c" +#line 4510 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4535,11 +4526,11 @@ yy385: } YYDEBUG(386, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1302 "Zend/zend_language_scanner.l" +#line 1301 "Zend/zend_language_scanner.l" { return T_USE; } -#line 4543 "Zend/zend_language_scanner.c" +#line 4534 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4558,11 +4549,11 @@ yy389: } YYDEBUG(390, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1350 "Zend/zend_language_scanner.l" +#line 1349 "Zend/zend_language_scanner.l" { return T_UNSET; } -#line 4566 "Zend/zend_language_scanner.c" +#line 4557 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4734,11 +4725,11 @@ yy406: ++YYCURSOR; YYDEBUG(408, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1250 "Zend/zend_language_scanner.l" +#line 1249 "Zend/zend_language_scanner.l" { return T_INT_CAST; } -#line 4742 "Zend/zend_language_scanner.c" +#line 4733 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4782,11 +4773,11 @@ yy414: ++YYCURSOR; YYDEBUG(417, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1254 "Zend/zend_language_scanner.l" +#line 1253 "Zend/zend_language_scanner.l" { return T_DOUBLE_CAST; } -#line 4790 "Zend/zend_language_scanner.c" +#line 4781 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4856,11 +4847,11 @@ yy428: ++YYCURSOR; YYDEBUG(431, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1258 "Zend/zend_language_scanner.l" +#line 1257 "Zend/zend_language_scanner.l" { return T_STRING_CAST; } -#line 4864 "Zend/zend_language_scanner.c" +#line 4855 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4893,11 +4884,11 @@ yy435: ++YYCURSOR; YYDEBUG(438, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1262 "Zend/zend_language_scanner.l" +#line 1261 "Zend/zend_language_scanner.l" { return T_ARRAY_CAST; } -#line 4901 "Zend/zend_language_scanner.c" +#line 4892 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4935,11 +4926,11 @@ yy443: ++YYCURSOR; YYDEBUG(446, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1266 "Zend/zend_language_scanner.l" +#line 1265 "Zend/zend_language_scanner.l" { return T_OBJECT_CAST; } -#line 4943 "Zend/zend_language_scanner.c" +#line 4934 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -4980,11 +4971,11 @@ yy452: ++YYCURSOR; YYDEBUG(454, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1270 "Zend/zend_language_scanner.l" +#line 1269 "Zend/zend_language_scanner.l" { return T_BOOL_CAST; } -#line 4988 "Zend/zend_language_scanner.c" +#line 4979 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5044,11 +5035,11 @@ yy463: ++YYCURSOR; YYDEBUG(466, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1274 "Zend/zend_language_scanner.l" +#line 1273 "Zend/zend_language_scanner.l" { return T_UNSET_CAST; } -#line 5052 "Zend/zend_language_scanner.c" +#line 5043 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5062,11 +5053,11 @@ yy468: } YYDEBUG(469, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1246 "Zend/zend_language_scanner.l" +#line 1245 "Zend/zend_language_scanner.l" { return T_VAR; } -#line 5070 "Zend/zend_language_scanner.c" +#line 5061 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5086,11 +5077,11 @@ yy472: } YYDEBUG(473, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1238 "Zend/zend_language_scanner.l" +#line 1237 "Zend/zend_language_scanner.l" { return T_NEW; } -#line 5094 "Zend/zend_language_scanner.c" +#line 5085 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5129,11 +5120,11 @@ yy480: } YYDEBUG(481, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1298 "Zend/zend_language_scanner.l" +#line 1297 "Zend/zend_language_scanner.l" { return T_NAMESPACE; } -#line 5137 "Zend/zend_language_scanner.c" +#line 5128 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5155,11 +5146,11 @@ yy484: ++YYCURSOR; YYDEBUG(485, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1426 "Zend/zend_language_scanner.l" +#line 1425 "Zend/zend_language_scanner.l" { return T_CONCAT_EQUAL; } -#line 5163 "Zend/zend_language_scanner.c" +#line 5154 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5168,21 +5159,21 @@ yy486: ++YYCURSOR; YYDEBUG(488, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1234 "Zend/zend_language_scanner.l" +#line 1233 "Zend/zend_language_scanner.l" { return T_ELLIPSIS; } -#line 5176 "Zend/zend_language_scanner.c" +#line 5167 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; YYDEBUG(490, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1226 "Zend/zend_language_scanner.l" +#line 1225 "Zend/zend_language_scanner.l" { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5186 "Zend/zend_language_scanner.c" +#line 5177 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5204,21 +5195,21 @@ yy493: ++YYCURSOR; YYDEBUG(494, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1406 "Zend/zend_language_scanner.l" +#line 1405 "Zend/zend_language_scanner.l" { return T_MINUS_EQUAL; } -#line 5212 "Zend/zend_language_scanner.c" +#line 5203 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; YYDEBUG(496, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1374 "Zend/zend_language_scanner.l" +#line 1373 "Zend/zend_language_scanner.l" { return T_DEC; } -#line 5222 "Zend/zend_language_scanner.c" +#line 5213 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; @@ -5229,7 +5220,7 @@ yy497: yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5233 "Zend/zend_language_scanner.c" +#line 5224 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5274,11 +5265,11 @@ yy504: } YYDEBUG(505, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1346 "Zend/zend_language_scanner.l" +#line 1345 "Zend/zend_language_scanner.l" { return T_PUBLIC; } -#line 5282 "Zend/zend_language_scanner.c" +#line 5273 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5333,11 +5324,11 @@ yy513: } YYDEBUG(514, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1342 "Zend/zend_language_scanner.l" +#line 1341 "Zend/zend_language_scanner.l" { return T_PROTECTED; } -#line 5341 "Zend/zend_language_scanner.c" +#line 5332 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5367,11 +5358,11 @@ yy519: } YYDEBUG(520, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1338 "Zend/zend_language_scanner.l" +#line 1337 "Zend/zend_language_scanner.l" { return T_PRIVATE; } -#line 5375 "Zend/zend_language_scanner.c" +#line 5366 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5384,7 +5375,7 @@ yy521: { return T_PRINT; } -#line 5388 "Zend/zend_language_scanner.c" +#line 5379 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5413,7 +5404,7 @@ yy526: { return T_GOTO; } -#line 5417 "Zend/zend_language_scanner.c" +#line 5408 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5437,11 +5428,11 @@ yy531: } YYDEBUG(532, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1310 "Zend/zend_language_scanner.l" +#line 1309 "Zend/zend_language_scanner.l" { return T_GLOBAL; } -#line 5445 "Zend/zend_language_scanner.c" +#line 5436 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5482,7 +5473,7 @@ yy539: { return T_BREAK; } -#line 5486 "Zend/zend_language_scanner.c" +#line 5477 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5526,7 +5517,7 @@ yy547: { return T_SWITCH; } -#line 5530 "Zend/zend_language_scanner.c" +#line 5521 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5550,11 +5541,11 @@ yy552: } YYDEBUG(553, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1326 "Zend/zend_language_scanner.l" +#line 1325 "Zend/zend_language_scanner.l" { return T_STATIC; } -#line 5558 "Zend/zend_language_scanner.c" +#line 5549 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5585,7 +5576,7 @@ yy557: { return T_AS; } -#line 5589 "Zend/zend_language_scanner.c" +#line 5580 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5604,11 +5595,11 @@ yy561: } YYDEBUG(562, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1362 "Zend/zend_language_scanner.l" +#line 1361 "Zend/zend_language_scanner.l" { return T_ARRAY; } -#line 5612 "Zend/zend_language_scanner.c" +#line 5603 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5617,11 +5608,11 @@ yy563: } YYDEBUG(564, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1466 "Zend/zend_language_scanner.l" +#line 1465 "Zend/zend_language_scanner.l" { return T_LOGICAL_AND; } -#line 5625 "Zend/zend_language_scanner.c" +#line 5616 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5655,11 +5646,11 @@ yy570: } YYDEBUG(571, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1330 "Zend/zend_language_scanner.l" +#line 1329 "Zend/zend_language_scanner.l" { return T_ABSTRACT; } -#line 5663 "Zend/zend_language_scanner.c" +#line 5654 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5687,7 +5678,7 @@ yy575: { return T_WHILE; } -#line 5691 "Zend/zend_language_scanner.c" +#line 5682 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5700,7 +5691,7 @@ yy577: { return T_IF; } -#line 5704 "Zend/zend_language_scanner.c" +#line 5695 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5752,11 +5743,11 @@ yy584: } YYDEBUG(585, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1314 "Zend/zend_language_scanner.l" +#line 1313 "Zend/zend_language_scanner.l" { return T_ISSET; } -#line 5760 "Zend/zend_language_scanner.c" +#line 5751 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5810,11 +5801,11 @@ yy592: yy593: YYDEBUG(593, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1282 "Zend/zend_language_scanner.l" +#line 1281 "Zend/zend_language_scanner.l" { return T_INCLUDE; } -#line 5818 "Zend/zend_language_scanner.c" +#line 5809 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5843,11 +5834,11 @@ yy598: } YYDEBUG(599, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1286 "Zend/zend_language_scanner.l" +#line 1285 "Zend/zend_language_scanner.l" { return T_INCLUDE_ONCE; } -#line 5851 "Zend/zend_language_scanner.c" +#line 5842 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5885,7 +5876,7 @@ yy605: { return T_INTERFACE; } -#line 5889 "Zend/zend_language_scanner.c" +#line 5880 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5935,11 +5926,11 @@ yy613: } YYDEBUG(614, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1306 "Zend/zend_language_scanner.l" +#line 1305 "Zend/zend_language_scanner.l" { return T_INSTEADOF; } -#line 5943 "Zend/zend_language_scanner.c" +#line 5934 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -5972,7 +5963,7 @@ yy619: { return T_INSTANCEOF; } -#line 5976 "Zend/zend_language_scanner.c" +#line 5967 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6020,7 +6011,7 @@ yy628: { return T_IMPLEMENTS; } -#line 6024 "Zend/zend_language_scanner.c" +#line 6015 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6052,7 +6043,7 @@ yy631: { return T_TRY; } -#line 6056 "Zend/zend_language_scanner.c" +#line 6047 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6075,7 +6066,7 @@ yy636: { return T_TRAIT; } -#line 6079 "Zend/zend_language_scanner.c" +#line 6070 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6098,7 +6089,7 @@ yy640: { return T_THROW; } -#line 6102 "Zend/zend_language_scanner.c" +#line 6093 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6126,7 +6117,7 @@ yy645: { return T_YIELD; } -#line 6130 "Zend/zend_language_scanner.c" +#line 6121 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6187,11 +6178,11 @@ yy653: yy654: YYDEBUG(654, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1290 "Zend/zend_language_scanner.l" +#line 1289 "Zend/zend_language_scanner.l" { return T_REQUIRE; } -#line 6195 "Zend/zend_language_scanner.c" +#line 6186 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6220,11 +6211,11 @@ yy659: } YYDEBUG(660, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1294 "Zend/zend_language_scanner.l" +#line 1293 "Zend/zend_language_scanner.l" { return T_REQUIRE_ONCE; } -#line 6228 "Zend/zend_language_scanner.c" +#line 6219 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6247,7 +6238,7 @@ yy663: { return T_RETURN; } -#line 6251 "Zend/zend_language_scanner.c" +#line 6242 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6341,7 +6332,7 @@ yy674: { return T_CONTINUE; } -#line 6345 "Zend/zend_language_scanner.c" +#line 6336 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6354,7 +6345,7 @@ yy676: { return T_CONST; } -#line 6358 "Zend/zend_language_scanner.c" +#line 6349 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6379,11 +6370,11 @@ yy681: } YYDEBUG(682, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1242 "Zend/zend_language_scanner.l" +#line 1241 "Zend/zend_language_scanner.l" { return T_CLONE; } -#line 6387 "Zend/zend_language_scanner.c" +#line 6378 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6401,7 +6392,7 @@ yy684: { return T_CLASS; } -#line 6405 "Zend/zend_language_scanner.c" +#line 6396 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6447,11 +6438,11 @@ yy693: } YYDEBUG(694, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1366 "Zend/zend_language_scanner.l" +#line 1365 "Zend/zend_language_scanner.l" { return T_CALLABLE; } -#line 6455 "Zend/zend_language_scanner.c" +#line 6446 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6464,7 +6455,7 @@ yy695: { return T_CASE; } -#line 6468 "Zend/zend_language_scanner.c" +#line 6459 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6482,7 +6473,7 @@ yy698: { return T_CATCH; } -#line 6486 "Zend/zend_language_scanner.c" +#line 6477 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6537,7 +6528,7 @@ yy708: { return T_FUNCTION; } -#line 6541 "Zend/zend_language_scanner.c" +#line 6532 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6565,7 +6556,7 @@ yy711: { return T_FOR; } -#line 6569 "Zend/zend_language_scanner.c" +#line 6560 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6593,7 +6584,7 @@ yy715: { return T_FOREACH; } -#line 6597 "Zend/zend_language_scanner.c" +#line 6588 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6627,11 +6618,11 @@ yy719: yy720: YYDEBUG(720, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1334 "Zend/zend_language_scanner.l" +#line 1333 "Zend/zend_language_scanner.l" { return T_FINAL; } -#line 6635 "Zend/zend_language_scanner.c" +#line 6626 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6649,7 +6640,7 @@ yy722: { return T_FINALLY; } -#line 6653 "Zend/zend_language_scanner.c" +#line 6644 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6684,7 +6675,7 @@ yy726: { return T_DO; } -#line 6688 "Zend/zend_language_scanner.c" +#line 6679 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6697,7 +6688,7 @@ yy728: { return T_EXIT; } -#line 6701 "Zend/zend_language_scanner.c" +#line 6692 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6736,7 +6727,7 @@ yy735: { return T_DEFAULT; } -#line 6740 "Zend/zend_language_scanner.c" +#line 6731 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6764,7 +6755,7 @@ yy740: { return T_DECLARE; } -#line 6768 "Zend/zend_language_scanner.c" +#line 6759 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6848,7 +6839,7 @@ yy753: { return T_EXTENDS; } -#line 6852 "Zend/zend_language_scanner.c" +#line 6843 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6861,7 +6852,7 @@ yy755: { return T_EXIT; } -#line 6865 "Zend/zend_language_scanner.c" +#line 6856 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6875,11 +6866,11 @@ yy758: } YYDEBUG(759, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1278 "Zend/zend_language_scanner.l" +#line 1277 "Zend/zend_language_scanner.l" { return T_EVAL; } -#line 6883 "Zend/zend_language_scanner.c" +#line 6874 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6953,7 +6944,7 @@ yy769: { return T_ENDWHILE; } -#line 6957 "Zend/zend_language_scanner.c" +#line 6948 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -6986,7 +6977,7 @@ yy775: { return T_ENDSWITCH; } -#line 6990 "Zend/zend_language_scanner.c" +#line 6981 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -6999,7 +6990,7 @@ yy777: { return T_ENDIF; } -#line 7003 "Zend/zend_language_scanner.c" +#line 6994 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7032,7 +7023,7 @@ yy781: { return T_ENDFOR; } -#line 7036 "Zend/zend_language_scanner.c" +#line 7027 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7060,7 +7051,7 @@ yy785: { return T_ENDFOREACH; } -#line 7064 "Zend/zend_language_scanner.c" +#line 7055 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7098,7 +7089,7 @@ yy792: { return T_ENDDECLARE; } -#line 7102 "Zend/zend_language_scanner.c" +#line 7093 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7117,11 +7108,11 @@ yy796: } YYDEBUG(797, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1318 "Zend/zend_language_scanner.l" +#line 1317 "Zend/zend_language_scanner.l" { return T_EMPTY; } -#line 7125 "Zend/zend_language_scanner.c" +#line 7116 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7154,7 +7145,7 @@ yy800: { return T_ELSE; } -#line 7158 "Zend/zend_language_scanner.c" +#line 7149 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7172,7 +7163,7 @@ yy802: { return T_ELSEIF; } -#line 7176 "Zend/zend_language_scanner.c" +#line 7167 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7190,7 +7181,7 @@ yy805: { return T_ECHO; } -#line 7194 "Zend/zend_language_scanner.c" +#line 7185 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7265,11 +7256,10 @@ yy810: yyleng = YYCURSOR - SCNG(yy_text); #line 1204 "Zend/zend_language_scanner.l" { - DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7273 "Zend/zend_language_scanner.c" +#line 7263 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7277,13 +7267,13 @@ yy811: yy812: YYDEBUG(812, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1220 "Zend/zend_language_scanner.l" +#line 1219 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); goto restart; } -#line 7287 "Zend/zend_language_scanner.c" +#line 7277 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7292,13 +7282,13 @@ yy813: yy814: YYDEBUG(814, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1214 "Zend/zend_language_scanner.l" +#line 1213 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7302 "Zend/zend_language_scanner.c" +#line 7292 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7319,11 +7309,11 @@ yy818: ++YYCURSOR; YYDEBUG(819, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1210 "Zend/zend_language_scanner.l" +#line 1209 "Zend/zend_language_scanner.l" { return T_OBJECT_OPERATOR; } -#line 7327 "Zend/zend_language_scanner.c" +#line 7317 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7408,14 +7398,14 @@ yy824: yy825: YYDEBUG(825, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1517 "Zend/zend_language_scanner.l" +#line 1516 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7419 "Zend/zend_language_scanner.c" +#line 7409 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7440,7 +7430,7 @@ yy830: ++YYCURSOR; YYDEBUG(831, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1508 "Zend/zend_language_scanner.l" +#line 1507 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); zend_copy_value(zendlval, yytext, yyleng); @@ -7448,7 +7438,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7452 "Zend/zend_language_scanner.c" +#line 7442 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7459,7 +7449,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2290 "Zend/zend_language_scanner.l" +#line 2281 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7515,7 +7505,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7519 "Zend/zend_language_scanner.c" +#line 7509 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7622,7 +7612,7 @@ yy838: yy839: YYDEBUG(839, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1588 "Zend/zend_language_scanner.l" +#line 1587 "Zend/zend_language_scanner.l" { /* Offset could be treated as a long */ if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) { ZVAL_LONG(zendlval, strtol(yytext, NULL, 10)); @@ -7631,7 +7621,7 @@ yy839: } return T_NUM_STRING; } -#line 7635 "Zend/zend_language_scanner.c" +#line 7625 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7651,23 +7641,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1822 "Zend/zend_language_scanner.l" +#line 1815 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7660 "Zend/zend_language_scanner.c" +#line 7650 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1817 "Zend/zend_language_scanner.l" +#line 1810 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7671 "Zend/zend_language_scanner.c" +#line 7661 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7677,14 +7667,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1827 "Zend/zend_language_scanner.l" +#line 1820 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7688 "Zend/zend_language_scanner.c" +#line 7678 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7693,18 +7683,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1834 "Zend/zend_language_scanner.l" +#line 1827 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7702 "Zend/zend_language_scanner.c" +#line 7692 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2347 "Zend/zend_language_scanner.l" +#line 2338 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7713,7 +7703,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7717 "Zend/zend_language_scanner.c" +#line 7707 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7749,12 +7739,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1812 "Zend/zend_language_scanner.l" +#line 1805 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7758 "Zend/zend_language_scanner.c" +#line 7748 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7794,12 +7784,12 @@ yy862: yy864: YYDEBUG(864, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1597 "Zend/zend_language_scanner.l" +#line 1596 "Zend/zend_language_scanner.l" { /* Offset must be treated as a string */ ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7803 "Zend/zend_language_scanner.c" +#line 7793 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7822,6 +7812,6 @@ yy867: goto yy864; } } -#line 2356 "Zend/zend_language_scanner.l" +#line 2347 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 31b76e9076..c02d636c2e 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -884,15 +884,6 @@ ZEND_API void zend_multibyte_yyinput_again(zend_encoding_filter old_input_filter ZVAL_STRINGL(zendlval, yytext, yyleng); \ } -// TODO: some extensions might need content, but we don't copy it intentional ??? -#if 0 -# define DUMMY_STRINGL(zendlval, yytext, yyleng) \ - ZVAL_STRINGL(zendlval, yytext, yyleng) -#else -# define DUMMY_STRINGL(zendlval, yytext, yyleng) \ - ZVAL_EMPTY_STRING(zendlval) -#endif - static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quote_type TSRMLS_DC) { register char *s, *t; @@ -1202,7 +1193,6 @@ NEWLINE ("\r"|"\n"|"\r\n") } {WHITESPACE}+ { - DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } @@ -1675,7 +1665,6 @@ NEWLINE ("\r"|"\n"|"\r\n") } HANDLE_NEWLINES(yytext, yyleng); - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } @@ -1683,7 +1672,6 @@ NEWLINE ("\r"|"\n"|"\r\n") "<%=" { if (CG(asp_tags)) { - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG_WITH_ECHO; } else { @@ -1693,7 +1681,6 @@ NEWLINE ("\r"|"\n"|"\r\n") ""<%" { if (CG(asp_tags)) { - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } else { @@ -1711,7 +1697,6 @@ NEWLINE ("\r"|"\n"|"\r\n") ""("?>"|""){NEWLINE}? { - DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } @@ -1914,7 +1897,6 @@ inline_html: "%>"{NEWLINE}? { if (CG(asp_tags)) { BEGIN(INITIAL); - DUMMY_STRINGL(zendlval, yytext, yyleng); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } else { yyless(1); -- cgit v1.2.1 From 4ca4b423be26a1f049933ca95b5a022201b64f73 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 20:54:41 +0200 Subject: Make lexer return AST nodes --- Zend/zend_ast.h | 30 +- Zend/zend_compile.c | 9 +- Zend/zend_language_parser.y | 92 +++--- Zend/zend_language_scanner.c | 709 +++++++++++++++++++++---------------------- 4 files changed, 409 insertions(+), 431 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 49a0a27d4d..4216a1ac3b 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -158,10 +158,6 @@ typedef struct _zend_ast_decl { zend_ast *child[3]; } zend_ast_decl; -static inline zval *zend_ast_get_zval(zend_ast *ast) { - return &((zend_ast_zval *) ast)->val; -} - ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr); ZEND_API zend_ast *zend_ast_create_ex( @@ -187,6 +183,13 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast); ZEND_API void zend_ast_destroy(zend_ast *ast); ZEND_API void zend_ast_destroy_and_free(zend_ast *ast); +static inline zval *zend_ast_get_zval(zend_ast *ast) { + return &((zend_ast_zval *) ast)->val; +} +static inline zend_string *zend_ast_get_str(zend_ast *ast) { + return Z_STR_P(zend_ast_get_zval(ast)); +} + static inline zend_ast *zend_ast_create_zval(zval *zv) { return zend_ast_create_zval_ex(zv, 0); } @@ -217,9 +220,6 @@ static inline zend_ast *zend_ast_create_dynamic_and_add(zend_ast_kind kind, zend return zend_ast_dynamic_add(zend_ast_create_dynamic(kind), op); } -static inline zend_ast *zend_ast_create_var(zval *name) { - return zend_ast_create_unary(ZEND_AST_VAR, zend_ast_create_zval(name)); -} static inline zend_ast *zend_ast_create_binary_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { return zend_ast_create_ex(2, ZEND_AST_BINARY_OP, opcode, op0, op1); } @@ -231,28 +231,12 @@ static inline zend_ast *zend_ast_create_cast(zend_uint type, zend_ast *op0) { } /* Temporary, for porting */ -#define AST_COMPILE(res, ast) do { \ - zend_ast *_ast = (ast); \ - zend_eval_const_expr(&_ast TSRMLS_CC); \ - zend_compile_expr((res), _ast TSRMLS_CC); \ - zend_ast_destroy(_ast); \ -} while (0) #define AST_COMPILE_VAR(res, ast, type) do { \ zend_ast *_ast = (ast); \ zend_compile_var((res), _ast, type TSRMLS_CC); \ zend_ast_destroy(_ast); \ } while (0) -#define AST_COMPILE_STMT(ast) do { \ - zend_ast *_ast = (ast); \ - zend_compile_stmt(_ast TSRMLS_CC); \ - if (_ast) zend_ast_destroy(_ast); \ -} while (0) -#define AST_ZNODE(znode) zend_ast_create_znode((znode)) #define AST_ZVAL(znode) zend_ast_create_zval(&(znode)->u.constant) -#define AC(znode) AST_COMPILE(&znode, znode.u.ast) -#define AS(znode) AST_COMPILE_STMT(znode.u.ast) -#define AN(znode) ((znode).u.ast = NULL) - #endif diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 91990a48cc..2e0d794862 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3168,6 +3168,7 @@ ZEND_API void zend_activate_auto_globals(TSRMLS_D) /* {{{ */ int zendlex(znode *zendlval TSRMLS_DC) /* {{{ */ { + zval zv; int retval; if (CG(increment_lineno)) { @@ -3176,8 +3177,8 @@ int zendlex(znode *zendlval TSRMLS_DC) /* {{{ */ } again: - Z_TYPE_INFO(zendlval->u.constant) = IS_LONG; - retval = lex_scan(&zendlval->u.constant TSRMLS_CC); + ZVAL_UNDEF(&zv); + retval = lex_scan(&zv TSRMLS_CC); switch (retval) { case T_COMMENT: case T_DOC_COMMENT: @@ -3198,8 +3199,10 @@ again: retval = T_ECHO; break; } + if (Z_TYPE(zv) != IS_UNDEF) { + zendlval->u.ast = zend_ast_create_zval(&zv); + } - zendlval->op_type = IS_CONST; return retval; } /* }}} */ diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index a0fa111f55..a4ab4e680c 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -230,8 +230,8 @@ top_statement_list: ; namespace_name: - T_STRING { $$ = $1; } - | namespace_name T_NS_SEPARATOR T_STRING { zend_do_build_namespace_name(&$$, &$1, &$3 TSRMLS_CC); } + T_STRING { zval zv; ZVAL_COPY_VALUE(&zv, zend_ast_get_zval($1.u.ast)); $1.op_type = IS_CONST; ZVAL_COPY_VALUE(&$1.u.constant, &zv); $$ = $1; } + | namespace_name T_NS_SEPARATOR T_STRING { zval zv; ZVAL_COPY_VALUE(&zv, zend_ast_get_zval($3.u.ast)); $3.op_type = IS_CONST; ZVAL_COPY_VALUE(&$3.u.constant, &zv); zend_do_build_namespace_name(&$$, &$1, &$3 TSRMLS_CC); } ; name: @@ -280,11 +280,11 @@ use_declaration: namespace_name { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$1), NULL); } | namespace_name T_AS T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$1), AST_ZVAL(&$3)); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$1), $3.u.ast); } | T_NS_SEPARATOR namespace_name { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), NULL); } | T_NS_SEPARATOR namespace_name T_AS T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), AST_ZVAL(&$4)); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), $4.u.ast); } ; const_list: @@ -312,7 +312,7 @@ inner_statement: statement: unticked_statement { $$.u.ast = $1.u.ast; } - | T_STRING ':' { $$.u.ast = zend_ast_create_unary(ZEND_AST_LABEL, AST_ZVAL(&$1)); } + | T_STRING ':' { $$.u.ast = zend_ast_create_unary(ZEND_AST_LABEL, $1.u.ast); } ; unticked_statement: @@ -338,7 +338,7 @@ unticked_statement: | T_GLOBAL global_var_list ';' { $$.u.ast = $2.u.ast; } | T_STATIC static_var_list ';' { $$.u.ast = $2.u.ast; } | T_ECHO echo_expr_list ';' { $$.u.ast = $2.u.ast; } - | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, AST_ZVAL(&$1)); } + | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, $1.u.ast); } | expr ';' { $$.u.ast = $1.u.ast; } | T_UNSET '(' unset_variables ')' ';' { $$.u.ast = $3.u.ast; } | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement @@ -354,7 +354,7 @@ unticked_statement: | T_TRY '{' inner_statement_list '}' catch_list finally_statement { $$.u.ast = zend_ast_create_ternary(ZEND_AST_TRY, $3.u.ast, $5.u.ast, $6.u.ast); } | T_THROW expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_THROW, $2.u.ast); } - | T_GOTO T_STRING ';' { $$.u.ast = zend_ast_create_unary(ZEND_GOTO, AST_ZVAL(&$2)); } + | T_GOTO T_STRING ';' { $$.u.ast = zend_ast_create_unary(ZEND_GOTO, $2.u.ast); } ; catch_list: @@ -362,7 +362,7 @@ catch_list: { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_CATCH_LIST); } | catch_list T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}' { $$.u.ast = zend_ast_dynamic_add($1.u.ast, - zend_ast_create_ternary(ZEND_AST_CATCH, $4.u.ast, AST_ZVAL(&$5), $8.u.ast)); } + zend_ast_create_ternary(ZEND_AST_CATCH, $4.u.ast, $5.u.ast, $8.u.ast)); } ; finally_statement: @@ -383,7 +383,7 @@ function_declaration_statement: function returns_ref T_STRING '(' parameter_list ')' '{' inner_statement_list '}' { $$.u.ast = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2.EA, $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $1.u.op.ptr, - Z_STR($3.u.constant), $5.u.ast, NULL, $8.u.ast); } + zend_ast_get_str($3.u.ast), $5.u.ast, NULL, $8.u.ast); } ; is_reference: @@ -402,13 +402,13 @@ class_declaration_statement: '{' class_statement_list '}' { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num, CG(zend_lineno), LANG_SCNG(yy_text), $5.u.op.ptr, - Z_STR($2.u.constant), $3.u.ast, $4.u.ast, $7.u.ast); } + zend_ast_get_str($2.u.ast), $3.u.ast, $4.u.ast, $7.u.ast); } | interface_entry T_STRING interface_extends_list { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } '{' class_statement_list '}' { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num, CG(zend_lineno), LANG_SCNG(yy_text), $4.u.op.ptr, - Z_STR($2.u.constant), NULL, $3.u.ast, $6.u.ast); } + zend_ast_get_str($2.u.ast), NULL, $3.u.ast, $6.u.ast); } ; @@ -538,10 +538,10 @@ non_empty_parameter_list: parameter: optional_type is_reference is_variadic T_VARIABLE { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.op_type | $3.op_type, - $1.u.ast, AST_ZVAL(&$4), NULL); } + $1.u.ast, $4.u.ast, NULL); } | optional_type is_reference is_variadic T_VARIABLE '=' expr { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.op_type | $3.op_type, - $1.u.ast, AST_ZVAL(&$4), $6.u.ast); } + $1.u.ast, $4.u.ast, $6.u.ast); } ; @@ -590,9 +590,9 @@ static_var_list: static_var: T_VARIABLE - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC, AST_ZVAL(&$1), NULL); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC, $1.u.ast, NULL); } | T_VARIABLE '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC, AST_ZVAL(&$1), $3.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC, $1.u.ast, $3.u.ast); } ; @@ -614,7 +614,7 @@ class_statement: | 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), $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), $2.u.op.ptr, - Z_STR($4.u.constant), $6.u.ast, NULL, $8.u.ast); } + zend_ast_get_str($4.u.ast), $6.u.ast, NULL, $8.u.ast); } ; name_list: @@ -648,7 +648,7 @@ 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, AST_ZVAL(&$4)); } + Z_LVAL($3.u.constant), $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); } @@ -656,13 +656,13 @@ trait_alias: trait_method_reference: T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, NULL, AST_ZVAL(&$1)); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, NULL, $1.u.ast); } | absolute_trait_method_reference { $$.u.ast = $1.u.ast; } ; absolute_trait_method_reference: name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, $1.u.ast, AST_ZVAL(&$3)); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, $1.u.ast, $3.u.ast); } ; trait_modifiers: @@ -705,9 +705,9 @@ property_list: ; property: - T_VARIABLE { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, AST_ZVAL(&$1), NULL); } + T_VARIABLE { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, $1.u.ast, NULL); } | T_VARIABLE '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, AST_ZVAL(&$1), $3.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, $1.u.ast, $3.u.ast); } ; class_const_list: @@ -718,7 +718,7 @@ class_const_list: const_decl: T_STRING '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_CONST_ELEM, AST_ZVAL(&$1), $3.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_CONST_ELEM, $1.u.ast, $3.u.ast); } ; echo_expr_list: @@ -893,8 +893,8 @@ lexical_var_list: ; lexical_var: - T_VARIABLE { $$.u.ast = AST_ZVAL(&$1); } - | '&' T_VARIABLE { $$.u.ast = zend_ast_create_zval_ex(&$2.u.constant, 1); } + T_VARIABLE { $$.u.ast = $1.u.ast; } + | '&' T_VARIABLE { $$.u.ast = $2.u.ast; $$.u.ast->attr = 1; } ; function_call: @@ -931,7 +931,7 @@ exit_expr: backticks_expr: /* empty */ { $$.u.ast = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } - | T_ENCAPSED_AND_WHITESPACE { $$.u.ast = AST_ZVAL(&$1); } + | T_ENCAPSED_AND_WHITESPACE { $$.u.ast = $1.u.ast; } | encaps_list { $$.u.ast = $1.u.ast; } ; @@ -945,21 +945,21 @@ ctor_arguments: dereferencable_scalar: T_ARRAY '(' array_pair_list ')' { $$.u.ast = $3.u.ast; } | '[' array_pair_list ']' { $$.u.ast = $2.u.ast; } - | T_CONSTANT_ENCAPSED_STRING { $$.u.ast = AST_ZVAL(&$1); } + | T_CONSTANT_ENCAPSED_STRING { $$.u.ast = $1.u.ast; } ; scalar: - T_LNUMBER { $$.u.ast = AST_ZVAL(&$1); } - | T_DNUMBER { $$.u.ast = AST_ZVAL(&$1); } - | T_LINE { $$.u.ast = AST_ZVAL(&$1); } - | T_FILE { $$.u.ast = AST_ZVAL(&$1); } - | T_DIR { $$.u.ast = AST_ZVAL(&$1); } + T_LNUMBER { $$.u.ast = $1.u.ast; } + | T_DNUMBER { $$.u.ast = $1.u.ast; } + | T_LINE { $$.u.ast = $1.u.ast; } + | T_FILE { $$.u.ast = $1.u.ast; } + | T_DIR { $$.u.ast = $1.u.ast; } | T_TRAIT_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_TRAIT_C); } | T_METHOD_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_METHOD_C); } | T_FUNC_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); } | T_NS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_NS_C); } | T_CLASS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_CLASS_C); } - | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } + | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = $2.u.ast; } | T_START_HEREDOC T_END_HEREDOC { $$.u.ast = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } | '"' encaps_list '"' { $$.u.ast = $2.u.ast; } @@ -1024,7 +1024,7 @@ variable: simple_variable: T_VARIABLE - { $$.u.ast = AST_ZVAL(&$1); } + { $$.u.ast = $1.u.ast; } | '$' '{' expr '}' { $$.u.ast = $3.u.ast; } | '$' simple_variable @@ -1059,7 +1059,7 @@ dim_offset: ; member_name: - T_STRING { $$.u.ast = AST_ZVAL(&$1); } + T_STRING { $$.u.ast = $1.u.ast; } | '{' expr '}' { $$.u.ast = $2.u.ast; } | simple_variable { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } ; @@ -1104,37 +1104,37 @@ encaps_list: encaps_list encaps_var { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } | encaps_list T_ENCAPSED_AND_WHITESPACE - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, AST_ZVAL(&$2)); } + { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } | encaps_var { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ENCAPS_LIST, $1.u.ast); } | T_ENCAPSED_AND_WHITESPACE encaps_var { $$.u.ast = zend_ast_dynamic_add(zend_ast_create_dynamic_and_add( - ZEND_AST_ENCAPS_LIST, AST_ZVAL(&$1)), $2.u.ast); } + ZEND_AST_ENCAPS_LIST, $1.u.ast), $2.u.ast); } ; encaps_var: T_VARIABLE - { $$.u.ast = zend_ast_create_var(&$1.u.constant); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } | T_VARIABLE '[' encaps_var_offset ']' { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, - zend_ast_create_var(&$1.u.constant), $3.u.ast); } + zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast), $3.u.ast); } | T_VARIABLE T_OBJECT_OPERATOR T_STRING { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, - zend_ast_create_var(&$1.u.constant), AST_ZVAL(&$3)); } + zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast), $3.u.ast); } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' - { $$.u.ast = zend_ast_create_var(&$2.u.constant); } + { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, - zend_ast_create_var(&$2.u.constant), $4.u.ast); } + zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast), $4.u.ast); } | T_CURLY_OPEN variable '}' { $$.u.ast = $2.u.ast; } ; encaps_var_offset: - T_STRING { $$.u.ast = AST_ZVAL(&$1); } - | T_NUM_STRING { $$.u.ast = AST_ZVAL(&$1); } - | T_VARIABLE { $$.u.ast = zend_ast_create_var(&$1.u.constant); } + T_STRING { $$.u.ast = $1.u.ast; } + | T_NUM_STRING { $$.u.ast = $1.u.ast; } + | T_VARIABLE { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } ; @@ -1166,10 +1166,10 @@ isset_variable: class_constant: class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { $$.u.ast = zend_ast_create_binary( - ZEND_AST_CLASS_CONST, $1.u.ast, AST_ZVAL(&$3)); } + ZEND_AST_CLASS_CONST, $1.u.ast, $3.u.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING { $$.u.ast = zend_ast_create_binary( - ZEND_AST_CLASS_CONST, $1.u.ast, AST_ZVAL(&$3)); } + ZEND_AST_CLASS_CONST, $1.u.ast, $3.u.ast); } ; class_name_scalar: diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index faa90dd5f8..d6d444bffe 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -886,15 +886,6 @@ ZEND_API void zend_multibyte_yyinput_again(zend_encoding_filter old_input_filter ZVAL_STRINGL(zendlval, yytext, yyleng); \ } -// TODO: some extensions might need content, but we don't copy it intentional ??? -#if 0 -# define DUMMY_STRINGL(zendlval, yytext, yyleng) \ - ZVAL_STRINGL(zendlval, yytext, yyleng) -#else -# define DUMMY_STRINGL(zendlval, yytext, yyleng) \ - ZVAL_EMPTY_STRING(zendlval) -#endif - static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quote_type TSRMLS_DC) { register char *s, *t; @@ -1026,7 +1017,7 @@ restart: yymore_restart: -#line 1030 "Zend/zend_language_scanner.c" +#line 1021 "Zend/zend_language_scanner.c" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -1125,7 +1116,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1724 "Zend/zend_language_scanner.l" +#line 1715 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1186,7 +1177,7 @@ inline_html: HANDLE_NEWLINES(yytext, yyleng); return T_INLINE_HTML; } -#line 1190 "Zend/zend_language_scanner.c" +#line 1181 "Zend/zend_language_scanner.c" yy4: YYDEBUG(4, *YYCURSOR); yych = *++YYCURSOR; @@ -1204,7 +1195,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1715 "Zend/zend_language_scanner.l" +#line 1706 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { BEGIN(ST_IN_SCRIPTING); @@ -1213,14 +1204,14 @@ yy6: goto inline_char_handler; } } -#line 1217 "Zend/zend_language_scanner.c" +#line 1208 "Zend/zend_language_scanner.c" yy7: YYDEBUG(7, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1698 "Zend/zend_language_scanner.l" +#line 1689 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(ST_IN_SCRIPTING); @@ -1229,7 +1220,7 @@ yy7: goto inline_char_handler; } } -#line 1233 "Zend/zend_language_scanner.c" +#line 1224 "Zend/zend_language_scanner.c" yy9: YYDEBUG(9, *YYCURSOR); yych = *++YYCURSOR; @@ -1415,7 +1406,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1667 "Zend/zend_language_scanner.l" +#line 1658 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1429,7 +1420,7 @@ yy35: BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1433 "Zend/zend_language_scanner.c" +#line 1424 "Zend/zend_language_scanner.c" yy39: YYDEBUG(39, *YYCURSOR); yych = *++YYCURSOR; @@ -1456,7 +1447,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1682 "Zend/zend_language_scanner.l" +#line 1673 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(ST_IN_SCRIPTING); @@ -1465,18 +1456,18 @@ yy43: goto inline_char_handler; } } -#line 1469 "Zend/zend_language_scanner.c" +#line 1460 "Zend/zend_language_scanner.c" yy45: YYDEBUG(45, *YYCURSOR); ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1692 "Zend/zend_language_scanner.l" +#line 1683 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG_WITH_ECHO; } -#line 1480 "Zend/zend_language_scanner.c" +#line 1471 "Zend/zend_language_scanner.c" yy47: YYDEBUG(47, *YYCURSOR); yych = *++YYCURSOR; @@ -1503,13 +1494,13 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1708 "Zend/zend_language_scanner.l" +#line 1699 "Zend/zend_language_scanner.l" { HANDLE_NEWLINE(yytext[yyleng-1]); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1513 "Zend/zend_language_scanner.c" +#line 1504 "Zend/zend_language_scanner.c" yy52: YYDEBUG(52, *YYCURSOR); ++YYCURSOR; @@ -1580,7 +1571,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2165 "Zend/zend_language_scanner.l" +#line 2156 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1621,7 +1612,7 @@ yy56: zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1625 "Zend/zend_language_scanner.c" +#line 1616 "Zend/zend_language_scanner.c" yy57: YYDEBUG(57, *YYCURSOR); yych = *++YYCURSOR; @@ -1632,12 +1623,12 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2109 "Zend/zend_language_scanner.l" +#line 2100 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; } -#line 1641 "Zend/zend_language_scanner.c" +#line 1632 "Zend/zend_language_scanner.c" yy60: YYDEBUG(60, *YYCURSOR); yych = *++YYCURSOR; @@ -1647,14 +1638,14 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2096 "Zend/zend_language_scanner.l" +#line 2087 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1658 "Zend/zend_language_scanner.c" +#line 1649 "Zend/zend_language_scanner.c" yy63: YYDEBUG(63, *YYCURSOR); yyaccept = 0; @@ -1670,23 +1661,23 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1805 "Zend/zend_language_scanner.l" +#line 1796 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1679 "Zend/zend_language_scanner.c" +#line 1670 "Zend/zend_language_scanner.c" yy66: YYDEBUG(66, *YYCURSOR); ++YYCURSOR; YYDEBUG(67, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1492 "Zend/zend_language_scanner.l" +#line 1483 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1690 "Zend/zend_language_scanner.c" +#line 1681 "Zend/zend_language_scanner.c" yy68: YYDEBUG(68, *YYCURSOR); yych = *++YYCURSOR; @@ -1700,14 +1691,14 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1798 "Zend/zend_language_scanner.l" +#line 1789 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1711 "Zend/zend_language_scanner.c" +#line 1702 "Zend/zend_language_scanner.c" yy72: YYDEBUG(72, *YYCURSOR); yych = *++YYCURSOR; @@ -1725,14 +1716,14 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1789 "Zend/zend_language_scanner.l" +#line 1780 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1736 "Zend/zend_language_scanner.c" +#line 1727 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_DOUBLE_QUOTES: @@ -1800,7 +1791,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2115 "Zend/zend_language_scanner.l" +#line 2106 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1849,7 +1840,7 @@ double_quotes_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1853 "Zend/zend_language_scanner.c" +#line 1844 "Zend/zend_language_scanner.c" yy79: YYDEBUG(79, *YYCURSOR); yych = *++YYCURSOR; @@ -1860,12 +1851,12 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2104 "Zend/zend_language_scanner.l" +#line 2095 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; } -#line 1869 "Zend/zend_language_scanner.c" +#line 1860 "Zend/zend_language_scanner.c" yy82: YYDEBUG(82, *YYCURSOR); yych = *++YYCURSOR; @@ -1875,14 +1866,14 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2096 "Zend/zend_language_scanner.l" +#line 2087 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1886 "Zend/zend_language_scanner.c" +#line 1877 "Zend/zend_language_scanner.c" yy85: YYDEBUG(85, *YYCURSOR); yyaccept = 0; @@ -1898,23 +1889,23 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1805 "Zend/zend_language_scanner.l" +#line 1796 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1907 "Zend/zend_language_scanner.c" +#line 1898 "Zend/zend_language_scanner.c" yy88: YYDEBUG(88, *YYCURSOR); ++YYCURSOR; YYDEBUG(89, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1492 "Zend/zend_language_scanner.l" +#line 1483 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1918 "Zend/zend_language_scanner.c" +#line 1909 "Zend/zend_language_scanner.c" yy90: YYDEBUG(90, *YYCURSOR); yych = *++YYCURSOR; @@ -1928,14 +1919,14 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1798 "Zend/zend_language_scanner.l" +#line 1789 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1939 "Zend/zend_language_scanner.c" +#line 1930 "Zend/zend_language_scanner.c" yy94: YYDEBUG(94, *YYCURSOR); yych = *++YYCURSOR; @@ -1953,14 +1944,14 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1789 "Zend/zend_language_scanner.l" +#line 1780 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1964 "Zend/zend_language_scanner.c" +#line 1955 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_END_HEREDOC: @@ -1971,7 +1962,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2082 "Zend/zend_language_scanner.l" +#line 2073 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -1984,7 +1975,7 @@ yyc_ST_END_HEREDOC: BEGIN(ST_IN_SCRIPTING); return T_END_HEREDOC; } -#line 1988 "Zend/zend_language_scanner.c" +#line 1979 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_HEREDOC: { @@ -2046,7 +2037,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2207 "Zend/zend_language_scanner.l" +#line 2198 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2119,7 +2110,7 @@ heredoc_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 2123 "Zend/zend_language_scanner.c" +#line 2114 "Zend/zend_language_scanner.c" yy105: YYDEBUG(105, *YYCURSOR); yych = *++YYCURSOR; @@ -2134,14 +2125,14 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2096 "Zend/zend_language_scanner.l" +#line 2087 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 2145 "Zend/zend_language_scanner.c" +#line 2136 "Zend/zend_language_scanner.c" yy109: YYDEBUG(109, *YYCURSOR); yyaccept = 0; @@ -2157,23 +2148,23 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1805 "Zend/zend_language_scanner.l" +#line 1796 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2166 "Zend/zend_language_scanner.c" +#line 2157 "Zend/zend_language_scanner.c" yy112: YYDEBUG(112, *YYCURSOR); ++YYCURSOR; YYDEBUG(113, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1492 "Zend/zend_language_scanner.l" +#line 1483 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 2177 "Zend/zend_language_scanner.c" +#line 2168 "Zend/zend_language_scanner.c" yy114: YYDEBUG(114, *YYCURSOR); yych = *++YYCURSOR; @@ -2187,14 +2178,14 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1798 "Zend/zend_language_scanner.l" +#line 1789 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2198 "Zend/zend_language_scanner.c" +#line 2189 "Zend/zend_language_scanner.c" yy118: YYDEBUG(118, *YYCURSOR); yych = *++YYCURSOR; @@ -2212,14 +2203,14 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1789 "Zend/zend_language_scanner.l" +#line 1780 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2223 "Zend/zend_language_scanner.c" +#line 2214 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_IN_SCRIPTING: @@ -2402,12 +2393,12 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1827 "Zend/zend_language_scanner.l" +#line 1818 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 2411 "Zend/zend_language_scanner.c" +#line 2402 "Zend/zend_language_scanner.c" yy125: YYDEBUG(125, *YYCURSOR); yych = *++YYCURSOR; @@ -2639,11 +2630,11 @@ yy138: yy139: YYDEBUG(139, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1481 "Zend/zend_language_scanner.l" +#line 1472 "Zend/zend_language_scanner.l" { return yytext[0]; } -#line 2647 "Zend/zend_language_scanner.c" +#line 2638 "Zend/zend_language_scanner.c" yy140: YYDEBUG(140, *YYCURSOR); ++YYCURSOR; @@ -2652,12 +2643,12 @@ yy140: yy141: YYDEBUG(141, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1204 "Zend/zend_language_scanner.l" +#line 1195 "Zend/zend_language_scanner.l" { HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 2661 "Zend/zend_language_scanner.c" +#line 2652 "Zend/zend_language_scanner.c" yy142: YYDEBUG(142, *YYCURSOR); yych = *++YYCURSOR; @@ -2668,11 +2659,11 @@ yy143: ++YYCURSOR; YYDEBUG(144, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1229 "Zend/zend_language_scanner.l" +#line 1220 "Zend/zend_language_scanner.l" { return T_NS_SEPARATOR; } -#line 2676 "Zend/zend_language_scanner.c" +#line 2667 "Zend/zend_language_scanner.c" yy145: YYDEBUG(145, *YYCURSOR); yyaccept = 1; @@ -2906,18 +2897,18 @@ yy168: ++YYCURSOR; YYDEBUG(169, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1486 "Zend/zend_language_scanner.l" +#line 1477 "Zend/zend_language_scanner.l" { yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return '{'; } -#line 2915 "Zend/zend_language_scanner.c" +#line 2906 "Zend/zend_language_scanner.c" yy170: YYDEBUG(170, *YYCURSOR); ++YYCURSOR; YYDEBUG(171, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1498 "Zend/zend_language_scanner.l" +#line 1489 "Zend/zend_language_scanner.l" { RESET_DOC_COMMENT(); if (!zend_stack_is_empty(&SCNG(state_stack))) { @@ -2925,7 +2916,7 @@ yy170: } return '}'; } -#line 2929 "Zend/zend_language_scanner.c" +#line 2920 "Zend/zend_language_scanner.c" yy172: YYDEBUG(172, *YYCURSOR); yyaccept = 2; @@ -2953,7 +2944,7 @@ yy172: yy173: YYDEBUG(173, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1546 "Zend/zend_language_scanner.l" +#line 1537 "Zend/zend_language_scanner.l" { if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */ ZVAL_LONG(zendlval, strtol(yytext, NULL, 0)); @@ -2971,7 +2962,7 @@ yy173: } return T_LNUMBER; } -#line 2975 "Zend/zend_language_scanner.c" +#line 2966 "Zend/zend_language_scanner.c" yy174: YYDEBUG(174, *YYCURSOR); yyaccept = 2; @@ -2999,7 +2990,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1833 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3033,14 +3024,14 @@ yy177: return T_COMMENT; } -#line 3037 "Zend/zend_language_scanner.c" +#line 3028 "Zend/zend_language_scanner.c" yy178: YYDEBUG(178, *YYCURSOR); ++YYCURSOR; yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1917 "Zend/zend_language_scanner.l" +#line 1908 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3108,14 +3099,14 @@ yy179: } return T_CONSTANT_ENCAPSED_STRING; } -#line 3112 "Zend/zend_language_scanner.c" +#line 3103 "Zend/zend_language_scanner.c" yy180: YYDEBUG(180, *YYCURSOR); ++YYCURSOR; yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1986 "Zend/zend_language_scanner.l" +#line 1977 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3156,24 +3147,24 @@ yy181: BEGIN(ST_DOUBLE_QUOTES); return '"'; } -#line 3160 "Zend/zend_language_scanner.c" +#line 3151 "Zend/zend_language_scanner.c" yy182: YYDEBUG(182, *YYCURSOR); ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2076 "Zend/zend_language_scanner.l" +#line 2067 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; } -#line 3171 "Zend/zend_language_scanner.c" +#line 3162 "Zend/zend_language_scanner.c" yy184: YYDEBUG(184, *YYCURSOR); ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2338 "Zend/zend_language_scanner.l" +#line 2329 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3182,7 +3173,7 @@ yy184: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 3186 "Zend/zend_language_scanner.c" +#line 3177 "Zend/zend_language_scanner.c" yy186: YYDEBUG(186, *YYCURSOR); ++YYCURSOR; @@ -3209,12 +3200,12 @@ yy188: yy190: YYDEBUG(190, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1601 "Zend/zend_language_scanner.l" +#line 1592 "Zend/zend_language_scanner.l" { ZVAL_DOUBLE(zendlval, zend_strtod(yytext, NULL)); return T_DNUMBER; } -#line 3218 "Zend/zend_language_scanner.c" +#line 3209 "Zend/zend_language_scanner.c" yy191: YYDEBUG(191, *YYCURSOR); yyaccept = 2; @@ -3306,7 +3297,7 @@ yy200: } YYDEBUG(202, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1523 "Zend/zend_language_scanner.l" +#line 1514 "Zend/zend_language_scanner.l" { char *bin = yytext + 2; /* Skip "0b" */ int len = yyleng - 2; @@ -3329,7 +3320,7 @@ yy200: return T_DNUMBER; } } -#line 3333 "Zend/zend_language_scanner.c" +#line 3324 "Zend/zend_language_scanner.c" yy203: YYDEBUG(203, *YYCURSOR); ++YYCURSOR; @@ -3341,7 +3332,7 @@ yy203: } YYDEBUG(205, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1564 "Zend/zend_language_scanner.l" +#line 1555 "Zend/zend_language_scanner.l" { char *hex = yytext + 2; /* Skip "0x" */ int len = yyleng - 2; @@ -3364,7 +3355,7 @@ yy203: return T_DNUMBER; } } -#line 3368 "Zend/zend_language_scanner.c" +#line 3359 "Zend/zend_language_scanner.c" yy206: YYDEBUG(206, *YYCURSOR); ++YYCURSOR; @@ -3373,12 +3364,12 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1900 "Zend/zend_language_scanner.l" +#line 1891 "Zend/zend_language_scanner.l" { BEGIN(INITIAL); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } -#line 3382 "Zend/zend_language_scanner.c" +#line 3373 "Zend/zend_language_scanner.c" yy208: YYDEBUG(208, *YYCURSOR); yych = *++YYCURSOR; @@ -3412,12 +3403,12 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1805 "Zend/zend_language_scanner.l" +#line 1796 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 3421 "Zend/zend_language_scanner.c" +#line 3412 "Zend/zend_language_scanner.c" yy213: YYDEBUG(213, *YYCURSOR); yych = *++YYCURSOR; @@ -3431,11 +3422,11 @@ yy214: } YYDEBUG(215, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1469 "Zend/zend_language_scanner.l" +#line 1460 "Zend/zend_language_scanner.l" { return T_LOGICAL_XOR; } -#line 3439 "Zend/zend_language_scanner.c" +#line 3430 "Zend/zend_language_scanner.c" yy216: YYDEBUG(216, *YYCURSOR); ++YYCURSOR; @@ -3444,61 +3435,61 @@ yy216: } YYDEBUG(217, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1461 "Zend/zend_language_scanner.l" +#line 1452 "Zend/zend_language_scanner.l" { return T_LOGICAL_OR; } -#line 3452 "Zend/zend_language_scanner.c" +#line 3443 "Zend/zend_language_scanner.c" yy218: YYDEBUG(218, *YYCURSOR); ++YYCURSOR; YYDEBUG(219, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1449 "Zend/zend_language_scanner.l" +#line 1440 "Zend/zend_language_scanner.l" { return T_XOR_EQUAL; } -#line 3462 "Zend/zend_language_scanner.c" +#line 3453 "Zend/zend_language_scanner.c" yy220: YYDEBUG(220, *YYCURSOR); ++YYCURSOR; YYDEBUG(221, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1453 "Zend/zend_language_scanner.l" +#line 1444 "Zend/zend_language_scanner.l" { return T_BOOLEAN_OR; } -#line 3472 "Zend/zend_language_scanner.c" +#line 3463 "Zend/zend_language_scanner.c" yy222: YYDEBUG(222, *YYCURSOR); ++YYCURSOR; YYDEBUG(223, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1445 "Zend/zend_language_scanner.l" +#line 1436 "Zend/zend_language_scanner.l" { return T_OR_EQUAL; } -#line 3482 "Zend/zend_language_scanner.c" +#line 3473 "Zend/zend_language_scanner.c" yy224: YYDEBUG(224, *YYCURSOR); ++YYCURSOR; YYDEBUG(225, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1457 "Zend/zend_language_scanner.l" +#line 1448 "Zend/zend_language_scanner.l" { return T_BOOLEAN_AND; } -#line 3492 "Zend/zend_language_scanner.c" +#line 3483 "Zend/zend_language_scanner.c" yy226: YYDEBUG(226, *YYCURSOR); ++YYCURSOR; YYDEBUG(227, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1441 "Zend/zend_language_scanner.l" +#line 1432 "Zend/zend_language_scanner.l" { return T_AND_EQUAL; } -#line 3502 "Zend/zend_language_scanner.c" +#line 3493 "Zend/zend_language_scanner.c" yy228: YYDEBUG(228, *YYCURSOR); ++YYCURSOR; @@ -3507,7 +3498,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1906 "Zend/zend_language_scanner.l" +#line 1897 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3517,17 +3508,17 @@ yy229: return yytext[0]; } } -#line 3521 "Zend/zend_language_scanner.c" +#line 3512 "Zend/zend_language_scanner.c" yy230: YYDEBUG(230, *YYCURSOR); ++YYCURSOR; YYDEBUG(231, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1429 "Zend/zend_language_scanner.l" +#line 1420 "Zend/zend_language_scanner.l" { return T_MOD_EQUAL; } -#line 3531 "Zend/zend_language_scanner.c" +#line 3522 "Zend/zend_language_scanner.c" yy232: YYDEBUG(232, *YYCURSOR); yych = *++YYCURSOR; @@ -3545,7 +3536,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1867 "Zend/zend_language_scanner.l" +#line 1858 "Zend/zend_language_scanner.l" { int doc_com; @@ -3578,7 +3569,7 @@ yy235: return T_COMMENT; } -#line 3582 "Zend/zend_language_scanner.c" +#line 3573 "Zend/zend_language_scanner.c" yy236: YYDEBUG(236, *YYCURSOR); yych = *++YYCURSOR; @@ -3588,11 +3579,11 @@ yy237: ++YYCURSOR; YYDEBUG(238, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1421 "Zend/zend_language_scanner.l" +#line 1412 "Zend/zend_language_scanner.l" { return T_DIV_EQUAL; } -#line 3596 "Zend/zend_language_scanner.c" +#line 3587 "Zend/zend_language_scanner.c" yy239: YYDEBUG(239, *YYCURSOR); yych = *++YYCURSOR; @@ -3616,62 +3607,62 @@ yy242: if ((yych = *YYCURSOR) == '=') goto yy246; YYDEBUG(243, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1413 "Zend/zend_language_scanner.l" +#line 1404 "Zend/zend_language_scanner.l" { return T_POW; } -#line 3624 "Zend/zend_language_scanner.c" +#line 3615 "Zend/zend_language_scanner.c" yy244: YYDEBUG(244, *YYCURSOR); ++YYCURSOR; YYDEBUG(245, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1409 "Zend/zend_language_scanner.l" +#line 1400 "Zend/zend_language_scanner.l" { return T_MUL_EQUAL; } -#line 3634 "Zend/zend_language_scanner.c" +#line 3625 "Zend/zend_language_scanner.c" yy246: YYDEBUG(246, *YYCURSOR); ++YYCURSOR; YYDEBUG(247, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1417 "Zend/zend_language_scanner.l" +#line 1408 "Zend/zend_language_scanner.l" { return T_POW_EQUAL; } -#line 3644 "Zend/zend_language_scanner.c" +#line 3635 "Zend/zend_language_scanner.c" yy248: YYDEBUG(248, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy252; YYDEBUG(249, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1477 "Zend/zend_language_scanner.l" +#line 1468 "Zend/zend_language_scanner.l" { return T_SR; } -#line 3655 "Zend/zend_language_scanner.c" +#line 3646 "Zend/zend_language_scanner.c" yy250: YYDEBUG(250, *YYCURSOR); ++YYCURSOR; YYDEBUG(251, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1397 "Zend/zend_language_scanner.l" +#line 1388 "Zend/zend_language_scanner.l" { return T_IS_GREATER_OR_EQUAL; } -#line 3665 "Zend/zend_language_scanner.c" +#line 3656 "Zend/zend_language_scanner.c" yy252: YYDEBUG(252, *YYCURSOR); ++YYCURSOR; YYDEBUG(253, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1437 "Zend/zend_language_scanner.l" +#line 1428 "Zend/zend_language_scanner.l" { return T_SR_EQUAL; } -#line 3675 "Zend/zend_language_scanner.c" +#line 3666 "Zend/zend_language_scanner.c" yy254: YYDEBUG(254, *YYCURSOR); yyaccept = 5; @@ -3682,11 +3673,11 @@ yy254: yy255: YYDEBUG(255, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1473 "Zend/zend_language_scanner.l" +#line 1464 "Zend/zend_language_scanner.l" { return T_SL; } -#line 3690 "Zend/zend_language_scanner.c" +#line 3681 "Zend/zend_language_scanner.c" yy256: YYDEBUG(256, *YYCURSOR); yych = *++YYCURSOR; @@ -3698,22 +3689,22 @@ yy257: ++YYCURSOR; YYDEBUG(258, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1393 "Zend/zend_language_scanner.l" +#line 1384 "Zend/zend_language_scanner.l" { return T_IS_SMALLER_OR_EQUAL; } -#line 3706 "Zend/zend_language_scanner.c" +#line 3697 "Zend/zend_language_scanner.c" yy259: YYDEBUG(259, *YYCURSOR); ++YYCURSOR; yy260: YYDEBUG(260, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1389 "Zend/zend_language_scanner.l" +#line 1380 "Zend/zend_language_scanner.l" { return T_IS_NOT_EQUAL; } -#line 3717 "Zend/zend_language_scanner.c" +#line 3708 "Zend/zend_language_scanner.c" yy261: YYDEBUG(261, *YYCURSOR); yych = *++YYCURSOR; @@ -3764,11 +3755,11 @@ yy268: ++YYCURSOR; YYDEBUG(269, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1433 "Zend/zend_language_scanner.l" +#line 1424 "Zend/zend_language_scanner.l" { return T_SL_EQUAL; } -#line 3772 "Zend/zend_language_scanner.c" +#line 3763 "Zend/zend_language_scanner.c" yy270: YYDEBUG(270, *YYCURSOR); ++YYCURSOR; @@ -3873,7 +3864,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2028 "Zend/zend_language_scanner.l" +#line 2019 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -3920,7 +3911,7 @@ yy280: return T_START_HEREDOC; } -#line 3924 "Zend/zend_language_scanner.c" +#line 3915 "Zend/zend_language_scanner.c" yy281: YYDEBUG(281, *YYCURSOR); yych = *++YYCURSOR; @@ -3960,31 +3951,31 @@ yy284: ++YYCURSOR; YYDEBUG(286, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1381 "Zend/zend_language_scanner.l" +#line 1372 "Zend/zend_language_scanner.l" { return T_IS_NOT_IDENTICAL; } -#line 3968 "Zend/zend_language_scanner.c" +#line 3959 "Zend/zend_language_scanner.c" yy287: YYDEBUG(287, *YYCURSOR); ++YYCURSOR; YYDEBUG(288, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1401 "Zend/zend_language_scanner.l" +#line 1392 "Zend/zend_language_scanner.l" { return T_PLUS_EQUAL; } -#line 3978 "Zend/zend_language_scanner.c" +#line 3969 "Zend/zend_language_scanner.c" yy289: YYDEBUG(289, *YYCURSOR); ++YYCURSOR; YYDEBUG(290, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1369 "Zend/zend_language_scanner.l" +#line 1360 "Zend/zend_language_scanner.l" { return T_INC; } -#line 3988 "Zend/zend_language_scanner.c" +#line 3979 "Zend/zend_language_scanner.c" yy291: YYDEBUG(291, *YYCURSOR); yych = *++YYCURSOR; @@ -4003,42 +3994,42 @@ yy293: } YYDEBUG(294, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1357 "Zend/zend_language_scanner.l" +#line 1348 "Zend/zend_language_scanner.l" { return T_LIST; } -#line 4011 "Zend/zend_language_scanner.c" +#line 4002 "Zend/zend_language_scanner.c" yy295: YYDEBUG(295, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy299; YYDEBUG(296, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1385 "Zend/zend_language_scanner.l" +#line 1376 "Zend/zend_language_scanner.l" { return T_IS_EQUAL; } -#line 4022 "Zend/zend_language_scanner.c" +#line 4013 "Zend/zend_language_scanner.c" yy297: YYDEBUG(297, *YYCURSOR); ++YYCURSOR; YYDEBUG(298, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1353 "Zend/zend_language_scanner.l" +#line 1344 "Zend/zend_language_scanner.l" { return T_DOUBLE_ARROW; } -#line 4032 "Zend/zend_language_scanner.c" +#line 4023 "Zend/zend_language_scanner.c" yy299: YYDEBUG(299, *YYCURSOR); ++YYCURSOR; YYDEBUG(300, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1377 "Zend/zend_language_scanner.l" +#line 1368 "Zend/zend_language_scanner.l" { return T_IS_IDENTICAL; } -#line 4042 "Zend/zend_language_scanner.c" +#line 4033 "Zend/zend_language_scanner.c" yy301: YYDEBUG(301, *YYCURSOR); yych = *++YYCURSOR; @@ -4168,11 +4159,11 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1663 "Zend/zend_language_scanner.l" +#line 1654 "Zend/zend_language_scanner.l" { return T_NS_C; } -#line 4176 "Zend/zend_language_scanner.c" +#line 4167 "Zend/zend_language_scanner.c" yy321: YYDEBUG(321, *YYCURSOR); yych = *++YYCURSOR; @@ -4192,7 +4183,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1638 "Zend/zend_language_scanner.l" +#line 1629 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4217,7 +4208,7 @@ yy322: ZVAL_STR(zendlval, dirname); return T_DIR; } -#line 4221 "Zend/zend_language_scanner.c" +#line 4212 "Zend/zend_language_scanner.c" yy326: YYDEBUG(326, *YYCURSOR); yych = *++YYCURSOR; @@ -4242,12 +4233,12 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1622 "Zend/zend_language_scanner.l" +#line 1613 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; } -#line 4251 "Zend/zend_language_scanner.c" +#line 4242 "Zend/zend_language_scanner.c" yy332: YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; @@ -4282,11 +4273,11 @@ yy336: } YYDEBUG(339, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1618 "Zend/zend_language_scanner.l" +#line 1609 "Zend/zend_language_scanner.l" { return T_METHOD_C; } -#line 4290 "Zend/zend_language_scanner.c" +#line 4281 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; @@ -4337,11 +4328,11 @@ yy347: } YYDEBUG(350, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1614 "Zend/zend_language_scanner.l" +#line 1605 "Zend/zend_language_scanner.l" { return T_FUNC_C; } -#line 4345 "Zend/zend_language_scanner.c" +#line 4336 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4361,7 +4352,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1627 "Zend/zend_language_scanner.l" +#line 1618 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4372,7 +4363,7 @@ yy352: } return T_FILE; } -#line 4376 "Zend/zend_language_scanner.c" +#line 4367 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4402,11 +4393,11 @@ yy359: } YYDEBUG(362, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1610 "Zend/zend_language_scanner.l" +#line 1601 "Zend/zend_language_scanner.l" { return T_TRAIT_C; } -#line 4410 "Zend/zend_language_scanner.c" +#line 4401 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4436,11 +4427,11 @@ yy366: } YYDEBUG(369, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1606 "Zend/zend_language_scanner.l" +#line 1597 "Zend/zend_language_scanner.l" { return T_CLASS_C; } -#line 4444 "Zend/zend_language_scanner.c" +#line 4435 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4502,11 +4493,11 @@ yy381: } YYDEBUG(382, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1321 "Zend/zend_language_scanner.l" +#line 1312 "Zend/zend_language_scanner.l" { return T_HALT_COMPILER; } -#line 4510 "Zend/zend_language_scanner.c" +#line 4501 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4526,11 +4517,11 @@ yy385: } YYDEBUG(386, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1301 "Zend/zend_language_scanner.l" +#line 1292 "Zend/zend_language_scanner.l" { return T_USE; } -#line 4534 "Zend/zend_language_scanner.c" +#line 4525 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4549,11 +4540,11 @@ yy389: } YYDEBUG(390, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1349 "Zend/zend_language_scanner.l" +#line 1340 "Zend/zend_language_scanner.l" { return T_UNSET; } -#line 4557 "Zend/zend_language_scanner.c" +#line 4548 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4725,11 +4716,11 @@ yy406: ++YYCURSOR; YYDEBUG(408, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1249 "Zend/zend_language_scanner.l" +#line 1240 "Zend/zend_language_scanner.l" { return T_INT_CAST; } -#line 4733 "Zend/zend_language_scanner.c" +#line 4724 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4773,11 +4764,11 @@ yy414: ++YYCURSOR; YYDEBUG(417, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1253 "Zend/zend_language_scanner.l" +#line 1244 "Zend/zend_language_scanner.l" { return T_DOUBLE_CAST; } -#line 4781 "Zend/zend_language_scanner.c" +#line 4772 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4847,11 +4838,11 @@ yy428: ++YYCURSOR; YYDEBUG(431, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1257 "Zend/zend_language_scanner.l" +#line 1248 "Zend/zend_language_scanner.l" { return T_STRING_CAST; } -#line 4855 "Zend/zend_language_scanner.c" +#line 4846 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4884,11 +4875,11 @@ yy435: ++YYCURSOR; YYDEBUG(438, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1261 "Zend/zend_language_scanner.l" +#line 1252 "Zend/zend_language_scanner.l" { return T_ARRAY_CAST; } -#line 4892 "Zend/zend_language_scanner.c" +#line 4883 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4926,11 +4917,11 @@ yy443: ++YYCURSOR; YYDEBUG(446, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1265 "Zend/zend_language_scanner.l" +#line 1256 "Zend/zend_language_scanner.l" { return T_OBJECT_CAST; } -#line 4934 "Zend/zend_language_scanner.c" +#line 4925 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -4971,11 +4962,11 @@ yy452: ++YYCURSOR; YYDEBUG(454, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1269 "Zend/zend_language_scanner.l" +#line 1260 "Zend/zend_language_scanner.l" { return T_BOOL_CAST; } -#line 4979 "Zend/zend_language_scanner.c" +#line 4970 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5035,11 +5026,11 @@ yy463: ++YYCURSOR; YYDEBUG(466, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1273 "Zend/zend_language_scanner.l" +#line 1264 "Zend/zend_language_scanner.l" { return T_UNSET_CAST; } -#line 5043 "Zend/zend_language_scanner.c" +#line 5034 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5053,11 +5044,11 @@ yy468: } YYDEBUG(469, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1245 "Zend/zend_language_scanner.l" +#line 1236 "Zend/zend_language_scanner.l" { return T_VAR; } -#line 5061 "Zend/zend_language_scanner.c" +#line 5052 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5077,11 +5068,11 @@ yy472: } YYDEBUG(473, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1237 "Zend/zend_language_scanner.l" +#line 1228 "Zend/zend_language_scanner.l" { return T_NEW; } -#line 5085 "Zend/zend_language_scanner.c" +#line 5076 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5120,11 +5111,11 @@ yy480: } YYDEBUG(481, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1297 "Zend/zend_language_scanner.l" +#line 1288 "Zend/zend_language_scanner.l" { return T_NAMESPACE; } -#line 5128 "Zend/zend_language_scanner.c" +#line 5119 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5146,11 +5137,11 @@ yy484: ++YYCURSOR; YYDEBUG(485, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1425 "Zend/zend_language_scanner.l" +#line 1416 "Zend/zend_language_scanner.l" { return T_CONCAT_EQUAL; } -#line 5154 "Zend/zend_language_scanner.c" +#line 5145 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5159,21 +5150,21 @@ yy486: ++YYCURSOR; YYDEBUG(488, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1233 "Zend/zend_language_scanner.l" +#line 1224 "Zend/zend_language_scanner.l" { return T_ELLIPSIS; } -#line 5167 "Zend/zend_language_scanner.c" +#line 5158 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; YYDEBUG(490, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1225 "Zend/zend_language_scanner.l" +#line 1216 "Zend/zend_language_scanner.l" { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5177 "Zend/zend_language_scanner.c" +#line 5168 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5195,32 +5186,32 @@ yy493: ++YYCURSOR; YYDEBUG(494, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1405 "Zend/zend_language_scanner.l" +#line 1396 "Zend/zend_language_scanner.l" { return T_MINUS_EQUAL; } -#line 5203 "Zend/zend_language_scanner.c" +#line 5194 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; YYDEBUG(496, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1373 "Zend/zend_language_scanner.l" +#line 1364 "Zend/zend_language_scanner.l" { return T_DEC; } -#line 5213 "Zend/zend_language_scanner.c" +#line 5204 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; YYDEBUG(498, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1199 "Zend/zend_language_scanner.l" +#line 1190 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5224 "Zend/zend_language_scanner.c" +#line 5215 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5265,11 +5256,11 @@ yy504: } YYDEBUG(505, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1345 "Zend/zend_language_scanner.l" +#line 1336 "Zend/zend_language_scanner.l" { return T_PUBLIC; } -#line 5273 "Zend/zend_language_scanner.c" +#line 5264 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5324,11 +5315,11 @@ yy513: } YYDEBUG(514, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1341 "Zend/zend_language_scanner.l" +#line 1332 "Zend/zend_language_scanner.l" { return T_PROTECTED; } -#line 5332 "Zend/zend_language_scanner.c" +#line 5323 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5358,11 +5349,11 @@ yy519: } YYDEBUG(520, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1337 "Zend/zend_language_scanner.l" +#line 1328 "Zend/zend_language_scanner.l" { return T_PRIVATE; } -#line 5366 "Zend/zend_language_scanner.c" +#line 5357 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5371,11 +5362,11 @@ yy521: } YYDEBUG(522, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1175 "Zend/zend_language_scanner.l" +#line 1166 "Zend/zend_language_scanner.l" { return T_PRINT; } -#line 5379 "Zend/zend_language_scanner.c" +#line 5370 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5400,11 +5391,11 @@ yy526: } YYDEBUG(527, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1167 "Zend/zend_language_scanner.l" +#line 1158 "Zend/zend_language_scanner.l" { return T_GOTO; } -#line 5408 "Zend/zend_language_scanner.c" +#line 5399 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5428,11 +5419,11 @@ yy531: } YYDEBUG(532, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1309 "Zend/zend_language_scanner.l" +#line 1300 "Zend/zend_language_scanner.l" { return T_GLOBAL; } -#line 5436 "Zend/zend_language_scanner.c" +#line 5427 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5469,11 +5460,11 @@ yy539: } YYDEBUG(540, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1159 "Zend/zend_language_scanner.l" +#line 1150 "Zend/zend_language_scanner.l" { return T_BREAK; } -#line 5477 "Zend/zend_language_scanner.c" +#line 5468 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5513,11 +5504,11 @@ yy547: } YYDEBUG(548, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1143 "Zend/zend_language_scanner.l" +#line 1134 "Zend/zend_language_scanner.l" { return T_SWITCH; } -#line 5521 "Zend/zend_language_scanner.c" +#line 5512 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5541,11 +5532,11 @@ yy552: } YYDEBUG(553, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1325 "Zend/zend_language_scanner.l" +#line 1316 "Zend/zend_language_scanner.l" { return T_STATIC; } -#line 5549 "Zend/zend_language_scanner.c" +#line 5540 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5572,11 +5563,11 @@ yy557: } YYDEBUG(558, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1139 "Zend/zend_language_scanner.l" +#line 1130 "Zend/zend_language_scanner.l" { return T_AS; } -#line 5580 "Zend/zend_language_scanner.c" +#line 5571 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5595,11 +5586,11 @@ yy561: } YYDEBUG(562, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1361 "Zend/zend_language_scanner.l" +#line 1352 "Zend/zend_language_scanner.l" { return T_ARRAY; } -#line 5603 "Zend/zend_language_scanner.c" +#line 5594 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5608,11 +5599,11 @@ yy563: } YYDEBUG(564, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1465 "Zend/zend_language_scanner.l" +#line 1456 "Zend/zend_language_scanner.l" { return T_LOGICAL_AND; } -#line 5616 "Zend/zend_language_scanner.c" +#line 5607 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5646,11 +5637,11 @@ yy570: } YYDEBUG(571, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1329 "Zend/zend_language_scanner.l" +#line 1320 "Zend/zend_language_scanner.l" { return T_ABSTRACT; } -#line 5654 "Zend/zend_language_scanner.c" +#line 5645 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5674,11 +5665,11 @@ yy575: } YYDEBUG(576, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1099 "Zend/zend_language_scanner.l" +#line 1090 "Zend/zend_language_scanner.l" { return T_WHILE; } -#line 5682 "Zend/zend_language_scanner.c" +#line 5673 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5687,11 +5678,11 @@ yy577: } YYDEBUG(578, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1083 "Zend/zend_language_scanner.l" +#line 1074 "Zend/zend_language_scanner.l" { return T_IF; } -#line 5695 "Zend/zend_language_scanner.c" +#line 5686 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5743,11 +5734,11 @@ yy584: } YYDEBUG(585, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1313 "Zend/zend_language_scanner.l" +#line 1304 "Zend/zend_language_scanner.l" { return T_ISSET; } -#line 5751 "Zend/zend_language_scanner.c" +#line 5742 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5801,11 +5792,11 @@ yy592: yy593: YYDEBUG(593, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1281 "Zend/zend_language_scanner.l" +#line 1272 "Zend/zend_language_scanner.l" { return T_INCLUDE; } -#line 5809 "Zend/zend_language_scanner.c" +#line 5800 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5834,11 +5825,11 @@ yy598: } YYDEBUG(599, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1285 "Zend/zend_language_scanner.l" +#line 1276 "Zend/zend_language_scanner.l" { return T_INCLUDE_ONCE; } -#line 5842 "Zend/zend_language_scanner.c" +#line 5833 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5872,11 +5863,11 @@ yy605: } YYDEBUG(606, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1183 "Zend/zend_language_scanner.l" +#line 1174 "Zend/zend_language_scanner.l" { return T_INTERFACE; } -#line 5880 "Zend/zend_language_scanner.c" +#line 5871 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5926,11 +5917,11 @@ yy613: } YYDEBUG(614, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1305 "Zend/zend_language_scanner.l" +#line 1296 "Zend/zend_language_scanner.l" { return T_INSTEADOF; } -#line 5934 "Zend/zend_language_scanner.c" +#line 5925 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -5959,11 +5950,11 @@ yy619: } YYDEBUG(620, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1135 "Zend/zend_language_scanner.l" +#line 1126 "Zend/zend_language_scanner.l" { return T_INSTANCEOF; } -#line 5967 "Zend/zend_language_scanner.c" +#line 5958 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6007,11 +5998,11 @@ yy628: } YYDEBUG(629, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1195 "Zend/zend_language_scanner.l" +#line 1186 "Zend/zend_language_scanner.l" { return T_IMPLEMENTS; } -#line 6015 "Zend/zend_language_scanner.c" +#line 6006 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6039,11 +6030,11 @@ yy631: } YYDEBUG(633, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1067 "Zend/zend_language_scanner.l" +#line 1058 "Zend/zend_language_scanner.l" { return T_TRY; } -#line 6047 "Zend/zend_language_scanner.c" +#line 6038 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6062,11 +6053,11 @@ yy636: } YYDEBUG(637, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1187 "Zend/zend_language_scanner.l" +#line 1178 "Zend/zend_language_scanner.l" { return T_TRAIT; } -#line 6070 "Zend/zend_language_scanner.c" +#line 6061 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6085,11 +6076,11 @@ yy640: } YYDEBUG(641, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1079 "Zend/zend_language_scanner.l" +#line 1070 "Zend/zend_language_scanner.l" { return T_THROW; } -#line 6093 "Zend/zend_language_scanner.c" +#line 6084 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6113,11 +6104,11 @@ yy645: } YYDEBUG(646, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1063 "Zend/zend_language_scanner.l" +#line 1054 "Zend/zend_language_scanner.l" { return T_YIELD; } -#line 6121 "Zend/zend_language_scanner.c" +#line 6112 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6178,11 +6169,11 @@ yy653: yy654: YYDEBUG(654, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1289 "Zend/zend_language_scanner.l" +#line 1280 "Zend/zend_language_scanner.l" { return T_REQUIRE; } -#line 6186 "Zend/zend_language_scanner.c" +#line 6177 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6211,11 +6202,11 @@ yy659: } YYDEBUG(660, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1293 "Zend/zend_language_scanner.l" +#line 1284 "Zend/zend_language_scanner.l" { return T_REQUIRE_ONCE; } -#line 6219 "Zend/zend_language_scanner.c" +#line 6210 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6234,11 +6225,11 @@ yy663: } YYDEBUG(664, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1059 "Zend/zend_language_scanner.l" +#line 1050 "Zend/zend_language_scanner.l" { return T_RETURN; } -#line 6242 "Zend/zend_language_scanner.c" +#line 6233 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6328,11 +6319,11 @@ yy674: } YYDEBUG(675, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1163 "Zend/zend_language_scanner.l" +#line 1154 "Zend/zend_language_scanner.l" { return T_CONTINUE; } -#line 6336 "Zend/zend_language_scanner.c" +#line 6327 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6341,11 +6332,11 @@ yy676: } YYDEBUG(677, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1055 "Zend/zend_language_scanner.l" +#line 1046 "Zend/zend_language_scanner.l" { return T_CONST; } -#line 6349 "Zend/zend_language_scanner.c" +#line 6340 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6370,11 +6361,11 @@ yy681: } YYDEBUG(682, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1241 "Zend/zend_language_scanner.l" +#line 1232 "Zend/zend_language_scanner.l" { return T_CLONE; } -#line 6378 "Zend/zend_language_scanner.c" +#line 6369 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6388,11 +6379,11 @@ yy684: } YYDEBUG(685, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1179 "Zend/zend_language_scanner.l" +#line 1170 "Zend/zend_language_scanner.l" { return T_CLASS; } -#line 6396 "Zend/zend_language_scanner.c" +#line 6387 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6438,11 +6429,11 @@ yy693: } YYDEBUG(694, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1365 "Zend/zend_language_scanner.l" +#line 1356 "Zend/zend_language_scanner.l" { return T_CALLABLE; } -#line 6446 "Zend/zend_language_scanner.c" +#line 6437 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6451,11 +6442,11 @@ yy695: } YYDEBUG(696, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1151 "Zend/zend_language_scanner.l" +#line 1142 "Zend/zend_language_scanner.l" { return T_CASE; } -#line 6459 "Zend/zend_language_scanner.c" +#line 6450 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6469,11 +6460,11 @@ yy698: } YYDEBUG(699, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1071 "Zend/zend_language_scanner.l" +#line 1062 "Zend/zend_language_scanner.l" { return T_CATCH; } -#line 6477 "Zend/zend_language_scanner.c" +#line 6468 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6524,11 +6515,11 @@ yy708: } YYDEBUG(709, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1051 "Zend/zend_language_scanner.l" +#line 1042 "Zend/zend_language_scanner.l" { return T_FUNCTION; } -#line 6532 "Zend/zend_language_scanner.c" +#line 6523 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6552,11 +6543,11 @@ yy710: yy711: YYDEBUG(711, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1111 "Zend/zend_language_scanner.l" +#line 1102 "Zend/zend_language_scanner.l" { return T_FOR; } -#line 6560 "Zend/zend_language_scanner.c" +#line 6551 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6580,11 +6571,11 @@ yy715: } YYDEBUG(716, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1119 "Zend/zend_language_scanner.l" +#line 1110 "Zend/zend_language_scanner.l" { return T_FOREACH; } -#line 6588 "Zend/zend_language_scanner.c" +#line 6579 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6618,11 +6609,11 @@ yy719: yy720: YYDEBUG(720, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1333 "Zend/zend_language_scanner.l" +#line 1324 "Zend/zend_language_scanner.l" { return T_FINAL; } -#line 6626 "Zend/zend_language_scanner.c" +#line 6617 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6636,11 +6627,11 @@ yy722: } YYDEBUG(723, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1075 "Zend/zend_language_scanner.l" +#line 1066 "Zend/zend_language_scanner.l" { return T_FINALLY; } -#line 6644 "Zend/zend_language_scanner.c" +#line 6635 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6671,11 +6662,11 @@ yy726: } YYDEBUG(727, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1107 "Zend/zend_language_scanner.l" +#line 1098 "Zend/zend_language_scanner.l" { return T_DO; } -#line 6679 "Zend/zend_language_scanner.c" +#line 6670 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6684,11 +6675,11 @@ yy728: } YYDEBUG(729, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1047 "Zend/zend_language_scanner.l" +#line 1038 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6692 "Zend/zend_language_scanner.c" +#line 6683 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6723,11 +6714,11 @@ yy735: } YYDEBUG(736, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1155 "Zend/zend_language_scanner.l" +#line 1146 "Zend/zend_language_scanner.l" { return T_DEFAULT; } -#line 6731 "Zend/zend_language_scanner.c" +#line 6722 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6751,11 +6742,11 @@ yy740: } YYDEBUG(741, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1127 "Zend/zend_language_scanner.l" +#line 1118 "Zend/zend_language_scanner.l" { return T_DECLARE; } -#line 6759 "Zend/zend_language_scanner.c" +#line 6750 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6835,11 +6826,11 @@ yy753: } YYDEBUG(754, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1191 "Zend/zend_language_scanner.l" +#line 1182 "Zend/zend_language_scanner.l" { return T_EXTENDS; } -#line 6843 "Zend/zend_language_scanner.c" +#line 6834 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6848,11 +6839,11 @@ yy755: } YYDEBUG(756, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1043 "Zend/zend_language_scanner.l" +#line 1034 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6856 "Zend/zend_language_scanner.c" +#line 6847 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6866,11 +6857,11 @@ yy758: } YYDEBUG(759, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1277 "Zend/zend_language_scanner.l" +#line 1268 "Zend/zend_language_scanner.l" { return T_EVAL; } -#line 6874 "Zend/zend_language_scanner.c" +#line 6865 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6940,11 +6931,11 @@ yy769: } YYDEBUG(770, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1103 "Zend/zend_language_scanner.l" +#line 1094 "Zend/zend_language_scanner.l" { return T_ENDWHILE; } -#line 6948 "Zend/zend_language_scanner.c" +#line 6939 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -6973,11 +6964,11 @@ yy775: } YYDEBUG(776, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1147 "Zend/zend_language_scanner.l" +#line 1138 "Zend/zend_language_scanner.l" { return T_ENDSWITCH; } -#line 6981 "Zend/zend_language_scanner.c" +#line 6972 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -6986,11 +6977,11 @@ yy777: } YYDEBUG(778, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1091 "Zend/zend_language_scanner.l" +#line 1082 "Zend/zend_language_scanner.l" { return T_ENDIF; } -#line 6994 "Zend/zend_language_scanner.c" +#line 6985 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7019,11 +7010,11 @@ yy780: yy781: YYDEBUG(781, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1115 "Zend/zend_language_scanner.l" +#line 1106 "Zend/zend_language_scanner.l" { return T_ENDFOR; } -#line 7027 "Zend/zend_language_scanner.c" +#line 7018 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7047,11 +7038,11 @@ yy785: } YYDEBUG(786, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1123 "Zend/zend_language_scanner.l" +#line 1114 "Zend/zend_language_scanner.l" { return T_ENDFOREACH; } -#line 7055 "Zend/zend_language_scanner.c" +#line 7046 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7085,11 +7076,11 @@ yy792: } YYDEBUG(793, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1131 "Zend/zend_language_scanner.l" +#line 1122 "Zend/zend_language_scanner.l" { return T_ENDDECLARE; } -#line 7093 "Zend/zend_language_scanner.c" +#line 7084 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7108,11 +7099,11 @@ yy796: } YYDEBUG(797, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1317 "Zend/zend_language_scanner.l" +#line 1308 "Zend/zend_language_scanner.l" { return T_EMPTY; } -#line 7116 "Zend/zend_language_scanner.c" +#line 7107 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7141,11 +7132,11 @@ yy799: yy800: YYDEBUG(800, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1095 "Zend/zend_language_scanner.l" +#line 1086 "Zend/zend_language_scanner.l" { return T_ELSE; } -#line 7149 "Zend/zend_language_scanner.c" +#line 7140 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7159,11 +7150,11 @@ yy802: } YYDEBUG(803, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1087 "Zend/zend_language_scanner.l" +#line 1078 "Zend/zend_language_scanner.l" { return T_ELSEIF; } -#line 7167 "Zend/zend_language_scanner.c" +#line 7158 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7177,11 +7168,11 @@ yy805: } YYDEBUG(806, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1171 "Zend/zend_language_scanner.l" +#line 1162 "Zend/zend_language_scanner.l" { return T_ECHO; } -#line 7185 "Zend/zend_language_scanner.c" +#line 7176 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7254,12 +7245,12 @@ yy809: yy810: YYDEBUG(810, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1204 "Zend/zend_language_scanner.l" +#line 1195 "Zend/zend_language_scanner.l" { HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7263 "Zend/zend_language_scanner.c" +#line 7254 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7267,13 +7258,13 @@ yy811: yy812: YYDEBUG(812, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1219 "Zend/zend_language_scanner.l" +#line 1210 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); goto restart; } -#line 7277 "Zend/zend_language_scanner.c" +#line 7268 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7282,13 +7273,13 @@ yy813: yy814: YYDEBUG(814, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1213 "Zend/zend_language_scanner.l" +#line 1204 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7292 "Zend/zend_language_scanner.c" +#line 7283 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7309,11 +7300,11 @@ yy818: ++YYCURSOR; YYDEBUG(819, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1209 "Zend/zend_language_scanner.l" +#line 1200 "Zend/zend_language_scanner.l" { return T_OBJECT_OPERATOR; } -#line 7317 "Zend/zend_language_scanner.c" +#line 7308 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7398,14 +7389,14 @@ yy824: yy825: YYDEBUG(825, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1516 "Zend/zend_language_scanner.l" +#line 1507 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7409 "Zend/zend_language_scanner.c" +#line 7400 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7430,7 +7421,7 @@ yy830: ++YYCURSOR; YYDEBUG(831, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1507 "Zend/zend_language_scanner.l" +#line 1498 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); zend_copy_value(zendlval, yytext, yyleng); @@ -7438,7 +7429,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7442 "Zend/zend_language_scanner.c" +#line 7433 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7449,7 +7440,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2281 "Zend/zend_language_scanner.l" +#line 2272 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7505,7 +7496,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7509 "Zend/zend_language_scanner.c" +#line 7500 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7612,7 +7603,7 @@ yy838: yy839: YYDEBUG(839, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1587 "Zend/zend_language_scanner.l" +#line 1578 "Zend/zend_language_scanner.l" { /* Offset could be treated as a long */ if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) { ZVAL_LONG(zendlval, strtol(yytext, NULL, 10)); @@ -7621,7 +7612,7 @@ yy839: } return T_NUM_STRING; } -#line 7625 "Zend/zend_language_scanner.c" +#line 7616 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7641,23 +7632,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1815 "Zend/zend_language_scanner.l" +#line 1806 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7650 "Zend/zend_language_scanner.c" +#line 7641 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1810 "Zend/zend_language_scanner.l" +#line 1801 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7661 "Zend/zend_language_scanner.c" +#line 7652 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7667,14 +7658,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1820 "Zend/zend_language_scanner.l" +#line 1811 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7678 "Zend/zend_language_scanner.c" +#line 7669 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7683,18 +7674,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1827 "Zend/zend_language_scanner.l" +#line 1818 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7692 "Zend/zend_language_scanner.c" +#line 7683 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2338 "Zend/zend_language_scanner.l" +#line 2329 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7703,7 +7694,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7707 "Zend/zend_language_scanner.c" +#line 7698 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7739,12 +7730,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1805 "Zend/zend_language_scanner.l" +#line 1796 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7748 "Zend/zend_language_scanner.c" +#line 7739 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7784,12 +7775,12 @@ yy862: yy864: YYDEBUG(864, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1596 "Zend/zend_language_scanner.l" +#line 1587 "Zend/zend_language_scanner.l" { /* Offset must be treated as a string */ ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7793 "Zend/zend_language_scanner.c" +#line 7784 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7812,6 +7803,6 @@ yy867: goto yy864; } } -#line 2347 "Zend/zend_language_scanner.l" +#line 2338 "Zend/zend_language_scanner.l" } -- cgit v1.2.1 From c07907121e01ff195266de70b8421af2e6e62f26 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 21:32:48 +0200 Subject: zend_do_return -> zend_emit_final_return --- Zend/zend_ast.h | 6 - Zend/zend_compile.c | 79 +---- Zend/zend_compile.h | 2 +- Zend/zend_language_scanner.c | 709 +++++++++++++++++++++---------------------- Zend/zend_language_scanner.l | 9 +- 5 files changed, 375 insertions(+), 430 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 4216a1ac3b..d9e096b82d 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -231,12 +231,6 @@ static inline zend_ast *zend_ast_create_cast(zend_uint type, zend_ast *op0) { } /* Temporary, for porting */ -#define AST_COMPILE_VAR(res, ast, type) do { \ - zend_ast *_ast = (ast); \ - zend_compile_var((res), _ast, type TSRMLS_CC); \ - zend_ast_destroy(_ast); \ -} while (0) - #define AST_ZVAL(znode) zend_ast_create_zval(&(znode)->u.constant) #endif diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2e0d794862..8cfaeb450a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1053,68 +1053,6 @@ static int generate_free_foreach_copy(const zend_op *foreach_copy TSRMLS_DC) /* } /* }}} */ -void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC) /* {{{ */ -{ - zend_op *opline; - int start_op_number, end_op_number; - zend_bool returns_reference = (CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0; - zend_bool is_call = 0; - - /* The error for use of return inside a generator is thrown in pass_two. */ - - if (do_end_vparse) { - is_call = zend_is_call(expr->u.ast); - if (returns_reference && !is_call) { - AST_COMPILE_VAR(expr, expr->u.ast, BP_VAR_REF); - } else { - AST_COMPILE_VAR(expr, expr->u.ast, BP_VAR_R); - } - } - - start_op_number = get_next_op_number(CG(active_op_array)); - -#ifdef ZTS - zend_stack_apply_with_argument(&CG(switch_cond_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element, void *)) generate_free_switch_expr TSRMLS_CC); - zend_stack_apply_with_argument(&CG(foreach_copy_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element, void *)) generate_free_foreach_copy TSRMLS_CC); -#else - zend_stack_apply(&CG(switch_cond_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element)) generate_free_switch_expr); - zend_stack_apply(&CG(foreach_copy_stack), ZEND_STACK_APPLY_TOPDOWN, (int (*)(void *element)) generate_free_foreach_copy); -#endif - - end_op_number = get_next_op_number(CG(active_op_array)); - while (start_op_number < end_op_number) { - CG(active_op_array)->opcodes[start_op_number].extended_value |= EXT_TYPE_FREE_ON_RETURN; - start_op_number++; - } - - if (CG(context).in_finally) { - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_DISCARD_EXCEPTION; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - } - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = returns_reference ? ZEND_RETURN_BY_REF : ZEND_RETURN; - - if (expr) { - SET_NODE(opline->op1, expr); - - if (!do_end_vparse) { - opline->extended_value = ZEND_RETURNS_VALUE; - } else if (is_call) { - opline->extended_value = ZEND_RETURNS_FUNCTION; - } - } else { - opline->op1_type = IS_CONST; - LITERAL_NULL(opline->op1); - } - - SET_UNUSED(opline->op2); -} -/* }}} */ - static zend_uint zend_add_try_element(zend_uint try_op TSRMLS_DC) /* {{{ */ { zend_op_array *op_array = CG(active_op_array); @@ -3645,6 +3583,21 @@ static void zend_update_jump_target_to_next(zend_uint opnum_jump TSRMLS_DC) { zend_update_jump_target(opnum_jump, get_next_op_number(CG(active_op_array)) TSRMLS_CC); } +void zend_emit_final_return(zval *zv TSRMLS_DC) { + znode zn; + zend_bool returns_reference = (CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0; + + zn.op_type = IS_CONST; + if (zv) { + ZVAL_COPY_VALUE(&zn.u.constant, zv); + } else { + ZVAL_NULL(&zn.u.constant); + } + + emit_op(NULL, returns_reference ? ZEND_RETURN_BY_REF : ZEND_RETURN, &zn, NULL TSRMLS_CC); +} + + static zend_bool zend_is_variable(zend_ast *ast) { return ast->kind == ZEND_AST_VAR || ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP || ast->kind == ZEND_AST_STATIC_PROP @@ -5851,7 +5804,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { } zend_do_extended_info(TSRMLS_C); - zend_do_return(NULL, 0 TSRMLS_CC); + zend_emit_final_return(NULL TSRMLS_CC); pass_two(CG(active_op_array) TSRMLS_CC); zend_release_labels(0 TSRMLS_CC); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 790b915e24..2f7b2cca59 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -466,13 +466,13 @@ ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC); void zend_discard_doc_comment(TSRMLS_D); void zend_stop_lexing(TSRMLS_D); +void zend_emit_final_return(zval *zv TSRMLS_DC); /* 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_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC); -void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC); 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_scanner.c b/Zend/zend_language_scanner.c index d6d444bffe..78654194d1 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -561,11 +561,10 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR zend_op_array *retval=NULL; int compiler_result; zend_bool compilation_successful=0; - znode retval_znode; + zval retval_zv; zend_bool original_in_compilation = CG(in_compilation); - retval_znode.op_type = IS_CONST; - ZVAL_LONG(&retval_znode.u.constant, 1); + ZVAL_LONG(&retval_zv, 1); zend_save_lexical_state(&original_lex_state TSRMLS_CC); @@ -594,7 +593,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR zend_ast_destroy(CG(ast)); zend_arena_destroy(CG(ast_arena)); zend_do_end_compilation(TSRMLS_C); - zend_do_return(&retval_znode, 0 TSRMLS_CC); + zend_emit_final_return(&retval_zv TSRMLS_CC); CG(in_compilation) = original_in_compilation; compilation_successful=1; } @@ -776,7 +775,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) zend_ast_destroy(CG(ast)); zend_arena_destroy(CG(ast_arena)); zend_do_end_compilation(TSRMLS_C); - zend_do_return(NULL, 0 TSRMLS_CC); + zend_emit_final_return(NULL TSRMLS_CC); CG(active_op_array) = original_active_op_array; pass_two(op_array TSRMLS_CC); zend_release_labels(0 TSRMLS_CC); @@ -1017,7 +1016,7 @@ restart: yymore_restart: -#line 1021 "Zend/zend_language_scanner.c" +#line 1020 "Zend/zend_language_scanner.c" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -1116,7 +1115,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1715 "Zend/zend_language_scanner.l" +#line 1714 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1177,7 +1176,7 @@ inline_html: HANDLE_NEWLINES(yytext, yyleng); return T_INLINE_HTML; } -#line 1181 "Zend/zend_language_scanner.c" +#line 1180 "Zend/zend_language_scanner.c" yy4: YYDEBUG(4, *YYCURSOR); yych = *++YYCURSOR; @@ -1195,7 +1194,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1706 "Zend/zend_language_scanner.l" +#line 1705 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { BEGIN(ST_IN_SCRIPTING); @@ -1204,14 +1203,14 @@ yy6: goto inline_char_handler; } } -#line 1208 "Zend/zend_language_scanner.c" +#line 1207 "Zend/zend_language_scanner.c" yy7: YYDEBUG(7, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1689 "Zend/zend_language_scanner.l" +#line 1688 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(ST_IN_SCRIPTING); @@ -1220,7 +1219,7 @@ yy7: goto inline_char_handler; } } -#line 1224 "Zend/zend_language_scanner.c" +#line 1223 "Zend/zend_language_scanner.c" yy9: YYDEBUG(9, *YYCURSOR); yych = *++YYCURSOR; @@ -1406,7 +1405,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1658 "Zend/zend_language_scanner.l" +#line 1657 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1420,7 +1419,7 @@ yy35: BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1424 "Zend/zend_language_scanner.c" +#line 1423 "Zend/zend_language_scanner.c" yy39: YYDEBUG(39, *YYCURSOR); yych = *++YYCURSOR; @@ -1447,7 +1446,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1673 "Zend/zend_language_scanner.l" +#line 1672 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(ST_IN_SCRIPTING); @@ -1456,18 +1455,18 @@ yy43: goto inline_char_handler; } } -#line 1460 "Zend/zend_language_scanner.c" +#line 1459 "Zend/zend_language_scanner.c" yy45: YYDEBUG(45, *YYCURSOR); ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1683 "Zend/zend_language_scanner.l" +#line 1682 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG_WITH_ECHO; } -#line 1471 "Zend/zend_language_scanner.c" +#line 1470 "Zend/zend_language_scanner.c" yy47: YYDEBUG(47, *YYCURSOR); yych = *++YYCURSOR; @@ -1494,13 +1493,13 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1699 "Zend/zend_language_scanner.l" +#line 1698 "Zend/zend_language_scanner.l" { HANDLE_NEWLINE(yytext[yyleng-1]); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1504 "Zend/zend_language_scanner.c" +#line 1503 "Zend/zend_language_scanner.c" yy52: YYDEBUG(52, *YYCURSOR); ++YYCURSOR; @@ -1571,7 +1570,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2156 "Zend/zend_language_scanner.l" +#line 2155 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1612,7 +1611,7 @@ yy56: zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1616 "Zend/zend_language_scanner.c" +#line 1615 "Zend/zend_language_scanner.c" yy57: YYDEBUG(57, *YYCURSOR); yych = *++YYCURSOR; @@ -1623,12 +1622,12 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2100 "Zend/zend_language_scanner.l" +#line 2099 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; } -#line 1632 "Zend/zend_language_scanner.c" +#line 1631 "Zend/zend_language_scanner.c" yy60: YYDEBUG(60, *YYCURSOR); yych = *++YYCURSOR; @@ -1638,14 +1637,14 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2087 "Zend/zend_language_scanner.l" +#line 2086 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1649 "Zend/zend_language_scanner.c" +#line 1648 "Zend/zend_language_scanner.c" yy63: YYDEBUG(63, *YYCURSOR); yyaccept = 0; @@ -1661,23 +1660,23 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1796 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1670 "Zend/zend_language_scanner.c" +#line 1669 "Zend/zend_language_scanner.c" yy66: YYDEBUG(66, *YYCURSOR); ++YYCURSOR; YYDEBUG(67, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1483 "Zend/zend_language_scanner.l" +#line 1482 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1681 "Zend/zend_language_scanner.c" +#line 1680 "Zend/zend_language_scanner.c" yy68: YYDEBUG(68, *YYCURSOR); yych = *++YYCURSOR; @@ -1691,14 +1690,14 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1789 "Zend/zend_language_scanner.l" +#line 1788 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1702 "Zend/zend_language_scanner.c" +#line 1701 "Zend/zend_language_scanner.c" yy72: YYDEBUG(72, *YYCURSOR); yych = *++YYCURSOR; @@ -1716,14 +1715,14 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1780 "Zend/zend_language_scanner.l" +#line 1779 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1727 "Zend/zend_language_scanner.c" +#line 1726 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_DOUBLE_QUOTES: @@ -1791,7 +1790,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2106 "Zend/zend_language_scanner.l" +#line 2105 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1840,7 +1839,7 @@ double_quotes_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1844 "Zend/zend_language_scanner.c" +#line 1843 "Zend/zend_language_scanner.c" yy79: YYDEBUG(79, *YYCURSOR); yych = *++YYCURSOR; @@ -1851,12 +1850,12 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2095 "Zend/zend_language_scanner.l" +#line 2094 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; } -#line 1860 "Zend/zend_language_scanner.c" +#line 1859 "Zend/zend_language_scanner.c" yy82: YYDEBUG(82, *YYCURSOR); yych = *++YYCURSOR; @@ -1866,14 +1865,14 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2087 "Zend/zend_language_scanner.l" +#line 2086 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1877 "Zend/zend_language_scanner.c" +#line 1876 "Zend/zend_language_scanner.c" yy85: YYDEBUG(85, *YYCURSOR); yyaccept = 0; @@ -1889,23 +1888,23 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1796 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1898 "Zend/zend_language_scanner.c" +#line 1897 "Zend/zend_language_scanner.c" yy88: YYDEBUG(88, *YYCURSOR); ++YYCURSOR; YYDEBUG(89, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1483 "Zend/zend_language_scanner.l" +#line 1482 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1909 "Zend/zend_language_scanner.c" +#line 1908 "Zend/zend_language_scanner.c" yy90: YYDEBUG(90, *YYCURSOR); yych = *++YYCURSOR; @@ -1919,14 +1918,14 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1789 "Zend/zend_language_scanner.l" +#line 1788 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1930 "Zend/zend_language_scanner.c" +#line 1929 "Zend/zend_language_scanner.c" yy94: YYDEBUG(94, *YYCURSOR); yych = *++YYCURSOR; @@ -1944,14 +1943,14 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1780 "Zend/zend_language_scanner.l" +#line 1779 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1955 "Zend/zend_language_scanner.c" +#line 1954 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_END_HEREDOC: @@ -1962,7 +1961,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2073 "Zend/zend_language_scanner.l" +#line 2072 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -1975,7 +1974,7 @@ yyc_ST_END_HEREDOC: BEGIN(ST_IN_SCRIPTING); return T_END_HEREDOC; } -#line 1979 "Zend/zend_language_scanner.c" +#line 1978 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_HEREDOC: { @@ -2037,7 +2036,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2198 "Zend/zend_language_scanner.l" +#line 2197 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2110,7 +2109,7 @@ heredoc_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 2114 "Zend/zend_language_scanner.c" +#line 2113 "Zend/zend_language_scanner.c" yy105: YYDEBUG(105, *YYCURSOR); yych = *++YYCURSOR; @@ -2125,14 +2124,14 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2087 "Zend/zend_language_scanner.l" +#line 2086 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 2136 "Zend/zend_language_scanner.c" +#line 2135 "Zend/zend_language_scanner.c" yy109: YYDEBUG(109, *YYCURSOR); yyaccept = 0; @@ -2148,23 +2147,23 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1796 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2157 "Zend/zend_language_scanner.c" +#line 2156 "Zend/zend_language_scanner.c" yy112: YYDEBUG(112, *YYCURSOR); ++YYCURSOR; YYDEBUG(113, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1483 "Zend/zend_language_scanner.l" +#line 1482 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 2168 "Zend/zend_language_scanner.c" +#line 2167 "Zend/zend_language_scanner.c" yy114: YYDEBUG(114, *YYCURSOR); yych = *++YYCURSOR; @@ -2178,14 +2177,14 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1789 "Zend/zend_language_scanner.l" +#line 1788 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2189 "Zend/zend_language_scanner.c" +#line 2188 "Zend/zend_language_scanner.c" yy118: YYDEBUG(118, *YYCURSOR); yych = *++YYCURSOR; @@ -2203,14 +2202,14 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1780 "Zend/zend_language_scanner.l" +#line 1779 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2214 "Zend/zend_language_scanner.c" +#line 2213 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_IN_SCRIPTING: @@ -2393,12 +2392,12 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1818 "Zend/zend_language_scanner.l" +#line 1817 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 2402 "Zend/zend_language_scanner.c" +#line 2401 "Zend/zend_language_scanner.c" yy125: YYDEBUG(125, *YYCURSOR); yych = *++YYCURSOR; @@ -2630,11 +2629,11 @@ yy138: yy139: YYDEBUG(139, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1472 "Zend/zend_language_scanner.l" +#line 1471 "Zend/zend_language_scanner.l" { return yytext[0]; } -#line 2638 "Zend/zend_language_scanner.c" +#line 2637 "Zend/zend_language_scanner.c" yy140: YYDEBUG(140, *YYCURSOR); ++YYCURSOR; @@ -2643,12 +2642,12 @@ yy140: yy141: YYDEBUG(141, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1195 "Zend/zend_language_scanner.l" +#line 1194 "Zend/zend_language_scanner.l" { HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 2652 "Zend/zend_language_scanner.c" +#line 2651 "Zend/zend_language_scanner.c" yy142: YYDEBUG(142, *YYCURSOR); yych = *++YYCURSOR; @@ -2659,11 +2658,11 @@ yy143: ++YYCURSOR; YYDEBUG(144, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1220 "Zend/zend_language_scanner.l" +#line 1219 "Zend/zend_language_scanner.l" { return T_NS_SEPARATOR; } -#line 2667 "Zend/zend_language_scanner.c" +#line 2666 "Zend/zend_language_scanner.c" yy145: YYDEBUG(145, *YYCURSOR); yyaccept = 1; @@ -2897,18 +2896,18 @@ yy168: ++YYCURSOR; YYDEBUG(169, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1477 "Zend/zend_language_scanner.l" +#line 1476 "Zend/zend_language_scanner.l" { yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return '{'; } -#line 2906 "Zend/zend_language_scanner.c" +#line 2905 "Zend/zend_language_scanner.c" yy170: YYDEBUG(170, *YYCURSOR); ++YYCURSOR; YYDEBUG(171, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1489 "Zend/zend_language_scanner.l" +#line 1488 "Zend/zend_language_scanner.l" { RESET_DOC_COMMENT(); if (!zend_stack_is_empty(&SCNG(state_stack))) { @@ -2916,7 +2915,7 @@ yy170: } return '}'; } -#line 2920 "Zend/zend_language_scanner.c" +#line 2919 "Zend/zend_language_scanner.c" yy172: YYDEBUG(172, *YYCURSOR); yyaccept = 2; @@ -2944,7 +2943,7 @@ yy172: yy173: YYDEBUG(173, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1537 "Zend/zend_language_scanner.l" +#line 1536 "Zend/zend_language_scanner.l" { if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */ ZVAL_LONG(zendlval, strtol(yytext, NULL, 0)); @@ -2962,7 +2961,7 @@ yy173: } return T_LNUMBER; } -#line 2966 "Zend/zend_language_scanner.c" +#line 2965 "Zend/zend_language_scanner.c" yy174: YYDEBUG(174, *YYCURSOR); yyaccept = 2; @@ -2990,7 +2989,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1824 "Zend/zend_language_scanner.l" +#line 1823 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3024,14 +3023,14 @@ yy177: return T_COMMENT; } -#line 3028 "Zend/zend_language_scanner.c" +#line 3027 "Zend/zend_language_scanner.c" yy178: YYDEBUG(178, *YYCURSOR); ++YYCURSOR; yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1908 "Zend/zend_language_scanner.l" +#line 1907 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3099,14 +3098,14 @@ yy179: } return T_CONSTANT_ENCAPSED_STRING; } -#line 3103 "Zend/zend_language_scanner.c" +#line 3102 "Zend/zend_language_scanner.c" yy180: YYDEBUG(180, *YYCURSOR); ++YYCURSOR; yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1977 "Zend/zend_language_scanner.l" +#line 1976 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3147,24 +3146,24 @@ yy181: BEGIN(ST_DOUBLE_QUOTES); return '"'; } -#line 3151 "Zend/zend_language_scanner.c" +#line 3150 "Zend/zend_language_scanner.c" yy182: YYDEBUG(182, *YYCURSOR); ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2067 "Zend/zend_language_scanner.l" +#line 2066 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; } -#line 3162 "Zend/zend_language_scanner.c" +#line 3161 "Zend/zend_language_scanner.c" yy184: YYDEBUG(184, *YYCURSOR); ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2329 "Zend/zend_language_scanner.l" +#line 2328 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3173,7 +3172,7 @@ yy184: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 3177 "Zend/zend_language_scanner.c" +#line 3176 "Zend/zend_language_scanner.c" yy186: YYDEBUG(186, *YYCURSOR); ++YYCURSOR; @@ -3200,12 +3199,12 @@ yy188: yy190: YYDEBUG(190, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1592 "Zend/zend_language_scanner.l" +#line 1591 "Zend/zend_language_scanner.l" { ZVAL_DOUBLE(zendlval, zend_strtod(yytext, NULL)); return T_DNUMBER; } -#line 3209 "Zend/zend_language_scanner.c" +#line 3208 "Zend/zend_language_scanner.c" yy191: YYDEBUG(191, *YYCURSOR); yyaccept = 2; @@ -3297,7 +3296,7 @@ yy200: } YYDEBUG(202, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1514 "Zend/zend_language_scanner.l" +#line 1513 "Zend/zend_language_scanner.l" { char *bin = yytext + 2; /* Skip "0b" */ int len = yyleng - 2; @@ -3320,7 +3319,7 @@ yy200: return T_DNUMBER; } } -#line 3324 "Zend/zend_language_scanner.c" +#line 3323 "Zend/zend_language_scanner.c" yy203: YYDEBUG(203, *YYCURSOR); ++YYCURSOR; @@ -3332,7 +3331,7 @@ yy203: } YYDEBUG(205, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1555 "Zend/zend_language_scanner.l" +#line 1554 "Zend/zend_language_scanner.l" { char *hex = yytext + 2; /* Skip "0x" */ int len = yyleng - 2; @@ -3355,7 +3354,7 @@ yy203: return T_DNUMBER; } } -#line 3359 "Zend/zend_language_scanner.c" +#line 3358 "Zend/zend_language_scanner.c" yy206: YYDEBUG(206, *YYCURSOR); ++YYCURSOR; @@ -3364,12 +3363,12 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1891 "Zend/zend_language_scanner.l" +#line 1890 "Zend/zend_language_scanner.l" { BEGIN(INITIAL); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } -#line 3373 "Zend/zend_language_scanner.c" +#line 3372 "Zend/zend_language_scanner.c" yy208: YYDEBUG(208, *YYCURSOR); yych = *++YYCURSOR; @@ -3403,12 +3402,12 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1796 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 3412 "Zend/zend_language_scanner.c" +#line 3411 "Zend/zend_language_scanner.c" yy213: YYDEBUG(213, *YYCURSOR); yych = *++YYCURSOR; @@ -3422,11 +3421,11 @@ yy214: } YYDEBUG(215, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1460 "Zend/zend_language_scanner.l" +#line 1459 "Zend/zend_language_scanner.l" { return T_LOGICAL_XOR; } -#line 3430 "Zend/zend_language_scanner.c" +#line 3429 "Zend/zend_language_scanner.c" yy216: YYDEBUG(216, *YYCURSOR); ++YYCURSOR; @@ -3435,61 +3434,61 @@ yy216: } YYDEBUG(217, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1452 "Zend/zend_language_scanner.l" +#line 1451 "Zend/zend_language_scanner.l" { return T_LOGICAL_OR; } -#line 3443 "Zend/zend_language_scanner.c" +#line 3442 "Zend/zend_language_scanner.c" yy218: YYDEBUG(218, *YYCURSOR); ++YYCURSOR; YYDEBUG(219, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1440 "Zend/zend_language_scanner.l" +#line 1439 "Zend/zend_language_scanner.l" { return T_XOR_EQUAL; } -#line 3453 "Zend/zend_language_scanner.c" +#line 3452 "Zend/zend_language_scanner.c" yy220: YYDEBUG(220, *YYCURSOR); ++YYCURSOR; YYDEBUG(221, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1444 "Zend/zend_language_scanner.l" +#line 1443 "Zend/zend_language_scanner.l" { return T_BOOLEAN_OR; } -#line 3463 "Zend/zend_language_scanner.c" +#line 3462 "Zend/zend_language_scanner.c" yy222: YYDEBUG(222, *YYCURSOR); ++YYCURSOR; YYDEBUG(223, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1436 "Zend/zend_language_scanner.l" +#line 1435 "Zend/zend_language_scanner.l" { return T_OR_EQUAL; } -#line 3473 "Zend/zend_language_scanner.c" +#line 3472 "Zend/zend_language_scanner.c" yy224: YYDEBUG(224, *YYCURSOR); ++YYCURSOR; YYDEBUG(225, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1448 "Zend/zend_language_scanner.l" +#line 1447 "Zend/zend_language_scanner.l" { return T_BOOLEAN_AND; } -#line 3483 "Zend/zend_language_scanner.c" +#line 3482 "Zend/zend_language_scanner.c" yy226: YYDEBUG(226, *YYCURSOR); ++YYCURSOR; YYDEBUG(227, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1432 "Zend/zend_language_scanner.l" +#line 1431 "Zend/zend_language_scanner.l" { return T_AND_EQUAL; } -#line 3493 "Zend/zend_language_scanner.c" +#line 3492 "Zend/zend_language_scanner.c" yy228: YYDEBUG(228, *YYCURSOR); ++YYCURSOR; @@ -3498,7 +3497,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1897 "Zend/zend_language_scanner.l" +#line 1896 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3508,17 +3507,17 @@ yy229: return yytext[0]; } } -#line 3512 "Zend/zend_language_scanner.c" +#line 3511 "Zend/zend_language_scanner.c" yy230: YYDEBUG(230, *YYCURSOR); ++YYCURSOR; YYDEBUG(231, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1420 "Zend/zend_language_scanner.l" +#line 1419 "Zend/zend_language_scanner.l" { return T_MOD_EQUAL; } -#line 3522 "Zend/zend_language_scanner.c" +#line 3521 "Zend/zend_language_scanner.c" yy232: YYDEBUG(232, *YYCURSOR); yych = *++YYCURSOR; @@ -3536,7 +3535,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1858 "Zend/zend_language_scanner.l" +#line 1857 "Zend/zend_language_scanner.l" { int doc_com; @@ -3569,7 +3568,7 @@ yy235: return T_COMMENT; } -#line 3573 "Zend/zend_language_scanner.c" +#line 3572 "Zend/zend_language_scanner.c" yy236: YYDEBUG(236, *YYCURSOR); yych = *++YYCURSOR; @@ -3579,11 +3578,11 @@ yy237: ++YYCURSOR; YYDEBUG(238, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1412 "Zend/zend_language_scanner.l" +#line 1411 "Zend/zend_language_scanner.l" { return T_DIV_EQUAL; } -#line 3587 "Zend/zend_language_scanner.c" +#line 3586 "Zend/zend_language_scanner.c" yy239: YYDEBUG(239, *YYCURSOR); yych = *++YYCURSOR; @@ -3607,62 +3606,62 @@ yy242: if ((yych = *YYCURSOR) == '=') goto yy246; YYDEBUG(243, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1404 "Zend/zend_language_scanner.l" +#line 1403 "Zend/zend_language_scanner.l" { return T_POW; } -#line 3615 "Zend/zend_language_scanner.c" +#line 3614 "Zend/zend_language_scanner.c" yy244: YYDEBUG(244, *YYCURSOR); ++YYCURSOR; YYDEBUG(245, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1400 "Zend/zend_language_scanner.l" +#line 1399 "Zend/zend_language_scanner.l" { return T_MUL_EQUAL; } -#line 3625 "Zend/zend_language_scanner.c" +#line 3624 "Zend/zend_language_scanner.c" yy246: YYDEBUG(246, *YYCURSOR); ++YYCURSOR; YYDEBUG(247, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1408 "Zend/zend_language_scanner.l" +#line 1407 "Zend/zend_language_scanner.l" { return T_POW_EQUAL; } -#line 3635 "Zend/zend_language_scanner.c" +#line 3634 "Zend/zend_language_scanner.c" yy248: YYDEBUG(248, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy252; YYDEBUG(249, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1468 "Zend/zend_language_scanner.l" +#line 1467 "Zend/zend_language_scanner.l" { return T_SR; } -#line 3646 "Zend/zend_language_scanner.c" +#line 3645 "Zend/zend_language_scanner.c" yy250: YYDEBUG(250, *YYCURSOR); ++YYCURSOR; YYDEBUG(251, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1388 "Zend/zend_language_scanner.l" +#line 1387 "Zend/zend_language_scanner.l" { return T_IS_GREATER_OR_EQUAL; } -#line 3656 "Zend/zend_language_scanner.c" +#line 3655 "Zend/zend_language_scanner.c" yy252: YYDEBUG(252, *YYCURSOR); ++YYCURSOR; YYDEBUG(253, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1428 "Zend/zend_language_scanner.l" +#line 1427 "Zend/zend_language_scanner.l" { return T_SR_EQUAL; } -#line 3666 "Zend/zend_language_scanner.c" +#line 3665 "Zend/zend_language_scanner.c" yy254: YYDEBUG(254, *YYCURSOR); yyaccept = 5; @@ -3673,11 +3672,11 @@ yy254: yy255: YYDEBUG(255, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1464 "Zend/zend_language_scanner.l" +#line 1463 "Zend/zend_language_scanner.l" { return T_SL; } -#line 3681 "Zend/zend_language_scanner.c" +#line 3680 "Zend/zend_language_scanner.c" yy256: YYDEBUG(256, *YYCURSOR); yych = *++YYCURSOR; @@ -3689,22 +3688,22 @@ yy257: ++YYCURSOR; YYDEBUG(258, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1384 "Zend/zend_language_scanner.l" +#line 1383 "Zend/zend_language_scanner.l" { return T_IS_SMALLER_OR_EQUAL; } -#line 3697 "Zend/zend_language_scanner.c" +#line 3696 "Zend/zend_language_scanner.c" yy259: YYDEBUG(259, *YYCURSOR); ++YYCURSOR; yy260: YYDEBUG(260, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1380 "Zend/zend_language_scanner.l" +#line 1379 "Zend/zend_language_scanner.l" { return T_IS_NOT_EQUAL; } -#line 3708 "Zend/zend_language_scanner.c" +#line 3707 "Zend/zend_language_scanner.c" yy261: YYDEBUG(261, *YYCURSOR); yych = *++YYCURSOR; @@ -3755,11 +3754,11 @@ yy268: ++YYCURSOR; YYDEBUG(269, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1424 "Zend/zend_language_scanner.l" +#line 1423 "Zend/zend_language_scanner.l" { return T_SL_EQUAL; } -#line 3763 "Zend/zend_language_scanner.c" +#line 3762 "Zend/zend_language_scanner.c" yy270: YYDEBUG(270, *YYCURSOR); ++YYCURSOR; @@ -3864,7 +3863,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2019 "Zend/zend_language_scanner.l" +#line 2018 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -3911,7 +3910,7 @@ yy280: return T_START_HEREDOC; } -#line 3915 "Zend/zend_language_scanner.c" +#line 3914 "Zend/zend_language_scanner.c" yy281: YYDEBUG(281, *YYCURSOR); yych = *++YYCURSOR; @@ -3951,31 +3950,31 @@ yy284: ++YYCURSOR; YYDEBUG(286, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1372 "Zend/zend_language_scanner.l" +#line 1371 "Zend/zend_language_scanner.l" { return T_IS_NOT_IDENTICAL; } -#line 3959 "Zend/zend_language_scanner.c" +#line 3958 "Zend/zend_language_scanner.c" yy287: YYDEBUG(287, *YYCURSOR); ++YYCURSOR; YYDEBUG(288, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1392 "Zend/zend_language_scanner.l" +#line 1391 "Zend/zend_language_scanner.l" { return T_PLUS_EQUAL; } -#line 3969 "Zend/zend_language_scanner.c" +#line 3968 "Zend/zend_language_scanner.c" yy289: YYDEBUG(289, *YYCURSOR); ++YYCURSOR; YYDEBUG(290, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1360 "Zend/zend_language_scanner.l" +#line 1359 "Zend/zend_language_scanner.l" { return T_INC; } -#line 3979 "Zend/zend_language_scanner.c" +#line 3978 "Zend/zend_language_scanner.c" yy291: YYDEBUG(291, *YYCURSOR); yych = *++YYCURSOR; @@ -3994,42 +3993,42 @@ yy293: } YYDEBUG(294, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1348 "Zend/zend_language_scanner.l" +#line 1347 "Zend/zend_language_scanner.l" { return T_LIST; } -#line 4002 "Zend/zend_language_scanner.c" +#line 4001 "Zend/zend_language_scanner.c" yy295: YYDEBUG(295, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy299; YYDEBUG(296, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1376 "Zend/zend_language_scanner.l" +#line 1375 "Zend/zend_language_scanner.l" { return T_IS_EQUAL; } -#line 4013 "Zend/zend_language_scanner.c" +#line 4012 "Zend/zend_language_scanner.c" yy297: YYDEBUG(297, *YYCURSOR); ++YYCURSOR; YYDEBUG(298, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1344 "Zend/zend_language_scanner.l" +#line 1343 "Zend/zend_language_scanner.l" { return T_DOUBLE_ARROW; } -#line 4023 "Zend/zend_language_scanner.c" +#line 4022 "Zend/zend_language_scanner.c" yy299: YYDEBUG(299, *YYCURSOR); ++YYCURSOR; YYDEBUG(300, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1368 "Zend/zend_language_scanner.l" +#line 1367 "Zend/zend_language_scanner.l" { return T_IS_IDENTICAL; } -#line 4033 "Zend/zend_language_scanner.c" +#line 4032 "Zend/zend_language_scanner.c" yy301: YYDEBUG(301, *YYCURSOR); yych = *++YYCURSOR; @@ -4159,11 +4158,11 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1654 "Zend/zend_language_scanner.l" +#line 1653 "Zend/zend_language_scanner.l" { return T_NS_C; } -#line 4167 "Zend/zend_language_scanner.c" +#line 4166 "Zend/zend_language_scanner.c" yy321: YYDEBUG(321, *YYCURSOR); yych = *++YYCURSOR; @@ -4183,7 +4182,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1629 "Zend/zend_language_scanner.l" +#line 1628 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4208,7 +4207,7 @@ yy322: ZVAL_STR(zendlval, dirname); return T_DIR; } -#line 4212 "Zend/zend_language_scanner.c" +#line 4211 "Zend/zend_language_scanner.c" yy326: YYDEBUG(326, *YYCURSOR); yych = *++YYCURSOR; @@ -4233,12 +4232,12 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1613 "Zend/zend_language_scanner.l" +#line 1612 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; } -#line 4242 "Zend/zend_language_scanner.c" +#line 4241 "Zend/zend_language_scanner.c" yy332: YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; @@ -4273,11 +4272,11 @@ yy336: } YYDEBUG(339, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1609 "Zend/zend_language_scanner.l" +#line 1608 "Zend/zend_language_scanner.l" { return T_METHOD_C; } -#line 4281 "Zend/zend_language_scanner.c" +#line 4280 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; @@ -4328,11 +4327,11 @@ yy347: } YYDEBUG(350, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1605 "Zend/zend_language_scanner.l" +#line 1604 "Zend/zend_language_scanner.l" { return T_FUNC_C; } -#line 4336 "Zend/zend_language_scanner.c" +#line 4335 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4352,7 +4351,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1618 "Zend/zend_language_scanner.l" +#line 1617 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4363,7 +4362,7 @@ yy352: } return T_FILE; } -#line 4367 "Zend/zend_language_scanner.c" +#line 4366 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4393,11 +4392,11 @@ yy359: } YYDEBUG(362, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1601 "Zend/zend_language_scanner.l" +#line 1600 "Zend/zend_language_scanner.l" { return T_TRAIT_C; } -#line 4401 "Zend/zend_language_scanner.c" +#line 4400 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4427,11 +4426,11 @@ yy366: } YYDEBUG(369, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1597 "Zend/zend_language_scanner.l" +#line 1596 "Zend/zend_language_scanner.l" { return T_CLASS_C; } -#line 4435 "Zend/zend_language_scanner.c" +#line 4434 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4493,11 +4492,11 @@ yy381: } YYDEBUG(382, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1312 "Zend/zend_language_scanner.l" +#line 1311 "Zend/zend_language_scanner.l" { return T_HALT_COMPILER; } -#line 4501 "Zend/zend_language_scanner.c" +#line 4500 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4517,11 +4516,11 @@ yy385: } YYDEBUG(386, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1292 "Zend/zend_language_scanner.l" +#line 1291 "Zend/zend_language_scanner.l" { return T_USE; } -#line 4525 "Zend/zend_language_scanner.c" +#line 4524 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4540,11 +4539,11 @@ yy389: } YYDEBUG(390, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1340 "Zend/zend_language_scanner.l" +#line 1339 "Zend/zend_language_scanner.l" { return T_UNSET; } -#line 4548 "Zend/zend_language_scanner.c" +#line 4547 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4716,11 +4715,11 @@ yy406: ++YYCURSOR; YYDEBUG(408, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1240 "Zend/zend_language_scanner.l" +#line 1239 "Zend/zend_language_scanner.l" { return T_INT_CAST; } -#line 4724 "Zend/zend_language_scanner.c" +#line 4723 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4764,11 +4763,11 @@ yy414: ++YYCURSOR; YYDEBUG(417, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1244 "Zend/zend_language_scanner.l" +#line 1243 "Zend/zend_language_scanner.l" { return T_DOUBLE_CAST; } -#line 4772 "Zend/zend_language_scanner.c" +#line 4771 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4838,11 +4837,11 @@ yy428: ++YYCURSOR; YYDEBUG(431, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1248 "Zend/zend_language_scanner.l" +#line 1247 "Zend/zend_language_scanner.l" { return T_STRING_CAST; } -#line 4846 "Zend/zend_language_scanner.c" +#line 4845 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4875,11 +4874,11 @@ yy435: ++YYCURSOR; YYDEBUG(438, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1252 "Zend/zend_language_scanner.l" +#line 1251 "Zend/zend_language_scanner.l" { return T_ARRAY_CAST; } -#line 4883 "Zend/zend_language_scanner.c" +#line 4882 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4917,11 +4916,11 @@ yy443: ++YYCURSOR; YYDEBUG(446, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1256 "Zend/zend_language_scanner.l" +#line 1255 "Zend/zend_language_scanner.l" { return T_OBJECT_CAST; } -#line 4925 "Zend/zend_language_scanner.c" +#line 4924 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -4962,11 +4961,11 @@ yy452: ++YYCURSOR; YYDEBUG(454, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1260 "Zend/zend_language_scanner.l" +#line 1259 "Zend/zend_language_scanner.l" { return T_BOOL_CAST; } -#line 4970 "Zend/zend_language_scanner.c" +#line 4969 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5026,11 +5025,11 @@ yy463: ++YYCURSOR; YYDEBUG(466, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1264 "Zend/zend_language_scanner.l" +#line 1263 "Zend/zend_language_scanner.l" { return T_UNSET_CAST; } -#line 5034 "Zend/zend_language_scanner.c" +#line 5033 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5044,11 +5043,11 @@ yy468: } YYDEBUG(469, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1236 "Zend/zend_language_scanner.l" +#line 1235 "Zend/zend_language_scanner.l" { return T_VAR; } -#line 5052 "Zend/zend_language_scanner.c" +#line 5051 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5068,11 +5067,11 @@ yy472: } YYDEBUG(473, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1228 "Zend/zend_language_scanner.l" +#line 1227 "Zend/zend_language_scanner.l" { return T_NEW; } -#line 5076 "Zend/zend_language_scanner.c" +#line 5075 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5111,11 +5110,11 @@ yy480: } YYDEBUG(481, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1288 "Zend/zend_language_scanner.l" +#line 1287 "Zend/zend_language_scanner.l" { return T_NAMESPACE; } -#line 5119 "Zend/zend_language_scanner.c" +#line 5118 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5137,11 +5136,11 @@ yy484: ++YYCURSOR; YYDEBUG(485, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1416 "Zend/zend_language_scanner.l" +#line 1415 "Zend/zend_language_scanner.l" { return T_CONCAT_EQUAL; } -#line 5145 "Zend/zend_language_scanner.c" +#line 5144 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5150,21 +5149,21 @@ yy486: ++YYCURSOR; YYDEBUG(488, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1224 "Zend/zend_language_scanner.l" +#line 1223 "Zend/zend_language_scanner.l" { return T_ELLIPSIS; } -#line 5158 "Zend/zend_language_scanner.c" +#line 5157 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; YYDEBUG(490, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1216 "Zend/zend_language_scanner.l" +#line 1215 "Zend/zend_language_scanner.l" { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5168 "Zend/zend_language_scanner.c" +#line 5167 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5186,32 +5185,32 @@ yy493: ++YYCURSOR; YYDEBUG(494, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1396 "Zend/zend_language_scanner.l" +#line 1395 "Zend/zend_language_scanner.l" { return T_MINUS_EQUAL; } -#line 5194 "Zend/zend_language_scanner.c" +#line 5193 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; YYDEBUG(496, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1364 "Zend/zend_language_scanner.l" +#line 1363 "Zend/zend_language_scanner.l" { return T_DEC; } -#line 5204 "Zend/zend_language_scanner.c" +#line 5203 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; YYDEBUG(498, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1190 "Zend/zend_language_scanner.l" +#line 1189 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5215 "Zend/zend_language_scanner.c" +#line 5214 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5256,11 +5255,11 @@ yy504: } YYDEBUG(505, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1336 "Zend/zend_language_scanner.l" +#line 1335 "Zend/zend_language_scanner.l" { return T_PUBLIC; } -#line 5264 "Zend/zend_language_scanner.c" +#line 5263 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5315,11 +5314,11 @@ yy513: } YYDEBUG(514, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1332 "Zend/zend_language_scanner.l" +#line 1331 "Zend/zend_language_scanner.l" { return T_PROTECTED; } -#line 5323 "Zend/zend_language_scanner.c" +#line 5322 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5349,11 +5348,11 @@ yy519: } YYDEBUG(520, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1328 "Zend/zend_language_scanner.l" +#line 1327 "Zend/zend_language_scanner.l" { return T_PRIVATE; } -#line 5357 "Zend/zend_language_scanner.c" +#line 5356 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5362,11 +5361,11 @@ yy521: } YYDEBUG(522, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1166 "Zend/zend_language_scanner.l" +#line 1165 "Zend/zend_language_scanner.l" { return T_PRINT; } -#line 5370 "Zend/zend_language_scanner.c" +#line 5369 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5391,11 +5390,11 @@ yy526: } YYDEBUG(527, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1158 "Zend/zend_language_scanner.l" +#line 1157 "Zend/zend_language_scanner.l" { return T_GOTO; } -#line 5399 "Zend/zend_language_scanner.c" +#line 5398 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5419,11 +5418,11 @@ yy531: } YYDEBUG(532, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1300 "Zend/zend_language_scanner.l" +#line 1299 "Zend/zend_language_scanner.l" { return T_GLOBAL; } -#line 5427 "Zend/zend_language_scanner.c" +#line 5426 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5460,11 +5459,11 @@ yy539: } YYDEBUG(540, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1150 "Zend/zend_language_scanner.l" +#line 1149 "Zend/zend_language_scanner.l" { return T_BREAK; } -#line 5468 "Zend/zend_language_scanner.c" +#line 5467 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5504,11 +5503,11 @@ yy547: } YYDEBUG(548, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1134 "Zend/zend_language_scanner.l" +#line 1133 "Zend/zend_language_scanner.l" { return T_SWITCH; } -#line 5512 "Zend/zend_language_scanner.c" +#line 5511 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5532,11 +5531,11 @@ yy552: } YYDEBUG(553, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1316 "Zend/zend_language_scanner.l" +#line 1315 "Zend/zend_language_scanner.l" { return T_STATIC; } -#line 5540 "Zend/zend_language_scanner.c" +#line 5539 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5563,11 +5562,11 @@ yy557: } YYDEBUG(558, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1130 "Zend/zend_language_scanner.l" +#line 1129 "Zend/zend_language_scanner.l" { return T_AS; } -#line 5571 "Zend/zend_language_scanner.c" +#line 5570 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5586,11 +5585,11 @@ yy561: } YYDEBUG(562, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1352 "Zend/zend_language_scanner.l" +#line 1351 "Zend/zend_language_scanner.l" { return T_ARRAY; } -#line 5594 "Zend/zend_language_scanner.c" +#line 5593 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5599,11 +5598,11 @@ yy563: } YYDEBUG(564, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1456 "Zend/zend_language_scanner.l" +#line 1455 "Zend/zend_language_scanner.l" { return T_LOGICAL_AND; } -#line 5607 "Zend/zend_language_scanner.c" +#line 5606 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5637,11 +5636,11 @@ yy570: } YYDEBUG(571, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1320 "Zend/zend_language_scanner.l" +#line 1319 "Zend/zend_language_scanner.l" { return T_ABSTRACT; } -#line 5645 "Zend/zend_language_scanner.c" +#line 5644 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5665,11 +5664,11 @@ yy575: } YYDEBUG(576, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1090 "Zend/zend_language_scanner.l" +#line 1089 "Zend/zend_language_scanner.l" { return T_WHILE; } -#line 5673 "Zend/zend_language_scanner.c" +#line 5672 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5678,11 +5677,11 @@ yy577: } YYDEBUG(578, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1074 "Zend/zend_language_scanner.l" +#line 1073 "Zend/zend_language_scanner.l" { return T_IF; } -#line 5686 "Zend/zend_language_scanner.c" +#line 5685 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5734,11 +5733,11 @@ yy584: } YYDEBUG(585, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1304 "Zend/zend_language_scanner.l" +#line 1303 "Zend/zend_language_scanner.l" { return T_ISSET; } -#line 5742 "Zend/zend_language_scanner.c" +#line 5741 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5792,11 +5791,11 @@ yy592: yy593: YYDEBUG(593, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1272 "Zend/zend_language_scanner.l" +#line 1271 "Zend/zend_language_scanner.l" { return T_INCLUDE; } -#line 5800 "Zend/zend_language_scanner.c" +#line 5799 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5825,11 +5824,11 @@ yy598: } YYDEBUG(599, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1276 "Zend/zend_language_scanner.l" +#line 1275 "Zend/zend_language_scanner.l" { return T_INCLUDE_ONCE; } -#line 5833 "Zend/zend_language_scanner.c" +#line 5832 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5863,11 +5862,11 @@ yy605: } YYDEBUG(606, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1174 "Zend/zend_language_scanner.l" +#line 1173 "Zend/zend_language_scanner.l" { return T_INTERFACE; } -#line 5871 "Zend/zend_language_scanner.c" +#line 5870 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5917,11 +5916,11 @@ yy613: } YYDEBUG(614, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1296 "Zend/zend_language_scanner.l" +#line 1295 "Zend/zend_language_scanner.l" { return T_INSTEADOF; } -#line 5925 "Zend/zend_language_scanner.c" +#line 5924 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -5950,11 +5949,11 @@ yy619: } YYDEBUG(620, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1126 "Zend/zend_language_scanner.l" +#line 1125 "Zend/zend_language_scanner.l" { return T_INSTANCEOF; } -#line 5958 "Zend/zend_language_scanner.c" +#line 5957 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -5998,11 +5997,11 @@ yy628: } YYDEBUG(629, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1186 "Zend/zend_language_scanner.l" +#line 1185 "Zend/zend_language_scanner.l" { return T_IMPLEMENTS; } -#line 6006 "Zend/zend_language_scanner.c" +#line 6005 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6030,11 +6029,11 @@ yy631: } YYDEBUG(633, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1058 "Zend/zend_language_scanner.l" +#line 1057 "Zend/zend_language_scanner.l" { return T_TRY; } -#line 6038 "Zend/zend_language_scanner.c" +#line 6037 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6053,11 +6052,11 @@ yy636: } YYDEBUG(637, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1178 "Zend/zend_language_scanner.l" +#line 1177 "Zend/zend_language_scanner.l" { return T_TRAIT; } -#line 6061 "Zend/zend_language_scanner.c" +#line 6060 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6076,11 +6075,11 @@ yy640: } YYDEBUG(641, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1070 "Zend/zend_language_scanner.l" +#line 1069 "Zend/zend_language_scanner.l" { return T_THROW; } -#line 6084 "Zend/zend_language_scanner.c" +#line 6083 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6104,11 +6103,11 @@ yy645: } YYDEBUG(646, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1054 "Zend/zend_language_scanner.l" +#line 1053 "Zend/zend_language_scanner.l" { return T_YIELD; } -#line 6112 "Zend/zend_language_scanner.c" +#line 6111 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6169,11 +6168,11 @@ yy653: yy654: YYDEBUG(654, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1280 "Zend/zend_language_scanner.l" +#line 1279 "Zend/zend_language_scanner.l" { return T_REQUIRE; } -#line 6177 "Zend/zend_language_scanner.c" +#line 6176 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6202,11 +6201,11 @@ yy659: } YYDEBUG(660, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1284 "Zend/zend_language_scanner.l" +#line 1283 "Zend/zend_language_scanner.l" { return T_REQUIRE_ONCE; } -#line 6210 "Zend/zend_language_scanner.c" +#line 6209 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6225,11 +6224,11 @@ yy663: } YYDEBUG(664, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1050 "Zend/zend_language_scanner.l" +#line 1049 "Zend/zend_language_scanner.l" { return T_RETURN; } -#line 6233 "Zend/zend_language_scanner.c" +#line 6232 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6319,11 +6318,11 @@ yy674: } YYDEBUG(675, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1154 "Zend/zend_language_scanner.l" +#line 1153 "Zend/zend_language_scanner.l" { return T_CONTINUE; } -#line 6327 "Zend/zend_language_scanner.c" +#line 6326 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6332,11 +6331,11 @@ yy676: } YYDEBUG(677, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1046 "Zend/zend_language_scanner.l" +#line 1045 "Zend/zend_language_scanner.l" { return T_CONST; } -#line 6340 "Zend/zend_language_scanner.c" +#line 6339 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6361,11 +6360,11 @@ yy681: } YYDEBUG(682, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1232 "Zend/zend_language_scanner.l" +#line 1231 "Zend/zend_language_scanner.l" { return T_CLONE; } -#line 6369 "Zend/zend_language_scanner.c" +#line 6368 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6379,11 +6378,11 @@ yy684: } YYDEBUG(685, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1170 "Zend/zend_language_scanner.l" +#line 1169 "Zend/zend_language_scanner.l" { return T_CLASS; } -#line 6387 "Zend/zend_language_scanner.c" +#line 6386 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6429,11 +6428,11 @@ yy693: } YYDEBUG(694, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1356 "Zend/zend_language_scanner.l" +#line 1355 "Zend/zend_language_scanner.l" { return T_CALLABLE; } -#line 6437 "Zend/zend_language_scanner.c" +#line 6436 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6442,11 +6441,11 @@ yy695: } YYDEBUG(696, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1142 "Zend/zend_language_scanner.l" +#line 1141 "Zend/zend_language_scanner.l" { return T_CASE; } -#line 6450 "Zend/zend_language_scanner.c" +#line 6449 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6460,11 +6459,11 @@ yy698: } YYDEBUG(699, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1062 "Zend/zend_language_scanner.l" +#line 1061 "Zend/zend_language_scanner.l" { return T_CATCH; } -#line 6468 "Zend/zend_language_scanner.c" +#line 6467 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6515,11 +6514,11 @@ yy708: } YYDEBUG(709, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1042 "Zend/zend_language_scanner.l" +#line 1041 "Zend/zend_language_scanner.l" { return T_FUNCTION; } -#line 6523 "Zend/zend_language_scanner.c" +#line 6522 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6543,11 +6542,11 @@ yy710: yy711: YYDEBUG(711, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1102 "Zend/zend_language_scanner.l" +#line 1101 "Zend/zend_language_scanner.l" { return T_FOR; } -#line 6551 "Zend/zend_language_scanner.c" +#line 6550 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6571,11 +6570,11 @@ yy715: } YYDEBUG(716, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1110 "Zend/zend_language_scanner.l" +#line 1109 "Zend/zend_language_scanner.l" { return T_FOREACH; } -#line 6579 "Zend/zend_language_scanner.c" +#line 6578 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6609,11 +6608,11 @@ yy719: yy720: YYDEBUG(720, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1324 "Zend/zend_language_scanner.l" +#line 1323 "Zend/zend_language_scanner.l" { return T_FINAL; } -#line 6617 "Zend/zend_language_scanner.c" +#line 6616 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6627,11 +6626,11 @@ yy722: } YYDEBUG(723, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1066 "Zend/zend_language_scanner.l" +#line 1065 "Zend/zend_language_scanner.l" { return T_FINALLY; } -#line 6635 "Zend/zend_language_scanner.c" +#line 6634 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6662,11 +6661,11 @@ yy726: } YYDEBUG(727, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1098 "Zend/zend_language_scanner.l" +#line 1097 "Zend/zend_language_scanner.l" { return T_DO; } -#line 6670 "Zend/zend_language_scanner.c" +#line 6669 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6675,11 +6674,11 @@ yy728: } YYDEBUG(729, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1038 "Zend/zend_language_scanner.l" +#line 1037 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6683 "Zend/zend_language_scanner.c" +#line 6682 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6714,11 +6713,11 @@ yy735: } YYDEBUG(736, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1146 "Zend/zend_language_scanner.l" +#line 1145 "Zend/zend_language_scanner.l" { return T_DEFAULT; } -#line 6722 "Zend/zend_language_scanner.c" +#line 6721 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6742,11 +6741,11 @@ yy740: } YYDEBUG(741, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1118 "Zend/zend_language_scanner.l" +#line 1117 "Zend/zend_language_scanner.l" { return T_DECLARE; } -#line 6750 "Zend/zend_language_scanner.c" +#line 6749 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6826,11 +6825,11 @@ yy753: } YYDEBUG(754, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1182 "Zend/zend_language_scanner.l" +#line 1181 "Zend/zend_language_scanner.l" { return T_EXTENDS; } -#line 6834 "Zend/zend_language_scanner.c" +#line 6833 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6839,11 +6838,11 @@ yy755: } YYDEBUG(756, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1034 "Zend/zend_language_scanner.l" +#line 1033 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6847 "Zend/zend_language_scanner.c" +#line 6846 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6857,11 +6856,11 @@ yy758: } YYDEBUG(759, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1268 "Zend/zend_language_scanner.l" +#line 1267 "Zend/zend_language_scanner.l" { return T_EVAL; } -#line 6865 "Zend/zend_language_scanner.c" +#line 6864 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6931,11 +6930,11 @@ yy769: } YYDEBUG(770, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1094 "Zend/zend_language_scanner.l" +#line 1093 "Zend/zend_language_scanner.l" { return T_ENDWHILE; } -#line 6939 "Zend/zend_language_scanner.c" +#line 6938 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -6964,11 +6963,11 @@ yy775: } YYDEBUG(776, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1138 "Zend/zend_language_scanner.l" +#line 1137 "Zend/zend_language_scanner.l" { return T_ENDSWITCH; } -#line 6972 "Zend/zend_language_scanner.c" +#line 6971 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -6977,11 +6976,11 @@ yy777: } YYDEBUG(778, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1082 "Zend/zend_language_scanner.l" +#line 1081 "Zend/zend_language_scanner.l" { return T_ENDIF; } -#line 6985 "Zend/zend_language_scanner.c" +#line 6984 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7010,11 +7009,11 @@ yy780: yy781: YYDEBUG(781, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1106 "Zend/zend_language_scanner.l" +#line 1105 "Zend/zend_language_scanner.l" { return T_ENDFOR; } -#line 7018 "Zend/zend_language_scanner.c" +#line 7017 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7038,11 +7037,11 @@ yy785: } YYDEBUG(786, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1114 "Zend/zend_language_scanner.l" +#line 1113 "Zend/zend_language_scanner.l" { return T_ENDFOREACH; } -#line 7046 "Zend/zend_language_scanner.c" +#line 7045 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7076,11 +7075,11 @@ yy792: } YYDEBUG(793, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1122 "Zend/zend_language_scanner.l" +#line 1121 "Zend/zend_language_scanner.l" { return T_ENDDECLARE; } -#line 7084 "Zend/zend_language_scanner.c" +#line 7083 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7099,11 +7098,11 @@ yy796: } YYDEBUG(797, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1308 "Zend/zend_language_scanner.l" +#line 1307 "Zend/zend_language_scanner.l" { return T_EMPTY; } -#line 7107 "Zend/zend_language_scanner.c" +#line 7106 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7132,11 +7131,11 @@ yy799: yy800: YYDEBUG(800, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1086 "Zend/zend_language_scanner.l" +#line 1085 "Zend/zend_language_scanner.l" { return T_ELSE; } -#line 7140 "Zend/zend_language_scanner.c" +#line 7139 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7150,11 +7149,11 @@ yy802: } YYDEBUG(803, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1078 "Zend/zend_language_scanner.l" +#line 1077 "Zend/zend_language_scanner.l" { return T_ELSEIF; } -#line 7158 "Zend/zend_language_scanner.c" +#line 7157 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7168,11 +7167,11 @@ yy805: } YYDEBUG(806, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1162 "Zend/zend_language_scanner.l" +#line 1161 "Zend/zend_language_scanner.l" { return T_ECHO; } -#line 7176 "Zend/zend_language_scanner.c" +#line 7175 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7245,12 +7244,12 @@ yy809: yy810: YYDEBUG(810, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1195 "Zend/zend_language_scanner.l" +#line 1194 "Zend/zend_language_scanner.l" { HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7254 "Zend/zend_language_scanner.c" +#line 7253 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7258,13 +7257,13 @@ yy811: yy812: YYDEBUG(812, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1210 "Zend/zend_language_scanner.l" +#line 1209 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); goto restart; } -#line 7268 "Zend/zend_language_scanner.c" +#line 7267 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7273,13 +7272,13 @@ yy813: yy814: YYDEBUG(814, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1204 "Zend/zend_language_scanner.l" +#line 1203 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7283 "Zend/zend_language_scanner.c" +#line 7282 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7300,11 +7299,11 @@ yy818: ++YYCURSOR; YYDEBUG(819, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1200 "Zend/zend_language_scanner.l" +#line 1199 "Zend/zend_language_scanner.l" { return T_OBJECT_OPERATOR; } -#line 7308 "Zend/zend_language_scanner.c" +#line 7307 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7389,14 +7388,14 @@ yy824: yy825: YYDEBUG(825, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1507 "Zend/zend_language_scanner.l" +#line 1506 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7400 "Zend/zend_language_scanner.c" +#line 7399 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7421,7 +7420,7 @@ yy830: ++YYCURSOR; YYDEBUG(831, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1498 "Zend/zend_language_scanner.l" +#line 1497 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); zend_copy_value(zendlval, yytext, yyleng); @@ -7429,7 +7428,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7433 "Zend/zend_language_scanner.c" +#line 7432 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7440,7 +7439,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2272 "Zend/zend_language_scanner.l" +#line 2271 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7496,7 +7495,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7500 "Zend/zend_language_scanner.c" +#line 7499 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7603,7 +7602,7 @@ yy838: yy839: YYDEBUG(839, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1578 "Zend/zend_language_scanner.l" +#line 1577 "Zend/zend_language_scanner.l" { /* Offset could be treated as a long */ if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) { ZVAL_LONG(zendlval, strtol(yytext, NULL, 10)); @@ -7612,7 +7611,7 @@ yy839: } return T_NUM_STRING; } -#line 7616 "Zend/zend_language_scanner.c" +#line 7615 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7632,23 +7631,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1806 "Zend/zend_language_scanner.l" +#line 1805 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7641 "Zend/zend_language_scanner.c" +#line 7640 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1801 "Zend/zend_language_scanner.l" +#line 1800 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7652 "Zend/zend_language_scanner.c" +#line 7651 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7658,14 +7657,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1811 "Zend/zend_language_scanner.l" +#line 1810 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7669 "Zend/zend_language_scanner.c" +#line 7668 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7674,18 +7673,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1818 "Zend/zend_language_scanner.l" +#line 1817 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7683 "Zend/zend_language_scanner.c" +#line 7682 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2329 "Zend/zend_language_scanner.l" +#line 2328 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7694,7 +7693,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7698 "Zend/zend_language_scanner.c" +#line 7697 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7730,12 +7729,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1796 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7739 "Zend/zend_language_scanner.c" +#line 7738 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7775,12 +7774,12 @@ yy862: yy864: YYDEBUG(864, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1587 "Zend/zend_language_scanner.l" +#line 1586 "Zend/zend_language_scanner.l" { /* Offset must be treated as a string */ ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7784 "Zend/zend_language_scanner.c" +#line 7783 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7803,6 +7802,6 @@ yy867: goto yy864; } } -#line 2338 "Zend/zend_language_scanner.l" +#line 2337 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index c02d636c2e..81d839b0fb 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -559,11 +559,10 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR zend_op_array *retval=NULL; int compiler_result; zend_bool compilation_successful=0; - znode retval_znode; + zval retval_zv; zend_bool original_in_compilation = CG(in_compilation); - retval_znode.op_type = IS_CONST; - ZVAL_LONG(&retval_znode.u.constant, 1); + ZVAL_LONG(&retval_zv, 1); zend_save_lexical_state(&original_lex_state TSRMLS_CC); @@ -592,7 +591,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR zend_ast_destroy(CG(ast)); zend_arena_destroy(CG(ast_arena)); zend_do_end_compilation(TSRMLS_C); - zend_do_return(&retval_znode, 0 TSRMLS_CC); + zend_emit_final_return(&retval_zv TSRMLS_CC); CG(in_compilation) = original_in_compilation; compilation_successful=1; } @@ -774,7 +773,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) zend_ast_destroy(CG(ast)); zend_arena_destroy(CG(ast_arena)); zend_do_end_compilation(TSRMLS_C); - zend_do_return(NULL, 0 TSRMLS_CC); + zend_emit_final_return(NULL TSRMLS_CC); CG(active_op_array) = original_active_op_array; pass_two(op_array TSRMLS_CC); zend_release_labels(0 TSRMLS_CC); -- cgit v1.2.1 From df42793cd2ceed11cb46288e0f89d4684b885a57 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 26 Jul 2014 21:53:50 +0200 Subject: Create namespace_name via AST --- Zend/zend_ast.h | 3 -- Zend/zend_compile.c | 68 +++++++++++---------------------------------- Zend/zend_compile.h | 3 +- Zend/zend_language_parser.y | 23 +++++++-------- 4 files changed, 29 insertions(+), 68 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index d9e096b82d..414dd3c117 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -230,7 +230,4 @@ static inline zend_ast *zend_ast_create_cast(zend_uint type, zend_ast *op0) { return zend_ast_create_ex(1, ZEND_AST_CAST, type, op0); } -/* Temporary, for porting */ -#define AST_ZVAL(znode) zend_ast_create_zval(&(znode)->u.constant) - #endif diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8cfaeb450a..496392bfcc 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -984,36 +984,6 @@ void zend_release_labels(int temporary TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC) /* {{{ */ -{ - zend_uint length; - - if (!result) { - result = prefix; - } else { - *result = *prefix; - } - - if (is_class_member) { - int old_len = Z_STRLEN(result->u.constant); - length = sizeof("::")-1 + old_len + Z_STRLEN(name->u.constant); - Z_STR(result->u.constant) = STR_REALLOC(Z_STR(result->u.constant), length, 0); - Z_TYPE_FLAGS(result->u.constant) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE; - memcpy(&Z_STRVAL(result->u.constant)[old_len], "::", sizeof("::")-1); - memcpy(&Z_STRVAL(result->u.constant)[old_len + sizeof("::")-1], Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant)+1); - STR_RELEASE(Z_STR(name->u.constant)); - } else { - int old_len = Z_STRLEN(result->u.constant); - length = sizeof("\\")-1 + old_len + Z_STRLEN(name->u.constant); - Z_STR(result->u.constant) = STR_REALLOC(Z_STR(result->u.constant), length, 0); - Z_TYPE_FLAGS(result->u.constant) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE; - memcpy(&Z_STRVAL(result->u.constant)[old_len], "\\", sizeof("\\")-1); - memcpy(&Z_STRVAL(result->u.constant)[old_len + sizeof("\\")-1], Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant)+1); - STR_RELEASE(Z_STR(name->u.constant)); - } -} -/* }}} */ - static zend_bool zend_is_call(zend_ast *ast); static int generate_free_switch_expr(zend_switch_entry *switch_entry TSRMLS_DC) /* {{{ */ @@ -3240,30 +3210,24 @@ ZEND_API zend_string *zend_get_compiled_variable_name(const zend_op_array *op_ar } /* }}} */ -void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRMLS_DC) /* {{{ */ -{ - if (prefix) { - *result = *prefix; - if (Z_TYPE(result->u.constant) == IS_STRING && - Z_STRLEN(result->u.constant) == 0) { - /* namespace\ */ - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - znode tmp; +zend_ast *zend_ast_append_str(zend_ast *left_ast, zend_ast *right_ast) { + zval *left_zv = zend_ast_get_zval(left_ast); + zend_string *left = Z_STR_P(left_zv); + zend_string *right = zend_ast_get_str(right_ast); - zval_dtor(&result->u.constant); - tmp.op_type = IS_CONST; - ZVAL_DUP(&tmp.u.constant, &CG(current_namespace)); - zend_do_build_namespace_name(result, NULL, &tmp TSRMLS_CC); - } - } - } else { - result->op_type = IS_CONST; - ZVAL_EMPTY_STRING(&result->u.constant); - } - /* prefix = result */ - zend_do_build_full_name(NULL, result, name, 0 TSRMLS_CC); + zend_string *result; + size_t left_len = left->len; + size_t len = left_len + right->len + 1; /* left\right */ + + result = STR_REALLOC(left, len, 0); + result->val[left_len] = '\\'; + memcpy(&result->val[left_len + 1], right->val, right->len); + result->val[len] = '\0'; + STR_RELEASE(right); + + ZVAL_STR(left_zv, result); + return left_ast; } -/* }}} */ void zend_verify_namespace(TSRMLS_D) /* {{{ */ { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 2f7b2cca59..22c047296a 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -467,12 +467,12 @@ ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC); 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); /* 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_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC); 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); @@ -502,7 +502,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_build_namespace_name(znode *result, znode *prefix, znode *name TSRMLS_DC); void zend_do_end_namespace(TSRMLS_D); void zend_verify_namespace(TSRMLS_D); void zend_do_end_compilation(TSRMLS_D); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index a4ab4e680c..f592b04be2 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -230,17 +230,18 @@ top_statement_list: ; namespace_name: - T_STRING { zval zv; ZVAL_COPY_VALUE(&zv, zend_ast_get_zval($1.u.ast)); $1.op_type = IS_CONST; ZVAL_COPY_VALUE(&$1.u.constant, &zv); $$ = $1; } - | namespace_name T_NS_SEPARATOR T_STRING { zval zv; ZVAL_COPY_VALUE(&zv, zend_ast_get_zval($3.u.ast)); $3.op_type = IS_CONST; ZVAL_COPY_VALUE(&$3.u.constant, &zv); zend_do_build_namespace_name(&$$, &$1, &$3 TSRMLS_CC); } + T_STRING { $$.u.ast = $1.u.ast; } + | namespace_name T_NS_SEPARATOR T_STRING + { $$.u.ast = zend_ast_append_str($1.u.ast, $3.u.ast); } ; name: namespace_name - { $$.u.ast = zend_ast_create_zval_ex(&$1.u.constant, ZEND_NAME_NOT_FQ); } + { $$.u.ast = $1.u.ast; $$.u.ast->attr = ZEND_NAME_NOT_FQ; } | T_NAMESPACE T_NS_SEPARATOR namespace_name - { $$.u.ast = zend_ast_create_zval_ex(&$3.u.constant, ZEND_NAME_RELATIVE); } + { $$.u.ast = $3.u.ast; $$.u.ast->attr = ZEND_NAME_RELATIVE; } | T_NS_SEPARATOR namespace_name - { $$.u.ast = zend_ast_create_zval_ex(&$2.u.constant, ZEND_NAME_FQ); } + { $$.u.ast = $2.u.ast; $$.u.ast->attr = ZEND_NAME_FQ; } ; top_statement: @@ -252,11 +253,11 @@ top_statement: zend_ast_create_zval_from_long(zend_get_scanned_file_offset(TSRMLS_C))); zend_stop_lexing(TSRMLS_C); } | T_NAMESPACE namespace_name ';' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.u.ast, NULL); zend_discard_doc_comment(TSRMLS_C); } | T_NAMESPACE namespace_name { zend_discard_doc_comment(TSRMLS_C); } '{' top_statement_list '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), $5.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.u.ast, $5.u.ast); } | T_NAMESPACE { zend_discard_doc_comment(TSRMLS_C); } '{' top_statement_list '}' { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $4.u.ast); } @@ -278,13 +279,13 @@ use_declarations: use_declaration: namespace_name - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$1), NULL); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.u.ast, NULL); } | namespace_name T_AS T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$1), $3.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.u.ast, $3.u.ast); } | T_NS_SEPARATOR namespace_name - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), NULL); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.u.ast, NULL); } | T_NS_SEPARATOR namespace_name T_AS T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), $4.u.ast); } + { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.u.ast, $4.u.ast); } ; const_list: -- cgit v1.2.1 From 1ea9a2d934a0aef66aaf92c174cdf0542dd0dd68 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 27 Jul 2014 12:17:36 +0200 Subject: Cleanup member modifier code --- Zend/zend_compile.c | 21 ++++++++------------- Zend/zend_compile.h | 2 +- Zend/zend_language_parser.y | 38 ++++++++++++++++++++------------------ 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 496392bfcc..df4d4740d5 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 22c047296a..192de6880c 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 f592b04be2..fa505b019e 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: -- cgit v1.2.1 From 0b86b1c8e518e844c29b2d584c39b457126af60e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 27 Jul 2014 12:31:17 +0200 Subject: Store doc comments in separate stack entry from start lineno --- Zend/zend_language_parser.y | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index fa505b019e..a2a17cf813 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -381,10 +381,12 @@ unset_variable: ; function_declaration_statement: - function returns_ref T_STRING '(' parameter_list ')' '{' inner_statement_list '}' + function returns_ref T_STRING '(' parameter_list ')' + { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + '{' inner_statement_list '}' { $$.u.ast = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2.EA, - $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $1.u.op.ptr, - zend_ast_get_str($3.u.ast), $5.u.ast, NULL, $8.u.ast); } + $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $7.u.op.ptr, + zend_ast_get_str($3.u.ast), $5.u.ast, NULL, $9.u.ast); } ; is_reference: @@ -612,10 +614,12 @@ class_statement: { $$.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 + | method_modifiers function returns_ref T_STRING '(' parameter_list ')' + { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + method_body { $$.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); } + $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), $8.u.op.ptr, + zend_ast_get_str($4.u.ast), $6.u.ast, NULL, $9.u.ast); } ; name_list: @@ -862,22 +866,24 @@ expr_without_variable: | T_YIELD expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $2.u.ast, NULL); } | T_YIELD expr T_DOUBLE_ARROW expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } - | function returns_ref '(' parameter_list ')' lexical_vars '{' inner_statement_list '}' + | function returns_ref '(' parameter_list ')' lexical_vars + { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + '{' inner_statement_list '}' { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $2.EA, - $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $1.u.op.ptr, + $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $7.u.op.ptr, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), - $4.u.ast, $6.u.ast, $8.u.ast); } + $4.u.ast, $6.u.ast, $9.u.ast); } | T_STATIC function returns_ref '(' parameter_list ')' lexical_vars + { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $3.EA | ZEND_ACC_STATIC, $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), - $2.u.op.ptr, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), - $5.u.ast, $7.u.ast, $9.u.ast); } + $8.u.op.ptr, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), + $5.u.ast, $7.u.ast, $10.u.ast); } ; function: - T_FUNCTION - { $$.EA = CG(zend_lineno); $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + T_FUNCTION { $$.EA = CG(zend_lineno); } ; returns_ref: -- cgit v1.2.1 From a74515e2406ce2d9ca85593d38d0abab4a00c038 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 27 Jul 2014 12:37:28 +0200 Subject: Separate class type and start lineno --- Zend/zend_language_parser.y | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index a2a17cf813..884b18c7b7 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -400,30 +400,29 @@ is_variadic: ; class_declaration_statement: - class_entry_type T_STRING extends_from implements_list + class_type + { $$.EA = CG(zend_lineno); } + T_STRING extends_from implements_list { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } '{' class_statement_list '}' - { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num, - CG(zend_lineno), LANG_SCNG(yy_text), $5.u.op.ptr, - zend_ast_get_str($2.u.ast), $3.u.ast, $4.u.ast, $7.u.ast); } - | interface_entry T_STRING interface_extends_list + { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $2.EA, + CG(zend_lineno), LANG_SCNG(yy_text), $6.u.op.ptr, + zend_ast_get_str($3.u.ast), $4.u.ast, $5.u.ast, $8.u.ast); } + | T_INTERFACE + { $$.EA = CG(zend_lineno); } + T_STRING interface_extends_list { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } '{' class_statement_list '}' - { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num, - CG(zend_lineno), LANG_SCNG(yy_text), $4.u.op.ptr, - zend_ast_get_str($2.u.ast), NULL, $3.u.ast, $6.u.ast); } -; - - -class_entry_type: - T_CLASS { $$.u.op.opline_num = CG(zend_lineno); $$.EA = 0; } - | T_ABSTRACT T_CLASS { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; } - | T_TRAIT { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_TRAIT; } - | T_FINAL T_CLASS { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_FINAL_CLASS; } + { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_INTERFACE, $2.EA, + CG(zend_lineno), LANG_SCNG(yy_text), $5.u.op.ptr, + zend_ast_get_str($3.u.ast), NULL, $4.u.ast, $7.u.ast); } ; -interface_entry: - T_INTERFACE { $$.u.op.opline_num = CG(zend_lineno); $$.EA = ZEND_ACC_INTERFACE; } +class_type: + T_CLASS { $$.EA = 0; } + | T_ABSTRACT T_CLASS { $$.EA = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; } + | T_FINAL T_CLASS { $$.EA = ZEND_ACC_FINAL_CLASS; } + | T_TRAIT { $$.EA = ZEND_ACC_TRAIT; } ; extends_from: -- cgit v1.2.1 From bea85f58bbdf100d780b48af8752d8eee44634d3 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 27 Jul 2014 12:45:38 +0200 Subject: Use more specific parser stack nodes --- Zend/zend_compile.c | 4 +- Zend/zend_compile.h | 8 +- Zend/zend_language_parser.y | 854 ++++++++++++++++++++++---------------------- 3 files changed, 436 insertions(+), 430 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index df4d4740d5..900789a0a9 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3069,7 +3069,7 @@ ZEND_API void zend_activate_auto_globals(TSRMLS_D) /* {{{ */ } /* }}} */ -int zendlex(znode *zendlval TSRMLS_DC) /* {{{ */ +int zendlex(zend_parser_stack_elem *elem TSRMLS_DC) /* {{{ */ { zval zv; int retval; @@ -3103,7 +3103,7 @@ again: break; } if (Z_TYPE(zv) != IS_UNDEF) { - zendlval->u.ast = zend_ast_create_zval(&zv); + elem->ast = zend_ast_create_zval(&zv); } return retval; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 192de6880c..20d2c4fc44 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -98,6 +98,12 @@ static inline znode *zend_ast_get_znode(zend_ast *ast) { return &((zend_ast_znode *) ast)->node; } +typedef union _zend_parser_stack_elem { + zend_ast *ast; + zend_string *str; + zend_ulong num; +} zend_parser_stack_elem; + void zend_ensure_writable_variable(const zend_ast *ast); void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_stmt(zend_ast *ast TSRMLS_DC); @@ -570,7 +576,7 @@ ZEND_API void zend_activate_auto_globals(TSRMLS_D); ZEND_API zend_bool zend_is_auto_global(zend_string *name TSRMLS_DC); ZEND_API size_t zend_dirname(char *path, size_t len); -int zendlex(znode *zendlval TSRMLS_DC); +int zendlex(zend_parser_stack_elem *elem TSRMLS_DC); int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 884b18c7b7..c5cd93fd65 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -40,7 +40,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); #define YYERROR_VERBOSE -#define YYSTYPE znode +#define YYSTYPE zend_parser_stack_elem %} @@ -221,263 +221,263 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %% /* Rules */ start: - top_statement_list { CG(ast) = $1.u.ast; } + top_statement_list { CG(ast) = $1.ast; } ; top_statement_list: - top_statement_list top_statement { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } - | /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } + top_statement_list top_statement { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } + | /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } ; namespace_name: - T_STRING { $$.u.ast = $1.u.ast; } + T_STRING { $$.ast = $1.ast; } | namespace_name T_NS_SEPARATOR T_STRING - { $$.u.ast = zend_ast_append_str($1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_append_str($1.ast, $3.ast); } ; name: namespace_name - { $$.u.ast = $1.u.ast; $$.u.ast->attr = ZEND_NAME_NOT_FQ; } + { $$.ast = $1.ast; $$.ast->attr = ZEND_NAME_NOT_FQ; } | T_NAMESPACE T_NS_SEPARATOR namespace_name - { $$.u.ast = $3.u.ast; $$.u.ast->attr = ZEND_NAME_RELATIVE; } + { $$.ast = $3.ast; $$.ast->attr = ZEND_NAME_RELATIVE; } | T_NS_SEPARATOR namespace_name - { $$.u.ast = $2.u.ast; $$.u.ast->attr = ZEND_NAME_FQ; } + { $$.ast = $2.ast; $$.ast->attr = ZEND_NAME_FQ; } ; top_statement: - statement { $$.u.ast = $1.u.ast; } - | function_declaration_statement { $$.u.ast = $1.u.ast; } - | class_declaration_statement { $$.u.ast = $1.u.ast; } + statement { $$.ast = $1.ast; } + | function_declaration_statement { $$.ast = $1.ast; } + | class_declaration_statement { $$.ast = $1.ast; } | T_HALT_COMPILER '(' ')' ';' - { $$.u.ast = zend_ast_create_unary(ZEND_AST_HALT_COMPILER, + { $$.ast = zend_ast_create_unary(ZEND_AST_HALT_COMPILER, zend_ast_create_zval_from_long(zend_get_scanned_file_offset(TSRMLS_C))); zend_stop_lexing(TSRMLS_C); } | T_NAMESPACE namespace_name ';' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.u.ast, NULL); + { $$.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.ast, NULL); zend_discard_doc_comment(TSRMLS_C); } | T_NAMESPACE namespace_name { zend_discard_doc_comment(TSRMLS_C); } '{' top_statement_list '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.u.ast, $5.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.ast, $5.ast); } | T_NAMESPACE { zend_discard_doc_comment(TSRMLS_C); } '{' top_statement_list '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $4.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $4.ast); } | T_USE use_declarations ';' - { $$.u.ast = $2.u.ast; $$.u.ast->attr = T_CLASS; } + { $$.ast = $2.ast; $$.ast->attr = T_CLASS; } | T_USE T_FUNCTION use_declarations ';' - { $$.u.ast = $3.u.ast; $$.u.ast->attr = T_FUNCTION; } + { $$.ast = $3.ast; $$.ast->attr = T_FUNCTION; } | T_USE T_CONST use_declarations ';' - { $$.u.ast = $3.u.ast; $$.u.ast->attr = T_CONST; } - | T_CONST const_list ';' { $$.u.ast = $2.u.ast; } + { $$.ast = $3.ast; $$.ast->attr = T_CONST; } + | T_CONST const_list ';' { $$.ast = $2.ast; } ; use_declarations: use_declarations ',' use_declaration - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } | use_declaration - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_USE, $1.u.ast); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_USE, $1.ast); } ; use_declaration: namespace_name - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.u.ast, NULL); } + { $$.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.ast, NULL); } | namespace_name T_AS T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.ast, $3.ast); } | T_NS_SEPARATOR namespace_name - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.u.ast, NULL); } + { $$.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.ast, NULL); } | T_NS_SEPARATOR namespace_name T_AS T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.u.ast, $4.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.ast, $4.ast); } ; const_list: - const_list ',' const_decl { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + const_list ',' const_decl { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } | const_decl - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CONST_DECL, $1.u.ast); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CONST_DECL, $1.ast); } ; inner_statement_list: inner_statement_list inner_statement - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } | /* empty */ - { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } + { $$.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } ; inner_statement: - statement { $$.u.ast = $1.u.ast; } - | function_declaration_statement { $$.u.ast = $1.u.ast; } - | class_declaration_statement { $$.u.ast = $1.u.ast; } + statement { $$.ast = $1.ast; } + | function_declaration_statement { $$.ast = $1.ast; } + | class_declaration_statement { $$.ast = $1.ast; } | T_HALT_COMPILER '(' ')' ';' { zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); } ; statement: - unticked_statement { $$.u.ast = $1.u.ast; } - | T_STRING ':' { $$.u.ast = zend_ast_create_unary(ZEND_AST_LABEL, $1.u.ast); } + unticked_statement { $$.ast = $1.ast; } + | T_STRING ':' { $$.ast = zend_ast_create_unary(ZEND_AST_LABEL, $1.ast); } ; unticked_statement: - '{' inner_statement_list '}' { $$.u.ast = $2.u.ast; } - | if_stmt { $$.u.ast = $1.u.ast; } - | alt_if_stmt { $$.u.ast = $1.u.ast; } + '{' inner_statement_list '}' { $$.ast = $2.ast; } + | if_stmt { $$.ast = $1.ast; } + | alt_if_stmt { $$.ast = $1.ast; } | T_WHILE parenthesis_expr while_statement - { $$.u.ast = zend_ast_create_binary(ZEND_AST_WHILE, $2.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_WHILE, $2.ast, $3.ast); } | T_DO statement T_WHILE parenthesis_expr ';' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DO_WHILE, $2.u.ast, $4.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_DO_WHILE, $2.ast, $4.ast); } | T_FOR '(' for_expr ';' for_expr ';' for_expr ')' for_statement - { $$.u.ast = zend_ast_create(4, ZEND_AST_FOR, $3.u.ast, $5.u.ast, $7.u.ast, $9.u.ast); } + { $$.ast = zend_ast_create(4, ZEND_AST_FOR, $3.ast, $5.ast, $7.ast, $9.ast); } | T_SWITCH parenthesis_expr switch_case_list - { $$.u.ast = zend_ast_create_binary(ZEND_AST_SWITCH, $2.u.ast, $3.u.ast); } - | T_BREAK ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, NULL); } - | T_BREAK expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_BRK, $2.u.ast); } - | T_CONTINUE ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, NULL); } - | T_CONTINUE expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_CONT, $2.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_SWITCH, $2.ast, $3.ast); } + | T_BREAK ';' { $$.ast = zend_ast_create_unary(ZEND_BRK, NULL); } + | T_BREAK expr ';' { $$.ast = zend_ast_create_unary(ZEND_BRK, $2.ast); } + | T_CONTINUE ';' { $$.ast = zend_ast_create_unary(ZEND_CONT, NULL); } + | T_CONTINUE expr ';' { $$.ast = zend_ast_create_unary(ZEND_CONT, $2.ast); } | T_RETURN ';' - { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, NULL); } + { $$.ast = zend_ast_create_unary(ZEND_AST_RETURN, NULL); } | T_RETURN expr ';' - { $$.u.ast = zend_ast_create_unary(ZEND_AST_RETURN, $2.u.ast); } - | T_GLOBAL global_var_list ';' { $$.u.ast = $2.u.ast; } - | T_STATIC static_var_list ';' { $$.u.ast = $2.u.ast; } - | T_ECHO echo_expr_list ';' { $$.u.ast = $2.u.ast; } - | T_INLINE_HTML { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, $1.u.ast); } - | expr ';' { $$.u.ast = $1.u.ast; } - | T_UNSET '(' unset_variables ')' ';' { $$.u.ast = $3.u.ast; } + { $$.ast = zend_ast_create_unary(ZEND_AST_RETURN, $2.ast); } + | T_GLOBAL global_var_list ';' { $$.ast = $2.ast; } + | T_STATIC static_var_list ';' { $$.ast = $2.ast; } + | T_ECHO echo_expr_list ';' { $$.ast = $2.ast; } + | T_INLINE_HTML { $$.ast = zend_ast_create_unary(ZEND_ECHO, $1.ast); } + | expr ';' { $$.ast = $1.ast; } + | T_UNSET '(' unset_variables ')' ';' { $$.ast = $3.ast; } | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement - { $$.u.ast = zend_ast_create(4, ZEND_AST_FOREACH, - $3.u.ast, $5.u.ast, NULL, $7.u.ast); } + { $$.ast = zend_ast_create(4, ZEND_AST_FOREACH, + $3.ast, $5.ast, NULL, $7.ast); } | T_FOREACH '(' expr T_AS foreach_variable T_DOUBLE_ARROW foreach_variable ')' foreach_statement - { $$.u.ast = zend_ast_create(4, ZEND_AST_FOREACH, - $3.u.ast, $7.u.ast, $5.u.ast, $9.u.ast); } + { $$.ast = zend_ast_create(4, ZEND_AST_FOREACH, + $3.ast, $7.ast, $5.ast, $9.ast); } | T_DECLARE '(' const_list ')' declare_statement - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DECLARE, $3.u.ast, $5.u.ast); } - | ';' /* empty statement */ { $$.u.ast = NULL; } + { $$.ast = zend_ast_create_binary(ZEND_AST_DECLARE, $3.ast, $5.ast); } + | ';' /* empty statement */ { $$.ast = NULL; } | T_TRY '{' inner_statement_list '}' catch_list finally_statement - { $$.u.ast = zend_ast_create_ternary(ZEND_AST_TRY, $3.u.ast, $5.u.ast, $6.u.ast); } - | T_THROW expr ';' { $$.u.ast = zend_ast_create_unary(ZEND_THROW, $2.u.ast); } - | T_GOTO T_STRING ';' { $$.u.ast = zend_ast_create_unary(ZEND_GOTO, $2.u.ast); } + { $$.ast = zend_ast_create_ternary(ZEND_AST_TRY, $3.ast, $5.ast, $6.ast); } + | T_THROW expr ';' { $$.ast = zend_ast_create_unary(ZEND_THROW, $2.ast); } + | T_GOTO T_STRING ';' { $$.ast = zend_ast_create_unary(ZEND_GOTO, $2.ast); } ; catch_list: /* empty */ - { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_CATCH_LIST); } + { $$.ast = zend_ast_create_dynamic(ZEND_AST_CATCH_LIST); } | catch_list T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}' - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, - zend_ast_create_ternary(ZEND_AST_CATCH, $4.u.ast, $5.u.ast, $8.u.ast)); } + { $$.ast = zend_ast_dynamic_add($1.ast, + zend_ast_create_ternary(ZEND_AST_CATCH, $4.ast, $5.ast, $8.ast)); } ; finally_statement: - /* empty */ { $$.u.ast = NULL; } - | T_FINALLY '{' inner_statement_list '}' { $$.u.ast = $3.u.ast; } + /* empty */ { $$.ast = NULL; } + | T_FINALLY '{' inner_statement_list '}' { $$.ast = $3.ast; } ; unset_variables: - unset_variable { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.u.ast); } - | unset_variables ',' unset_variable { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + unset_variable { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.ast); } + | unset_variables ',' unset_variable { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } ; unset_variable: - variable { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNSET, $1.u.ast); } + variable { $$.ast = zend_ast_create_unary(ZEND_AST_UNSET, $1.ast); } ; function_declaration_statement: function returns_ref T_STRING '(' parameter_list ')' - { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2.EA, - $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $7.u.op.ptr, - zend_ast_get_str($3.u.ast), $5.u.ast, NULL, $9.u.ast); } + { $$.ast = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2.num, + $1.num, CG(zend_lineno), LANG_SCNG(yy_text), $7.str, + zend_ast_get_str($3.ast), $5.ast, NULL, $9.ast); } ; is_reference: - /* empty */ { $$.op_type = 0; } - | '&' { $$.op_type = ZEND_PARAM_REF; } + /* empty */ { $$.num = 0; } + | '&' { $$.num = ZEND_PARAM_REF; } ; is_variadic: - /* empty */ { $$.op_type = 0; } - | T_ELLIPSIS { $$.op_type = ZEND_PARAM_VARIADIC; } + /* empty */ { $$.num = 0; } + | T_ELLIPSIS { $$.num = ZEND_PARAM_VARIADIC; } ; class_declaration_statement: class_type - { $$.EA = CG(zend_lineno); } + { $$.num = CG(zend_lineno); } T_STRING extends_from implements_list - { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' class_statement_list '}' - { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $2.EA, - CG(zend_lineno), LANG_SCNG(yy_text), $6.u.op.ptr, - zend_ast_get_str($3.u.ast), $4.u.ast, $5.u.ast, $8.u.ast); } + { $$.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.num, $2.num, + CG(zend_lineno), LANG_SCNG(yy_text), $6.str, + zend_ast_get_str($3.ast), $4.ast, $5.ast, $8.ast); } | T_INTERFACE - { $$.EA = CG(zend_lineno); } + { $$.num = CG(zend_lineno); } T_STRING interface_extends_list - { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' class_statement_list '}' - { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_INTERFACE, $2.EA, - CG(zend_lineno), LANG_SCNG(yy_text), $5.u.op.ptr, - zend_ast_get_str($3.u.ast), NULL, $4.u.ast, $7.u.ast); } + { $$.ast = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_INTERFACE, $2.num, + CG(zend_lineno), LANG_SCNG(yy_text), $5.str, + zend_ast_get_str($3.ast), NULL, $4.ast, $7.ast); } ; class_type: - T_CLASS { $$.EA = 0; } - | T_ABSTRACT T_CLASS { $$.EA = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; } - | T_FINAL T_CLASS { $$.EA = ZEND_ACC_FINAL_CLASS; } - | T_TRAIT { $$.EA = ZEND_ACC_TRAIT; } + T_CLASS { $$.num = 0; } + | T_ABSTRACT T_CLASS { $$.num = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; } + | T_FINAL T_CLASS { $$.num = ZEND_ACC_FINAL_CLASS; } + | T_TRAIT { $$.num = ZEND_ACC_TRAIT; } ; extends_from: - /* empty */ { $$.u.ast = NULL; } - | T_EXTENDS name { $$.u.ast = $2.u.ast; } + /* empty */ { $$.ast = NULL; } + | T_EXTENDS name { $$.ast = $2.ast; } ; interface_extends_list: - /* empty */ { $$.u.ast = NULL; } - | T_EXTENDS name_list { $$.u.ast = $2.u.ast; } + /* empty */ { $$.ast = NULL; } + | T_EXTENDS name_list { $$.ast = $2.ast; } ; implements_list: - /* empty */ { $$.u.ast = NULL; } - | T_IMPLEMENTS name_list { $$.u.ast = $2.u.ast; } + /* empty */ { $$.ast = NULL; } + | T_IMPLEMENTS name_list { $$.ast = $2.ast; } ; foreach_variable: - variable { $$.u.ast = $1.u.ast; } - | '&' variable { $$.u.ast = zend_ast_create_unary(ZEND_AST_REF, $2.u.ast); } - | T_LIST '(' assignment_list ')' { $$.u.ast = $3.u.ast; } + variable { $$.ast = $1.ast; } + | '&' variable { $$.ast = zend_ast_create_unary(ZEND_AST_REF, $2.ast); } + | T_LIST '(' assignment_list ')' { $$.ast = $3.ast; } ; for_statement: - statement { $$.u.ast = $1.u.ast; } - | ':' inner_statement_list T_ENDFOR ';' { $$.u.ast = $2.u.ast; } + statement { $$.ast = $1.ast; } + | ':' inner_statement_list T_ENDFOR ';' { $$.ast = $2.ast; } ; foreach_statement: - statement { $$.u.ast = $1.u.ast; } - | ':' inner_statement_list T_ENDFOREACH ';' { $$.u.ast = $2.u.ast; } + statement { $$.ast = $1.ast; } + | ':' inner_statement_list T_ENDFOREACH ';' { $$.ast = $2.ast; } ; declare_statement: - statement { $$.u.ast = $1.u.ast; } - | ':' inner_statement_list T_ENDDECLARE ';' { $$.u.ast = $2.u.ast; } + statement { $$.ast = $1.ast; } + | ':' inner_statement_list T_ENDDECLARE ';' { $$.ast = $2.ast; } ; switch_case_list: - '{' case_list '}' { $$.u.ast = $2.u.ast; } - | '{' ';' case_list '}' { $$.u.ast = $3.u.ast; } - | ':' case_list T_ENDSWITCH ';' { $$.u.ast = $2.u.ast; } - | ':' ';' case_list T_ENDSWITCH ';' { $$.u.ast = $3.u.ast; } + '{' case_list '}' { $$.ast = $2.ast; } + | '{' ';' case_list '}' { $$.ast = $3.ast; } + | ':' case_list T_ENDSWITCH ';' { $$.ast = $2.ast; } + | ':' ';' case_list T_ENDSWITCH ';' { $$.ast = $3.ast; } ; case_list: - /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_SWITCH_LIST); } + /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_SWITCH_LIST); } | case_list T_CASE expr case_separator inner_statement_list - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, - zend_ast_create_binary(ZEND_AST_SWITCH_CASE, $3.u.ast, $5.u.ast)); } + { $$.ast = zend_ast_dynamic_add($1.ast, + zend_ast_create_binary(ZEND_AST_SWITCH_CASE, $3.ast, $5.ast)); } | case_list T_DEFAULT case_separator inner_statement_list - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, - zend_ast_create_binary(ZEND_AST_SWITCH_CASE, NULL, $4.u.ast)); } + { $$.ast = zend_ast_dynamic_add($1.ast, + zend_ast_create_binary(ZEND_AST_SWITCH_CASE, NULL, $4.ast)); } ; case_separator: @@ -487,495 +487,495 @@ case_separator: while_statement: - statement { $$.u.ast = $1.u.ast; } - | ':' inner_statement_list T_ENDWHILE ';' { $$.u.ast = $2.u.ast; } + statement { $$.ast = $1.ast; } + | ':' inner_statement_list T_ENDWHILE ';' { $$.ast = $2.ast; } ; if_stmt_without_else: T_IF parenthesis_expr statement - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_IF, - zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.u.ast, $3.u.ast)); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_IF, + zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.ast, $3.ast)); } | if_stmt_without_else T_ELSEIF parenthesis_expr statement - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, - zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.u.ast, $4.u.ast)); } + { $$.ast = zend_ast_dynamic_add($1.ast, + zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.ast, $4.ast)); } ; if_stmt: - if_stmt_without_else { $$.u.ast = $1.u.ast; } + if_stmt_without_else { $$.ast = $1.ast; } | if_stmt_without_else T_ELSE statement - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, - zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $3.u.ast)); } + { $$.ast = zend_ast_dynamic_add($1.ast, + zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $3.ast)); } ; alt_if_stmt_without_else: T_IF parenthesis_expr ':' inner_statement_list - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_IF, - zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.u.ast, $4.u.ast)); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_IF, + zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.ast, $4.ast)); } | alt_if_stmt_without_else T_ELSEIF parenthesis_expr ':' inner_statement_list - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, - zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.u.ast, $5.u.ast)); } + { $$.ast = zend_ast_dynamic_add($1.ast, + zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.ast, $5.ast)); } ; alt_if_stmt: - alt_if_stmt_without_else T_ENDIF ';' { $$.u.ast = $1.u.ast; } + alt_if_stmt_without_else T_ENDIF ';' { $$.ast = $1.ast; } | alt_if_stmt_without_else T_ELSE ':' inner_statement_list T_ENDIF ';' - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, - zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $4.u.ast)); } + { $$.ast = zend_ast_dynamic_add($1.ast, + zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $4.ast)); } ; parameter_list: - non_empty_parameter_list { $$.u.ast = $1.u.ast; } - | /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_PARAM_LIST); } + non_empty_parameter_list { $$.ast = $1.ast; } + | /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_PARAM_LIST); } ; non_empty_parameter_list: parameter - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PARAM_LIST, $1.u.ast); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PARAM_LIST, $1.ast); } | non_empty_parameter_list ',' parameter - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } ; parameter: optional_type is_reference is_variadic T_VARIABLE - { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.op_type | $3.op_type, - $1.u.ast, $4.u.ast, NULL); } + { $$.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.num | $3.num, + $1.ast, $4.ast, NULL); } | optional_type is_reference is_variadic T_VARIABLE '=' expr - { $$.u.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.op_type | $3.op_type, - $1.u.ast, $4.u.ast, $6.u.ast); } + { $$.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.num | $3.num, + $1.ast, $4.ast, $6.ast); } ; optional_type: - /* empty */ { $$.u.ast = NULL; } - | T_ARRAY { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_TYPE, IS_ARRAY); } - | T_CALLABLE { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_TYPE, IS_CALLABLE); } - | name { $$.u.ast = $1.u.ast; } + /* empty */ { $$.ast = NULL; } + | T_ARRAY { $$.ast = zend_ast_create_ex(0, ZEND_AST_TYPE, IS_ARRAY); } + | T_CALLABLE { $$.ast = zend_ast_create_ex(0, ZEND_AST_TYPE, IS_CALLABLE); } + | name { $$.ast = $1.ast; } ; argument_list: - '(' ')' { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_ARG_LIST); } - | '(' non_empty_argument_list ')' { $$.u.ast = $2.u.ast; } + '(' ')' { $$.ast = zend_ast_create_dynamic(ZEND_AST_ARG_LIST); } + | '(' non_empty_argument_list ')' { $$.ast = $2.ast; } ; non_empty_argument_list: argument - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARG_LIST, $1.u.ast); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARG_LIST, $1.ast); } | non_empty_argument_list ',' argument - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } ; argument: - expr_without_variable { $$.u.ast = $1.u.ast; } - | variable { $$.u.ast = $1.u.ast; } + expr_without_variable { $$.ast = $1.ast; } + | variable { $$.ast = $1.ast; } /*| '&' variable { ZEND_ASSERT(0); } */ - | T_ELLIPSIS expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNPACK, $2.u.ast); } + | T_ELLIPSIS expr { $$.ast = zend_ast_create_unary(ZEND_AST_UNPACK, $2.ast); } ; global_var_list: - global_var_list ',' global_var { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } - | global_var { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.u.ast); } + global_var_list ',' global_var { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + | global_var { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.ast); } ; global_var: simple_variable - { $$.u.ast = zend_ast_create_unary(ZEND_AST_GLOBAL, - zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast)); } + { $$.ast = zend_ast_create_unary(ZEND_AST_GLOBAL, + zend_ast_create_unary(ZEND_AST_VAR, $1.ast)); } ; static_var_list: - static_var_list ',' static_var { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } - | static_var { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.u.ast); } + static_var_list ',' static_var { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + | static_var { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.ast); } ; static_var: T_VARIABLE - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC, $1.u.ast, NULL); } + { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC, $1.ast, NULL); } | T_VARIABLE '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC, $1.ast, $3.ast); } ; class_statement_list: class_statement_list class_statement - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } | /* empty */ - { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } + { $$.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } ; class_statement: variable_modifiers property_list ';' - { $$.u.ast = $2.u.ast; $$.u.ast->attr = $1.EA; } + { $$.ast = $2.ast; $$.ast->attr = $1.num; } | T_CONST class_const_list ';' - { $$.u.ast = $2.u.ast; zend_discard_doc_comment(TSRMLS_C); } + { $$.ast = $2.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); } + { $$.ast = zend_ast_create_binary(ZEND_AST_USE_TRAIT, $2.ast, $3.ast); } | method_modifiers function returns_ref T_STRING '(' parameter_list ')' - { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } method_body - { $$.u.ast = zend_ast_create_decl(ZEND_AST_METHOD, $3.EA | $1.EA, - $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), $8.u.op.ptr, - zend_ast_get_str($4.u.ast), $6.u.ast, NULL, $9.u.ast); } + { $$.ast = zend_ast_create_decl(ZEND_AST_METHOD, $3.num | $1.num, + $2.num, CG(zend_lineno), LANG_SCNG(yy_text), $8.str, + zend_ast_get_str($4.ast), $6.ast, NULL, $9.ast); } ; name_list: - name { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_NAME_LIST, $1.u.ast); } - | name_list ',' name { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + name { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_NAME_LIST, $1.ast); } + | name_list ',' name { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } ; trait_adaptations: - ';' { $$.u.ast = NULL; } - | '{' '}' { $$.u.ast = NULL; } - | '{' trait_adaptation_list '}' { $$.u.ast = $2.u.ast; } + ';' { $$.ast = NULL; } + | '{' '}' { $$.ast = NULL; } + | '{' trait_adaptation_list '}' { $$.ast = $2.ast; } ; trait_adaptation_list: trait_adaptation - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_TRAIT_ADAPTATIONS, $1.u.ast); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_TRAIT_ADAPTATIONS, $1.ast); } | trait_adaptation_list trait_adaptation - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } ; trait_adaptation: - trait_precedence ';' { $$.u.ast = $1.u.ast; } - | trait_alias ';' { $$.u.ast = $1.u.ast; } + trait_precedence ';' { $$.ast = $1.ast; } + | trait_alias ';' { $$.ast = $1.ast; } ; trait_precedence: absolute_trait_method_reference T_INSTEADOF name_list - { $$.u.ast = zend_ast_create_binary(ZEND_AST_TRAIT_PRECEDENCE, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_TRAIT_PRECEDENCE, $1.ast, $3.ast); } ; trait_alias: trait_method_reference T_AS trait_modifiers T_STRING - { $$.u.ast = zend_ast_create_ex(2, ZEND_AST_TRAIT_ALIAS, - $3.EA, $1.u.ast, $4.u.ast); } + { $$.ast = zend_ast_create_ex(2, ZEND_AST_TRAIT_ALIAS, + $3.num, $1.ast, $4.ast); } | trait_method_reference T_AS member_modifier - { $$.u.ast = zend_ast_create_ex(2, ZEND_AST_TRAIT_ALIAS, - $3.EA, $1.u.ast, NULL); } + { $$.ast = zend_ast_create_ex(2, ZEND_AST_TRAIT_ALIAS, + $3.num, $1.ast, NULL); } ; trait_method_reference: T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, NULL, $1.u.ast); } - | absolute_trait_method_reference { $$.u.ast = $1.u.ast; } + { $$.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, NULL, $1.ast); } + | absolute_trait_method_reference { $$.ast = $1.ast; } ; absolute_trait_method_reference: name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, $1.ast, $3.ast); } ; trait_modifiers: - /* empty */ { $$.EA = 0; } - | member_modifier { $$.EA = $1.EA; } + /* empty */ { $$.num = 0; } + | member_modifier { $$.num = $1.num; } ; method_body: - ';' /* abstract method */ { $$.u.ast = NULL; } - | '{' inner_statement_list '}' { $$.u.ast = $2.u.ast; } + ';' /* abstract method */ { $$.ast = NULL; } + | '{' inner_statement_list '}' { $$.ast = $2.ast; } ; variable_modifiers: - non_empty_member_modifiers { $$.EA = $1.EA; } - | T_VAR { $$.EA = ZEND_ACC_PUBLIC; } + non_empty_member_modifiers { $$.num = $1.num; } + | T_VAR { $$.num = ZEND_ACC_PUBLIC; } ; method_modifiers: - /* empty */ { $$.EA = ZEND_ACC_PUBLIC; } + /* empty */ { $$.num = ZEND_ACC_PUBLIC; } | non_empty_member_modifiers - { $$.EA = $1.EA; if (!($$.EA & ZEND_ACC_PPP_MASK)) { $$.EA |= ZEND_ACC_PUBLIC; } } + { $$.num = $1.num; if (!($$.num & ZEND_ACC_PPP_MASK)) { $$.num |= ZEND_ACC_PUBLIC; } } ; non_empty_member_modifiers: - member_modifier { $$.EA = $1.EA; } + member_modifier { $$.num = $1.num; } | non_empty_member_modifiers member_modifier - { $$.EA = zend_add_member_modifier($1.EA, $2.EA); } + { $$.num = zend_add_member_modifier($1.num, $2.num); } ; member_modifier: - 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; } + T_PUBLIC { $$.num = ZEND_ACC_PUBLIC; } + | T_PROTECTED { $$.num = ZEND_ACC_PROTECTED; } + | T_PRIVATE { $$.num = ZEND_ACC_PRIVATE; } + | T_STATIC { $$.num = ZEND_ACC_STATIC; } + | T_ABSTRACT { $$.num = ZEND_ACC_ABSTRACT; } + | T_FINAL { $$.num = ZEND_ACC_FINAL; } ; property_list: - property_list ',' property { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } - | property { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PROP_DECL, $1.u.ast); } + property_list ',' property { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + | property { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PROP_DECL, $1.ast); } ; property: - T_VARIABLE { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, $1.u.ast, NULL); } + T_VARIABLE { $$.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, $1.ast, NULL); } | T_VARIABLE '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, $1.ast, $3.ast); } ; class_const_list: - class_const_list ',' const_decl { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + class_const_list ',' const_decl { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } | const_decl - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CLASS_CONST_DECL, $1.u.ast); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CLASS_CONST_DECL, $1.ast); } ; const_decl: T_STRING '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_CONST_ELEM, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_CONST_ELEM, $1.ast, $3.ast); } ; echo_expr_list: - echo_expr_list ',' echo_expr { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } - | echo_expr { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.u.ast); } + echo_expr_list ',' echo_expr { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + | echo_expr { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.ast); } ; echo_expr: - expr { $$.u.ast = zend_ast_create_unary(ZEND_ECHO, $1.u.ast); } + expr { $$.ast = zend_ast_create_unary(ZEND_ECHO, $1.ast); } ; for_expr: - /* empty */ { $$.u.ast = NULL; } - | non_empty_for_expr { $$.u.ast = $1.u.ast; } + /* empty */ { $$.ast = NULL; } + | non_empty_for_expr { $$.ast = $1.ast; } ; non_empty_for_expr: - non_empty_for_expr ',' expr { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } - | expr { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_EXPR_LIST, $1.u.ast); } + non_empty_for_expr ',' expr { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + | expr { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_EXPR_LIST, $1.ast); } ; new_expr: T_NEW class_name_reference ctor_arguments - { $$.u.ast = zend_ast_create_binary(ZEND_NEW, $2.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_NEW, $2.ast, $3.ast); } ; expr_without_variable: T_LIST '(' assignment_list ')' '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $3.u.ast, $6.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $3.ast, $6.ast); } | variable '=' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $1.ast, $3.ast); } | variable '=' '&' variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.u.ast, $4.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.ast, $4.ast); } | variable '=' '&' T_NEW class_name_reference ctor_arguments { zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); - $$.u.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.u.ast, - zend_ast_create_binary(ZEND_NEW, $5.u.ast, $6.u.ast)); } - | T_CLONE expr { $$.u.ast = zend_ast_create_unary(ZEND_CLONE, $2.u.ast); } + $$.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.ast, + zend_ast_create_binary(ZEND_NEW, $5.ast, $6.ast)); } + | T_CLONE expr { $$.ast = zend_ast_create_unary(ZEND_CLONE, $2.ast); } | variable T_PLUS_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_ADD, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_ADD, $1.ast, $3.ast); } | variable T_MINUS_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SUB, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SUB, $1.ast, $3.ast); } | variable T_MUL_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_MUL, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_MUL, $1.ast, $3.ast); } | variable T_POW_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_POW, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_POW, $1.ast, $3.ast); } | variable T_DIV_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_DIV, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_DIV, $1.ast, $3.ast); } | variable T_CONCAT_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_CONCAT, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_CONCAT, $1.ast, $3.ast); } | variable T_MOD_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_MOD, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_MOD, $1.ast, $3.ast); } | variable T_AND_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_BW_AND, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_BW_AND, $1.ast, $3.ast); } | variable T_OR_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_BW_OR, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_BW_OR, $1.ast, $3.ast); } | variable T_XOR_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_BW_XOR, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_BW_XOR, $1.ast, $3.ast); } | variable T_SL_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SL, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SL, $1.ast, $3.ast); } | variable T_SR_EQUAL expr - { $$.u.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SR, $1.u.ast, $3.u.ast); } - | variable T_INC { $$.u.ast = zend_ast_create_unary(ZEND_POST_INC, $1.u.ast); } - | T_INC variable { $$.u.ast = zend_ast_create_unary(ZEND_PRE_INC, $2.u.ast); } - | variable T_DEC { $$.u.ast = zend_ast_create_unary(ZEND_POST_DEC, $1.u.ast); } - | T_DEC variable { $$.u.ast = zend_ast_create_unary(ZEND_PRE_DEC, $2.u.ast); } + { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SR, $1.ast, $3.ast); } + | variable T_INC { $$.ast = zend_ast_create_unary(ZEND_POST_INC, $1.ast); } + | T_INC variable { $$.ast = zend_ast_create_unary(ZEND_PRE_INC, $2.ast); } + | variable T_DEC { $$.ast = zend_ast_create_unary(ZEND_POST_DEC, $1.ast); } + | T_DEC variable { $$.ast = zend_ast_create_unary(ZEND_PRE_DEC, $2.ast); } | expr T_BOOLEAN_OR expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_OR, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_OR, $1.ast, $3.ast); } | expr T_BOOLEAN_AND expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_AND, $1.ast, $3.ast); } | expr T_LOGICAL_OR expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_OR, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_OR, $1.ast, $3.ast); } | expr T_LOGICAL_AND expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_AND, $1.ast, $3.ast); } | expr T_LOGICAL_XOR expr - { $$.u.ast = zend_ast_create_binary_op(ZEND_BOOL_XOR, $1.u.ast, $3.u.ast); } - | expr '|' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_OR, $1.u.ast, $3.u.ast); } - | expr '&' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_AND, $1.u.ast, $3.u.ast); } - | expr '^' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_BW_XOR, $1.u.ast, $3.u.ast); } - | expr '.' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_CONCAT, $1.u.ast, $3.u.ast); } - | expr '+' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_ADD, $1.u.ast, $3.u.ast); } - | expr '-' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_SUB, $1.u.ast, $3.u.ast); } - | expr '*' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_MUL, $1.u.ast, $3.u.ast); } - | expr T_POW expr { $$.u.ast = zend_ast_create_binary_op(ZEND_POW, $1.u.ast, $3.u.ast); } - | expr '/' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_DIV, $1.u.ast, $3.u.ast); } - | expr '%' expr { $$.u.ast = zend_ast_create_binary_op(ZEND_MOD, $1.u.ast, $3.u.ast); } - | expr T_SL expr { $$.u.ast = zend_ast_create_binary_op(ZEND_SL, $1.u.ast, $3.u.ast); } - | expr T_SR expr { $$.u.ast = zend_ast_create_binary_op(ZEND_SR, $1.u.ast, $3.u.ast); } - | '+' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_PLUS, $2.u.ast); } - | '-' expr %prec T_INC { $$.u.ast = zend_ast_create_unary(ZEND_AST_UNARY_MINUS, $2.u.ast); } - | '!' expr { $$.u.ast = zend_ast_create_unary(ZEND_BOOL_NOT, $2.u.ast); } - | '~' expr { $$.u.ast = zend_ast_create_unary(ZEND_BW_NOT, $2.u.ast); } + { $$.ast = zend_ast_create_binary_op(ZEND_BOOL_XOR, $1.ast, $3.ast); } + | expr '|' expr { $$.ast = zend_ast_create_binary_op(ZEND_BW_OR, $1.ast, $3.ast); } + | expr '&' expr { $$.ast = zend_ast_create_binary_op(ZEND_BW_AND, $1.ast, $3.ast); } + | expr '^' expr { $$.ast = zend_ast_create_binary_op(ZEND_BW_XOR, $1.ast, $3.ast); } + | expr '.' expr { $$.ast = zend_ast_create_binary_op(ZEND_CONCAT, $1.ast, $3.ast); } + | expr '+' expr { $$.ast = zend_ast_create_binary_op(ZEND_ADD, $1.ast, $3.ast); } + | expr '-' expr { $$.ast = zend_ast_create_binary_op(ZEND_SUB, $1.ast, $3.ast); } + | expr '*' expr { $$.ast = zend_ast_create_binary_op(ZEND_MUL, $1.ast, $3.ast); } + | expr T_POW expr { $$.ast = zend_ast_create_binary_op(ZEND_POW, $1.ast, $3.ast); } + | expr '/' expr { $$.ast = zend_ast_create_binary_op(ZEND_DIV, $1.ast, $3.ast); } + | expr '%' expr { $$.ast = zend_ast_create_binary_op(ZEND_MOD, $1.ast, $3.ast); } + | expr T_SL expr { $$.ast = zend_ast_create_binary_op(ZEND_SL, $1.ast, $3.ast); } + | expr T_SR expr { $$.ast = zend_ast_create_binary_op(ZEND_SR, $1.ast, $3.ast); } + | '+' expr %prec T_INC { $$.ast = zend_ast_create_unary(ZEND_AST_UNARY_PLUS, $2.ast); } + | '-' expr %prec T_INC { $$.ast = zend_ast_create_unary(ZEND_AST_UNARY_MINUS, $2.ast); } + | '!' expr { $$.ast = zend_ast_create_unary(ZEND_BOOL_NOT, $2.ast); } + | '~' expr { $$.ast = zend_ast_create_unary(ZEND_BW_NOT, $2.ast); } | expr T_IS_IDENTICAL expr - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, $1.ast, $3.ast); } | expr T_IS_NOT_IDENTICAL expr - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_NOT_IDENTICAL, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary_op(ZEND_IS_NOT_IDENTICAL, $1.ast, $3.ast); } | expr T_IS_EQUAL expr - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_EQUAL, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary_op(ZEND_IS_EQUAL, $1.ast, $3.ast); } | expr T_IS_NOT_EQUAL expr - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_NOT_EQUAL, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary_op(ZEND_IS_NOT_EQUAL, $1.ast, $3.ast); } | expr '<' expr - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER, $1.ast, $3.ast); } | expr T_IS_SMALLER_OR_EQUAL expr - { $$.u.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $1.ast, $3.ast); } | expr '>' expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_GREATER, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_GREATER, $1.ast, $3.ast); } | expr T_IS_GREATER_OR_EQUAL expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_GREATER_EQUAL, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_GREATER_EQUAL, $1.ast, $3.ast); } | expr T_INSTANCEOF class_name_reference - { $$.u.ast = zend_ast_create_binary(ZEND_INSTANCEOF, $1.u.ast, $3.u.ast); } - | parenthesis_expr { $$.u.ast = $1.u.ast; } - | new_expr { $$.u.ast = $1.u.ast; } + { $$.ast = zend_ast_create_binary(ZEND_INSTANCEOF, $1.ast, $3.ast); } + | parenthesis_expr { $$.ast = $1.ast; } + | new_expr { $$.ast = $1.ast; } | expr '?' expr ':' expr - { $$.u.ast = zend_ast_create_ternary( - ZEND_AST_CONDITIONAL, $1.u.ast, $3.u.ast, $5.u.ast); } + { $$.ast = zend_ast_create_ternary( + ZEND_AST_CONDITIONAL, $1.ast, $3.ast, $5.ast); } | expr '?' ':' expr - { $$.u.ast = zend_ast_create_ternary(ZEND_AST_CONDITIONAL, $1.u.ast, NULL, $4.u.ast); } - | internal_functions_in_yacc { $$.u.ast = $1.u.ast; } + { $$.ast = zend_ast_create_ternary(ZEND_AST_CONDITIONAL, $1.ast, NULL, $4.ast); } + | internal_functions_in_yacc { $$.ast = $1.ast; } | T_INT_CAST expr - { $$.u.ast = zend_ast_create_cast(IS_LONG, $2.u.ast); } + { $$.ast = zend_ast_create_cast(IS_LONG, $2.ast); } | T_DOUBLE_CAST expr - { $$.u.ast = zend_ast_create_cast(IS_DOUBLE, $2.u.ast); } + { $$.ast = zend_ast_create_cast(IS_DOUBLE, $2.ast); } | T_STRING_CAST expr - { $$.u.ast = zend_ast_create_cast(IS_STRING, $2.u.ast); } + { $$.ast = zend_ast_create_cast(IS_STRING, $2.ast); } | T_ARRAY_CAST expr - { $$.u.ast = zend_ast_create_cast(IS_ARRAY, $2.u.ast); } + { $$.ast = zend_ast_create_cast(IS_ARRAY, $2.ast); } | T_OBJECT_CAST expr - { $$.u.ast = zend_ast_create_cast(IS_OBJECT, $2.u.ast); } + { $$.ast = zend_ast_create_cast(IS_OBJECT, $2.ast); } | T_BOOL_CAST expr - { $$.u.ast = zend_ast_create_cast(_IS_BOOL, $2.u.ast); } + { $$.ast = zend_ast_create_cast(_IS_BOOL, $2.ast); } | T_UNSET_CAST expr - { $$.u.ast = zend_ast_create_cast(IS_NULL, $2.u.ast); } - | T_EXIT exit_expr { $$.u.ast = zend_ast_create_unary(ZEND_EXIT, $2.u.ast); } - | '@' expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_SILENCE, $2.u.ast); } - | scalar { $$.u.ast = $1.u.ast; } - | '`' backticks_expr '`' { $$.u.ast = zend_ast_create_unary(ZEND_AST_SHELL_EXEC, $2.u.ast); } - | T_PRINT expr { $$.u.ast = zend_ast_create_unary(ZEND_PRINT, $2.u.ast); } - | T_YIELD { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, NULL, NULL); } - | T_YIELD expr { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $2.u.ast, NULL); } + { $$.ast = zend_ast_create_cast(IS_NULL, $2.ast); } + | T_EXIT exit_expr { $$.ast = zend_ast_create_unary(ZEND_EXIT, $2.ast); } + | '@' expr { $$.ast = zend_ast_create_unary(ZEND_AST_SILENCE, $2.ast); } + | scalar { $$.ast = $1.ast; } + | '`' backticks_expr '`' { $$.ast = zend_ast_create_unary(ZEND_AST_SHELL_EXEC, $2.ast); } + | T_PRINT expr { $$.ast = zend_ast_create_unary(ZEND_PRINT, $2.ast); } + | T_YIELD { $$.ast = zend_ast_create_binary(ZEND_YIELD, NULL, NULL); } + | T_YIELD expr { $$.ast = zend_ast_create_binary(ZEND_YIELD, $2.ast, NULL); } | T_YIELD expr T_DOUBLE_ARROW expr - { $$.u.ast = zend_ast_create_binary(ZEND_YIELD, $4.u.ast, $2.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_YIELD, $4.ast, $2.ast); } | function returns_ref '(' parameter_list ')' lexical_vars - { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $2.EA, - $1.EA, CG(zend_lineno), LANG_SCNG(yy_text), $7.u.op.ptr, + { $$.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $2.num, + $1.num, CG(zend_lineno), LANG_SCNG(yy_text), $7.str, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), - $4.u.ast, $6.u.ast, $9.u.ast); } + $4.ast, $6.ast, $9.ast); } | T_STATIC function returns_ref '(' parameter_list ')' lexical_vars - { $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; } + { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' - { $$.u.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, - $3.EA | ZEND_ACC_STATIC, $2.EA, CG(zend_lineno), LANG_SCNG(yy_text), - $8.u.op.ptr, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), - $5.u.ast, $7.u.ast, $10.u.ast); } + { $$.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, + $3.num | ZEND_ACC_STATIC, $2.num, CG(zend_lineno), LANG_SCNG(yy_text), + $8.str, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), + $5.ast, $7.ast, $10.ast); } ; function: - T_FUNCTION { $$.EA = CG(zend_lineno); } + T_FUNCTION { $$.num = CG(zend_lineno); } ; returns_ref: - /* empty */ { $$.EA = 0; } - | '&' { $$.EA = ZEND_ACC_RETURN_REFERENCE; } + /* empty */ { $$.num = 0; } + | '&' { $$.num = ZEND_ACC_RETURN_REFERENCE; } ; lexical_vars: - /* empty */ { $$.u.ast = NULL; } - | T_USE '(' lexical_var_list ')' { $$.u.ast = $3.u.ast; } + /* empty */ { $$.ast = NULL; } + | T_USE '(' lexical_var_list ')' { $$.ast = $3.ast; } ; lexical_var_list: - lexical_var_list ',' lexical_var { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } - | lexical_var { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CLOSURE_USES, $1.u.ast); } + lexical_var_list ',' lexical_var { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + | lexical_var { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CLOSURE_USES, $1.ast); } ; lexical_var: - T_VARIABLE { $$.u.ast = $1.u.ast; } - | '&' T_VARIABLE { $$.u.ast = $2.u.ast; $$.u.ast->attr = 1; } + T_VARIABLE { $$.ast = $1.ast; } + | '&' T_VARIABLE { $$.ast = $2.ast; $$.ast->attr = 1; } ; function_call: name argument_list - { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.u.ast, $2.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.ast, $2.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list - { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, - $1.u.ast, $3.u.ast, $4.u.ast); } + { $$.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, + $1.ast, $3.ast, $4.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list - { $$.u.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, - $1.u.ast, $3.u.ast, $4.u.ast); } + { $$.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, + $1.ast, $3.ast, $4.ast); } | callable_expr argument_list - { $$.u.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.u.ast, $2.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.ast, $2.ast); } ; class_name: T_STATIC { zval zv; ZVAL_STRINGL(&zv, "static", sizeof("static")-1); - $$.u.ast = zend_ast_create_zval_ex(&zv, ZEND_NAME_NOT_FQ); } - | name { $$.u.ast = $1.u.ast; } + $$.ast = zend_ast_create_zval_ex(&zv, ZEND_NAME_NOT_FQ); } + | name { $$.ast = $1.ast; } ; class_name_reference: - class_name { $$.u.ast = $1.u.ast; } - | new_variable { $$.u.ast = $1.u.ast; } + class_name { $$.ast = $1.ast; } + | new_variable { $$.ast = $1.ast; } ; exit_expr: - /* empty */ { $$.u.ast = NULL; } - | '(' ')' { $$.u.ast = NULL; } - | parenthesis_expr { $$.u.ast = $1.u.ast; } + /* empty */ { $$.ast = NULL; } + | '(' ')' { $$.ast = NULL; } + | parenthesis_expr { $$.ast = $1.ast; } ; backticks_expr: /* empty */ - { $$.u.ast = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } - | T_ENCAPSED_AND_WHITESPACE { $$.u.ast = $1.u.ast; } - | encaps_list { $$.u.ast = $1.u.ast; } + { $$.ast = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } + | T_ENCAPSED_AND_WHITESPACE { $$.ast = $1.ast; } + | encaps_list { $$.ast = $1.ast; } ; ctor_arguments: - /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_ARG_LIST); } - | argument_list { $$.u.ast = $1.u.ast; } + /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_ARG_LIST); } + | argument_list { $$.ast = $1.ast; } ; dereferencable_scalar: - T_ARRAY '(' array_pair_list ')' { $$.u.ast = $3.u.ast; } - | '[' array_pair_list ']' { $$.u.ast = $2.u.ast; } - | T_CONSTANT_ENCAPSED_STRING { $$.u.ast = $1.u.ast; } + T_ARRAY '(' array_pair_list ')' { $$.ast = $3.ast; } + | '[' array_pair_list ']' { $$.ast = $2.ast; } + | T_CONSTANT_ENCAPSED_STRING { $$.ast = $1.ast; } ; scalar: - T_LNUMBER { $$.u.ast = $1.u.ast; } - | T_DNUMBER { $$.u.ast = $1.u.ast; } - | T_LINE { $$.u.ast = $1.u.ast; } - | T_FILE { $$.u.ast = $1.u.ast; } - | T_DIR { $$.u.ast = $1.u.ast; } - | T_TRAIT_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_TRAIT_C); } - | T_METHOD_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_METHOD_C); } - | T_FUNC_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); } - | T_NS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_NS_C); } - | T_CLASS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_CLASS_C); } - | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = $2.u.ast; } + T_LNUMBER { $$.ast = $1.ast; } + | T_DNUMBER { $$.ast = $1.ast; } + | T_LINE { $$.ast = $1.ast; } + | T_FILE { $$.ast = $1.ast; } + | T_DIR { $$.ast = $1.ast; } + | T_TRAIT_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_TRAIT_C); } + | T_METHOD_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_METHOD_C); } + | T_FUNC_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); } + | T_NS_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_NS_C); } + | T_CLASS_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_CLASS_C); } + | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.ast = $2.ast; } | T_START_HEREDOC T_END_HEREDOC - { $$.u.ast = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } - | '"' encaps_list '"' { $$.u.ast = $2.u.ast; } - | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.u.ast = $2.u.ast; } - | dereferencable_scalar { $$.u.ast = $1.u.ast; } - | class_name_scalar { $$.u.ast = $1.u.ast; } - | class_constant { $$.u.ast = $1.u.ast; } - | name { $$.u.ast = zend_ast_create_unary(ZEND_AST_CONST, $1.u.ast); } + { $$.ast = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } + | '"' encaps_list '"' { $$.ast = $2.ast; } + | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.ast = $2.ast; } + | dereferencable_scalar { $$.ast = $1.ast; } + | class_name_scalar { $$.ast = $1.ast; } + | class_constant { $$.ast = $1.ast; } + | name { $$.ast = zend_ast_create_unary(ZEND_AST_CONST, $1.ast); } ; @@ -985,204 +985,204 @@ possible_comma: ; expr: - variable { $$.u.ast = $1.u.ast; } - | expr_without_variable { $$.u.ast = $1.u.ast; } + variable { $$.ast = $1.ast; } + | expr_without_variable { $$.ast = $1.ast; } ; parenthesis_expr: - '(' expr ')' { $$.u.ast = $2.u.ast; } + '(' expr ')' { $$.ast = $2.ast; } ; variable_class_name: - dereferencable { $$.u.ast = $1.u.ast; } + dereferencable { $$.ast = $1.ast; } ; dereferencable: - variable { $$.u.ast = $1.u.ast; } - | '(' expr ')' { $$.u.ast = $2.u.ast; } - | dereferencable_scalar { $$.u.ast = $1.u.ast; } + variable { $$.ast = $1.ast; } + | '(' expr ')' { $$.ast = $2.ast; } + | dereferencable_scalar { $$.ast = $1.ast; } ; callable_expr: - callable_variable { $$.u.ast = $1.u.ast; } - | '(' expr ')' { $$.u.ast = $2.u.ast; } - | dereferencable_scalar { $$.u.ast = $1.u.ast; } + callable_variable { $$.ast = $1.ast; } + | '(' expr ')' { $$.ast = $2.ast; } + | dereferencable_scalar { $$.ast = $1.ast; } ; callable_variable: simple_variable - { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } + { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } | dereferencable '[' dim_offset ']' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.ast, $3.ast); } | dereferencable '{' expr '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.ast, $3.ast); } | dereferencable T_OBJECT_OPERATOR member_name argument_list - { $$.u.ast = zend_ast_create_ternary(ZEND_AST_METHOD_CALL, $1.u.ast, $3.u.ast, $4.u.ast); } - | function_call { $$.u.ast = $1.u.ast; } + { $$.ast = zend_ast_create_ternary(ZEND_AST_METHOD_CALL, $1.ast, $3.ast, $4.ast); } + | function_call { $$.ast = $1.ast; } ; variable: callable_variable - { $$.u.ast = $1.u.ast; } + { $$.ast = $1.ast; } | static_member - { $$.u.ast = $1.u.ast; } + { $$.ast = $1.ast; } | dereferencable T_OBJECT_OPERATOR member_name - { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.ast, $3.ast); } ; simple_variable: T_VARIABLE - { $$.u.ast = $1.u.ast; } + { $$.ast = $1.ast; } | '$' '{' expr '}' - { $$.u.ast = $3.u.ast; } + { $$.ast = $3.ast; } | '$' simple_variable - { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); } + { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.ast); } ; static_member: class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } ; new_variable: simple_variable - { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } + { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } | new_variable '[' dim_offset ']' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.ast, $3.ast); } | new_variable '{' expr '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.ast, $3.ast); } | new_variable T_OBJECT_OPERATOR member_name - { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.ast, $3.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } ; dim_offset: - /* empty */ { $$.u.ast = NULL; } - | expr { $$.u.ast = $1.u.ast; } + /* empty */ { $$.ast = NULL; } + | expr { $$.ast = $1.ast; } ; member_name: - T_STRING { $$.u.ast = $1.u.ast; } - | '{' expr '}' { $$.u.ast = $2.u.ast; } - | simple_variable { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } + T_STRING { $$.ast = $1.ast; } + | '{' expr '}' { $$.ast = $2.ast; } + | simple_variable { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } ; assignment_list: assignment_list ',' assignment_list_element - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } | assignment_list_element - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_LIST, $1.u.ast); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_LIST, $1.ast); } ; assignment_list_element: - variable { $$.u.ast = $1.u.ast; } - | T_LIST '(' assignment_list ')' { $$.u.ast = $3.u.ast; } - | /* empty */ { $$.u.ast = NULL; } + variable { $$.ast = $1.ast; } + | T_LIST '(' assignment_list ')' { $$.ast = $3.ast; } + | /* empty */ { $$.ast = NULL; } ; array_pair_list: - /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_ARRAY); } - | non_empty_array_pair_list possible_comma { $$.u.ast = $1.u.ast; } + /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_ARRAY); } + | non_empty_array_pair_list possible_comma { $$.ast = $1.ast; } ; non_empty_array_pair_list: non_empty_array_pair_list ',' array_pair - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } | array_pair - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARRAY, $1.u.ast); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARRAY, $1.ast); } ; array_pair: expr T_DOUBLE_ARROW expr - { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $3.u.ast, $1.u.ast); } - | expr { $$.u.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $1.u.ast, NULL); } + { $$.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $3.ast, $1.ast); } + | expr { $$.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $1.ast, NULL); } | expr T_DOUBLE_ARROW '&' variable - { $$.u.ast = zend_ast_create_ex(2, ZEND_AST_ARRAY_ELEM, 1, $4.u.ast, $1.u.ast); } + { $$.ast = zend_ast_create_ex(2, ZEND_AST_ARRAY_ELEM, 1, $4.ast, $1.ast); } | '&' variable - { $$.u.ast = zend_ast_create_ex(2, ZEND_AST_ARRAY_ELEM, 1, $2.u.ast, NULL); } + { $$.ast = zend_ast_create_ex(2, ZEND_AST_ARRAY_ELEM, 1, $2.ast, NULL); } ; encaps_list: encaps_list encaps_var - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } | encaps_list T_ENCAPSED_AND_WHITESPACE - { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); } + { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } | encaps_var - { $$.u.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ENCAPS_LIST, $1.u.ast); } + { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ENCAPS_LIST, $1.ast); } | T_ENCAPSED_AND_WHITESPACE encaps_var - { $$.u.ast = zend_ast_dynamic_add(zend_ast_create_dynamic_and_add( - ZEND_AST_ENCAPS_LIST, $1.u.ast), $2.u.ast); } + { $$.ast = zend_ast_dynamic_add(zend_ast_create_dynamic_and_add( + ZEND_AST_ENCAPS_LIST, $1.ast), $2.ast); } ; encaps_var: T_VARIABLE - { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } + { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } | T_VARIABLE '[' encaps_var_offset ']' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, - zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast), $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, + zend_ast_create_unary(ZEND_AST_VAR, $1.ast), $3.ast); } | T_VARIABLE T_OBJECT_OPERATOR T_STRING - { $$.u.ast = zend_ast_create_binary(ZEND_AST_PROP, - zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast), $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_PROP, + zend_ast_create_unary(ZEND_AST_VAR, $1.ast), $3.ast); } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' - { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); } + { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.ast); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' - { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast); } + { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.ast); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' - { $$.u.ast = zend_ast_create_binary(ZEND_AST_DIM, - zend_ast_create_unary(ZEND_AST_VAR, $2.u.ast), $4.u.ast); } - | T_CURLY_OPEN variable '}' { $$.u.ast = $2.u.ast; } + { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, + zend_ast_create_unary(ZEND_AST_VAR, $2.ast), $4.ast); } + | T_CURLY_OPEN variable '}' { $$.ast = $2.ast; } ; encaps_var_offset: - T_STRING { $$.u.ast = $1.u.ast; } - | T_NUM_STRING { $$.u.ast = $1.u.ast; } - | T_VARIABLE { $$.u.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.u.ast); } + T_STRING { $$.ast = $1.ast; } + | T_NUM_STRING { $$.ast = $1.ast; } + | T_VARIABLE { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } ; internal_functions_in_yacc: - T_ISSET '(' isset_variables ')' { $$.u.ast = $3.u.ast; } - | T_EMPTY '(' expr ')' { $$.u.ast = zend_ast_create_unary(ZEND_AST_EMPTY, $3.u.ast); } + T_ISSET '(' isset_variables ')' { $$.ast = $3.ast; } + | T_EMPTY '(' expr ')' { $$.ast = zend_ast_create_unary(ZEND_AST_EMPTY, $3.ast); } | T_INCLUDE expr - { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.u.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.ast); } | T_INCLUDE_ONCE expr - { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2.u.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2.ast); } | T_EVAL '(' expr ')' - { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_EVAL, $3.u.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_EVAL, $3.ast); } | T_REQUIRE expr - { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2.u.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2.ast); } | T_REQUIRE_ONCE expr - { $$.u.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2.u.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2.ast); } ; isset_variables: - isset_variable { $$.u.ast = $1.u.ast; } + isset_variable { $$.ast = $1.ast; } | isset_variables ',' isset_variable - { $$.u.ast = zend_ast_create_binary(ZEND_AST_AND, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_AND, $1.ast, $3.ast); } ; isset_variable: - expr { $$.u.ast = zend_ast_create_unary(ZEND_AST_ISSET, $1.u.ast); } + expr { $$.ast = zend_ast_create_unary(ZEND_AST_ISSET, $1.ast); } ; class_constant: class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.u.ast = zend_ast_create_binary( - ZEND_AST_CLASS_CONST, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary( + ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.u.ast = zend_ast_create_binary( - ZEND_AST_CLASS_CONST, $1.u.ast, $3.u.ast); } + { $$.ast = zend_ast_create_binary( + ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } ; class_name_scalar: class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS - { $$.u.ast = zend_ast_create_unary(ZEND_AST_RESOLVE_CLASS_NAME, $1.u.ast); } + { $$.ast = zend_ast_create_unary(ZEND_AST_RESOLVE_CLASS_NAME, $1.ast); } ; %% -- cgit v1.2.1 From d0943edf49e39f9aa5ab7be2ad0c9d718b891484 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 27 Jul 2014 12:49:26 +0200 Subject: Remove last EA usages Still retaining the EA field in znode as it is used by opcache --- Zend/zend_compile.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 900789a0a9..c46ed9276f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -51,7 +51,6 @@ (target)->u.constant = CONSTANT(src.constant); \ } else { \ (target)->u.op = src; \ - (target)->EA = 0; \ } \ } while (0) @@ -553,14 +552,6 @@ static int zend_add_const_name_literal(zend_op_array *op_array, zval *zv, int un op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \ } while (0) -static inline zend_bool zend_is_function_or_method_call(const znode *variable) /* {{{ */ -{ - zend_uint type = variable->EA; - - return ((type & ZEND_PARSED_METHOD_CALL) || (type == ZEND_PARSED_FUNCTION_CALL)); -} -/* }}} */ - #define MAKE_NOP(opline) { opline->opcode = ZEND_NOP; memset(&opline->result,0,sizeof(opline->result)); memset(&opline->op1,0,sizeof(opline->op1)); memset(&opline->op2,0,sizeof(opline->op2)); opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; } void zend_discard_doc_comment(TSRMLS_D) { @@ -3658,7 +3649,6 @@ static int zend_try_compile_cv(znode *result, zend_ast *ast TSRMLS_DC) { result->op_type = IS_CV; result->u.op.var = lookup_cv(CG(active_op_array), name TSRMLS_CC); - result->EA = 0; if (name->len == sizeof("this") - 1 && !memcmp(name->val, "this", sizeof("this") - 1)) { CG(active_op_array)->this_var = result->u.op.var; -- cgit v1.2.1 From 21eb6807c98756708c49cb5d571de030e41af218 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 27 Jul 2014 13:25:32 +0200 Subject: Store lineno for zval ast nodes more efficiently --- Zend/zend_ast.c | 10 ++++++---- Zend/zend_ast.h | 10 +++++++++- Zend/zend_compile.c | 4 +++- Zend/zend_language_parser.y | 1 + Zend/zend_types.h | 1 + 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 62b98ff93f..c52291cfc0 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -40,8 +40,8 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) zend_ast_zval *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast_zval)); ast->kind = ZEND_AST_ZVAL; ast->attr = attr; - ast->lineno = CG(zend_lineno); ZVAL_COPY_VALUE(&ast->val, zv); + ast->val.u2.lineno = CG(zend_lineno); return (zend_ast *) ast; } @@ -83,8 +83,11 @@ static zend_ast *zend_ast_create_from_va_list( for (i = 0; i < children; ++i) { ast->child[i] = va_arg(va, zend_ast *); - if (ast->child[i] != NULL && ast->child[i]->lineno < ast->lineno) { - ast->lineno = ast->child[i]->lineno; + if (ast->child[i] != NULL) { + zend_uint lineno = zend_ast_get_lineno(ast->child[i]); + if (lineno < ast->lineno) { + ast->lineno = lineno; + } } } @@ -341,7 +344,6 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) zend_ast_zval *copy = emalloc(sizeof(zend_ast_zval)); copy->kind = ZEND_AST_ZVAL; copy->attr = ast->attr; - copy->lineno = ast->lineno; ZVAL_DUP(©->val, zend_ast_get_zval(ast)); return (zend_ast *) copy; } else { diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 414dd3c117..5288ad8023 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -14,6 +14,7 @@ +----------------------------------------------------------------------+ | Authors: Bob Weinand | | Dmitry Stogov | + | Nikita Popov | +----------------------------------------------------------------------+ */ @@ -141,7 +142,6 @@ struct _zend_ast { typedef struct _zend_ast_zval { zend_ast_kind kind; zend_ast_attr attr; - zend_uint lineno; zval val; } zend_ast_zval; @@ -189,6 +189,14 @@ static inline zval *zend_ast_get_zval(zend_ast *ast) { static inline zend_string *zend_ast_get_str(zend_ast *ast) { return Z_STR_P(zend_ast_get_zval(ast)); } +static inline zend_uint zend_ast_get_lineno(zend_ast *ast) { + if (ast->kind == ZEND_AST_ZVAL) { + zval *zv = zend_ast_get_zval(ast); + return zv->u2.lineno; + } else { + return ast->lineno; + } +} static inline zend_ast *zend_ast_create_zval(zval *zv) { return zend_ast_create_zval_ex(zv, 0); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index c46ed9276f..f98808cd1b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -14,6 +14,7 @@ +----------------------------------------------------------------------+ | Authors: Andi Gutmans | | Zeev Suraski | + | Nikita Popov | +----------------------------------------------------------------------+ */ @@ -7453,7 +7454,8 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { } void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { - CG(zend_lineno) = ast->lineno; + //CG(zend_lineno) = ast->lineno; + CG(zend_lineno) = zend_ast_get_lineno(ast); switch (ast->kind) { case ZEND_AST_ZVAL: diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index c5cd93fd65..03bfab3814 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -15,6 +15,7 @@ +----------------------------------------------------------------------+ | Authors: Andi Gutmans | | Zeev Suraski | + | Nikita Popov | +----------------------------------------------------------------------+ */ diff --git a/Zend/zend_types.h b/Zend/zend_types.h index 232fcbadc1..7ce259a34f 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -119,6 +119,7 @@ struct _zval_struct { zend_uint next; /* hash collision chain */ zend_uint str_offset; /* string offset */ zend_uint cache_slot; /* literal cache slot */ + zend_uint lineno; /* line number (for ast nodes) */ } u2; }; -- cgit v1.2.1 From d3cb2393052d435abdad7dcdeaa726c949a37668 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 27 Jul 2014 22:26:06 +0200 Subject: Use separate node type for lists This saves storing the children count for normal ast nodes. --- Zend/zend_ast.c | 134 +++++++++--------- Zend/zend_ast.h | 173 ++++++++++++++--------- Zend/zend_compile.c | 331 +++++++++++++++++++++++--------------------- Zend/zend_language_parser.y | 56 ++++---- 4 files changed, 377 insertions(+), 317 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index c52291cfc0..de5787895f 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -79,7 +79,6 @@ static zend_ast *zend_ast_create_from_va_list( ast->kind = kind; ast->attr = attr; ast->lineno = UINT_MAX; - ast->children = children; for (i = 0; i < children; ++i) { ast->child[i] = va_arg(va, zend_ast *); @@ -124,16 +123,16 @@ ZEND_API zend_ast *zend_ast_create( return ast; } -ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind) -{ +ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind) { /* use 4 children as default */ TSRMLS_FETCH(); - zend_ast *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast) + sizeof(zend_ast *) * 3); - ast->kind = kind; - ast->attr = 0; - ast->lineno = CG(zend_lineno); - ast->children = 0; - return ast; + zend_ast_list *list = zend_arena_alloc(&CG(ast_arena), + sizeof(zend_ast_list) + sizeof(zend_ast *) * 3); + list->kind = kind; + list->attr = 0; + list->lineno = CG(zend_lineno); + list->children = 0; + return (zend_ast *) list; } static inline zend_bool is_power_of_two(unsigned short n) { @@ -142,39 +141,17 @@ static inline zend_bool is_power_of_two(unsigned short n) { ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op) { - if (ast->children >= 4 && is_power_of_two(ast->children)) { + zend_ast_list *list = zend_ast_get_list(ast); + if (list->children >= 4 && is_power_of_two(list->children)) { TSRMLS_FETCH(); - size_t old_size = sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children - 1); - zend_ast *new_ast = zend_arena_alloc(&CG(ast_arena), - sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children * 2 - 1)); - memcpy(new_ast, ast, old_size); - ast = new_ast; - } - ast->child[ast->children++] = op; - return ast; -} - -ZEND_API void zend_ast_dynamic_shrink(zend_ast **ast) -{ - *ast = erealloc(*ast, sizeof(zend_ast) + sizeof(zend_ast *) * ((*ast)->children - 1)); -} - -ZEND_API int zend_ast_is_ct_constant(zend_ast *ast) -{ - int i; - - if (ast->kind == ZEND_AST_ZVAL) { - return !Z_CONSTANT_P(zend_ast_get_zval(ast)); - } else { - for (i = 0; i < ast->children; i++) { - if (ast->child[i]) { - if (!zend_ast_is_ct_constant(ast->child[i])) { - return 0; - } - } - } - return 1; + size_t old_size = sizeof(zend_ast_list) + sizeof(zend_ast *) * (list->children - 1); + zend_ast_list *new_list = zend_arena_alloc(&CG(ast_arena), + sizeof(zend_ast_list) + sizeof(zend_ast *) * (list->children * 2 - 1)); + memcpy(new_list, list, old_size); + list = new_list; } + list->child[list->children++] = op; + return (zend_ast *) list; } static void zend_ast_add_array_element(zval *result, zval *offset, zval *expr TSRMLS_DC) @@ -237,16 +214,14 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s zval_dtor(&op2); break; } - case ZEND_BW_NOT: - zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - bitwise_not_function(result, &op1 TSRMLS_CC); - zval_dtor(&op1); - break; - case ZEND_BOOL_NOT: + case ZEND_AST_UNARY_OP: + { + unary_op_type op = get_unary_op(ast->attr); zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); - boolean_not_function(result, &op1 TSRMLS_CC); + op(result, &op1 TSRMLS_CC); zval_dtor(&op1); break; + } case ZEND_AST_ZVAL: ZVAL_DUP(result, zend_ast_get_zval(ast)); if (Z_OPT_CONSTANT_P(result)) { @@ -305,8 +280,9 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s array_init(result); { zend_uint i; - for (i = 0; i < ast->children; i++) { - zend_ast *elem = ast->child[i]; + zend_ast_list *list = zend_ast_get_list(ast); + for (i = 0; i < list->children; i++) { + zend_ast *elem = list->child[i]; if (elem->child[1]) { zend_ast_evaluate(&op1, elem->child[1], scope TSRMLS_CC); } else { @@ -341,18 +317,29 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) if (ast == NULL) { return NULL; } else if (ast->kind == ZEND_AST_ZVAL) { - zend_ast_zval *copy = emalloc(sizeof(zend_ast_zval)); - copy->kind = ZEND_AST_ZVAL; - copy->attr = ast->attr; - ZVAL_DUP(©->val, zend_ast_get_zval(ast)); - return (zend_ast *) copy; + zend_ast_zval *new = emalloc(sizeof(zend_ast_zval)); + new->kind = ZEND_AST_ZVAL; + new->attr = ast->attr; + ZVAL_DUP(&new->val, zend_ast_get_zval(ast)); + return (zend_ast *) new; + } else if (zend_ast_is_list(ast)) { + zend_ast_list *list = zend_ast_get_list(ast); + zend_ast_list *new = emalloc(sizeof(zend_ast_list) + + sizeof(zend_ast *) * (list->children - 1)); + zend_uint i; + new->kind = list->kind; + new->attr = list->attr; + new->children = list->children; + for (i = 0; i < list->children; i++) { + new->child[i] = zend_ast_copy(list->child[i]); + } + return (zend_ast *) new; } else { - zend_ast *new = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * (ast->children - 1)); - int i; + zend_uint i, children = zend_ast_get_num_children(ast); + zend_ast *new = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * (children - 1)); new->kind = ast->kind; new->attr = ast->attr; - new->children = ast->children; - for (i = 0; i < ast->children; i++) { + for (i = 0; i < children; i++) { new->child[i] = zend_ast_copy(ast->child[i]); } return new; @@ -386,12 +373,18 @@ static void zend_ast_destroy_ex(zend_ast *ast, zend_bool free) { break; } default: - { - zend_uint i; - for (i = 0; i < ast->children; i++) { - zend_ast_destroy_ex(ast->child[i], free); + if (zend_ast_is_list(ast)) { + zend_ast_list *list = zend_ast_get_list(ast); + zend_uint i; + for (i = 0; i < list->children; i++) { + zend_ast_destroy_ex(list->child[i], free); + } + } else { + zend_uint i, children = zend_ast_get_num_children(ast); + for (i = 0; i < children; i++) { + zend_ast_destroy_ex(ast->child[i], free); + } } - } } if (free) { @@ -405,3 +398,18 @@ ZEND_API void zend_ast_destroy(zend_ast *ast) { ZEND_API void zend_ast_destroy_and_free(zend_ast *ast) { zend_ast_destroy_ex(ast, 1); } + +ZEND_API void zend_ast_apply(zend_ast *ast, zend_ast_apply_func fn TSRMLS_DC) { + if (zend_ast_is_list(ast)) { + zend_ast_list *list = zend_ast_get_list(ast); + zend_uint i; + for (i = 0; i < list->children; ++i) { + fn(&list->child[i] TSRMLS_CC); + } + } else { + zend_uint i, children = zend_ast_get_num_children(ast); + for (i = 0; i < children; ++i) { + fn(&ast->child[i] TSRMLS_CC); + } + } +} diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 5288ad8023..87b26405a6 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -25,31 +25,49 @@ #include "zend.h" + +#define ZEND_AST_IS_LIST_SHIFT 11 +#define ZEND_AST_NUM_CHILDREN_SHIFT 12 + enum _zend_ast_kind { /* first 256 kinds are reserved for opcodes */ ZEND_AST_ZVAL = 256, ZEND_AST_ZNODE, - ZEND_AST_VAR, - ZEND_AST_DIM, - ZEND_AST_PROP, - ZEND_AST_STATIC_PROP, + /* declaration nodes */ + ZEND_AST_FUNC_DECL, + ZEND_AST_CLOSURE, + ZEND_AST_METHOD, + ZEND_AST_CLASS, - ZEND_AST_CALL, - ZEND_AST_METHOD_CALL, - ZEND_AST_STATIC_CALL, - ZEND_AST_ARG_LIST, - ZEND_AST_UNPACK, + /* list nodes */ + ZEND_AST_ARG_LIST = 1 << ZEND_AST_IS_LIST_SHIFT, + ZEND_AST_LIST, + ZEND_AST_ARRAY, + ZEND_AST_ENCAPS_LIST, + ZEND_AST_EXPR_LIST, + ZEND_AST_STMT_LIST, + ZEND_AST_IF, + ZEND_AST_SWITCH_LIST, + ZEND_AST_CATCH_LIST, + ZEND_AST_PARAM_LIST, + ZEND_AST_CLOSURE_USES, + ZEND_AST_PROP_DECL, + ZEND_AST_CONST_DECL, + ZEND_AST_CLASS_CONST_DECL, + ZEND_AST_NAME_LIST, + ZEND_AST_TRAIT_ADAPTATIONS, + ZEND_AST_USE, + + /* 0 child nodes */ + ZEND_AST_MAGIC_CONST = 0 << ZEND_AST_NUM_CHILDREN_SHIFT, + ZEND_AST_TYPE, + /* 1 child node */ + ZEND_AST_VAR = 1 << ZEND_AST_NUM_CHILDREN_SHIFT, ZEND_AST_CONST, - ZEND_AST_CLASS_CONST, ZEND_AST_RESOLVE_CLASS_NAME, - - ZEND_AST_ASSIGN, - ZEND_AST_ASSIGN_REF, - ZEND_AST_ASSIGN_OP, - ZEND_AST_LIST, - + ZEND_AST_UNPACK, ZEND_AST_UNARY_PLUS, ZEND_AST_UNARY_MINUS, ZEND_AST_CAST, @@ -57,75 +75,75 @@ enum _zend_ast_kind { ZEND_AST_ISSET, ZEND_AST_SILENCE, ZEND_AST_SHELL_EXEC, + ZEND_AST_CLONE, + ZEND_AST_EXIT, + ZEND_AST_PRINT, + ZEND_AST_INCLUDE_OR_EVAL, + ZEND_AST_UNARY_OP, + ZEND_AST_PRE_INC, + ZEND_AST_PRE_DEC, + ZEND_AST_POST_INC, + ZEND_AST_POST_DEC, + ZEND_AST_GLOBAL, + ZEND_AST_UNSET, + ZEND_AST_RETURN, + ZEND_AST_LABEL, + ZEND_AST_REF, + ZEND_AST_HALT_COMPILER, + ZEND_AST_ECHO, + ZEND_AST_THROW, + ZEND_AST_GOTO, + ZEND_AST_BREAK, + ZEND_AST_CONTINUE, + + /* 2 child nodes */ + ZEND_AST_DIM = 2 << ZEND_AST_NUM_CHILDREN_SHIFT, + ZEND_AST_PROP, + ZEND_AST_STATIC_PROP, + ZEND_AST_CALL, + ZEND_AST_CLASS_CONST, + ZEND_AST_ASSIGN, + ZEND_AST_ASSIGN_REF, + ZEND_AST_ASSIGN_OP, ZEND_AST_BINARY_OP, ZEND_AST_GREATER, ZEND_AST_GREATER_EQUAL, ZEND_AST_AND, ZEND_AST_OR, - - ZEND_AST_CONDITIONAL, - - ZEND_AST_ARRAY, ZEND_AST_ARRAY_ELEM, - ZEND_AST_ENCAPS_LIST, - ZEND_AST_MAGIC_CONST, - - ZEND_AST_EXPR_LIST, - ZEND_AST_STMT_LIST, + ZEND_AST_NEW, + ZEND_AST_INSTANCEOF, + ZEND_AST_YIELD, - ZEND_AST_GLOBAL, ZEND_AST_STATIC, - ZEND_AST_UNSET, - ZEND_AST_RETURN, - ZEND_AST_LABEL, - ZEND_AST_WHILE, ZEND_AST_DO_WHILE, - ZEND_AST_FOR, - ZEND_AST_FOREACH, - ZEND_AST_REF, - ZEND_AST_IF, ZEND_AST_IF_ELEM, - ZEND_AST_SWITCH, - ZEND_AST_SWITCH_LIST, ZEND_AST_SWITCH_CASE, - - ZEND_AST_TRY, - ZEND_AST_CATCH_LIST, - ZEND_AST_CATCH, ZEND_AST_DECLARE, - - ZEND_AST_PARAM_LIST, - ZEND_AST_PARAM, - ZEND_AST_TYPE, - - ZEND_AST_FUNC_DECL, - ZEND_AST_CLOSURE, - ZEND_AST_CLOSURE_USES, - ZEND_AST_METHOD, - - ZEND_AST_PROP_DECL, ZEND_AST_PROP_ELEM, - - ZEND_AST_CONST_DECL, - ZEND_AST_CLASS_CONST_DECL, ZEND_AST_CONST_ELEM, - ZEND_AST_USE_TRAIT, - ZEND_AST_NAME_LIST, - ZEND_AST_TRAIT_ADAPTATIONS, ZEND_AST_TRAIT_PRECEDENCE, - ZEND_AST_TRAIT_ALIAS, ZEND_AST_METHOD_REFERENCE, + ZEND_AST_NAMESPACE, + ZEND_AST_USE_ELEM, + ZEND_AST_TRAIT_ALIAS, - ZEND_AST_CLASS, + /* 3 child nodes */ + ZEND_AST_METHOD_CALL = 3 << ZEND_AST_NUM_CHILDREN_SHIFT, + ZEND_AST_STATIC_CALL, + ZEND_AST_CONDITIONAL, - ZEND_AST_USE, - ZEND_AST_USE_ELEM, - ZEND_AST_NAMESPACE, - ZEND_AST_HALT_COMPILER, + ZEND_AST_TRY, + ZEND_AST_CATCH, + ZEND_AST_PARAM, + + /* 4 child nodes */ + ZEND_AST_FOR = 4 << ZEND_AST_NUM_CHILDREN_SHIFT, + ZEND_AST_FOREACH, }; typedef unsigned short zend_ast_kind; @@ -135,10 +153,18 @@ struct _zend_ast { zend_ast_kind kind; /* Type of the node (either opcode or ZEND_AST_* constant) */ zend_ast_attr attr; /* Additional attribute, use depending on node type */ zend_uint lineno; /* Line number */ - zend_uint children; /* Number of children */ zend_ast *child[1]; /* Array of children (using struct hack) */ }; +/* Same as zend_ast, but with children count, which is updated dynamically */ +typedef struct _zend_ast_list { + zend_ast_kind kind; + zend_ast_attr attr; + zend_uint lineno; + zend_uint children; + zend_ast *child[1]; +} zend_ast_list; + typedef struct _zend_ast_zval { zend_ast_kind kind; zend_ast_attr attr; @@ -173,9 +199,6 @@ ZEND_API zend_ast *zend_ast_create_decl( ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind); ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op); -ZEND_API void zend_ast_dynamic_shrink(zend_ast **ast); - -ZEND_API int zend_ast_is_ct_constant(zend_ast *ast); ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *scope TSRMLS_DC); @@ -183,6 +206,22 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast); ZEND_API void zend_ast_destroy(zend_ast *ast); ZEND_API void zend_ast_destroy_and_free(zend_ast *ast); +typedef void (*zend_ast_apply_func)(zend_ast **ast_ptr TSRMLS_DC); +ZEND_API void zend_ast_apply(zend_ast *ast, zend_ast_apply_func fn TSRMLS_DC); + +static inline zend_bool zend_ast_is_list(zend_ast *ast) { + return (ast->kind >> ZEND_AST_IS_LIST_SHIFT) & 1; +} +static inline zend_ast_list *zend_ast_get_list(zend_ast *ast) { + ZEND_ASSERT(zend_ast_is_list(ast)); + return (zend_ast_list *) ast; +} + +/* Only for non-lists! */ +static inline zend_uint zend_ast_get_num_children(zend_ast *ast) { + return ast->kind >> ZEND_AST_NUM_CHILDREN_SHIFT; +} + static inline zval *zend_ast_get_zval(zend_ast *ast) { return &((zend_ast_zval *) ast)->val; } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f98808cd1b..abf931ea62 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3823,15 +3823,16 @@ static zend_uchar get_list_fetch_opcode(zend_uchar op_type) { } } -static void zend_compile_list_assign(znode *result, zend_ast *list_ast, znode *expr_node TSRMLS_DC) { +static void zend_compile_list_assign(znode *result, zend_ast *ast, znode *expr_node TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; - if (list_ast->children == 1 && !list_ast->child[0]) { + if (list->children == 1 && !list->child[0]) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use empty list"); } - for (i = 0; i < list_ast->children; ++i) { - zend_ast *var_ast = list_ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *var_ast = list->child[i]; znode fetch_result, dim_node, var_node, assign_result; zend_op *opline; @@ -3985,7 +3986,7 @@ void zend_compile_assign_ref(znode *result, zend_ast *ast TSRMLS_DC) { if (zend_is_call(source_ast)) { opline->extended_value = ZEND_RETURNS_FUNCTION; - } else if (source_ast->kind == ZEND_NEW) { + } else if (source_ast->kind == ZEND_AST_NEW) { opline->extended_value = ZEND_RETURNS_NEW; } } @@ -4031,8 +4032,9 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { } } -zend_uint zend_compile_args(zend_ast *args, zend_function *fbc TSRMLS_DC) { +zend_uint zend_compile_args(zend_ast *ast, zend_function *fbc TSRMLS_DC) { // TODO.AST &var error + zend_ast_list *args = zend_ast_get_list(ast); zend_uint i; zend_bool uses_arg_unpack = 0; zend_uint arg_count = 0; /* number of arguments not including unpacks */ @@ -4183,7 +4185,7 @@ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_a zend_compile_call_common(result, args_ast, NULL TSRMLS_CC); } -static zend_bool zend_args_contain_unpack(zend_ast *args) { +static zend_bool zend_args_contain_unpack(zend_ast_list *args) { zend_uint i; for (i = 0; i < args->children; ++i) { if (args->child[i]->kind == ZEND_AST_UNPACK) { @@ -4193,43 +4195,43 @@ static zend_bool zend_args_contain_unpack(zend_ast *args) { return 0; } -int zend_compile_func_strlen(znode *result, zend_ast *args_ast TSRMLS_DC) { +int zend_compile_func_strlen(znode *result, zend_ast_list *args TSRMLS_DC) { znode arg_node; if ((CG(compiler_options) & ZEND_COMPILE_NO_BUILTIN_STRLEN) - || args_ast->children != 1 || args_ast->child[0]->kind == ZEND_AST_UNPACK + || args->children != 1 || args->child[0]->kind == ZEND_AST_UNPACK ) { return FAILURE; } - zend_compile_expr(&arg_node, args_ast->child[0] TSRMLS_CC); + zend_compile_expr(&arg_node, args->child[0] TSRMLS_CC); emit_op(result, ZEND_STRLEN, &arg_node, NULL TSRMLS_CC); return SUCCESS; } -int zend_compile_func_typecheck(znode *result, zend_ast *args_ast, zend_uint type TSRMLS_DC) { +int zend_compile_func_typecheck(znode *result, zend_ast_list *args, zend_uint type TSRMLS_DC) { znode arg_node; zend_op *opline; - if (args_ast->children != 1 || args_ast->child[0]->kind == ZEND_AST_UNPACK) { + if (args->children != 1 || args->child[0]->kind == ZEND_AST_UNPACK) { return FAILURE; } - zend_compile_expr(&arg_node, args_ast->child[0] TSRMLS_CC); + zend_compile_expr(&arg_node, args->child[0] TSRMLS_CC); opline = emit_op(result, ZEND_TYPE_CHECK, &arg_node, NULL TSRMLS_CC); opline->extended_value = type; return SUCCESS; } -int zend_compile_func_defined(znode *result, zend_ast *args_ast TSRMLS_DC) { +int zend_compile_func_defined(znode *result, zend_ast_list *args TSRMLS_DC) { zend_string *name; zend_op *opline; - if (args_ast->children != 1 || args_ast->child[0]->kind != ZEND_AST_ZVAL) { + if (args->children != 1 || args->child[0]->kind != ZEND_AST_ZVAL) { return FAILURE; } - name = zval_get_string(zend_ast_get_zval(args_ast->child[0])); + name = zval_get_string(zend_ast_get_zval(args->child[0])); if (zend_memrchr(name->val, '\\', name->len) || zend_memrchr(name->val, ':', name->len)) { STR_RELEASE(name); return FAILURE; @@ -4301,15 +4303,15 @@ static void zend_compile_init_user_func( } /* cufa = call_user_func_array */ -int zend_compile_func_cufa(znode *result, zend_ast *args_ast, zend_string *lcname TSRMLS_DC) { +int zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_string *lcname TSRMLS_DC) { znode arg_node; - if (args_ast->children != 2 || zend_args_contain_unpack(args_ast)) { + if (args->children != 2 || zend_args_contain_unpack(args)) { return FAILURE; } - zend_compile_init_user_func(NULL, args_ast->child[0], 1, lcname TSRMLS_CC); - zend_compile_expr(&arg_node, args_ast->child[1] TSRMLS_CC); + zend_compile_init_user_func(NULL, args->child[0], 1, lcname TSRMLS_CC); + zend_compile_expr(&arg_node, args->child[1] TSRMLS_CC); emit_op(NULL, ZEND_SEND_ARRAY, &arg_node, NULL TSRMLS_CC); emit_op(result, ZEND_DO_FCALL, NULL, NULL TSRMLS_CC); @@ -4317,16 +4319,16 @@ int zend_compile_func_cufa(znode *result, zend_ast *args_ast, zend_string *lcnam } /* cuf = call_user_func */ -int zend_compile_func_cuf(znode *result, zend_ast *args_ast, zend_string *lcname TSRMLS_DC) { +int zend_compile_func_cuf(znode *result, zend_ast_list *args, zend_string *lcname TSRMLS_DC) { zend_uint i; - if (args_ast->children < 1 || zend_args_contain_unpack(args_ast)) { + if (args->children < 1 || zend_args_contain_unpack(args)) { return FAILURE; } - zend_compile_init_user_func(NULL, args_ast->child[0], args_ast->children - 1, lcname TSRMLS_CC); - for (i = 1; i < args_ast->children; ++i) { - zend_ast *arg_ast = args_ast->child[i]; + zend_compile_init_user_func(NULL, args->child[0], args->children - 1, lcname TSRMLS_CC); + for (i = 1; i < args->children; ++i) { + zend_ast *arg_ast = args->child[i]; znode arg_node; zend_op *opline; zend_bool send_user = 0; @@ -4355,32 +4357,32 @@ int zend_compile_func_cuf(znode *result, zend_ast *args_ast, zend_string *lcname } int zend_try_compile_special_func( - znode *result, zend_string *lcname, zend_ast *args_ast TSRMLS_DC + znode *result, zend_string *lcname, zend_ast_list *args TSRMLS_DC ) { if (zend_str_equals(lcname, "strlen")) { - return zend_compile_func_strlen(result, args_ast TSRMLS_CC); + return zend_compile_func_strlen(result, args TSRMLS_CC); } else if (zend_str_equals(lcname, "is_null")) { - return zend_compile_func_typecheck(result, args_ast, IS_NULL TSRMLS_CC); + return zend_compile_func_typecheck(result, args, IS_NULL TSRMLS_CC); } else if (zend_str_equals(lcname, "is_bool")) { - return zend_compile_func_typecheck(result, args_ast, _IS_BOOL TSRMLS_CC); + return zend_compile_func_typecheck(result, args, _IS_BOOL TSRMLS_CC); } else if (zend_str_equals(lcname, "is_long")) { - return zend_compile_func_typecheck(result, args_ast, IS_LONG TSRMLS_CC); + return zend_compile_func_typecheck(result, args, IS_LONG TSRMLS_CC); } else if (zend_str_equals(lcname, "is_float")) { - return zend_compile_func_typecheck(result, args_ast, IS_DOUBLE TSRMLS_CC); + return zend_compile_func_typecheck(result, args, IS_DOUBLE TSRMLS_CC); } else if (zend_str_equals(lcname, "is_string")) { - return zend_compile_func_typecheck(result, args_ast, IS_STRING TSRMLS_CC); + return zend_compile_func_typecheck(result, args, IS_STRING TSRMLS_CC); } else if (zend_str_equals(lcname, "is_array")) { - return zend_compile_func_typecheck(result, args_ast, IS_ARRAY TSRMLS_CC); + return zend_compile_func_typecheck(result, args, IS_ARRAY TSRMLS_CC); } else if (zend_str_equals(lcname, "is_object")) { - return zend_compile_func_typecheck(result, args_ast, IS_OBJECT TSRMLS_CC); + return zend_compile_func_typecheck(result, args, IS_OBJECT TSRMLS_CC); } else if (zend_str_equals(lcname, "is_resource")) { - return zend_compile_func_typecheck(result, args_ast, IS_RESOURCE TSRMLS_CC); + return zend_compile_func_typecheck(result, args, IS_RESOURCE TSRMLS_CC); } else if (zend_str_equals(lcname, "defined")) { - return zend_compile_func_defined(result, args_ast TSRMLS_CC); + return zend_compile_func_defined(result, args TSRMLS_CC); } else if (zend_str_equals(lcname, "call_user_func_array")) { - return zend_compile_func_cufa(result, args_ast, lcname TSRMLS_CC); + return zend_compile_func_cufa(result, args, lcname TSRMLS_CC); } else if (zend_str_equals(lcname, "call_user_func")) { - return zend_compile_func_cuf(result, args_ast, lcname TSRMLS_CC); + return zend_compile_func_cuf(result, args, lcname TSRMLS_CC); } else { return FAILURE; } @@ -4423,7 +4425,9 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { return; } - if (zend_try_compile_special_func(result, lcname, args_ast TSRMLS_CC) == SUCCESS) { + if (zend_try_compile_special_func(result, lcname, + zend_ast_get_list(args_ast) TSRMLS_CC) == SUCCESS + ) { STR_RELEASE(lcname); zval_ptr_dtor(&name_node.u.constant); return; @@ -4731,31 +4735,31 @@ void zend_compile_throw(zend_ast *ast TSRMLS_DC) { void zend_compile_break_continue(zend_ast *ast TSRMLS_DC) { zend_ast *depth_ast = ast->child[0]; - zend_uint opcode = ast->kind; znode depth_node; zend_op *opline; - ZEND_ASSERT(opcode == ZEND_BRK || opcode == ZEND_CONT); + ZEND_ASSERT(ast->kind == ZEND_AST_BREAK || ast->kind == ZEND_AST_CONTINUE); if (depth_ast) { if (depth_ast->kind != ZEND_AST_ZVAL) { zend_error_noreturn(E_COMPILE_ERROR, "'%s' operator with non-constant operand " - "is no longer supported", opcode == ZEND_BRK ? "break" : "continue"); + "is no longer supported", ast->kind == ZEND_AST_BREAK ? "break" : "continue"); } zend_compile_expr(&depth_node, depth_ast TSRMLS_CC); if (Z_TYPE(depth_node.u.constant) != IS_LONG || Z_LVAL(depth_node.u.constant) < 1) { zend_error_noreturn(E_COMPILE_ERROR, "'%s' operator accepts only positive numbers", - opcode == ZEND_BRK ? "break" : "continue"); + ast->kind == ZEND_AST_BREAK ? "break" : "continue"); } } else { depth_node.op_type = IS_CONST; ZVAL_LONG(&depth_node.u.constant, 1); } - opline = emit_op(NULL, opcode, NULL, &depth_node TSRMLS_CC); + opline = emit_op(NULL, ast->kind == ZEND_AST_BREAK ? ZEND_BRK : ZEND_CONT, + NULL, &depth_node TSRMLS_CC); opline->op1.opline_num = CG(context).current_brk_cont; } @@ -4832,6 +4836,7 @@ void zend_compile_do_while(zend_ast *ast TSRMLS_DC) { } void zend_compile_expr_list(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast_list *list; zend_uint i; result->op_type = IS_CONST; @@ -4840,8 +4845,10 @@ void zend_compile_expr_list(znode *result, zend_ast *ast TSRMLS_DC) { if (!ast) { return; } - for (i = 0; i < ast->children; ++i) { - zend_ast *expr_ast = ast->child[i]; + + list = zend_ast_get_list(ast); + for (i = 0; i < list->children; ++i) { + zend_ast *expr_ast = list->child[i]; zend_do_free(result TSRMLS_CC); zend_compile_expr(result, expr_ast TSRMLS_CC); @@ -4988,12 +4995,13 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { } void zend_compile_if(zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; - zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), ast->children - 1, 0); + zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), list->children - 1, 0); zend_uint opnum_last_jmpz = 0; - for (i = 0; i < ast->children; ++i) { - zend_ast *elem_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *elem_ast = list->child[i]; zend_ast *cond_ast = elem_ast->child[0]; zend_ast *stmt_ast = elem_ast->child[1]; @@ -5005,7 +5013,7 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { zend_compile_stmt(stmt_ast TSRMLS_CC); - if (i != ast->children - 1) { + if (i != list->children - 1) { jmp_opnums[i] = zend_emit_jump(0 TSRMLS_CC); } @@ -5014,7 +5022,7 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { } } - for (i = 0; i < ast->children - 1; ++i) { + for (i = 0; i < list->children - 1; ++i) { zend_update_jump_target_to_next(jmp_opnums[i] TSRMLS_CC); } @@ -5023,7 +5031,7 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { void zend_compile_switch(zend_ast *ast TSRMLS_DC) { zend_ast *expr_ast = ast->child[0]; - zend_ast *cases_ast = ast->child[1]; + zend_ast_list *cases = zend_ast_get_list(ast->child[1]); zend_uint i; zend_bool has_default_case = 0; @@ -5031,7 +5039,7 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { znode expr_node, case_node; zend_op *opline; - zend_uint *jmpnz_opnums = safe_emalloc(sizeof(zend_uint), cases_ast->children, 0); + zend_uint *jmpnz_opnums = safe_emalloc(sizeof(zend_uint), cases->children, 0); zend_uint opnum_default_jmp; zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); @@ -5046,8 +5054,8 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { case_node.op_type = IS_TMP_VAR; case_node.u.op.var = get_temporary_variable(CG(active_op_array)); - for (i = 0; i < cases_ast->children; ++i) { - zend_ast *case_ast = cases_ast->child[i]; + for (i = 0; i < cases->children; ++i) { + zend_ast *case_ast = cases->child[i]; zend_ast *cond_ast = case_ast->child[0]; znode cond_node; @@ -5069,8 +5077,8 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { opnum_default_jmp = zend_emit_jump(0 TSRMLS_CC); - for (i = 0; i < cases_ast->children; ++i) { - zend_ast *case_ast = cases_ast->child[i]; + for (i = 0; i < cases->children; ++i) { + zend_ast *case_ast = cases->child[i]; zend_ast *cond_ast = case_ast->child[0]; zend_ast *stmt_ast = case_ast->child[1]; @@ -5102,32 +5110,32 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { void zend_compile_try(zend_ast *ast TSRMLS_DC) { zend_ast *try_ast = ast->child[0]; - zend_ast *catches_ast = ast->child[1]; + zend_ast_list *catches = zend_ast_get_list(ast->child[1]); zend_ast *finally_ast = ast->child[2]; zend_uint i; zend_op *opline; zend_uint try_catch_offset = zend_add_try_element( get_next_op_number(CG(active_op_array)) TSRMLS_CC); - zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), catches_ast->children, 0); + zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), catches->children, 0); - if (catches_ast->children == 0 && !finally_ast) { + if (catches->children == 0 && !finally_ast) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use try without catch or finally"); } zend_compile_stmt(try_ast TSRMLS_CC); - if (catches_ast->children != 0) { + if (catches->children != 0) { jmp_opnums[0] = zend_emit_jump(0 TSRMLS_CC); } - for (i = 0; i < catches_ast->children; ++i) { - zend_ast *catch_ast = catches_ast->child[i]; + for (i = 0; i < catches->children; ++i) { + zend_ast *catch_ast = catches->child[i]; zend_ast *class_ast = catch_ast->child[0]; zend_ast *var_ast = catch_ast->child[1]; zend_ast *stmt_ast = catch_ast->child[2]; zval *var_name = zend_ast_get_zval(var_ast); - zend_bool is_last_catch = (i + 1 == catches_ast->children); + zend_bool is_last_catch = (i + 1 == catches->children); zend_uint opnum_catch; @@ -5162,7 +5170,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { opline->extended_value = get_next_op_number(CG(active_op_array)); } - for (i = 0; i < catches_ast->children; ++i) { + for (i = 0; i < catches->children; ++i) { zend_update_jump_target_to_next(jmp_opnums[i] TSRMLS_CC); } @@ -5192,13 +5200,13 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { } void zend_compile_declare(zend_ast *ast TSRMLS_DC) { - zend_ast *declares_ast = ast->child[0]; + zend_ast_list *declares = zend_ast_get_list(ast->child[0]); zend_ast *stmt_ast = ast->child[1]; zend_declarables orig_declarables = CG(declarables); zend_uint i; - for (i = 0; i < declares_ast->children; ++i) { - zend_ast *declare_ast = declares_ast->child[i]; + for (i = 0; i < declares->children; ++i) { + zend_ast *declare_ast = declares->child[i]; zend_ast *name_ast = declare_ast->child[0]; zend_ast *value_ast = declare_ast->child[1]; @@ -5276,24 +5284,26 @@ void zend_compile_declare(zend_ast *ast TSRMLS_DC) { } void zend_compile_stmt_list(zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; - for (i = 0; i < ast->children; ++i) { - zend_compile_stmt(ast->child[i] TSRMLS_CC); + for (i = 0; i < list->children; ++i) { + zend_compile_stmt(list->child[i] TSRMLS_CC); } } void zend_compile_params(zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; zend_op_array *op_array = CG(active_op_array); zend_arg_info *arg_infos; - if (ast->children == 0) { + if (list->children == 0) { return; } - arg_infos = safe_emalloc(sizeof(zend_arg_info), ast->children, 0); - for (i = 0; i < ast->children; ++i) { - zend_ast *param_ast = ast->child[i]; + arg_infos = safe_emalloc(sizeof(zend_arg_info), list->children, 0); + for (i = 0; i < list->children; ++i) { + zend_ast *param_ast = list->child[i]; zend_ast *type_ast = param_ast->child[0]; zend_ast *var_ast = param_ast->child[1]; zend_ast *default_ast = param_ast->child[2]; @@ -5412,19 +5422,16 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { } /* These are assigned at the end to avoid unitialized memory in case of an error */ - op_array->num_args = ast->children; + op_array->num_args = list->children; op_array->arg_info = arg_infos; } void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; - if (!ast) { - return; - } - - for (i = 0; i < ast->children; ++i) { - zend_ast *var_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *var_ast = list->child[i]; zend_string *name = Z_STR_P(zend_ast_get_zval(var_ast)); zend_bool by_ref = var_ast->attr; zval zv; @@ -5657,7 +5664,9 @@ static void zend_begin_func_decl( } } - if (zend_str_equals(lcname, ZEND_AUTOLOAD_FUNC_NAME) && params_ast->children != 1) { + if (zend_str_equals(lcname, ZEND_AUTOLOAD_FUNC_NAME) + && zend_ast_get_list(params_ast)->children != 1 + ) { zend_error_noreturn(E_COMPILE_ERROR, "%s() must take exactly 1 argument", ZEND_AUTOLOAD_FUNC_NAME); } @@ -5745,7 +5754,9 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { } zend_compile_params(params_ast TSRMLS_CC); - zend_compile_closure_uses(uses_ast TSRMLS_CC); + if (uses_ast) { + zend_compile_closure_uses(uses_ast TSRMLS_CC); + } zend_compile_stmt(stmt_ast TSRMLS_CC); if (is_method) { @@ -5767,7 +5778,8 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { } void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { - zend_uint flags = ast->attr; + zend_ast_list *list = zend_ast_get_list(ast); + zend_uint flags = list->attr; zend_class_entry *ce = CG(active_class_entry); zend_uint i; @@ -5779,8 +5791,8 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "Properties cannot be declared abstract"); } - for (i = 0; i < ast->children; ++i) { - zend_ast *prop_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *prop_ast = list->child[i]; zend_ast *name_ast = prop_ast->child[0]; zend_ast *value_ast = prop_ast->child[1]; zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); @@ -5809,11 +5821,12 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { } void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_class_entry *ce = CG(active_class_entry); zend_uint i; - for (i = 0; i < ast->children; ++i) { - zend_ast *const_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *const_ast = list->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)); @@ -5862,15 +5875,16 @@ static zend_trait_method_reference *zend_compile_method_ref(zend_ast *ast TSRMLS } static zend_string **zend_compile_name_list(zend_ast *ast TSRMLS_DC) { - zend_string **names = safe_emalloc(sizeof(zend_string *), ast->children + 1, 0); + zend_ast_list *list = zend_ast_get_list(ast); + zend_string **names = safe_emalloc(sizeof(zend_string *), list->children + 1, 0); zend_uint i; - for (i = 0; i < ast->children; ++i) { - zend_ast *name_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *name_ast = list->child[i]; names[i] = zend_resolve_class_name_ast(name_ast TSRMLS_CC); } - names[ast->children] = NULL; + names[list->children] = NULL; return names; } @@ -5916,14 +5930,14 @@ static void zend_compile_trait_alias(zend_ast *ast TSRMLS_DC) { } void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { - zend_ast *traits_ast = ast->child[0]; - zend_ast *adaptations_ast = ast->child[1]; + zend_ast_list *traits = zend_ast_get_list(ast->child[0]); + zend_ast_list *adaptations = ast->child[1] ? zend_ast_get_list(ast->child[1]) : NULL; zend_class_entry *ce = CG(active_class_entry); zend_op *opline; zend_uint i; - for (i = 0; i < traits_ast->children; ++i) { - zend_ast *trait_ast = traits_ast->child[i]; + for (i = 0; i < traits->children; ++i) { + zend_ast *trait_ast = traits->child[i]; zend_string *name = Z_STR_P(zend_ast_get_zval(trait_ast)); if (ce->ce_flags & ZEND_ACC_INTERFACE) { @@ -5951,12 +5965,12 @@ void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { ce->num_traits++; } - if (!adaptations_ast) { + if (!adaptations) { return; } - for (i = 0; i < adaptations_ast->children; ++i) { - zend_ast *adaptation_ast = adaptations_ast->child[i]; + for (i = 0; i < adaptations->children; ++i) { + zend_ast *adaptation_ast = adaptations->child[i]; switch (adaptation_ast->kind) { case ZEND_AST_TRAIT_PRECEDENCE: zend_compile_trait_precedence(adaptation_ast TSRMLS_CC); @@ -5970,9 +5984,10 @@ void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { } void zend_compile_implements(znode *class_node, zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; - for (i = 0; i < ast->children; ++i) { - zend_ast *class_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *class_ast = list->child[i]; zend_string *name = Z_STR_P(zend_ast_get_zval(class_ast)); zend_op *opline; @@ -6221,6 +6236,7 @@ static void zend_check_already_in_use( } void zend_compile_use(zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; zend_string *current_ns = Z_TYPE(CG(current_namespace)) != IS_UNDEF ? Z_STR(CG(current_namespace)) : NULL; @@ -6228,8 +6244,8 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { HashTable *current_import = zend_get_import_ht(type TSRMLS_CC); zend_bool case_sensitive = type == T_CONST; - for (i = 0; i < ast->children; ++i) { - zend_ast *use_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *use_ast = list->child[i]; zend_ast *old_name_ast = use_ast->child[0]; zend_ast *new_name_ast = use_ast->child[1]; zend_string *old_name = Z_STR_P(zend_ast_get_zval(old_name_ast)); @@ -6328,9 +6344,10 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { } void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; - for (i = 0; i < ast->children; ++i) { - zend_ast *const_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *const_ast = list->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)); @@ -6518,11 +6535,12 @@ void zend_compile_greater(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_unary_op(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *expr_ast = ast->child[0]; + zend_uint opcode = ast->attr; znode expr_node; zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - emit_op_tmp(result, ast->kind, &expr_node, NULL TSRMLS_CC); + emit_op_tmp(result, opcode, &expr_node, NULL TSRMLS_CC); } void zend_compile_unary_pm(znode *result, zend_ast *ast TSRMLS_DC) { @@ -6578,17 +6596,18 @@ void zend_compile_post_incdec(znode *result, zend_ast *ast TSRMLS_DC) { znode var_node; zend_op *opline; - ZEND_ASSERT(ast->kind == ZEND_POST_INC || ast->kind == ZEND_POST_DEC); + ZEND_ASSERT(ast->kind == ZEND_AST_POST_INC || ast->kind == ZEND_AST_POST_DEC); if (var_ast->kind == ZEND_AST_PROP) { opline = zend_compile_prop_common(NULL, var_ast, BP_VAR_RW TSRMLS_CC); - opline->opcode = ast->kind == ZEND_POST_INC ? ZEND_POST_INC_OBJ : ZEND_POST_DEC_OBJ; + opline->opcode = ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC_OBJ : ZEND_POST_DEC_OBJ; opline->result_type = IS_TMP_VAR; opline->result.var = get_temporary_variable(CG(active_op_array)); GET_NODE(result, opline->result); } else { zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); - emit_op_tmp(result, ast->kind, &var_node, NULL TSRMLS_CC); + emit_op_tmp(result, ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC : ZEND_POST_DEC, + &var_node, NULL TSRMLS_CC); } } @@ -6598,14 +6617,15 @@ void zend_compile_pre_incdec(znode *result, zend_ast *ast TSRMLS_DC) { znode var_node; zend_op *opline; - ZEND_ASSERT(ast->kind == ZEND_PRE_INC || ast->kind == ZEND_PRE_DEC); + ZEND_ASSERT(ast->kind == ZEND_AST_PRE_INC || ast->kind == ZEND_AST_PRE_DEC); if (var_ast->kind == ZEND_AST_PROP) { opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); - opline->opcode = ast->kind == ZEND_PRE_INC ? ZEND_PRE_INC_OBJ : ZEND_PRE_DEC_OBJ; + opline->opcode = ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC_OBJ : ZEND_PRE_DEC_OBJ; } else { zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); - emit_op(result, ast->kind, &var_node, NULL TSRMLS_CC); + emit_op(result, ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC : ZEND_PRE_DEC, + &var_node, NULL TSRMLS_CC); } } @@ -6801,7 +6821,7 @@ void zend_compile_isset_or_empty(znode *result, zend_ast *ast TSRMLS_DC) { if (!zend_is_variable(var_ast) || zend_is_call(var_ast)) { if (ast->kind == ZEND_AST_EMPTY) { /* empty(expr) can be transformed to !expr */ - zend_ast *not_ast = zend_ast_create_unary(ZEND_BOOL_NOT, var_ast); + zend_ast *not_ast = zend_ast_create_ex(1, ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, var_ast); zend_compile_expr(result, not_ast TSRMLS_CC); return; } else { @@ -6874,14 +6894,15 @@ void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { } void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_op *opline; zend_uint i, opnum_init; zend_bool packed = 1; opnum_init = get_next_op_number(CG(active_op_array)); - for (i = 0; i < ast->children; ++i) { - zend_ast *elem_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *elem_ast = list->child[i]; zend_ast *value_ast = elem_ast->child[0]; zend_ast *key_ast = elem_ast->child[1]; zend_bool by_ref = elem_ast->attr; @@ -6902,7 +6923,7 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { if (i == 0) { opline = emit_op_tmp(result, ZEND_INIT_ARRAY, &value_node, key_node_ptr TSRMLS_CC); - opline->extended_value = ast->children << ZEND_ARRAY_SIZE_SHIFT; + opline->extended_value = list->children << ZEND_ARRAY_SIZE_SHIFT; } else { opline = emit_op(NULL, ZEND_ADD_ARRAY_ELEMENT, &value_node, key_node_ptr TSRMLS_CC); SET_NODE(opline->result, result); @@ -6918,7 +6939,7 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { } /* Handle empty array */ - if (!ast->children) { + if (!list->children) { emit_op_tmp(result, ZEND_INIT_ARRAY, NULL, NULL TSRMLS_CC); } @@ -7035,15 +7056,16 @@ void zend_compile_resolve_class_name(znode *result, zend_ast *ast TSRMLS_DC) { } void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; - ZEND_ASSERT(ast->children > 0); + ZEND_ASSERT(list->children > 0); result->op_type = IS_TMP_VAR; result->u.op.var = get_temporary_variable(CG(active_op_array)); - for (i = 0; i < ast->children; ++i) { - zend_ast *elem_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *elem_ast = list->child[i]; znode elem_node; zend_op *opline; @@ -7165,7 +7187,7 @@ zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { return kind == ZEND_AST_ZVAL || kind == ZEND_AST_BINARY_OP || kind == ZEND_AST_GREATER || kind == ZEND_AST_GREATER_EQUAL || kind == ZEND_AST_AND || kind == ZEND_AST_OR - || kind == ZEND_BW_NOT || kind == ZEND_BOOL_NOT + || kind == ZEND_AST_UNARY_OP || kind == ZEND_AST_UNARY_PLUS || kind == ZEND_AST_UNARY_MINUS || kind == ZEND_AST_CONDITIONAL || kind == ZEND_AST_ARRAY || kind == ZEND_AST_ARRAY_ELEM @@ -7301,12 +7323,7 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "Constant expression contains invalid operations"); } - { - zend_uint i; - for (i = 0; i < ast->children; ++i) { - zend_compile_const_expr(&ast->child[i] TSRMLS_CC); - } - } + zend_ast_apply(ast, zend_compile_const_expr TSRMLS_CC); switch (ast->kind) { case ZEND_AST_CLASS_CONST: @@ -7331,9 +7348,10 @@ void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC) { } if (ast->kind == ZEND_AST_STMT_LIST) { + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; - for (i = 0; i < ast->children; ++i) { - zend_compile_top_stmt(ast->child[i] TSRMLS_CC); + for (i = 0; i < list->children; ++i) { + zend_compile_top_stmt(list->child[i] TSRMLS_CC); } return; } @@ -7372,17 +7390,17 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_RETURN: zend_compile_return(ast TSRMLS_CC); break; - case ZEND_ECHO: + case ZEND_AST_ECHO: zend_compile_echo(ast TSRMLS_CC); break; - case ZEND_THROW: + case ZEND_AST_THROW: zend_compile_throw(ast TSRMLS_CC); break; - case ZEND_BRK: - case ZEND_CONT: + case ZEND_AST_BREAK: + case ZEND_AST_CONTINUE: zend_compile_break_continue(ast TSRMLS_CC); break; - case ZEND_GOTO: + case ZEND_AST_GOTO: zend_compile_goto(ast TSRMLS_CC); break; case ZEND_AST_LABEL: @@ -7480,10 +7498,10 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_ASSIGN_REF: zend_compile_assign_ref(result, ast TSRMLS_CC); return; - case ZEND_NEW: + case ZEND_AST_NEW: zend_compile_new(result, ast TSRMLS_CC); return; - case ZEND_CLONE: + case ZEND_AST_CLONE: zend_compile_clone(result, ast TSRMLS_CC); return; case ZEND_AST_ASSIGN_OP: @@ -7496,8 +7514,7 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_GREATER_EQUAL: zend_compile_greater(result, ast TSRMLS_CC); return; - case ZEND_BOOL_NOT: - case ZEND_BW_NOT: + case ZEND_AST_UNARY_OP: zend_compile_unary_op(result, ast TSRMLS_CC); return; case ZEND_AST_UNARY_PLUS: @@ -7508,12 +7525,12 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_OR: zend_compile_short_circuiting(result, ast TSRMLS_CC); return; - case ZEND_POST_INC: - case ZEND_POST_DEC: + case ZEND_AST_POST_INC: + case ZEND_AST_POST_DEC: zend_compile_post_incdec(result, ast TSRMLS_CC); return; - case ZEND_PRE_INC: - case ZEND_PRE_DEC: + case ZEND_AST_PRE_INC: + case ZEND_AST_PRE_DEC: zend_compile_pre_incdec(result, ast TSRMLS_CC); return; case ZEND_AST_CAST: @@ -7522,19 +7539,19 @@ void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_CONDITIONAL: zend_compile_conditional(result, ast TSRMLS_CC); return; - case ZEND_PRINT: + case ZEND_AST_PRINT: zend_compile_print(result, ast TSRMLS_CC); return; - case ZEND_EXIT: + case ZEND_AST_EXIT: zend_compile_exit(result, ast TSRMLS_CC); return; - case ZEND_YIELD: + case ZEND_AST_YIELD: zend_compile_yield(result, ast TSRMLS_CC); return; - case ZEND_INSTANCEOF: + case ZEND_AST_INSTANCEOF: zend_compile_instanceof(result, ast TSRMLS_CC); return; - case ZEND_INCLUDE_OR_EVAL: + case ZEND_AST_INCLUDE_OR_EVAL: zend_compile_include_or_eval(result, ast TSRMLS_CC); return; case ZEND_AST_ISSET: @@ -7601,7 +7618,7 @@ void zend_compile_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { || type == BP_VAR_RW || type == BP_VAR_UNSET ) { /* For BC reasons =& new Foo is allowed */ - if (type != BP_VAR_REF || ast->kind != ZEND_NEW) { + if (type != BP_VAR_REF || ast->kind != ZEND_AST_NEW) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use temporary expression in write context"); } @@ -7665,12 +7682,13 @@ void zend_eval_const_greater(zend_ast **ast_ptr TSRMLS_DC) { void zend_eval_const_array(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; + zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; zval array; /* First ensure that *all* child nodes are constant */ - for (i = 0; i < ast->children; ++i) { - zend_ast *elem_ast = ast->child[i]; + for (i = 0; i < list->children; ++i) { + zend_ast *elem_ast = list->child[i]; zend_ast *value_ast = elem_ast->child[0]; zend_ast *key_ast = elem_ast->child[1]; zend_bool by_ref = elem_ast->attr; @@ -7680,9 +7698,9 @@ void zend_eval_const_array(zend_ast **ast_ptr TSRMLS_DC) { } } - array_init_size(&array, ast->children); - for (i = 0; i < ast->children; ++i) { - zend_ast *elem_ast = ast->child[i]; + array_init_size(&array, list->children); + for (i = 0; i < list->children; ++i) { + zend_ast *elem_ast = list->child[i]; zend_ast *value_ast = elem_ast->child[0]; zend_ast *key_ast = elem_ast->child[1]; @@ -7741,12 +7759,7 @@ void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { return; } - { - zend_uint i; - for (i = 0; i < ast->children; ++i) { - zend_eval_const_expr(&ast->child[i] TSRMLS_CC); - } - } + zend_ast_apply(ast, zend_eval_const_expr TSRMLS_CC); switch (ast->kind) { case ZEND_AST_BINARY_OP: diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 03bfab3814..f48fffcf8b 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -329,10 +329,10 @@ unticked_statement: { $$.ast = zend_ast_create(4, ZEND_AST_FOR, $3.ast, $5.ast, $7.ast, $9.ast); } | T_SWITCH parenthesis_expr switch_case_list { $$.ast = zend_ast_create_binary(ZEND_AST_SWITCH, $2.ast, $3.ast); } - | T_BREAK ';' { $$.ast = zend_ast_create_unary(ZEND_BRK, NULL); } - | T_BREAK expr ';' { $$.ast = zend_ast_create_unary(ZEND_BRK, $2.ast); } - | T_CONTINUE ';' { $$.ast = zend_ast_create_unary(ZEND_CONT, NULL); } - | T_CONTINUE expr ';' { $$.ast = zend_ast_create_unary(ZEND_CONT, $2.ast); } + | T_BREAK ';' { $$.ast = zend_ast_create_unary(ZEND_AST_BREAK, NULL); } + | T_BREAK expr ';' { $$.ast = zend_ast_create_unary(ZEND_AST_BREAK, $2.ast); } + | T_CONTINUE ';' { $$.ast = zend_ast_create_unary(ZEND_AST_CONTINUE, NULL); } + | T_CONTINUE expr ';' { $$.ast = zend_ast_create_unary(ZEND_AST_CONTINUE, $2.ast); } | T_RETURN ';' { $$.ast = zend_ast_create_unary(ZEND_AST_RETURN, NULL); } | T_RETURN expr ';' @@ -340,7 +340,7 @@ unticked_statement: | T_GLOBAL global_var_list ';' { $$.ast = $2.ast; } | T_STATIC static_var_list ';' { $$.ast = $2.ast; } | T_ECHO echo_expr_list ';' { $$.ast = $2.ast; } - | T_INLINE_HTML { $$.ast = zend_ast_create_unary(ZEND_ECHO, $1.ast); } + | T_INLINE_HTML { $$.ast = zend_ast_create_unary(ZEND_AST_ECHO, $1.ast); } | expr ';' { $$.ast = $1.ast; } | T_UNSET '(' unset_variables ')' ';' { $$.ast = $3.ast; } | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement @@ -355,8 +355,8 @@ unticked_statement: | ';' /* empty statement */ { $$.ast = NULL; } | T_TRY '{' inner_statement_list '}' catch_list finally_statement { $$.ast = zend_ast_create_ternary(ZEND_AST_TRY, $3.ast, $5.ast, $6.ast); } - | T_THROW expr ';' { $$.ast = zend_ast_create_unary(ZEND_THROW, $2.ast); } - | T_GOTO T_STRING ';' { $$.ast = zend_ast_create_unary(ZEND_GOTO, $2.ast); } + | T_THROW expr ';' { $$.ast = zend_ast_create_unary(ZEND_AST_THROW, $2.ast); } + | T_GOTO T_STRING ';' { $$.ast = zend_ast_create_unary(ZEND_AST_GOTO, $2.ast); } ; catch_list: @@ -733,7 +733,7 @@ echo_expr_list: | echo_expr { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.ast); } ; echo_expr: - expr { $$.ast = zend_ast_create_unary(ZEND_ECHO, $1.ast); } + expr { $$.ast = zend_ast_create_unary(ZEND_AST_ECHO, $1.ast); } ; for_expr: @@ -748,7 +748,7 @@ non_empty_for_expr: new_expr: T_NEW class_name_reference ctor_arguments - { $$.ast = zend_ast_create_binary(ZEND_NEW, $2.ast, $3.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_NEW, $2.ast, $3.ast); } ; expr_without_variable: @@ -761,8 +761,8 @@ expr_without_variable: | variable '=' '&' T_NEW class_name_reference ctor_arguments { zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); $$.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.ast, - zend_ast_create_binary(ZEND_NEW, $5.ast, $6.ast)); } - | T_CLONE expr { $$.ast = zend_ast_create_unary(ZEND_CLONE, $2.ast); } + zend_ast_create_binary(ZEND_AST_NEW, $5.ast, $6.ast)); } + | T_CLONE expr { $$.ast = zend_ast_create_unary(ZEND_AST_CLONE, $2.ast); } | variable T_PLUS_EQUAL expr { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_ADD, $1.ast, $3.ast); } | variable T_MINUS_EQUAL expr @@ -787,10 +787,10 @@ expr_without_variable: { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SL, $1.ast, $3.ast); } | variable T_SR_EQUAL expr { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SR, $1.ast, $3.ast); } - | variable T_INC { $$.ast = zend_ast_create_unary(ZEND_POST_INC, $1.ast); } - | T_INC variable { $$.ast = zend_ast_create_unary(ZEND_PRE_INC, $2.ast); } - | variable T_DEC { $$.ast = zend_ast_create_unary(ZEND_POST_DEC, $1.ast); } - | T_DEC variable { $$.ast = zend_ast_create_unary(ZEND_PRE_DEC, $2.ast); } + | variable T_INC { $$.ast = zend_ast_create_unary(ZEND_AST_POST_INC, $1.ast); } + | T_INC variable { $$.ast = zend_ast_create_unary(ZEND_AST_PRE_INC, $2.ast); } + | variable T_DEC { $$.ast = zend_ast_create_unary(ZEND_AST_POST_DEC, $1.ast); } + | T_DEC variable { $$.ast = zend_ast_create_unary(ZEND_AST_PRE_DEC, $2.ast); } | expr T_BOOLEAN_OR expr { $$.ast = zend_ast_create_binary(ZEND_AST_OR, $1.ast, $3.ast); } | expr T_BOOLEAN_AND expr @@ -815,8 +815,8 @@ expr_without_variable: | expr T_SR expr { $$.ast = zend_ast_create_binary_op(ZEND_SR, $1.ast, $3.ast); } | '+' expr %prec T_INC { $$.ast = zend_ast_create_unary(ZEND_AST_UNARY_PLUS, $2.ast); } | '-' expr %prec T_INC { $$.ast = zend_ast_create_unary(ZEND_AST_UNARY_MINUS, $2.ast); } - | '!' expr { $$.ast = zend_ast_create_unary(ZEND_BOOL_NOT, $2.ast); } - | '~' expr { $$.ast = zend_ast_create_unary(ZEND_BW_NOT, $2.ast); } + | '!' expr { $$.ast = zend_ast_create_ex(1, ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, $2.ast); } + | '~' expr { $$.ast = zend_ast_create_ex(1, ZEND_AST_UNARY_OP, ZEND_BW_NOT, $2.ast); } | expr T_IS_IDENTICAL expr { $$.ast = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, $1.ast, $3.ast); } | expr T_IS_NOT_IDENTICAL expr @@ -834,7 +834,7 @@ expr_without_variable: | expr T_IS_GREATER_OR_EQUAL expr { $$.ast = zend_ast_create_binary(ZEND_AST_GREATER_EQUAL, $1.ast, $3.ast); } | expr T_INSTANCEOF class_name_reference - { $$.ast = zend_ast_create_binary(ZEND_INSTANCEOF, $1.ast, $3.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_INSTANCEOF, $1.ast, $3.ast); } | parenthesis_expr { $$.ast = $1.ast; } | new_expr { $$.ast = $1.ast; } | expr '?' expr ':' expr @@ -857,15 +857,15 @@ expr_without_variable: { $$.ast = zend_ast_create_cast(_IS_BOOL, $2.ast); } | T_UNSET_CAST expr { $$.ast = zend_ast_create_cast(IS_NULL, $2.ast); } - | T_EXIT exit_expr { $$.ast = zend_ast_create_unary(ZEND_EXIT, $2.ast); } + | T_EXIT exit_expr { $$.ast = zend_ast_create_unary(ZEND_AST_EXIT, $2.ast); } | '@' expr { $$.ast = zend_ast_create_unary(ZEND_AST_SILENCE, $2.ast); } | scalar { $$.ast = $1.ast; } | '`' backticks_expr '`' { $$.ast = zend_ast_create_unary(ZEND_AST_SHELL_EXEC, $2.ast); } - | T_PRINT expr { $$.ast = zend_ast_create_unary(ZEND_PRINT, $2.ast); } - | T_YIELD { $$.ast = zend_ast_create_binary(ZEND_YIELD, NULL, NULL); } - | T_YIELD expr { $$.ast = zend_ast_create_binary(ZEND_YIELD, $2.ast, NULL); } + | T_PRINT expr { $$.ast = zend_ast_create_unary(ZEND_AST_PRINT, $2.ast); } + | T_YIELD { $$.ast = zend_ast_create_binary(ZEND_AST_YIELD, NULL, NULL); } + | T_YIELD expr { $$.ast = zend_ast_create_binary(ZEND_AST_YIELD, $2.ast, NULL); } | T_YIELD expr T_DOUBLE_ARROW expr - { $$.ast = zend_ast_create_binary(ZEND_YIELD, $4.ast, $2.ast); } + { $$.ast = zend_ast_create_binary(ZEND_AST_YIELD, $4.ast, $2.ast); } | function returns_ref '(' parameter_list ')' lexical_vars { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' @@ -1151,15 +1151,15 @@ internal_functions_in_yacc: T_ISSET '(' isset_variables ')' { $$.ast = $3.ast; } | T_EMPTY '(' expr ')' { $$.ast = zend_ast_create_unary(ZEND_AST_EMPTY, $3.ast); } | T_INCLUDE expr - { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.ast); } | T_INCLUDE_ONCE expr - { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2.ast); } | T_EVAL '(' expr ')' - { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_EVAL, $3.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_EVAL, $3.ast); } | T_REQUIRE expr - { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2.ast); } | T_REQUIRE_ONCE expr - { $$.ast = zend_ast_create_ex(1, ZEND_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2.ast); } + { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2.ast); } ; isset_variables: -- cgit v1.2.1 From 187ff135f23b14cbac81677b53986dc20bf16058 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 12:55:37 +0200 Subject: zend_do_op_data -> zend_emit_op_data --- Zend/zend_compile.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index abf931ea62..ea50715183 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -566,14 +566,6 @@ void zend_stop_lexing(TSRMLS_D) { LANG_SCNG(yy_cursor) = LANG_SCNG(yy_limit); } -static void zend_do_op_data(zend_op *data_op, znode *value TSRMLS_DC) /* {{{ */ -{ - data_op->opcode = ZEND_OP_DATA; - SET_NODE(data_op->op1, value); - SET_UNUSED(data_op->op2); -} -/* }}} */ - void zend_do_abstract_method(const znode *function_name, znode *modifiers, const znode *body TSRMLS_DC) /* {{{ */ { char *method_type; @@ -3498,6 +3490,10 @@ static void zend_emit_tick(TSRMLS_D) { opline->extended_value = Z_LVAL(CG(declarables).ticks); } +static zend_op *zend_emit_op_data(znode *value TSRMLS_DC) { + return emit_op(NULL, ZEND_OP_DATA, value, NULL TSRMLS_CC); +} + static zend_uint zend_emit_jump(zend_uint opnum_target TSRMLS_DC) { zend_uint opnum = get_next_op_number(CG(active_op_array)); zend_op *opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); @@ -3924,19 +3920,15 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline = zend_compile_dim_common(result, var_ast, BP_VAR_W TSRMLS_CC); opline->opcode = ZEND_ASSIGN_DIM; - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zend_do_op_data(opline, &expr_node TSRMLS_CC); + opline = zend_emit_op_data(&expr_node TSRMLS_CC); opline->op2.var = get_temporary_variable(CG(active_op_array)); opline->op2_type = IS_VAR; - SET_UNUSED(opline->result); return; case ZEND_AST_PROP: opline = zend_compile_prop_common(result, var_ast, BP_VAR_W TSRMLS_CC); opline->opcode = ZEND_ASSIGN_OBJ; - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zend_do_op_data(opline, &expr_node TSRMLS_CC); - SET_UNUSED(opline->result); + zend_emit_op_data(&expr_node TSRMLS_CC); return; case ZEND_AST_LIST: zend_compile_list_assign(result, var_ast, &expr_node TSRMLS_CC); @@ -4013,20 +4005,16 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_DIM; - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zend_do_op_data(opline, &expr_node TSRMLS_CC); + opline = zend_emit_op_data(&expr_node TSRMLS_CC); opline->op2.var = get_temporary_variable(CG(active_op_array)); opline->op2_type = IS_VAR; - SET_UNUSED(opline->result); return; case ZEND_AST_PROP: opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_OBJ; - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - zend_do_op_data(opline, &expr_node TSRMLS_CC); - SET_UNUSED(opline->result); + opline = zend_emit_op_data(&expr_node TSRMLS_CC); return; EMPTY_SWITCH_DEFAULT_CASE() } -- cgit v1.2.1 From f29b84ab46ddcef44ac42b064178a3dc1941ad77 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 14:51:08 +0200 Subject: Minor cleanups in AST code --- Zend/zend_ast.c | 50 +++++++++++++++++++++++++-------------------- Zend/zend_ast.h | 29 +++++++++++++------------- Zend/zend_language_parser.y | 20 +++++++----------- 3 files changed, 50 insertions(+), 49 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index de5787895f..e51c9d699e 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -23,10 +23,19 @@ #include "zend_API.h" #include "zend_operators.h" -ZEND_API zend_ast *zend_ast_create_znode(znode *node) -{ +static inline void *zend_ast_alloc(size_t size TSRMLS_DC) { + return zend_arena_alloc(&CG(ast_arena), size); +} + +static inline void *zend_ast_realloc(void *old, size_t old_size, size_t new_size TSRMLS_DC) { + void *new = zend_ast_alloc(new_size TSRMLS_CC); + memcpy(new, old, old_size); + return new; +} + +ZEND_API zend_ast *zend_ast_create_znode(znode *node) { TSRMLS_FETCH(); - zend_ast_znode *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast_znode)); + zend_ast_znode *ast = zend_ast_alloc(sizeof(zend_ast_znode) TSRMLS_CC); ast->kind = ZEND_AST_ZNODE; ast->attr = 0; ast->lineno = CG(zend_lineno); @@ -34,10 +43,9 @@ ZEND_API zend_ast *zend_ast_create_znode(znode *node) return (zend_ast *) ast; } -ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) -{ +ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) { TSRMLS_FETCH(); - zend_ast_zval *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast_zval)); + zend_ast_zval *ast = zend_ast_alloc(sizeof(zend_ast_zval) TSRMLS_CC); ast->kind = ZEND_AST_ZVAL; ast->attr = attr; ZVAL_COPY_VALUE(&ast->val, zv); @@ -46,19 +54,18 @@ ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr) } ZEND_API zend_ast *zend_ast_create_decl( - zend_ast_kind kind, zend_uint flags, zend_uint start_lineno, zend_uint end_lineno, - unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, - zend_ast *child0, zend_ast *child1, zend_ast *child2 + zend_ast_kind kind, zend_uint flags, zend_uint start_lineno, zend_string *doc_comment, + zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2 ) { TSRMLS_FETCH(); - zend_ast_decl *ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast_decl)); + zend_ast_decl *ast = zend_ast_alloc(sizeof(zend_ast_decl) TSRMLS_CC); ast->kind = kind; ast->attr = 0; ast->start_lineno = start_lineno; - ast->end_lineno = end_lineno; + ast->end_lineno = CG(zend_lineno); ast->flags = flags; - ast->lex_pos = lex_pos; + ast->lex_pos = LANG_SCNG(yy_text); ast->doc_comment = doc_comment; ast->name = name; ast->child[0] = child0; @@ -75,7 +82,7 @@ static zend_ast *zend_ast_create_from_va_list( zend_uint i; zend_ast *ast; - ast = zend_arena_alloc(&CG(ast_arena), sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *)); + ast = zend_ast_alloc(sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *) TSRMLS_CC); ast->kind = kind; ast->attr = attr; ast->lineno = UINT_MAX; @@ -123,11 +130,14 @@ ZEND_API zend_ast *zend_ast_create( return ast; } +size_t zend_ast_list_size(zend_uint children) { + return sizeof(zend_ast_list) + sizeof(zend_ast *) * (children - 1); +} + ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind) { /* use 4 children as default */ TSRMLS_FETCH(); - zend_ast_list *list = zend_arena_alloc(&CG(ast_arena), - sizeof(zend_ast_list) + sizeof(zend_ast *) * 3); + zend_ast_list *list = zend_ast_alloc(zend_ast_list_size(4) TSRMLS_CC); list->kind = kind; list->attr = 0; list->lineno = CG(zend_lineno); @@ -139,16 +149,12 @@ static inline zend_bool is_power_of_two(unsigned short n) { return n == (n & -n); } -ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op) -{ +ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op) { zend_ast_list *list = zend_ast_get_list(ast); if (list->children >= 4 && is_power_of_two(list->children)) { TSRMLS_FETCH(); - size_t old_size = sizeof(zend_ast_list) + sizeof(zend_ast *) * (list->children - 1); - zend_ast_list *new_list = zend_arena_alloc(&CG(ast_arena), - sizeof(zend_ast_list) + sizeof(zend_ast *) * (list->children * 2 - 1)); - memcpy(new_list, list, old_size); - list = new_list; + list = zend_ast_realloc(list, + zend_ast_list_size(list->children), zend_ast_list_size(list->children * 2) TSRMLS_CC); } list->child[list->children++] = op; return (zend_ast *) list; diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 87b26405a6..86bb6ed2a2 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -25,13 +25,13 @@ #include "zend.h" - -#define ZEND_AST_IS_LIST_SHIFT 11 -#define ZEND_AST_NUM_CHILDREN_SHIFT 12 +#define ZEND_AST_SPECIAL_SHIFT 6 +#define ZEND_AST_IS_LIST_SHIFT 7 +#define ZEND_AST_NUM_CHILDREN_SHIFT 8 enum _zend_ast_kind { - /* first 256 kinds are reserved for opcodes */ - ZEND_AST_ZVAL = 256, + /* special nodes */ + ZEND_AST_ZVAL = 1 << ZEND_AST_SPECIAL_SHIFT, ZEND_AST_ZNODE, /* declaration nodes */ @@ -150,7 +150,7 @@ typedef unsigned short zend_ast_kind; typedef unsigned short zend_ast_attr; struct _zend_ast { - zend_ast_kind kind; /* Type of the node (either opcode or ZEND_AST_* constant) */ + zend_ast_kind kind; /* Type of the node (ZEND_AST_* enum constant) */ zend_ast_attr attr; /* Additional attribute, use depending on node type */ zend_uint lineno; /* Line number */ zend_ast *child[1]; /* Array of children (using struct hack) */ @@ -165,6 +165,7 @@ typedef struct _zend_ast_list { zend_ast *child[1]; } zend_ast_list; +/* Lineno is stored in val.u2.lineno */ typedef struct _zend_ast_zval { zend_ast_kind kind; zend_ast_attr attr; @@ -192,9 +193,8 @@ ZEND_API zend_ast *zend_ast_create( zend_uint children, zend_ast_kind kind, ...); ZEND_API zend_ast *zend_ast_create_decl( - zend_ast_kind kind, zend_uint flags, zend_uint start_lineno, zend_uint end_lineno, - unsigned char *lex_pos, zend_string *doc_comment, zend_string *name, - zend_ast *child0, zend_ast *child1, zend_ast *child2 + zend_ast_kind kind, zend_uint flags, zend_uint start_lineno, zend_string *doc_comment, + zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2 ); ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind); @@ -217,17 +217,18 @@ static inline zend_ast_list *zend_ast_get_list(zend_ast *ast) { return (zend_ast_list *) ast; } -/* Only for non-lists! */ -static inline zend_uint zend_ast_get_num_children(zend_ast *ast) { - return ast->kind >> ZEND_AST_NUM_CHILDREN_SHIFT; -} - static inline zval *zend_ast_get_zval(zend_ast *ast) { + ZEND_ASSERT(ast->kind == ZEND_AST_ZVAL); return &((zend_ast_zval *) ast)->val; } static inline zend_string *zend_ast_get_str(zend_ast *ast) { return Z_STR_P(zend_ast_get_zval(ast)); } + +static inline zend_uint zend_ast_get_num_children(zend_ast *ast) { + ZEND_ASSERT(!zend_ast_is_list(ast)); + return ast->kind >> ZEND_AST_NUM_CHILDREN_SHIFT; +} static inline zend_uint zend_ast_get_lineno(zend_ast *ast) { if (ast->kind == ZEND_AST_ZVAL) { zval *zv = zend_ast_get_zval(ast); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index f48fffcf8b..14932f3282 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -385,9 +385,8 @@ function_declaration_statement: function returns_ref T_STRING '(' parameter_list ')' { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' - { $$.ast = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2.num, - $1.num, CG(zend_lineno), LANG_SCNG(yy_text), $7.str, - zend_ast_get_str($3.ast), $5.ast, NULL, $9.ast); } + { $$.ast = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2.num, $1.num, $7.str, + zend_ast_get_str($3.ast), $5.ast, NULL, $9.ast); } ; is_reference: @@ -406,16 +405,14 @@ class_declaration_statement: T_STRING extends_from implements_list { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' class_statement_list '}' - { $$.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.num, $2.num, - CG(zend_lineno), LANG_SCNG(yy_text), $6.str, + { $$.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.num, $2.num, $6.str, zend_ast_get_str($3.ast), $4.ast, $5.ast, $8.ast); } | T_INTERFACE { $$.num = CG(zend_lineno); } T_STRING interface_extends_list { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' class_statement_list '}' - { $$.ast = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_INTERFACE, $2.num, - CG(zend_lineno), LANG_SCNG(yy_text), $5.str, + { $$.ast = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_INTERFACE, $2.num, $5.str, zend_ast_get_str($3.ast), NULL, $4.ast, $7.ast); } ; @@ -617,8 +614,7 @@ class_statement: | method_modifiers function returns_ref T_STRING '(' parameter_list ')' { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } method_body - { $$.ast = zend_ast_create_decl(ZEND_AST_METHOD, $3.num | $1.num, - $2.num, CG(zend_lineno), LANG_SCNG(yy_text), $8.str, + { $$.ast = zend_ast_create_decl(ZEND_AST_METHOD, $3.num | $1.num, $2.num, $8.str, zend_ast_get_str($4.ast), $6.ast, NULL, $9.ast); } ; @@ -869,15 +865,13 @@ expr_without_variable: | function returns_ref '(' parameter_list ')' lexical_vars { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' - { $$.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $2.num, - $1.num, CG(zend_lineno), LANG_SCNG(yy_text), $7.str, + { $$.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $2.num, $1.num, $7.str, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), $4.ast, $6.ast, $9.ast); } | T_STATIC function returns_ref '(' parameter_list ')' lexical_vars { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' - { $$.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, - $3.num | ZEND_ACC_STATIC, $2.num, CG(zend_lineno), LANG_SCNG(yy_text), + { $$.ast = zend_ast_create_decl(ZEND_AST_CLOSURE, $3.num | ZEND_ACC_STATIC, $2.num, $8.str, STR_INIT("{closure}", sizeof("{closure}") - 1, 0), $5.ast, $7.ast, $10.ast); } ; -- cgit v1.2.1 From 1d79fb308b6e25e813ad8f37d1381adacb0ed14d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 15:10:58 +0200 Subject: Add zend_ast_list* variant to parser stack element --- Zend/zend_ast.c | 21 +++++--- Zend/zend_ast.h | 8 +-- Zend/zend_compile.c | 2 +- Zend/zend_compile.h | 1 + Zend/zend_language_parser.y | 116 ++++++++++++++++++++++---------------------- 5 files changed, 76 insertions(+), 72 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index e51c9d699e..355f627e30 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -134,30 +134,39 @@ size_t zend_ast_list_size(zend_uint children) { return sizeof(zend_ast_list) + sizeof(zend_ast *) * (children - 1); } -ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind) { - /* use 4 children as default */ +ZEND_API zend_ast_list *zend_ast_create_list(zend_uint init_children, zend_ast_kind kind, ...) { TSRMLS_FETCH(); zend_ast_list *list = zend_ast_alloc(zend_ast_list_size(4) TSRMLS_CC); list->kind = kind; list->attr = 0; list->lineno = CG(zend_lineno); list->children = 0; - return (zend_ast *) list; + + { + va_list va; + zend_uint i; + va_start(va, kind); + for (i = 0; i < init_children; ++i) { + list = zend_ast_list_add(list, va_arg(va, zend_ast *)); + } + va_end(va); + } + + return list; } static inline zend_bool is_power_of_two(unsigned short n) { return n == (n & -n); } -ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op) { - zend_ast_list *list = zend_ast_get_list(ast); +ZEND_API zend_ast_list *zend_ast_list_add(zend_ast_list *list, zend_ast *op) { if (list->children >= 4 && is_power_of_two(list->children)) { TSRMLS_FETCH(); list = zend_ast_realloc(list, zend_ast_list_size(list->children), zend_ast_list_size(list->children * 2) TSRMLS_CC); } list->child[list->children++] = op; - return (zend_ast *) list; + return list; } static void zend_ast_add_array_element(zval *result, zval *offset, zval *expr TSRMLS_DC) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 86bb6ed2a2..1d9863d976 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -197,8 +197,8 @@ ZEND_API zend_ast *zend_ast_create_decl( zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2 ); -ZEND_API zend_ast *zend_ast_create_dynamic(zend_ast_kind kind); -ZEND_API zend_ast *zend_ast_dynamic_add(zend_ast *ast, zend_ast *op); +ZEND_API zend_ast_list *zend_ast_create_list(zend_uint init_children, zend_ast_kind kind, ...); +ZEND_API zend_ast_list *zend_ast_list_add(zend_ast_list *list, zend_ast *op); ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *scope TSRMLS_DC); @@ -264,10 +264,6 @@ static inline zend_ast *zend_ast_create_ternary( return zend_ast_create(3, kind, op0, op1, op2); } -static inline zend_ast *zend_ast_create_dynamic_and_add(zend_ast_kind kind, zend_ast *op) { - return zend_ast_dynamic_add(zend_ast_create_dynamic(kind), op); -} - static inline zend_ast *zend_ast_create_binary_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { return zend_ast_create_ex(2, ZEND_AST_BINARY_OP, opcode, op0, op1); } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ea50715183..892c04fa9d 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6873,7 +6873,7 @@ void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { ZVAL_STRING(&fn_name, "shell_exec"); name_ast = zend_ast_create_zval(&fn_name); - args_ast = zend_ast_dynamic_add(zend_ast_create_dynamic(ZEND_AST_ARG_LIST), expr_ast); + args_ast = (zend_ast *) zend_ast_create_list(1, ZEND_AST_ARG_LIST, expr_ast); call_ast = zend_ast_create_binary(ZEND_AST_CALL, name_ast, args_ast); zend_compile_expr(result, call_ast TSRMLS_CC); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 20d2c4fc44..1de42b2991 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -100,6 +100,7 @@ static inline znode *zend_ast_get_znode(zend_ast *ast) { typedef union _zend_parser_stack_elem { zend_ast *ast; + zend_ast_list *list; zend_string *str; zend_ulong num; } zend_parser_stack_elem; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 14932f3282..bfba46792a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -226,8 +226,8 @@ start: ; top_statement_list: - top_statement_list top_statement { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } - | /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } + top_statement_list top_statement { $$.list = zend_ast_list_add($1.list, $2.ast); } + | /* empty */ { $$.list = zend_ast_create_list(0, ZEND_AST_STMT_LIST); } ; namespace_name: @@ -273,9 +273,9 @@ top_statement: use_declarations: use_declarations ',' use_declaration - { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + { $$.list = zend_ast_list_add($1.list, $3.ast); } | use_declaration - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_USE, $1.ast); } + { $$.list = zend_ast_create_list(1, ZEND_AST_USE, $1.ast); } ; use_declaration: @@ -290,16 +290,15 @@ use_declaration: ; const_list: - const_list ',' const_decl { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } - | const_decl - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CONST_DECL, $1.ast); } + const_list ',' const_decl { $$.list = zend_ast_list_add($1.list, $3.ast); } + | const_decl { $$.list = zend_ast_create_list(1, ZEND_AST_CONST_DECL, $1.ast); } ; inner_statement_list: inner_statement_list inner_statement - { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } + { $$.list = zend_ast_list_add($1.list, $2.ast); } | /* empty */ - { $$.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } + { $$.list = zend_ast_create_list(0, ZEND_AST_STMT_LIST); } ; @@ -361,9 +360,9 @@ unticked_statement: catch_list: /* empty */ - { $$.ast = zend_ast_create_dynamic(ZEND_AST_CATCH_LIST); } + { $$.list = zend_ast_create_list(0, ZEND_AST_CATCH_LIST); } | catch_list T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}' - { $$.ast = zend_ast_dynamic_add($1.ast, + { $$.list = zend_ast_list_add($1.list, zend_ast_create_ternary(ZEND_AST_CATCH, $4.ast, $5.ast, $8.ast)); } ; @@ -373,8 +372,8 @@ finally_statement: ; unset_variables: - unset_variable { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.ast); } - | unset_variables ',' unset_variable { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + unset_variable { $$.list = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1.ast); } + | unset_variables ',' unset_variable { $$.list = zend_ast_list_add($1.list, $3.ast); } ; unset_variable: @@ -469,12 +468,12 @@ switch_case_list: ; case_list: - /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_SWITCH_LIST); } + /* empty */ { $$.list = zend_ast_create_list(0, ZEND_AST_SWITCH_LIST); } | case_list T_CASE expr case_separator inner_statement_list - { $$.ast = zend_ast_dynamic_add($1.ast, + { $$.list = zend_ast_list_add($1.list, zend_ast_create_binary(ZEND_AST_SWITCH_CASE, $3.ast, $5.ast)); } | case_list T_DEFAULT case_separator inner_statement_list - { $$.ast = zend_ast_dynamic_add($1.ast, + { $$.list = zend_ast_list_add($1.list, zend_ast_create_binary(ZEND_AST_SWITCH_CASE, NULL, $4.ast)); } ; @@ -492,47 +491,47 @@ while_statement: if_stmt_without_else: T_IF parenthesis_expr statement - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_IF, + { $$.list = zend_ast_create_list(1, ZEND_AST_IF, zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.ast, $3.ast)); } | if_stmt_without_else T_ELSEIF parenthesis_expr statement - { $$.ast = zend_ast_dynamic_add($1.ast, + { $$.list = zend_ast_list_add($1.list, zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.ast, $4.ast)); } ; if_stmt: if_stmt_without_else { $$.ast = $1.ast; } | if_stmt_without_else T_ELSE statement - { $$.ast = zend_ast_dynamic_add($1.ast, + { $$.list = zend_ast_list_add($1.list, zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $3.ast)); } ; alt_if_stmt_without_else: T_IF parenthesis_expr ':' inner_statement_list - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_IF, + { $$.list = zend_ast_create_list(1, ZEND_AST_IF, zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.ast, $4.ast)); } | alt_if_stmt_without_else T_ELSEIF parenthesis_expr ':' inner_statement_list - { $$.ast = zend_ast_dynamic_add($1.ast, + { $$.list = zend_ast_list_add($1.list, zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.ast, $5.ast)); } ; alt_if_stmt: alt_if_stmt_without_else T_ENDIF ';' { $$.ast = $1.ast; } | alt_if_stmt_without_else T_ELSE ':' inner_statement_list T_ENDIF ';' - { $$.ast = zend_ast_dynamic_add($1.ast, + { $$.list = zend_ast_list_add($1.list, zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $4.ast)); } ; parameter_list: non_empty_parameter_list { $$.ast = $1.ast; } - | /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_PARAM_LIST); } + | /* empty */ { $$.list = zend_ast_create_list(0, ZEND_AST_PARAM_LIST); } ; non_empty_parameter_list: parameter - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PARAM_LIST, $1.ast); } + { $$.list = zend_ast_create_list(1, ZEND_AST_PARAM_LIST, $1.ast); } | non_empty_parameter_list ',' parameter - { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + { $$.list = zend_ast_list_add($1.list, $3.ast); } ; parameter: @@ -553,15 +552,15 @@ optional_type: ; argument_list: - '(' ')' { $$.ast = zend_ast_create_dynamic(ZEND_AST_ARG_LIST); } + '(' ')' { $$.list = zend_ast_create_list(0, ZEND_AST_ARG_LIST); } | '(' non_empty_argument_list ')' { $$.ast = $2.ast; } ; non_empty_argument_list: argument - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARG_LIST, $1.ast); } + { $$.list = zend_ast_create_list(1, ZEND_AST_ARG_LIST, $1.ast); } | non_empty_argument_list ',' argument - { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + { $$.list = zend_ast_list_add($1.list, $3.ast); } ; argument: @@ -572,8 +571,8 @@ argument: ; global_var_list: - global_var_list ',' global_var { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } - | global_var { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.ast); } + global_var_list ',' global_var { $$.list = zend_ast_list_add($1.list, $3.ast); } + | global_var { $$.list = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1.ast); } ; global_var: @@ -584,8 +583,8 @@ global_var: static_var_list: - static_var_list ',' static_var { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } - | static_var { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.ast); } + static_var_list ',' static_var { $$.list = zend_ast_list_add($1.list, $3.ast); } + | static_var { $$.list = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1.ast); } ; static_var: @@ -598,9 +597,9 @@ static_var: class_statement_list: class_statement_list class_statement - { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } + { $$.list = zend_ast_list_add($1.list, $2.ast); } | /* empty */ - { $$.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); } + { $$.list = zend_ast_create_list(0, ZEND_AST_STMT_LIST); } ; @@ -619,8 +618,8 @@ class_statement: ; name_list: - name { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_NAME_LIST, $1.ast); } - | name_list ',' name { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + name { $$.list = zend_ast_create_list(1, ZEND_AST_NAME_LIST, $1.ast); } + | name_list ',' name { $$.list = zend_ast_list_add($1.list, $3.ast); } ; trait_adaptations: @@ -631,9 +630,9 @@ trait_adaptations: trait_adaptation_list: trait_adaptation - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_TRAIT_ADAPTATIONS, $1.ast); } + { $$.list = zend_ast_create_list(1, ZEND_AST_TRAIT_ADAPTATIONS, $1.ast); } | trait_adaptation_list trait_adaptation - { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } + { $$.list = zend_ast_list_add($1.list, $2.ast); } ; trait_adaptation: @@ -703,8 +702,8 @@ member_modifier: ; property_list: - property_list ',' property { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } - | property { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_PROP_DECL, $1.ast); } + property_list ',' property { $$.list = zend_ast_list_add($1.list, $3.ast); } + | property { $$.list = zend_ast_create_list(1, ZEND_AST_PROP_DECL, $1.ast); } ; property: @@ -714,9 +713,9 @@ property: ; class_const_list: - class_const_list ',' const_decl { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + class_const_list ',' const_decl { $$.list = zend_ast_list_add($1.list, $3.ast); } | const_decl - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CLASS_CONST_DECL, $1.ast); } + { $$.list = zend_ast_create_list(1, ZEND_AST_CLASS_CONST_DECL, $1.ast); } ; const_decl: @@ -725,8 +724,8 @@ const_decl: ; echo_expr_list: - echo_expr_list ',' echo_expr { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } - | echo_expr { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_STMT_LIST, $1.ast); } + echo_expr_list ',' echo_expr { $$.list = zend_ast_list_add($1.list, $3.ast); } + | echo_expr { $$.list = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1.ast); } ; echo_expr: expr { $$.ast = zend_ast_create_unary(ZEND_AST_ECHO, $1.ast); } @@ -738,8 +737,8 @@ for_expr: ; non_empty_for_expr: - non_empty_for_expr ',' expr { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } - | expr { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_EXPR_LIST, $1.ast); } + non_empty_for_expr ',' expr { $$.list = zend_ast_list_add($1.list, $3.ast); } + | expr { $$.list = zend_ast_create_list(1, ZEND_AST_EXPR_LIST, $1.ast); } ; new_expr: @@ -891,8 +890,8 @@ lexical_vars: ; lexical_var_list: - lexical_var_list ',' lexical_var { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } - | lexical_var { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_CLOSURE_USES, $1.ast); } + lexical_var_list ',' lexical_var { $$.list = zend_ast_list_add($1.list, $3.ast); } + | lexical_var { $$.list = zend_ast_create_list(1, ZEND_AST_CLOSURE_USES, $1.ast); } ; lexical_var: @@ -940,7 +939,7 @@ backticks_expr: ctor_arguments: - /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_ARG_LIST); } + /* empty */ { $$.list = zend_ast_create_list(0, ZEND_AST_ARG_LIST); } | argument_list { $$.ast = $1.ast; } ; @@ -1069,9 +1068,9 @@ member_name: assignment_list: assignment_list ',' assignment_list_element - { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + { $$.list = zend_ast_list_add($1.list, $3.ast); } | assignment_list_element - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_LIST, $1.ast); } + { $$.list = zend_ast_create_list(1, ZEND_AST_LIST, $1.ast); } ; assignment_list_element: @@ -1082,15 +1081,15 @@ assignment_list_element: array_pair_list: - /* empty */ { $$.ast = zend_ast_create_dynamic(ZEND_AST_ARRAY); } + /* empty */ { $$.list = zend_ast_create_list(0, ZEND_AST_ARRAY); } | non_empty_array_pair_list possible_comma { $$.ast = $1.ast; } ; non_empty_array_pair_list: non_empty_array_pair_list ',' array_pair - { $$.ast = zend_ast_dynamic_add($1.ast, $3.ast); } + { $$.list = zend_ast_list_add($1.list, $3.ast); } | array_pair - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ARRAY, $1.ast); } + { $$.list = zend_ast_create_list(1, ZEND_AST_ARRAY, $1.ast); } ; array_pair: @@ -1105,14 +1104,13 @@ array_pair: encaps_list: encaps_list encaps_var - { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } + { $$.list = zend_ast_list_add($1.list, $2.ast); } | encaps_list T_ENCAPSED_AND_WHITESPACE - { $$.ast = zend_ast_dynamic_add($1.ast, $2.ast); } + { $$.list = zend_ast_list_add($1.list, $2.ast); } | encaps_var - { $$.ast = zend_ast_create_dynamic_and_add(ZEND_AST_ENCAPS_LIST, $1.ast); } + { $$.list = zend_ast_create_list(1, ZEND_AST_ENCAPS_LIST, $1.ast); } | T_ENCAPSED_AND_WHITESPACE encaps_var - { $$.ast = zend_ast_dynamic_add(zend_ast_create_dynamic_and_add( - ZEND_AST_ENCAPS_LIST, $1.ast), $2.ast); } + { $$.list = zend_ast_create_list(2, ZEND_AST_ENCAPS_LIST, $1.ast, $2.ast); } ; encaps_var: -- cgit v1.2.1 From a2925df6538a5f3adb3a2e6fee3d6b4940edd83b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 15:16:35 +0200 Subject: Use zend_ast_get_str where possible --- Zend/zend_compile.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 892c04fa9d..6a24e22669 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -874,7 +874,7 @@ zend_string *zend_resolve_class_name( } zend_string *zend_resolve_class_name_ast(zend_ast *ast TSRMLS_DC) { - zend_string *name = Z_STR_P(zend_ast_get_zval(ast)); + zend_string *name = zend_ast_get_str(ast); return zend_resolve_class_name(name, ast->attr TSRMLS_CC); } @@ -4135,7 +4135,7 @@ void zend_compile_call_common(znode *result, zend_ast *args_ast, zend_function * } zend_bool zend_compile_function_name(znode *name_node, zend_ast *name_ast TSRMLS_DC) { - zend_string *orig_name = Z_STR_P(zend_ast_get_zval(name_ast)); + zend_string *orig_name = zend_ast_get_str(name_ast); zend_bool is_fully_qualified; name_node->op_type = IS_CONST; @@ -4252,7 +4252,7 @@ static int zend_try_compile_ct_bound_init_user_func( return FAILURE; } - name = Z_STR_P(zend_ast_get_zval(name_ast)); + name = zend_ast_get_str(name_ast); lcname = STR_ALLOC(name->len, 0); zend_str_tolower_copy(lcname->val, name->val, name->len); @@ -5198,7 +5198,7 @@ void zend_compile_declare(zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = declare_ast->child[0]; zend_ast *value_ast = declare_ast->child[1]; - zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); + zend_string *name = zend_ast_get_str(name_ast); zval value_zv; _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); @@ -5295,7 +5295,7 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { zend_ast *type_ast = param_ast->child[0]; zend_ast *var_ast = param_ast->child[1]; zend_ast *default_ast = param_ast->child[2]; - zend_string *name = Z_STR_P(zend_ast_get_zval(var_ast)); + zend_string *name = zend_ast_get_str(var_ast); zend_bool is_ref = (param_ast->attr & ZEND_PARAM_REF) != 0; zend_bool is_variadic = (param_ast->attr & ZEND_PARAM_VARIADIC) != 0; @@ -5387,7 +5387,7 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { } } } else { - zend_string *class_name = Z_STR_P(zend_ast_get_zval(type_ast)); + zend_string *class_name = zend_ast_get_str(type_ast); if (zend_is_const_default_class_ref(type_ast)) { class_name = zend_resolve_class_name_ast(type_ast TSRMLS_CC); @@ -5420,7 +5420,7 @@ void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { for (i = 0; i < list->children; ++i) { zend_ast *var_ast = list->child[i]; - zend_string *name = Z_STR_P(zend_ast_get_zval(var_ast)); + zend_string *name = zend_ast_get_str(var_ast); zend_bool by_ref = var_ast->attr; zval zv; @@ -5783,7 +5783,7 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { zend_ast *prop_ast = list->child[i]; zend_ast *name_ast = prop_ast->child[0]; zend_ast *value_ast = prop_ast->child[1]; - zend_string *name = Z_STR_P(zend_ast_get_zval(name_ast)); + zend_string *name = zend_ast_get_str(name_ast); zval value_zv; if (flags & ZEND_ACC_FINAL) { @@ -5817,7 +5817,7 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { zend_ast *const_ast = list->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 *name = zend_ast_get_str(name_ast); zval value_zv; if (ZEND_CE_IS_TRAIT(ce)) { @@ -5851,7 +5851,7 @@ static zend_trait_method_reference *zend_compile_method_ref(zend_ast *ast TSRMLS zend_trait_method_reference *method_ref = emalloc(sizeof(zend_trait_method_reference)); method_ref->ce = NULL; - method_ref->method_name = STR_COPY(Z_STR_P(zend_ast_get_zval(method_ast))); + method_ref->method_name = STR_COPY(zend_ast_get_str(method_ast)); if (class_ast) { method_ref->class_name = zend_resolve_class_name_ast(class_ast TSRMLS_CC); @@ -5909,7 +5909,7 @@ static void zend_compile_trait_alias(zend_ast *ast TSRMLS_DC) { alias->modifiers = modifiers; if (alias_ast) { - alias->alias = STR_COPY(Z_STR_P(zend_ast_get_zval(alias_ast))); + alias->alias = STR_COPY(zend_ast_get_str(alias_ast)); } else { alias->alias = NULL; } @@ -5926,7 +5926,7 @@ void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { for (i = 0; i < traits->children; ++i) { zend_ast *trait_ast = traits->child[i]; - zend_string *name = Z_STR_P(zend_ast_get_zval(trait_ast)); + zend_string *name = zend_ast_get_str(trait_ast); if (ce->ce_flags & ZEND_ACC_INTERFACE) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use traits inside of interfaces. " @@ -5976,7 +5976,7 @@ void zend_compile_implements(znode *class_node, zend_ast *ast TSRMLS_DC) { zend_uint i; for (i = 0; i < list->children; ++i) { zend_ast *class_ast = list->child[i]; - zend_string *name = Z_STR_P(zend_ast_get_zval(class_ast)); + zend_string *name = zend_ast_get_str(class_ast); zend_op *opline; @@ -6074,7 +6074,7 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { } if (!zend_is_const_default_class_ref(extends_ast)) { - zend_string *extends_name = Z_STR_P(zend_ast_get_zval(extends_ast)); + zend_string *extends_name = zend_ast_get_str(extends_ast); zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", extends_name->val); } @@ -6236,11 +6236,11 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { zend_ast *use_ast = list->child[i]; zend_ast *old_name_ast = use_ast->child[0]; zend_ast *new_name_ast = use_ast->child[1]; - zend_string *old_name = Z_STR_P(zend_ast_get_zval(old_name_ast)); + zend_string *old_name = zend_ast_get_str(old_name_ast); zend_string *new_name, *lookup_name; if (new_name_ast) { - new_name = STR_COPY(Z_STR_P(zend_ast_get_zval(new_name_ast))); + new_name = STR_COPY(zend_ast_get_str(new_name_ast)); } else { /* The form "use A\B" is eqivalent to "use A\B as B" */ const char *p = zend_memrchr(old_name->val, '\\', old_name->len); @@ -6338,7 +6338,7 @@ void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { zend_ast *const_ast = list->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 *name = zend_ast_get_str(name_ast); zend_string *import_name; znode name_node, value_node; @@ -6443,7 +6443,7 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { } if (name_ast) { - name = Z_STR_P(zend_ast_get_zval(name_ast)); + name = zend_ast_get_str(name_ast); if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name->val, name->len)) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as namespace name", name->val); @@ -6940,7 +6940,7 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; - zend_string *orig_name = Z_STR_P(zend_ast_get_zval(name_ast)); + zend_string *orig_name = zend_ast_get_str(name_ast); zend_bool is_fully_qualified; zval resolved_name; @@ -7187,8 +7187,8 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zend_ast *class_ast = ast->child[0]; zend_ast *const_ast = ast->child[1]; - zend_string *class_name = Z_STR_P(zend_ast_get_zval(class_ast)); - zend_string *const_name = Z_STR_P(zend_ast_get_zval(const_ast)); + zend_string *class_name = zend_ast_get_str(class_ast); + zend_string *const_name = zend_ast_get_str(const_ast); zval result; int fetch_type; -- cgit v1.2.1 From 38c4125c2e1fcf55529441c64e90e6625fa6deaa Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 15:23:00 +0200 Subject: Cleanup dead/duplicate code --- Zend/zend_compile.c | 39 --------------------------------------- Zend/zend_compile.h | 18 ++++++------------ Zend/zend_language_parser.y | 8 ++++---- 3 files changed, 10 insertions(+), 55 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 6a24e22669..0419d032ac 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -555,13 +555,6 @@ static int zend_add_const_name_literal(zend_op_array *op_array, zval *zv, int un #define MAKE_NOP(opline) { opline->opcode = ZEND_NOP; memset(&opline->result,0,sizeof(opline->result)); memset(&opline->op1,0,sizeof(opline->op1)); memset(&opline->op2,0,sizeof(opline->op2)); opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; } -void zend_discard_doc_comment(TSRMLS_D) { - if (CG(doc_comment)) { - STR_RELEASE(CG(doc_comment)); - CG(doc_comment) = NULL; - } -} - void zend_stop_lexing(TSRMLS_D) { LANG_SCNG(yy_cursor) = LANG_SCNG(yy_limit); } @@ -2840,27 +2833,6 @@ ZEND_API int zend_unmangle_property_name_ex(const char *mangled_property, int le } /* }}} */ -void zend_do_halt_compiler_register(TSRMLS_D) /* {{{ */ -{ - zend_string *name; - zend_string *cfilename; - char haltoff[] = "__COMPILER_HALT_OFFSET__"; - - if (CG(has_bracketed_namespaces) && CG(in_namespace)) { - zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); - } - - cfilename = zend_get_compiled_filename(TSRMLS_C); - name = zend_mangle_property_name(haltoff, sizeof(haltoff) - 1, cfilename->val, cfilename->len, 0); - zend_register_long_constant(name->val, name->len, zend_get_scanned_file_offset(TSRMLS_C), CONST_CS, 0 TSRMLS_CC); - STR_FREE(name); - - if (CG(in_namespace)) { - zend_do_end_namespace(TSRMLS_C); - } -} -/* }}} */ - static zend_constant *zend_get_ct_const(zend_string *name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */ { zend_constant *c = NULL; @@ -2996,17 +2968,6 @@ void zend_do_extended_fcall_end(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_do_ticks(TSRMLS_D) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_TICKS; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - opline->extended_value = Z_LVAL(CG(declarables).ticks); -} -/* }}} */ - zend_bool zend_is_auto_global(zend_string *name TSRMLS_DC) /* {{{ */ { zend_auto_global *auto_global; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 1de42b2991..69a65fe656 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -40,15 +40,13 @@ #define INC_BPC(op_array) if (op_array->fn_flags & ZEND_ACC_INTERACTIVE) { (CG(context).backpatch_count++); } #define DEC_BPC(op_array) if (op_array->fn_flags & ZEND_ACC_INTERACTIVE) { (CG(context).backpatch_count--); } #define HANDLE_INTERACTIVE() if (CG(active_op_array)->fn_flags & ZEND_ACC_INTERACTIVE) { execute_new_code(TSRMLS_C); } -#define DO_TICKS() if (Z_LVAL(CG(declarables).ticks)) { zend_do_ticks(TSRMLS_C); } -#define RESET_DOC_COMMENT() \ - { \ - if (CG(doc_comment)) { \ - STR_RELEASE(CG(doc_comment)); \ - CG(doc_comment) = NULL; \ - } \ - } +#define RESET_DOC_COMMENT() do { \ + if (CG(doc_comment)) { \ + STR_RELEASE(CG(doc_comment)); \ + CG(doc_comment) = NULL; \ + } \ +} while (0) typedef struct _zend_op_array zend_op_array; typedef struct _zend_op zend_op; @@ -495,8 +493,6 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent void zend_do_early_binding(TSRMLS_D); ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS_DC); -void zend_do_halt_compiler_register(TSRMLS_D); - /* Functions for a null terminated pointer list, used for traits parsing and compilation */ void zend_init_list(void *result, void *item TSRMLS_DC); void zend_add_to_list(void *result, void *item TSRMLS_DC); @@ -505,8 +501,6 @@ void zend_do_extended_info(TSRMLS_D); void zend_do_extended_fcall_begin(TSRMLS_D); void zend_do_extended_fcall_end(TSRMLS_D); -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_end_namespace(TSRMLS_D); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index bfba46792a..5b93c0bc1e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -255,11 +255,11 @@ top_statement: zend_stop_lexing(TSRMLS_C); } | T_NAMESPACE namespace_name ';' { $$.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.ast, NULL); - zend_discard_doc_comment(TSRMLS_C); } - | T_NAMESPACE namespace_name { zend_discard_doc_comment(TSRMLS_C); } + RESET_DOC_COMMENT(); } + | T_NAMESPACE namespace_name { RESET_DOC_COMMENT(); } '{' top_statement_list '}' { $$.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.ast, $5.ast); } - | T_NAMESPACE { zend_discard_doc_comment(TSRMLS_C); } + | T_NAMESPACE { RESET_DOC_COMMENT(); } '{' top_statement_list '}' { $$.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $4.ast); } | T_USE use_declarations ';' @@ -607,7 +607,7 @@ class_statement: variable_modifiers property_list ';' { $$.ast = $2.ast; $$.ast->attr = $1.num; } | T_CONST class_const_list ';' - { $$.ast = $2.ast; zend_discard_doc_comment(TSRMLS_C); } + { $$.ast = $2.ast; RESET_DOC_COMMENT(); } | T_USE name_list trait_adaptations { $$.ast = zend_ast_create_binary(ZEND_AST_USE_TRAIT, $2.ast, $3.ast); } | method_modifiers function returns_ref T_STRING '(' parameter_list ')' -- cgit v1.2.1 From 2306655214eaea7b15cf1f3327257fbf74d425db Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 15:26:30 +0200 Subject: We don't pay per newline... --- Zend/zend_compile.c | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 0419d032ac..f54c2fe8a1 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -529,31 +529,13 @@ static int zend_add_const_name_literal(zend_op_array *op_array, zval *zv, int un op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \ } while (0) -#define LITERAL_STRINGL(op, str, len) do { \ - zval _c; \ - ZVAL_STRINGL(&_c, str, len); \ - op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \ - } while (0) - -#define LITERAL_LONG(op, val) do { \ - zval _c; \ - ZVAL_LONG(&_c, val); \ - op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \ - } while (0) - -#define LITERAL_LONG_EX(op_array, op, val) do { \ - zval _c; \ - ZVAL_LONG(&_c, val); \ - op.constant = zend_add_literal(op_array, &_c TSRMLS_CC); \ - } while (0) - -#define LITERAL_NULL(op) do { \ - zval _c; \ - ZVAL_NULL(&_c); \ - op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \ - } while (0) - -#define MAKE_NOP(opline) { opline->opcode = ZEND_NOP; memset(&opline->result,0,sizeof(opline->result)); memset(&opline->op1,0,sizeof(opline->op1)); memset(&opline->op2,0,sizeof(opline->op2)); opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; } +#define MAKE_NOP(opline) do { \ + opline->opcode = ZEND_NOP; \ + memset(&opline->result, 0, sizeof(opline->result)); \ + memset(&opline->op1, 0, sizeof(opline->op1)); \ + memset(&opline->op2, 0, sizeof(opline->op2)); \ + opline->result_type = opline->op1_type = opline->op2_type = IS_UNUSED; \ +} while (0) void zend_stop_lexing(TSRMLS_D) { LANG_SCNG(yy_cursor) = LANG_SCNG(yy_limit); -- cgit v1.2.1 From 50aefcf0758b4dda19f803d5ff3f5ceba372f078 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 15:29:56 +0200 Subject: Remove duplicate code --- Zend/zend_compile.c | 84 +++++++++-------------------------------------------- Zend/zend_compile.h | 2 -- 2 files changed, 14 insertions(+), 72 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f54c2fe8a1..e5e6bede4b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -541,39 +541,6 @@ void zend_stop_lexing(TSRMLS_D) { LANG_SCNG(yy_cursor) = LANG_SCNG(yy_limit); } -void zend_do_abstract_method(const znode *function_name, znode *modifiers, const znode *body TSRMLS_DC) /* {{{ */ -{ - char *method_type; - - if (CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE) { - Z_LVAL(modifiers->u.constant) |= ZEND_ACC_ABSTRACT; - method_type = "Interface"; - } else { - method_type = "Abstract"; - } - - if (Z_LVAL(modifiers->u.constant) & ZEND_ACC_ABSTRACT) { - if(Z_LVAL(modifiers->u.constant) & ZEND_ACC_PRIVATE) { - zend_error_noreturn(E_COMPILE_ERROR, "%s function %s::%s() cannot be declared private", method_type, CG(active_class_entry)->name->val, Z_STRVAL(function_name->u.constant)); - } - if (Z_LVAL(body->u.constant) == ZEND_ACC_ABSTRACT) { - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_RAISE_ABSTRACT_ERROR; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); - } else { - /* we had code in the function body */ - zend_error_noreturn(E_COMPILE_ERROR, "%s function %s::%s() cannot contain body", method_type, CG(active_class_entry)->name->val, Z_STRVAL(function_name->u.constant)); - } - } else { - if (Z_LVAL(body->u.constant) == ZEND_ACC_ABSTRACT) { - zend_error_noreturn(E_COMPILE_ERROR, "Non-abstract method %s::%s() must contain body", CG(active_class_entry)->name->val, Z_STRVAL(function_name->u.constant)); - } - } -} -/* }}} */ - static inline void do_begin_loop(TSRMLS_D) /* {{{ */ { zend_brk_cont_element *brk_cont_element; @@ -3159,35 +3126,39 @@ void zend_verify_namespace(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_do_end_namespace(TSRMLS_D) /* {{{ */ -{ - CG(in_namespace) = 0; - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - zval_dtor(&CG(current_namespace)); - ZVAL_UNDEF(&CG(current_namespace)); - } +static void zend_reset_import_tables(TSRMLS_D) { if (CG(current_import)) { zend_hash_destroy(CG(current_import)); efree(CG(current_import)); CG(current_import) = NULL; } + if (CG(current_import_function)) { zend_hash_destroy(CG(current_import_function)); efree(CG(current_import_function)); CG(current_import_function) = NULL; } + if (CG(current_import_const)) { zend_hash_destroy(CG(current_import_const)); efree(CG(current_import_const)); CG(current_import_const) = NULL; } } -/* }}} */ + +static void zend_end_namespace(TSRMLS_D) { + CG(in_namespace) = 0; + zend_reset_import_tables(TSRMLS_C); + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + zval_dtor(&CG(current_namespace)); + ZVAL_UNDEF(&CG(current_namespace)); + } +} void zend_do_end_compilation(TSRMLS_D) /* {{{ */ { CG(has_bracketed_namespaces) = 0; - zend_do_end_namespace(TSRMLS_C); + zend_end_namespace(TSRMLS_C); } /* }}} */ @@ -6321,26 +6292,6 @@ void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { } } -static void zend_reset_import_tables(TSRMLS_D) { - if (CG(current_import)) { - zend_hash_destroy(CG(current_import)); - efree(CG(current_import)); - CG(current_import) = NULL; - } - - if (CG(current_import_function)) { - zend_hash_destroy(CG(current_import_function)); - efree(CG(current_import_function)); - CG(current_import_function) = NULL; - } - - if (CG(current_import_const)) { - zend_hash_destroy(CG(current_import_const)); - efree(CG(current_import_const)); - CG(current_import_const) = NULL; - } -} - void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; zend_ast *stmt_ast = ast->child[1]; @@ -6406,14 +6357,7 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { if (stmt_ast) { zend_compile_top_stmt(stmt_ast TSRMLS_CC); - - CG(in_namespace) = 0; - zend_reset_import_tables(TSRMLS_C); - - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - zval_dtor(&CG(current_namespace)); - ZVAL_UNDEF(&CG(current_namespace)); - } + zend_end_namespace(TSRMLS_C); } } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 69a65fe656..a637d4cbe6 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -501,8 +501,6 @@ void zend_do_extended_info(TSRMLS_D); void zend_do_extended_fcall_begin(TSRMLS_D); void zend_do_extended_fcall_end(TSRMLS_D); -void zend_do_abstract_method(const znode *function_name, znode *modifiers, const znode *body TSRMLS_DC); - void zend_do_end_namespace(TSRMLS_D); void zend_verify_namespace(TSRMLS_D); void zend_do_end_compilation(TSRMLS_D); -- cgit v1.2.1 From 55f53e29a0abde732eabf8364c289fdd4e97d7df Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 15:39:43 +0200 Subject: zend_get_class_fetch_type works on zend_string --- Zend/zend_compile.c | 43 ++++++++++++++++++------------------------- Zend/zend_compile.h | 2 +- Zend/zend_execute_API.c | 2 +- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e5e6bede4b..50946e1e37 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -783,7 +783,7 @@ zend_string *zend_resolve_class_name( STR_ADDREF(name); } /* Ensure that \self, \parent and \static are not used */ - if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name->val, name->len)) { + if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name)) { zend_error_noreturn(E_COMPILE_ERROR, "'\\%s' is an invalid class name", name->val); } return name; @@ -3076,22 +3076,20 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify } /* }}} */ -int zend_get_class_fetch_type(const char *class_name, uint class_name_len) /* {{{ */ -{ - if ((class_name_len == sizeof("self")-1) && - !strncasecmp(class_name, "self", sizeof("self")-1)) { +zend_uint zend_get_class_fetch_type(zend_string *name) { + if (name->len == sizeof("self") - 1 && + !strncasecmp(name->val, "self", sizeof("self") - 1)) { return ZEND_FETCH_CLASS_SELF; - } else if ((class_name_len == sizeof("parent")-1) && - !strncasecmp(class_name, "parent", sizeof("parent")-1)) { + } else if (name->len == sizeof("parent") - 1 && + !strncasecmp(name->val, "parent", sizeof("parent") - 1)) { return ZEND_FETCH_CLASS_PARENT; - } else if ((class_name_len == sizeof("static")-1) && - !strncasecmp(class_name, "static", sizeof("static")-1)) { + } else if (name->len == sizeof("static") - 1 && + !strncasecmp(name->val, "static", sizeof("static") - 1)) { return ZEND_FETCH_CLASS_STATIC; } else { return ZEND_FETCH_CLASS_DEFAULT; } } -/* }}} */ ZEND_API zend_string *zend_get_compiled_variable_name(const zend_op_array *op_array, zend_uint var) /* {{{ */ { @@ -3485,8 +3483,7 @@ static zend_bool zend_can_write_to_variable(zend_ast *ast) { } static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { - zval *name; - int fetch_type; + zend_string *name; if (name_ast->kind != ZEND_AST_ZVAL) { return 0; @@ -3497,9 +3494,8 @@ static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { return 1; } - name = zend_ast_get_zval(name_ast); - fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); - return fetch_type == ZEND_FETCH_CLASS_DEFAULT; + name = zend_ast_get_str(name_ast); + return ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(name); } static void zend_handle_numeric_op2(zend_op *opline TSRMLS_DC) { @@ -3527,8 +3523,7 @@ static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_ zend_op *opline; if (name_ast->kind == ZEND_AST_ZVAL) { - zval *name = zend_ast_get_zval(name_ast); - int fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); + zend_uint fetch_type = zend_get_class_fetch_type(zend_ast_get_str(name_ast)); opline = emit_op(result, ZEND_FETCH_CLASS, NULL, NULL TSRMLS_CC); opline->extended_value = fetch_type; @@ -5847,7 +5842,7 @@ void zend_compile_use_trait(zend_ast *ast TSRMLS_DC) { "%s is used in %s", name->val, ce->name->val); } - switch (zend_get_class_fetch_type(name->val, name->len)) { + switch (zend_get_class_fetch_type(name)) { case ZEND_FETCH_CLASS_SELF: case ZEND_FETCH_CLASS_PARENT: case ZEND_FETCH_CLASS_STATIC: @@ -5931,7 +5926,7 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { return; } - if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name->val, name->len)) { + if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name)) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", name->val); } @@ -6339,7 +6334,7 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { if (name_ast) { name = zend_ast_get_str(name_ast); - if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name->val, name->len)) { + if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name)) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as namespace name", name->val); } @@ -6890,8 +6885,7 @@ void zend_compile_class_const(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_resolve_class_name(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *name_ast = ast->child[0]; - zval *name = zend_ast_get_zval(name_ast); - int fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); + zend_uint fetch_type = zend_get_class_fetch_type(zend_ast_get_str(name_ast)); switch (fetch_type) { case ZEND_FETCH_CLASS_SELF: @@ -7084,7 +7078,7 @@ void zend_compile_const_expr_class_const(zend_ast **ast_ptr TSRMLS_DC) { "Dynamic class names are not allowed in compile-time class constant references"); } - fetch_type = zend_get_class_fetch_type(class_name->val, class_name->len); + fetch_type = zend_get_class_fetch_type(class_name); if (ZEND_FETCH_CLASS_STATIC == fetch_type) { zend_error_noreturn(E_COMPILE_ERROR, @@ -7142,8 +7136,7 @@ void zend_compile_const_expr_const(zend_ast **ast_ptr TSRMLS_DC) { void zend_compile_const_expr_resolve_class_name(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zend_ast *name_ast = ast->child[0]; - zval *name = zend_ast_get_zval(name_ast); - int fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name)); + zend_uint fetch_type = zend_get_class_fetch_type(zend_ast_get_str(name_ast)); zval result; switch (fetch_type) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index a637d4cbe6..b4ed669944 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -554,7 +554,7 @@ void zend_do_mark_last_catch(const znode *first_catch, const znode *last_additio ZEND_API zend_bool zend_is_compiling(TSRMLS_D); ZEND_API char *zend_make_compiled_string_description(const char *name TSRMLS_DC); ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify_handlers TSRMLS_DC); -int zend_get_class_fetch_type(const char *class_name, uint class_name_len); +zend_uint zend_get_class_fetch_type(zend_string *name); typedef zend_bool (*zend_auto_global_callback)(zend_string *name TSRMLS_DC); typedef struct _zend_auto_global { diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 5ac8eab068..bdf87bd440 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1467,7 +1467,7 @@ check_fetch_type: } return EG(current_execute_data)->called_scope; case ZEND_FETCH_CLASS_AUTO: { - fetch_type = zend_get_class_fetch_type(class_name->val, class_name->len); + fetch_type = zend_get_class_fetch_type(class_name); if (fetch_type!=ZEND_FETCH_CLASS_DEFAULT) { goto check_fetch_type; } -- cgit v1.2.1 From 31a886c346d268cd448125922c7ae32000d4ee87 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 15:43:39 +0200 Subject: More dead code --- Zend/zend_compile.c | 12 ------------ Zend/zend_compile.h | 3 --- 2 files changed, 15 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 50946e1e37..92bd8f45db 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -649,16 +649,6 @@ zend_uint zend_add_member_modifier(zend_uint flags, zend_uint new_flag) { return new_flags; } -void zend_do_handle_exception(TSRMLS_D) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_HANDLE_EXCEPTION; - SET_UNUSED(opline->op1); - SET_UNUSED(opline->op2); -} -/* }}} */ - zend_string *zend_concat3( char *str1, size_t str1_len, char *str2, size_t str2_len, char *str3, size_t str3_len ) { @@ -4345,8 +4335,6 @@ void zend_compile_method_call(znode *result, zend_ast *ast, int type TSRMLS_DC) //zend_ast *method_ast = ast->child[1]; zend_ast *args_ast = ast->child[2]; - // TODO.AST __clone check - WTF is that done in here?! - // TODO.AST using an evil overload from AST_METHOD to AST_PROP here ... zend_op *opline = zend_compile_prop_common(NULL, ast, BP_VAR_R TSRMLS_CC); opline->opcode = ZEND_INIT_METHOD_CALL; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index b4ed669944..ef136a71f1 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -478,8 +478,6 @@ 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); -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); ZEND_API zend_class_entry *do_bind_class(const zend_op_array *op_array, const zend_op *opline, HashTable *class_table, zend_bool compile_time TSRMLS_DC); ZEND_API zend_class_entry *do_bind_inherited_class(const zend_op_array *op_array, const zend_op *opline, HashTable *class_table, zend_class_entry *parent_ce, zend_bool compile_time TSRMLS_DC); @@ -501,7 +499,6 @@ void zend_do_extended_info(TSRMLS_D); void zend_do_extended_fcall_begin(TSRMLS_D); void zend_do_extended_fcall_end(TSRMLS_D); -void zend_do_end_namespace(TSRMLS_D); void zend_verify_namespace(TSRMLS_D); void zend_do_end_compilation(TSRMLS_D); -- cgit v1.2.1 From 4c05bec536bf3751ea63a39754c4c5e6cf4fe185 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 15:49:33 +0200 Subject: Remove some unused compiler globals --- Zend/zend.c | 9 --------- Zend/zend_compile.c | 8 -------- Zend/zend_compile.h | 17 ----------------- Zend/zend_globals.h | 19 +++---------------- 4 files changed, 3 insertions(+), 50 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index 6717bf2ce4..c0fd373508 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1024,11 +1024,8 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ zval orig_user_error_handler; zend_bool in_compilation; zend_class_entry *saved_class_entry; - zend_stack bp_stack; - zend_stack function_call_stack; zend_stack switch_cond_stack; zend_stack foreach_copy_stack; - zend_stack list_stack; zend_stack context_stack; zend_array *symbol_table; TSRMLS_FETCH(); @@ -1191,11 +1188,8 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ if (in_compilation) { saved_class_entry = CG(active_class_entry); CG(active_class_entry) = NULL; - SAVE_STACK(bp_stack); - SAVE_STACK(function_call_stack); SAVE_STACK(switch_cond_stack); SAVE_STACK(foreach_copy_stack); - SAVE_STACK(list_stack); SAVE_STACK(context_stack); CG(in_compilation) = 0; } @@ -1215,11 +1209,8 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ if (in_compilation) { CG(active_class_entry) = saved_class_entry; - RESTORE_STACK(bp_stack); - RESTORE_STACK(function_call_stack); RESTORE_STACK(switch_cond_stack); RESTORE_STACK(foreach_copy_stack); - RESTORE_STACK(list_stack); RESTORE_STACK(context_stack); CG(in_compilation) = 1; } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 92bd8f45db..4b00e5b9be 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -195,14 +195,9 @@ void zend_init_compiler_context(TSRMLS_D) /* {{{ */ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */ { - zend_stack_init(&CG(bp_stack), sizeof(zend_llist)); - zend_stack_init(&CG(function_call_stack), sizeof(zend_function_call_entry)); zend_stack_init(&CG(switch_cond_stack), sizeof(zend_switch_entry)); zend_stack_init(&CG(foreach_copy_stack), sizeof(zend_op)); CG(active_class_entry) = NULL; - zend_llist_init(&CG(list_llist), sizeof(list_llist_element), NULL, 0); - zend_llist_init(&CG(dimension_llist), sizeof(int), NULL, 0); - zend_stack_init(&CG(list_stack), sizeof(zend_llist)); CG(in_compilation) = 0; CG(start_lineno) = 0; ZVAL_UNDEF(&CG(current_namespace)); @@ -242,11 +237,8 @@ void init_compiler(TSRMLS_D) /* {{{ */ void shutdown_compiler(TSRMLS_D) /* {{{ */ { - zend_stack_destroy(&CG(bp_stack)); - zend_stack_destroy(&CG(function_call_stack)); zend_stack_destroy(&CG(switch_cond_stack)); zend_stack_destroy(&CG(foreach_copy_stack)); - zend_stack_destroy(&CG(list_stack)); zend_hash_destroy(&CG(filenames_table)); zend_hash_destroy(&CG(const_filenames)); zend_stack_destroy(&CG(context_stack)); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index ef136a71f1..a91ec99c07 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -359,26 +359,12 @@ union _zend_function { zend_internal_function internal_function; }; -typedef struct _zend_function_call_entry { - zend_function *fbc; - zend_uint op_number; - zend_uint arg_num; - zend_bool uses_argument_unpacking; -} zend_function_call_entry; - typedef struct _zend_switch_entry { znode cond; int default_case; int control_var; } zend_switch_entry; - -typedef struct _list_llist_element { - znode var; - zend_llist dimensions; - znode value; -} list_llist_element; - typedef enum _vm_frame_kind { VM_FRAME_NESTED_FUNCTION, /* stackless VM call to function */ VM_FRAME_NESTED_CODE, /* stackless VM call to include/require/eval */ @@ -545,9 +531,6 @@ int print_class(zend_class_entry *class_entry TSRMLS_DC); void print_op_array(zend_op_array *op_array, int optimizations); ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC); zend_brk_cont_element *get_next_brk_cont_element(zend_op_array *op_array); -void zend_do_first_catch(znode *open_parentheses TSRMLS_DC); -void zend_initialize_try_catch_element(znode *catch_token TSRMLS_DC); -void zend_do_mark_last_catch(const znode *first_catch, const znode *last_additional_catch TSRMLS_DC); ZEND_API zend_bool zend_is_compiling(TSRMLS_D); ZEND_API char *zend_make_compiled_string_description(const char *name TSRMLS_DC); ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify_handlers TSRMLS_DC); diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index dd8098e78b..f327493a4b 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -71,20 +71,11 @@ typedef struct _zend_ini_entry zend_ini_entry; struct _zend_compiler_globals { - zend_stack bp_stack; zend_stack switch_cond_stack; zend_stack foreach_copy_stack; - zend_stack object_stack; /* TODO: remove */ zend_class_entry *active_class_entry; - /* variables for list() compilation */ - zend_llist list_llist; - zend_llist dimension_llist; - zend_stack list_stack; - - zend_stack function_call_stack; - zend_string *compiled_filename; int zend_lineno; @@ -111,8 +102,6 @@ struct _zend_compiler_globals { zend_llist open_files; - long catch_begin; - struct _zend_ini_parser_param *ini_parser_param; int interactive; @@ -122,8 +111,6 @@ struct _zend_compiler_globals { znode implementing_class; - zend_uint access_type; - zend_string *doc_comment; zend_uint compiler_options; /* set of ZEND_COMPILE_* constants */ @@ -153,13 +140,13 @@ struct _zend_compiler_globals { zend_bool detect_unicode; zend_bool encoding_declared; + zend_ast *ast; + zend_arena *ast_arena; + #ifdef ZTS zval **static_members_table; int last_static_member; #endif - - zend_ast *ast; - zend_arena *ast_arena; }; -- cgit v1.2.1 From e403b27a404b5fb673f0c9e72c3d346cf9c412ff Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 15:55:30 +0200 Subject: Remove old macro/function --- Zend/zend_compile.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index a91ec99c07..68a30e35dc 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -33,8 +33,6 @@ #define DEBUG_ZEND 0 -#define FREE_PNODE(znode) zval_dtor(&znode->u.constant); - #define SET_UNUSED(op) op ## _type = IS_UNUSED #define INC_BPC(op_array) if (op_array->fn_flags & ZEND_ACC_INTERACTIVE) { (CG(context).backpatch_count++); } @@ -107,7 +105,6 @@ void zend_ensure_writable_variable(const zend_ast *ast); void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_expr(znode *node, zend_ast *ast TSRMLS_DC); -int zend_compile_expr_maybe_ct(znode *node, zend_ast *ast, zend_bool ct_required TSRMLS_DC); void zend_compile_var(znode *node, zend_ast *ast, int type TSRMLS_DC); void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC); -- cgit v1.2.1 From 39d480e471177eec57927f833b53dcf4dbad8173 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 17:59:12 +0200 Subject: Remove zend_ast_create_unary etc --- Zend/zend_ast.h | 12 --- Zend/zend_compile.c | 16 +-- Zend/zend_language_parser.y | 230 ++++++++++++++++++++++---------------------- 3 files changed, 122 insertions(+), 136 deletions(-) diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 1d9863d976..df293db405 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -252,18 +252,6 @@ static inline zend_ast *zend_ast_create_zval_from_long(long lval) { return zend_ast_create_zval(&zv); } -static inline zend_ast *zend_ast_create_unary(zend_ast_kind kind, zend_ast *op0) { - return zend_ast_create(1, kind, op0); -} -static inline zend_ast *zend_ast_create_binary(zend_ast_kind kind, zend_ast *op0, zend_ast *op1) { - return zend_ast_create(2, kind, op0, op1); -} -static inline zend_ast *zend_ast_create_ternary( - zend_ast_kind kind, zend_ast *op0, zend_ast *op1, zend_ast *op2 -) { - return zend_ast_create(3, kind, op0, op1, op2); -} - static inline zend_ast *zend_ast_create_binary_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { return zend_ast_create_ex(2, ZEND_AST_BINARY_OP, opcode, op0, op1); } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4b00e5b9be..2623e3ec30 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4483,12 +4483,12 @@ static void zend_compile_static_var_common( opline->extended_value = ZEND_FETCH_STATIC; if (by_ref) { - zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); + zend_ast *fetch_ast = zend_ast_create(1, ZEND_AST_VAR, var_ast); zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); } else { - zend_ast *fetch_ast = zend_ast_create_unary(ZEND_AST_VAR, var_ast); + zend_ast *fetch_ast = zend_ast_create(1, ZEND_AST_VAR, var_ast); zend_ast *znode_ast = zend_ast_create_znode(&result); - zend_ast *assign_ast = zend_ast_create_binary(ZEND_AST_ASSIGN, fetch_ast, znode_ast); + zend_ast *assign_ast = zend_ast_create(2, ZEND_AST_ASSIGN, fetch_ast, znode_ast); znode dummy_node; zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); @@ -4838,14 +4838,14 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { zend_compile_assign_ref_common(NULL, value_ast, &value_node TSRMLS_CC); } else { zend_ast *znode_ast = zend_ast_create_znode(&value_node); - zend_ast *assign_ast = zend_ast_create_binary(ZEND_AST_ASSIGN, value_ast, znode_ast); + zend_ast *assign_ast = zend_ast_create(2, ZEND_AST_ASSIGN, value_ast, znode_ast); zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); } if (key_ast) { zend_ast *znode_ast = zend_ast_create_znode(&key_node); - zend_ast *assign_ast = zend_ast_create_binary(ZEND_AST_ASSIGN, key_ast, znode_ast); + zend_ast *assign_ast = zend_ast_create(2, ZEND_AST_ASSIGN, key_ast, znode_ast); zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); } @@ -6736,7 +6736,7 @@ void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { ZVAL_STRING(&fn_name, "shell_exec"); name_ast = zend_ast_create_zval(&fn_name); args_ast = (zend_ast *) zend_ast_create_list(1, ZEND_AST_ARG_LIST, expr_ast); - call_ast = zend_ast_create_binary(ZEND_AST_CALL, name_ast, args_ast); + call_ast = zend_ast_create(2, ZEND_AST_CALL, name_ast, args_ast); zend_compile_expr(result, call_ast TSRMLS_CC); @@ -6888,7 +6888,7 @@ void zend_compile_resolve_class_name(znode *result, zend_ast *ast TSRMLS_DC) { ZVAL_STRING(&class_str_zv, "class"); class_str_ast = zend_ast_create_zval(&class_str_zv); - class_const_ast = zend_ast_create_binary( + class_const_ast = zend_ast_create(2, ZEND_AST_CLASS_CONST, name_ast, class_str_ast); zend_compile_expr(result, class_const_ast TSRMLS_CC); @@ -7025,7 +7025,7 @@ void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { { zval const_zv; ZVAL_STRING(&const_zv, "__CLASS__"); - zend_ast *const_ast = zend_ast_create_unary(ZEND_AST_CONST, + zend_ast *const_ast = zend_ast_create(1, ZEND_AST_CONST, zend_ast_create_zval(&const_zv)); zend_compile_const(result, const_ast TSRMLS_CC); zval_ptr_dtor(&const_zv); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 5b93c0bc1e..1cdff6b985 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -250,18 +250,18 @@ top_statement: | function_declaration_statement { $$.ast = $1.ast; } | class_declaration_statement { $$.ast = $1.ast; } | T_HALT_COMPILER '(' ')' ';' - { $$.ast = zend_ast_create_unary(ZEND_AST_HALT_COMPILER, + { $$.ast = zend_ast_create(1, ZEND_AST_HALT_COMPILER, zend_ast_create_zval_from_long(zend_get_scanned_file_offset(TSRMLS_C))); zend_stop_lexing(TSRMLS_C); } | T_NAMESPACE namespace_name ';' - { $$.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.ast, NULL); + { $$.ast = zend_ast_create(2, ZEND_AST_NAMESPACE, $2.ast, NULL); RESET_DOC_COMMENT(); } | T_NAMESPACE namespace_name { RESET_DOC_COMMENT(); } '{' top_statement_list '}' - { $$.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.ast, $5.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_NAMESPACE, $2.ast, $5.ast); } | T_NAMESPACE { RESET_DOC_COMMENT(); } '{' top_statement_list '}' - { $$.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $4.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_NAMESPACE, NULL, $4.ast); } | T_USE use_declarations ';' { $$.ast = $2.ast; $$.ast->attr = T_CLASS; } | T_USE T_FUNCTION use_declarations ';' @@ -280,13 +280,13 @@ use_declarations: use_declaration: namespace_name - { $$.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.ast, NULL); } + { $$.ast = zend_ast_create(2, ZEND_AST_USE_ELEM, $1.ast, NULL); } | namespace_name T_AS T_STRING - { $$.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_USE_ELEM, $1.ast, $3.ast); } | T_NS_SEPARATOR namespace_name - { $$.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.ast, NULL); } + { $$.ast = zend_ast_create(2, ZEND_AST_USE_ELEM, $2.ast, NULL); } | T_NS_SEPARATOR namespace_name T_AS T_STRING - { $$.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.ast, $4.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_USE_ELEM, $2.ast, $4.ast); } ; const_list: @@ -313,7 +313,7 @@ inner_statement: statement: unticked_statement { $$.ast = $1.ast; } - | T_STRING ':' { $$.ast = zend_ast_create_unary(ZEND_AST_LABEL, $1.ast); } + | T_STRING ':' { $$.ast = zend_ast_create(1, ZEND_AST_LABEL, $1.ast); } ; unticked_statement: @@ -321,25 +321,25 @@ unticked_statement: | if_stmt { $$.ast = $1.ast; } | alt_if_stmt { $$.ast = $1.ast; } | T_WHILE parenthesis_expr while_statement - { $$.ast = zend_ast_create_binary(ZEND_AST_WHILE, $2.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_WHILE, $2.ast, $3.ast); } | T_DO statement T_WHILE parenthesis_expr ';' - { $$.ast = zend_ast_create_binary(ZEND_AST_DO_WHILE, $2.ast, $4.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_DO_WHILE, $2.ast, $4.ast); } | T_FOR '(' for_expr ';' for_expr ';' for_expr ')' for_statement { $$.ast = zend_ast_create(4, ZEND_AST_FOR, $3.ast, $5.ast, $7.ast, $9.ast); } | T_SWITCH parenthesis_expr switch_case_list - { $$.ast = zend_ast_create_binary(ZEND_AST_SWITCH, $2.ast, $3.ast); } - | T_BREAK ';' { $$.ast = zend_ast_create_unary(ZEND_AST_BREAK, NULL); } - | T_BREAK expr ';' { $$.ast = zend_ast_create_unary(ZEND_AST_BREAK, $2.ast); } - | T_CONTINUE ';' { $$.ast = zend_ast_create_unary(ZEND_AST_CONTINUE, NULL); } - | T_CONTINUE expr ';' { $$.ast = zend_ast_create_unary(ZEND_AST_CONTINUE, $2.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_SWITCH, $2.ast, $3.ast); } + | T_BREAK ';' { $$.ast = zend_ast_create(1, ZEND_AST_BREAK, NULL); } + | T_BREAK expr ';' { $$.ast = zend_ast_create(1, ZEND_AST_BREAK, $2.ast); } + | T_CONTINUE ';' { $$.ast = zend_ast_create(1, ZEND_AST_CONTINUE, NULL); } + | T_CONTINUE expr ';' { $$.ast = zend_ast_create(1, ZEND_AST_CONTINUE, $2.ast); } | T_RETURN ';' - { $$.ast = zend_ast_create_unary(ZEND_AST_RETURN, NULL); } + { $$.ast = zend_ast_create(1, ZEND_AST_RETURN, NULL); } | T_RETURN expr ';' - { $$.ast = zend_ast_create_unary(ZEND_AST_RETURN, $2.ast); } + { $$.ast = zend_ast_create(1, ZEND_AST_RETURN, $2.ast); } | T_GLOBAL global_var_list ';' { $$.ast = $2.ast; } | T_STATIC static_var_list ';' { $$.ast = $2.ast; } | T_ECHO echo_expr_list ';' { $$.ast = $2.ast; } - | T_INLINE_HTML { $$.ast = zend_ast_create_unary(ZEND_AST_ECHO, $1.ast); } + | T_INLINE_HTML { $$.ast = zend_ast_create(1, ZEND_AST_ECHO, $1.ast); } | expr ';' { $$.ast = $1.ast; } | T_UNSET '(' unset_variables ')' ';' { $$.ast = $3.ast; } | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement @@ -350,12 +350,12 @@ unticked_statement: { $$.ast = zend_ast_create(4, ZEND_AST_FOREACH, $3.ast, $7.ast, $5.ast, $9.ast); } | T_DECLARE '(' const_list ')' declare_statement - { $$.ast = zend_ast_create_binary(ZEND_AST_DECLARE, $3.ast, $5.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_DECLARE, $3.ast, $5.ast); } | ';' /* empty statement */ { $$.ast = NULL; } | T_TRY '{' inner_statement_list '}' catch_list finally_statement - { $$.ast = zend_ast_create_ternary(ZEND_AST_TRY, $3.ast, $5.ast, $6.ast); } - | T_THROW expr ';' { $$.ast = zend_ast_create_unary(ZEND_AST_THROW, $2.ast); } - | T_GOTO T_STRING ';' { $$.ast = zend_ast_create_unary(ZEND_AST_GOTO, $2.ast); } + { $$.ast = zend_ast_create(3, ZEND_AST_TRY, $3.ast, $5.ast, $6.ast); } + | T_THROW expr ';' { $$.ast = zend_ast_create(1, ZEND_AST_THROW, $2.ast); } + | T_GOTO T_STRING ';' { $$.ast = zend_ast_create(1, ZEND_AST_GOTO, $2.ast); } ; catch_list: @@ -363,7 +363,7 @@ catch_list: { $$.list = zend_ast_create_list(0, ZEND_AST_CATCH_LIST); } | catch_list T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}' { $$.list = zend_ast_list_add($1.list, - zend_ast_create_ternary(ZEND_AST_CATCH, $4.ast, $5.ast, $8.ast)); } + zend_ast_create(3, ZEND_AST_CATCH, $4.ast, $5.ast, $8.ast)); } ; finally_statement: @@ -377,7 +377,7 @@ unset_variables: ; unset_variable: - variable { $$.ast = zend_ast_create_unary(ZEND_AST_UNSET, $1.ast); } + variable { $$.ast = zend_ast_create(1, ZEND_AST_UNSET, $1.ast); } ; function_declaration_statement: @@ -439,7 +439,7 @@ implements_list: foreach_variable: variable { $$.ast = $1.ast; } - | '&' variable { $$.ast = zend_ast_create_unary(ZEND_AST_REF, $2.ast); } + | '&' variable { $$.ast = zend_ast_create(1, ZEND_AST_REF, $2.ast); } | T_LIST '(' assignment_list ')' { $$.ast = $3.ast; } ; @@ -471,10 +471,10 @@ case_list: /* empty */ { $$.list = zend_ast_create_list(0, ZEND_AST_SWITCH_LIST); } | case_list T_CASE expr case_separator inner_statement_list { $$.list = zend_ast_list_add($1.list, - zend_ast_create_binary(ZEND_AST_SWITCH_CASE, $3.ast, $5.ast)); } + zend_ast_create(2, ZEND_AST_SWITCH_CASE, $3.ast, $5.ast)); } | case_list T_DEFAULT case_separator inner_statement_list { $$.list = zend_ast_list_add($1.list, - zend_ast_create_binary(ZEND_AST_SWITCH_CASE, NULL, $4.ast)); } + zend_ast_create(2, ZEND_AST_SWITCH_CASE, NULL, $4.ast)); } ; case_separator: @@ -492,33 +492,33 @@ while_statement: if_stmt_without_else: T_IF parenthesis_expr statement { $$.list = zend_ast_create_list(1, ZEND_AST_IF, - zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.ast, $3.ast)); } + zend_ast_create(2, ZEND_AST_IF_ELEM, $2.ast, $3.ast)); } | if_stmt_without_else T_ELSEIF parenthesis_expr statement { $$.list = zend_ast_list_add($1.list, - zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.ast, $4.ast)); } + zend_ast_create(2, ZEND_AST_IF_ELEM, $3.ast, $4.ast)); } ; if_stmt: if_stmt_without_else { $$.ast = $1.ast; } | if_stmt_without_else T_ELSE statement { $$.list = zend_ast_list_add($1.list, - zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $3.ast)); } + zend_ast_create(2, ZEND_AST_IF_ELEM, NULL, $3.ast)); } ; alt_if_stmt_without_else: T_IF parenthesis_expr ':' inner_statement_list { $$.list = zend_ast_create_list(1, ZEND_AST_IF, - zend_ast_create_binary(ZEND_AST_IF_ELEM, $2.ast, $4.ast)); } + zend_ast_create(2, ZEND_AST_IF_ELEM, $2.ast, $4.ast)); } | alt_if_stmt_without_else T_ELSEIF parenthesis_expr ':' inner_statement_list { $$.list = zend_ast_list_add($1.list, - zend_ast_create_binary(ZEND_AST_IF_ELEM, $3.ast, $5.ast)); } + zend_ast_create(2, ZEND_AST_IF_ELEM, $3.ast, $5.ast)); } ; alt_if_stmt: alt_if_stmt_without_else T_ENDIF ';' { $$.ast = $1.ast; } | alt_if_stmt_without_else T_ELSE ':' inner_statement_list T_ENDIF ';' { $$.list = zend_ast_list_add($1.list, - zend_ast_create_binary(ZEND_AST_IF_ELEM, NULL, $4.ast)); } + zend_ast_create(2, ZEND_AST_IF_ELEM, NULL, $4.ast)); } ; parameter_list: @@ -567,7 +567,7 @@ argument: expr_without_variable { $$.ast = $1.ast; } | variable { $$.ast = $1.ast; } /*| '&' variable { ZEND_ASSERT(0); } */ - | T_ELLIPSIS expr { $$.ast = zend_ast_create_unary(ZEND_AST_UNPACK, $2.ast); } + | T_ELLIPSIS expr { $$.ast = zend_ast_create(1, ZEND_AST_UNPACK, $2.ast); } ; global_var_list: @@ -577,8 +577,8 @@ global_var_list: global_var: simple_variable - { $$.ast = zend_ast_create_unary(ZEND_AST_GLOBAL, - zend_ast_create_unary(ZEND_AST_VAR, $1.ast)); } + { $$.ast = zend_ast_create(1, ZEND_AST_GLOBAL, + zend_ast_create(1, ZEND_AST_VAR, $1.ast)); } ; @@ -589,9 +589,9 @@ static_var_list: static_var: T_VARIABLE - { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC, $1.ast, NULL); } + { $$.ast = zend_ast_create(2, ZEND_AST_STATIC, $1.ast, NULL); } | T_VARIABLE '=' expr - { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_STATIC, $1.ast, $3.ast); } ; @@ -609,7 +609,7 @@ class_statement: | T_CONST class_const_list ';' { $$.ast = $2.ast; RESET_DOC_COMMENT(); } | T_USE name_list trait_adaptations - { $$.ast = zend_ast_create_binary(ZEND_AST_USE_TRAIT, $2.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_USE_TRAIT, $2.ast, $3.ast); } | method_modifiers function returns_ref T_STRING '(' parameter_list ')' { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } method_body @@ -642,7 +642,7 @@ trait_adaptation: trait_precedence: absolute_trait_method_reference T_INSTEADOF name_list - { $$.ast = zend_ast_create_binary(ZEND_AST_TRAIT_PRECEDENCE, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_TRAIT_PRECEDENCE, $1.ast, $3.ast); } ; trait_alias: @@ -656,13 +656,13 @@ trait_alias: trait_method_reference: T_STRING - { $$.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, NULL, $1.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_METHOD_REFERENCE, NULL, $1.ast); } | absolute_trait_method_reference { $$.ast = $1.ast; } ; absolute_trait_method_reference: name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.ast = zend_ast_create_binary(ZEND_AST_METHOD_REFERENCE, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_METHOD_REFERENCE, $1.ast, $3.ast); } ; trait_modifiers: @@ -707,9 +707,9 @@ property_list: ; property: - T_VARIABLE { $$.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, $1.ast, NULL); } + T_VARIABLE { $$.ast = zend_ast_create(2, ZEND_AST_PROP_ELEM, $1.ast, NULL); } | T_VARIABLE '=' expr - { $$.ast = zend_ast_create_binary(ZEND_AST_PROP_ELEM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_PROP_ELEM, $1.ast, $3.ast); } ; class_const_list: @@ -720,7 +720,7 @@ class_const_list: const_decl: T_STRING '=' expr - { $$.ast = zend_ast_create_binary(ZEND_AST_CONST_ELEM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_CONST_ELEM, $1.ast, $3.ast); } ; echo_expr_list: @@ -728,7 +728,7 @@ echo_expr_list: | echo_expr { $$.list = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1.ast); } ; echo_expr: - expr { $$.ast = zend_ast_create_unary(ZEND_AST_ECHO, $1.ast); } + expr { $$.ast = zend_ast_create(1, ZEND_AST_ECHO, $1.ast); } ; for_expr: @@ -743,21 +743,21 @@ non_empty_for_expr: new_expr: T_NEW class_name_reference ctor_arguments - { $$.ast = zend_ast_create_binary(ZEND_AST_NEW, $2.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_NEW, $2.ast, $3.ast); } ; expr_without_variable: T_LIST '(' assignment_list ')' '=' expr - { $$.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $3.ast, $6.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_ASSIGN, $3.ast, $6.ast); } | variable '=' expr - { $$.ast = zend_ast_create_binary(ZEND_AST_ASSIGN, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_ASSIGN, $1.ast, $3.ast); } | variable '=' '&' variable - { $$.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.ast, $4.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_ASSIGN_REF, $1.ast, $4.ast); } | variable '=' '&' T_NEW class_name_reference ctor_arguments { zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); - $$.ast = zend_ast_create_binary(ZEND_AST_ASSIGN_REF, $1.ast, - zend_ast_create_binary(ZEND_AST_NEW, $5.ast, $6.ast)); } - | T_CLONE expr { $$.ast = zend_ast_create_unary(ZEND_AST_CLONE, $2.ast); } + $$.ast = zend_ast_create(2, ZEND_AST_ASSIGN_REF, $1.ast, + zend_ast_create(2, ZEND_AST_NEW, $5.ast, $6.ast)); } + | T_CLONE expr { $$.ast = zend_ast_create(1, ZEND_AST_CLONE, $2.ast); } | variable T_PLUS_EQUAL expr { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_ADD, $1.ast, $3.ast); } | variable T_MINUS_EQUAL expr @@ -782,18 +782,18 @@ expr_without_variable: { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SL, $1.ast, $3.ast); } | variable T_SR_EQUAL expr { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SR, $1.ast, $3.ast); } - | variable T_INC { $$.ast = zend_ast_create_unary(ZEND_AST_POST_INC, $1.ast); } - | T_INC variable { $$.ast = zend_ast_create_unary(ZEND_AST_PRE_INC, $2.ast); } - | variable T_DEC { $$.ast = zend_ast_create_unary(ZEND_AST_POST_DEC, $1.ast); } - | T_DEC variable { $$.ast = zend_ast_create_unary(ZEND_AST_PRE_DEC, $2.ast); } + | variable T_INC { $$.ast = zend_ast_create(1, ZEND_AST_POST_INC, $1.ast); } + | T_INC variable { $$.ast = zend_ast_create(1, ZEND_AST_PRE_INC, $2.ast); } + | variable T_DEC { $$.ast = zend_ast_create(1, ZEND_AST_POST_DEC, $1.ast); } + | T_DEC variable { $$.ast = zend_ast_create(1, ZEND_AST_PRE_DEC, $2.ast); } | expr T_BOOLEAN_OR expr - { $$.ast = zend_ast_create_binary(ZEND_AST_OR, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_OR, $1.ast, $3.ast); } | expr T_BOOLEAN_AND expr - { $$.ast = zend_ast_create_binary(ZEND_AST_AND, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_AND, $1.ast, $3.ast); } | expr T_LOGICAL_OR expr - { $$.ast = zend_ast_create_binary(ZEND_AST_OR, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_OR, $1.ast, $3.ast); } | expr T_LOGICAL_AND expr - { $$.ast = zend_ast_create_binary(ZEND_AST_AND, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_AND, $1.ast, $3.ast); } | expr T_LOGICAL_XOR expr { $$.ast = zend_ast_create_binary_op(ZEND_BOOL_XOR, $1.ast, $3.ast); } | expr '|' expr { $$.ast = zend_ast_create_binary_op(ZEND_BW_OR, $1.ast, $3.ast); } @@ -808,8 +808,8 @@ expr_without_variable: | expr '%' expr { $$.ast = zend_ast_create_binary_op(ZEND_MOD, $1.ast, $3.ast); } | expr T_SL expr { $$.ast = zend_ast_create_binary_op(ZEND_SL, $1.ast, $3.ast); } | expr T_SR expr { $$.ast = zend_ast_create_binary_op(ZEND_SR, $1.ast, $3.ast); } - | '+' expr %prec T_INC { $$.ast = zend_ast_create_unary(ZEND_AST_UNARY_PLUS, $2.ast); } - | '-' expr %prec T_INC { $$.ast = zend_ast_create_unary(ZEND_AST_UNARY_MINUS, $2.ast); } + | '+' expr %prec T_INC { $$.ast = zend_ast_create(1, ZEND_AST_UNARY_PLUS, $2.ast); } + | '-' expr %prec T_INC { $$.ast = zend_ast_create(1, ZEND_AST_UNARY_MINUS, $2.ast); } | '!' expr { $$.ast = zend_ast_create_ex(1, ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, $2.ast); } | '~' expr { $$.ast = zend_ast_create_ex(1, ZEND_AST_UNARY_OP, ZEND_BW_NOT, $2.ast); } | expr T_IS_IDENTICAL expr @@ -825,18 +825,18 @@ expr_without_variable: | expr T_IS_SMALLER_OR_EQUAL expr { $$.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $1.ast, $3.ast); } | expr '>' expr - { $$.ast = zend_ast_create_binary(ZEND_AST_GREATER, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_GREATER, $1.ast, $3.ast); } | expr T_IS_GREATER_OR_EQUAL expr - { $$.ast = zend_ast_create_binary(ZEND_AST_GREATER_EQUAL, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_GREATER_EQUAL, $1.ast, $3.ast); } | expr T_INSTANCEOF class_name_reference - { $$.ast = zend_ast_create_binary(ZEND_AST_INSTANCEOF, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_INSTANCEOF, $1.ast, $3.ast); } | parenthesis_expr { $$.ast = $1.ast; } | new_expr { $$.ast = $1.ast; } | expr '?' expr ':' expr - { $$.ast = zend_ast_create_ternary( + { $$.ast = zend_ast_create(3, ZEND_AST_CONDITIONAL, $1.ast, $3.ast, $5.ast); } | expr '?' ':' expr - { $$.ast = zend_ast_create_ternary(ZEND_AST_CONDITIONAL, $1.ast, NULL, $4.ast); } + { $$.ast = zend_ast_create(3, ZEND_AST_CONDITIONAL, $1.ast, NULL, $4.ast); } | internal_functions_in_yacc { $$.ast = $1.ast; } | T_INT_CAST expr { $$.ast = zend_ast_create_cast(IS_LONG, $2.ast); } @@ -852,15 +852,15 @@ expr_without_variable: { $$.ast = zend_ast_create_cast(_IS_BOOL, $2.ast); } | T_UNSET_CAST expr { $$.ast = zend_ast_create_cast(IS_NULL, $2.ast); } - | T_EXIT exit_expr { $$.ast = zend_ast_create_unary(ZEND_AST_EXIT, $2.ast); } - | '@' expr { $$.ast = zend_ast_create_unary(ZEND_AST_SILENCE, $2.ast); } + | T_EXIT exit_expr { $$.ast = zend_ast_create(1, ZEND_AST_EXIT, $2.ast); } + | '@' expr { $$.ast = zend_ast_create(1, ZEND_AST_SILENCE, $2.ast); } | scalar { $$.ast = $1.ast; } - | '`' backticks_expr '`' { $$.ast = zend_ast_create_unary(ZEND_AST_SHELL_EXEC, $2.ast); } - | T_PRINT expr { $$.ast = zend_ast_create_unary(ZEND_AST_PRINT, $2.ast); } - | T_YIELD { $$.ast = zend_ast_create_binary(ZEND_AST_YIELD, NULL, NULL); } - | T_YIELD expr { $$.ast = zend_ast_create_binary(ZEND_AST_YIELD, $2.ast, NULL); } + | '`' backticks_expr '`' { $$.ast = zend_ast_create(1, ZEND_AST_SHELL_EXEC, $2.ast); } + | T_PRINT expr { $$.ast = zend_ast_create(1, ZEND_AST_PRINT, $2.ast); } + | T_YIELD { $$.ast = zend_ast_create(2, ZEND_AST_YIELD, NULL, NULL); } + | T_YIELD expr { $$.ast = zend_ast_create(2, ZEND_AST_YIELD, $2.ast, NULL); } | T_YIELD expr T_DOUBLE_ARROW expr - { $$.ast = zend_ast_create_binary(ZEND_AST_YIELD, $4.ast, $2.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_YIELD, $4.ast, $2.ast); } | function returns_ref '(' parameter_list ')' lexical_vars { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' @@ -901,15 +901,15 @@ lexical_var: function_call: name argument_list - { $$.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.ast, $2.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_CALL, $1.ast, $2.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list - { $$.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, + { $$.ast = zend_ast_create(3, ZEND_AST_STATIC_CALL, $1.ast, $3.ast, $4.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list - { $$.ast = zend_ast_create_ternary(ZEND_AST_STATIC_CALL, + { $$.ast = zend_ast_create(3, ZEND_AST_STATIC_CALL, $1.ast, $3.ast, $4.ast); } | callable_expr argument_list - { $$.ast = zend_ast_create_binary(ZEND_AST_CALL, $1.ast, $2.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_CALL, $1.ast, $2.ast); } ; class_name: @@ -969,7 +969,7 @@ scalar: | dereferencable_scalar { $$.ast = $1.ast; } | class_name_scalar { $$.ast = $1.ast; } | class_constant { $$.ast = $1.ast; } - | name { $$.ast = zend_ast_create_unary(ZEND_AST_CONST, $1.ast); } + | name { $$.ast = zend_ast_create(1, ZEND_AST_CONST, $1.ast); } ; @@ -1005,13 +1005,13 @@ callable_expr: callable_variable: simple_variable - { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } + { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } | dereferencable '[' dim_offset ']' - { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_DIM, $1.ast, $3.ast); } | dereferencable '{' expr '}' - { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_DIM, $1.ast, $3.ast); } | dereferencable T_OBJECT_OPERATOR member_name argument_list - { $$.ast = zend_ast_create_ternary(ZEND_AST_METHOD_CALL, $1.ast, $3.ast, $4.ast); } + { $$.ast = zend_ast_create(3, ZEND_AST_METHOD_CALL, $1.ast, $3.ast, $4.ast); } | function_call { $$.ast = $1.ast; } ; @@ -1021,7 +1021,7 @@ variable: | static_member { $$.ast = $1.ast; } | dereferencable T_OBJECT_OPERATOR member_name - { $$.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_PROP, $1.ast, $3.ast); } ; simple_variable: @@ -1030,29 +1030,29 @@ simple_variable: | '$' '{' expr '}' { $$.ast = $3.ast; } | '$' simple_variable - { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.ast); } + { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $2.ast); } ; static_member: class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } ; new_variable: simple_variable - { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } + { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } | new_variable '[' dim_offset ']' - { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_DIM, $1.ast, $3.ast); } | new_variable '{' expr '}' - { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_DIM, $1.ast, $3.ast); } | new_variable T_OBJECT_OPERATOR member_name - { $$.ast = zend_ast_create_binary(ZEND_AST_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_PROP, $1.ast, $3.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.ast = zend_ast_create_binary(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } ; dim_offset: @@ -1063,7 +1063,7 @@ dim_offset: member_name: T_STRING { $$.ast = $1.ast; } | '{' expr '}' { $$.ast = $2.ast; } - | simple_variable { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } + | simple_variable { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } ; assignment_list: @@ -1094,8 +1094,8 @@ non_empty_array_pair_list: array_pair: expr T_DOUBLE_ARROW expr - { $$.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $3.ast, $1.ast); } - | expr { $$.ast = zend_ast_create_binary(ZEND_AST_ARRAY_ELEM, $1.ast, NULL); } + { $$.ast = zend_ast_create(2, ZEND_AST_ARRAY_ELEM, $3.ast, $1.ast); } + | expr { $$.ast = zend_ast_create(2, ZEND_AST_ARRAY_ELEM, $1.ast, NULL); } | expr T_DOUBLE_ARROW '&' variable { $$.ast = zend_ast_create_ex(2, ZEND_AST_ARRAY_ELEM, 1, $4.ast, $1.ast); } | '&' variable @@ -1115,33 +1115,33 @@ encaps_list: encaps_var: T_VARIABLE - { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } + { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } | T_VARIABLE '[' encaps_var_offset ']' - { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, - zend_ast_create_unary(ZEND_AST_VAR, $1.ast), $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_DIM, + zend_ast_create(1, ZEND_AST_VAR, $1.ast), $3.ast); } | T_VARIABLE T_OBJECT_OPERATOR T_STRING - { $$.ast = zend_ast_create_binary(ZEND_AST_PROP, - zend_ast_create_unary(ZEND_AST_VAR, $1.ast), $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_PROP, + zend_ast_create(1, ZEND_AST_VAR, $1.ast), $3.ast); } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' - { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.ast); } + { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $2.ast); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' - { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $2.ast); } + { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $2.ast); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' - { $$.ast = zend_ast_create_binary(ZEND_AST_DIM, - zend_ast_create_unary(ZEND_AST_VAR, $2.ast), $4.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_DIM, + zend_ast_create(1, ZEND_AST_VAR, $2.ast), $4.ast); } | T_CURLY_OPEN variable '}' { $$.ast = $2.ast; } ; encaps_var_offset: T_STRING { $$.ast = $1.ast; } | T_NUM_STRING { $$.ast = $1.ast; } - | T_VARIABLE { $$.ast = zend_ast_create_unary(ZEND_AST_VAR, $1.ast); } + | T_VARIABLE { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } ; internal_functions_in_yacc: T_ISSET '(' isset_variables ')' { $$.ast = $3.ast; } - | T_EMPTY '(' expr ')' { $$.ast = zend_ast_create_unary(ZEND_AST_EMPTY, $3.ast); } + | T_EMPTY '(' expr ')' { $$.ast = zend_ast_create(1, ZEND_AST_EMPTY, $3.ast); } | T_INCLUDE expr { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.ast); } | T_INCLUDE_ONCE expr @@ -1157,25 +1157,23 @@ internal_functions_in_yacc: isset_variables: isset_variable { $$.ast = $1.ast; } | isset_variables ',' isset_variable - { $$.ast = zend_ast_create_binary(ZEND_AST_AND, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_AND, $1.ast, $3.ast); } ; isset_variable: - expr { $$.ast = zend_ast_create_unary(ZEND_AST_ISSET, $1.ast); } + expr { $$.ast = zend_ast_create(1, ZEND_AST_ISSET, $1.ast); } ; class_constant: class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.ast = zend_ast_create_binary( - ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.ast = zend_ast_create_binary( - ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(2, ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } ; class_name_scalar: class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS - { $$.ast = zend_ast_create_unary(ZEND_AST_RESOLVE_CLASS_NAME, $1.ast); } + { $$.ast = zend_ast_create(1, ZEND_AST_RESOLVE_CLASS_NAME, $1.ast); } ; %% -- cgit v1.2.1 From cf7f0c412d8b4702e844ce47027c34112cbde266 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 18:18:47 +0200 Subject: zend_ast_create determined child count automatically --- Zend/zend_ast.c | 39 +++---- Zend/zend_ast.h | 12 +- Zend/zend_compile.c | 18 +-- Zend/zend_language_parser.y | 275 ++++++++++++++++++++++---------------------- 4 files changed, 168 insertions(+), 176 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 355f627e30..fbdc35068a 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -33,6 +33,14 @@ static inline void *zend_ast_realloc(void *old, size_t old_size, size_t new_size return new; } +size_t zend_ast_size(zend_uint children) { + return sizeof(zend_ast) + sizeof(zend_ast *) * (children - 1); +} + +size_t zend_ast_list_size(zend_uint children) { + return sizeof(zend_ast_list) + sizeof(zend_ast *) * (children - 1); +} + ZEND_API zend_ast *zend_ast_create_znode(znode *node) { TSRMLS_FETCH(); zend_ast_znode *ast = zend_ast_alloc(sizeof(zend_ast_znode) TSRMLS_CC); @@ -75,14 +83,10 @@ ZEND_API zend_ast *zend_ast_create_decl( return (zend_ast *) ast; } -static zend_ast *zend_ast_create_from_va_list( - zend_uint children, zend_ast_kind kind, zend_ast_attr attr, va_list va -) { +static zend_ast *zend_ast_create_from_va_list(zend_ast_kind kind, zend_ast_attr attr, va_list va) { TSRMLS_FETCH(); - zend_uint i; - zend_ast *ast; - - ast = zend_ast_alloc(sizeof(zend_ast) + (children - 1) * sizeof(zend_ast *) TSRMLS_CC); + zend_uint i, children = kind >> ZEND_AST_NUM_CHILDREN_SHIFT; + zend_ast *ast = zend_ast_alloc(zend_ast_size(children) TSRMLS_CC); ast->kind = kind; ast->attr = attr; ast->lineno = UINT_MAX; @@ -104,36 +108,28 @@ static zend_ast *zend_ast_create_from_va_list( return ast; } -ZEND_API zend_ast *zend_ast_create_ex( - zend_uint children, zend_ast_kind kind, zend_ast_attr attr, ... -) { +ZEND_API zend_ast *zend_ast_create_ex(zend_ast_kind kind, zend_ast_attr attr, ...) { va_list va; zend_ast *ast; va_start(va, attr); - ast = zend_ast_create_from_va_list(children, kind, attr, va); + ast = zend_ast_create_from_va_list(kind, attr, va); va_end(va); return ast; } -ZEND_API zend_ast *zend_ast_create( - zend_uint children, zend_ast_kind kind, ... -) { +ZEND_API zend_ast *zend_ast_create(zend_ast_kind kind, ...) { va_list va; zend_ast *ast; va_start(va, kind); - ast = zend_ast_create_from_va_list(children, kind, 0, va); + ast = zend_ast_create_from_va_list(kind, 0, va); va_end(va); return ast; } -size_t zend_ast_list_size(zend_uint children) { - return sizeof(zend_ast_list) + sizeof(zend_ast *) * (children - 1); -} - ZEND_API zend_ast_list *zend_ast_create_list(zend_uint init_children, zend_ast_kind kind, ...) { TSRMLS_FETCH(); zend_ast_list *list = zend_ast_alloc(zend_ast_list_size(4) TSRMLS_CC); @@ -339,8 +335,7 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) return (zend_ast *) new; } else if (zend_ast_is_list(ast)) { zend_ast_list *list = zend_ast_get_list(ast); - zend_ast_list *new = emalloc(sizeof(zend_ast_list) - + sizeof(zend_ast *) * (list->children - 1)); + zend_ast_list *new = emalloc(zend_ast_list_size(list->children)); zend_uint i; new->kind = list->kind; new->attr = list->attr; @@ -351,7 +346,7 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) return (zend_ast *) new; } else { zend_uint i, children = zend_ast_get_num_children(ast); - zend_ast *new = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * (children - 1)); + zend_ast *new = emalloc(zend_ast_size(children)); new->kind = ast->kind; new->attr = ast->attr; for (i = 0; i < children; i++) { diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index df293db405..c8cac17cef 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -187,10 +187,8 @@ typedef struct _zend_ast_decl { ZEND_API zend_ast *zend_ast_create_zval_ex(zval *zv, zend_ast_attr attr); -ZEND_API zend_ast *zend_ast_create_ex( - zend_uint children, zend_ast_kind kind, zend_ast_attr attr, ...); -ZEND_API zend_ast *zend_ast_create( - zend_uint children, zend_ast_kind kind, ...); +ZEND_API zend_ast *zend_ast_create_ex(zend_ast_kind kind, zend_ast_attr attr, ...); +ZEND_API zend_ast *zend_ast_create(zend_ast_kind kind, ...); ZEND_API zend_ast *zend_ast_create_decl( zend_ast_kind kind, zend_uint flags, zend_uint start_lineno, zend_string *doc_comment, @@ -253,13 +251,13 @@ static inline zend_ast *zend_ast_create_zval_from_long(long lval) { } static inline zend_ast *zend_ast_create_binary_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { - return zend_ast_create_ex(2, ZEND_AST_BINARY_OP, opcode, op0, op1); + return zend_ast_create_ex(ZEND_AST_BINARY_OP, opcode, op0, op1); } static inline zend_ast *zend_ast_create_assign_op(zend_uint opcode, zend_ast *op0, zend_ast *op1) { - return zend_ast_create_ex(2, ZEND_AST_ASSIGN_OP, opcode, op0, op1); + return zend_ast_create_ex(ZEND_AST_ASSIGN_OP, opcode, op0, op1); } static inline zend_ast *zend_ast_create_cast(zend_uint type, zend_ast *op0) { - return zend_ast_create_ex(1, ZEND_AST_CAST, type, op0); + return zend_ast_create_ex(ZEND_AST_CAST, type, op0); } #endif diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2623e3ec30..562c076356 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4483,12 +4483,12 @@ static void zend_compile_static_var_common( opline->extended_value = ZEND_FETCH_STATIC; if (by_ref) { - zend_ast *fetch_ast = zend_ast_create(1, ZEND_AST_VAR, var_ast); + zend_ast *fetch_ast = zend_ast_create(ZEND_AST_VAR, var_ast); zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); } else { - zend_ast *fetch_ast = zend_ast_create(1, ZEND_AST_VAR, var_ast); + zend_ast *fetch_ast = zend_ast_create(ZEND_AST_VAR, var_ast); zend_ast *znode_ast = zend_ast_create_znode(&result); - zend_ast *assign_ast = zend_ast_create(2, ZEND_AST_ASSIGN, fetch_ast, znode_ast); + zend_ast *assign_ast = zend_ast_create(ZEND_AST_ASSIGN, fetch_ast, znode_ast); znode dummy_node; zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); @@ -4838,14 +4838,14 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { zend_compile_assign_ref_common(NULL, value_ast, &value_node TSRMLS_CC); } else { zend_ast *znode_ast = zend_ast_create_znode(&value_node); - zend_ast *assign_ast = zend_ast_create(2, ZEND_AST_ASSIGN, value_ast, znode_ast); + zend_ast *assign_ast = zend_ast_create(ZEND_AST_ASSIGN, value_ast, znode_ast); zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); } if (key_ast) { zend_ast *znode_ast = zend_ast_create_znode(&key_node); - zend_ast *assign_ast = zend_ast_create(2, ZEND_AST_ASSIGN, key_ast, znode_ast); + zend_ast *assign_ast = zend_ast_create(ZEND_AST_ASSIGN, key_ast, znode_ast); zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); } @@ -6671,7 +6671,7 @@ void zend_compile_isset_or_empty(znode *result, zend_ast *ast TSRMLS_DC) { if (!zend_is_variable(var_ast) || zend_is_call(var_ast)) { if (ast->kind == ZEND_AST_EMPTY) { /* empty(expr) can be transformed to !expr */ - zend_ast *not_ast = zend_ast_create_ex(1, ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, var_ast); + zend_ast *not_ast = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, var_ast); zend_compile_expr(result, not_ast TSRMLS_CC); return; } else { @@ -6736,7 +6736,7 @@ void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { ZVAL_STRING(&fn_name, "shell_exec"); name_ast = zend_ast_create_zval(&fn_name); args_ast = (zend_ast *) zend_ast_create_list(1, ZEND_AST_ARG_LIST, expr_ast); - call_ast = zend_ast_create(2, ZEND_AST_CALL, name_ast, args_ast); + call_ast = zend_ast_create(ZEND_AST_CALL, name_ast, args_ast); zend_compile_expr(result, call_ast TSRMLS_CC); @@ -6888,7 +6888,7 @@ void zend_compile_resolve_class_name(znode *result, zend_ast *ast TSRMLS_DC) { ZVAL_STRING(&class_str_zv, "class"); class_str_ast = zend_ast_create_zval(&class_str_zv); - class_const_ast = zend_ast_create(2, + class_const_ast = zend_ast_create( ZEND_AST_CLASS_CONST, name_ast, class_str_ast); zend_compile_expr(result, class_const_ast TSRMLS_CC); @@ -7025,7 +7025,7 @@ void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { { zval const_zv; ZVAL_STRING(&const_zv, "__CLASS__"); - zend_ast *const_ast = zend_ast_create(1, ZEND_AST_CONST, + zend_ast *const_ast = zend_ast_create(ZEND_AST_CONST, zend_ast_create_zval(&const_zv)); zend_compile_const(result, const_ast TSRMLS_CC); zval_ptr_dtor(&const_zv); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 1cdff6b985..20c2e19c44 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -250,18 +250,18 @@ top_statement: | function_declaration_statement { $$.ast = $1.ast; } | class_declaration_statement { $$.ast = $1.ast; } | T_HALT_COMPILER '(' ')' ';' - { $$.ast = zend_ast_create(1, ZEND_AST_HALT_COMPILER, + { $$.ast = zend_ast_create(ZEND_AST_HALT_COMPILER, zend_ast_create_zval_from_long(zend_get_scanned_file_offset(TSRMLS_C))); zend_stop_lexing(TSRMLS_C); } | T_NAMESPACE namespace_name ';' - { $$.ast = zend_ast_create(2, ZEND_AST_NAMESPACE, $2.ast, NULL); + { $$.ast = zend_ast_create(ZEND_AST_NAMESPACE, $2.ast, NULL); RESET_DOC_COMMENT(); } | T_NAMESPACE namespace_name { RESET_DOC_COMMENT(); } '{' top_statement_list '}' - { $$.ast = zend_ast_create(2, ZEND_AST_NAMESPACE, $2.ast, $5.ast); } + { $$.ast = zend_ast_create(ZEND_AST_NAMESPACE, $2.ast, $5.ast); } | T_NAMESPACE { RESET_DOC_COMMENT(); } '{' top_statement_list '}' - { $$.ast = zend_ast_create(2, ZEND_AST_NAMESPACE, NULL, $4.ast); } + { $$.ast = zend_ast_create(ZEND_AST_NAMESPACE, NULL, $4.ast); } | T_USE use_declarations ';' { $$.ast = $2.ast; $$.ast->attr = T_CLASS; } | T_USE T_FUNCTION use_declarations ';' @@ -280,13 +280,13 @@ use_declarations: use_declaration: namespace_name - { $$.ast = zend_ast_create(2, ZEND_AST_USE_ELEM, $1.ast, NULL); } + { $$.ast = zend_ast_create(ZEND_AST_USE_ELEM, $1.ast, NULL); } | namespace_name T_AS T_STRING - { $$.ast = zend_ast_create(2, ZEND_AST_USE_ELEM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_USE_ELEM, $1.ast, $3.ast); } | T_NS_SEPARATOR namespace_name - { $$.ast = zend_ast_create(2, ZEND_AST_USE_ELEM, $2.ast, NULL); } + { $$.ast = zend_ast_create(ZEND_AST_USE_ELEM, $2.ast, NULL); } | T_NS_SEPARATOR namespace_name T_AS T_STRING - { $$.ast = zend_ast_create(2, ZEND_AST_USE_ELEM, $2.ast, $4.ast); } + { $$.ast = zend_ast_create(ZEND_AST_USE_ELEM, $2.ast, $4.ast); } ; const_list: @@ -313,7 +313,7 @@ inner_statement: statement: unticked_statement { $$.ast = $1.ast; } - | T_STRING ':' { $$.ast = zend_ast_create(1, ZEND_AST_LABEL, $1.ast); } + | T_STRING ':' { $$.ast = zend_ast_create(ZEND_AST_LABEL, $1.ast); } ; unticked_statement: @@ -321,41 +321,41 @@ unticked_statement: | if_stmt { $$.ast = $1.ast; } | alt_if_stmt { $$.ast = $1.ast; } | T_WHILE parenthesis_expr while_statement - { $$.ast = zend_ast_create(2, ZEND_AST_WHILE, $2.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_WHILE, $2.ast, $3.ast); } | T_DO statement T_WHILE parenthesis_expr ';' - { $$.ast = zend_ast_create(2, ZEND_AST_DO_WHILE, $2.ast, $4.ast); } + { $$.ast = zend_ast_create(ZEND_AST_DO_WHILE, $2.ast, $4.ast); } | T_FOR '(' for_expr ';' for_expr ';' for_expr ')' for_statement - { $$.ast = zend_ast_create(4, ZEND_AST_FOR, $3.ast, $5.ast, $7.ast, $9.ast); } + { $$.ast = zend_ast_create(ZEND_AST_FOR, $3.ast, $5.ast, $7.ast, $9.ast); } | T_SWITCH parenthesis_expr switch_case_list - { $$.ast = zend_ast_create(2, ZEND_AST_SWITCH, $2.ast, $3.ast); } - | T_BREAK ';' { $$.ast = zend_ast_create(1, ZEND_AST_BREAK, NULL); } - | T_BREAK expr ';' { $$.ast = zend_ast_create(1, ZEND_AST_BREAK, $2.ast); } - | T_CONTINUE ';' { $$.ast = zend_ast_create(1, ZEND_AST_CONTINUE, NULL); } - | T_CONTINUE expr ';' { $$.ast = zend_ast_create(1, ZEND_AST_CONTINUE, $2.ast); } + { $$.ast = zend_ast_create(ZEND_AST_SWITCH, $2.ast, $3.ast); } + | T_BREAK ';' { $$.ast = zend_ast_create(ZEND_AST_BREAK, NULL); } + | T_BREAK expr ';' { $$.ast = zend_ast_create(ZEND_AST_BREAK, $2.ast); } + | T_CONTINUE ';' { $$.ast = zend_ast_create(ZEND_AST_CONTINUE, NULL); } + | T_CONTINUE expr ';' { $$.ast = zend_ast_create(ZEND_AST_CONTINUE, $2.ast); } | T_RETURN ';' - { $$.ast = zend_ast_create(1, ZEND_AST_RETURN, NULL); } + { $$.ast = zend_ast_create(ZEND_AST_RETURN, NULL); } | T_RETURN expr ';' - { $$.ast = zend_ast_create(1, ZEND_AST_RETURN, $2.ast); } + { $$.ast = zend_ast_create(ZEND_AST_RETURN, $2.ast); } | T_GLOBAL global_var_list ';' { $$.ast = $2.ast; } | T_STATIC static_var_list ';' { $$.ast = $2.ast; } | T_ECHO echo_expr_list ';' { $$.ast = $2.ast; } - | T_INLINE_HTML { $$.ast = zend_ast_create(1, ZEND_AST_ECHO, $1.ast); } + | T_INLINE_HTML { $$.ast = zend_ast_create(ZEND_AST_ECHO, $1.ast); } | expr ';' { $$.ast = $1.ast; } | T_UNSET '(' unset_variables ')' ';' { $$.ast = $3.ast; } | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement - { $$.ast = zend_ast_create(4, ZEND_AST_FOREACH, + { $$.ast = zend_ast_create(ZEND_AST_FOREACH, $3.ast, $5.ast, NULL, $7.ast); } | T_FOREACH '(' expr T_AS foreach_variable T_DOUBLE_ARROW foreach_variable ')' foreach_statement - { $$.ast = zend_ast_create(4, ZEND_AST_FOREACH, + { $$.ast = zend_ast_create(ZEND_AST_FOREACH, $3.ast, $7.ast, $5.ast, $9.ast); } | T_DECLARE '(' const_list ')' declare_statement - { $$.ast = zend_ast_create(2, ZEND_AST_DECLARE, $3.ast, $5.ast); } + { $$.ast = zend_ast_create(ZEND_AST_DECLARE, $3.ast, $5.ast); } | ';' /* empty statement */ { $$.ast = NULL; } | T_TRY '{' inner_statement_list '}' catch_list finally_statement - { $$.ast = zend_ast_create(3, ZEND_AST_TRY, $3.ast, $5.ast, $6.ast); } - | T_THROW expr ';' { $$.ast = zend_ast_create(1, ZEND_AST_THROW, $2.ast); } - | T_GOTO T_STRING ';' { $$.ast = zend_ast_create(1, ZEND_AST_GOTO, $2.ast); } + { $$.ast = zend_ast_create(ZEND_AST_TRY, $3.ast, $5.ast, $6.ast); } + | T_THROW expr ';' { $$.ast = zend_ast_create(ZEND_AST_THROW, $2.ast); } + | T_GOTO T_STRING ';' { $$.ast = zend_ast_create(ZEND_AST_GOTO, $2.ast); } ; catch_list: @@ -363,7 +363,7 @@ catch_list: { $$.list = zend_ast_create_list(0, ZEND_AST_CATCH_LIST); } | catch_list T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}' { $$.list = zend_ast_list_add($1.list, - zend_ast_create(3, ZEND_AST_CATCH, $4.ast, $5.ast, $8.ast)); } + zend_ast_create(ZEND_AST_CATCH, $4.ast, $5.ast, $8.ast)); } ; finally_statement: @@ -377,7 +377,7 @@ unset_variables: ; unset_variable: - variable { $$.ast = zend_ast_create(1, ZEND_AST_UNSET, $1.ast); } + variable { $$.ast = zend_ast_create(ZEND_AST_UNSET, $1.ast); } ; function_declaration_statement: @@ -439,7 +439,7 @@ implements_list: foreach_variable: variable { $$.ast = $1.ast; } - | '&' variable { $$.ast = zend_ast_create(1, ZEND_AST_REF, $2.ast); } + | '&' variable { $$.ast = zend_ast_create(ZEND_AST_REF, $2.ast); } | T_LIST '(' assignment_list ')' { $$.ast = $3.ast; } ; @@ -471,10 +471,10 @@ case_list: /* empty */ { $$.list = zend_ast_create_list(0, ZEND_AST_SWITCH_LIST); } | case_list T_CASE expr case_separator inner_statement_list { $$.list = zend_ast_list_add($1.list, - zend_ast_create(2, ZEND_AST_SWITCH_CASE, $3.ast, $5.ast)); } + zend_ast_create(ZEND_AST_SWITCH_CASE, $3.ast, $5.ast)); } | case_list T_DEFAULT case_separator inner_statement_list { $$.list = zend_ast_list_add($1.list, - zend_ast_create(2, ZEND_AST_SWITCH_CASE, NULL, $4.ast)); } + zend_ast_create(ZEND_AST_SWITCH_CASE, NULL, $4.ast)); } ; case_separator: @@ -492,33 +492,33 @@ while_statement: if_stmt_without_else: T_IF parenthesis_expr statement { $$.list = zend_ast_create_list(1, ZEND_AST_IF, - zend_ast_create(2, ZEND_AST_IF_ELEM, $2.ast, $3.ast)); } + zend_ast_create(ZEND_AST_IF_ELEM, $2.ast, $3.ast)); } | if_stmt_without_else T_ELSEIF parenthesis_expr statement { $$.list = zend_ast_list_add($1.list, - zend_ast_create(2, ZEND_AST_IF_ELEM, $3.ast, $4.ast)); } + zend_ast_create(ZEND_AST_IF_ELEM, $3.ast, $4.ast)); } ; if_stmt: if_stmt_without_else { $$.ast = $1.ast; } | if_stmt_without_else T_ELSE statement { $$.list = zend_ast_list_add($1.list, - zend_ast_create(2, ZEND_AST_IF_ELEM, NULL, $3.ast)); } + zend_ast_create(ZEND_AST_IF_ELEM, NULL, $3.ast)); } ; alt_if_stmt_without_else: T_IF parenthesis_expr ':' inner_statement_list { $$.list = zend_ast_create_list(1, ZEND_AST_IF, - zend_ast_create(2, ZEND_AST_IF_ELEM, $2.ast, $4.ast)); } + zend_ast_create(ZEND_AST_IF_ELEM, $2.ast, $4.ast)); } | alt_if_stmt_without_else T_ELSEIF parenthesis_expr ':' inner_statement_list { $$.list = zend_ast_list_add($1.list, - zend_ast_create(2, ZEND_AST_IF_ELEM, $3.ast, $5.ast)); } + zend_ast_create(ZEND_AST_IF_ELEM, $3.ast, $5.ast)); } ; alt_if_stmt: alt_if_stmt_without_else T_ENDIF ';' { $$.ast = $1.ast; } | alt_if_stmt_without_else T_ELSE ':' inner_statement_list T_ENDIF ';' { $$.list = zend_ast_list_add($1.list, - zend_ast_create(2, ZEND_AST_IF_ELEM, NULL, $4.ast)); } + zend_ast_create(ZEND_AST_IF_ELEM, NULL, $4.ast)); } ; parameter_list: @@ -536,18 +536,18 @@ non_empty_parameter_list: parameter: optional_type is_reference is_variadic T_VARIABLE - { $$.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.num | $3.num, + { $$.ast = zend_ast_create_ex(ZEND_AST_PARAM, $2.num | $3.num, $1.ast, $4.ast, NULL); } | optional_type is_reference is_variadic T_VARIABLE '=' expr - { $$.ast = zend_ast_create_ex(3, ZEND_AST_PARAM, $2.num | $3.num, + { $$.ast = zend_ast_create_ex(ZEND_AST_PARAM, $2.num | $3.num, $1.ast, $4.ast, $6.ast); } ; optional_type: /* empty */ { $$.ast = NULL; } - | T_ARRAY { $$.ast = zend_ast_create_ex(0, ZEND_AST_TYPE, IS_ARRAY); } - | T_CALLABLE { $$.ast = zend_ast_create_ex(0, ZEND_AST_TYPE, IS_CALLABLE); } + | T_ARRAY { $$.ast = zend_ast_create_ex(ZEND_AST_TYPE, IS_ARRAY); } + | T_CALLABLE { $$.ast = zend_ast_create_ex(ZEND_AST_TYPE, IS_CALLABLE); } | name { $$.ast = $1.ast; } ; @@ -567,7 +567,7 @@ argument: expr_without_variable { $$.ast = $1.ast; } | variable { $$.ast = $1.ast; } /*| '&' variable { ZEND_ASSERT(0); } */ - | T_ELLIPSIS expr { $$.ast = zend_ast_create(1, ZEND_AST_UNPACK, $2.ast); } + | T_ELLIPSIS expr { $$.ast = zend_ast_create(ZEND_AST_UNPACK, $2.ast); } ; global_var_list: @@ -577,8 +577,8 @@ global_var_list: global_var: simple_variable - { $$.ast = zend_ast_create(1, ZEND_AST_GLOBAL, - zend_ast_create(1, ZEND_AST_VAR, $1.ast)); } + { $$.ast = zend_ast_create(ZEND_AST_GLOBAL, + zend_ast_create(ZEND_AST_VAR, $1.ast)); } ; @@ -589,9 +589,9 @@ static_var_list: static_var: T_VARIABLE - { $$.ast = zend_ast_create(2, ZEND_AST_STATIC, $1.ast, NULL); } + { $$.ast = zend_ast_create(ZEND_AST_STATIC, $1.ast, NULL); } | T_VARIABLE '=' expr - { $$.ast = zend_ast_create(2, ZEND_AST_STATIC, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_STATIC, $1.ast, $3.ast); } ; @@ -609,7 +609,7 @@ class_statement: | T_CONST class_const_list ';' { $$.ast = $2.ast; RESET_DOC_COMMENT(); } | T_USE name_list trait_adaptations - { $$.ast = zend_ast_create(2, ZEND_AST_USE_TRAIT, $2.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_USE_TRAIT, $2.ast, $3.ast); } | method_modifiers function returns_ref T_STRING '(' parameter_list ')' { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } method_body @@ -642,27 +642,27 @@ trait_adaptation: trait_precedence: absolute_trait_method_reference T_INSTEADOF name_list - { $$.ast = zend_ast_create(2, ZEND_AST_TRAIT_PRECEDENCE, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_TRAIT_PRECEDENCE, $1.ast, $3.ast); } ; trait_alias: trait_method_reference T_AS trait_modifiers T_STRING - { $$.ast = zend_ast_create_ex(2, ZEND_AST_TRAIT_ALIAS, + { $$.ast = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, $3.num, $1.ast, $4.ast); } | trait_method_reference T_AS member_modifier - { $$.ast = zend_ast_create_ex(2, ZEND_AST_TRAIT_ALIAS, + { $$.ast = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, $3.num, $1.ast, NULL); } ; trait_method_reference: T_STRING - { $$.ast = zend_ast_create(2, ZEND_AST_METHOD_REFERENCE, NULL, $1.ast); } + { $$.ast = zend_ast_create(ZEND_AST_METHOD_REFERENCE, NULL, $1.ast); } | absolute_trait_method_reference { $$.ast = $1.ast; } ; absolute_trait_method_reference: name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.ast = zend_ast_create(2, ZEND_AST_METHOD_REFERENCE, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_METHOD_REFERENCE, $1.ast, $3.ast); } ; trait_modifiers: @@ -707,9 +707,9 @@ property_list: ; property: - T_VARIABLE { $$.ast = zend_ast_create(2, ZEND_AST_PROP_ELEM, $1.ast, NULL); } + T_VARIABLE { $$.ast = zend_ast_create(ZEND_AST_PROP_ELEM, $1.ast, NULL); } | T_VARIABLE '=' expr - { $$.ast = zend_ast_create(2, ZEND_AST_PROP_ELEM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_PROP_ELEM, $1.ast, $3.ast); } ; class_const_list: @@ -720,7 +720,7 @@ class_const_list: const_decl: T_STRING '=' expr - { $$.ast = zend_ast_create(2, ZEND_AST_CONST_ELEM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_CONST_ELEM, $1.ast, $3.ast); } ; echo_expr_list: @@ -728,7 +728,7 @@ echo_expr_list: | echo_expr { $$.list = zend_ast_create_list(1, ZEND_AST_STMT_LIST, $1.ast); } ; echo_expr: - expr { $$.ast = zend_ast_create(1, ZEND_AST_ECHO, $1.ast); } + expr { $$.ast = zend_ast_create(ZEND_AST_ECHO, $1.ast); } ; for_expr: @@ -743,21 +743,21 @@ non_empty_for_expr: new_expr: T_NEW class_name_reference ctor_arguments - { $$.ast = zend_ast_create(2, ZEND_AST_NEW, $2.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_NEW, $2.ast, $3.ast); } ; expr_without_variable: T_LIST '(' assignment_list ')' '=' expr - { $$.ast = zend_ast_create(2, ZEND_AST_ASSIGN, $3.ast, $6.ast); } + { $$.ast = zend_ast_create(ZEND_AST_ASSIGN, $3.ast, $6.ast); } | variable '=' expr - { $$.ast = zend_ast_create(2, ZEND_AST_ASSIGN, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_ASSIGN, $1.ast, $3.ast); } | variable '=' '&' variable - { $$.ast = zend_ast_create(2, ZEND_AST_ASSIGN_REF, $1.ast, $4.ast); } + { $$.ast = zend_ast_create(ZEND_AST_ASSIGN_REF, $1.ast, $4.ast); } | variable '=' '&' T_NEW class_name_reference ctor_arguments { zend_error(E_DEPRECATED, "Assigning the return value of new by reference is deprecated"); - $$.ast = zend_ast_create(2, ZEND_AST_ASSIGN_REF, $1.ast, - zend_ast_create(2, ZEND_AST_NEW, $5.ast, $6.ast)); } - | T_CLONE expr { $$.ast = zend_ast_create(1, ZEND_AST_CLONE, $2.ast); } + $$.ast = zend_ast_create(ZEND_AST_ASSIGN_REF, $1.ast, + zend_ast_create(ZEND_AST_NEW, $5.ast, $6.ast)); } + | T_CLONE expr { $$.ast = zend_ast_create(ZEND_AST_CLONE, $2.ast); } | variable T_PLUS_EQUAL expr { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_ADD, $1.ast, $3.ast); } | variable T_MINUS_EQUAL expr @@ -782,18 +782,18 @@ expr_without_variable: { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SL, $1.ast, $3.ast); } | variable T_SR_EQUAL expr { $$.ast = zend_ast_create_assign_op(ZEND_ASSIGN_SR, $1.ast, $3.ast); } - | variable T_INC { $$.ast = zend_ast_create(1, ZEND_AST_POST_INC, $1.ast); } - | T_INC variable { $$.ast = zend_ast_create(1, ZEND_AST_PRE_INC, $2.ast); } - | variable T_DEC { $$.ast = zend_ast_create(1, ZEND_AST_POST_DEC, $1.ast); } - | T_DEC variable { $$.ast = zend_ast_create(1, ZEND_AST_PRE_DEC, $2.ast); } + | variable T_INC { $$.ast = zend_ast_create(ZEND_AST_POST_INC, $1.ast); } + | T_INC variable { $$.ast = zend_ast_create(ZEND_AST_PRE_INC, $2.ast); } + | variable T_DEC { $$.ast = zend_ast_create(ZEND_AST_POST_DEC, $1.ast); } + | T_DEC variable { $$.ast = zend_ast_create(ZEND_AST_PRE_DEC, $2.ast); } | expr T_BOOLEAN_OR expr - { $$.ast = zend_ast_create(2, ZEND_AST_OR, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_OR, $1.ast, $3.ast); } | expr T_BOOLEAN_AND expr - { $$.ast = zend_ast_create(2, ZEND_AST_AND, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_AND, $1.ast, $3.ast); } | expr T_LOGICAL_OR expr - { $$.ast = zend_ast_create(2, ZEND_AST_OR, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_OR, $1.ast, $3.ast); } | expr T_LOGICAL_AND expr - { $$.ast = zend_ast_create(2, ZEND_AST_AND, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_AND, $1.ast, $3.ast); } | expr T_LOGICAL_XOR expr { $$.ast = zend_ast_create_binary_op(ZEND_BOOL_XOR, $1.ast, $3.ast); } | expr '|' expr { $$.ast = zend_ast_create_binary_op(ZEND_BW_OR, $1.ast, $3.ast); } @@ -808,10 +808,10 @@ expr_without_variable: | expr '%' expr { $$.ast = zend_ast_create_binary_op(ZEND_MOD, $1.ast, $3.ast); } | expr T_SL expr { $$.ast = zend_ast_create_binary_op(ZEND_SL, $1.ast, $3.ast); } | expr T_SR expr { $$.ast = zend_ast_create_binary_op(ZEND_SR, $1.ast, $3.ast); } - | '+' expr %prec T_INC { $$.ast = zend_ast_create(1, ZEND_AST_UNARY_PLUS, $2.ast); } - | '-' expr %prec T_INC { $$.ast = zend_ast_create(1, ZEND_AST_UNARY_MINUS, $2.ast); } - | '!' expr { $$.ast = zend_ast_create_ex(1, ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, $2.ast); } - | '~' expr { $$.ast = zend_ast_create_ex(1, ZEND_AST_UNARY_OP, ZEND_BW_NOT, $2.ast); } + | '+' expr %prec T_INC { $$.ast = zend_ast_create(ZEND_AST_UNARY_PLUS, $2.ast); } + | '-' expr %prec T_INC { $$.ast = zend_ast_create(ZEND_AST_UNARY_MINUS, $2.ast); } + | '!' expr { $$.ast = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BOOL_NOT, $2.ast); } + | '~' expr { $$.ast = zend_ast_create_ex(ZEND_AST_UNARY_OP, ZEND_BW_NOT, $2.ast); } | expr T_IS_IDENTICAL expr { $$.ast = zend_ast_create_binary_op(ZEND_IS_IDENTICAL, $1.ast, $3.ast); } | expr T_IS_NOT_IDENTICAL expr @@ -825,18 +825,17 @@ expr_without_variable: | expr T_IS_SMALLER_OR_EQUAL expr { $$.ast = zend_ast_create_binary_op(ZEND_IS_SMALLER_OR_EQUAL, $1.ast, $3.ast); } | expr '>' expr - { $$.ast = zend_ast_create(2, ZEND_AST_GREATER, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_GREATER, $1.ast, $3.ast); } | expr T_IS_GREATER_OR_EQUAL expr - { $$.ast = zend_ast_create(2, ZEND_AST_GREATER_EQUAL, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_GREATER_EQUAL, $1.ast, $3.ast); } | expr T_INSTANCEOF class_name_reference - { $$.ast = zend_ast_create(2, ZEND_AST_INSTANCEOF, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_INSTANCEOF, $1.ast, $3.ast); } | parenthesis_expr { $$.ast = $1.ast; } | new_expr { $$.ast = $1.ast; } | expr '?' expr ':' expr - { $$.ast = zend_ast_create(3, - ZEND_AST_CONDITIONAL, $1.ast, $3.ast, $5.ast); } + { $$.ast = zend_ast_create(ZEND_AST_CONDITIONAL, $1.ast, $3.ast, $5.ast); } | expr '?' ':' expr - { $$.ast = zend_ast_create(3, ZEND_AST_CONDITIONAL, $1.ast, NULL, $4.ast); } + { $$.ast = zend_ast_create(ZEND_AST_CONDITIONAL, $1.ast, NULL, $4.ast); } | internal_functions_in_yacc { $$.ast = $1.ast; } | T_INT_CAST expr { $$.ast = zend_ast_create_cast(IS_LONG, $2.ast); } @@ -852,15 +851,15 @@ expr_without_variable: { $$.ast = zend_ast_create_cast(_IS_BOOL, $2.ast); } | T_UNSET_CAST expr { $$.ast = zend_ast_create_cast(IS_NULL, $2.ast); } - | T_EXIT exit_expr { $$.ast = zend_ast_create(1, ZEND_AST_EXIT, $2.ast); } - | '@' expr { $$.ast = zend_ast_create(1, ZEND_AST_SILENCE, $2.ast); } + | T_EXIT exit_expr { $$.ast = zend_ast_create(ZEND_AST_EXIT, $2.ast); } + | '@' expr { $$.ast = zend_ast_create(ZEND_AST_SILENCE, $2.ast); } | scalar { $$.ast = $1.ast; } - | '`' backticks_expr '`' { $$.ast = zend_ast_create(1, ZEND_AST_SHELL_EXEC, $2.ast); } - | T_PRINT expr { $$.ast = zend_ast_create(1, ZEND_AST_PRINT, $2.ast); } - | T_YIELD { $$.ast = zend_ast_create(2, ZEND_AST_YIELD, NULL, NULL); } - | T_YIELD expr { $$.ast = zend_ast_create(2, ZEND_AST_YIELD, $2.ast, NULL); } + | '`' backticks_expr '`' { $$.ast = zend_ast_create(ZEND_AST_SHELL_EXEC, $2.ast); } + | T_PRINT expr { $$.ast = zend_ast_create(ZEND_AST_PRINT, $2.ast); } + | T_YIELD { $$.ast = zend_ast_create(ZEND_AST_YIELD, NULL, NULL); } + | T_YIELD expr { $$.ast = zend_ast_create(ZEND_AST_YIELD, $2.ast, NULL); } | T_YIELD expr T_DOUBLE_ARROW expr - { $$.ast = zend_ast_create(2, ZEND_AST_YIELD, $4.ast, $2.ast); } + { $$.ast = zend_ast_create(ZEND_AST_YIELD, $4.ast, $2.ast); } | function returns_ref '(' parameter_list ')' lexical_vars { $$.str = CG(doc_comment); CG(doc_comment) = NULL; } '{' inner_statement_list '}' @@ -901,15 +900,15 @@ lexical_var: function_call: name argument_list - { $$.ast = zend_ast_create(2, ZEND_AST_CALL, $1.ast, $2.ast); } + { $$.ast = zend_ast_create(ZEND_AST_CALL, $1.ast, $2.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list - { $$.ast = zend_ast_create(3, ZEND_AST_STATIC_CALL, + { $$.ast = zend_ast_create(ZEND_AST_STATIC_CALL, $1.ast, $3.ast, $4.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list - { $$.ast = zend_ast_create(3, ZEND_AST_STATIC_CALL, + { $$.ast = zend_ast_create(ZEND_AST_STATIC_CALL, $1.ast, $3.ast, $4.ast); } | callable_expr argument_list - { $$.ast = zend_ast_create(2, ZEND_AST_CALL, $1.ast, $2.ast); } + { $$.ast = zend_ast_create(ZEND_AST_CALL, $1.ast, $2.ast); } ; class_name: @@ -956,11 +955,11 @@ scalar: | T_LINE { $$.ast = $1.ast; } | T_FILE { $$.ast = $1.ast; } | T_DIR { $$.ast = $1.ast; } - | T_TRAIT_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_TRAIT_C); } - | T_METHOD_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_METHOD_C); } - | T_FUNC_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); } - | T_NS_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_NS_C); } - | T_CLASS_C { $$.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_CLASS_C); } + | T_TRAIT_C { $$.ast = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_TRAIT_C); } + | T_METHOD_C { $$.ast = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_METHOD_C); } + | T_FUNC_C { $$.ast = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_FUNC_C); } + | T_NS_C { $$.ast = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_NS_C); } + | T_CLASS_C { $$.ast = zend_ast_create_ex(ZEND_AST_MAGIC_CONST, T_CLASS_C); } | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.ast = $2.ast; } | T_START_HEREDOC T_END_HEREDOC { $$.ast = zend_ast_create_zval_from_str(STR_EMPTY_ALLOC()); } @@ -969,7 +968,7 @@ scalar: | dereferencable_scalar { $$.ast = $1.ast; } | class_name_scalar { $$.ast = $1.ast; } | class_constant { $$.ast = $1.ast; } - | name { $$.ast = zend_ast_create(1, ZEND_AST_CONST, $1.ast); } + | name { $$.ast = zend_ast_create(ZEND_AST_CONST, $1.ast); } ; @@ -1005,13 +1004,13 @@ callable_expr: callable_variable: simple_variable - { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } + { $$.ast = zend_ast_create(ZEND_AST_VAR, $1.ast); } | dereferencable '[' dim_offset ']' - { $$.ast = zend_ast_create(2, ZEND_AST_DIM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_DIM, $1.ast, $3.ast); } | dereferencable '{' expr '}' - { $$.ast = zend_ast_create(2, ZEND_AST_DIM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_DIM, $1.ast, $3.ast); } | dereferencable T_OBJECT_OPERATOR member_name argument_list - { $$.ast = zend_ast_create(3, ZEND_AST_METHOD_CALL, $1.ast, $3.ast, $4.ast); } + { $$.ast = zend_ast_create(ZEND_AST_METHOD_CALL, $1.ast, $3.ast, $4.ast); } | function_call { $$.ast = $1.ast; } ; @@ -1021,7 +1020,7 @@ variable: | static_member { $$.ast = $1.ast; } | dereferencable T_OBJECT_OPERATOR member_name - { $$.ast = zend_ast_create(2, ZEND_AST_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_PROP, $1.ast, $3.ast); } ; simple_variable: @@ -1030,29 +1029,29 @@ simple_variable: | '$' '{' expr '}' { $$.ast = $3.ast; } | '$' simple_variable - { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $2.ast); } + { $$.ast = zend_ast_create(ZEND_AST_VAR, $2.ast); } ; static_member: class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.ast = zend_ast_create(2, ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.ast = zend_ast_create(2, ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } ; new_variable: simple_variable - { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } + { $$.ast = zend_ast_create(ZEND_AST_VAR, $1.ast); } | new_variable '[' dim_offset ']' - { $$.ast = zend_ast_create(2, ZEND_AST_DIM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_DIM, $1.ast, $3.ast); } | new_variable '{' expr '}' - { $$.ast = zend_ast_create(2, ZEND_AST_DIM, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_DIM, $1.ast, $3.ast); } | new_variable T_OBJECT_OPERATOR member_name - { $$.ast = zend_ast_create(2, ZEND_AST_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_PROP, $1.ast, $3.ast); } | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.ast = zend_ast_create(2, ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable - { $$.ast = zend_ast_create(2, ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_STATIC_PROP, $1.ast, $3.ast); } ; dim_offset: @@ -1063,7 +1062,7 @@ dim_offset: member_name: T_STRING { $$.ast = $1.ast; } | '{' expr '}' { $$.ast = $2.ast; } - | simple_variable { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } + | simple_variable { $$.ast = zend_ast_create(ZEND_AST_VAR, $1.ast); } ; assignment_list: @@ -1094,12 +1093,12 @@ non_empty_array_pair_list: array_pair: expr T_DOUBLE_ARROW expr - { $$.ast = zend_ast_create(2, ZEND_AST_ARRAY_ELEM, $3.ast, $1.ast); } - | expr { $$.ast = zend_ast_create(2, ZEND_AST_ARRAY_ELEM, $1.ast, NULL); } + { $$.ast = zend_ast_create(ZEND_AST_ARRAY_ELEM, $3.ast, $1.ast); } + | expr { $$.ast = zend_ast_create(ZEND_AST_ARRAY_ELEM, $1.ast, NULL); } | expr T_DOUBLE_ARROW '&' variable - { $$.ast = zend_ast_create_ex(2, ZEND_AST_ARRAY_ELEM, 1, $4.ast, $1.ast); } + { $$.ast = zend_ast_create_ex(ZEND_AST_ARRAY_ELEM, 1, $4.ast, $1.ast); } | '&' variable - { $$.ast = zend_ast_create_ex(2, ZEND_AST_ARRAY_ELEM, 1, $2.ast, NULL); } + { $$.ast = zend_ast_create_ex(ZEND_AST_ARRAY_ELEM, 1, $2.ast, NULL); } ; encaps_list: @@ -1115,65 +1114,65 @@ encaps_list: encaps_var: T_VARIABLE - { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } + { $$.ast = zend_ast_create(ZEND_AST_VAR, $1.ast); } | T_VARIABLE '[' encaps_var_offset ']' - { $$.ast = zend_ast_create(2, ZEND_AST_DIM, - zend_ast_create(1, ZEND_AST_VAR, $1.ast), $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_DIM, + zend_ast_create(ZEND_AST_VAR, $1.ast), $3.ast); } | T_VARIABLE T_OBJECT_OPERATOR T_STRING - { $$.ast = zend_ast_create(2, ZEND_AST_PROP, - zend_ast_create(1, ZEND_AST_VAR, $1.ast), $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_PROP, + zend_ast_create(ZEND_AST_VAR, $1.ast), $3.ast); } | T_DOLLAR_OPEN_CURLY_BRACES expr '}' - { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $2.ast); } + { $$.ast = zend_ast_create(ZEND_AST_VAR, $2.ast); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}' - { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $2.ast); } + { $$.ast = zend_ast_create(ZEND_AST_VAR, $2.ast); } | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' - { $$.ast = zend_ast_create(2, ZEND_AST_DIM, - zend_ast_create(1, ZEND_AST_VAR, $2.ast), $4.ast); } + { $$.ast = zend_ast_create(ZEND_AST_DIM, + zend_ast_create(ZEND_AST_VAR, $2.ast), $4.ast); } | T_CURLY_OPEN variable '}' { $$.ast = $2.ast; } ; encaps_var_offset: T_STRING { $$.ast = $1.ast; } | T_NUM_STRING { $$.ast = $1.ast; } - | T_VARIABLE { $$.ast = zend_ast_create(1, ZEND_AST_VAR, $1.ast); } + | T_VARIABLE { $$.ast = zend_ast_create(ZEND_AST_VAR, $1.ast); } ; internal_functions_in_yacc: T_ISSET '(' isset_variables ')' { $$.ast = $3.ast; } - | T_EMPTY '(' expr ')' { $$.ast = zend_ast_create(1, ZEND_AST_EMPTY, $3.ast); } + | T_EMPTY '(' expr ')' { $$.ast = zend_ast_create(ZEND_AST_EMPTY, $3.ast); } | T_INCLUDE expr - { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.ast); } + { $$.ast = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE, $2.ast); } | T_INCLUDE_ONCE expr - { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2.ast); } + { $$.ast = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_INCLUDE_ONCE, $2.ast); } | T_EVAL '(' expr ')' - { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_EVAL, $3.ast); } + { $$.ast = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_EVAL, $3.ast); } | T_REQUIRE expr - { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2.ast); } + { $$.ast = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE, $2.ast); } | T_REQUIRE_ONCE expr - { $$.ast = zend_ast_create_ex(1, ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2.ast); } + { $$.ast = zend_ast_create_ex(ZEND_AST_INCLUDE_OR_EVAL, ZEND_REQUIRE_ONCE, $2.ast); } ; isset_variables: isset_variable { $$.ast = $1.ast; } | isset_variables ',' isset_variable - { $$.ast = zend_ast_create(2, ZEND_AST_AND, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_AND, $1.ast, $3.ast); } ; isset_variable: - expr { $$.ast = zend_ast_create(1, ZEND_AST_ISSET, $1.ast); } + expr { $$.ast = zend_ast_create(ZEND_AST_ISSET, $1.ast); } ; class_constant: class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.ast = zend_ast_create(2, ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.ast = zend_ast_create(2, ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } + { $$.ast = zend_ast_create(ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } ; class_name_scalar: class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS - { $$.ast = zend_ast_create(1, ZEND_AST_RESOLVE_CLASS_NAME, $1.ast); } + { $$.ast = zend_ast_create(ZEND_AST_RESOLVE_CLASS_NAME, $1.ast); } ; %% -- cgit v1.2.1 From 788905068580c03d3f3f8a324add93afb5a65703 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 22:03:16 +0200 Subject: Add zend_ prefix for emit_op(_tmp) --- Zend/zend_compile.c | 217 +++++++++++++++++++++++--------------------- Zend/zend_language_parser.y | 6 +- 2 files changed, 118 insertions(+), 105 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 562c076356..8506a82853 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3296,7 +3296,10 @@ static inline zend_bool zend_str_equals(zend_string *str, char *c) { size_t len = strlen(c); return str->len == len && !memcmp(str->val, c, len); } - +static inline zend_bool zend_str_equals_ci(zend_string *str, char *c) { + size_t len = strlen(c); + return str->len == len && !zend_binary_strcasecmp(str->val, len, c, len); +} static void zend_adjust_for_fetch_type(zend_op *opline, zend_uint type) { switch (type & BP_VAR_MASK) { @@ -3326,7 +3329,7 @@ static void zend_adjust_for_fetch_type(zend_op *opline, zend_uint type) { } } -static zend_op *emit_op(znode *result, zend_uchar opcode, znode *op1, znode *op2 TSRMLS_DC) { +static zend_op *zend_emit_op(znode *result, zend_uchar opcode, znode *op1, znode *op2 TSRMLS_DC) { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = opcode; @@ -3352,7 +3355,9 @@ static zend_op *emit_op(znode *result, zend_uchar opcode, znode *op1, znode *op2 return opline; } -static zend_op *emit_op_tmp(znode *result, zend_uchar opcode, znode *op1, znode *op2 TSRMLS_DC) { +static zend_op *zend_emit_op_tmp( + znode *result, zend_uchar opcode, znode *op1, znode *op2 TSRMLS_DC +) { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = opcode; @@ -3384,13 +3389,13 @@ static void zend_emit_tick(TSRMLS_D) { opline->extended_value = Z_LVAL(CG(declarables).ticks); } -static zend_op *zend_emit_op_data(znode *value TSRMLS_DC) { - return emit_op(NULL, ZEND_OP_DATA, value, NULL TSRMLS_CC); +static zend_op *zend_zend_emit_op_data(znode *value TSRMLS_DC) { + return zend_emit_op(NULL, ZEND_OP_DATA, value, NULL TSRMLS_CC); } static zend_uint zend_emit_jump(zend_uint opnum_target TSRMLS_DC) { zend_uint opnum = get_next_op_number(CG(active_op_array)); - zend_op *opline = emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + zend_op *opline = zend_emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); opline->op1.opline_num = opnum_target; return opnum; } @@ -3399,7 +3404,7 @@ static zend_uint zend_emit_cond_jump( zend_uchar opcode, znode *cond, zend_uint opnum_target TSRMLS_DC ) { zend_uint opnum = get_next_op_number(CG(active_op_array)); - zend_op *opline = emit_op(NULL, opcode, cond, NULL TSRMLS_CC); + zend_op *opline = zend_emit_op(NULL, opcode, cond, NULL TSRMLS_CC); opline->op2.opline_num = opnum_target; return opnum; } @@ -3435,7 +3440,7 @@ void zend_emit_final_return(zval *zv TSRMLS_DC) { ZVAL_NULL(&zn.u.constant); } - emit_op(NULL, returns_reference ? ZEND_RETURN_BY_REF : ZEND_RETURN, &zn, NULL TSRMLS_CC); + zend_emit_op(NULL, returns_reference ? ZEND_RETURN_BY_REF : ZEND_RETURN, &zn, NULL TSRMLS_CC); } @@ -3507,7 +3512,7 @@ static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_ if (name_ast->kind == ZEND_AST_ZVAL) { zend_uint fetch_type = zend_get_class_fetch_type(zend_ast_get_str(name_ast)); - opline = emit_op(result, ZEND_FETCH_CLASS, NULL, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_FETCH_CLASS, NULL, NULL TSRMLS_CC); opline->extended_value = fetch_type; if (fetch_type == ZEND_FETCH_CLASS_DEFAULT) { @@ -3518,7 +3523,7 @@ static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_ } else { znode name_node; zend_compile_expr(&name_node, name_ast TSRMLS_CC); - opline = emit_op(result, ZEND_FETCH_CLASS, NULL, &name_node TSRMLS_CC); + opline = zend_emit_op(result, ZEND_FETCH_CLASS, NULL, &name_node TSRMLS_CC); opline->extended_value = ZEND_FETCH_CLASS_DEFAULT; } @@ -3563,7 +3568,7 @@ static zend_op *zend_compile_simple_var_no_cv(znode *result, zend_ast *ast, int zend_compile_expr(&name_node, name_ast TSRMLS_CC); opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline = emit_op(result, ZEND_FETCH_R, &name_node, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_FETCH_R, &name_node, NULL TSRMLS_CC); opline->extended_value = ZEND_FETCH_LOCAL; if (name_node.op_type == IS_CONST) { @@ -3584,7 +3589,7 @@ static void zend_compile_simple_var(znode *result, zend_ast *ast, int type TSRML static void zend_separate_if_call_and_write(znode *node, zend_ast *ast, int type TSRMLS_DC) { if (type != BP_VAR_R && type != BP_VAR_IS && zend_is_call(ast)) { - zend_op *opline = emit_op(NULL, ZEND_SEPARATE, node, NULL TSRMLS_CC); + zend_op *opline = zend_emit_op(NULL, ZEND_SEPARATE, node, NULL TSRMLS_CC); opline->result_type = IS_VAR; opline->result.var = opline->op1.var; } @@ -3612,7 +3617,7 @@ zend_op *zend_compile_dim_common(znode *result, zend_ast *ast, int type TSRMLS_D zend_compile_var(&var_node, var_ast, type TSRMLS_CC); zend_separate_if_call_and_write(&var_node, var_ast, type TSRMLS_CC); - opline = emit_op(result, ZEND_FETCH_DIM_R, &var_node, &dim_node TSRMLS_CC); + opline = zend_emit_op(result, ZEND_FETCH_DIM_R, &var_node, &dim_node TSRMLS_CC); zend_handle_numeric_op2(opline TSRMLS_CC); return opline; @@ -3648,7 +3653,7 @@ zend_op *zend_compile_prop_common(znode *result, zend_ast *ast, int type TSRMLS_ zend_separate_if_call_and_write(&obj_node, obj_ast, type TSRMLS_CC); } - opline = emit_op(result, ZEND_FETCH_OBJ_R, &obj_node, &prop_node TSRMLS_CC); + opline = zend_emit_op(result, ZEND_FETCH_OBJ_R, &obj_node, &prop_node TSRMLS_CC); if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); } @@ -3677,7 +3682,7 @@ zend_op *zend_compile_static_prop_common(znode *result, zend_ast *ast, int type zend_compile_expr(&prop_node, prop_ast TSRMLS_CC); - opline = emit_op(result, ZEND_FETCH_R, &prop_node, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_FETCH_R, &prop_node, NULL TSRMLS_CC); if (opline->op1_type == IS_CONST) { GET_POLYMORPHIC_CACHE_SLOT(opline->op1.constant); } @@ -3730,7 +3735,7 @@ static void zend_compile_list_assign(znode *result, zend_ast *ast, znode *expr_n dim_node.op_type = IS_CONST; ZVAL_LONG(&dim_node.u.constant, i); - opline = emit_op(&fetch_result, + opline = zend_emit_op(&fetch_result, get_list_fetch_opcode(expr_node->op_type), expr_node, &dim_node TSRMLS_CC); opline->extended_value |= ZEND_FETCH_ADD_LOCK; @@ -3739,7 +3744,7 @@ static void zend_compile_list_assign(znode *result, zend_ast *ast, znode *expr_n zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); } zend_compile_var(&var_node, var_ast, BP_VAR_W TSRMLS_CC); - emit_op(&assign_result, ZEND_ASSIGN, &var_node, &fetch_result TSRMLS_CC); + zend_emit_op(&assign_result, ZEND_ASSIGN, &var_node, &fetch_result TSRMLS_CC); zend_do_free(&assign_result TSRMLS_CC); } else { zend_compile_list_assign(&assign_result, var_ast, &fetch_result TSRMLS_CC); @@ -3805,13 +3810,13 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_VAR: case ZEND_AST_STATIC_PROP: zend_compile_var(&var_node, var_ast, BP_VAR_W TSRMLS_CC); - emit_op(result, ZEND_ASSIGN, &var_node, &expr_node TSRMLS_CC); + zend_emit_op(result, ZEND_ASSIGN, &var_node, &expr_node TSRMLS_CC); return; case ZEND_AST_DIM: opline = zend_compile_dim_common(result, var_ast, BP_VAR_W TSRMLS_CC); opline->opcode = ZEND_ASSIGN_DIM; - opline = zend_emit_op_data(&expr_node TSRMLS_CC); + opline = zend_zend_emit_op_data(&expr_node TSRMLS_CC); opline->op2.var = get_temporary_variable(CG(active_op_array)); opline->op2_type = IS_VAR; return; @@ -3819,7 +3824,7 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline = zend_compile_prop_common(result, var_ast, BP_VAR_W TSRMLS_CC); opline->opcode = ZEND_ASSIGN_OBJ; - zend_emit_op_data(&expr_node TSRMLS_CC); + zend_zend_emit_op_data(&expr_node TSRMLS_CC); return; case ZEND_AST_LIST: zend_compile_list_assign(result, var_ast, &expr_node TSRMLS_CC); @@ -3889,14 +3894,14 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { case ZEND_AST_VAR: case ZEND_AST_STATIC_PROP: zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); - emit_op(result, opcode, &var_node, &expr_node TSRMLS_CC); + zend_emit_op(result, opcode, &var_node, &expr_node TSRMLS_CC); return; case ZEND_AST_DIM: opline = zend_compile_dim_common(result, var_ast, BP_VAR_RW TSRMLS_CC); opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_DIM; - opline = zend_emit_op_data(&expr_node TSRMLS_CC); + opline = zend_zend_emit_op_data(&expr_node TSRMLS_CC); opline->op2.var = get_temporary_variable(CG(active_op_array)); opline->op2_type = IS_VAR; return; @@ -3905,7 +3910,7 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_OBJ; - opline = zend_emit_op_data(&expr_node TSRMLS_CC); + opline = zend_zend_emit_op_data(&expr_node TSRMLS_CC); return; EMPTY_SWITCH_DEFAULT_CASE() } @@ -3932,7 +3937,7 @@ zend_uint zend_compile_args(zend_ast *ast, zend_function *fbc TSRMLS_DC) { fbc = NULL; zend_compile_expr(&arg_node, arg->child[0] TSRMLS_CC); - opline = emit_op(NULL, ZEND_SEND_UNPACK, &arg_node, NULL TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_SEND_UNPACK, &arg_node, NULL TSRMLS_CC); opline->op2.num = arg_count; continue; } @@ -4019,7 +4024,7 @@ void zend_compile_call_common(znode *result, zend_ast *args_ast, zend_function * opline->extended_value = arg_count; call_flags = (opline->opcode == ZEND_NEW ? ZEND_CALL_CTOR : 0); - opline = emit_op(result, ZEND_DO_FCALL, NULL, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL TSRMLS_CC); opline->op1.num = call_flags; zend_do_extended_fcall_end(TSRMLS_C); @@ -4084,7 +4089,7 @@ int zend_compile_func_strlen(znode *result, zend_ast_list *args TSRMLS_DC) { } zend_compile_expr(&arg_node, args->child[0] TSRMLS_CC); - emit_op(result, ZEND_STRLEN, &arg_node, NULL TSRMLS_CC); + zend_emit_op(result, ZEND_STRLEN, &arg_node, NULL TSRMLS_CC); return SUCCESS; } @@ -4097,7 +4102,7 @@ int zend_compile_func_typecheck(znode *result, zend_ast_list *args, zend_uint ty } zend_compile_expr(&arg_node, args->child[0] TSRMLS_CC); - opline = emit_op(result, ZEND_TYPE_CHECK, &arg_node, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_TYPE_CHECK, &arg_node, NULL TSRMLS_CC); opline->extended_value = type; return SUCCESS; } @@ -4116,7 +4121,7 @@ int zend_compile_func_defined(znode *result, zend_ast_list *args TSRMLS_DC) { return FAILURE; } - opline = emit_op(result, ZEND_DEFINED, NULL, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_DEFINED, NULL, NULL TSRMLS_CC); opline->op1_type = IS_CONST; LITERAL_STR(opline->op1, name); GET_CACHE_SLOT(opline->op1.constant); @@ -4155,7 +4160,7 @@ static int zend_try_compile_ct_bound_init_user_func( return FAILURE; } - opline = emit_op(NULL, ZEND_INIT_FCALL, NULL, NULL TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_INIT_FCALL, NULL, NULL TSRMLS_CC); opline->op2_type = IS_CONST; LITERAL_STR(opline->op2, lcname); opline->extended_value = num_args; @@ -4175,7 +4180,7 @@ static void zend_compile_init_user_func( zend_compile_expr(&name_node, name_ast TSRMLS_CC); - opline = emit_op(NULL, ZEND_INIT_USER_CALL, NULL, &name_node TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_INIT_USER_CALL, NULL, &name_node TSRMLS_CC); opline->op1_type = IS_CONST; LITERAL_STR(opline->op1, STR_COPY(orig_func_name)); opline->extended_value = num_args; @@ -4191,8 +4196,8 @@ int zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_string *lcna zend_compile_init_user_func(NULL, args->child[0], 1, lcname TSRMLS_CC); zend_compile_expr(&arg_node, args->child[1] TSRMLS_CC); - emit_op(NULL, ZEND_SEND_ARRAY, &arg_node, NULL TSRMLS_CC); - emit_op(result, ZEND_DO_FCALL, NULL, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_SEND_ARRAY, &arg_node, NULL TSRMLS_CC); + zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL TSRMLS_CC); return SUCCESS; } @@ -4223,14 +4228,14 @@ int zend_compile_func_cuf(znode *result, zend_ast_list *args, zend_string *lcnam } if (send_user) { - opline = emit_op(NULL, ZEND_SEND_USER, &arg_node, NULL TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_SEND_USER, &arg_node, NULL TSRMLS_CC); } else { - opline = emit_op(NULL, ZEND_SEND_VAL, &arg_node, NULL TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_SEND_VAL, &arg_node, NULL TSRMLS_CC); } opline->op2.opline_num = i; } - emit_op(result, ZEND_DO_FCALL, NULL, NULL TSRMLS_CC); + zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL TSRMLS_CC); return SUCCESS; } @@ -4280,8 +4285,8 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { } { - zend_bool needs_runtime_resolution = zend_compile_function_name(&name_node, name_ast TSRMLS_CC); - if (needs_runtime_resolution) { + zend_bool runtime_resolution = zend_compile_function_name(&name_node, name_ast TSRMLS_CC); + if (runtime_resolution) { zend_compile_ns_call(result, &name_node, args_ast TSRMLS_CC); return; } @@ -4315,7 +4320,7 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { zval_ptr_dtor(&name_node.u.constant); ZVAL_NEW_STR(&name_node.u.constant, lcname); - opline = emit_op(NULL, ZEND_INIT_FCALL, NULL, &name_node TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_INIT_FCALL, NULL, &name_node TSRMLS_CC); GET_CACHE_SLOT(opline->op2.constant); zend_compile_call_common(result, args_ast, fbc TSRMLS_CC); @@ -4417,7 +4422,7 @@ void zend_compile_new(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); opnum = get_next_op_number(CG(active_op_array)); - opline = emit_op(result, ZEND_NEW, &class_node, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_NEW, &class_node, NULL TSRMLS_CC); zend_compile_call_common(&ctor_result, args_ast, NULL TSRMLS_CC); zend_do_free(&ctor_result TSRMLS_CC); @@ -4433,7 +4438,7 @@ void zend_compile_clone(znode *result, zend_ast *ast TSRMLS_DC) { znode obj_node; zend_compile_expr(&obj_node, obj_ast TSRMLS_CC); - emit_op(result, ZEND_CLONE, &obj_node, NULL TSRMLS_CC); + zend_emit_op(result, ZEND_CLONE, &obj_node, NULL TSRMLS_CC); } void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { @@ -4450,9 +4455,9 @@ void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { } if (zend_try_compile_cv(&result, var_ast TSRMLS_CC) == SUCCESS) { - emit_op(NULL, ZEND_BIND_GLOBAL, &result, &name_node TSRMLS_CC); + zend_emit_op(NULL, ZEND_BIND_GLOBAL, &result, &name_node TSRMLS_CC); } else { - emit_op(&result, ZEND_FETCH_W, &name_node, NULL TSRMLS_CC); + zend_emit_op(&result, ZEND_FETCH_W, &name_node, NULL TSRMLS_CC); // TODO.AST Avoid double fetch //opline->extended_value = ZEND_FETCH_GLOBAL_LOCK; @@ -4479,7 +4484,7 @@ static void zend_compile_static_var_common( zend_hash_update(CG(active_op_array)->static_variables, Z_STR(var_node.u.constant), value); - opline = emit_op(&result, by_ref ? ZEND_FETCH_W : ZEND_FETCH_R, &var_node, NULL TSRMLS_CC); + opline = zend_emit_op(&result, by_ref ? ZEND_FETCH_W : ZEND_FETCH_R, &var_node, NULL TSRMLS_CC); opline->extended_value = ZEND_FETCH_STATIC; if (by_ref) { @@ -4517,7 +4522,7 @@ void zend_compile_unset(zend_ast *ast TSRMLS_DC) { switch (var_ast->kind) { case ZEND_AST_VAR: if (zend_try_compile_cv(&var_node, var_ast TSRMLS_CC) == SUCCESS) { - opline = emit_op(NULL, ZEND_UNSET_VAR, &var_node, NULL TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_UNSET_VAR, &var_node, NULL TSRMLS_CC); opline->extended_value = ZEND_FETCH_LOCAL | ZEND_QUICK_SET; } else { opline = zend_compile_simple_var_no_cv(NULL, var_ast, BP_VAR_UNSET TSRMLS_CC); @@ -4579,10 +4584,12 @@ void zend_compile_return(zend_ast *ast TSRMLS_DC) { zend_free_foreach_and_switch_variables(TSRMLS_C); if (CG(context).in_finally) { - emit_op(NULL, ZEND_DISCARD_EXCEPTION, NULL, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_DISCARD_EXCEPTION, NULL, NULL TSRMLS_CC); } - opline = emit_op(NULL, by_ref ? ZEND_RETURN_BY_REF : ZEND_RETURN, &expr_node, NULL TSRMLS_CC); + opline = zend_emit_op(NULL, by_ref ? ZEND_RETURN_BY_REF : ZEND_RETURN, + &expr_node, NULL TSRMLS_CC); + if (expr_ast) { if (zend_is_call(expr_ast)) { opline->extended_value = ZEND_RETURNS_FUNCTION; @@ -4598,7 +4605,7 @@ void zend_compile_echo(zend_ast *ast TSRMLS_DC) { znode expr_node; zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - emit_op(NULL, ZEND_ECHO, &expr_node, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_ECHO, &expr_node, NULL TSRMLS_CC); } void zend_compile_throw(zend_ast *ast TSRMLS_DC) { @@ -4607,7 +4614,7 @@ void zend_compile_throw(zend_ast *ast TSRMLS_DC) { znode expr_node; zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - emit_op(NULL, ZEND_THROW, &expr_node, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_THROW, &expr_node, NULL TSRMLS_CC); } void zend_compile_break_continue(zend_ast *ast TSRMLS_DC) { @@ -4635,7 +4642,7 @@ void zend_compile_break_continue(zend_ast *ast TSRMLS_DC) { ZVAL_LONG(&depth_node.u.constant, 1); } - opline = emit_op(NULL, ast->kind == ZEND_AST_BREAK ? ZEND_BRK : ZEND_CONT, + opline = zend_emit_op(NULL, ast->kind == ZEND_AST_BREAK ? ZEND_BRK : ZEND_CONT, NULL, &depth_node TSRMLS_CC); opline->op1.opline_num = CG(context).current_brk_cont; } @@ -4646,7 +4653,7 @@ void zend_compile_goto(zend_ast *ast TSRMLS_DC) { zend_op *opline; zend_compile_expr(&label_node, label_ast TSRMLS_CC); - opline = emit_op(NULL, ZEND_GOTO, NULL, &label_node TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_GOTO, NULL, &label_node TSRMLS_CC); opline->extended_value = CG(context).current_brk_cont; zend_resolve_goto_label(CG(active_op_array), opline, 0 TSRMLS_CC); } @@ -4798,7 +4805,7 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { } opnum_reset = get_next_op_number(CG(active_op_array)); - opline = emit_op(&reset_node, ZEND_FE_RESET, &expr_node, NULL TSRMLS_CC); + opline = zend_emit_op(&reset_node, ZEND_FE_RESET, &expr_node, NULL TSRMLS_CC); if (by_ref && is_variable) { opline->extended_value = ZEND_FE_RESET_VARIABLE | ZEND_FE_RESET_REFERENCE; // ??? } @@ -4807,7 +4814,7 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { zend_stack_push(&CG(foreach_copy_stack), &foreach_stack_opline); opnum_fetch = get_next_op_number(CG(active_op_array)); - opline = emit_op(&value_node, ZEND_FE_FETCH, &reset_node, NULL TSRMLS_CC); + opline = zend_emit_op(&value_node, ZEND_FE_FETCH, &reset_node, NULL TSRMLS_CC); if (by_ref) { opline->extended_value |= ZEND_FE_FETCH_BYREF; } @@ -4815,7 +4822,7 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { opline->extended_value |= ZEND_FE_FETCH_WITH_KEY; } - opline = emit_op(NULL, ZEND_OP_DATA, NULL, NULL TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_OP_DATA, NULL, NULL TSRMLS_CC); /* Allocate enough space to keep HashPointer on VM stack */ opline->op1_type = IS_TMP_VAR; @@ -4943,7 +4950,7 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); - opline = emit_op(NULL, ZEND_CASE, &expr_node, &cond_node TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_CASE, &expr_node, &cond_node TSRMLS_CC); SET_NODE(opline->result, &case_node); if (opline->op1_type == IS_CONST) { zval_copy_ctor(&CONSTANT(opline->op1.constant)); @@ -4975,7 +4982,7 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { do_end_loop(get_next_op_number(CG(active_op_array)), 1 TSRMLS_CC); if (expr_node.op_type == IS_VAR || expr_node.op_type == IS_TMP_VAR) { - emit_op(NULL, expr_node.op_type == IS_TMP_VAR ? ZEND_FREE : ZEND_SWITCH_FREE, + zend_emit_op(NULL, expr_node.op_type == IS_TMP_VAR ? ZEND_FREE : ZEND_SWITCH_FREE, &expr_node, NULL TSRMLS_CC); } else if (expr_node.op_type == IS_CONST) { zval_dtor(&expr_node.u.constant); @@ -5054,10 +5061,10 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { if (finally_ast) { zend_uint opnum_jmp = get_next_op_number(CG(active_op_array)) + 1; - opline = emit_op(NULL, ZEND_FAST_CALL, NULL, NULL TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_FAST_CALL, NULL, NULL TSRMLS_CC); opline->op1.opline_num = opnum_jmp + 1; - emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); CG(context).in_finally++; zend_compile_stmt(finally_ast TSRMLS_CC); @@ -5068,7 +5075,7 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { = get_next_op_number(CG(active_op_array)); CG(active_op_array)->has_finally_block = 1; - emit_op(NULL, ZEND_FAST_RET, NULL, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_FAST_RET, NULL, NULL TSRMLS_CC); zend_update_jump_target_to_next(opnum_jmp TSRMLS_CC); } @@ -5092,10 +5099,10 @@ void zend_compile_declare(zend_ast *ast TSRMLS_DC) { _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); - if (!zend_binary_strcasecmp(name->val, name->len, "ticks", sizeof("ticks") - 1)) { + if (zend_str_equals_ci(name, "ticks")) { convert_to_long(&value_zv); ZVAL_COPY_VALUE(&CG(declarables).ticks, &value_zv); - } else if (!zend_binary_strcasecmp(name->val, name->len, "encoding", sizeof("encoding") - 1)) { + } else if (zend_str_equals_ci(name, "encoding")) { if (Z_TYPE(value_zv) == IS_CONSTANT) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use constants as encoding"); } @@ -5236,7 +5243,7 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { op_array->required_num_args = i + 1; } - opline = emit_op(NULL, opcode, NULL, &default_node TSRMLS_CC); + opline = zend_emit_op(NULL, opcode, NULL, &default_node TSRMLS_CC); SET_NODE(opline->result, &var_node); opline->op1.num = i + 1; @@ -5313,7 +5320,7 @@ void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { zend_bool by_ref = var_ast->attr; zval zv; - if (name->len == sizeof("this") - 1 && !memcmp(name->val, "this", sizeof("this") - 1)) { + if (zend_str_equals(name, "this")) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as lexical variable"); } @@ -5549,7 +5556,7 @@ static void zend_begin_func_decl( } if (op_array->fn_flags & ZEND_ACC_CLOSURE) { - opline = emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL TSRMLS_CC); + opline = zend_emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL TSRMLS_CC); } else { opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = ZEND_DECLARE_FUNCTION; @@ -5606,7 +5613,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) { zend_init_compiler_context(TSRMLS_C); if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) { - zend_op *opline_ext = emit_op(NULL, ZEND_EXT_NOP, NULL, NULL TSRMLS_CC); + zend_op *opline_ext = zend_emit_op(NULL, ZEND_EXT_NOP, NULL, NULL TSRMLS_CC); opline_ext->lineno = decl->start_lineno; } @@ -5693,7 +5700,8 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { } name = zend_new_interned_string_safe(name TSRMLS_CC); - zend_declare_property_ex(ce, name, &value_zv, flags, NULL /* TODO.AST doc comment */ TSRMLS_CC); + zend_declare_property_ex(ce, name, &value_zv, flags, + NULL /* TODO.AST doc comment */ TSRMLS_CC); } } @@ -5880,7 +5888,7 @@ void zend_compile_implements(znode *class_node, zend_ast *ast TSRMLS_DC) { "Cannot use '%s' as interface name as it is reserved", name->val); } - opline = emit_op(NULL, ZEND_ADD_INTERFACE, class_node, NULL TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_ADD_INTERFACE, class_node, NULL TSRMLS_CC); opline->extended_value = ZEND_FETCH_CLASS_INTERFACE; opline->op2_type = IS_CONST; opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), @@ -6036,7 +6044,7 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { ce->num_traits = 0; ce->ce_flags |= ZEND_ACC_IMPLEMENT_TRAITS; - emit_op(NULL, ZEND_BIND_TRAITS, &declare_node, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_BIND_TRAITS, &declare_node, NULL TSRMLS_CC); } if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) @@ -6044,7 +6052,7 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { ) { zend_verify_abstract_class(ce TSRMLS_CC); if (ce->num_interfaces && !(ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS)) { - emit_op(NULL, ZEND_VERIFY_ABSTRACT_CLASS, &declare_node, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_VERIFY_ABSTRACT_CLASS, &declare_node, NULL TSRMLS_CC); } } @@ -6261,7 +6269,7 @@ void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { 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_emit_op(NULL, ZEND_DECLARE_CONST, &name_node, &value_node TSRMLS_CC); zend_hash_add_ptr(&CG(const_filenames), name, CG(compiled_filename)); } @@ -6303,7 +6311,8 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { --num; } if (num > 0) { - zend_error_noreturn(E_COMPILE_ERROR, "Namespace declaration statement has to be the very first statement in the script"); + zend_error_noreturn(E_COMPILE_ERROR, "Namespace declaration statement has to be " + "the very first statement in the script"); } } @@ -6344,7 +6353,8 @@ void zend_compile_halt_compiler(zend_ast *ast TSRMLS_DC) { const char const_name[] = "__COMPILER_HALT_OFFSET__"; if (CG(has_bracketed_namespaces) && CG(in_namespace)) { - zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); + zend_error_noreturn(E_COMPILE_ERROR, + "__HALT_COMPILER() can only be used from the outermost scope"); } filename = zend_get_compiled_filename(TSRMLS_C); @@ -6364,7 +6374,7 @@ void zend_compile_binary_op(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&left_node, left_ast TSRMLS_CC); zend_compile_expr(&right_node, right_ast TSRMLS_CC); - emit_op_tmp(result, opcode, &left_node, &right_node TSRMLS_CC); + zend_emit_op_tmp(result, opcode, &left_node, &right_node TSRMLS_CC); } /* We do not use zend_compile_binary_op for this because we want to retain the left-to-right @@ -6379,7 +6389,8 @@ void zend_compile_greater(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&left_node, left_ast TSRMLS_CC); zend_compile_expr(&right_node, right_ast TSRMLS_CC); - emit_op_tmp(result, ast->kind == ZEND_AST_GREATER ? ZEND_IS_SMALLER : ZEND_IS_SMALLER_OR_EQUAL, + zend_emit_op_tmp(result, + ast->kind == ZEND_AST_GREATER ? ZEND_IS_SMALLER : ZEND_IS_SMALLER_OR_EQUAL, &right_node, &left_node TSRMLS_CC); } @@ -6390,7 +6401,7 @@ void zend_compile_unary_op(znode *result, zend_ast *ast TSRMLS_DC) { znode expr_node; zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - emit_op_tmp(result, opcode, &expr_node, NULL TSRMLS_CC); + zend_emit_op_tmp(result, opcode, &expr_node, NULL TSRMLS_CC); } void zend_compile_unary_pm(znode *result, zend_ast *ast TSRMLS_DC) { @@ -6404,7 +6415,7 @@ void zend_compile_unary_pm(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - emit_op_tmp(result, ast->kind == ZEND_AST_UNARY_PLUS ? ZEND_ADD : ZEND_SUB, + zend_emit_op_tmp(result, ast->kind == ZEND_AST_UNARY_PLUS ? ZEND_ADD : ZEND_SUB, &zero_node, &expr_node TSRMLS_CC); } @@ -6421,7 +6432,7 @@ void zend_compile_short_circuiting(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&left_node, left_ast TSRMLS_CC); opnum_jmpz = get_next_op_number(CG(active_op_array)); - opline_jmpz = emit_op(NULL, ast->kind == ZEND_AST_AND ? ZEND_JMPZ_EX : ZEND_JMPNZ_EX, + opline_jmpz = zend_emit_op(NULL, ast->kind == ZEND_AST_AND ? ZEND_JMPZ_EX : ZEND_JMPNZ_EX, &left_node, NULL TSRMLS_CC); if (left_node.op_type == IS_TMP_VAR) { @@ -6434,7 +6445,7 @@ void zend_compile_short_circuiting(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&right_node, right_ast TSRMLS_CC); - opline_bool = emit_op(NULL, ZEND_BOOL, &right_node, NULL TSRMLS_CC); + opline_bool = zend_emit_op(NULL, ZEND_BOOL, &right_node, NULL TSRMLS_CC); SET_NODE(opline_bool->result, result); zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); @@ -6456,7 +6467,7 @@ void zend_compile_post_incdec(znode *result, zend_ast *ast TSRMLS_DC) { GET_NODE(result, opline->result); } else { zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); - emit_op_tmp(result, ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC : ZEND_POST_DEC, + zend_emit_op_tmp(result, ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC : ZEND_POST_DEC, &var_node, NULL TSRMLS_CC); } } @@ -6474,7 +6485,7 @@ void zend_compile_pre_incdec(znode *result, zend_ast *ast TSRMLS_DC) { opline->opcode = ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC_OBJ : ZEND_PRE_DEC_OBJ; } else { zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); - emit_op(result, ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC : ZEND_PRE_DEC, + zend_emit_op(result, ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC : ZEND_PRE_DEC, &var_node, NULL TSRMLS_CC); } } @@ -6486,7 +6497,7 @@ void zend_compile_cast(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - opline = emit_op(result, ZEND_CAST, &expr_node, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_CAST, &expr_node, NULL TSRMLS_CC); opline->extended_value = ast->attr; } @@ -6503,7 +6514,7 @@ static void zend_compile_shorthand_conditional(znode *result, zend_ast *ast TSRM zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); opnum_jmp_set = get_next_op_number(CG(active_op_array)); - emit_op_tmp(result, ZEND_JMP_SET, &cond_node, NULL TSRMLS_CC); + zend_emit_op_tmp(result, ZEND_JMP_SET, &cond_node, NULL TSRMLS_CC); zend_compile_expr(&false_node, false_ast TSRMLS_CC); @@ -6516,9 +6527,9 @@ static void zend_compile_shorthand_conditional(znode *result, zend_ast *ast TSRM opline_jmp_set->result_type = IS_VAR; GET_NODE(result, opline_jmp_set->result); - opline_qm_assign = emit_op(NULL, ZEND_QM_ASSIGN_VAR, &false_node, NULL TSRMLS_CC); + opline_qm_assign = zend_emit_op(NULL, ZEND_QM_ASSIGN_VAR, &false_node, NULL TSRMLS_CC); } else { - opline_qm_assign = emit_op(NULL, ZEND_QM_ASSIGN, &false_node, NULL TSRMLS_CC); + opline_qm_assign = zend_emit_op(NULL, ZEND_QM_ASSIGN, &false_node, NULL TSRMLS_CC); } SET_NODE(opline_qm_assign->result, result); } @@ -6544,7 +6555,7 @@ void zend_compile_conditional(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&true_node, true_ast TSRMLS_CC); opnum_qm_assign1 = get_next_op_number(CG(active_op_array)); - emit_op(result, ZEND_QM_ASSIGN, &true_node, NULL TSRMLS_CC); + zend_emit_op(result, ZEND_QM_ASSIGN, &true_node, NULL TSRMLS_CC); opnum_jmp = zend_emit_jump(0 TSRMLS_CC); @@ -6561,7 +6572,7 @@ void zend_compile_conditional(znode *result, zend_ast *ast TSRMLS_DC) { GET_NODE(result, opline_qm_assign1->result); } - opline_qm_assign2 = emit_op(NULL, opline_qm_assign1->opcode, &false_node, NULL TSRMLS_CC); + opline_qm_assign2 = zend_emit_op(NULL, opline_qm_assign1->opcode, &false_node, NULL TSRMLS_CC); SET_NODE(opline_qm_assign2->result, result); zend_update_jump_target_to_next(opnum_jmp TSRMLS_CC); @@ -6573,7 +6584,7 @@ void zend_compile_print(znode *result, zend_ast *ast TSRMLS_DC) { znode expr_node; zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - emit_op_tmp(result, ZEND_PRINT, &expr_node, NULL TSRMLS_CC); + zend_emit_op_tmp(result, ZEND_PRINT, &expr_node, NULL TSRMLS_CC); } void zend_compile_exit(znode *result, zend_ast *ast TSRMLS_DC) { @@ -6582,9 +6593,9 @@ void zend_compile_exit(znode *result, zend_ast *ast TSRMLS_DC) { if (expr_ast) { znode expr_node; zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - emit_op(NULL, ZEND_EXIT, &expr_node, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_EXIT, &expr_node, NULL TSRMLS_CC); } else { - emit_op(NULL, ZEND_EXIT, NULL, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_EXIT, NULL, NULL TSRMLS_CC); } result->op_type = IS_CONST; @@ -6601,7 +6612,8 @@ void zend_compile_yield(znode *result, zend_ast *ast TSRMLS_DC) { zend_bool returns_by_ref = (CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0; if (!CG(active_op_array)->function_name) { - zend_error_noreturn(E_COMPILE_ERROR, "The \"yield\" expression can only be used inside a function"); + zend_error_noreturn(E_COMPILE_ERROR, + "The \"yield\" expression can only be used inside a function"); } CG(active_op_array)->fn_flags |= ZEND_ACC_GENERATOR; @@ -6620,7 +6632,7 @@ void zend_compile_yield(znode *result, zend_ast *ast TSRMLS_DC) { value_node_ptr = &value_node; } - opline = emit_op(result, ZEND_YIELD, value_node_ptr, key_node_ptr TSRMLS_CC); + opline = zend_emit_op(result, ZEND_YIELD, value_node_ptr, key_node_ptr TSRMLS_CC); if (value_ast && returns_by_ref && zend_is_call(value_ast)) { opline->extended_value = ZEND_RETURNS_FUNCTION; @@ -6643,7 +6655,7 @@ void zend_compile_instanceof(znode *result, zend_ast *ast TSRMLS_DC) { opline = zend_compile_class_ref(&class_node, class_ast TSRMLS_CC); opline->extended_value |= ZEND_FETCH_CLASS_NO_AUTOLOAD; - emit_op_tmp(result, ZEND_INSTANCEOF, &obj_node, &class_node TSRMLS_CC); + zend_emit_op_tmp(result, ZEND_INSTANCEOF, &obj_node, &class_node TSRMLS_CC); } void zend_compile_include_or_eval(znode *result, zend_ast *ast TSRMLS_DC) { @@ -6654,7 +6666,7 @@ void zend_compile_include_or_eval(znode *result, zend_ast *ast TSRMLS_DC) { zend_do_extended_fcall_begin(TSRMLS_C); zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - opline = emit_op(result, ZEND_INCLUDE_OR_EVAL, &expr_node, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_INCLUDE_OR_EVAL, &expr_node, NULL TSRMLS_CC); opline->extended_value = ast->attr; zend_do_extended_fcall_end(TSRMLS_C); @@ -6684,7 +6696,7 @@ void zend_compile_isset_or_empty(znode *result, zend_ast *ast TSRMLS_DC) { switch (var_ast->kind) { case ZEND_AST_VAR: if (zend_try_compile_cv(&var_node, var_ast TSRMLS_CC) == SUCCESS) { - opline = emit_op(result, ZEND_ISSET_ISEMPTY_VAR, &var_node, NULL TSRMLS_CC); + opline = zend_emit_op(result, ZEND_ISSET_ISEMPTY_VAR, &var_node, NULL TSRMLS_CC); opline->extended_value = ZEND_FETCH_LOCAL | ZEND_QUICK_SET; } else { opline = zend_compile_simple_var_no_cv(result, var_ast, BP_VAR_IS TSRMLS_CC); @@ -6714,7 +6726,7 @@ void zend_compile_silence(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *expr_ast = ast->child[0]; znode silence_node; - emit_op_tmp(&silence_node, ZEND_BEGIN_SILENCE, NULL, NULL TSRMLS_CC); + zend_emit_op_tmp(&silence_node, ZEND_BEGIN_SILENCE, NULL, NULL TSRMLS_CC); if (expr_ast->kind == ZEND_AST_VAR) { /* For @$var we need to force a FETCH instruction, otherwise the CV access will @@ -6724,7 +6736,7 @@ void zend_compile_silence(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(result, expr_ast TSRMLS_CC); } - emit_op(NULL, ZEND_END_SILENCE, &silence_node, NULL TSRMLS_CC); + zend_emit_op(NULL, ZEND_END_SILENCE, &silence_node, NULL TSRMLS_CC); } void zend_compile_shell_exec(znode *result, zend_ast *ast TSRMLS_DC) { @@ -6772,10 +6784,11 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { } if (i == 0) { - opline = emit_op_tmp(result, ZEND_INIT_ARRAY, &value_node, key_node_ptr TSRMLS_CC); + opline = zend_emit_op_tmp(result, ZEND_INIT_ARRAY, &value_node, key_node_ptr TSRMLS_CC); opline->extended_value = list->children << ZEND_ARRAY_SIZE_SHIFT; } else { - opline = emit_op(NULL, ZEND_ADD_ARRAY_ELEMENT, &value_node, key_node_ptr TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_ADD_ARRAY_ELEMENT, + &value_node, key_node_ptr TSRMLS_CC); SET_NODE(opline->result, result); } opline->extended_value |= by_ref; @@ -6790,7 +6803,7 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { /* Handle empty array */ if (!list->children) { - emit_op_tmp(result, ZEND_INIT_ARRAY, NULL, NULL TSRMLS_CC); + zend_emit_op_tmp(result, ZEND_INIT_ARRAY, NULL, NULL TSRMLS_CC); } /* Add a flag to INIT_ARRAY if we know this array cannot be packed */ @@ -6816,7 +6829,7 @@ void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { return; } - opline = emit_op_tmp(result, ZEND_FETCH_CONSTANT, NULL, NULL TSRMLS_CC); + opline = zend_emit_op_tmp(result, ZEND_FETCH_CONSTANT, NULL, NULL TSRMLS_CC); opline->op2_type = IS_CONST; if (is_fully_qualified) { @@ -6852,7 +6865,7 @@ void zend_compile_class_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&const_node, const_ast TSRMLS_CC); - opline = emit_op_tmp(result, ZEND_FETCH_CONSTANT, NULL, &const_node TSRMLS_CC); + opline = zend_emit_op_tmp(result, ZEND_FETCH_CONSTANT, NULL, &const_node TSRMLS_CC); zend_set_class_name_op1(opline, &class_node TSRMLS_CC); @@ -7541,7 +7554,9 @@ void zend_eval_const_array(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *key_ast = elem_ast->child[1]; zend_bool by_ref = elem_ast->attr; - if (by_ref || (key_ast && key_ast->kind != ZEND_AST_ZVAL) || value_ast->kind != ZEND_AST_ZVAL) { + if (by_ref || (key_ast && key_ast->kind != ZEND_AST_ZVAL) + || value_ast->kind != ZEND_AST_ZVAL + ) { return; } } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 20c2e19c44..e3d166037b 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -647,11 +647,9 @@ trait_precedence: trait_alias: trait_method_reference T_AS trait_modifiers T_STRING - { $$.ast = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, - $3.num, $1.ast, $4.ast); } + { $$.ast = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, $3.num, $1.ast, $4.ast); } | trait_method_reference T_AS member_modifier - { $$.ast = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, - $3.num, $1.ast, NULL); } + { $$.ast = zend_ast_create_ex(ZEND_AST_TRAIT_ALIAS, $3.num, $1.ast, NULL); } ; trait_method_reference: -- cgit v1.2.1 From 8c724c205d81b2477883c6c10f553b8fa9fc9f38 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 22:07:11 +0200 Subject: Use zend_str_equals more often --- Zend/zend_compile.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8506a82853..85f401f440 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3543,7 +3543,7 @@ static int zend_try_compile_cv(znode *result, zend_ast *ast TSRMLS_DC) { result->op_type = IS_CV; result->u.op.var = lookup_cv(CG(active_op_array), name TSRMLS_CC); - if (name->len == sizeof("this") - 1 && !memcmp(name->val, "this", sizeof("this") - 1)) { + if (zend_str_equals(name, "this")) { CG(active_op_array)->this_var = result->u.op.var; } return SUCCESS; @@ -3634,8 +3634,7 @@ static zend_bool is_this_fetch(zend_ast *ast) { } zval *name = zend_ast_get_zval(ast->child[0]); - return Z_TYPE_P(name) == IS_STRING && Z_STRLEN_P(name) == sizeof("this") - 1 - && !memcmp(Z_STRVAL_P(name), "this", sizeof("this") - 1); + return Z_TYPE_P(name) == IS_STRING && zend_str_equals(Z_STR_P(name), "this"); } zend_op *zend_compile_prop_common(znode *result, zend_ast *ast, int type TSRMLS_DC) { @@ -4353,11 +4352,7 @@ void zend_compile_method_call(znode *result, zend_ast *ast, int type TSRMLS_DC) } zend_bool zend_is_constructor(zend_string *name) { - char *lcname = zend_str_tolower_dup(name->val, name->len); - zend_bool is_ctor = name->len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME) - 1 && - !memcmp(lcname, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME) - 1); - efree(lcname); - return is_ctor; + return zend_str_equals_ci(name, ZEND_CONSTRUCTOR_FUNC_NAME); } void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { @@ -5211,9 +5206,7 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { if (EX_VAR_TO_NUM(var_node.u.op.var) != i) { zend_error_noreturn(E_COMPILE_ERROR, "Redefinition of parameter %s", name->val); - } else if (name->len == sizeof("this") - 1 - && !memcmp(name->val, "this", sizeof("this") - 1) - ) { + } else if (zend_str_equals(name, "this")) { if (op_array->scope && (op_array->fn_flags & ZEND_ACC_STATIC) == 0) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); } -- cgit v1.2.1 From c8d3b5909e6a1dbc95a8aa0fb19fbaae0e2e1253 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 22:16:24 +0200 Subject: zend_str_equals_str(_ci) --- Zend/zend_compile.c | 56 ++++++++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 85f401f440..ea9d0e965c 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3292,6 +3292,14 @@ ZEND_API size_t zend_dirname(char *path, size_t len) } /* }}} */ +static inline zend_bool zend_str_equals_str(zend_string *str1, zend_string *str2) { + return str1->len == str2->len && !memcmp(str1->val, str2->val, str2->len); +} +static inline zend_bool zend_str_equals_str_ci(zend_string *str1, zend_string *str2) { + return str1->len == str2->len + && !zend_binary_strcasecmp(str1->val, str1->len, str2->val, str2->len); +} + static inline zend_bool zend_str_equals(zend_string *str, char *c) { size_t len = strlen(c); return str->len == len && !memcmp(str->val, c, len); @@ -3779,7 +3787,7 @@ zend_bool zend_is_assign_to_self(zend_ast *var_ast, zend_ast *expr_ast TSRMLS_DC { zend_string *name1 = zval_get_string(zend_ast_get_zval(var_ast->child[0])); zend_string *name2 = zval_get_string(zend_ast_get_zval(expr_ast->child[0])); - zend_bool result = name1->len == name2->len && !memcmp(name1->val, name2->val, name1->len); + zend_bool result = zend_str_equals_str(name1, name2); STR_RELEASE(name1); STR_RELEASE(name2); return result; @@ -5430,13 +5438,7 @@ void zend_begin_method_decl( } } } else { - ALLOCA_FLAG(use_heap); - char *class_lcname = do_alloca(ce->name->len + 1, use_heap); - zend_str_tolower_copy(class_lcname, ce->name->val, ce->name->len); - - if (!in_trait && lcname->len == ce->name->len - && !memcmp(class_lcname, lcname->val, lcname->len) - ) { + if (!in_trait && zend_str_equals_str_ci(lcname, ce->name)) { if (!ce->constructor) { ce->constructor = (zend_function *) op_array; } @@ -5506,8 +5508,6 @@ void zend_begin_method_decl( } else if (!is_static) { op_array->fn_flags |= ZEND_ACC_ALLOW_STATIC; } - - free_alloca(class_lcname, use_heap); } STR_RELEASE(lcname); @@ -5527,17 +5527,9 @@ static void zend_begin_func_decl( if (CG(current_import_function)) { zend_string *import_name = zend_hash_find_ptr(CG(current_import_function), lcname); - if (import_name) { - char *import_name_lc = zend_str_tolower_dup(import_name->val, import_name->len); - - if (import_name->len != name->len - || memcmp(import_name_lc, lcname->val, name->len) - ) { - zend_error(E_COMPILE_ERROR, "Cannot declare function %s " - "because the name is already in use", name->val); - } - - efree(import_name_lc); + if (import_name && !zend_str_equals_str_ci(lcname, import_name)) { + zend_error(E_COMPILE_ERROR, "Cannot declare function %s " + "because the name is already in use", name->val); } } @@ -5930,15 +5922,9 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { STR_ADDREF(name); } - if (import_name) { - char *import_name_lc = zend_str_tolower_dup(import_name->val, import_name->len); - if (lcname->len != import_name->len - || memcmp(import_name_lc, lcname->val, lcname->len) - ) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare class %s " - "because the name is already in use", name->val); - } - efree(import_name_lc); + if (import_name && !zend_str_equals_str_ci(lcname, import_name)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare class %s " + "because the name is already in use", name->val); } name = zend_new_interned_string(name TSRMLS_CC); @@ -6101,12 +6087,8 @@ static char *zend_get_use_type_str(zend_uint type) { static void zend_check_already_in_use( zend_uint type, zend_string *old_name, zend_string *new_name, zend_string *check_name ) { - if (old_name->len == check_name->len) { - char *old_name_lc = zend_str_tolower_dup(old_name->val, old_name->len); - if (!memcmp(old_name_lc, check_name->val, check_name->len)) { - efree(old_name_lc); - return; - } + if (zend_str_equals_str_ci(old_name, check_name)) { + return; } zend_error_noreturn(E_COMPILE_ERROR, "Cannot use%s %s as %s because the name " @@ -6253,7 +6235,7 @@ void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { 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)) { + if (!zend_str_equals_str(import_name, name)) { zend_error(E_COMPILE_ERROR, "Cannot declare const %s because " "the name is already in use", name->val); } -- cgit v1.2.1 From e9fb72c8eab7a1f5cc89dae6b2951bcbba6c49f3 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 22:20:43 +0200 Subject: Rename to zend_str_equals_literal and turn into a macro So we can make of sizeof rather than strlen --- Zend/zend_compile.c | 101 +++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ea9d0e965c..12fd046272 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3300,14 +3300,11 @@ static inline zend_bool zend_str_equals_str_ci(zend_string *str1, zend_string *s && !zend_binary_strcasecmp(str1->val, str1->len, str2->val, str2->len); } -static inline zend_bool zend_str_equals(zend_string *str, char *c) { - size_t len = strlen(c); - return str->len == len && !memcmp(str->val, c, len); -} -static inline zend_bool zend_str_equals_ci(zend_string *str, char *c) { - size_t len = strlen(c); - return str->len == len && !zend_binary_strcasecmp(str->val, len, c, len); -} +#define zend_str_equals_literal(str, c) \ + ((str)->len == sizeof(c) - 1 && !memcmp((str)->val, (c), sizeof(c) - 1)) +#define zend_str_equals_literal_ci(str, c) \ + ((str)->len == sizeof(c) - 1 \ + && !zend_binary_strcasecmp((str)->val, (str)->len, (c), sizeof(c) - 1)) static void zend_adjust_for_fetch_type(zend_op *opline, zend_uint type) { switch (type & BP_VAR_MASK) { @@ -3551,7 +3548,7 @@ static int zend_try_compile_cv(znode *result, zend_ast *ast TSRMLS_DC) { result->op_type = IS_CV; result->u.op.var = lookup_cv(CG(active_op_array), name TSRMLS_CC); - if (zend_str_equals(name, "this")) { + if (zend_str_equals_literal(name, "this")) { CG(active_op_array)->this_var = result->u.op.var; } return SUCCESS; @@ -3642,7 +3639,7 @@ static zend_bool is_this_fetch(zend_ast *ast) { } zval *name = zend_ast_get_zval(ast->child[0]); - return Z_TYPE_P(name) == IS_STRING && zend_str_equals(Z_STR_P(name), "this"); + return Z_TYPE_P(name) == IS_STRING && zend_str_equals_literal(Z_STR_P(name), "this"); } zend_op *zend_compile_prop_common(znode *result, zend_ast *ast, int type TSRMLS_DC) { @@ -4250,29 +4247,29 @@ int zend_compile_func_cuf(znode *result, zend_ast_list *args, zend_string *lcnam int zend_try_compile_special_func( znode *result, zend_string *lcname, zend_ast_list *args TSRMLS_DC ) { - if (zend_str_equals(lcname, "strlen")) { + if (zend_str_equals_literal(lcname, "strlen")) { return zend_compile_func_strlen(result, args TSRMLS_CC); - } else if (zend_str_equals(lcname, "is_null")) { + } else if (zend_str_equals_literal(lcname, "is_null")) { return zend_compile_func_typecheck(result, args, IS_NULL TSRMLS_CC); - } else if (zend_str_equals(lcname, "is_bool")) { + } else if (zend_str_equals_literal(lcname, "is_bool")) { return zend_compile_func_typecheck(result, args, _IS_BOOL TSRMLS_CC); - } else if (zend_str_equals(lcname, "is_long")) { + } else if (zend_str_equals_literal(lcname, "is_long")) { return zend_compile_func_typecheck(result, args, IS_LONG TSRMLS_CC); - } else if (zend_str_equals(lcname, "is_float")) { + } else if (zend_str_equals_literal(lcname, "is_float")) { return zend_compile_func_typecheck(result, args, IS_DOUBLE TSRMLS_CC); - } else if (zend_str_equals(lcname, "is_string")) { + } else if (zend_str_equals_literal(lcname, "is_string")) { return zend_compile_func_typecheck(result, args, IS_STRING TSRMLS_CC); - } else if (zend_str_equals(lcname, "is_array")) { + } else if (zend_str_equals_literal(lcname, "is_array")) { return zend_compile_func_typecheck(result, args, IS_ARRAY TSRMLS_CC); - } else if (zend_str_equals(lcname, "is_object")) { + } else if (zend_str_equals_literal(lcname, "is_object")) { return zend_compile_func_typecheck(result, args, IS_OBJECT TSRMLS_CC); - } else if (zend_str_equals(lcname, "is_resource")) { + } else if (zend_str_equals_literal(lcname, "is_resource")) { return zend_compile_func_typecheck(result, args, IS_RESOURCE TSRMLS_CC); - } else if (zend_str_equals(lcname, "defined")) { + } else if (zend_str_equals_literal(lcname, "defined")) { return zend_compile_func_defined(result, args TSRMLS_CC); - } else if (zend_str_equals(lcname, "call_user_func_array")) { + } else if (zend_str_equals_literal(lcname, "call_user_func_array")) { return zend_compile_func_cufa(result, args, lcname TSRMLS_CC); - } else if (zend_str_equals(lcname, "call_user_func")) { + } else if (zend_str_equals_literal(lcname, "call_user_func")) { return zend_compile_func_cuf(result, args, lcname TSRMLS_CC); } else { return FAILURE; @@ -4360,7 +4357,7 @@ void zend_compile_method_call(znode *result, zend_ast *ast, int type TSRMLS_DC) } zend_bool zend_is_constructor(zend_string *name) { - return zend_str_equals_ci(name, ZEND_CONSTRUCTOR_FUNC_NAME); + return zend_str_equals_literal_ci(name, ZEND_CONSTRUCTOR_FUNC_NAME); } void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { @@ -5102,10 +5099,10 @@ void zend_compile_declare(zend_ast *ast TSRMLS_DC) { _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); - if (zend_str_equals_ci(name, "ticks")) { + if (zend_str_equals_literal_ci(name, "ticks")) { convert_to_long(&value_zv); ZVAL_COPY_VALUE(&CG(declarables).ticks, &value_zv); - } else if (zend_str_equals_ci(name, "encoding")) { + } else if (zend_str_equals_literal_ci(name, "encoding")) { if (Z_TYPE(value_zv) == IS_CONSTANT) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use constants as encoding"); } @@ -5214,7 +5211,7 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { if (EX_VAR_TO_NUM(var_node.u.op.var) != i) { zend_error_noreturn(E_COMPILE_ERROR, "Redefinition of parameter %s", name->val); - } else if (zend_str_equals(name, "this")) { + } else if (zend_str_equals_literal(name, "this")) { if (op_array->scope && (op_array->fn_flags & ZEND_ACC_STATIC) == 0) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); } @@ -5321,7 +5318,7 @@ void zend_compile_closure_uses(zend_ast *ast TSRMLS_DC) { zend_bool by_ref = var_ast->attr; zval zv; - if (zend_str_equals(name, "this")) { + if (zend_str_equals_literal(name, "this")) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use $this as lexical variable"); } @@ -5391,47 +5388,47 @@ void zend_begin_method_decl( } if (in_interface) { - if (zend_str_equals(lcname, ZEND_CALL_FUNC_NAME)) { + if (zend_str_equals_literal(lcname, ZEND_CALL_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __call() must have " "public visibility and cannot be static"); } - } else if (zend_str_equals(lcname, ZEND_CALLSTATIC_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_CALLSTATIC_FUNC_NAME)) { if (!is_public || !is_static) { zend_error(E_WARNING, "The magic method __callStatic() must have " "public visibility and be static"); } - } else if (zend_str_equals(lcname, ZEND_GET_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_GET_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __get() must have " "public visibility and cannot be static"); } - } else if (zend_str_equals(lcname, ZEND_SET_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_SET_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __set() must have " "public visibility and cannot be static"); } - } else if (zend_str_equals(lcname, ZEND_UNSET_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_UNSET_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __unset() must have " "public visibility and cannot be static"); } - } else if (zend_str_equals(lcname, ZEND_ISSET_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_ISSET_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __isset() must have " "public visibility and cannot be static"); } - } else if (zend_str_equals(lcname, ZEND_TOSTRING_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_TOSTRING_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __toString() must have " "public visibility and cannot be static"); } - } else if (zend_str_equals(lcname, ZEND_INVOKE_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_INVOKE_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __invoke() must have " "public visibility and cannot be static"); } - } else if (zend_str_equals(lcname, ZEND_DEBUGINFO_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_DEBUGINFO_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __debugInfo() must have " "public visibility and cannot be static"); @@ -5442,64 +5439,64 @@ void zend_begin_method_decl( if (!ce->constructor) { ce->constructor = (zend_function *) op_array; } - } else if (zend_str_equals(lcname, ZEND_CONSTRUCTOR_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_CONSTRUCTOR_FUNC_NAME)) { if (CG(active_class_entry)->constructor) { zend_error(E_STRICT, "Redefining already defined constructor for class %s", ce->name->val); } ce->constructor = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_DESTRUCTOR_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_DESTRUCTOR_FUNC_NAME)) { ce->destructor = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_CLONE_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_CLONE_FUNC_NAME)) { ce->clone = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_CALL_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_CALL_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __call() must have " "public visibility and cannot be static"); } ce->__call = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_CALLSTATIC_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_CALLSTATIC_FUNC_NAME)) { if (!is_public || !is_static) { zend_error(E_WARNING, "The magic method __callStatic() must have " "public visibility and be static"); } ce->__callstatic = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_GET_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_GET_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __get() must have " "public visibility and cannot be static"); } ce->__get = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_SET_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_SET_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __set() must have " "public visibility and cannot be static"); } ce->__set = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_UNSET_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_UNSET_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __unset() must have " "public visibility and cannot be static"); } ce->__unset = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_ISSET_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_ISSET_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __isset() must have " "public visibility and cannot be static"); } ce->__isset = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_TOSTRING_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_TOSTRING_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __toString() must have " "public visibility and cannot be static"); } ce->__tostring = (zend_function *) op_array; - } else if (zend_str_equals(lcname, ZEND_INVOKE_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_INVOKE_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __invoke() must have " "public visibility and cannot be static"); } - } else if (zend_str_equals(lcname, ZEND_DEBUGINFO_FUNC_NAME)) { + } else if (zend_str_equals_literal(lcname, ZEND_DEBUGINFO_FUNC_NAME)) { if (!is_public || is_static) { zend_error(E_WARNING, "The magic method __debugInfo() must have " "public visibility and cannot be static"); @@ -5533,7 +5530,7 @@ static void zend_begin_func_decl( } } - if (zend_str_equals(lcname, ZEND_AUTOLOAD_FUNC_NAME) + if (zend_str_equals_literal(lcname, ZEND_AUTOLOAD_FUNC_NAME) && zend_ast_get_list(params_ast)->children != 1 ) { zend_error_noreturn(E_COMPILE_ERROR, "%s() must take exactly 1 argument", @@ -6122,7 +6119,7 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { new_name = STR_COPY(old_name); if (!current_ns) { - if (type == T_CLASS && zend_str_equals(new_name, "strict")) { + if (type == T_CLASS && zend_str_equals_literal(new_name, "strict")) { zend_error_noreturn(E_COMPILE_ERROR, "You seem to be trying to use a different language..."); } @@ -6140,8 +6137,8 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { zend_str_tolower_copy(lookup_name->val, new_name->val, new_name->len); } - if (type == T_CLASS - && (zend_str_equals(lookup_name, "self") || zend_str_equals(lookup_name, "parent")) + if (type == T_CLASS && (zend_str_equals_literal(lookup_name, "self") + || zend_str_equals_literal(lookup_name, "parent")) ) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use %s as %s because '%s' " "is a special class name", old_name->val, new_name->val, new_name->val); -- cgit v1.2.1 From 047a994830e87291d7446c41df9cc1ba9851dee4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 22:30:24 +0200 Subject: For filenames a pointer comparison is sufficient --- Zend/zend_compile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 12fd046272..6d0886057b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6171,7 +6171,7 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { { zend_function *fn = zend_hash_find_ptr(CG(function_table), lookup_name); if (fn && fn->type == ZEND_USER_FUNCTION - && !strcmp(fn->op_array.filename->val, CG(compiled_filename)->val) + && fn->op_array.filename == CG(compiled_filename) ) { zend_check_already_in_use(type, old_name, new_name, lookup_name); } @@ -6180,7 +6180,7 @@ void zend_compile_use(zend_ast *ast TSRMLS_DC) { case T_CONST: { zend_string *filename = zend_hash_find_ptr(&CG(const_filenames), lookup_name); - if (filename && !strcmp(filename->val, CG(compiled_filename)->val)) { + if (filename && filename == CG(compiled_filename)) { zend_check_already_in_use(type, old_name, new_name, lookup_name); } break; -- cgit v1.2.1 From 18f068077994774267912b6694bf1e4aae3eaa7b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 28 Jul 2014 22:38:26 +0200 Subject: Change current_namespace to a zend_string* --- Zend/zend_compile.c | 42 ++++++++++++++++++++---------------------- Zend/zend_globals.h | 2 +- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 6d0886057b..2b4055c736 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -200,7 +200,7 @@ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */ CG(active_class_entry) = NULL; CG(in_compilation) = 0; CG(start_lineno) = 0; - ZVAL_UNDEF(&CG(current_namespace)); + CG(current_namespace) = NULL; CG(in_namespace) = 0; CG(has_bracketed_namespaces) = 0; CG(current_import) = NULL; @@ -660,8 +660,8 @@ zend_string *zend_concat_names(char *name1, size_t name1_len, char *name2, size_ } zend_string *zend_prefix_with_ns(zend_string *name TSRMLS_DC) { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - zend_string *ns = Z_STR(CG(current_namespace)); + if (CG(current_namespace)) { + zend_string *ns = CG(current_namespace); return zend_concat_names(ns->val, ns->len, name->val, name->len); } else { return STR_COPY(name); @@ -3129,9 +3129,9 @@ static void zend_reset_import_tables(TSRMLS_D) { static void zend_end_namespace(TSRMLS_D) { CG(in_namespace) = 0; zend_reset_import_tables(TSRMLS_C); - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - zval_dtor(&CG(current_namespace)); - ZVAL_UNDEF(&CG(current_namespace)); + if (CG(current_namespace)) { + STR_RELEASE(CG(current_namespace)); + CG(current_namespace) = NULL; } } @@ -4042,7 +4042,7 @@ zend_bool zend_compile_function_name(znode *name_node, zend_ast *name_ast TSRMLS ZVAL_STR(&name_node->u.constant, zend_resolve_function_name( orig_name, name_ast->attr, &is_fully_qualified TSRMLS_CC)); - return !is_fully_qualified && Z_TYPE(CG(current_namespace)) != IS_UNDEF; + return !is_fully_qualified && CG(current_namespace); } void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *args_ast TSRMLS_DC) { @@ -5908,9 +5908,8 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { import_name = zend_hash_find_ptr(CG(current_import), lcname); } - 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); + if (CG(current_namespace)) { + name = zend_prefix_with_ns(name TSRMLS_CC); STR_RELEASE(lcname); lcname = STR_ALLOC(name->len, 0); @@ -6095,8 +6094,7 @@ static void zend_check_already_in_use( void zend_compile_use(zend_ast *ast TSRMLS_DC) { zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; - zend_string *current_ns = Z_TYPE(CG(current_namespace)) != IS_UNDEF - ? Z_STR(CG(current_namespace)) : NULL; + zend_string *current_ns = CG(current_namespace); zend_uint type = ast->attr; HashTable *current_import = zend_get_import_ht(type TSRMLS_CC); zend_bool case_sensitive = type == T_CONST; @@ -6255,7 +6253,7 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { /* handle mixed syntax declaration or nested namespaces */ if (!CG(has_bracketed_namespaces)) { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + if (CG(current_namespace)) { /* previous namespace declarations were unbracketed */ if (with_bracket) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot mix bracketed namespace declarations " @@ -6267,12 +6265,12 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { if (!with_bracket) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot mix bracketed namespace declarations " "with unbracketed namespace declarations"); - } else if (Z_TYPE(CG(current_namespace)) != IS_UNDEF || CG(in_namespace)) { + } else if (CG(current_namespace) || CG(in_namespace)) { zend_error_noreturn(E_COMPILE_ERROR, "Namespace declarations cannot be nested"); } } - if (((!with_bracket && Z_TYPE(CG(current_namespace)) == IS_UNDEF) + if (((!with_bracket && !CG(current_namespace)) || (with_bracket && !CG(has_bracketed_namespaces))) && CG(active_op_array)->last > 0 ) { /* ignore ZEND_EXT_STMT and ZEND_TICKS */ @@ -6288,8 +6286,8 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { } } - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - zval_dtor(&CG(current_namespace)); + if (CG(current_namespace)) { + STR_RELEASE(CG(current_namespace)); } if (name_ast) { @@ -6299,9 +6297,9 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as namespace name", name->val); } - ZVAL_STR(&CG(current_namespace), STR_COPY(name)); + CG(current_namespace) = STR_COPY(name); } else { - ZVAL_UNDEF(&CG(current_namespace)); + CG(current_namespace) = NULL; } zend_reset_import_tables(TSRMLS_C); @@ -6809,7 +6807,7 @@ void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { CG(active_op_array), &resolved_name, 0 TSRMLS_CC); } else { opline->extended_value = IS_CONSTANT_UNQUALIFIED; - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + if (CG(current_namespace)) { opline->extended_value |= IS_CONSTANT_IN_NAMESPACE; opline->op2.constant = zend_add_const_name_literal( CG(active_op_array), &resolved_name, 1 TSRMLS_CC); @@ -6985,8 +6983,8 @@ zend_bool zend_try_ct_compile_magic_const(zval *zv, zend_ast *ast TSRMLS_DC) { } break; case T_NS_C: - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - ZVAL_DUP(zv, &CG(current_namespace)); + if (CG(current_namespace)) { + ZVAL_STR(zv, STR_COPY(CG(current_namespace))); } else { ZVAL_EMPTY_STRING(zv); } diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index f327493a4b..45119218bb 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -115,7 +115,7 @@ struct _zend_compiler_globals { zend_uint compiler_options; /* set of ZEND_COMPILE_* constants */ - zval current_namespace; + zend_string *current_namespace; HashTable *current_import; HashTable *current_import_function; HashTable *current_import_const; -- cgit v1.2.1 From 438b1e3d42a5605bfa12a9282590894205c9b057 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 29 Jul 2014 20:01:11 +0200 Subject: build_runtime_definition_key returns zend_string* --- Zend/zend_compile.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2b4055c736..a144c6d11b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -153,13 +153,14 @@ static zend_string *zend_new_interned_string_safe(zend_string *str TSRMLS_DC) { } } -static void build_runtime_defined_function_key(zval *result, zend_string *name, unsigned char *lex_pos TSRMLS_DC) /* {{{ */ -{ +static zend_string *zend_build_runtime_definition_key( + zend_string *name, unsigned char *lex_pos TSRMLS_DC +) { + zend_string *result; char char_pos_buf[32]; - uint char_pos_len; - const char *filename; + size_t char_pos_len = zend_sprintf(char_pos_buf, "%p", lex_pos); - char_pos_len = zend_sprintf(char_pos_buf, "%p", lex_pos); + const char *filename; if (CG(active_op_array)->filename) { filename = CG(active_op_array)->filename->val; } else { @@ -167,13 +168,12 @@ static void build_runtime_defined_function_key(zval *result, zend_string *name, } /* NULL, name length, filename length, last accepting char position length */ - ZVAL_NEW_STR(result, STR_ALLOC(1 + name->len + strlen(filename) + char_pos_len, 0)); + result = STR_ALLOC(1 + name->len + strlen(filename) + char_pos_len, 0); - /* must be binary safe */ - Z_STRVAL_P(result)[0] = '\0'; - sprintf(Z_STRVAL_P(result)+1, "%s%s%s", name->val, filename, char_pos_buf); + result->val[0] = '\0'; + sprintf(result->val + 1, "%s%s%s", name->val, filename, char_pos_buf); + return result; } -/* }}} */ static void init_compiler_declarables(TSRMLS_D) /* {{{ */ { @@ -5547,13 +5547,12 @@ static void zend_begin_func_decl( } { - zval key; - build_runtime_defined_function_key(&key, lcname, decl->lex_pos TSRMLS_CC); + zend_string *key = zend_build_runtime_definition_key(lcname, decl->lex_pos TSRMLS_CC); opline->op1_type = IS_CONST; - opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); + LITERAL_STR(opline->op1, key); - zend_hash_update_ptr(CG(function_table), Z_STR(key), op_array); + zend_hash_update_ptr(CG(function_table), key, op_array); } STR_RELEASE(lcname); @@ -5973,12 +5972,12 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { } { - zval key; - build_runtime_defined_function_key(&key, lcname, decl->lex_pos TSRMLS_CC); + zend_string *key = zend_build_runtime_definition_key(lcname, decl->lex_pos TSRMLS_CC); + opline->op1_type = IS_CONST; - opline->op1.constant = zend_add_literal(CG(active_op_array), &key TSRMLS_CC); + LITERAL_STR(opline->op1, key); - zend_hash_update_ptr(CG(class_table), Z_STR(key), ce); + zend_hash_update_ptr(CG(class_table), key, ce); } CG(active_class_entry) = ce; -- cgit v1.2.1 From 763eb13d6e8979c6c3f5416fbeb0f7031e94a61b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 29 Jul 2014 21:00:19 +0200 Subject: Formatting --- Zend/zend_compile.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a144c6d11b..7cdc8efefb 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6422,19 +6422,16 @@ void zend_compile_short_circuiting(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_post_incdec(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; - - znode var_node; - zend_op *opline; - ZEND_ASSERT(ast->kind == ZEND_AST_POST_INC || ast->kind == ZEND_AST_POST_DEC); if (var_ast->kind == ZEND_AST_PROP) { - opline = zend_compile_prop_common(NULL, var_ast, BP_VAR_RW TSRMLS_CC); + zend_op *opline = zend_compile_prop_common(NULL, var_ast, BP_VAR_RW TSRMLS_CC); opline->opcode = ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC_OBJ : ZEND_POST_DEC_OBJ; opline->result_type = IS_TMP_VAR; opline->result.var = get_temporary_variable(CG(active_op_array)); GET_NODE(result, opline->result); } else { + znode var_node; zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); zend_emit_op_tmp(result, ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC : ZEND_POST_DEC, &var_node, NULL TSRMLS_CC); @@ -6443,16 +6440,13 @@ void zend_compile_post_incdec(znode *result, zend_ast *ast TSRMLS_DC) { void zend_compile_pre_incdec(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; - - znode var_node; - zend_op *opline; - ZEND_ASSERT(ast->kind == ZEND_AST_PRE_INC || ast->kind == ZEND_AST_PRE_DEC); if (var_ast->kind == ZEND_AST_PROP) { - opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); + zend_op *opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); opline->opcode = ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC_OBJ : ZEND_PRE_DEC_OBJ; } else { + znode var_node; zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); zend_emit_op(result, ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC : ZEND_PRE_DEC, &var_node, NULL TSRMLS_CC); -- cgit v1.2.1 From 6a13a22f9d2118801a7548c329307f89885eff3a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 29 Jul 2014 23:17:54 +0200 Subject: Fix segfault when class name evaluates to IS_CONST --- Zend/zend_compile.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7cdc8efefb..086ee0b3be 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3513,21 +3513,25 @@ static void zend_set_class_name_op1(zend_op *opline, znode *class_node TSRMLS_DC static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_DC) { zend_op *opline; + znode name_node; + zend_compile_expr(&name_node, name_ast TSRMLS_CC); - if (name_ast->kind == ZEND_AST_ZVAL) { - zend_uint fetch_type = zend_get_class_fetch_type(zend_ast_get_str(name_ast)); + if (name_node.op_type == IS_CONST) { + zend_string *name = Z_STR(name_node.u.constant); + zend_uint fetch_type = zend_get_class_fetch_type(name); opline = zend_emit_op(result, ZEND_FETCH_CLASS, NULL, NULL TSRMLS_CC); opline->extended_value = fetch_type; if (fetch_type == ZEND_FETCH_CLASS_DEFAULT) { + zend_uint type = name_ast->kind == ZEND_AST_ZVAL ? name_ast->attr : ZEND_NAME_FQ; opline->op2_type = IS_CONST; opline->op2.constant = zend_add_class_name_literal(CG(active_op_array), - zend_resolve_class_name_ast(name_ast TSRMLS_CC) TSRMLS_CC); + zend_resolve_class_name(name, type TSRMLS_CC) TSRMLS_CC); } + + STR_RELEASE(name); } else { - znode name_node; - zend_compile_expr(&name_node, name_ast TSRMLS_CC); opline = zend_emit_op(result, ZEND_FETCH_CLASS, NULL, &name_node TSRMLS_CC); opline->extended_value = ZEND_FETCH_CLASS_DEFAULT; } -- cgit v1.2.1 From 8cab06f09b107d62bacd4bb70c01b94217179b45 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 29 Jul 2014 23:22:23 +0200 Subject: Immutablize constant leaf arrays Still haven't entirely figured out how to elegantly handle the recursive variant. --- Zend/zend_compile.c | 392 +++++++++++++++++++++++++++------------------------- 1 file changed, 202 insertions(+), 190 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 086ee0b3be..e6422100ad 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6338,6 +6338,145 @@ void zend_compile_halt_compiler(zend_ast *ast TSRMLS_DC) { STR_RELEASE(name); } +zend_bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast TSRMLS_DC) { + zend_op_array *op_array = CG(active_op_array); + zend_class_entry *ce = CG(active_class_entry); + + switch (ast->attr) { + case T_FUNC_C: + if (op_array && op_array->function_name) { + ZVAL_STR(zv, STR_COPY(op_array->function_name)); + } else { + ZVAL_EMPTY_STRING(zv); + } + break; + case T_METHOD_C: + if (ce) { + if (op_array && op_array->function_name) { + ZVAL_STR(zv, zend_concat3(ce->name->val, ce->name->len, "::", 2, + op_array->function_name->val, op_array->function_name->len)); + } else { + ZVAL_STR(zv, STR_COPY(ce->name)); + } + } else if (op_array && op_array->function_name) { + ZVAL_STR(zv, STR_COPY(op_array->function_name)); + } else { + ZVAL_EMPTY_STRING(zv); + } + break; + case T_CLASS_C: + if (ce) { + if (ZEND_CE_IS_TRAIT(ce)) { + return 0; + } else { + ZVAL_STR(zv, STR_COPY(ce->name)); + } + } else { + ZVAL_EMPTY_STRING(zv); + } + break; + case T_TRAIT_C: + if (ce && ZEND_CE_IS_TRAIT(ce)) { + ZVAL_STR(zv, STR_COPY(ce->name)); + } else { + ZVAL_EMPTY_STRING(zv); + } + break; + case T_NS_C: + if (CG(current_namespace)) { + ZVAL_STR(zv, STR_COPY(CG(current_namespace))); + } else { + ZVAL_EMPTY_STRING(zv); + } + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + + return 1; +} + +void zend_ct_eval_binary_op(zval *result, zend_uint opcode, zval *op1, zval *op2 TSRMLS_DC) { + binary_op_type fn = get_binary_op(opcode); + fn(result, op1, op2 TSRMLS_CC); +} + +void zend_ct_eval_unary_pm(zval *result, zend_ast_kind kind, zval *op TSRMLS_DC) { + binary_op_type fn = kind == ZEND_AST_UNARY_PLUS + ? add_function : sub_function; + + zval left; + ZVAL_LONG(&left, 0); + fn(result, &left, op TSRMLS_CC); +} + +void zend_ct_eval_greater(zval *result, zend_ast_kind kind, zval *op1, zval *op2 TSRMLS_DC) { + binary_op_type fn = kind == ZEND_AST_GREATER + ? is_smaller_function : is_smaller_or_equal_function; + fn(result, op2, op1 TSRMLS_CC); +} + +zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast TSRMLS_DC) { + zend_ast_list *list = zend_ast_get_list(ast); + zend_uint i; + + /* First ensure that *all* child nodes are constant and by-val */ + for (i = 0; i < list->children; ++i) { + zend_ast *elem_ast = list->child[i]; + zend_ast *value_ast = elem_ast->child[0]; + zend_ast *key_ast = elem_ast->child[1]; + zend_bool by_ref = elem_ast->attr; + + if (by_ref || (key_ast && key_ast->kind != ZEND_AST_ZVAL) + || value_ast->kind != ZEND_AST_ZVAL + ) { + return 0; + } + } + + array_init_size(result, list->children); + for (i = 0; i < list->children; ++i) { + zend_ast *elem_ast = list->child[i]; + zend_ast *value_ast = elem_ast->child[0]; + zend_ast *key_ast = elem_ast->child[1]; + + zval *value = zend_ast_get_zval(value_ast); + if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value); + + if (key_ast) { + zval *key = zend_ast_get_zval(key_ast); + switch (Z_TYPE_P(key)) { + case IS_LONG: + zend_hash_index_update(Z_ARRVAL_P(result), Z_LVAL_P(key), value); + break; + case IS_STRING: + zend_symtable_update(Z_ARRVAL_P(result), Z_STR_P(key), value); + break; + case IS_DOUBLE: + zend_hash_index_update(Z_ARRVAL_P(result), + zend_dval_to_lval(Z_DVAL_P(key)), value); + break; + case IS_FALSE: + zend_hash_index_update(Z_ARRVAL_P(result), 0, value); + break; + case IS_TRUE: + zend_hash_index_update(Z_ARRVAL_P(result), 1, value); + break; + case IS_NULL: + zend_hash_update(Z_ARRVAL_P(result), STR_EMPTY_ALLOC(), value); + break; + default: + zend_error(E_COMPILE_ERROR, "Illegal offset type"); + break; + } + } else { + zend_hash_next_index_insert(Z_ARRVAL_P(result), value); + } + } + + zend_make_immutable_array(result TSRMLS_CC); + return 1; +} + 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]; @@ -6347,6 +6486,15 @@ void zend_compile_binary_op(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&left_node, left_ast TSRMLS_CC); zend_compile_expr(&right_node, right_ast TSRMLS_CC); + if (left_node.op_type == IS_CONST && right_node.op_type == IS_CONST) { + result->op_type = IS_CONST; + zend_ct_eval_binary_op(&result->u.constant, opcode, + &left_node.u.constant, &right_node.u.constant TSRMLS_CC); + zval_ptr_dtor(&left_node.u.constant); + zval_ptr_dtor(&right_node.u.constant); + return; + } + zend_emit_op_tmp(result, opcode, &left_node, &right_node TSRMLS_CC); } @@ -6362,6 +6510,15 @@ void zend_compile_greater(znode *result, zend_ast *ast TSRMLS_DC) { zend_compile_expr(&left_node, left_ast TSRMLS_CC); zend_compile_expr(&right_node, right_ast TSRMLS_CC); + if (left_node.op_type == IS_CONST && right_node.op_type == IS_CONST) { + result->op_type = IS_CONST; + zend_ct_eval_greater(&result->u.constant, ast->kind, + &left_node.u.constant, &right_node.u.constant TSRMLS_CC); + zval_ptr_dtor(&left_node.u.constant); + zval_ptr_dtor(&right_node.u.constant); + return; + } + zend_emit_op_tmp(result, ast->kind == ZEND_AST_GREATER ? ZEND_IS_SMALLER : ZEND_IS_SMALLER_OR_EQUAL, &right_node, &left_node TSRMLS_CC); @@ -6383,11 +6540,18 @@ void zend_compile_unary_pm(znode *result, zend_ast *ast TSRMLS_DC) { ZEND_ASSERT(ast->kind == ZEND_AST_UNARY_PLUS || ast->kind == ZEND_AST_UNARY_MINUS); + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + if (expr_node.op_type == IS_CONST) { + result->op_type = IS_CONST; + zend_ct_eval_unary_pm(&result->u.constant, ast->kind, &expr_node.u.constant TSRMLS_CC); + zval_ptr_dtor(&expr_node.u.constant); + return; + } + zero_node.op_type = IS_CONST; ZVAL_LONG(&zero_node.u.constant, 0); - zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - zend_emit_op_tmp(result, ast->kind == ZEND_AST_UNARY_PLUS ? ZEND_ADD : ZEND_SUB, &zero_node, &expr_node TSRMLS_CC); } @@ -6728,6 +6892,11 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { zend_uint i, opnum_init; zend_bool packed = 1; + if (zend_try_ct_eval_array(&result->u.constant, ast TSRMLS_CC)) { + result->op_type = IS_CONST; + return; + } + opnum_init = get_next_op_number(CG(active_op_array)); for (i = 0; i < list->children; ++i) { @@ -6935,67 +7104,10 @@ void zend_compile_encaps_list(znode *result, zend_ast *ast TSRMLS_DC) { } } -zend_bool zend_try_ct_compile_magic_const(zval *zv, zend_ast *ast TSRMLS_DC) { - zend_op_array *op_array = CG(active_op_array); - zend_class_entry *ce = CG(active_class_entry); - - switch (ast->attr) { - case T_FUNC_C: - if (op_array && op_array->function_name) { - ZVAL_STR(zv, STR_COPY(op_array->function_name)); - } else { - ZVAL_EMPTY_STRING(zv); - } - break; - case T_METHOD_C: - if (ce) { - if (op_array && op_array->function_name) { - ZVAL_STR(zv, zend_concat3(ce->name->val, ce->name->len, "::", 2, - op_array->function_name->val, op_array->function_name->len)); - } else { - ZVAL_STR(zv, STR_COPY(ce->name)); - } - } else if (op_array && op_array->function_name) { - ZVAL_STR(zv, STR_COPY(op_array->function_name)); - } else { - ZVAL_EMPTY_STRING(zv); - } - break; - case T_CLASS_C: - if (ce) { - if (ZEND_CE_IS_TRAIT(ce)) { - return 0; - } else { - ZVAL_STR(zv, STR_COPY(ce->name)); - } - } else { - ZVAL_EMPTY_STRING(zv); - } - break; - case T_TRAIT_C: - if (ce && ZEND_CE_IS_TRAIT(ce)) { - ZVAL_STR(zv, STR_COPY(ce->name)); - } else { - ZVAL_EMPTY_STRING(zv); - } - break; - case T_NS_C: - if (CG(current_namespace)) { - ZVAL_STR(zv, STR_COPY(CG(current_namespace))); - } else { - ZVAL_EMPTY_STRING(zv); - } - break; - EMPTY_SWITCH_DEFAULT_CASE() - } - - return 1; -} - void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_class_entry *ce = CG(active_class_entry); - if (zend_try_ct_compile_magic_const(&result->u.constant, ast TSRMLS_CC)) { + if (zend_try_ct_eval_magic_const(&result->u.constant, ast TSRMLS_CC)) { result->op_type = IS_CONST; return; } @@ -7457,134 +7569,10 @@ void zend_compile_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { } } -void zend_eval_const_binary_op(zend_ast **ast_ptr TSRMLS_DC) { - zend_ast *ast = *ast_ptr; - zend_ast *left_ast = ast->child[0]; - zend_ast *right_ast = ast->child[1]; - zend_uchar opcode = ast->attr; - - if (left_ast->kind == ZEND_AST_ZVAL && right_ast->kind == ZEND_AST_ZVAL) { - binary_op_type op = get_binary_op(opcode); - zval result; - op(&result, zend_ast_get_zval(left_ast), zend_ast_get_zval(right_ast) TSRMLS_CC); - zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_zval(&result); - } -} - -void zend_eval_const_unary_pm(zend_ast **ast_ptr TSRMLS_DC) { - zend_ast *ast = *ast_ptr; - zend_ast *expr_ast = ast->child[0]; - - ZEND_ASSERT(ast->kind == ZEND_AST_UNARY_PLUS || ast->kind == ZEND_AST_UNARY_MINUS); - - if (expr_ast->kind == ZEND_AST_ZVAL) { - binary_op_type op = ast->kind == ZEND_AST_UNARY_PLUS - ? add_function : sub_function; - - zval left, result; - ZVAL_LONG(&left, 0); - op(&result, &left, zend_ast_get_zval(expr_ast) TSRMLS_CC); - zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_zval(&result); - } -} - -void zend_eval_const_greater(zend_ast **ast_ptr TSRMLS_DC) { - zend_ast *ast = *ast_ptr; - zend_ast *left_ast = ast->child[0]; - zend_ast *right_ast = ast->child[1]; - - ZEND_ASSERT(ast->kind == ZEND_AST_GREATER || ast->kind == ZEND_AST_GREATER_EQUAL); - - if (left_ast->kind == ZEND_AST_ZVAL && right_ast->kind == ZEND_AST_ZVAL) { - binary_op_type op = ast->kind == ZEND_AST_GREATER - ? is_smaller_function : is_smaller_or_equal_function; - - zval result; - op(&result, zend_ast_get_zval(right_ast), zend_ast_get_zval(left_ast) TSRMLS_CC); - zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_zval(&result); - } -} - -void zend_eval_const_array(zend_ast **ast_ptr TSRMLS_DC) { - zend_ast *ast = *ast_ptr; - zend_ast_list *list = zend_ast_get_list(ast); - zend_uint i; - zval array; - - /* First ensure that *all* child nodes are constant */ - for (i = 0; i < list->children; ++i) { - zend_ast *elem_ast = list->child[i]; - zend_ast *value_ast = elem_ast->child[0]; - zend_ast *key_ast = elem_ast->child[1]; - zend_bool by_ref = elem_ast->attr; - - if (by_ref || (key_ast && key_ast->kind != ZEND_AST_ZVAL) - || value_ast->kind != ZEND_AST_ZVAL - ) { - return; - } - } - - array_init_size(&array, list->children); - for (i = 0; i < list->children; ++i) { - zend_ast *elem_ast = list->child[i]; - zend_ast *value_ast = elem_ast->child[0]; - zend_ast *key_ast = elem_ast->child[1]; - - zval *value = zend_ast_get_zval(value_ast); - if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value); - - if (key_ast) { - zval *key = zend_ast_get_zval(key_ast); - switch (Z_TYPE_P(key)) { - case IS_LONG: - zend_hash_index_update(Z_ARRVAL(array), Z_LVAL_P(key), value); - break; - case IS_STRING: - zend_symtable_update(Z_ARRVAL(array), Z_STR_P(key), value); - break; - case IS_DOUBLE: - zend_hash_index_update(Z_ARRVAL(array), - zend_dval_to_lval(Z_DVAL_P(key)), value); - break; - case IS_FALSE: - zend_hash_index_update(Z_ARRVAL(array), 0, value); - break; - case IS_TRUE: - zend_hash_index_update(Z_ARRVAL(array), 1, value); - break; - case IS_NULL: - zend_hash_update(Z_ARRVAL(array), STR_EMPTY_ALLOC(), value); - break; - default: - zend_error(E_COMPILE_ERROR, "Illegal offset type"); - break; - } - } else { - zend_hash_next_index_insert(Z_ARRVAL(array), value); - } - } - - zend_ast_destroy(ast); - zend_make_immutable_array(&array TSRMLS_CC); - *ast_ptr = zend_ast_create_zval(&array); -} - -void zend_eval_const_magic_const(zend_ast **ast_ptr TSRMLS_DC) { +void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zval result; - if (zend_try_ct_compile_magic_const(&result, ast TSRMLS_CC)) { - zend_ast_destroy(ast); - *ast_ptr = zend_ast_create_zval(&result); - } -} - -void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { - zend_ast *ast = *ast_ptr; if (!ast || ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_ZNODE) { return; } @@ -7593,23 +7581,47 @@ void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { switch (ast->kind) { case ZEND_AST_BINARY_OP: - zend_eval_const_binary_op(ast_ptr TSRMLS_CC); + if (ast->child[0]->kind != ZEND_AST_ZVAL || ast->child[1]->kind != ZEND_AST_ZVAL) { + return; + } + + zend_ct_eval_binary_op(&result, ast->attr, + zend_ast_get_zval(ast->child[0]), zend_ast_get_zval(ast->child[1]) TSRMLS_CC); break; case ZEND_AST_GREATER: case ZEND_AST_GREATER_EQUAL: - zend_eval_const_greater(ast_ptr TSRMLS_CC); + if (ast->child[0]->kind != ZEND_AST_ZVAL || ast->child[1]->kind != ZEND_AST_ZVAL) { + return; + } + + zend_ct_eval_greater(&result, ast->kind, + zend_ast_get_zval(ast->child[0]), zend_ast_get_zval(ast->child[1]) TSRMLS_CC); break; case ZEND_AST_UNARY_PLUS: case ZEND_AST_UNARY_MINUS: - zend_eval_const_unary_pm(ast_ptr TSRMLS_CC); + if (ast->child[0]->kind != ZEND_AST_ZVAL) { + return; + } + + zend_ct_eval_unary_pm(&result, ast->kind, + zend_ast_get_zval(ast->child[0]) TSRMLS_CC); break; case ZEND_AST_ARRAY: - zend_eval_const_array(ast_ptr TSRMLS_CC); + if (!zend_try_ct_eval_array(&result, ast TSRMLS_CC)) { + return; + } break; case ZEND_AST_MAGIC_CONST: - zend_eval_const_magic_const(ast_ptr TSRMLS_CC); + if (!zend_try_ct_eval_magic_const(&result, ast TSRMLS_CC)) { + return; + } break; + default: + return; } + + zend_ast_destroy(ast); + *ast_ptr = zend_ast_create_zval(&result); } /* -- cgit v1.2.1 From 3630f03f8f6f35bed031dbf1c7bc077bb4bcd596 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 30 Jul 2014 13:43:04 +0200 Subject: Immutable arrays for the recursive case as well --- Zend/zend_compile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e6422100ad..bc9f468d39 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6422,12 +6422,12 @@ zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast TSRMLS_DC) { /* First ensure that *all* child nodes are constant and by-val */ for (i = 0; i < list->children; ++i) { zend_ast *elem_ast = list->child[i]; - zend_ast *value_ast = elem_ast->child[0]; - zend_ast *key_ast = elem_ast->child[1]; zend_bool by_ref = elem_ast->attr; + zend_eval_const_expr(&elem_ast->child[0] TSRMLS_CC); + zend_eval_const_expr(&elem_ast->child[1] TSRMLS_CC); - if (by_ref || (key_ast && key_ast->kind != ZEND_AST_ZVAL) - || value_ast->kind != ZEND_AST_ZVAL + if (by_ref || elem_ast->child[0]->kind != ZEND_AST_ZVAL + || (elem_ast->child[1] && elem_ast->child[1]->kind != ZEND_AST_ZVAL) ) { return 0; } @@ -7573,7 +7573,7 @@ void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zval result; - if (!ast || ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_ZNODE) { + if (!ast || ast->kind == ZEND_AST_ZVAL) { return; } -- cgit v1.2.1 From 044e48d0b11e5b061bcf88c381eadced5ef4c7d2 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 30 Jul 2014 17:29:59 +0200 Subject: Weaker recursion during pre-evaluation --- Zend/zend_compile.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index bc9f468d39..8683ca926e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7263,8 +7263,6 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "Constant expression contains invalid operations"); } - zend_ast_apply(ast, zend_compile_const_expr TSRMLS_CC); - switch (ast->kind) { case ZEND_AST_CLASS_CONST: zend_compile_const_expr_class_const(ast_ptr TSRMLS_CC); @@ -7278,6 +7276,9 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { case ZEND_AST_MAGIC_CONST: zend_compile_const_expr_magic_const(ast_ptr TSRMLS_CC); break; + default: + zend_ast_apply(ast, zend_compile_const_expr TSRMLS_CC); + break; } } @@ -7573,14 +7574,14 @@ void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zval result; - if (!ast || ast->kind == ZEND_AST_ZVAL) { + if (!ast) { return; } - zend_ast_apply(ast, zend_eval_const_expr TSRMLS_CC); - switch (ast->kind) { case ZEND_AST_BINARY_OP: + zend_eval_const_expr(&ast->child[0] TSRMLS_CC); + zend_eval_const_expr(&ast->child[1] TSRMLS_CC); if (ast->child[0]->kind != ZEND_AST_ZVAL || ast->child[1]->kind != ZEND_AST_ZVAL) { return; } @@ -7590,6 +7591,8 @@ void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { break; case ZEND_AST_GREATER: case ZEND_AST_GREATER_EQUAL: + zend_eval_const_expr(&ast->child[0] TSRMLS_CC); + zend_eval_const_expr(&ast->child[1] TSRMLS_CC); if (ast->child[0]->kind != ZEND_AST_ZVAL || ast->child[1]->kind != ZEND_AST_ZVAL) { return; } @@ -7599,6 +7602,7 @@ void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { break; case ZEND_AST_UNARY_PLUS: case ZEND_AST_UNARY_MINUS: + zend_eval_const_expr(&ast->child[0] TSRMLS_CC); if (ast->child[0]->kind != ZEND_AST_ZVAL) { return; } -- cgit v1.2.1 From 0cd9cffb5140876c5ca04c671d2cb842c0d100ea Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 30 Jul 2014 17:44:26 +0200 Subject: Rename _tmp_compile_const_expr Also remove recursive immutization of arrays there, because this is already handled when the array is created. --- Zend/zend_compile.c | 46 ++++++++++++++++++++++------------------------ Zend/zend_compile.h | 2 +- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8683ca926e..ac4f691c2a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3180,24 +3180,6 @@ void zend_make_immutable_array_r(zval *zv TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC); - -// TODO.AST Sort out the whole constant folding issue -static void _tmp_compile_const_expr(zval *result, zend_ast *ast TSRMLS_DC) { - zend_ast *orig_ast = ast; - zend_eval_const_expr(&ast TSRMLS_CC); - zend_compile_const_expr(&ast TSRMLS_CC); - if (ast->kind == ZEND_AST_ZVAL) { - ZVAL_COPY_VALUE(result, zend_ast_get_zval(ast)); - if (Z_TYPE_P(result) == IS_ARRAY) { - zend_make_immutable_array_r(result TSRMLS_CC); - } - orig_ast->kind = ZEND_AST_ZNODE; - } else { - ZVAL_NEW_AST(result, zend_ast_copy(ast)); - } -} - /* {{{ zend_dirname Returns directory name component of path */ ZEND_API size_t zend_dirname(char *path, size_t len) @@ -4510,7 +4492,7 @@ void zend_compile_static_var(zend_ast *ast TSRMLS_DC) { zval value_zv; if (value_ast) { - _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); + zend_const_expr_to_zval(&value_zv, value_ast TSRMLS_CC); } else { ZVAL_NULL(&value_zv); } @@ -5101,7 +5083,7 @@ void zend_compile_declare(zend_ast *ast TSRMLS_DC) { zend_string *name = zend_ast_get_str(name_ast); zval value_zv; - _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); + zend_const_expr_to_zval(&value_zv, value_ast TSRMLS_CC); if (zend_str_equals_literal_ci(name, "ticks")) { convert_to_long(&value_zv); @@ -5238,7 +5220,7 @@ void zend_compile_params(zend_ast *ast TSRMLS_DC) { } else if (default_ast) { opcode = ZEND_RECV_INIT; default_node.op_type = IS_CONST; - _tmp_compile_const_expr(&default_node.u.constant, default_ast TSRMLS_CC); + zend_const_expr_to_zval(&default_node.u.constant, default_ast TSRMLS_CC); } else { opcode = ZEND_RECV; default_node.op_type = IS_UNUSED; @@ -5679,7 +5661,7 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { } if (value_ast) { - _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); + zend_const_expr_to_zval(&value_zv, value_ast TSRMLS_CC); } else { ZVAL_NULL(&value_zv); } @@ -5707,7 +5689,7 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { return; } - _tmp_compile_const_expr(&value_zv, value_ast TSRMLS_CC); + zend_const_expr_to_zval(&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) @@ -6215,7 +6197,7 @@ void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { zval *value_zv = &value_node.u.constant; value_node.op_type = IS_CONST; - _tmp_compile_const_expr(value_zv, value_ast TSRMLS_CC); + zend_const_expr_to_zval(value_zv, value_ast TSRMLS_CC); if (Z_TYPE_P(value_zv) == IS_ARRAY || (Z_TYPE_P(value_zv) == IS_CONSTANT_AST @@ -7282,6 +7264,22 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) { } } +void zend_const_expr_to_zval(zval *result, zend_ast *ast TSRMLS_DC) { + zend_ast *orig_ast = ast; + zend_eval_const_expr(&ast TSRMLS_CC); + zend_compile_const_expr(&ast TSRMLS_CC); + if (ast->kind == ZEND_AST_ZVAL) { + ZVAL_COPY_VALUE(result, zend_ast_get_zval(ast)); + + /* Kill this branch of the original AST, as it was already destroyed. + * It would be nice to find a better solution to this problem in the + * future. */ + orig_ast->kind = 0; + } else { + ZVAL_NEW_AST(result, zend_ast_copy(ast)); + } +} + /* Same as compile_stmt, but with early binding */ void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC) { if (!ast) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 68a30e35dc..9286756941 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -101,12 +101,12 @@ typedef union _zend_parser_stack_elem { zend_ulong num; } zend_parser_stack_elem; -void zend_ensure_writable_variable(const zend_ast *ast); void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_stmt(zend_ast *ast TSRMLS_DC); void zend_compile_expr(znode *node, zend_ast *ast TSRMLS_DC); void zend_compile_var(znode *node, zend_ast *ast, int type TSRMLS_DC); void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC); +void zend_const_expr_to_zval(zval *result, zend_ast *ast TSRMLS_DC); typedef struct _zend_execute_data zend_execute_data; -- cgit v1.2.1 From ad5677e4cd9273eb4c23418d4a187cd8a64d8baf Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 30 Jul 2014 17:46:00 +0200 Subject: Use ZVAL_COPY until proven wrong --- Zend/zend_ast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index fbdc35068a..2dd5b16f44 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -331,7 +331,7 @@ ZEND_API zend_ast *zend_ast_copy(zend_ast *ast) zend_ast_zval *new = emalloc(sizeof(zend_ast_zval)); new->kind = ZEND_AST_ZVAL; new->attr = ast->attr; - ZVAL_DUP(&new->val, zend_ast_get_zval(ast)); + ZVAL_COPY(&new->val, zend_ast_get_zval(ast)); return (zend_ast *) new; } else if (zend_ast_is_list(ast)) { zend_ast_list *list = zend_ast_get_list(ast); -- cgit v1.2.1 From 8e9a840a53ba7fa2f969f64bcfb73c2e251b4c7b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 30 Jul 2014 18:27:41 +0200 Subject: Mark some small functions as inline --- Zend/zend_compile.c | 68 ++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ac4f691c2a..04359883b5 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -533,7 +533,7 @@ void zend_stop_lexing(TSRMLS_D) { LANG_SCNG(yy_cursor) = LANG_SCNG(yy_limit); } -static inline void do_begin_loop(TSRMLS_D) /* {{{ */ +static inline void zend_begin_loop(TSRMLS_D) /* {{{ */ { zend_brk_cont_element *brk_cont_element; int parent; @@ -546,7 +546,7 @@ static inline void do_begin_loop(TSRMLS_D) /* {{{ */ } /* }}} */ -static inline void do_end_loop(int cont_addr, int has_loop_var TSRMLS_DC) /* {{{ */ +static inline void zend_end_loop(int cont_addr, int has_loop_var TSRMLS_DC) /* {{{ */ { if (!has_loop_var) { /* The start fileld is used to free temporary variables in case of exceptions. @@ -3376,18 +3376,18 @@ static void zend_emit_tick(TSRMLS_D) { opline->extended_value = Z_LVAL(CG(declarables).ticks); } -static zend_op *zend_zend_emit_op_data(znode *value TSRMLS_DC) { +static inline zend_op *zend_zend_emit_op_data(znode *value TSRMLS_DC) { return zend_emit_op(NULL, ZEND_OP_DATA, value, NULL TSRMLS_CC); } -static zend_uint zend_emit_jump(zend_uint opnum_target TSRMLS_DC) { +static inline zend_uint zend_emit_jump(zend_uint opnum_target TSRMLS_DC) { zend_uint opnum = get_next_op_number(CG(active_op_array)); zend_op *opline = zend_emit_op(NULL, ZEND_JMP, NULL, NULL TSRMLS_CC); opline->op1.opline_num = opnum_target; return opnum; } -static zend_uint zend_emit_cond_jump( +static inline zend_uint zend_emit_cond_jump( zend_uchar opcode, znode *cond, zend_uint opnum_target TSRMLS_DC ) { zend_uint opnum = get_next_op_number(CG(active_op_array)); @@ -3396,7 +3396,7 @@ static zend_uint zend_emit_cond_jump( return opnum; } -static void zend_update_jump_target(zend_uint opnum_jump, zend_uint opnum_target TSRMLS_DC) { +static inline void zend_update_jump_target(zend_uint opnum_jump, zend_uint opnum_target TSRMLS_DC) { zend_op *opline = &CG(active_op_array)->opcodes[opnum_jump]; switch (opline->opcode) { case ZEND_JMP: @@ -3412,7 +3412,7 @@ static void zend_update_jump_target(zend_uint opnum_jump, zend_uint opnum_target } } -static void zend_update_jump_target_to_next(zend_uint opnum_jump TSRMLS_DC) { +static inline void zend_update_jump_target_to_next(zend_uint opnum_jump TSRMLS_DC) { zend_update_jump_target(opnum_jump, get_next_op_number(CG(active_op_array)) TSRMLS_CC); } @@ -3431,24 +3431,24 @@ void zend_emit_final_return(zval *zv TSRMLS_DC) { } -static zend_bool zend_is_variable(zend_ast *ast) { +static inline zend_bool zend_is_variable(zend_ast *ast) { return ast->kind == ZEND_AST_VAR || ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP || ast->kind == ZEND_AST_STATIC_PROP || ast->kind == ZEND_AST_CALL || ast->kind == ZEND_AST_METHOD_CALL || ast->kind == ZEND_AST_STATIC_CALL; } -static zend_bool zend_is_call(zend_ast *ast) { +static inline zend_bool zend_is_call(zend_ast *ast) { return ast->kind == ZEND_AST_CALL || ast->kind == ZEND_AST_METHOD_CALL || ast->kind == ZEND_AST_STATIC_CALL; } -static zend_bool zend_is_unticked_stmt(zend_ast *ast) { +static inline zend_bool zend_is_unticked_stmt(zend_ast *ast) { return ast->kind == ZEND_AST_STMT_LIST || ast->kind == ZEND_AST_LABEL; } -static zend_bool zend_can_write_to_variable(zend_ast *ast) { +static inline zend_bool zend_can_write_to_variable(zend_ast *ast) { while (ast->kind == ZEND_AST_DIM || ast->kind == ZEND_AST_PROP) { ast = ast->child[0]; } @@ -3456,7 +3456,7 @@ static zend_bool zend_can_write_to_variable(zend_ast *ast) { return zend_is_variable(ast); } -static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { +static inline zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { zend_string *name; if (name_ast->kind != ZEND_AST_ZVAL) { @@ -3472,7 +3472,7 @@ static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { return ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(name); } -static void zend_handle_numeric_op2(zend_op *opline TSRMLS_DC) { +static inline void zend_handle_numeric_op2(zend_op *opline TSRMLS_DC) { if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { ulong index; @@ -3483,7 +3483,7 @@ static void zend_handle_numeric_op2(zend_op *opline TSRMLS_DC) { } } -static void zend_set_class_name_op1(zend_op *opline, znode *class_node TSRMLS_DC) { +static inline void zend_set_class_name_op1(zend_op *opline, znode *class_node TSRMLS_DC) { if (class_node->op_type == IS_CONST) { opline->op1_type = IS_CONST; opline->op1.constant = zend_add_class_name_literal( @@ -4674,7 +4674,7 @@ void zend_compile_while(zend_ast *ast TSRMLS_DC) { zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); opnum_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &cond_node, 0 TSRMLS_CC); - do_begin_loop(TSRMLS_C); + zend_begin_loop(TSRMLS_C); zend_compile_stmt(stmt_ast TSRMLS_CC); @@ -4682,7 +4682,7 @@ void zend_compile_while(zend_ast *ast TSRMLS_DC) { zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); - do_end_loop(opnum_start, 0 TSRMLS_CC); + zend_end_loop(opnum_start, 0 TSRMLS_CC); } void zend_compile_do_while(zend_ast *ast TSRMLS_DC) { @@ -4692,7 +4692,7 @@ void zend_compile_do_while(zend_ast *ast TSRMLS_DC) { znode cond_node; zend_uint opnum_start, opnum_cond; - do_begin_loop(TSRMLS_C); + zend_begin_loop(TSRMLS_C); opnum_start = get_next_op_number(CG(active_op_array)); zend_compile_stmt(stmt_ast TSRMLS_CC); @@ -4702,7 +4702,7 @@ void zend_compile_do_while(zend_ast *ast TSRMLS_DC) { zend_emit_cond_jump(ZEND_JMPNZ, &cond_node, opnum_start TSRMLS_CC); - do_end_loop(opnum_cond, 0 TSRMLS_CC); + zend_end_loop(opnum_cond, 0 TSRMLS_CC); } void zend_compile_expr_list(znode *result, zend_ast *ast TSRMLS_DC) { @@ -4742,7 +4742,7 @@ void zend_compile_for(zend_ast *ast TSRMLS_DC) { zend_do_extended_info(TSRMLS_C); opnum_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &result, 0 TSRMLS_CC); - do_begin_loop(TSRMLS_C); + zend_begin_loop(TSRMLS_C); zend_compile_stmt(stmt_ast TSRMLS_CC); @@ -4754,7 +4754,7 @@ void zend_compile_for(zend_ast *ast TSRMLS_DC) { zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); - do_end_loop(opnum_loop, 0 TSRMLS_CC); + zend_end_loop(opnum_loop, 0 TSRMLS_CC); } void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { @@ -4843,7 +4843,7 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { zend_do_free(&dummy_node TSRMLS_CC); } - do_begin_loop(TSRMLS_C); + zend_begin_loop(TSRMLS_C); zend_compile_stmt(stmt_ast TSRMLS_CC); @@ -4855,7 +4855,7 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { opline = &CG(active_op_array)->opcodes[opnum_fetch]; opline->op2.opline_num = get_next_op_number(CG(active_op_array)); - do_end_loop(opnum_fetch, 1 TSRMLS_CC); + zend_end_loop(opnum_fetch, 1 TSRMLS_CC); { zend_op *container_ptr = zend_stack_top(&CG(foreach_copy_stack)); @@ -4868,7 +4868,6 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; zend_uint *jmp_opnums = safe_emalloc(sizeof(zend_uint), list->children - 1, 0); - zend_uint opnum_last_jmpz = 0; for (i = 0; i < list->children; ++i) { zend_ast *elem_ast = list->child[i]; @@ -4876,9 +4875,10 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { zend_ast *stmt_ast = elem_ast->child[1]; znode cond_node; + zend_uint opnum_jmpz; if (cond_ast) { zend_compile_expr(&cond_node, cond_ast TSRMLS_CC); - opnum_last_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &cond_node, 0 TSRMLS_CC); + opnum_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &cond_node, 0 TSRMLS_CC); } zend_compile_stmt(stmt_ast TSRMLS_CC); @@ -4888,7 +4888,7 @@ void zend_compile_if(zend_ast *ast TSRMLS_DC) { } if (cond_ast) { - zend_update_jump_target_to_next(opnum_last_jmpz TSRMLS_CC); + zend_update_jump_target_to_next(opnum_jmpz TSRMLS_CC); } } @@ -4919,7 +4919,7 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { switch_entry.control_var = -1; zend_stack_push(&CG(switch_cond_stack), (void *) &switch_entry); - do_begin_loop(TSRMLS_C); + zend_begin_loop(TSRMLS_C); case_node.op_type = IS_TMP_VAR; case_node.u.op.var = get_temporary_variable(CG(active_op_array)); @@ -4965,7 +4965,7 @@ void zend_compile_switch(zend_ast *ast TSRMLS_DC) { zend_update_jump_target_to_next(opnum_default_jmp TSRMLS_CC); } - do_end_loop(get_next_op_number(CG(active_op_array)), 1 TSRMLS_CC); + zend_end_loop(get_next_op_number(CG(active_op_array)), 1 TSRMLS_CC); if (expr_node.op_type == IS_VAR || expr_node.op_type == IS_TMP_VAR) { zend_emit_op(NULL, expr_node.op_type == IS_TMP_VAR ? ZEND_FREE : ZEND_SWITCH_FREE, @@ -6320,7 +6320,7 @@ void zend_compile_halt_compiler(zend_ast *ast TSRMLS_DC) { STR_RELEASE(name); } -zend_bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast TSRMLS_DC) { +static zend_bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast TSRMLS_DC) { zend_op_array *op_array = CG(active_op_array); zend_class_entry *ce = CG(active_class_entry); @@ -6377,12 +6377,14 @@ zend_bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast TSRMLS_DC) { return 1; } -void zend_ct_eval_binary_op(zval *result, zend_uint opcode, zval *op1, zval *op2 TSRMLS_DC) { +static inline void zend_ct_eval_binary_op( + zval *result, zend_uint opcode, zval *op1, zval *op2 TSRMLS_DC +) { binary_op_type fn = get_binary_op(opcode); fn(result, op1, op2 TSRMLS_CC); } -void zend_ct_eval_unary_pm(zval *result, zend_ast_kind kind, zval *op TSRMLS_DC) { +static inline void zend_ct_eval_unary_pm(zval *result, zend_ast_kind kind, zval *op TSRMLS_DC) { binary_op_type fn = kind == ZEND_AST_UNARY_PLUS ? add_function : sub_function; @@ -6391,13 +6393,15 @@ void zend_ct_eval_unary_pm(zval *result, zend_ast_kind kind, zval *op TSRMLS_DC) fn(result, &left, op TSRMLS_CC); } -void zend_ct_eval_greater(zval *result, zend_ast_kind kind, zval *op1, zval *op2 TSRMLS_DC) { +static inline void zend_ct_eval_greater( + zval *result, zend_ast_kind kind, zval *op1, zval *op2 TSRMLS_DC +) { binary_op_type fn = kind == ZEND_AST_GREATER ? is_smaller_function : is_smaller_or_equal_function; fn(result, op2, op1 TSRMLS_CC); } -zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast TSRMLS_DC) { +static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast TSRMLS_DC) { zend_ast_list *list = zend_ast_get_list(ast); zend_uint i; -- cgit v1.2.1 From 6cf89612dbe3b44d756c805edd3ce7067a99c3ea Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 30 Jul 2014 19:12:48 +0200 Subject: Support doc comments for propreties --- Zend/zend_compile.c | 29 ++++++++++++++++++++++++----- Zend/zend_compile.h | 2 +- Zend/zend_language_parser.y | 2 +- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 04359883b5..5bcfe93147 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3098,6 +3098,16 @@ zend_ast *zend_ast_append_str(zend_ast *left_ast, zend_ast *right_ast) { return left_ast; } +/* A hacky way that is used to store the doc comment for properties */ +zend_ast_list *zend_ast_append_doc_comment(zend_ast_list *list TSRMLS_DC) { + if (CG(doc_comment)) { + list = zend_ast_list_add(list, zend_ast_create_zval_from_str(CG(doc_comment))); + CG(doc_comment) = NULL; + } + + return list; +} + void zend_verify_namespace(TSRMLS_D) /* {{{ */ { if (CG(has_bracketed_namespaces) && !CG(in_namespace)) { @@ -3693,7 +3703,7 @@ void zend_compile_static_prop(znode *result, zend_ast *ast, zend_uint type TSRML zend_adjust_for_fetch_type(opline, type); } -static zend_uchar get_list_fetch_opcode(zend_uchar op_type) { +static inline zend_uchar get_list_fetch_opcode(zend_uchar op_type) { switch (op_type) { case IS_VAR: case IS_CV: @@ -5632,7 +5642,8 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { zend_ast_list *list = zend_ast_get_list(ast); zend_uint flags = list->attr; zend_class_entry *ce = CG(active_class_entry); - zend_uint i; + zend_uint i, children = list->children; + zend_string *doc_comment = NULL; if (ce->ce_flags & ZEND_ACC_INTERFACE) { zend_error_noreturn(E_COMPILE_ERROR, "Interfaces may not include member variables"); @@ -5642,7 +5653,13 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { zend_error_noreturn(E_COMPILE_ERROR, "Properties cannot be declared abstract"); } - for (i = 0; i < list->children; ++i) { + /* Doc comment has been appended as last element in property list */ + if (list->child[children - 1]->kind == ZEND_AST_ZVAL) { + doc_comment = STR_COPY(zend_ast_get_str(list->child[children - 1])); + children -= 1; + } + + for (i = 0; i < children; ++i) { zend_ast *prop_ast = list->child[i]; zend_ast *name_ast = prop_ast->child[0]; zend_ast *value_ast = prop_ast->child[1]; @@ -5667,8 +5684,10 @@ void zend_compile_prop_decl(zend_ast *ast TSRMLS_DC) { } name = zend_new_interned_string_safe(name TSRMLS_CC); - zend_declare_property_ex(ce, name, &value_zv, flags, - NULL /* TODO.AST doc comment */ TSRMLS_CC); + zend_declare_property_ex(ce, name, &value_zv, flags, doc_comment TSRMLS_CC); + + /* Doc comment is only assigned to first property */ + doc_comment = NULL; } } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 9286756941..d3d81d04d0 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -452,11 +452,11 @@ ZEND_API unary_op_type get_unary_op(int opcode); ZEND_API binary_op_type get_binary_op(int opcode); ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC); -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); +zend_ast_list *zend_ast_append_doc_comment(zend_ast_list *list TSRMLS_DC); /* parser-driven code generators */ void zend_do_free(znode *op1 TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index e3d166037b..cc5f7f2e55 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -605,7 +605,7 @@ class_statement_list: class_statement: variable_modifiers property_list ';' - { $$.ast = $2.ast; $$.ast->attr = $1.num; } + { $$.list = zend_ast_append_doc_comment($2.list TSRMLS_CC); $$.ast->attr = $1.num; } | T_CONST class_const_list ';' { $$.ast = $2.ast; RESET_DOC_COMMENT(); } | T_USE name_list trait_adaptations -- cgit v1.2.1 From c4460dd162852a795026ba01aa39bb0278663d99 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 17:10:06 +0200 Subject: Restore old evaluation order ${a()}[b()][c()] = d() will now evaluate in order a, b, c, d. --- Zend/zend.c | 3 + Zend/zend_compile.c | 372 ++++++++++++++---------- Zend/zend_globals.h | 2 + tests/lang/engine_assignExecutionOrder_004.phpt | 16 +- 4 files changed, 232 insertions(+), 161 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index c0fd373508..5ab8ee3eb4 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1026,6 +1026,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ zend_class_entry *saved_class_entry; zend_stack switch_cond_stack; zend_stack foreach_copy_stack; + zend_stack delayed_oplines_stack; zend_stack context_stack; zend_array *symbol_table; TSRMLS_FETCH(); @@ -1190,6 +1191,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ CG(active_class_entry) = NULL; SAVE_STACK(switch_cond_stack); SAVE_STACK(foreach_copy_stack); + SAVE_STACK(delayed_oplines_stack); SAVE_STACK(context_stack); CG(in_compilation) = 0; } @@ -1211,6 +1213,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ CG(active_class_entry) = saved_class_entry; RESTORE_STACK(switch_cond_stack); RESTORE_STACK(foreach_copy_stack); + RESTORE_STACK(delayed_oplines_stack); RESTORE_STACK(context_stack); CG(in_compilation) = 1; } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 5bcfe93147..22d5066836 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -60,34 +60,29 @@ target = src; \ } while (0) -#define GET_CACHE_SLOT(literal) do { \ - Z_CACHE_SLOT(CG(active_op_array)->literals[literal]) = CG(active_op_array)->last_cache_slot++; \ - if ((CG(active_op_array)->fn_flags & ZEND_ACC_INTERACTIVE) && CG(active_op_array)->run_time_cache) { \ - CG(active_op_array)->run_time_cache = erealloc(CG(active_op_array)->run_time_cache, CG(active_op_array)->last_cache_slot * sizeof(void*)); \ - CG(active_op_array)->run_time_cache[CG(active_op_array)->last_cache_slot - 1] = NULL; \ - } \ - } while (0) +static inline void zend_alloc_cache_slot(zend_uint literal TSRMLS_DC) { + zend_op_array *op_array = CG(active_op_array); + Z_CACHE_SLOT(op_array->literals[literal]) = op_array->last_cache_slot++; + if ((op_array->fn_flags & ZEND_ACC_INTERACTIVE) && op_array->run_time_cache) { + op_array->run_time_cache = erealloc(op_array->run_time_cache, + op_array->last_cache_slot * sizeof(void*)); + op_array->run_time_cache[CG(active_op_array)->last_cache_slot - 1] = NULL; + } +} #define POLYMORPHIC_CACHE_SLOT_SIZE 2 -#define GET_POLYMORPHIC_CACHE_SLOT(literal) do { \ - Z_CACHE_SLOT(CG(active_op_array)->literals[literal]) = CG(active_op_array)->last_cache_slot; \ - CG(active_op_array)->last_cache_slot += POLYMORPHIC_CACHE_SLOT_SIZE; \ - if ((CG(active_op_array)->fn_flags & ZEND_ACC_INTERACTIVE) && CG(active_op_array)->run_time_cache) { \ - CG(active_op_array)->run_time_cache = erealloc(CG(active_op_array)->run_time_cache, CG(active_op_array)->last_cache_slot * sizeof(void*)); \ - CG(active_op_array)->run_time_cache[CG(active_op_array)->last_cache_slot - 1] = NULL; \ - CG(active_op_array)->run_time_cache[CG(active_op_array)->last_cache_slot - 2] = NULL; \ - } \ - } while (0) - -#define FREE_POLYMORPHIC_CACHE_SLOT(literal) do { \ - if (Z_CACHE_SLOT(CG(active_op_array)->literals[literal]) != -1 && \ - Z_CACHE_SLOT(CG(active_op_array)->literals[literal]) == \ - CG(active_op_array)->last_cache_slot - POLYMORPHIC_CACHE_SLOT_SIZE) { \ - Z_CACHE_SLOT(CG(active_op_array)->literals[literal]) = -1; \ - CG(active_op_array)->last_cache_slot -= POLYMORPHIC_CACHE_SLOT_SIZE; \ - } \ - } while (0) +static inline void zend_alloc_polymorphic_cache_slot(zend_uint literal TSRMLS_DC) { + zend_op_array *op_array = CG(active_op_array); + Z_CACHE_SLOT(op_array->literals[literal]) = op_array->last_cache_slot; + op_array->last_cache_slot += POLYMORPHIC_CACHE_SLOT_SIZE; + if ((op_array->fn_flags & ZEND_ACC_INTERACTIVE) && op_array->run_time_cache) { + op_array->run_time_cache = erealloc( + op_array->run_time_cache, op_array->last_cache_slot * sizeof(void *)); + op_array->run_time_cache[op_array->last_cache_slot - 1] = NULL; + op_array->run_time_cache[op_array->last_cache_slot - 2] = NULL; + } +} ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC); ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC); @@ -197,6 +192,7 @@ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */ { zend_stack_init(&CG(switch_cond_stack), sizeof(zend_switch_entry)); zend_stack_init(&CG(foreach_copy_stack), sizeof(zend_op)); + zend_stack_init(&CG(delayed_oplines_stack), sizeof(zend_op)); CG(active_class_entry) = NULL; CG(in_compilation) = 0; CG(start_lineno) = 0; @@ -239,6 +235,7 @@ void shutdown_compiler(TSRMLS_D) /* {{{ */ { zend_stack_destroy(&CG(switch_cond_stack)); zend_stack_destroy(&CG(foreach_copy_stack)); + zend_stack_destroy(&CG(delayed_oplines_stack)); zend_hash_destroy(&CG(filenames_table)); zend_hash_destroy(&CG(const_filenames)); zend_stack_destroy(&CG(context_stack)); @@ -438,7 +435,7 @@ static int zend_add_class_name_literal(zend_op_array *op_array, zend_string *nam ZVAL_NEW_STR(&zv, lc_name); zend_add_literal(CG(active_op_array), &zv TSRMLS_CC); - GET_CACHE_SLOT(ret); + zend_alloc_cache_slot(ret TSRMLS_CC); return ret; } @@ -3326,6 +3323,18 @@ static void zend_adjust_for_fetch_type(zend_op *opline, zend_uint type) { } } +static inline void zend_make_var_result(znode *result, zend_op *opline TSRMLS_DC) { + opline->result_type = IS_VAR; + opline->result.var = get_temporary_variable(CG(active_op_array)); + GET_NODE(result, opline->result); +} + +static inline void zend_make_tmp_result(znode *result, zend_op *opline TSRMLS_DC) { + opline->result_type = IS_TMP_VAR; + opline->result.var = get_temporary_variable(CG(active_op_array)); + GET_NODE(result, opline->result); +} + static zend_op *zend_emit_op(znode *result, zend_uchar opcode, znode *op1, znode *op2 TSRMLS_DC) { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); opline->opcode = opcode; @@ -3342,12 +3351,8 @@ static zend_op *zend_emit_op(znode *result, zend_uchar opcode, znode *op1, znode SET_NODE(opline->op2, op2); } - if (result == NULL) { - SET_UNUSED(opline->result); - } else { - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); + if (result) { + zend_make_var_result(result, opline TSRMLS_CC); } return opline; } @@ -3370,9 +3375,7 @@ static zend_op *zend_emit_op_tmp( SET_NODE(opline->op2, op2); } - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); + zend_make_tmp_result(result, opline TSRMLS_CC); return opline; } @@ -3426,6 +3429,39 @@ static inline void zend_update_jump_target_to_next(zend_uint opnum_jump TSRMLS_D zend_update_jump_target(opnum_jump, get_next_op_number(CG(active_op_array)) TSRMLS_CC); } +static inline zend_op *zend_delayed_emit_op( + znode *result, zend_uchar opcode, znode *op1, znode *op2 TSRMLS_DC +) { + zend_op tmp_opline; + init_op(&tmp_opline TSRMLS_CC); + tmp_opline.opcode = opcode; + SET_NODE(tmp_opline.op1, op1); + SET_NODE(tmp_opline.op2, op2); + if (result) { + zend_make_var_result(result, &tmp_opline TSRMLS_CC); + } + + zend_stack_push(&CG(delayed_oplines_stack), &tmp_opline); + return zend_stack_top(&CG(delayed_oplines_stack)); +} + +static inline zend_uint zend_delayed_compile_begin(TSRMLS_D) { + return zend_stack_count(&CG(delayed_oplines_stack)); +} + +static zend_op *zend_delayed_compile_end(zend_uint offset TSRMLS_DC) { + zend_op *opline, *oplines = zend_stack_base(&CG(delayed_oplines_stack)); + zend_uint i, count = zend_stack_count(&CG(delayed_oplines_stack)); + + ZEND_ASSERT(count > offset); + for (i = offset; i < count; ++i) { + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + memcpy(opline, &oplines[i], sizeof(zend_op)); + } + CG(delayed_oplines_stack).top = offset; + return opline; +} + void zend_emit_final_return(zval *zv TSRMLS_DC) { znode zn; zend_bool returns_reference = (CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0; @@ -3482,13 +3518,13 @@ static inline zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) { return ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(name); } -static inline void zend_handle_numeric_op2(zend_op *opline TSRMLS_DC) { - if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { - ulong index; +static inline void zend_handle_numeric_op(znode *node TSRMLS_DC) { + if (node->op_type == IS_CONST && Z_TYPE(node->u.constant) == IS_STRING) { + zend_ulong index; - if (ZEND_HANDLE_NUMERIC(Z_STR(CONSTANT(opline->op2.constant)), index)) { - zval_dtor(&CONSTANT(opline->op2.constant)); - ZVAL_LONG(&CONSTANT(opline->op2.constant), index); + if (ZEND_HANDLE_NUMERIC(Z_STR(node->u.constant), index)) { + zval_ptr_dtor(&node->u.constant); + ZVAL_LONG(&node->u.constant, index); } } } @@ -3596,12 +3632,16 @@ static void zend_separate_if_call_and_write(znode *node, zend_ast *ast, int type } } -zend_op *zend_compile_dim_common(znode *result, zend_ast *ast, int type TSRMLS_DC) { +void zend_delayed_compile_var(znode *result, zend_ast *ast, zend_uint type TSRMLS_DC); + +static zend_op *zend_delayed_compile_dim(znode *result, zend_ast *ast, zend_uint type TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; zend_ast *dim_ast = ast->child[1]; znode var_node, dim_node; - zend_op *opline; + + zend_delayed_compile_var(&var_node, var_ast, type TSRMLS_CC); + zend_separate_if_call_and_write(&var_node, var_ast, type TSRMLS_CC); if (dim_ast == NULL) { if (type == BP_VAR_R || type == BP_VAR_IS) { @@ -3613,15 +3653,18 @@ zend_op *zend_compile_dim_common(znode *result, zend_ast *ast, int type TSRMLS_D dim_node.op_type = IS_UNUSED; } else { zend_compile_expr(&dim_node, dim_ast TSRMLS_CC); + zend_handle_numeric_op(&dim_node TSRMLS_CC); } - zend_compile_var(&var_node, var_ast, type TSRMLS_CC); - zend_separate_if_call_and_write(&var_node, var_ast, type TSRMLS_CC); - - opline = zend_emit_op(result, ZEND_FETCH_DIM_R, &var_node, &dim_node TSRMLS_CC); - zend_handle_numeric_op2(opline TSRMLS_CC); + return zend_delayed_emit_op(result, ZEND_FETCH_DIM_R, &var_node, &dim_node TSRMLS_CC); +} - return opline; +static inline zend_op *zend_compile_dim_common( + znode *result, zend_ast *ast, zend_uint type TSRMLS_DC +) { + zend_uint offset = zend_delayed_compile_begin(TSRMLS_C); + zend_delayed_compile_dim(result, ast, type TSRMLS_CC); + return zend_delayed_compile_end(offset TSRMLS_CC); } void zend_compile_dim(znode *result, zend_ast *ast, int type TSRMLS_DC) { @@ -3638,29 +3681,37 @@ static zend_bool is_this_fetch(zend_ast *ast) { return Z_TYPE_P(name) == IS_STRING && zend_str_equals_literal(Z_STR_P(name), "this"); } -zend_op *zend_compile_prop_common(znode *result, zend_ast *ast, int type TSRMLS_DC) { +static zend_op *zend_delayed_compile_prop( + znode *result, zend_ast *ast, zend_uint type TSRMLS_DC +) { zend_ast *obj_ast = ast->child[0]; zend_ast *prop_ast = ast->child[1]; znode obj_node, prop_node; zend_op *opline; - zend_compile_expr(&prop_node, prop_ast TSRMLS_CC); if (is_this_fetch(obj_ast)) { obj_node.op_type = IS_UNUSED; } else { - zend_compile_var(&obj_node, obj_ast, type TSRMLS_CC); + zend_delayed_compile_var(&obj_node, obj_ast, type TSRMLS_CC); zend_separate_if_call_and_write(&obj_node, obj_ast, type TSRMLS_CC); } + zend_compile_expr(&prop_node, prop_ast TSRMLS_CC); - opline = zend_emit_op(result, ZEND_FETCH_OBJ_R, &obj_node, &prop_node TSRMLS_CC); + opline = zend_delayed_emit_op(result, ZEND_FETCH_OBJ_R, &obj_node, &prop_node TSRMLS_CC); if (opline->op2_type == IS_CONST && Z_TYPE(CONSTANT(opline->op2.constant)) == IS_STRING) { - GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + zend_alloc_polymorphic_cache_slot(opline->op2.constant TSRMLS_CC); } return opline; } +static zend_op *zend_compile_prop_common(znode *result, zend_ast *ast, zend_uint type TSRMLS_DC) { + zend_uint offset = zend_delayed_compile_begin(TSRMLS_C); + zend_delayed_compile_prop(result, ast, type TSRMLS_CC); + return zend_delayed_compile_end(offset TSRMLS_CC); +} + void zend_compile_prop(znode *result, zend_ast *ast, int type TSRMLS_DC) { zend_op *opline = zend_compile_prop_common(result, ast, type TSRMLS_CC); zend_adjust_for_fetch_type(opline, type); @@ -3684,7 +3735,7 @@ zend_op *zend_compile_static_prop_common(znode *result, zend_ast *ast, int type opline = zend_emit_op(result, ZEND_FETCH_R, &prop_node, NULL TSRMLS_CC); if (opline->op1_type == IS_CONST) { - GET_POLYMORPHIC_CACHE_SLOT(opline->op1.constant); + zend_alloc_polymorphic_cache_slot(opline->op1.constant TSRMLS_CC); } if (class_node.op_type == IS_CONST) { opline->op2_type = IS_CONST; @@ -3793,6 +3844,7 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { znode var_node, expr_node; zend_op *opline; + zend_uint offset; if (is_this_fetch(var_ast)) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); @@ -3800,20 +3852,25 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { zend_ensure_writable_variable(var_ast); - if (zend_is_assign_to_self(var_ast, expr_ast TSRMLS_CC)) { - zend_compile_simple_var_no_cv(&expr_node, expr_ast, BP_VAR_R TSRMLS_CC); - } else { - zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); - } - switch (var_ast->kind) { case ZEND_AST_VAR: case ZEND_AST_STATIC_PROP: zend_compile_var(&var_node, var_ast, BP_VAR_W TSRMLS_CC); + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); zend_emit_op(result, ZEND_ASSIGN, &var_node, &expr_node TSRMLS_CC); return; case ZEND_AST_DIM: - opline = zend_compile_dim_common(result, var_ast, BP_VAR_W TSRMLS_CC); + offset = zend_delayed_compile_begin(TSRMLS_C); + zend_delayed_compile_dim(result, var_ast, BP_VAR_W TSRMLS_CC); + + if (zend_is_assign_to_self(var_ast, expr_ast TSRMLS_CC)) { + /* $a[0] = $a should evaluate the right $a first */ + zend_compile_simple_var_no_cv(&expr_node, expr_ast, BP_VAR_R TSRMLS_CC); + } else { + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + } + + opline = zend_delayed_compile_end(offset TSRMLS_CC); opline->opcode = ZEND_ASSIGN_DIM; opline = zend_zend_emit_op_data(&expr_node TSRMLS_CC); @@ -3821,56 +3878,50 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline->op2_type = IS_VAR; return; case ZEND_AST_PROP: - opline = zend_compile_prop_common(result, var_ast, BP_VAR_W TSRMLS_CC); + offset = zend_delayed_compile_begin(TSRMLS_C); + zend_delayed_compile_prop(result, var_ast, BP_VAR_W TSRMLS_CC); + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + opline = zend_delayed_compile_end(offset TSRMLS_CC); opline->opcode = ZEND_ASSIGN_OBJ; zend_zend_emit_op_data(&expr_node TSRMLS_CC); return; case ZEND_AST_LIST: + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); zend_compile_list_assign(result, var_ast, &expr_node TSRMLS_CC); return; EMPTY_SWITCH_DEFAULT_CASE(); } } -zend_op *zend_compile_assign_ref_common( - znode *result, zend_ast *target_ast, znode *source_node TSRMLS_DC -) { - znode target_node; - zend_op *opline; - - if (is_this_fetch(target_ast)) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); - } - - zend_ensure_writable_variable(target_ast); - zend_compile_var(&target_node, target_ast, BP_VAR_W TSRMLS_CC); - - opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->opcode = ZEND_ASSIGN_REF; - SET_NODE(opline->op1, &target_node); - SET_NODE(opline->op2, source_node); - - if (result) { - opline->result_type = IS_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); - } else { - opline->result_type = IS_UNUSED | EXT_TYPE_UNUSED; - } - - return opline; +static inline void zend_emit_assign_znode(zend_ast *var_ast, znode *value_node TSRMLS_DC) { + znode dummy_node; + zend_ast *assign_ast = zend_ast_create(ZEND_AST_ASSIGN, var_ast, + zend_ast_create_znode(value_node)); + zend_compile_assign(&dummy_node, assign_ast TSRMLS_CC); + zend_do_free(&dummy_node TSRMLS_CC); } void zend_compile_assign_ref(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *target_ast = ast->child[0]; zend_ast *source_ast = ast->child[1]; - znode source_node; + znode target_node, source_node; zend_op *opline; + if (is_this_fetch(target_ast)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this"); + } + zend_ensure_writable_variable(target_ast); + + zend_compile_var(&target_node, target_ast, BP_VAR_W TSRMLS_CC); zend_compile_var(&source_node, source_ast, BP_VAR_REF TSRMLS_CC); - opline = zend_compile_assign_ref_common(result, target_ast, &source_node TSRMLS_CC); + + opline = zend_emit_op(result, ZEND_ASSIGN_REF, &target_node, &source_node TSRMLS_CC); + if (!result) { + opline->result_type |= EXT_TYPE_UNUSED; + } if (zend_is_call(source_ast)) { opline->extended_value = ZEND_RETURNS_FUNCTION; @@ -3879,6 +3930,12 @@ void zend_compile_assign_ref(znode *result, zend_ast *ast TSRMLS_DC) { } } +static inline void zend_emit_assign_ref_znode(zend_ast *var_ast, znode *value_node TSRMLS_DC) { + zend_ast *assign_ast = zend_ast_create(ZEND_AST_ASSIGN_REF, var_ast, + zend_ast_create_znode(value_node)); + zend_compile_assign_ref(NULL, assign_ast TSRMLS_CC); +} + void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *var_ast = ast->child[0]; zend_ast *expr_ast = ast->child[1]; @@ -3886,18 +3943,23 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { znode var_node, expr_node; zend_op *opline; + zend_uint offset; zend_ensure_writable_variable(var_ast); - zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); switch (var_ast->kind) { case ZEND_AST_VAR: case ZEND_AST_STATIC_PROP: zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); zend_emit_op(result, opcode, &var_node, &expr_node TSRMLS_CC); return; case ZEND_AST_DIM: - opline = zend_compile_dim_common(result, var_ast, BP_VAR_RW TSRMLS_CC); + offset = zend_delayed_compile_begin(TSRMLS_C); + zend_delayed_compile_dim(result, var_ast, BP_VAR_RW TSRMLS_CC); + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + opline = zend_delayed_compile_end(offset TSRMLS_CC); opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_DIM; @@ -3906,11 +3968,15 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline->op2_type = IS_VAR; return; case ZEND_AST_PROP: - opline = zend_compile_prop_common(result, var_ast, BP_VAR_RW TSRMLS_CC); + offset = zend_delayed_compile_begin(TSRMLS_C); + zend_delayed_compile_prop(result, var_ast, BP_VAR_RW TSRMLS_CC); + zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); + + opline = zend_delayed_compile_end(offset TSRMLS_CC); opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_OBJ; - opline = zend_zend_emit_op_data(&expr_node TSRMLS_CC); + zend_zend_emit_op_data(&expr_node TSRMLS_CC); return; EMPTY_SWITCH_DEFAULT_CASE() } @@ -4048,7 +4114,7 @@ void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *args_ast TS opline->op2_type = IS_CONST; opline->op2.constant = zend_add_ns_func_name_literal( CG(active_op_array), &name_node->u.constant TSRMLS_CC); - GET_CACHE_SLOT(opline->op2.constant); + zend_alloc_cache_slot(opline->op2.constant TSRMLS_CC); zend_compile_call_common(result, args_ast, NULL TSRMLS_CC); } @@ -4061,7 +4127,7 @@ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_a opline->op2_type = IS_CONST; opline->op2.constant = zend_add_func_name_literal(CG(active_op_array), &name_node->u.constant TSRMLS_CC); - GET_CACHE_SLOT(opline->op2.constant); + zend_alloc_cache_slot(opline->op2.constant TSRMLS_CC); } else { SET_NODE(opline->op2, name_node); } @@ -4124,7 +4190,7 @@ int zend_compile_func_defined(znode *result, zend_ast_list *args TSRMLS_DC) { opline = zend_emit_op(result, ZEND_DEFINED, NULL, NULL TSRMLS_CC); opline->op1_type = IS_CONST; LITERAL_STR(opline->op1, name); - GET_CACHE_SLOT(opline->op1.constant); + zend_alloc_cache_slot(opline->op1.constant TSRMLS_CC); /* Lowercase constant name in a separate literal */ { @@ -4321,32 +4387,40 @@ void zend_compile_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { ZVAL_NEW_STR(&name_node.u.constant, lcname); opline = zend_emit_op(NULL, ZEND_INIT_FCALL, NULL, &name_node TSRMLS_CC); - GET_CACHE_SLOT(opline->op2.constant); + zend_alloc_cache_slot(opline->op2.constant TSRMLS_CC); zend_compile_call_common(result, args_ast, fbc TSRMLS_CC); } } void zend_compile_method_call(znode *result, zend_ast *ast, int type TSRMLS_DC) { - //zend_ast *obj_ast = ast->child[0]; - //zend_ast *method_ast = ast->child[1]; + zend_ast *obj_ast = ast->child[0]; + zend_ast *method_ast = ast->child[1]; zend_ast *args_ast = ast->child[2]; - // TODO.AST using an evil overload from AST_METHOD to AST_PROP here ... - zend_op *opline = zend_compile_prop_common(NULL, ast, BP_VAR_R TSRMLS_CC); - opline->opcode = ZEND_INIT_METHOD_CALL; + znode obj_node, method_node; + zend_op *opline; + + if (is_this_fetch(obj_ast)) { + obj_node.op_type = IS_UNUSED; + } else { + zend_compile_var(&obj_node, obj_ast, type TSRMLS_CC); + } - if (opline->op2_type == IS_CONST) { - zval name; - name = CONSTANT(opline->op2.constant); - if (Z_TYPE(name) != IS_STRING) { + zend_compile_expr(&method_node, method_ast TSRMLS_CC); + opline = zend_emit_op(NULL, ZEND_INIT_METHOD_CALL, &obj_node, NULL TSRMLS_CC); + + if (method_node.op_type == IS_CONST) { + if (Z_TYPE(method_node.u.constant) != IS_STRING) { zend_error_noreturn(E_COMPILE_ERROR, "Method name must be a string"); } - Z_STR(name) = STR_COPY(Z_STR(name)); - FREE_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + + opline->op2_type = IS_CONST; opline->op2.constant = - zend_add_func_name_literal(CG(active_op_array), &name TSRMLS_CC); - GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + zend_add_func_name_literal(CG(active_op_array), &method_node.u.constant TSRMLS_CC); + zend_alloc_polymorphic_cache_slot(opline->op2.constant TSRMLS_CC); + } else { + SET_NODE(opline->op2, &method_node); } zend_compile_call_common(result, args_ast, NULL TSRMLS_CC); @@ -4396,9 +4470,9 @@ void zend_compile_static_call(znode *result, zend_ast *ast, int type TSRMLS_DC) opline->op2.constant = zend_add_func_name_literal(CG(active_op_array), &method_node.u.constant TSRMLS_CC); if (opline->op1_type == IS_CONST) { - GET_CACHE_SLOT(opline->op2.constant); + zend_alloc_cache_slot(opline->op2.constant TSRMLS_CC); } else { - GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + zend_alloc_polymorphic_cache_slot(opline->op2.constant TSRMLS_CC); } } else { SET_NODE(opline->op2, &method_node); @@ -4458,7 +4532,7 @@ void zend_compile_global_var(zend_ast *ast TSRMLS_DC) { // TODO.AST Avoid double fetch //opline->extended_value = ZEND_FETCH_GLOBAL_LOCK; - zend_compile_assign_ref_common(NULL, var_ast, &result TSRMLS_CC); + zend_emit_assign_ref_znode(var_ast, &result TSRMLS_CC); } } @@ -4485,14 +4559,10 @@ static void zend_compile_static_var_common( if (by_ref) { zend_ast *fetch_ast = zend_ast_create(ZEND_AST_VAR, var_ast); - zend_compile_assign_ref_common(NULL, fetch_ast, &result TSRMLS_CC); + zend_emit_assign_ref_znode(fetch_ast, &result TSRMLS_CC); } else { zend_ast *fetch_ast = zend_ast_create(ZEND_AST_VAR, var_ast); - zend_ast *znode_ast = zend_ast_create_znode(&result); - zend_ast *assign_ast = zend_ast_create(ZEND_AST_ASSIGN, fetch_ast, znode_ast); - znode dummy_node; - zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); - zend_do_free(&dummy_node TSRMLS_CC); + zend_emit_assign_znode(fetch_ast, &result TSRMLS_CC); } } @@ -4829,28 +4899,20 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) { } if (key_ast) { - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(&key_node, opline->result); + zend_make_tmp_result(&key_node, opline TSRMLS_CC); } if (value_ast->attr == ZEND_AST_LIST) { zend_compile_list_assign(&dummy_node, value_ast, &value_node TSRMLS_CC); zend_do_free(&dummy_node TSRMLS_CC); } else if (by_ref) { - zend_compile_assign_ref_common(NULL, value_ast, &value_node TSRMLS_CC); + zend_emit_assign_ref_znode(value_ast, &value_node TSRMLS_CC); } else { - zend_ast *znode_ast = zend_ast_create_znode(&value_node); - zend_ast *assign_ast = zend_ast_create(ZEND_AST_ASSIGN, value_ast, znode_ast); - zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); - zend_do_free(&dummy_node TSRMLS_CC); + zend_emit_assign_znode(value_ast, &value_node TSRMLS_CC); } if (key_ast) { - zend_ast *znode_ast = zend_ast_create_znode(&key_node); - zend_ast *assign_ast = zend_ast_create(ZEND_AST_ASSIGN, key_ast, znode_ast); - zend_compile_expr(&dummy_node, assign_ast TSRMLS_CC); - zend_do_free(&dummy_node TSRMLS_CC); + zend_emit_assign_znode(key_ast, &key_node TSRMLS_CC); } zend_begin_loop(TSRMLS_C); @@ -5959,9 +6021,7 @@ void zend_compile_class_decl(zend_ast *ast TSRMLS_DC) { } opline = get_next_op(CG(active_op_array) TSRMLS_CC); - opline->result.var = get_temporary_variable(CG(active_op_array)); - opline->result_type = IS_VAR; - GET_NODE(&declare_node, opline->result); + zend_make_var_result(&declare_node, opline TSRMLS_CC); // TODO.AST drop this GET_NODE(&CG(implementing_class), opline->result); @@ -6600,9 +6660,7 @@ void zend_compile_post_incdec(znode *result, zend_ast *ast TSRMLS_DC) { if (var_ast->kind == ZEND_AST_PROP) { zend_op *opline = zend_compile_prop_common(NULL, var_ast, BP_VAR_RW TSRMLS_CC); opline->opcode = ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC_OBJ : ZEND_POST_DEC_OBJ; - opline->result_type = IS_TMP_VAR; - opline->result.var = get_temporary_variable(CG(active_op_array)); - GET_NODE(result, opline->result); + zend_make_tmp_result(result, opline TSRMLS_CC); } else { znode var_node; zend_compile_var(&var_node, var_ast, BP_VAR_RW TSRMLS_CC); @@ -6914,6 +6972,7 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { if (key_ast) { zend_compile_expr(&key_node, key_ast TSRMLS_CC); + zend_handle_numeric_op(&key_node TSRMLS_CC); key_node_ptr = &key_node; } @@ -6934,11 +6993,8 @@ void zend_compile_array(znode *result, zend_ast *ast TSRMLS_DC) { } opline->extended_value |= by_ref; - if (key_ast) { - if (key_node.op_type == IS_CONST && Z_TYPE(key_node.u.constant) == IS_STRING) { - zend_handle_numeric_op2(opline TSRMLS_CC); - packed = 0; - } + if (key_ast && key_node.op_type == IS_CONST && Z_TYPE(key_node.u.constant) == IS_STRING) { + packed = 0; } } @@ -6987,7 +7043,7 @@ void zend_compile_const(znode *result, zend_ast *ast TSRMLS_DC) { CG(active_op_array), &resolved_name, 0 TSRMLS_CC); } } - GET_CACHE_SLOT(opline->op2.constant); + zend_alloc_cache_slot(opline->op2.constant TSRMLS_CC); } void zend_compile_class_const(znode *result, zend_ast *ast TSRMLS_DC) { @@ -7011,9 +7067,9 @@ void zend_compile_class_const(znode *result, zend_ast *ast TSRMLS_DC) { zend_set_class_name_op1(opline, &class_node TSRMLS_CC); if (opline->op1_type == IS_CONST) { - GET_CACHE_SLOT(opline->op2.constant); + zend_alloc_cache_slot(opline->op2.constant TSRMLS_CC); } else { - GET_POLYMORPHIC_CACHE_SLOT(opline->op2.constant); + zend_alloc_polymorphic_cache_slot(opline->op2.constant TSRMLS_CC); } } @@ -7575,6 +7631,9 @@ void zend_compile_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { case ZEND_AST_STATIC_CALL: zend_compile_static_call(result, ast, type TSRMLS_CC); return; + case ZEND_AST_ZNODE: + *result = *zend_ast_get_znode(ast); + return; default: if (type == BP_VAR_W || type == BP_VAR_REF || type == BP_VAR_RW || type == BP_VAR_UNSET @@ -7591,6 +7650,23 @@ void zend_compile_var(znode *result, zend_ast *ast, int type TSRMLS_DC) { } } +void zend_delayed_compile_var(znode *result, zend_ast *ast, zend_uint type TSRMLS_DC) { + zend_op *opline; + switch (ast->kind) { + case ZEND_AST_DIM: + opline = zend_delayed_compile_dim(result, ast, type TSRMLS_CC); + zend_adjust_for_fetch_type(opline, type); + return; + case ZEND_AST_PROP: + opline = zend_delayed_compile_prop(result, ast, type TSRMLS_CC); + zend_adjust_for_fetch_type(opline, type); + return; + default: + zend_compile_var(result, ast, type TSRMLS_CC); + return; + } +} + void zend_eval_const_expr(zend_ast **ast_ptr TSRMLS_DC) { zend_ast *ast = *ast_ptr; zval result; diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 45119218bb..c27d7bc717 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -143,6 +143,8 @@ struct _zend_compiler_globals { zend_ast *ast; zend_arena *ast_arena; + zend_stack delayed_oplines_stack; + #ifdef ZTS zval **static_members_table; int last_static_member; diff --git a/tests/lang/engine_assignExecutionOrder_004.phpt b/tests/lang/engine_assignExecutionOrder_004.phpt index 86bc87f9c7..9471b7f063 100644 --- a/tests/lang/engine_assignExecutionOrder_004.phpt +++ b/tests/lang/engine_assignExecutionOrder_004.phpt @@ -18,15 +18,8 @@ function i3() { return 3; } -function i4() { - global $a; - $a = array(10, 11, 12, 13, 14); - echo "i4\n"; - return 4; -} - -$a = 0; // $a should not be indexable till the i4 has been executed -list($a[i1()+i2()], , list($a[i3()], $a[i4()]), $a[]) = array (0, 1, array(30, 40), 3, 4); +$a = array(10, 11, 12, 13); +list($a[i1()+i2()], , list($a[i3()], $a[])) = array(0, 1, array(30, 40), 3); var_dump($a); @@ -35,8 +28,7 @@ var_dump($a); i1 i2 i3 -i4 -array(6) { +array(5) { [0]=> int(10) [1]=> @@ -47,6 +39,4 @@ array(6) { int(30) [4]=> int(40) - [5]=> - int(3) } -- cgit v1.2.1 From 471f13b75ecdb4353d0f0698a2b1013e9973b64e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 17:27:57 +0200 Subject: Fix s&r mistake --- Zend/zend_compile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 22d5066836..948fc55bf5 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3389,7 +3389,7 @@ static void zend_emit_tick(TSRMLS_D) { opline->extended_value = Z_LVAL(CG(declarables).ticks); } -static inline zend_op *zend_zend_emit_op_data(znode *value TSRMLS_DC) { +static inline zend_op *zend_emit_op_data(znode *value TSRMLS_DC) { return zend_emit_op(NULL, ZEND_OP_DATA, value, NULL TSRMLS_CC); } @@ -3873,7 +3873,7 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline = zend_delayed_compile_end(offset TSRMLS_CC); opline->opcode = ZEND_ASSIGN_DIM; - opline = zend_zend_emit_op_data(&expr_node TSRMLS_CC); + opline = zend_emit_op_data(&expr_node TSRMLS_CC); opline->op2.var = get_temporary_variable(CG(active_op_array)); opline->op2_type = IS_VAR; return; @@ -3885,7 +3885,7 @@ void zend_compile_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline = zend_delayed_compile_end(offset TSRMLS_CC); opline->opcode = ZEND_ASSIGN_OBJ; - zend_zend_emit_op_data(&expr_node TSRMLS_CC); + zend_emit_op_data(&expr_node TSRMLS_CC); return; case ZEND_AST_LIST: zend_compile_expr(&expr_node, expr_ast TSRMLS_CC); @@ -3963,7 +3963,7 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_DIM; - opline = zend_zend_emit_op_data(&expr_node TSRMLS_CC); + opline = zend_emit_op_data(&expr_node TSRMLS_CC); opline->op2.var = get_temporary_variable(CG(active_op_array)); opline->op2_type = IS_VAR; return; @@ -3976,7 +3976,7 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast TSRMLS_DC) { opline->opcode = opcode; opline->extended_value = ZEND_ASSIGN_OBJ; - zend_zend_emit_op_data(&expr_node TSRMLS_CC); + zend_emit_op_data(&expr_node TSRMLS_CC); return; EMPTY_SWITCH_DEFAULT_CASE() } -- cgit v1.2.1 From 919cb32f720561dc5f1c8853173ed2a9970820b5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 17:44:15 +0200 Subject: Fix memory usage test Can't use peak memory usage because memory usage during compilation is now larger --- Zend/tests/bug43450.phpt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zend/tests/bug43450.phpt b/Zend/tests/bug43450.phpt index a94eba312e..f0cd4f75bc 100644 --- a/Zend/tests/bug43450.phpt +++ b/Zend/tests/bug43450.phpt @@ -18,15 +18,15 @@ class Foo $num_repeats = 100000; -$start = (memory_get_usage() / 1024) + 16; +$start = memory_get_usage() / 1024; for ($i=1;$i<$num_repeats;$i++) { $foo = new Foo(); md5($foo); } -$end = memory_get_peak_usage() / 1024; +$end = memory_get_usage() / 1024; -if ($start < $end) { +if ($start + 16 < $end) { echo 'FAIL'; } else { echo 'PASS'; -- cgit v1.2.1 From 7d8383149a9dbecff992351e43bc7beee43767d8 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 18:25:58 +0200 Subject: Fix list() test wrt new assignment order --- tests/lang/engine_assignExecutionOrder_002.phpt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/lang/engine_assignExecutionOrder_002.phpt b/tests/lang/engine_assignExecutionOrder_002.phpt index ba88150dd4..c090a452c3 100644 --- a/tests/lang/engine_assignExecutionOrder_002.phpt +++ b/tests/lang/engine_assignExecutionOrder_002.phpt @@ -26,7 +26,7 @@ $g1 = array(10,10); $g2 = array(20,20); $g3 = array(30,30); $g = array($g1,$g2,$g3); -list($e[$f++],$e[$f++]) = $g[$f]; +list($e[$f++],$e[$f++]) = $g[2]; // expect 30,30 var_dump($e); @@ -39,7 +39,7 @@ $i = array($i1,$i2,$i3,$i4); $j = array(0,0,0); $h = 0; // a list of lists -list(list($j[$h++],$j[$h++]),$j[$h++]) = $i[$h]; +list(list($j[$h++],$j[$h++]),$j[$h++]) = $i[3]; var_dump($j); @@ -116,9 +116,9 @@ L=100 M=200 N=300 O= and P= 10 20 40 50 60 70 80 -Notice: Undefined offset: 1 in %s on line %d - Notice: Undefined offset: 0 in %s on line %d + +Notice: Undefined offset: 1 in %s on line %d Y=,Z= Notice: Undefined offset: 1 in %s on line %d -- cgit v1.2.1 From f7e5308f4b0a5a47c3edf80e14d37768d30213d8 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 18:31:54 +0200 Subject: Fix test to conform with UVS changes --- tests/classes/method_call_variation_001.phpt | 36 ++++++++++------------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/tests/classes/method_call_variation_001.phpt b/tests/classes/method_call_variation_001.phpt index dd43cfd1cb..7950b7deb3 100644 --- a/tests/classes/method_call_variation_001.phpt +++ b/tests/classes/method_call_variation_001.phpt @@ -1,37 +1,27 @@ --TEST-- -In $a->$b[Y](), $b[Y] represents a method name on $a. But in $a->X[Y](), $a->X[Y] represents a global function name. +In $a->$b[Y]() and $a->X[Y]() both $a->$b[Y] and $a->X[Y] represent a global function name --FILE-- $functions[0](1, 2); - $c->$functions[1][2][3][4](3, 4); - - - function foo($a, $b) - { + class C {} + + function foo($a, $b) { echo "Called global foo($a, $b)\n"; } - + + $name = 'functions'; + + $c = new C; $c->functions[0] = 'foo'; $c->functions[1][2][3][4] = 'foo'; + $c->$name[0](1, 2); + $c->$name[1][2][3][4](3, 4); + $c->functions[0](5, 6); $c->functions[1][2][3][4](7, 8); ?> --EXPECTF-- -Called C::foo(1, 2) -Called C::foo(3, 4) +Called global foo(1, 2) +Called global foo(3, 4) Called global foo(5, 6) Called global foo(7, 8) -- cgit v1.2.1 From e607215e47e9138f17fc236d6f02db4f585f9120 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 18:36:58 +0200 Subject: Fix tests to account for warnings moved from RT to CT --- ext/standard/tests/array/array_keys_error.phpt | 2 +- tests/run-test/test005.phpt | 3 ++- tests/run-test/test008a.phpt | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ext/standard/tests/array/array_keys_error.phpt b/ext/standard/tests/array/array_keys_error.phpt index 316e91d7e6..685547f0ec 100644 --- a/ext/standard/tests/array/array_keys_error.phpt +++ b/ext/standard/tests/array/array_keys_error.phpt @@ -9,7 +9,7 @@ var_dump(array_keys("string")); var_dump(array_keys(new stdclass)); // object var_dump(array_keys()); // Zero arguments var_dump(array_keys(array(), "", TRUE, 100)); // args > expected -var_dump(array_keys(array(1,2,3, array() => array()))); // (W)illegal offset +var_dump(array_keys(array(1,2,3, new stdClass => array()))); // (W)illegal offset echo "Done\n"; ?> diff --git a/tests/run-test/test005.phpt b/tests/run-test/test005.phpt index 3d51531ed9..5dcb650444 100644 --- a/tests/run-test/test005.phpt +++ b/tests/run-test/test005.phpt @@ -19,7 +19,8 @@ var_dump(ini_get('track_errors')); ini_set('display_errors', 0); var_dump(ini_get('display_errors')); var_dump($php_errormsg); -$error = 1 / 0; +$zero = 0; +$error = 1 / $zero; var_dump($php_errormsg); ?> --EXPECTF-- diff --git a/tests/run-test/test008a.phpt b/tests/run-test/test008a.phpt index 27da085e04..ff2a93be0f 100644 --- a/tests/run-test/test008a.phpt +++ b/tests/run-test/test008a.phpt @@ -19,7 +19,8 @@ var_dump(ini_get('track_errors')); ini_set('display_errors', 0); var_dump(ini_get('display_errors')); var_dump($php_errormsg); -$error = 1 / 0; +$zero = 0; +$error = 1 / $zero; var_dump($php_errormsg); ?> --EXPECTF-- -- cgit v1.2.1 From fbef2af2c3ac756015d7a8d8bd46dc3096652bbe Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 22:02:53 +0200 Subject: Update opcache for new AST structures --- ext/opcache/zend_accelerator_util_funcs.c | 50 ++++++++++++++++++++----------- ext/opcache/zend_persist.c | 29 +++++++++++++----- ext/opcache/zend_persist_calc.c | 25 +++++++++++----- 3 files changed, 71 insertions(+), 33 deletions(-) diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index ad5f44baa0..0c3b808c63 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -326,28 +326,44 @@ static inline void zend_clone_zval(zval *src, int bind TSRMLS_DC) #if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO static zend_ast *zend_ast_clone(zend_ast *ast TSRMLS_DC) { - int i; - zend_ast *node; - - if (ast->kind == ZEND_CONST) { - node = emalloc(sizeof(zend_ast) + sizeof(zval)); - node->kind = ZEND_CONST; - node->children = 0; - ZVAL_COPY_VALUE(&node->u.val, &ast->u.val); - zend_clone_zval(&node->u.val, 0 TSRMLS_CC); + zend_uint i; + + if (ast->kind == ZEND_AST_ZVAL) { + zend_ast_zval *copy = emalloc(sizeof(zend_ast_zval)); + copy->kind = ZEND_AST_ZVAL; + copy->attr = ast->attr; + ZVAL_COPY_VALUE(©->val, zend_ast_get_zval(ast)); + zend_clone_zval(©->val, 0 TSRMLS_CC); + return (zend_ast *) copy; + } else if (zend_ast_is_list(ast)) { + zend_ast_list *list = zend_ast_get_list(ast); + zend_ast_list *copy = emalloc( + sizeof(zend_ast_list) + sizeof(zend_ast *) * (list->children - 1)); + copy->kind = list->kind; + copy->attr = list->attr; + copy->children = list->children; + for (i = 0; i < list->children; i++) { + if (list->child[i]) { + copy->child[i] = zend_ast_clone(list->child[i] TSRMLS_CC); + } else { + copy->child[i] = NULL; + } + } + return (zend_ast *) copy; } else { - node = emalloc(sizeof(zend_ast) + sizeof(zend_ast*) * (ast->children - 1)); - node->kind = ast->kind; - node->children = ast->children; - for (i = 0; i < ast->children; i++) { - if ((&ast->u.child)[i]) { - (&node->u.child)[i] = zend_ast_clone((&ast->u.child)[i] TSRMLS_CC); + zend_uint children = zend_ast_get_num_children(ast); + zend_ast *copy = emalloc(sizeof(zend_ast) + sizeof(zend_ast *) * (children - 1)); + copy->kind = ast->kind; + copy->attr = ast->attr; + for (i = 0; i < children; i++) { + if (ast->child[i]) { + copy->child[i] = zend_ast_clone(ast->child[i] TSRMLS_CC); } else { - (&node->u.child)[i] = NULL; + copy->child[i] = NULL; } } + return copy; } - return node; } #endif diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index e47cfda894..a01b00e874 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -139,20 +139,33 @@ static void zend_hash_persist_immutable(HashTable *ht TSRMLS_DC) #if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO static zend_ast *zend_persist_ast(zend_ast *ast TSRMLS_DC) { - int i; + zend_uint i; zend_ast *node; - if (ast->kind == ZEND_CONST) { - node = zend_accel_memdup(ast, sizeof(zend_ast)); - zend_persist_zval(&node->u.val TSRMLS_CC); + if (ast->kind == ZEND_AST_ZVAL) { + zend_ast_zval *copy = zend_accel_memdup(ast, sizeof(zend_ast_zval)); + zend_persist_zval(©->val TSRMLS_CC); + node = (zend_ast *) copy; + } else if (zend_ast_is_list(ast)) { + zend_ast_list *list = zend_ast_get_list(ast); + zend_ast_list *copy = zend_accel_memdup(ast, + sizeof(zend_ast) + sizeof(zend_ast *) * (list->children - 1)); + for (i = 0; i < list->children; i++) { + if (copy->child[i]) { + copy->child[i] = zend_persist_ast(copy->child[i] TSRMLS_CC); + } + } + node = (zend_ast *) copy; } else { - node = zend_accel_memdup(ast, sizeof(zend_ast) + sizeof(zend_ast*) * (ast->children - 1)); - for (i = 0; i < ast->children; i++) { - if ((&node->u.child)[i]) { - (&node->u.child)[i] = zend_persist_ast((&node->u.child)[i] TSRMLS_CC); + zend_uint children = zend_ast_get_num_children(ast); + node = zend_accel_memdup(ast, sizeof(zend_ast) + sizeof(zend_ast *) * (children - 1)); + for (i = 0; i < children; i++) { + if (node->child[i]) { + node->child[i] = zend_persist_ast(node->child[i] TSRMLS_CC); } } } + efree(ast); return node; } diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c index b6740db044..dc7f96727c 100644 --- a/ext/opcache/zend_persist_calc.c +++ b/ext/opcache/zend_persist_calc.c @@ -88,17 +88,26 @@ static uint zend_hash_persist_calc(HashTable *ht, uint (*pPersistElement)(zval * #if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO static uint zend_persist_ast_calc(zend_ast *ast TSRMLS_DC) { - int i; + zend_uint i; START_SIZE(); - if (ast->kind == ZEND_CONST) { - ADD_SIZE(sizeof(zend_ast)); - ADD_SIZE(zend_persist_zval_calc(&ast->u.val TSRMLS_CC)); + if (ast->kind == ZEND_AST_ZVAL) { + ADD_SIZE(sizeof(zend_ast_zval)); + ADD_SIZE(zend_persist_zval_calc(zend_ast_get_zval(ast) TSRMLS_CC)); + } else if (zend_ast_is_list(ast)) { + zend_ast_list *list = zend_ast_get_list(ast); + ADD_SIZE(sizeof(zend_ast_list) + sizeof(zend_ast *) * (list->children - 1)); + for (i = 0; i < list->children; i++) { + if (list->child[i]) { + ADD_SIZE(zend_persist_ast_calc(list->child[i] TSRMLS_CC)); + } + } } else { - ADD_SIZE(sizeof(zend_ast) + sizeof(zend_ast*) * (ast->children - 1)); - for (i = 0; i < ast->children; i++) { - if ((&ast->u.child)[i]) { - ADD_SIZE(zend_persist_ast_calc((&ast->u.child)[i] TSRMLS_CC)); + zend_uint children = zend_ast_get_num_children(ast); + ADD_SIZE(sizeof(zend_ast) + sizeof(zend_ast *) * (children - 1)); + for (i = 0; i < children; i++) { + if (ast->child[i]) { + ADD_SIZE(zend_persist_ast_calc(ast->child[i] TSRMLS_CC)); } } } -- cgit v1.2.1 From 99878ced1565ba68fa7f7441d6bc8e1c7480bb39 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 22:07:46 +0200 Subject: ZEND_STRLEN and ZEND_DEFINED have IS_VAR results for now This avoids issues with calls being expected to have an IS_VAR result --- ext/opcache/Optimizer/pass1_5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c index b2e5b1cb3c..5c6f8efed6 100644 --- a/ext/opcache/Optimizer/pass1_5.c +++ b/ext/opcache/Optimizer/pass1_5.c @@ -463,7 +463,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) { zval t; ZVAL_LONG(&t, Z_STRLEN(ZEND_OP1_LITERAL(opline))); - replace_tmp_by_const(op_array, opline + 1, ZEND_RESULT(opline).var, &t TSRMLS_CC); + replace_var_by_const(op_array, opline + 1, ZEND_RESULT(opline).var, &t TSRMLS_CC); literal_dtor(&ZEND_OP1_LITERAL(opline)); MAKE_NOP(opline); } @@ -476,7 +476,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) { break; } ZVAL_TRUE(&c); - replace_tmp_by_const(op_array, opline, tv, &c TSRMLS_CC); + replace_var_by_const(op_array, opline, tv, &c TSRMLS_CC); literal_dtor(&ZEND_OP1_LITERAL(opline)); MAKE_NOP(opline); } -- cgit v1.2.1 From b511bf828cfbff5a6a06196800812671f2b779b8 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 22:13:38 +0200 Subject: Fix typo --- ext/opcache/zend_persist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index a01b00e874..09bca802c6 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -149,7 +149,7 @@ static zend_ast *zend_persist_ast(zend_ast *ast TSRMLS_DC) } else if (zend_ast_is_list(ast)) { zend_ast_list *list = zend_ast_get_list(ast); zend_ast_list *copy = zend_accel_memdup(ast, - sizeof(zend_ast) + sizeof(zend_ast *) * (list->children - 1)); + sizeof(zend_ast_list) + sizeof(zend_ast *) * (list->children - 1)); for (i = 0; i < list->children; i++) { if (copy->child[i]) { copy->child[i] = zend_persist_ast(copy->child[i] TSRMLS_CC); -- cgit v1.2.1 From 9cfbf333b03f1a50394219f9d42871a6564b8ac6 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 22:36:22 +0200 Subject: Fix list() = string refcounting --- Zend/zend_compile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 948fc55bf5..5a3359efa7 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3786,6 +3786,10 @@ static void zend_compile_list_assign(znode *result, zend_ast *ast, znode *expr_n dim_node.op_type = IS_CONST; ZVAL_LONG(&dim_node.u.constant, i); + if (expr_node->op_type == IS_CONST) { + Z_TRY_ADDREF(expr_node->u.constant); + } + opline = zend_emit_op(&fetch_result, get_list_fetch_opcode(expr_node->op_type), expr_node, &dim_node TSRMLS_CC); opline->extended_value |= ZEND_FETCH_ADD_LOCK; -- cgit v1.2.1 From f72d6f97ecf976f00abc0dc21b5d1ef4838de60a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 15 Aug 2014 22:55:15 +0200 Subject: ZEND_INIT_FCALL_BY_NAME can have non-string literal --- ext/opcache/Optimizer/optimize_func_calls.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c index b93fc3667c..9e3ed290bd 100644 --- a/ext/opcache/Optimizer/optimize_func_calls.c +++ b/ext/opcache/Optimizer/optimize_func_calls.c @@ -3,6 +3,10 @@ */ #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO +#define ZEND_OP2_IS_CONST_STRING(opline) \ + (ZEND_OP2_TYPE(opline) == IS_CONST && \ + Z_TYPE(op_array->literals[(opline)->op2.constant]) == IS_STRING) + typedef struct _optimizer_call_info { zend_function *func; zend_op *opline; @@ -25,7 +29,7 @@ static void optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx switch (opline->opcode) { case ZEND_INIT_FCALL_BY_NAME: case ZEND_INIT_NS_FCALL_BY_NAME: - if (ZEND_OP2_TYPE(opline) == IS_CONST) { + if (ZEND_OP2_IS_CONST_STRING(opline)) { zend_function *func; zval *function_name = &op_array->literals[opline->op2.constant + 1]; if ((func = zend_hash_find_ptr(&ctx->script->function_table, @@ -64,7 +68,7 @@ static void optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx } else if (opline->extended_value == 0 && call_stack[call].opline && call_stack[call].opline->opcode == ZEND_INIT_FCALL_BY_NAME && - ZEND_OP2_TYPE(call_stack[call].opline) == IS_CONST) { + ZEND_OP2_IS_CONST_STRING(call_stack[call].opline)) { zend_op *fcall = call_stack[call].opline; -- cgit v1.2.1 From 38a173916c6bd4f38eee02336e3f7e022dca4f16 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 16 Aug 2014 22:08:02 +0200 Subject: Fix merge --- Zend/zend_ast.c | 2 +- Zend/zend_compile.c | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 8e1d970c41..d6995efe88 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -314,7 +314,7 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s } } break; - case ZEND_FETCH_DIM_R: + case ZEND_AST_DIM: zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); { diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 5e0ed6cf7b..fbacd00346 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -613,7 +613,7 @@ void zend_do_free(znode *op1 TSRMLS_DC) /* {{{ */ } } } else if (op1->op_type == IS_CONST) { - zval_dtor(&op1->u.constant); + zval_ptr_dtor(&op1->u.constant); } } /* }}} */ @@ -5738,12 +5738,6 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { zend_const_expr_to_zval(&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) - ) { - zend_error_noreturn(E_COMPILE_ERROR, "Arrays are not allowed in class constants"); - } - name = zend_new_interned_string_safe(name TSRMLS_CC); if (zend_hash_add(&ce->constants_table, name, &value_zv) == NULL) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", @@ -6244,13 +6238,6 @@ void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { value_node.op_type = IS_CONST; zend_const_expr_to_zval(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); } @@ -7156,7 +7143,7 @@ zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) { || kind == ZEND_AST_AND || kind == ZEND_AST_OR || kind == ZEND_AST_UNARY_OP || kind == ZEND_AST_UNARY_PLUS || kind == ZEND_AST_UNARY_MINUS - || kind == ZEND_AST_CONDITIONAL + || kind == ZEND_AST_CONDITIONAL || kind == ZEND_AST_DIM || kind == ZEND_AST_ARRAY || kind == ZEND_AST_ARRAY_ELEM || kind == ZEND_AST_CONST || kind == ZEND_AST_CLASS_CONST || kind == ZEND_AST_RESOLVE_CLASS_NAME || kind == ZEND_AST_MAGIC_CONST; -- cgit v1.2.1 From ef5f3390e78247d9d6dcaf2556c2f858c37898d7 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 16 Aug 2014 22:13:33 +0200 Subject: Implement a[0] syntax from merge --- Zend/zend_language_parser.y | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index cc5f7f2e55..a7e75fb217 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -965,10 +965,16 @@ scalar: | T_START_HEREDOC encaps_list T_END_HEREDOC { $$.ast = $2.ast; } | dereferencable_scalar { $$.ast = $1.ast; } | class_name_scalar { $$.ast = $1.ast; } - | class_constant { $$.ast = $1.ast; } - | name { $$.ast = zend_ast_create(ZEND_AST_CONST, $1.ast); } + | constant { $$.ast = $1.ast; } ; +constant: + name { $$.ast = zend_ast_create(ZEND_AST_CONST, $1.ast); } + | class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING + { $$.ast = zend_ast_create(ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } + | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING + { $$.ast = zend_ast_create(ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } +; possible_comma: /* empty */ @@ -1005,6 +1011,8 @@ callable_variable: { $$.ast = zend_ast_create(ZEND_AST_VAR, $1.ast); } | dereferencable '[' dim_offset ']' { $$.ast = zend_ast_create(ZEND_AST_DIM, $1.ast, $3.ast); } + | constant '[' dim_offset ']' + { $$.ast = zend_ast_create(ZEND_AST_DIM, $1.ast, $3.ast); } | dereferencable '{' expr '}' { $$.ast = zend_ast_create(ZEND_AST_DIM, $1.ast, $3.ast); } | dereferencable T_OBJECT_OPERATOR member_name argument_list @@ -1161,13 +1169,6 @@ isset_variable: expr { $$.ast = zend_ast_create(ZEND_AST_ISSET, $1.ast); } ; -class_constant: - class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.ast = zend_ast_create(ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING - { $$.ast = zend_ast_create(ZEND_AST_CLASS_CONST, $1.ast, $3.ast); } -; - class_name_scalar: class_name T_PAAMAYIM_NEKUDOTAYIM T_CLASS { $$.ast = zend_ast_create(ZEND_AST_RESOLVE_CLASS_NAME, $1.ast); } -- cgit v1.2.1 From ee3d28ed331593c532c812a11e2b3b18574bf176 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 16 Aug 2014 22:29:15 +0200 Subject: Fix compile_args semantics --- Zend/zend_compile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index fbacd00346..59ccee1666 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4008,7 +4008,7 @@ zend_uint zend_compile_args(zend_ast *ast, zend_function *fbc TSRMLS_DC) { zend_compile_expr(&arg_node, arg TSRMLS_CC); if (arg_node.op_type & (IS_VAR|IS_CV)) { opcode = ZEND_SEND_VAR_NO_REF; - if (fbc && ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { + if (fbc && ARG_MUST_BE_SENT_BY_REF(fbc, arg_num)) { flags |= ZEND_ARG_SEND_BY_REF; } } else { -- cgit v1.2.1 From 84e757d22d437dcdaf5dfd08b69032240c69fb13 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 17 Aug 2014 00:37:45 +0200 Subject: Drop znode extended attribute and unused union members --- Zend/zend_compile.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 0d343f0b39..41761ab019 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -75,10 +75,7 @@ typedef struct _znode { /* used only during compilation */ union { znode_op op; zval constant; /* replaced by literal/zv */ - zend_op_array *op_array; - zend_ast *ast; } u; - zend_uint EA; /* extended attributes */ } znode; /* Temporarily defined here, to avoid header ordering issues */ -- cgit v1.2.1 From 1bab755a35ab7ffd5a551f7d9719f7045431dcd0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 17 Aug 2014 19:15:54 +0200 Subject: Fix GC when opcache is in use --- Zend/zend_ast.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index d6995efe88..eb35a51020 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -370,10 +370,16 @@ static void zend_ast_destroy_ex(zend_ast *ast, zend_bool free) { switch (ast->kind) { case ZEND_AST_ZVAL: - zval_ptr_dtor(zend_ast_get_zval(ast)); - break; - case ZEND_AST_ZNODE: + { + /* Destroy value without using GC: When opcache moves arrays into SHM it will + * free the zend_array structure, so references to it from outside the op array + * become invalid. GC would cause such a reference in the root buffer. */ + zval *zv = zend_ast_get_zval(ast); + if (Z_REFCOUNTED_P(zv) && !Z_DELREF_P(zv)) { + _zval_dtor_func_for_ptr(Z_COUNTED_P(zv) ZEND_FILE_LINE_CC); + } break; + } case ZEND_AST_FUNC_DECL: case ZEND_AST_CLOSURE: case ZEND_AST_METHOD: -- cgit v1.2.1 From 2a26cbb70e11c045cbb21966c1053e41b805d18f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 17 Aug 2014 21:45:29 +0200 Subject: Fix dtor in do_free as well We should expose zval_ptr_dtor_nogc outside zend_execute --- Zend/zend_compile.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 59ccee1666..4a04862376 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -613,7 +613,13 @@ void zend_do_free(znode *op1 TSRMLS_DC) /* {{{ */ } } } else if (op1->op_type == IS_CONST) { - zval_ptr_dtor(&op1->u.constant); + /* Destroy value without using GC: When opcache moves arrays into SHM it will + * free the zend_array structure, so references to it from outside the op array + * become invalid. GC would cause such a reference in the root buffer. */ + zval *zv = &op1->u.constant; + if (Z_REFCOUNTED_P(zv) && !Z_DELREF_P(zv)) { + _zval_dtor_func_for_ptr(Z_COUNTED_P(zv) ZEND_FILE_LINE_CC); + } } } /* }}} */ -- cgit v1.2.1 From 458f67cd2109620c5f59305a56c64f07c886720d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 18 Aug 2014 16:07:18 +0200 Subject: Fix encoding declaration handling As the encoding declaration influences lexing it needs to be immidiately handled in the parser. --- Zend/tests/declare_001.phpt | 5 +-- Zend/tests/declare_003.phpt | 5 +-- Zend/zend_compile.c | 86 ++++++++++++++++++++++++--------------------- Zend/zend_compile.h | 1 + Zend/zend_language_parser.y | 6 ++-- 5 files changed, 53 insertions(+), 50 deletions(-) diff --git a/Zend/tests/declare_001.phpt b/Zend/tests/declare_001.phpt index 21d797880e..4eff18045c 100644 --- a/Zend/tests/declare_001.phpt +++ b/Zend/tests/declare_001.phpt @@ -13,7 +13,6 @@ zend.multibyte=1 declare(encoding = 1); declare(encoding = 112313123213131232100); -declare(encoding = NULL); declare(encoding = 'utf-8'); declare(encoding = M_PI); @@ -25,6 +24,4 @@ Warning: Unsupported encoding [1] in %sdeclare_001.php on line %d Warning: Unsupported encoding [1.1231312321313E+20] in %sdeclare_001.php on line %d -Warning: Unsupported encoding [] in %sdeclare_001.php on line %d - -Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line %d +Fatal error: Encoding must be a literal in %s on line %d diff --git a/Zend/tests/declare_003.phpt b/Zend/tests/declare_003.phpt index 2980f7589b..2f3e887380 100644 --- a/Zend/tests/declare_003.phpt +++ b/Zend/tests/declare_003.phpt @@ -8,7 +8,6 @@ zend.multibyte=1 declare(encoding = 1); declare(encoding = 11111111111111); -declare(encoding = NULL); declare(encoding = M_PI); print 'DONE'; @@ -19,6 +18,4 @@ Warning: Unsupported encoding [1] in %sdeclare_003.php on line %d Warning: Unsupported encoding [11111111111111] in %sdeclare_003.php on line %d -Warning: Unsupported encoding [] in %sdeclare_003.php on line %d - -Fatal error: Cannot use constants as encoding in %sdeclare_003.php on line %d +Fatal error: Encoding must be a literal in %s on line %d diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4a04862376..5b35233765 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5113,61 +5113,31 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { efree(jmp_opnums); } -void zend_compile_declare(zend_ast *ast TSRMLS_DC) { - zend_ast_list *declares = zend_ast_get_list(ast->child[0]); - zend_ast *stmt_ast = ast->child[1]; - zend_declarables orig_declarables = CG(declarables); +/* Encoding declarations must already be handled during parsing */ +void zend_handle_encoding_declaration(zend_ast_list *declares TSRMLS_DC) { zend_uint i; - for (i = 0; i < declares->children; ++i) { zend_ast *declare_ast = declares->child[i]; zend_ast *name_ast = declare_ast->child[0]; zend_ast *value_ast = declare_ast->child[1]; - zend_string *name = zend_ast_get_str(name_ast); - zval value_zv; - - zend_const_expr_to_zval(&value_zv, value_ast TSRMLS_CC); - - if (zend_str_equals_literal_ci(name, "ticks")) { - convert_to_long(&value_zv); - ZVAL_COPY_VALUE(&CG(declarables).ticks, &value_zv); - } else if (zend_str_equals_literal_ci(name, "encoding")) { - if (Z_TYPE(value_zv) == IS_CONSTANT) { - zend_error_noreturn(E_COMPILE_ERROR, "Cannot use constants as encoding"); - } - - /* - * Check that the pragma comes before any opcodes. If the compilation - * got as far as this, the previous portion of the script must have been - * parseable according to the .ini script_encoding setting. We still - * want to tell them to put declare() at the top. - */ - { - zend_uint num = CG(active_op_array)->last; - /* ignore ZEND_EXT_STMT and ZEND_TICKS */ - while (num > 0 && - (CG(active_op_array)->opcodes[num-1].opcode == ZEND_EXT_STMT || - CG(active_op_array)->opcodes[num-1].opcode == ZEND_TICKS)) { - --num; - } - if (num > 0) { - zend_error_noreturn(E_COMPILE_ERROR, "Encoding declaration pragma must be " - "the very first statement in the script"); - } + if (zend_str_equals_literal_ci(name, "encoding")) { + if (value_ast->kind != ZEND_AST_ZVAL) { + zend_error_noreturn(E_COMPILE_ERROR, "Encoding must be a literal"); } if (CG(multibyte)) { + zend_string *encoding_name = zval_get_string(zend_ast_get_zval(value_ast)); + const zend_encoding *new_encoding, *old_encoding; zend_encoding_filter old_input_filter; CG(encoding_declared) = 1; - convert_to_string(&value_zv); - new_encoding = zend_multibyte_fetch_encoding(Z_STRVAL(value_zv) TSRMLS_CC); + new_encoding = zend_multibyte_fetch_encoding(encoding_name->val TSRMLS_CC); if (!new_encoding) { - zend_error(E_COMPILE_WARNING, "Unsupported encoding [%s]", Z_STRVAL(value_zv)); + zend_error(E_COMPILE_WARNING, "Unsupported encoding [%s]", encoding_name->val); } else { old_input_filter = LANG_SCNG(input_filter); old_encoding = LANG_SCNG(script_encoding); @@ -5179,14 +5149,50 @@ void zend_compile_declare(zend_ast *ast TSRMLS_DC) { zend_multibyte_yyinput_again(old_input_filter, old_encoding TSRMLS_CC); } } + + STR_RELEASE(encoding_name); } else { zend_error(E_COMPILE_WARNING, "declare(encoding=...) ignored because " "Zend multibyte feature is turned off by settings"); } + } + } +} + +void zend_compile_declare(zend_ast *ast TSRMLS_DC) { + zend_ast_list *declares = zend_ast_get_list(ast->child[0]); + zend_ast *stmt_ast = ast->child[1]; + zend_declarables orig_declarables = CG(declarables); + zend_uint i; + + for (i = 0; i < declares->children; ++i) { + zend_ast *declare_ast = declares->child[i]; + zend_ast *name_ast = declare_ast->child[0]; + zend_ast *value_ast = declare_ast->child[1]; + + zend_string *name = zend_ast_get_str(name_ast); + if (zend_str_equals_literal_ci(name, "ticks")) { + zval value_zv; + zend_const_expr_to_zval(&value_zv, value_ast TSRMLS_CC); + convert_to_long(&value_zv); + ZVAL_COPY_VALUE(&CG(declarables).ticks, &value_zv); zval_dtor(&value_zv); + } else if (zend_str_equals_literal_ci(name, "encoding")) { + /* Encoding declaration was already handled during parsing. Here we + * only check that it is the first statement in the file. */ + zend_uint num = CG(active_op_array)->last; + while (num > 0 && + (CG(active_op_array)->opcodes[num-1].opcode == ZEND_EXT_STMT || + CG(active_op_array)->opcodes[num-1].opcode == ZEND_TICKS)) { + --num; + } + + if (num > 0) { + zend_error_noreturn(E_COMPILE_ERROR, "Encoding declaration pragma must be " + "the very first statement in the script"); + } } else { zend_error(E_COMPILE_WARNING, "Unsupported declare '%s'", name->val); - zval_dtor(&value_zv); } } diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 41761ab019..cecba02661 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -453,6 +453,7 @@ 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); zend_ast_list *zend_ast_append_doc_comment(zend_ast_list *list TSRMLS_DC); +void zend_handle_encoding_declaration(zend_ast_list *declares TSRMLS_DC); /* parser-driven code generators */ void zend_do_free(znode *op1 TSRMLS_DC); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index a7e75fb217..340371aba6 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -349,8 +349,10 @@ unticked_statement: foreach_statement { $$.ast = zend_ast_create(ZEND_AST_FOREACH, $3.ast, $7.ast, $5.ast, $9.ast); } - | T_DECLARE '(' const_list ')' declare_statement - { $$.ast = zend_ast_create(ZEND_AST_DECLARE, $3.ast, $5.ast); } + | T_DECLARE '(' const_list ')' + { zend_handle_encoding_declaration($3.list TSRMLS_CC); } + declare_statement + { $$.ast = zend_ast_create(ZEND_AST_DECLARE, $3.ast, $6.ast); } | ';' /* empty statement */ { $$.ast = NULL; } | T_TRY '{' inner_statement_list '}' catch_list finally_statement { $$.ast = zend_ast_create(ZEND_AST_TRY, $3.ast, $5.ast, $6.ast); } -- cgit v1.2.1 From ce9971231598f6a51a028ab8222063efdf403255 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 18 Aug 2014 18:20:34 +0200 Subject: Adjust serialization tests to not rely on auto-vivification order --- ext/standard/tests/serialize/serialization_arrays_002.phpt | 12 ++++++------ ext/standard/tests/serialize/serialization_objects_013.phpt | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ext/standard/tests/serialize/serialization_arrays_002.phpt b/ext/standard/tests/serialize/serialization_arrays_002.phpt index f8cef7818e..c62ff6a91c 100644 --- a/ext/standard/tests/serialize/serialization_arrays_002.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt @@ -37,16 +37,16 @@ check($a); echo "\n\n--- 0 refs 1:\n"; $a = array(); -$a[0] = &$a[1]; $a[1] = 1; +$a[0] = &$a[1]; $a[2] = 1; check($a); echo "\n\n--- 0 refs 2:\n"; $a = array(); +$a[2] = 1; $a[0] = &$a[2]; $a[1] = 1; -$a[2] = 1; check($a); echo "\n\n--- 1 refs 0:\n"; @@ -59,8 +59,8 @@ check($a); echo "\n\n--- 1 refs 2:\n"; $a = array(); $a[0] = 1; -$a[1] = &$a[2]; $a[2] = 1; +$a[1] = &$a[2]; check($a); echo "\n\n--- 2 refs 0:\n"; @@ -79,15 +79,15 @@ check($a); echo "\n\n--- 0,1 ref 2:\n"; $a = array(); +$a[2] = 1; $a[0] = &$a[2]; $a[1] = &$a[2]; -$a[2] = 1; check($a); echo "\n\n--- 0,2 ref 1:\n"; $a = array(); -$a[0] = &$a[1]; $a[1] = 1; +$a[0] = &$a[1]; $a[2] = &$a[1]; check($a); @@ -541,4 +541,4 @@ array(3) { [2]=> &string(10) "b2.changed" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt index 01b623cb0d..403f9de08c 100644 --- a/ext/standard/tests/serialize/serialization_objects_013.phpt +++ b/ext/standard/tests/serialize/serialization_objects_013.phpt @@ -32,16 +32,16 @@ function check(&$obj) { echo "\n\n--- a refs b:\n"; $obj = new stdClass; -$obj->a = &$obj->b; $obj->b = 1; +$obj->a = &$obj->b; $obj->c = 1; check($obj); echo "\n\n--- a refs c:\n"; $obj = new stdClass; +$obj->c = 1; $obj->a = &$obj->c; $obj->b = 1; -$obj->c = 1; check($obj); echo "\n\n--- b refs a:\n"; @@ -54,8 +54,8 @@ check($obj); echo "\n\n--- b refs c:\n"; $obj = new stdClass; $obj->a = 1; -$obj->b = &$obj->c; $obj->c = 1; +$obj->b = &$obj->c; check($obj); echo "\n\n--- c refs a:\n"; @@ -74,15 +74,15 @@ check($obj); echo "\n\n--- a,b refs c:\n"; $obj = new stdClass; +$obj->c = 1; $obj->a = &$obj->c; $obj->b = &$obj->c; -$obj->c = 1; check($obj); echo "\n\n--- a,c refs b:\n"; $obj = new stdClass; -$obj->a = &$obj->b; $obj->b = 1; +$obj->a = &$obj->b; $obj->c = &$obj->b; check($obj); @@ -491,4 +491,4 @@ object(stdClass)#%d (3) { ["c"]=> &string(14) "obj->c.changed" } -Done \ No newline at end of file +Done -- cgit v1.2.1 From 69f0deb399eec76bc8afa97fa383b08a207582fb Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 19 Aug 2014 11:38:09 +0200 Subject: Fix ast size computation in case of zero children --- Zend/zend_ast.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index eb35a51020..822698a354 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -34,11 +34,11 @@ static inline void *zend_ast_realloc(void *old, size_t old_size, size_t new_size } size_t zend_ast_size(zend_uint children) { - return sizeof(zend_ast) + sizeof(zend_ast *) * (children - 1); + return sizeof(zend_ast) - sizeof(zend_ast *) + sizeof(zend_ast *) * children; } size_t zend_ast_list_size(zend_uint children) { - return sizeof(zend_ast_list) + sizeof(zend_ast *) * (children - 1); + return sizeof(zend_ast_list) - sizeof(zend_ast *) + sizeof(zend_ast *) * children; } ZEND_API zend_ast *zend_ast_create_znode(znode *node) { -- cgit v1.2.1 From 0a230fb4dbb747d7fee209f6c6f50e573c419368 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 19 Aug 2014 12:01:54 +0200 Subject: Fix add_class_name_literal (thanks laruence) --- Zend/zend_compile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 5b35233765..8c15a90022 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -428,6 +428,7 @@ static int zend_add_class_name_literal(zend_op_array *op_array, zend_string *nam ZVAL_STR(&zv, name); ret = zend_add_literal(op_array, &zv TSRMLS_CC); + name = Z_STR(zv); /* Load new name string in case it was interned */ lc_name = STR_ALLOC(name->len, 0); zend_str_tolower_copy(lc_name->val, name->val, name->len); -- cgit v1.2.1 From 7813d85d3d5901b24f77b63538eb6754e161f471 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 25 Aug 2014 19:46:21 +0200 Subject: Fix for C89 --- Zend/zend_compile.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8c15a90022..4b292d5bef 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -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); } } -- cgit v1.2.1