cvs: ZendEngine2(PHP_5_3) / zend_language_scanner.c zend_language_scanner_defs.h

moriyoshi Mon Jul 28 06:05:37 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2 zend_language_scanner.c zend_language_scanner_defs.h Log: - Touch http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.c?r1=1.1.2.21&r2=1.1.2.22&diff_format=u Index: ZendEngine2/zend_language_scanner.c diff -u ZendEngine2/zend_language_scanner.c:1.1.2.21 ZendEngine2/zend_language_scanner.c:1.1.2.22 --- ZendEngine2/zend_language_scanner.c:1.1.2.21 Mon Jul 28 06:00:13 2008 +++ ZendEngine2/zend_language_scanner.c Mon Jul 28 06:05:35 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Mon Jul 28 14:40:08 2008 */ +/* Generated by re2c 0.13.5 on Mon Jul 28 15:01:08 2008 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.c,v 1.1.2.21 2008/07/28 06:00:13 moriyoshi Exp $ */ +/* $Id: zend_language_scanner.c,v 1.1.2.22 2008/07/28 06:05:35 moriyoshi Exp $ */ #if 0 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c) @@ -450,22 +450,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; } @@ -607,10 +607,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; } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner_defs.h?r1=1.1.2.15&r2=1.1.2.16&diff_format=u Index: ZendEngine2/zend_language_scanner_defs.h diff -u ZendEngine2/zend_language_scanner_defs.h:1.1.2.15 ZendEngine2/zend_language_scanner_defs.h:1.1.2.16 --- ZendEngine2/zend_language_scanner_defs.h:1.1.2.15 Mon Jul 28 06:00:15 2008 +++ ZendEngine2/zend_language_scanner_defs.h Mon Jul 28 06:05:36 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Mon Jul 28 14:40:08 2008 */ +/* Generated by re2c 0.13.5 on Mon Jul 28 15:01:08 2008 */ #line 3 "Zend/zend_language_scanner_defs.h" enum YYCONDTYPE {