Re: cvs: ZendEngine2 / zend_language_scanner.c zend_language_scanner.l

Thanks!
Nuno


----- Original Message ----- 
From: "Matt Wilmas" <[email protected]>
To: <[email protected]>
Sent: Monday, June 09, 2008 11:20 AM
Subject: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend_language_scanner.c 
zend_language_scanner.l


> mattwil Mon Jun  9 10:20:30 2008 UTC
>
>  Modified files:
>    /ZendEngine2 zend_language_scanner.c zend_language_scanner.l
>  Log:
>  MFB: Fixed yyleng calculation after the yyless change
>
> http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.c?r1=1.8&r2=1.9&diff_format=u
> Index: ZendEngine2/zend_language_scanner.c
> diff -u ZendEngine2/zend_language_scanner.c:1.8 
> ZendEngine2/zend_language_scanner.c:1.9
> --- ZendEngine2/zend_language_scanner.c:1.8 Fri Jun  6 17:34:43 2008
> +++ ZendEngine2/zend_language_scanner.c Mon Jun  9 10:20:30 2008
> @@ -1,4 +1,4 @@
> -/* Generated by re2c 0.13.6.dev on Fri Jun  6 18:30:48 2008 */
> +/* Generated by re2c 0.13.5 on Mon Jun 09 05:05:01 2008 */
> #line 1 "Zend/zend_language_scanner.l"
> /*
> 
> +----------------------------------------------------------------------+
> @@ -23,7 +23,7 @@
> 
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: zend_language_scanner.c,v 1.8 2008/06/06 17:34:43 nlopess Exp $ 
> */
> +/* $Id: zend_language_scanner.c,v 1.9 2008/06/09 10:20:30 mattwil Exp $ 
> */
>
> #if 0
> # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
> @@ -3310,9 +3310,9 @@
>  /* 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);
> @@ -9396,9 +9396,9 @@
>  /* 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);
> http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.185&r2=1.186&diff_format=u
> Index: ZendEngine2/zend_language_scanner.l
> diff -u ZendEngine2/zend_language_scanner.l:1.185 
> ZendEngine2/zend_language_scanner.l:1.186
> --- ZendEngine2/zend_language_scanner.l:1.185 Fri Jun  6 17:34:43 2008
> +++ ZendEngine2/zend_language_scanner.l Mon Jun  9 10:20:30 2008
> @@ -21,7 +21,7 @@
> 
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: zend_language_scanner.l,v 1.185 2008/06/06 17:34:43 nlopess Exp $ 
> */
> +/* $Id: zend_language_scanner.l,v 1.186 2008/06/09 10:20:30 mattwil Exp $ 
> */
>
> #if 0
> # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
> @@ -2532,9 +2532,9 @@
>  /* 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);
> @@ -2722,9 +2722,9 @@
>  /* 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);
>
>
>
> -- 
> Zend Engine CVS Mailing List (http://cvs.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php 


-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php