cvs: ZendEngine2 / zend_compile.c zend_globals.h zend_language_scanner.l

zeev Sun Jan 5 11:09:59 2003 EDT Modified files: /ZendEngine2 zend_compile.c zend_globals.h zend_language_scanner.l Log: MFZE1 - lineno fix Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.338 ZendEngine2/zend_compile.c:1.339 --- ZendEngine2/zend_compile.c:1.338 Thu Jan 2 08:58:07 2003 +++ ZendEngine2/zend_compile.c Sun Jan 5 11:09:58 2003 @@ -79,6 +79,7 @@ zend_stack_init(&CG(list_stack)); CG(handle_op_arrays) = 1; CG(in_compilation) = 0; + CG(start_lineno) = 0; init_compiler_declarables(TSRMLS_C); CG(throw_list) = NULL; zend_register_auto_global("GLOBALS", sizeof("GLOBALS")-1 TSRMLS_CC); Index: ZendEngine2/zend_globals.h diff -u ZendEngine2/zend_globals.h:1.112 ZendEngine2/zend_globals.h:1.113 --- ZendEngine2/zend_globals.h:1.112 Tue Dec 31 10:54:08 2002 +++ ZendEngine2/zend_globals.h Sun Jan 5 11:09:59 2003 @@ -119,6 +119,7 @@ int interactive; + zend_uint start_lineno; zend_bool in_clone_method; zend_bool increment_lineno; Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.69 ZendEngine2/zend_language_scanner.l:1.70 --- ZendEngine2/zend_language_scanner.l:1.69 Sat Dec 14 18:56:44 2002 +++ ZendEngine2/zend_language_scanner.l Sun Jan 5 11:09:59 2003 @@ -248,8 +248,9 @@ zend_set_compiled_filename(file_path TSRMLS_CC); - if (CG(zend_lineno) < 0) { /* position is (n_lines * -1), position was changed by an external app */ - CG(zend_lineno) = CG(zend_lineno) * -1; + if (CG(start_lineno)) { + CG(zend_lineno) = CG(start_lineno); + CG(start_lineno) = 0; } else { CG(zend_lineno) = 1; }