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

zeev Sun Jan 5 11:07:03 2003 EDT Modified files: /Zend zend_compile.c zend_globals.h zend_language_scanner.l Log: Fix lineno issue in Windows and various other operating systems Index: Zend/zend_compile.c diff -u Zend/zend_compile.c:1.242 Zend/zend_compile.c:1.243 --- Zend/zend_compile.c:1.242 Tue Dec 31 10:55:01 2002 +++ Zend/zend_compile.c Sun Jan 5 11:07:03 2003 @@ -83,6 +83,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); #ifdef ZEND_MULTIBYTE CG(script_encoding_list) = NULL; Index: Zend/zend_globals.h diff -u Zend/zend_globals.h:1.94 Zend/zend_globals.h:1.95 --- Zend/zend_globals.h:1.94 Tue Dec 31 10:55:03 2002 +++ Zend/zend_globals.h Sun Jan 5 11:07:03 2003 @@ -118,7 +118,9 @@ int interactive; + zend_uint start_lineno; zend_bool increment_lineno; + #ifdef ZEND_MULTIBYTE zend_encoding **script_encoding_list; Index: Zend/zend_language_scanner.l diff -u Zend/zend_language_scanner.l:1.62 Zend/zend_language_scanner.l:1.63 --- Zend/zend_language_scanner.l:1.62 Sat Dec 14 18:55:14 2002 +++ Zend/zend_language_scanner.l Sun Jan 5 11:07:03 2003 @@ -304,8 +304,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; }