From e0247de14701e38853a2a93b9763d60dd1df9bc8 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 30 Apr 2014 20:48:02 +0200 Subject: [PATCH] zend_stack_top() now returns pointer directly --- Zend/zend_builtin_functions.c | 6 +- Zend/zend_compile.c | 76 ++-- Zend/zend_ini_scanner.c | 231 ++++++----- Zend/zend_ini_scanner.l | 3 +- Zend/zend_language_scanner.c | 703 +++++++++++++++++----------------- Zend/zend_language_scanner.l | 3 +- Zend/zend_stack.c | 18 +- Zend/zend_stack.h | 2 +- main/output.c | 6 +- 9 files changed, 505 insertions(+), 543 deletions(-) diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index d858fe7982..bc998abc3c 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1517,7 +1517,7 @@ ZEND_FUNCTION(restore_error_handler) zval *tmp; EG(user_error_handler_error_reporting) = zend_stack_int_top(&EG(user_error_handlers_error_reporting)); zend_stack_del_top(&EG(user_error_handlers_error_reporting)); - zend_stack_top(&EG(user_error_handlers), (void**)&tmp); + tmp = zend_stack_top(&EG(user_error_handlers)); ZVAL_COPY_VALUE(&EG(user_error_handler), tmp); zend_stack_del_top(&EG(user_error_handlers)); } @@ -1573,9 +1573,7 @@ ZEND_FUNCTION(restore_exception_handler) if (zend_stack_is_empty(&EG(user_exception_handlers))) { ZVAL_UNDEF(&EG(user_exception_handler)); } else { - zval *tmp; - - zend_stack_top(&EG(user_exception_handlers), (void**)&tmp); + zval *tmp = zend_stack_top(&EG(user_exception_handlers)); ZVAL_COPY_VALUE(&EG(user_exception_handler), tmp); zend_stack_del_top(&EG(user_exception_handlers)); } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 232e9ae661..65cbbc9709 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -661,7 +661,6 @@ void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar { zend_op opline; zend_op *opline_ptr; - zend_llist *fetch_list_ptr; if (varname->op_type == IS_CONST) { if (Z_TYPE(varname->u.constant) != IS_STRING) { @@ -703,7 +702,7 @@ void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar } if (bp) { - zend_stack_top(&CG(bp_stack), (void **) &fetch_list_ptr); + zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); zend_llist_add_element(fetch_list_ptr, opline_ptr); } } @@ -731,7 +730,7 @@ 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_stack_top(&CG(bp_stack), (void **) &fetch_list_ptr); + fetch_list_ptr = zend_stack_top(&CG(bp_stack)); if (result->op_type == IS_CV) { init_op(&opline TSRMLS_CC); @@ -804,9 +803,7 @@ 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) /* {{{ */ { zend_op opline; - zend_llist *fetch_list_ptr; - - zend_stack_top(&CG(bp_stack), (void **) &fetch_list_ptr); + zend_llist *fetch_list_ptr = zend_stack_top(&CG(bp_stack)); if (zend_is_function_or_method_call(parent)) { init_op(&opline TSRMLS_CC); @@ -924,9 +921,7 @@ void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC) /* { zend_op *opline; if (value->op_type == IS_CV) { - zend_llist *fetch_list_ptr; - - zend_stack_top(&CG(bp_stack), (void **) &fetch_list_ptr); + 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; @@ -1245,7 +1240,7 @@ void zend_do_if_after_statement(const znode *closing_bracket_token, unsigned cha zend_llist_init(&jmp_list, sizeof(int), NULL, 0); zend_stack_push(&CG(bp_stack), (void *) &jmp_list); } - zend_stack_top(&CG(bp_stack), (void **) &jmp_list_ptr); + 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; @@ -1257,10 +1252,9 @@ void zend_do_if_after_statement(const znode *closing_bracket_token, unsigned cha 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_llist *jmp_list_ptr = zend_stack_top(&CG(bp_stack)); zend_llist_element *le; - zend_stack_top(&CG(bp_stack), (void **) &jmp_list_ptr); for (le=jmp_list_ptr->head; le; le = le->next) { CG(active_op_array)->opcodes[*((int *) le->data)].op1.opline_num = next_op_number; } @@ -1294,16 +1288,12 @@ void zend_do_begin_variable_parse(TSRMLS_D) /* {{{ */ void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS_DC) /* {{{ */ { - zend_llist *fetch_list_ptr; - zend_llist_element *le; + 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; - zend_stack_top(&CG(bp_stack), (void **) &fetch_list_ptr); - - le = fetch_list_ptr->head; - /* TODO: $foo->x->y->z = 1 should fetch "x" and "y" for R or RW, not just W */ if (le) { @@ -2462,9 +2452,7 @@ void zend_release_labels(int temporary TSRMLS_DC) /* {{{ */ CG(context).labels = NULL; } if (!temporary && !zend_stack_is_empty(&CG(context_stack))) { - zend_compiler_context *ctx; - - zend_stack_top(&CG(context_stack), (void**)&ctx); + zend_compiler_context *ctx = zend_stack_top(&CG(context_stack)); CG(context) = *ctx; zend_stack_del_top(&CG(context_stack)); } @@ -2564,8 +2552,7 @@ int zend_do_begin_class_member_function_call(znode *class_name, znode *method_na void zend_do_end_function_call(znode *function_name, znode *result, int is_method, int is_dynamic_fcall TSRMLS_DC) /* {{{ */ { zend_op *opline; - zend_function_call_entry *fcall; - zend_stack_top(&CG(function_call_stack), (void **) &fcall); + zend_function_call_entry *fcall = zend_stack_top(&CG(function_call_stack)); if (is_method && function_name && function_name->op_type == IS_UNUSED) { /* clone */ @@ -2613,13 +2600,11 @@ 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_function *function_ptr; + 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; - zend_stack_top(&CG(function_call_stack), (void **) &fcall); - function_ptr = fcall->fbc; fcall->arg_num++; if (fcall->uses_argument_unpacking) { @@ -2727,9 +2712,8 @@ void zend_do_pass_param(znode *param, zend_uchar op TSRMLS_DC) /* {{{ */ void zend_do_unpack_params(znode *params TSRMLS_DC) /* {{{ */ { zend_op *opline; - zend_function_call_entry *fcall; + zend_function_call_entry *fcall = zend_stack_top(&CG(function_call_stack)); - zend_stack_top(&CG(function_call_stack), (void **) &fcall); fcall->uses_argument_unpacking = 1; if (fcall->fbc) { @@ -2939,7 +2923,7 @@ void zend_initialize_try_catch_element(znode *catch_token TSRMLS_DC) /* {{{ */ zend_llist_init(&jmp_list, sizeof(int), NULL, 0); zend_stack_push(&CG(bp_stack), (void *) &jmp_list); - zend_stack_top(&CG(bp_stack), (void **) &jmp_list_ptr); + 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)); @@ -3033,7 +3017,7 @@ void zend_do_end_catch(znode *catch_token TSRMLS_DC) /* {{{ */ SET_UNUSED(opline->op2); /* save for backpatching */ - zend_stack_top(&CG(bp_stack), (void **) &jmp_list_ptr); + 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)); @@ -5006,9 +4990,7 @@ void zend_do_switch_cond(const znode *cond TSRMLS_DC) /* {{{ */ 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), (void **) &switch_entry_ptr); + 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) { @@ -5050,11 +5032,9 @@ void zend_do_case_before_statement(const znode *case_list, znode *case_token, zn { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); int next_op_number; - zend_switch_entry *switch_entry_ptr; + zend_switch_entry *switch_entry_ptr = zend_stack_top(&CG(switch_cond_stack)); znode result; - zend_stack_top(&CG(switch_cond_stack), (void **) &switch_entry_ptr); - if (switch_entry_ptr->control_var == -1) { switch_entry_ptr->control_var = get_temporary_variable(CG(active_op_array)); } @@ -5108,9 +5088,7 @@ void zend_do_default_before_statement(const znode *case_list, znode *default_tok { 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), (void **) &switch_entry_ptr); + zend_switch_entry *switch_entry_ptr = zend_stack_top(&CG(switch_cond_stack)); opline->opcode = ZEND_JMP; SET_UNUSED(opline->op1); @@ -5514,9 +5492,7 @@ 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), (void **) &fetch_list_ptr); + 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) { @@ -5614,9 +5590,7 @@ void zend_do_push_object(const znode *object TSRMLS_DC) /* {{{ */ void zend_do_pop_object(znode *object TSRMLS_DC) /* {{{ */ { if (object) { - znode *tmp; - - zend_stack_top(&CG(object_stack), (void **) &tmp); + znode *tmp = zend_stack_top(&CG(object_stack)); *object = *tmp; } zend_stack_del_top(&CG(object_stack)); @@ -6084,10 +6058,10 @@ void zend_do_list_end(znode *result, znode *expr TSRMLS_DC) /* {{{ */ zend_llist *p; /* restore previous lists */ - zend_stack_top(&CG(list_stack), (void **) &p); + p = zend_stack_top(&CG(list_stack)); CG(dimension_llist) = *p; zend_stack_del_top(&CG(list_stack)); - zend_stack_top(&CG(list_stack), (void **) &p); + p = zend_stack_top(&CG(list_stack)); CG(list_llist) = *p; zend_stack_del_top(&CG(list_stack)); } @@ -6553,7 +6527,7 @@ void zend_do_foreach_end(const znode *foreach_token, const znode *as_token TSRML do_end_loop(as_token->u.op.opline_num, 1 TSRMLS_CC); - zend_stack_top(&CG(foreach_copy_stack), (void **) &container_ptr); + 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)); @@ -6632,9 +6606,7 @@ void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC) /* {{{ */ void zend_do_declare_end(const znode *declare_token TSRMLS_DC) /* {{{ */ { - zend_declarables *declarables; - - zend_stack_top(&CG(declare_stack), (void **) &declarables); + 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; diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c index 9ade1497d8..b71f1ccb3c 100644 --- a/Zend/zend_ini_scanner.c +++ b/Zend/zend_ini_scanner.c @@ -152,8 +152,7 @@ static void _yy_push_state(int new_state TSRMLS_DC) static void yy_pop_state(TSRMLS_D) { - int *stack_state; - zend_stack_top(&SCNG(state_stack), (void **) &stack_state); + int *stack_state = zend_stack_top(&SCNG(state_stack)); YYSETCONDITION(*stack_state); zend_stack_del_top(&SCNG(state_stack)); } @@ -331,7 +330,7 @@ restart: } } -#line 335 "Zend/zend_ini_scanner.c" +#line 334 "Zend/zend_ini_scanner.c" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -460,7 +459,7 @@ yy2: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 427 "Zend/zend_ini_scanner.l" +#line 426 "Zend/zend_ini_scanner.l" { /* Get option name */ /* Eat leading whitespace */ EAT_LEADING_WHITESPACE(); @@ -470,7 +469,7 @@ yy3: RETURN_TOKEN(TC_LABEL, yytext, yyleng); } -#line 474 "Zend/zend_ini_scanner.c" +#line 473 "Zend/zend_ini_scanner.c" yy4: YYDEBUG(4, *YYCURSOR); yyaccept = 0; @@ -479,24 +478,24 @@ yy4: yy5: YYDEBUG(5, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 573 "Zend/zend_ini_scanner.l" +#line 572 "Zend/zend_ini_scanner.l" { /* eat whitespace */ goto restart; } -#line 488 "Zend/zend_ini_scanner.c" +#line 487 "Zend/zend_ini_scanner.c" yy6: YYDEBUG(6, *YYCURSOR); ++YYCURSOR; yy7: YYDEBUG(7, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 578 "Zend/zend_ini_scanner.l" +#line 577 "Zend/zend_ini_scanner.l" { SCNG(lineno)++; return END_OF_LINE; } -#line 500 "Zend/zend_ini_scanner.c" +#line 499 "Zend/zend_ini_scanner.c" yy8: YYDEBUG(8, *YYCURSOR); yych = *++YYCURSOR; @@ -531,11 +530,11 @@ yy10: ++YYCURSOR; YYDEBUG(11, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 501 "Zend/zend_ini_scanner.l" +#line 500 "Zend/zend_ini_scanner.l" { /* Disallow these chars outside option values */ return yytext[0]; } -#line 539 "Zend/zend_ini_scanner.c" +#line 538 "Zend/zend_ini_scanner.c" yy12: YYDEBUG(12, *YYCURSOR); yyaccept = 1; @@ -552,11 +551,11 @@ yy14: goto yy54; YYDEBUG(15, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 601 "Zend/zend_ini_scanner.l" +#line 600 "Zend/zend_ini_scanner.l" { return 0; } -#line 560 "Zend/zend_ini_scanner.c" +#line 559 "Zend/zend_ini_scanner.c" yy16: YYDEBUG(16, *YYCURSOR); ++YYCURSOR; @@ -565,7 +564,7 @@ yy16: yy17: YYDEBUG(17, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 437 "Zend/zend_ini_scanner.l" +#line 436 "Zend/zend_ini_scanner.l" { /* Start option value */ if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) { yy_push_state(ST_RAW TSRMLS_CC); @@ -574,7 +573,7 @@ yy17: } return '='; } -#line 578 "Zend/zend_ini_scanner.c" +#line 577 "Zend/zend_ini_scanner.c" yy18: YYDEBUG(18, *YYCURSOR); yych = *++YYCURSOR; @@ -630,7 +629,7 @@ yy23: ++YYCURSOR; YYDEBUG(24, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 356 "Zend/zend_ini_scanner.l" +#line 355 "Zend/zend_ini_scanner.l" { /* Section start */ /* Enter section data lookup state */ if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) { @@ -640,7 +639,7 @@ yy23: } return TC_SECTION; } -#line 644 "Zend/zend_ini_scanner.c" +#line 643 "Zend/zend_ini_scanner.c" yy25: YYDEBUG(25, *YYCURSOR); ++YYCURSOR; @@ -670,7 +669,7 @@ yy28: } YYDEBUG(30, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 381 "Zend/zend_ini_scanner.l" +#line 380 "Zend/zend_ini_scanner.l" { /* Start of option with offset */ /* Eat leading whitespace */ EAT_LEADING_WHITESPACE(); @@ -683,7 +682,7 @@ yy28: RETURN_TOKEN(TC_OFFSET, yytext, yyleng); } -#line 687 "Zend/zend_ini_scanner.c" +#line 686 "Zend/zend_ini_scanner.c" yy31: YYDEBUG(31, *YYCURSOR); ++YYCURSOR; @@ -729,11 +728,11 @@ yy31: yy33: YYDEBUG(33, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 419 "Zend/zend_ini_scanner.l" +#line 418 "Zend/zend_ini_scanner.l" { /* TRUE value (when used outside option value/offset this causes parse error!) */ RETURN_TOKEN(BOOL_TRUE, "1", 1); } -#line 737 "Zend/zend_ini_scanner.c" +#line 736 "Zend/zend_ini_scanner.c" yy34: YYDEBUG(34, *YYCURSOR); ++YYCURSOR; @@ -803,11 +802,11 @@ yy39: yy41: YYDEBUG(41, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 423 "Zend/zend_ini_scanner.l" +#line 422 "Zend/zend_ini_scanner.l" { /* FALSE value (when used outside option value/offset this causes parse error!)*/ RETURN_TOKEN(BOOL_FALSE, "", 0); } -#line 811 "Zend/zend_ini_scanner.c" +#line 810 "Zend/zend_ini_scanner.c" yy42: YYDEBUG(42, *YYCURSOR); ++YYCURSOR; @@ -924,13 +923,13 @@ yy55: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 583 "Zend/zend_ini_scanner.l" +#line 582 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 934 "Zend/zend_ini_scanner.c" +#line 933 "Zend/zend_ini_scanner.c" yy57: YYDEBUG(57, *YYCURSOR); yych = *++YYCURSOR; @@ -1009,14 +1008,14 @@ yy64: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 589 "Zend/zend_ini_scanner.l" +#line 588 "Zend/zend_ini_scanner.l" { /* #Comment */ zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno)); BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 1020 "Zend/zend_ini_scanner.c" +#line 1019 "Zend/zend_ini_scanner.c" yy66: YYDEBUG(66, *YYCURSOR); yych = *++YYCURSOR; @@ -1156,7 +1155,7 @@ yyc_ST_DOUBLE_QUOTES: yy76: YYDEBUG(76, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 533 "Zend/zend_ini_scanner.l" +#line 532 "Zend/zend_ini_scanner.l" { /* Escape double quoted string contents */ if (YYCURSOR > YYLIMIT) { return 0; @@ -1192,7 +1191,7 @@ yy76: zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC); return TC_QUOTED_STRING; } -#line 1196 "Zend/zend_ini_scanner.c" +#line 1195 "Zend/zend_ini_scanner.c" yy77: YYDEBUG(77, *YYCURSOR); ++YYCURSOR; @@ -1201,12 +1200,12 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 528 "Zend/zend_ini_scanner.l" +#line 527 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string ends */ yy_pop_state(TSRMLS_C); return '"'; } -#line 1210 "Zend/zend_ini_scanner.c" +#line 1209 "Zend/zend_ini_scanner.c" yy79: YYDEBUG(79, *YYCURSOR); yych = *++YYCURSOR; @@ -1215,12 +1214,12 @@ yy79: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 399 "Zend/zend_ini_scanner.l" +#line 398 "Zend/zend_ini_scanner.l" { /* Variable start */ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 1224 "Zend/zend_ini_scanner.c" +#line 1223 "Zend/zend_ini_scanner.c" yy82: YYDEBUG(82, *YYCURSOR); ++YYCURSOR; @@ -1320,11 +1319,11 @@ yy86: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 519 "Zend/zend_ini_scanner.l" +#line 518 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } -#line 1328 "Zend/zend_ini_scanner.c" +#line 1327 "Zend/zend_ini_scanner.c" yy88: YYDEBUG(88, *YYCURSOR); yyaccept = 0; @@ -1341,23 +1340,23 @@ yy89: yy90: YYDEBUG(90, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 601 "Zend/zend_ini_scanner.l" +#line 600 "Zend/zend_ini_scanner.l" { return 0; } -#line 1349 "Zend/zend_ini_scanner.c" +#line 1348 "Zend/zend_ini_scanner.c" yy91: YYDEBUG(91, *YYCURSOR); ++YYCURSOR; yy92: YYDEBUG(92, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 523 "Zend/zend_ini_scanner.l" +#line 522 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); return '"'; } -#line 1361 "Zend/zend_ini_scanner.c" +#line 1360 "Zend/zend_ini_scanner.c" yy93: YYDEBUG(93, *YYCURSOR); yych = *++YYCURSOR; @@ -1419,11 +1418,11 @@ yy97: yy98: YYDEBUG(98, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 497 "Zend/zend_ini_scanner.l" +#line 496 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } -#line 1427 "Zend/zend_ini_scanner.c" +#line 1426 "Zend/zend_ini_scanner.c" yy99: YYDEBUG(99, *YYCURSOR); yyaccept = 3; @@ -1449,11 +1448,11 @@ yy99: yy100: YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 493 "Zend/zend_ini_scanner.l" +#line 492 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } -#line 1457 "Zend/zend_ini_scanner.c" +#line 1456 "Zend/zend_ini_scanner.c" yy101: YYDEBUG(101, *YYCURSOR); yych = *++YYCURSOR; @@ -1464,12 +1463,12 @@ yy102: yy103: YYDEBUG(103, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 394 "Zend/zend_ini_scanner.l" +#line 393 "Zend/zend_ini_scanner.l" { /* End of section or an option offset */ BEGIN(INITIAL); return ']'; } -#line 1473 "Zend/zend_ini_scanner.c" +#line 1472 "Zend/zend_ini_scanner.c" yy104: YYDEBUG(104, *YYCURSOR); yyaccept = 0; @@ -1759,7 +1758,7 @@ yy125: ++YYCURSOR; YYDEBUG(128, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 366 "Zend/zend_ini_scanner.l" +#line 365 "Zend/zend_ini_scanner.l" { /* Raw string */ /* Eat leading and trailing single quotes */ if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') { @@ -1768,18 +1767,18 @@ yy125: } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 1772 "Zend/zend_ini_scanner.c" +#line 1771 "Zend/zend_ini_scanner.c" yy129: YYDEBUG(129, *YYCURSOR); ++YYCURSOR; YYDEBUG(130, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 399 "Zend/zend_ini_scanner.l" +#line 398 "Zend/zend_ini_scanner.l" { /* Variable start */ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 1783 "Zend/zend_ini_scanner.c" +#line 1782 "Zend/zend_ini_scanner.c" yy131: YYDEBUG(131, *YYCURSOR); yyaccept = 0; @@ -1884,19 +1883,19 @@ yyc_ST_RAW: ++YYCURSOR; YYDEBUG(138, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 596 "Zend/zend_ini_scanner.l" +#line 595 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); return END_OF_LINE; } -#line 1893 "Zend/zend_ini_scanner.c" +#line 1892 "Zend/zend_ini_scanner.c" yy139: YYDEBUG(139, *YYCURSOR); ++YYCURSOR; yy140: YYDEBUG(140, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 446 "Zend/zend_ini_scanner.l" +#line 445 "Zend/zend_ini_scanner.l" { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */ char *sc = NULL; while (YYCURSOR < YYLIMIT) { @@ -1933,7 +1932,7 @@ end_raw_value_chars: } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 1937 "Zend/zend_ini_scanner.c" +#line 1936 "Zend/zend_ini_scanner.c" yy141: YYDEBUG(141, *YYCURSOR); yyaccept = 0; @@ -1958,13 +1957,13 @@ yy142: yy143: YYDEBUG(143, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 487 "Zend/zend_ini_scanner.l" +#line 486 "Zend/zend_ini_scanner.l" { /* End of option value */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 1968 "Zend/zend_ini_scanner.c" +#line 1967 "Zend/zend_ini_scanner.c" yy144: YYDEBUG(144, *YYCURSOR); yych = *++YYCURSOR; @@ -1992,13 +1991,13 @@ yy148: yy149: YYDEBUG(149, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 583 "Zend/zend_ini_scanner.l" +#line 582 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 2002 "Zend/zend_ini_scanner.c" +#line 2001 "Zend/zend_ini_scanner.c" yy150: YYDEBUG(150, *YYCURSOR); yych = *++YYCURSOR; @@ -2027,12 +2026,12 @@ yy153: } YYDEBUG(154, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 573 "Zend/zend_ini_scanner.l" +#line 572 "Zend/zend_ini_scanner.l" { /* eat whitespace */ goto restart; } -#line 2036 "Zend/zend_ini_scanner.c" +#line 2035 "Zend/zend_ini_scanner.c" yy155: YYDEBUG(155, *YYCURSOR); ++YYCURSOR; @@ -2092,21 +2091,21 @@ yyc_ST_SECTION_RAW: yy159: YYDEBUG(159, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 483 "Zend/zend_ini_scanner.l" +#line 482 "Zend/zend_ini_scanner.l" { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */ RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 2100 "Zend/zend_ini_scanner.c" +#line 2099 "Zend/zend_ini_scanner.c" yy160: YYDEBUG(160, *YYCURSOR); ++YYCURSOR; YYDEBUG(161, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 601 "Zend/zend_ini_scanner.l" +#line 600 "Zend/zend_ini_scanner.l" { return 0; } -#line 2110 "Zend/zend_ini_scanner.c" +#line 2109 "Zend/zend_ini_scanner.c" yy162: YYDEBUG(162, *YYCURSOR); ++YYCURSOR; @@ -2115,13 +2114,13 @@ yy162: yy163: YYDEBUG(163, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 375 "Zend/zend_ini_scanner.l" +#line 374 "Zend/zend_ini_scanner.l" { /* End of section */ BEGIN(INITIAL); SCNG(lineno)++; return ']'; } -#line 2125 "Zend/zend_ini_scanner.c" +#line 2124 "Zend/zend_ini_scanner.c" yy164: YYDEBUG(164, *YYCURSOR); ++YYCURSOR; @@ -2243,11 +2242,11 @@ yy172: yy173: YYDEBUG(173, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 519 "Zend/zend_ini_scanner.l" +#line 518 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } -#line 2251 "Zend/zend_ini_scanner.c" +#line 2250 "Zend/zend_ini_scanner.c" yy174: YYDEBUG(174, *YYCURSOR); yyaccept = 0; @@ -2266,23 +2265,23 @@ yy175: yy176: YYDEBUG(176, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 601 "Zend/zend_ini_scanner.l" +#line 600 "Zend/zend_ini_scanner.l" { return 0; } -#line 2274 "Zend/zend_ini_scanner.c" +#line 2273 "Zend/zend_ini_scanner.c" yy177: YYDEBUG(177, *YYCURSOR); ++YYCURSOR; yy178: YYDEBUG(178, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 523 "Zend/zend_ini_scanner.l" +#line 522 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); return '"'; } -#line 2286 "Zend/zend_ini_scanner.c" +#line 2285 "Zend/zend_ini_scanner.c" yy179: YYDEBUG(179, *YYCURSOR); yych = *++YYCURSOR; @@ -2344,11 +2343,11 @@ yy183: yy184: YYDEBUG(184, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 497 "Zend/zend_ini_scanner.l" +#line 496 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } -#line 2352 "Zend/zend_ini_scanner.c" +#line 2351 "Zend/zend_ini_scanner.c" yy185: YYDEBUG(185, *YYCURSOR); yyaccept = 3; @@ -2374,11 +2373,11 @@ yy185: yy186: YYDEBUG(186, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 493 "Zend/zend_ini_scanner.l" +#line 492 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } -#line 2382 "Zend/zend_ini_scanner.c" +#line 2381 "Zend/zend_ini_scanner.c" yy187: YYDEBUG(187, *YYCURSOR); yych = *++YYCURSOR; @@ -2391,13 +2390,13 @@ yy188: yy189: YYDEBUG(189, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 375 "Zend/zend_ini_scanner.l" +#line 374 "Zend/zend_ini_scanner.l" { /* End of section */ BEGIN(INITIAL); SCNG(lineno)++; return ']'; } -#line 2401 "Zend/zend_ini_scanner.c" +#line 2400 "Zend/zend_ini_scanner.c" yy190: YYDEBUG(190, *YYCURSOR); ++YYCURSOR; @@ -2709,7 +2708,7 @@ yy215: ++YYCURSOR; YYDEBUG(218, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 366 "Zend/zend_ini_scanner.l" +#line 365 "Zend/zend_ini_scanner.l" { /* Raw string */ /* Eat leading and trailing single quotes */ if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') { @@ -2718,18 +2717,18 @@ yy215: } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 2722 "Zend/zend_ini_scanner.c" +#line 2721 "Zend/zend_ini_scanner.c" yy219: YYDEBUG(219, *YYCURSOR); ++YYCURSOR; YYDEBUG(220, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 399 "Zend/zend_ini_scanner.l" +#line 398 "Zend/zend_ini_scanner.l" { /* Variable start */ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 2733 "Zend/zend_ini_scanner.c" +#line 2732 "Zend/zend_ini_scanner.c" yy221: YYDEBUG(221, *YYCURSOR); yyaccept = 0; @@ -2910,12 +2909,12 @@ yy226: yy227: YYDEBUG(227, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 596 "Zend/zend_ini_scanner.l" +#line 595 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); return END_OF_LINE; } -#line 2919 "Zend/zend_ini_scanner.c" +#line 2918 "Zend/zend_ini_scanner.c" yy228: YYDEBUG(228, *YYCURSOR); yyaccept = 0; @@ -2924,11 +2923,11 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 515 "Zend/zend_ini_scanner.l" +#line 514 "Zend/zend_ini_scanner.l" { /* Get everything else as option/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } -#line 2932 "Zend/zend_ini_scanner.c" +#line 2931 "Zend/zend_ini_scanner.c" yy230: YYDEBUG(230, *YYCURSOR); yyaccept = 1; @@ -2937,24 +2936,24 @@ yy230: yy231: YYDEBUG(231, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 569 "Zend/zend_ini_scanner.l" +#line 568 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng); } -#line 2945 "Zend/zend_ini_scanner.c" +#line 2944 "Zend/zend_ini_scanner.c" yy232: YYDEBUG(232, *YYCURSOR); ++YYCURSOR; yy233: YYDEBUG(233, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 487 "Zend/zend_ini_scanner.l" +#line 486 "Zend/zend_ini_scanner.l" { /* End of option value */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 2958 "Zend/zend_ini_scanner.c" +#line 2957 "Zend/zend_ini_scanner.c" yy234: YYDEBUG(234, *YYCURSOR); yych = *++YYCURSOR; @@ -2968,23 +2967,23 @@ yy235: yy236: YYDEBUG(236, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 505 "Zend/zend_ini_scanner.l" +#line 504 "Zend/zend_ini_scanner.l" { /* Boolean operators */ return yytext[0]; } -#line 2976 "Zend/zend_ini_scanner.c" +#line 2975 "Zend/zend_ini_scanner.c" yy237: YYDEBUG(237, *YYCURSOR); ++YYCURSOR; yy238: YYDEBUG(238, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 523 "Zend/zend_ini_scanner.l" +#line 522 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); return '"'; } -#line 2988 "Zend/zend_ini_scanner.c" +#line 2987 "Zend/zend_ini_scanner.c" yy239: YYDEBUG(239, *YYCURSOR); yych = *++YYCURSOR; @@ -3059,11 +3058,11 @@ yy243: yy244: YYDEBUG(244, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 497 "Zend/zend_ini_scanner.l" +#line 496 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } -#line 3067 "Zend/zend_ini_scanner.c" +#line 3066 "Zend/zend_ini_scanner.c" yy245: YYDEBUG(245, *YYCURSOR); yyaccept = 2; @@ -3074,13 +3073,13 @@ yy246: ++YYCURSOR; YYDEBUG(247, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 509 "Zend/zend_ini_scanner.l" +#line 508 "Zend/zend_ini_scanner.l" { /* Make = used in option value to trigger error */ yyless(0); BEGIN(INITIAL); return END_OF_LINE; } -#line 3084 "Zend/zend_ini_scanner.c" +#line 3083 "Zend/zend_ini_scanner.c" yy248: YYDEBUG(248, *YYCURSOR); yyaccept = 4; @@ -3123,11 +3122,11 @@ yy248: yy249: YYDEBUG(249, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 493 "Zend/zend_ini_scanner.l" +#line 492 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } -#line 3131 "Zend/zend_ini_scanner.c" +#line 3130 "Zend/zend_ini_scanner.c" yy250: YYDEBUG(250, *YYCURSOR); yyaccept = 4; @@ -3635,11 +3634,11 @@ yy265: yy266: YYDEBUG(266, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 419 "Zend/zend_ini_scanner.l" +#line 418 "Zend/zend_ini_scanner.l" { /* TRUE value (when used outside option value/offset this causes parse error!) */ RETURN_TOKEN(BOOL_TRUE, "1", 1); } -#line 3643 "Zend/zend_ini_scanner.c" +#line 3642 "Zend/zend_ini_scanner.c" yy267: YYDEBUG(267, *YYCURSOR); ++YYCURSOR; @@ -3845,11 +3844,11 @@ yy272: yy273: YYDEBUG(273, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 423 "Zend/zend_ini_scanner.l" +#line 422 "Zend/zend_ini_scanner.l" { /* FALSE value (when used outside option value/offset this causes parse error!)*/ RETURN_TOKEN(BOOL_FALSE, "", 0); } -#line 3853 "Zend/zend_ini_scanner.c" +#line 3852 "Zend/zend_ini_scanner.c" yy274: YYDEBUG(274, *YYCURSOR); ++YYCURSOR; @@ -4236,13 +4235,13 @@ yy285: yy286: YYDEBUG(286, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 583 "Zend/zend_ini_scanner.l" +#line 582 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 4246 "Zend/zend_ini_scanner.c" +#line 4245 "Zend/zend_ini_scanner.c" yy287: YYDEBUG(287, *YYCURSOR); yych = *++YYCURSOR; @@ -4460,7 +4459,7 @@ yy296: ++YYCURSOR; YYDEBUG(299, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 366 "Zend/zend_ini_scanner.l" +#line 365 "Zend/zend_ini_scanner.l" { /* Raw string */ /* Eat leading and trailing single quotes */ if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') { @@ -4469,18 +4468,18 @@ yy296: } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 4473 "Zend/zend_ini_scanner.c" +#line 4472 "Zend/zend_ini_scanner.c" yy300: YYDEBUG(300, *YYCURSOR); ++YYCURSOR; YYDEBUG(301, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 399 "Zend/zend_ini_scanner.l" +#line 398 "Zend/zend_ini_scanner.l" { /* Variable start */ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 4484 "Zend/zend_ini_scanner.c" +#line 4483 "Zend/zend_ini_scanner.c" yy302: YYDEBUG(302, *YYCURSOR); ++YYCURSOR; @@ -4611,7 +4610,7 @@ yy311: yy312: YYDEBUG(312, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 404 "Zend/zend_ini_scanner.l" +#line 403 "Zend/zend_ini_scanner.l" { /* Variable name */ /* Eat leading whitespace */ EAT_LEADING_WHITESPACE(); @@ -4621,28 +4620,28 @@ yy312: RETURN_TOKEN(TC_VARNAME, yytext, yyleng); } -#line 4625 "Zend/zend_ini_scanner.c" +#line 4624 "Zend/zend_ini_scanner.c" yy313: YYDEBUG(313, *YYCURSOR); ++YYCURSOR; YYDEBUG(314, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 601 "Zend/zend_ini_scanner.l" +#line 600 "Zend/zend_ini_scanner.l" { return 0; } -#line 4635 "Zend/zend_ini_scanner.c" +#line 4634 "Zend/zend_ini_scanner.c" yy315: YYDEBUG(315, *YYCURSOR); ++YYCURSOR; YYDEBUG(316, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 414 "Zend/zend_ini_scanner.l" +#line 413 "Zend/zend_ini_scanner.l" { /* Variable end */ yy_pop_state(TSRMLS_C); return '}'; } -#line 4646 "Zend/zend_ini_scanner.c" +#line 4645 "Zend/zend_ini_scanner.c" yy317: YYDEBUG(317, *YYCURSOR); ++YYCURSOR; @@ -4656,6 +4655,6 @@ yy318: goto yy312; } } -#line 605 "Zend/zend_ini_scanner.l" +#line 604 "Zend/zend_ini_scanner.l" } diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index 1b3cbd47ea..bbc48d1fc1 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -150,8 +150,7 @@ static void _yy_push_state(int new_state TSRMLS_DC) static void yy_pop_state(TSRMLS_D) { - int *stack_state; - zend_stack_top(&SCNG(state_stack), (void **) &stack_state); + int *stack_state = zend_stack_top(&SCNG(state_stack)); YYSETCONDITION(*stack_state); zend_stack_del_top(&SCNG(state_stack)); } diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 5f384680ee..8858e8be9e 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -162,8 +162,7 @@ static void _yy_push_state(int new_state TSRMLS_DC) static void yy_pop_state(TSRMLS_D) { - int *stack_state; - zend_stack_top(&SCNG(state_stack), (void **) &stack_state); + int *stack_state = zend_stack_top(&SCNG(state_stack)); YYSETCONDITION(*stack_state); zend_stack_del_top(&SCNG(state_stack)); } @@ -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 1780 "Zend/zend_language_scanner.l" +#line 1779 "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 1770 "Zend/zend_language_scanner.l" +#line 1769 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1205,14 +1204,14 @@ yy6: goto inline_char_handler; } } -#line 1209 "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 1751 "Zend/zend_language_scanner.l" +#line 1750 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1222,7 +1221,7 @@ yy7: goto inline_char_handler; } } -#line 1226 "Zend/zend_language_scanner.c" +#line 1225 "Zend/zend_language_scanner.c" yy9: YYDEBUG(9, *YYCURSOR); yych = *++YYCURSOR; @@ -1408,7 +1407,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1717 "Zend/zend_language_scanner.l" +#line 1716 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1423,7 +1422,7 @@ yy35: BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1427 "Zend/zend_language_scanner.c" +#line 1426 "Zend/zend_language_scanner.c" yy39: YYDEBUG(39, *YYCURSOR); yych = *++YYCURSOR; @@ -1450,7 +1449,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1733 "Zend/zend_language_scanner.l" +#line 1732 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1460,19 +1459,19 @@ yy43: goto inline_char_handler; } } -#line 1464 "Zend/zend_language_scanner.c" +#line 1463 "Zend/zend_language_scanner.c" yy45: YYDEBUG(45, *YYCURSOR); ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1744 "Zend/zend_language_scanner.l" +#line 1743 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG_WITH_ECHO; } -#line 1476 "Zend/zend_language_scanner.c" +#line 1475 "Zend/zend_language_scanner.c" yy47: YYDEBUG(47, *YYCURSOR); yych = *++YYCURSOR; @@ -1499,14 +1498,14 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1762 "Zend/zend_language_scanner.l" +#line 1761 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1510 "Zend/zend_language_scanner.c" +#line 1509 "Zend/zend_language_scanner.c" yy52: YYDEBUG(52, *YYCURSOR); ++YYCURSOR; @@ -1577,7 +1576,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2223 "Zend/zend_language_scanner.l" +#line 2222 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1618,7 +1617,7 @@ yy56: zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1622 "Zend/zend_language_scanner.c" +#line 1621 "Zend/zend_language_scanner.c" yy57: YYDEBUG(57, *YYCURSOR); yych = *++YYCURSOR; @@ -1629,12 +1628,12 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2167 "Zend/zend_language_scanner.l" +#line 2166 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; } -#line 1638 "Zend/zend_language_scanner.c" +#line 1637 "Zend/zend_language_scanner.c" yy60: YYDEBUG(60, *YYCURSOR); yych = *++YYCURSOR; @@ -1644,14 +1643,14 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2154 "Zend/zend_language_scanner.l" +#line 2153 "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 1655 "Zend/zend_language_scanner.c" +#line 1654 "Zend/zend_language_scanner.c" yy63: YYDEBUG(63, *YYCURSOR); yyaccept = 0; @@ -1667,23 +1666,23 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1861 "Zend/zend_language_scanner.l" +#line 1860 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1676 "Zend/zend_language_scanner.c" +#line 1675 "Zend/zend_language_scanner.c" yy66: YYDEBUG(66, *YYCURSOR); ++YYCURSOR; YYDEBUG(67, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1484 "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 1687 "Zend/zend_language_scanner.c" +#line 1686 "Zend/zend_language_scanner.c" yy68: YYDEBUG(68, *YYCURSOR); yych = *++YYCURSOR; @@ -1697,14 +1696,14 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1854 "Zend/zend_language_scanner.l" +#line 1853 "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 1708 "Zend/zend_language_scanner.c" +#line 1707 "Zend/zend_language_scanner.c" yy72: YYDEBUG(72, *YYCURSOR); yych = *++YYCURSOR; @@ -1722,14 +1721,14 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1845 "Zend/zend_language_scanner.l" +#line 1844 "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 1733 "Zend/zend_language_scanner.c" +#line 1732 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_DOUBLE_QUOTES: @@ -1797,7 +1796,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2173 "Zend/zend_language_scanner.l" +#line 2172 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1846,7 +1845,7 @@ double_quotes_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1850 "Zend/zend_language_scanner.c" +#line 1849 "Zend/zend_language_scanner.c" yy79: YYDEBUG(79, *YYCURSOR); yych = *++YYCURSOR; @@ -1857,12 +1856,12 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2162 "Zend/zend_language_scanner.l" +#line 2161 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; } -#line 1866 "Zend/zend_language_scanner.c" +#line 1865 "Zend/zend_language_scanner.c" yy82: YYDEBUG(82, *YYCURSOR); yych = *++YYCURSOR; @@ -1872,14 +1871,14 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2154 "Zend/zend_language_scanner.l" +#line 2153 "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 1883 "Zend/zend_language_scanner.c" +#line 1882 "Zend/zend_language_scanner.c" yy85: YYDEBUG(85, *YYCURSOR); yyaccept = 0; @@ -1895,23 +1894,23 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1861 "Zend/zend_language_scanner.l" +#line 1860 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 1904 "Zend/zend_language_scanner.c" +#line 1903 "Zend/zend_language_scanner.c" yy88: YYDEBUG(88, *YYCURSOR); ++YYCURSOR; YYDEBUG(89, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1484 "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 1915 "Zend/zend_language_scanner.c" +#line 1914 "Zend/zend_language_scanner.c" yy90: YYDEBUG(90, *YYCURSOR); yych = *++YYCURSOR; @@ -1925,14 +1924,14 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1854 "Zend/zend_language_scanner.l" +#line 1853 "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 1936 "Zend/zend_language_scanner.c" +#line 1935 "Zend/zend_language_scanner.c" yy94: YYDEBUG(94, *YYCURSOR); yych = *++YYCURSOR; @@ -1950,14 +1949,14 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1845 "Zend/zend_language_scanner.l" +#line 1844 "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 1961 "Zend/zend_language_scanner.c" +#line 1960 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_END_HEREDOC: @@ -1968,7 +1967,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2140 "Zend/zend_language_scanner.l" +#line 2139 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -1981,7 +1980,7 @@ yyc_ST_END_HEREDOC: BEGIN(ST_IN_SCRIPTING); return T_END_HEREDOC; } -#line 1985 "Zend/zend_language_scanner.c" +#line 1984 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_HEREDOC: { @@ -2043,7 +2042,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2265 "Zend/zend_language_scanner.l" +#line 2264 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2116,7 +2115,7 @@ heredoc_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 2120 "Zend/zend_language_scanner.c" +#line 2119 "Zend/zend_language_scanner.c" yy105: YYDEBUG(105, *YYCURSOR); yych = *++YYCURSOR; @@ -2131,14 +2130,14 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2154 "Zend/zend_language_scanner.l" +#line 2153 "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 2142 "Zend/zend_language_scanner.c" +#line 2141 "Zend/zend_language_scanner.c" yy109: YYDEBUG(109, *YYCURSOR); yyaccept = 0; @@ -2154,23 +2153,23 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1861 "Zend/zend_language_scanner.l" +#line 1860 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 2163 "Zend/zend_language_scanner.c" +#line 2162 "Zend/zend_language_scanner.c" yy112: YYDEBUG(112, *YYCURSOR); ++YYCURSOR; YYDEBUG(113, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1484 "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 2174 "Zend/zend_language_scanner.c" +#line 2173 "Zend/zend_language_scanner.c" yy114: YYDEBUG(114, *YYCURSOR); yych = *++YYCURSOR; @@ -2184,14 +2183,14 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1854 "Zend/zend_language_scanner.l" +#line 1853 "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 2195 "Zend/zend_language_scanner.c" +#line 2194 "Zend/zend_language_scanner.c" yy118: YYDEBUG(118, *YYCURSOR); yych = *++YYCURSOR; @@ -2209,14 +2208,14 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1845 "Zend/zend_language_scanner.l" +#line 1844 "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 2220 "Zend/zend_language_scanner.c" +#line 2219 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_IN_SCRIPTING: @@ -2399,12 +2398,12 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1883 "Zend/zend_language_scanner.l" +#line 1882 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 2408 "Zend/zend_language_scanner.c" +#line 2407 "Zend/zend_language_scanner.c" yy125: YYDEBUG(125, *YYCURSOR); yych = *++YYCURSOR; @@ -2636,11 +2635,11 @@ yy138: yy139: YYDEBUG(139, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1473 "Zend/zend_language_scanner.l" +#line 1472 "Zend/zend_language_scanner.l" { return yytext[0]; } -#line 2644 "Zend/zend_language_scanner.c" +#line 2643 "Zend/zend_language_scanner.c" yy140: YYDEBUG(140, *YYCURSOR); ++YYCURSOR; @@ -2649,13 +2648,13 @@ yy140: yy141: YYDEBUG(141, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1195 "Zend/zend_language_scanner.l" +#line 1194 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 2659 "Zend/zend_language_scanner.c" +#line 2658 "Zend/zend_language_scanner.c" yy142: YYDEBUG(142, *YYCURSOR); yych = *++YYCURSOR; @@ -2666,11 +2665,11 @@ yy143: ++YYCURSOR; YYDEBUG(144, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1221 "Zend/zend_language_scanner.l" +#line 1220 "Zend/zend_language_scanner.l" { return T_NS_SEPARATOR; } -#line 2674 "Zend/zend_language_scanner.c" +#line 2673 "Zend/zend_language_scanner.c" yy145: YYDEBUG(145, *YYCURSOR); yyaccept = 1; @@ -2904,18 +2903,18 @@ yy168: ++YYCURSOR; YYDEBUG(169, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1478 "Zend/zend_language_scanner.l" +#line 1477 "Zend/zend_language_scanner.l" { yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return '{'; } -#line 2913 "Zend/zend_language_scanner.c" +#line 2912 "Zend/zend_language_scanner.c" yy170: YYDEBUG(170, *YYCURSOR); ++YYCURSOR; YYDEBUG(171, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1490 "Zend/zend_language_scanner.l" +#line 1489 "Zend/zend_language_scanner.l" { RESET_DOC_COMMENT(); if (!zend_stack_is_empty(&SCNG(state_stack))) { @@ -2923,7 +2922,7 @@ yy170: } return '}'; } -#line 2927 "Zend/zend_language_scanner.c" +#line 2926 "Zend/zend_language_scanner.c" yy172: YYDEBUG(172, *YYCURSOR); yyaccept = 2; @@ -2951,7 +2950,7 @@ yy172: yy173: YYDEBUG(173, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1538 "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)); @@ -2969,7 +2968,7 @@ yy173: } return T_LNUMBER; } -#line 2973 "Zend/zend_language_scanner.c" +#line 2972 "Zend/zend_language_scanner.c" yy174: YYDEBUG(174, *YYCURSOR); yyaccept = 2; @@ -2997,7 +2996,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1889 "Zend/zend_language_scanner.l" +#line 1888 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3031,14 +3030,14 @@ yy177: return T_COMMENT; } -#line 3035 "Zend/zend_language_scanner.c" +#line 3034 "Zend/zend_language_scanner.c" yy178: YYDEBUG(178, *YYCURSOR); ++YYCURSOR; yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1975 "Zend/zend_language_scanner.l" +#line 1974 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3106,14 +3105,14 @@ yy179: } return T_CONSTANT_ENCAPSED_STRING; } -#line 3110 "Zend/zend_language_scanner.c" +#line 3109 "Zend/zend_language_scanner.c" yy180: YYDEBUG(180, *YYCURSOR); ++YYCURSOR; yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2044 "Zend/zend_language_scanner.l" +#line 2043 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3154,24 +3153,24 @@ yy181: BEGIN(ST_DOUBLE_QUOTES); return '"'; } -#line 3158 "Zend/zend_language_scanner.c" +#line 3157 "Zend/zend_language_scanner.c" yy182: YYDEBUG(182, *YYCURSOR); ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2134 "Zend/zend_language_scanner.l" +#line 2133 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; } -#line 3169 "Zend/zend_language_scanner.c" +#line 3168 "Zend/zend_language_scanner.c" yy184: YYDEBUG(184, *YYCURSOR); ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2396 "Zend/zend_language_scanner.l" +#line 2395 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3180,7 +3179,7 @@ yy184: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 3184 "Zend/zend_language_scanner.c" +#line 3183 "Zend/zend_language_scanner.c" yy186: YYDEBUG(186, *YYCURSOR); ++YYCURSOR; @@ -3207,12 +3206,12 @@ yy188: yy190: YYDEBUG(190, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1593 "Zend/zend_language_scanner.l" +#line 1592 "Zend/zend_language_scanner.l" { ZVAL_DOUBLE(zendlval, zend_strtod(yytext, NULL)); return T_DNUMBER; } -#line 3216 "Zend/zend_language_scanner.c" +#line 3215 "Zend/zend_language_scanner.c" yy191: YYDEBUG(191, *YYCURSOR); yyaccept = 2; @@ -3304,7 +3303,7 @@ yy200: } YYDEBUG(202, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1515 "Zend/zend_language_scanner.l" +#line 1514 "Zend/zend_language_scanner.l" { char *bin = yytext + 2; /* Skip "0b" */ int len = yyleng - 2; @@ -3327,7 +3326,7 @@ yy200: return T_DNUMBER; } } -#line 3331 "Zend/zend_language_scanner.c" +#line 3330 "Zend/zend_language_scanner.c" yy203: YYDEBUG(203, *YYCURSOR); ++YYCURSOR; @@ -3339,7 +3338,7 @@ yy203: } YYDEBUG(205, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1556 "Zend/zend_language_scanner.l" +#line 1555 "Zend/zend_language_scanner.l" { char *hex = yytext + 2; /* Skip "0x" */ int len = yyleng - 2; @@ -3362,7 +3361,7 @@ yy203: return T_DNUMBER; } } -#line 3366 "Zend/zend_language_scanner.c" +#line 3365 "Zend/zend_language_scanner.c" yy206: YYDEBUG(206, *YYCURSOR); ++YYCURSOR; @@ -3371,13 +3370,13 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1956 "Zend/zend_language_scanner.l" +#line 1955 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } -#line 3381 "Zend/zend_language_scanner.c" +#line 3380 "Zend/zend_language_scanner.c" yy208: YYDEBUG(208, *YYCURSOR); yych = *++YYCURSOR; @@ -3411,12 +3410,12 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1861 "Zend/zend_language_scanner.l" +#line 1860 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 3420 "Zend/zend_language_scanner.c" +#line 3419 "Zend/zend_language_scanner.c" yy213: YYDEBUG(213, *YYCURSOR); yych = *++YYCURSOR; @@ -3430,11 +3429,11 @@ yy214: } YYDEBUG(215, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1461 "Zend/zend_language_scanner.l" +#line 1460 "Zend/zend_language_scanner.l" { return T_LOGICAL_XOR; } -#line 3438 "Zend/zend_language_scanner.c" +#line 3437 "Zend/zend_language_scanner.c" yy216: YYDEBUG(216, *YYCURSOR); ++YYCURSOR; @@ -3443,61 +3442,61 @@ yy216: } YYDEBUG(217, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1453 "Zend/zend_language_scanner.l" +#line 1452 "Zend/zend_language_scanner.l" { return T_LOGICAL_OR; } -#line 3451 "Zend/zend_language_scanner.c" +#line 3450 "Zend/zend_language_scanner.c" yy218: YYDEBUG(218, *YYCURSOR); ++YYCURSOR; YYDEBUG(219, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1441 "Zend/zend_language_scanner.l" +#line 1440 "Zend/zend_language_scanner.l" { return T_XOR_EQUAL; } -#line 3461 "Zend/zend_language_scanner.c" +#line 3460 "Zend/zend_language_scanner.c" yy220: YYDEBUG(220, *YYCURSOR); ++YYCURSOR; YYDEBUG(221, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1445 "Zend/zend_language_scanner.l" +#line 1444 "Zend/zend_language_scanner.l" { return T_BOOLEAN_OR; } -#line 3471 "Zend/zend_language_scanner.c" +#line 3470 "Zend/zend_language_scanner.c" yy222: YYDEBUG(222, *YYCURSOR); ++YYCURSOR; YYDEBUG(223, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1437 "Zend/zend_language_scanner.l" +#line 1436 "Zend/zend_language_scanner.l" { return T_OR_EQUAL; } -#line 3481 "Zend/zend_language_scanner.c" +#line 3480 "Zend/zend_language_scanner.c" yy224: YYDEBUG(224, *YYCURSOR); ++YYCURSOR; YYDEBUG(225, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1449 "Zend/zend_language_scanner.l" +#line 1448 "Zend/zend_language_scanner.l" { return T_BOOLEAN_AND; } -#line 3491 "Zend/zend_language_scanner.c" +#line 3490 "Zend/zend_language_scanner.c" yy226: YYDEBUG(226, *YYCURSOR); ++YYCURSOR; YYDEBUG(227, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1433 "Zend/zend_language_scanner.l" +#line 1432 "Zend/zend_language_scanner.l" { return T_AND_EQUAL; } -#line 3501 "Zend/zend_language_scanner.c" +#line 3500 "Zend/zend_language_scanner.c" yy228: YYDEBUG(228, *YYCURSOR); ++YYCURSOR; @@ -3506,7 +3505,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1963 "Zend/zend_language_scanner.l" +#line 1962 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3517,17 +3516,17 @@ yy229: return yytext[0]; } } -#line 3521 "Zend/zend_language_scanner.c" +#line 3520 "Zend/zend_language_scanner.c" yy230: YYDEBUG(230, *YYCURSOR); ++YYCURSOR; YYDEBUG(231, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1421 "Zend/zend_language_scanner.l" +#line 1420 "Zend/zend_language_scanner.l" { return T_MOD_EQUAL; } -#line 3531 "Zend/zend_language_scanner.c" +#line 3530 "Zend/zend_language_scanner.c" yy232: YYDEBUG(232, *YYCURSOR); yych = *++YYCURSOR; @@ -3545,7 +3544,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1923 "Zend/zend_language_scanner.l" +#line 1922 "Zend/zend_language_scanner.l" { int doc_com; @@ -3578,7 +3577,7 @@ yy235: return T_COMMENT; } -#line 3582 "Zend/zend_language_scanner.c" +#line 3581 "Zend/zend_language_scanner.c" yy236: YYDEBUG(236, *YYCURSOR); yych = *++YYCURSOR; @@ -3588,11 +3587,11 @@ yy237: ++YYCURSOR; YYDEBUG(238, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1413 "Zend/zend_language_scanner.l" +#line 1412 "Zend/zend_language_scanner.l" { return T_DIV_EQUAL; } -#line 3596 "Zend/zend_language_scanner.c" +#line 3595 "Zend/zend_language_scanner.c" yy239: YYDEBUG(239, *YYCURSOR); yych = *++YYCURSOR; @@ -3616,62 +3615,62 @@ yy242: if ((yych = *YYCURSOR) == '=') goto yy246; YYDEBUG(243, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1405 "Zend/zend_language_scanner.l" +#line 1404 "Zend/zend_language_scanner.l" { return T_POW; } -#line 3624 "Zend/zend_language_scanner.c" +#line 3623 "Zend/zend_language_scanner.c" yy244: YYDEBUG(244, *YYCURSOR); ++YYCURSOR; YYDEBUG(245, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1401 "Zend/zend_language_scanner.l" +#line 1400 "Zend/zend_language_scanner.l" { return T_MUL_EQUAL; } -#line 3634 "Zend/zend_language_scanner.c" +#line 3633 "Zend/zend_language_scanner.c" yy246: YYDEBUG(246, *YYCURSOR); ++YYCURSOR; YYDEBUG(247, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1409 "Zend/zend_language_scanner.l" +#line 1408 "Zend/zend_language_scanner.l" { return T_POW_EQUAL; } -#line 3644 "Zend/zend_language_scanner.c" +#line 3643 "Zend/zend_language_scanner.c" yy248: YYDEBUG(248, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy252; YYDEBUG(249, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1469 "Zend/zend_language_scanner.l" +#line 1468 "Zend/zend_language_scanner.l" { return T_SR; } -#line 3655 "Zend/zend_language_scanner.c" +#line 3654 "Zend/zend_language_scanner.c" yy250: YYDEBUG(250, *YYCURSOR); ++YYCURSOR; YYDEBUG(251, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1389 "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 3664 "Zend/zend_language_scanner.c" yy252: YYDEBUG(252, *YYCURSOR); ++YYCURSOR; YYDEBUG(253, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1429 "Zend/zend_language_scanner.l" +#line 1428 "Zend/zend_language_scanner.l" { return T_SR_EQUAL; } -#line 3675 "Zend/zend_language_scanner.c" +#line 3674 "Zend/zend_language_scanner.c" yy254: YYDEBUG(254, *YYCURSOR); yyaccept = 5; @@ -3682,11 +3681,11 @@ yy254: yy255: YYDEBUG(255, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1465 "Zend/zend_language_scanner.l" +#line 1464 "Zend/zend_language_scanner.l" { return T_SL; } -#line 3690 "Zend/zend_language_scanner.c" +#line 3689 "Zend/zend_language_scanner.c" yy256: YYDEBUG(256, *YYCURSOR); yych = *++YYCURSOR; @@ -3698,22 +3697,22 @@ yy257: ++YYCURSOR; YYDEBUG(258, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1385 "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 3705 "Zend/zend_language_scanner.c" yy259: YYDEBUG(259, *YYCURSOR); ++YYCURSOR; yy260: YYDEBUG(260, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1381 "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 3716 "Zend/zend_language_scanner.c" yy261: YYDEBUG(261, *YYCURSOR); yych = *++YYCURSOR; @@ -3764,11 +3763,11 @@ yy268: ++YYCURSOR; YYDEBUG(269, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1425 "Zend/zend_language_scanner.l" +#line 1424 "Zend/zend_language_scanner.l" { return T_SL_EQUAL; } -#line 3772 "Zend/zend_language_scanner.c" +#line 3771 "Zend/zend_language_scanner.c" yy270: YYDEBUG(270, *YYCURSOR); ++YYCURSOR; @@ -3873,7 +3872,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2086 "Zend/zend_language_scanner.l" +#line 2085 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -3920,7 +3919,7 @@ yy280: return T_START_HEREDOC; } -#line 3924 "Zend/zend_language_scanner.c" +#line 3923 "Zend/zend_language_scanner.c" yy281: YYDEBUG(281, *YYCURSOR); yych = *++YYCURSOR; @@ -3960,31 +3959,31 @@ yy284: ++YYCURSOR; YYDEBUG(286, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1373 "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 3967 "Zend/zend_language_scanner.c" yy287: YYDEBUG(287, *YYCURSOR); ++YYCURSOR; YYDEBUG(288, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1393 "Zend/zend_language_scanner.l" +#line 1392 "Zend/zend_language_scanner.l" { return T_PLUS_EQUAL; } -#line 3978 "Zend/zend_language_scanner.c" +#line 3977 "Zend/zend_language_scanner.c" yy289: YYDEBUG(289, *YYCURSOR); ++YYCURSOR; YYDEBUG(290, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1361 "Zend/zend_language_scanner.l" +#line 1360 "Zend/zend_language_scanner.l" { return T_INC; } -#line 3988 "Zend/zend_language_scanner.c" +#line 3987 "Zend/zend_language_scanner.c" yy291: YYDEBUG(291, *YYCURSOR); yych = *++YYCURSOR; @@ -4003,42 +4002,42 @@ yy293: } YYDEBUG(294, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1349 "Zend/zend_language_scanner.l" +#line 1348 "Zend/zend_language_scanner.l" { return T_LIST; } -#line 4011 "Zend/zend_language_scanner.c" +#line 4010 "Zend/zend_language_scanner.c" yy295: YYDEBUG(295, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy299; YYDEBUG(296, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1377 "Zend/zend_language_scanner.l" +#line 1376 "Zend/zend_language_scanner.l" { return T_IS_EQUAL; } -#line 4022 "Zend/zend_language_scanner.c" +#line 4021 "Zend/zend_language_scanner.c" yy297: YYDEBUG(297, *YYCURSOR); ++YYCURSOR; YYDEBUG(298, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1345 "Zend/zend_language_scanner.l" +#line 1344 "Zend/zend_language_scanner.l" { return T_DOUBLE_ARROW; } -#line 4032 "Zend/zend_language_scanner.c" +#line 4031 "Zend/zend_language_scanner.c" yy299: YYDEBUG(299, *YYCURSOR); ++YYCURSOR; YYDEBUG(300, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1369 "Zend/zend_language_scanner.l" +#line 1368 "Zend/zend_language_scanner.l" { return T_IS_IDENTICAL; } -#line 4042 "Zend/zend_language_scanner.c" +#line 4041 "Zend/zend_language_scanner.c" yy301: YYDEBUG(301, *YYCURSOR); yych = *++YYCURSOR; @@ -4168,7 +4167,7 @@ yy317: } YYDEBUG(320, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1708 "Zend/zend_language_scanner.l" +#line 1707 "Zend/zend_language_scanner.l" { if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { ZVAL_DUP(zendlval, &CG(current_namespace)); @@ -4177,7 +4176,7 @@ yy317: } return T_NS_C; } -#line 4181 "Zend/zend_language_scanner.c" +#line 4180 "Zend/zend_language_scanner.c" yy321: YYDEBUG(321, *YYCURSOR); yych = *++YYCURSOR; @@ -4197,7 +4196,7 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1683 "Zend/zend_language_scanner.l" +#line 1682 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); zend_string *dirname; @@ -4222,7 +4221,7 @@ yy322: ZVAL_STR(zendlval, dirname); return T_DIR; } -#line 4226 "Zend/zend_language_scanner.c" +#line 4225 "Zend/zend_language_scanner.c" yy326: YYDEBUG(326, *YYCURSOR); yych = *++YYCURSOR; @@ -4247,12 +4246,12 @@ yy328: } YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1667 "Zend/zend_language_scanner.l" +#line 1666 "Zend/zend_language_scanner.l" { ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; } -#line 4256 "Zend/zend_language_scanner.c" +#line 4255 "Zend/zend_language_scanner.c" yy332: YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; @@ -4287,7 +4286,7 @@ yy336: } YYDEBUG(339, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1635 "Zend/zend_language_scanner.l" +#line 1634 "Zend/zend_language_scanner.l" { if (CG(active_class_entry)) { int len = 0; @@ -4319,7 +4318,7 @@ yy336: } return T_METHOD_C; } -#line 4323 "Zend/zend_language_scanner.c" +#line 4322 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; @@ -4370,7 +4369,7 @@ yy347: } YYDEBUG(350, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1625 "Zend/zend_language_scanner.l" +#line 1624 "Zend/zend_language_scanner.l" { zend_op_array *op_array = CG(active_op_array); if (op_array && op_array->function_name) { @@ -4380,7 +4379,7 @@ yy347: } return T_FUNC_C; } -#line 4384 "Zend/zend_language_scanner.c" +#line 4383 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4400,7 +4399,7 @@ yy352: } YYDEBUG(355, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1672 "Zend/zend_language_scanner.l" +#line 1671 "Zend/zend_language_scanner.l" { zend_string *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4411,7 +4410,7 @@ yy352: } return T_FILE; } -#line 4415 "Zend/zend_language_scanner.c" +#line 4414 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4441,7 +4440,7 @@ yy359: } YYDEBUG(362, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1615 "Zend/zend_language_scanner.l" +#line 1614 "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)) { @@ -4451,7 +4450,7 @@ yy359: } return T_TRAIT_C; } -#line 4455 "Zend/zend_language_scanner.c" +#line 4454 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4481,7 +4480,7 @@ yy366: } YYDEBUG(369, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1598 "Zend/zend_language_scanner.l" +#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)) { @@ -4498,7 +4497,7 @@ yy366: } return T_CLASS_C; } -#line 4502 "Zend/zend_language_scanner.c" +#line 4501 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4560,11 +4559,11 @@ yy381: } YYDEBUG(382, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1313 "Zend/zend_language_scanner.l" +#line 1312 "Zend/zend_language_scanner.l" { return T_HALT_COMPILER; } -#line 4568 "Zend/zend_language_scanner.c" +#line 4567 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4584,11 +4583,11 @@ yy385: } YYDEBUG(386, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1293 "Zend/zend_language_scanner.l" +#line 1292 "Zend/zend_language_scanner.l" { return T_USE; } -#line 4592 "Zend/zend_language_scanner.c" +#line 4591 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4607,11 +4606,11 @@ yy389: } YYDEBUG(390, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1341 "Zend/zend_language_scanner.l" +#line 1340 "Zend/zend_language_scanner.l" { return T_UNSET; } -#line 4615 "Zend/zend_language_scanner.c" +#line 4614 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4783,11 +4782,11 @@ yy406: ++YYCURSOR; YYDEBUG(408, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1241 "Zend/zend_language_scanner.l" +#line 1240 "Zend/zend_language_scanner.l" { return T_INT_CAST; } -#line 4791 "Zend/zend_language_scanner.c" +#line 4790 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4831,11 +4830,11 @@ yy414: ++YYCURSOR; YYDEBUG(417, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1245 "Zend/zend_language_scanner.l" +#line 1244 "Zend/zend_language_scanner.l" { return T_DOUBLE_CAST; } -#line 4839 "Zend/zend_language_scanner.c" +#line 4838 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4905,11 +4904,11 @@ yy428: ++YYCURSOR; YYDEBUG(431, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1249 "Zend/zend_language_scanner.l" +#line 1248 "Zend/zend_language_scanner.l" { return T_STRING_CAST; } -#line 4913 "Zend/zend_language_scanner.c" +#line 4912 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4942,11 +4941,11 @@ yy435: ++YYCURSOR; YYDEBUG(438, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1253 "Zend/zend_language_scanner.l" +#line 1252 "Zend/zend_language_scanner.l" { return T_ARRAY_CAST; } -#line 4950 "Zend/zend_language_scanner.c" +#line 4949 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4984,11 +4983,11 @@ yy443: ++YYCURSOR; YYDEBUG(446, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1257 "Zend/zend_language_scanner.l" +#line 1256 "Zend/zend_language_scanner.l" { return T_OBJECT_CAST; } -#line 4992 "Zend/zend_language_scanner.c" +#line 4991 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -5029,11 +5028,11 @@ yy452: ++YYCURSOR; YYDEBUG(454, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1261 "Zend/zend_language_scanner.l" +#line 1260 "Zend/zend_language_scanner.l" { return T_BOOL_CAST; } -#line 5037 "Zend/zend_language_scanner.c" +#line 5036 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5093,11 +5092,11 @@ yy463: ++YYCURSOR; YYDEBUG(466, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1265 "Zend/zend_language_scanner.l" +#line 1264 "Zend/zend_language_scanner.l" { return T_UNSET_CAST; } -#line 5101 "Zend/zend_language_scanner.c" +#line 5100 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5111,11 +5110,11 @@ yy468: } YYDEBUG(469, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1237 "Zend/zend_language_scanner.l" +#line 1236 "Zend/zend_language_scanner.l" { return T_VAR; } -#line 5119 "Zend/zend_language_scanner.c" +#line 5118 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5135,11 +5134,11 @@ yy472: } YYDEBUG(473, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1229 "Zend/zend_language_scanner.l" +#line 1228 "Zend/zend_language_scanner.l" { return T_NEW; } -#line 5143 "Zend/zend_language_scanner.c" +#line 5142 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5178,11 +5177,11 @@ yy480: } YYDEBUG(481, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1289 "Zend/zend_language_scanner.l" +#line 1288 "Zend/zend_language_scanner.l" { return T_NAMESPACE; } -#line 5186 "Zend/zend_language_scanner.c" +#line 5185 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5204,11 +5203,11 @@ yy484: ++YYCURSOR; YYDEBUG(485, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1417 "Zend/zend_language_scanner.l" +#line 1416 "Zend/zend_language_scanner.l" { return T_CONCAT_EQUAL; } -#line 5212 "Zend/zend_language_scanner.c" +#line 5211 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5217,21 +5216,21 @@ yy486: ++YYCURSOR; YYDEBUG(488, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1225 "Zend/zend_language_scanner.l" +#line 1224 "Zend/zend_language_scanner.l" { return T_ELLIPSIS; } -#line 5225 "Zend/zend_language_scanner.c" +#line 5224 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; YYDEBUG(490, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1217 "Zend/zend_language_scanner.l" +#line 1216 "Zend/zend_language_scanner.l" { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5235 "Zend/zend_language_scanner.c" +#line 5234 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5253,32 +5252,32 @@ yy493: ++YYCURSOR; YYDEBUG(494, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1397 "Zend/zend_language_scanner.l" +#line 1396 "Zend/zend_language_scanner.l" { return T_MINUS_EQUAL; } -#line 5261 "Zend/zend_language_scanner.c" +#line 5260 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; YYDEBUG(496, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1365 "Zend/zend_language_scanner.l" +#line 1364 "Zend/zend_language_scanner.l" { return T_DEC; } -#line 5271 "Zend/zend_language_scanner.c" +#line 5270 "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 5282 "Zend/zend_language_scanner.c" +#line 5281 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5323,11 +5322,11 @@ yy504: } YYDEBUG(505, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1337 "Zend/zend_language_scanner.l" +#line 1336 "Zend/zend_language_scanner.l" { return T_PUBLIC; } -#line 5331 "Zend/zend_language_scanner.c" +#line 5330 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5382,11 +5381,11 @@ yy513: } YYDEBUG(514, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1333 "Zend/zend_language_scanner.l" +#line 1332 "Zend/zend_language_scanner.l" { return T_PROTECTED; } -#line 5390 "Zend/zend_language_scanner.c" +#line 5389 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5416,11 +5415,11 @@ yy519: } YYDEBUG(520, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1329 "Zend/zend_language_scanner.l" +#line 1328 "Zend/zend_language_scanner.l" { return T_PRIVATE; } -#line 5424 "Zend/zend_language_scanner.c" +#line 5423 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5429,11 +5428,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 5437 "Zend/zend_language_scanner.c" +#line 5436 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5458,11 +5457,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 5466 "Zend/zend_language_scanner.c" +#line 5465 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5486,11 +5485,11 @@ yy531: } YYDEBUG(532, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1301 "Zend/zend_language_scanner.l" +#line 1300 "Zend/zend_language_scanner.l" { return T_GLOBAL; } -#line 5494 "Zend/zend_language_scanner.c" +#line 5493 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5527,11 +5526,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 5535 "Zend/zend_language_scanner.c" +#line 5534 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5571,11 +5570,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 5579 "Zend/zend_language_scanner.c" +#line 5578 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5599,11 +5598,11 @@ yy552: } YYDEBUG(553, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1317 "Zend/zend_language_scanner.l" +#line 1316 "Zend/zend_language_scanner.l" { return T_STATIC; } -#line 5607 "Zend/zend_language_scanner.c" +#line 5606 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5630,11 +5629,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 5638 "Zend/zend_language_scanner.c" +#line 5637 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5653,11 +5652,11 @@ yy561: } YYDEBUG(562, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1353 "Zend/zend_language_scanner.l" +#line 1352 "Zend/zend_language_scanner.l" { return T_ARRAY; } -#line 5661 "Zend/zend_language_scanner.c" +#line 5660 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5666,11 +5665,11 @@ yy563: } YYDEBUG(564, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1457 "Zend/zend_language_scanner.l" +#line 1456 "Zend/zend_language_scanner.l" { return T_LOGICAL_AND; } -#line 5674 "Zend/zend_language_scanner.c" +#line 5673 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5704,11 +5703,11 @@ yy570: } YYDEBUG(571, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1321 "Zend/zend_language_scanner.l" +#line 1320 "Zend/zend_language_scanner.l" { return T_ABSTRACT; } -#line 5712 "Zend/zend_language_scanner.c" +#line 5711 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5732,11 +5731,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 5740 "Zend/zend_language_scanner.c" +#line 5739 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5745,11 +5744,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 5753 "Zend/zend_language_scanner.c" +#line 5752 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5801,11 +5800,11 @@ yy584: } YYDEBUG(585, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1305 "Zend/zend_language_scanner.l" +#line 1304 "Zend/zend_language_scanner.l" { return T_ISSET; } -#line 5809 "Zend/zend_language_scanner.c" +#line 5808 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5859,11 +5858,11 @@ yy592: yy593: YYDEBUG(593, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1273 "Zend/zend_language_scanner.l" +#line 1272 "Zend/zend_language_scanner.l" { return T_INCLUDE; } -#line 5867 "Zend/zend_language_scanner.c" +#line 5866 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5892,11 +5891,11 @@ yy598: } YYDEBUG(599, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1277 "Zend/zend_language_scanner.l" +#line 1276 "Zend/zend_language_scanner.l" { return T_INCLUDE_ONCE; } -#line 5900 "Zend/zend_language_scanner.c" +#line 5899 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5930,11 +5929,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 5938 "Zend/zend_language_scanner.c" +#line 5937 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5984,11 +5983,11 @@ yy613: } YYDEBUG(614, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1297 "Zend/zend_language_scanner.l" +#line 1296 "Zend/zend_language_scanner.l" { return T_INSTEADOF; } -#line 5992 "Zend/zend_language_scanner.c" +#line 5991 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -6017,11 +6016,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 6025 "Zend/zend_language_scanner.c" +#line 6024 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6065,11 +6064,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 6073 "Zend/zend_language_scanner.c" +#line 6072 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6097,11 +6096,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 6105 "Zend/zend_language_scanner.c" +#line 6104 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6120,11 +6119,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 6128 "Zend/zend_language_scanner.c" +#line 6127 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6143,11 +6142,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 6151 "Zend/zend_language_scanner.c" +#line 6150 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6171,11 +6170,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 6179 "Zend/zend_language_scanner.c" +#line 6178 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6236,11 +6235,11 @@ yy653: yy654: YYDEBUG(654, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1281 "Zend/zend_language_scanner.l" +#line 1280 "Zend/zend_language_scanner.l" { return T_REQUIRE; } -#line 6244 "Zend/zend_language_scanner.c" +#line 6243 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6269,11 +6268,11 @@ yy659: } YYDEBUG(660, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1285 "Zend/zend_language_scanner.l" +#line 1284 "Zend/zend_language_scanner.l" { return T_REQUIRE_ONCE; } -#line 6277 "Zend/zend_language_scanner.c" +#line 6276 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6292,11 +6291,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 6300 "Zend/zend_language_scanner.c" +#line 6299 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6386,11 +6385,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 6394 "Zend/zend_language_scanner.c" +#line 6393 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6399,11 +6398,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 6407 "Zend/zend_language_scanner.c" +#line 6406 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6428,11 +6427,11 @@ yy681: } YYDEBUG(682, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1233 "Zend/zend_language_scanner.l" +#line 1232 "Zend/zend_language_scanner.l" { return T_CLONE; } -#line 6436 "Zend/zend_language_scanner.c" +#line 6435 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6446,11 +6445,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 6454 "Zend/zend_language_scanner.c" +#line 6453 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6496,11 +6495,11 @@ yy693: } YYDEBUG(694, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1357 "Zend/zend_language_scanner.l" +#line 1356 "Zend/zend_language_scanner.l" { return T_CALLABLE; } -#line 6504 "Zend/zend_language_scanner.c" +#line 6503 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6509,11 +6508,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 6517 "Zend/zend_language_scanner.c" +#line 6516 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6527,11 +6526,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 6535 "Zend/zend_language_scanner.c" +#line 6534 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6582,11 +6581,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 6590 "Zend/zend_language_scanner.c" +#line 6589 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6610,11 +6609,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 6618 "Zend/zend_language_scanner.c" +#line 6617 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6638,11 +6637,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 6646 "Zend/zend_language_scanner.c" +#line 6645 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6676,11 +6675,11 @@ yy719: yy720: YYDEBUG(720, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1325 "Zend/zend_language_scanner.l" +#line 1324 "Zend/zend_language_scanner.l" { return T_FINAL; } -#line 6684 "Zend/zend_language_scanner.c" +#line 6683 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6694,11 +6693,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 6702 "Zend/zend_language_scanner.c" +#line 6701 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6729,11 +6728,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 6737 "Zend/zend_language_scanner.c" +#line 6736 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6742,11 +6741,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 6750 "Zend/zend_language_scanner.c" +#line 6749 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6781,11 +6780,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 6789 "Zend/zend_language_scanner.c" +#line 6788 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6809,11 +6808,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 6817 "Zend/zend_language_scanner.c" +#line 6816 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6893,11 +6892,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 6901 "Zend/zend_language_scanner.c" +#line 6900 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6906,11 +6905,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 6914 "Zend/zend_language_scanner.c" +#line 6913 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6924,11 +6923,11 @@ yy758: } YYDEBUG(759, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1269 "Zend/zend_language_scanner.l" +#line 1268 "Zend/zend_language_scanner.l" { return T_EVAL; } -#line 6932 "Zend/zend_language_scanner.c" +#line 6931 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6998,11 +6997,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 7006 "Zend/zend_language_scanner.c" +#line 7005 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -7031,11 +7030,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 7039 "Zend/zend_language_scanner.c" +#line 7038 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -7044,11 +7043,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 7052 "Zend/zend_language_scanner.c" +#line 7051 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7077,11 +7076,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 7085 "Zend/zend_language_scanner.c" +#line 7084 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7105,11 +7104,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 7113 "Zend/zend_language_scanner.c" +#line 7112 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7143,11 +7142,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 7151 "Zend/zend_language_scanner.c" +#line 7150 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7166,11 +7165,11 @@ yy796: } YYDEBUG(797, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1309 "Zend/zend_language_scanner.l" +#line 1308 "Zend/zend_language_scanner.l" { return T_EMPTY; } -#line 7174 "Zend/zend_language_scanner.c" +#line 7173 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7199,11 +7198,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 7207 "Zend/zend_language_scanner.c" +#line 7206 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7217,11 +7216,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 7225 "Zend/zend_language_scanner.c" +#line 7224 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7235,11 +7234,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 7243 "Zend/zend_language_scanner.c" +#line 7242 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7312,13 +7311,13 @@ yy809: yy810: YYDEBUG(810, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1195 "Zend/zend_language_scanner.l" +#line 1194 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7322 "Zend/zend_language_scanner.c" +#line 7321 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7326,13 +7325,13 @@ yy811: yy812: YYDEBUG(812, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1211 "Zend/zend_language_scanner.l" +#line 1210 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); goto restart; } -#line 7336 "Zend/zend_language_scanner.c" +#line 7335 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7341,13 +7340,13 @@ yy813: yy814: YYDEBUG(814, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1205 "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 7351 "Zend/zend_language_scanner.c" +#line 7350 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7368,11 +7367,11 @@ yy818: ++YYCURSOR; YYDEBUG(819, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1201 "Zend/zend_language_scanner.l" +#line 1200 "Zend/zend_language_scanner.l" { return T_OBJECT_OPERATOR; } -#line 7376 "Zend/zend_language_scanner.c" +#line 7375 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7457,14 +7456,14 @@ yy824: yy825: YYDEBUG(825, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1508 "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 7468 "Zend/zend_language_scanner.c" +#line 7467 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7489,7 +7488,7 @@ yy830: ++YYCURSOR; YYDEBUG(831, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1499 "Zend/zend_language_scanner.l" +#line 1498 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); zend_copy_value(zendlval, yytext, yyleng); @@ -7497,7 +7496,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7501 "Zend/zend_language_scanner.c" +#line 7500 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7508,7 +7507,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2339 "Zend/zend_language_scanner.l" +#line 2338 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7564,7 +7563,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7568 "Zend/zend_language_scanner.c" +#line 7567 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7671,7 +7670,7 @@ yy838: yy839: YYDEBUG(839, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1579 "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)); @@ -7680,7 +7679,7 @@ yy839: } return T_NUM_STRING; } -#line 7684 "Zend/zend_language_scanner.c" +#line 7683 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7700,23 +7699,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1871 "Zend/zend_language_scanner.l" +#line 1870 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7709 "Zend/zend_language_scanner.c" +#line 7708 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1866 "Zend/zend_language_scanner.l" +#line 1865 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7720 "Zend/zend_language_scanner.c" +#line 7719 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7726,14 +7725,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1876 "Zend/zend_language_scanner.l" +#line 1875 "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 7737 "Zend/zend_language_scanner.c" +#line 7736 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7742,18 +7741,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1883 "Zend/zend_language_scanner.l" +#line 1882 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7751 "Zend/zend_language_scanner.c" +#line 7750 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2396 "Zend/zend_language_scanner.l" +#line 2395 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7762,7 +7761,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7766 "Zend/zend_language_scanner.c" +#line 7765 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7798,12 +7797,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1861 "Zend/zend_language_scanner.l" +#line 1860 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7807 "Zend/zend_language_scanner.c" +#line 7806 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7843,12 +7842,12 @@ yy862: yy864: YYDEBUG(864, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1588 "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 7852 "Zend/zend_language_scanner.c" +#line 7851 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7871,6 +7870,6 @@ yy867: goto yy864; } } -#line 2405 "Zend/zend_language_scanner.l" +#line 2404 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 71e9bb60ab..b5100860c1 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -160,8 +160,7 @@ static void _yy_push_state(int new_state TSRMLS_DC) static void yy_pop_state(TSRMLS_D) { - int *stack_state; - zend_stack_top(&SCNG(state_stack), (void **) &stack_state); + int *stack_state = zend_stack_top(&SCNG(state_stack)); YYSETCONDITION(*stack_state); zend_stack_del_top(&SCNG(state_stack)); } diff --git a/Zend/zend_stack.c b/Zend/zend_stack.c index a3c8759f1c..03b23427cb 100644 --- a/Zend/zend_stack.c +++ b/Zend/zend_stack.c @@ -45,14 +45,12 @@ ZEND_API int zend_stack_push(zend_stack *stack, const void *element) } -ZEND_API int zend_stack_top(const zend_stack *stack, void **element) +ZEND_API void *zend_stack_top(const zend_stack *stack) { if (stack->top > 0) { - *element = ZEND_STACK_ELEMENT(stack, stack->top - 1); - return SUCCESS; + return ZEND_STACK_ELEMENT(stack, stack->top - 1); } else { - *element = NULL; - return FAILURE; + return NULL; } } @@ -66,13 +64,11 @@ ZEND_API int zend_stack_del_top(zend_stack *stack) ZEND_API int zend_stack_int_top(const zend_stack *stack) { - int *e; - - if (zend_stack_top(stack, (void **) &e) == FAILURE) { - /* this must be a negative number, since negative numbers can't be address numbers */ - return FAILURE; - } else { + int *e = zend_stack_top(stack); + if (e) { return *e; + } else { + return FAILURE; } } diff --git a/Zend/zend_stack.h b/Zend/zend_stack.h index 3932136aac..6700053258 100644 --- a/Zend/zend_stack.h +++ b/Zend/zend_stack.h @@ -33,7 +33,7 @@ typedef struct _zend_stack { BEGIN_EXTERN_C() ZEND_API int zend_stack_init(zend_stack *stack, int size); ZEND_API int zend_stack_push(zend_stack *stack, const void *element); -ZEND_API int zend_stack_top(const zend_stack *stack, void **element); +ZEND_API void *zend_stack_top(const zend_stack *stack); ZEND_API int zend_stack_del_top(zend_stack *stack); ZEND_API int zend_stack_int_top(const zend_stack *stack); ZEND_API int zend_stack_is_empty(const zend_stack *stack); diff --git a/main/output.c b/main/output.c index 6c6fa5ca8a..d33e418277 100644 --- a/main/output.c +++ b/main/output.c @@ -186,7 +186,7 @@ PHPAPI void php_output_deactivate(TSRMLS_D) /* release all output handlers */ if (OG(handlers).elements) { - while (SUCCESS == zend_stack_top(&OG(handlers), (void *) &handler)) { + while ((handler = zend_stack_top(&OG(handlers)))) { php_output_handler_free(handler TSRMLS_CC); zend_stack_del_top(&OG(handlers)); } @@ -1072,7 +1072,7 @@ static inline void php_output_op(int op, const char *str, size_t len TSRMLS_DC) if (obh_cnt > 1) { zend_stack_apply_with_argument(&OG(handlers), ZEND_STACK_APPLY_TOPDOWN, php_output_stack_apply_op, &context); - } else if ((SUCCESS == zend_stack_top(&OG(handlers), (void *) &active)) && (!((*active)->flags & PHP_OUTPUT_HANDLER_DISABLED))) { + } else if ((active = zend_stack_top(&OG(handlers))) && (!((*active)->flags & PHP_OUTPUT_HANDLER_DISABLED))) { php_output_handler_op(*active, &context); } else { php_output_context_pass(&context); @@ -1242,7 +1242,7 @@ static inline int php_output_stack_pop(int flags TSRMLS_DC) /* pop it off the stack */ zend_stack_del_top(&OG(handlers)); - if (SUCCESS == zend_stack_top(&OG(handlers), (void *) ¤t)) { + if ((current = zend_stack_top(&OG(handlers)))) { OG(active) = *current; } else { OG(active) = NULL; -- 2.40.0