cvs: ZendEngine2(PHP_5_3) / zend_language_scanner.l

moriyoshi Mon Jul 28 06:05:15 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2 zend_language_scanner.l Log: - WS http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.131.2.11.2.13.2.26&r2=1.131.2.11.2.13.2.27&diff_format=u Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.26 ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.27 --- ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.26 Mon Jul 28 05:59:16 2008 +++ ZendEngine2/zend_language_scanner.l Mon Jul 28 06:05:14 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.26 2008/07/28 05:59:16 moriyoshi Exp $ */ +/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.27 2008/07/28 06:05:14 moriyoshi Exp $ */ #if 0 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c) @@ -448,22 +448,22 @@ { size_t offset = SCNG(yy_cursor) - SCNG(yy_start); #ifdef ZEND_MULTIBYTE - size_t original_offset = offset, length = 0; - do { - unsigned char *p = NULL; - SCNG(input_filter)(&p, &length, SCNG(script_org), offset TSRMLS_CC); - if (!p) { - break; - } - efree(p); - if (length > original_offset) { - offset--; - } else if (length < original_offset) { - offset++; - } - } while (original_offset != length); + size_t original_offset = offset, length = 0; + do { + unsigned char *p = NULL; + SCNG(input_filter)(&p, &length, SCNG(script_org), offset TSRMLS_CC); + if (!p) { + break; + } + efree(p); + if (length > original_offset) { + offset--; + } else if (length < original_offset) { + offset++; + } + } while (original_offset != length); #endif - return offset; + return offset; } @@ -605,10 +605,10 @@ offset = original_offset = YYCURSOR - SCNG(yy_start); if (old_input_filter && offset > 0) { zend_encoding *new_encoding = SCNG(script_encoding); - zend_encoding_filter new_filter = SCNG(input_filter); + zend_encoding_filter new_filter = SCNG(input_filter); SCNG(script_encoding) = old_encoding; - SCNG(input_filter) = new_filter; - offset = zend_get_scanned_file_offset(TSRMLS_C); + SCNG(input_filter) = new_filter; + offset = zend_get_scanned_file_offset(TSRMLS_C); SCNG(script_encoding) = new_encoding; SCNG(input_filter) = new_filter; }