diff options
| author | Nuno Lopes <nlopess@php.net> | 2008-04-10 19:19:04 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2008-04-10 19:19:04 +0000 |
| commit | 7507ff326efed2c0e0cc37a504cf2927c4e3ee64 (patch) | |
| tree | 742c3a841bee058c57df3c47ae90b36d18ea4d31 /Zend/zend_language_scanner.c | |
| parent | 93c676992d748e7d82165e5982018362e717f4f4 (diff) | |
| download | php-git-7507ff326efed2c0e0cc37a504cf2927c4e3ee64.tar.gz | |
fix heredoc+nowdoc
#patch by Matt Wilmas
Diffstat (limited to 'Zend/zend_language_scanner.c')
| -rw-r--r-- | Zend/zend_language_scanner.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 9807442a34..c77bbf6693 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5.dev on Wed Apr 9 22:52:47 2008 */ +/* Generated by re2c 0.13.5.dev on Thu Apr 10 20:01:41 2008 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ @@ -2519,9 +2519,9 @@ yy181: /* Go back before last label char, to match in ST_END_HEREDOC state */ yyless(yyleng - 2); - /* Subtract the label/newline length. yyleng must include newline + /* Subtract the remaining label length. yyleng must include newline * before label, for zend_highlight/strip, tokenizer, etc. */ - yyleng -= CG(heredoc_len) + 1; + yyleng -= CG(heredoc_len) - 1; CG(increment_lineno) = 1; /* For newline before label */ BEGIN(ST_END_HEREDOC); @@ -8279,9 +8279,9 @@ yy932: /* Go back before last label char, to match in ST_END_NOWDOC state */ yyless(yyleng - 2); - /* Subtract the label/newline length. yyleng must include newline + /* Subtract the remaining label length. yyleng must include newline * before label, for zend_highlight/strip, tokenizer, etc. */ - yyleng -= CG(heredoc_len) + 1; + yyleng -= CG(heredoc_len) - 1; CG(increment_lineno) = 1; /* For newline before label */ BEGIN(ST_END_NOWDOC); |