diff options
| author | Zeev Suraski <zeev@php.net> | 2001-08-06 14:36:46 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-08-06 14:36:46 +0000 |
| commit | 7ade3b30cb9253341f18f7016e07f41a9fb478b5 (patch) | |
| tree | 3e59032bf788254bedecc5334a78f965f71a3d2e /Zend/zend_language_scanner.l | |
| parent | 85875e83ae665f1d00b3d6f6d6924b683a905514 (diff) | |
| download | php-git-7ade3b30cb9253341f18f7016e07f41a9fb478b5.tar.gz | |
Fix an off by one lineno issue, in case of an implicit ;
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 37be5e7994..f5f79e7ae4 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -322,6 +322,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC) zend_set_compiled_filename(file_path TSRMLS_CC); CG(zend_lineno) = 1; + CG(increment_lineno) = 0; return SUCCESS; } END_EXTERN_C() @@ -1233,7 +1234,6 @@ NEWLINE ("\r"|"\n"|"\r\n") zendlval->value.str.val = yytext; /* no copying - intentional */ zendlval->value.str.len = yyleng; zendlval->type = IS_STRING; - HANDLE_NEWLINES(yytext, yyleng); BEGIN(INITIAL); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } @@ -1245,7 +1245,6 @@ NEWLINE ("\r"|"\n"|"\r\n") zendlval->value.str.len = yyleng; zendlval->type = IS_STRING; zendlval->value.str.val = yytext; /* no copying - intentional */ - HANDLE_NEWLINES(yytext,yyleng); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } else { yyless(1); |