cvs: ZendEngine2 / zend_compile.c zend_compile.h zend_globals.h zend_language_parser.y

jason Tue Aug 13 21:40:59 2002 EDT Modified files: /ZendEngine2 zend_compile.c zend_compile.h zend_globals.h zend_language_parser.y Log: MFZE1 (use token instead of global for opcode counting) Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.301 ZendEngine2/zend_compile.c:1.302 --- ZendEngine2/zend_compile.c:1.301 Thu Aug 8 12:32:34 2002 +++ ZendEngine2/zend_compile.c Tue Aug 13 21:40:59 2002 @@ -2857,7 +2857,6 @@ void zend_do_declare_begin(TSRMLS_D) { zend_stack_push(&CG(declare_stack), &CG(declarables), sizeof(zend_declarables)); - CG(declarables).beginop = get_next_op_number(CG(active_op_array)); } @@ -2873,13 +2872,13 @@ } -void zend_do_declare_end(TSRMLS_D) +void zend_do_declare_end(znode *declare_token TSRMLS_DC) { zend_declarables *declarables; zend_stack_top(&CG(declare_stack), (void **) &declarables); /* We should restore if there was more than (current - start) - (ticks?1:0) opcodes */ - if ((get_next_op_number(CG(active_op_array)) - CG(declarables).beginop) - ((CG(declarables).ticks.value.lval)?1:0)) { + if ((get_next_op_number(CG(active_op_array)) - declare_token->u.opline_num) - ((CG(declarables).ticks.value.lval)?1:0)) { CG(declarables) = *declarables; } } Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.180 ZendEngine2/zend_compile.h:1.181 --- ZendEngine2/zend_compile.h:1.180 Thu Aug 8 12:32:34 2002 +++ ZendEngine2/zend_compile.h Tue Aug 13 21:40:59 2002 @@ -366,7 +366,7 @@ void zend_do_declare_begin(TSRMLS_D); void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC); -void zend_do_declare_end(TSRMLS_D); +void zend_do_declare_end(znode *declare_token TSRMLS_DC); void zend_do_end_heredoc(TSRMLS_D); Index: ZendEngine2/zend_globals.h diff -u ZendEngine2/zend_globals.h:1.102 ZendEngine2/zend_globals.h:1.103 --- ZendEngine2/zend_globals.h:1.102 Tue Jul 30 18:19:50 2002 +++ ZendEngine2/zend_globals.h Tue Aug 13 21:40:59 2002 @@ -58,7 +58,6 @@ typedef struct _zend_declarables { zval ticks; - zend_uint beginop; } zend_declarables; Index: ZendEngine2/zend_language_parser.y diff -u ZendEngine2/zend_language_parser.y:1.66 ZendEngine2/zend_language_parser.y:1.67 --- ZendEngine2/zend_language_parser.y:1.66 Thu Aug 8 12:32:34 2002 +++ ZendEngine2/zend_language_parser.y Tue Aug 13 21:40:59 2002 @@ -207,7 +207,7 @@ | T_UNSET '(' unset_variables ')' ';' | T_FOREACH '(' variable T_AS { zend_do_foreach_begin(&$1, &$3, &$2, &$4, 1 TSRMLS_CC); } w_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$6, &$7, &$4 TSRMLS_CC); } foreach_statement { zend_do_foreach_end(&$1, &$2 TSRMLS_CC); } | T_FOREACH '(' expr_without_variable T_AS { zend_do_foreach_begin(&$1, &$3, &$2, &$4, 0 TSRMLS_CC); } w_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$6, &$7, &$4 TSRMLS_CC); } foreach_statement { zend_do_foreach_end(&$1, &$2 TSRMLS_CC); } - | T_DECLARE { zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(TSRMLS_C); } + | T_DECLARE { $1.u.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); } | ';' /* empty statement */ | T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}' T_CATCH '(' catch_or_import_class_entry T_VARIABLE ')' { zend_do_begin_catch(&$1, &$8, &$9, 1 TSRMLS_CC); } '{' inner_statement_list '}' { zend_do_end_catch(&$1 TSRMLS_CC); }