diff options
| -rw-r--r-- | Zend/zend_language_scanner.c | 38 | ||||
| -rw-r--r-- | Zend/zend_language_scanner_defs.h | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 48bcb28c68..3c4aa40380 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -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" /* +----------------------------------------------------------------------+ @@ -450,22 +450,22 @@ ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D) { 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 @@ ZEND_API void zend_multibyte_yyinput_again(zend_encoding_filter old_input_filter 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; } diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index d6387ef530..939be08359 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -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 { |