cvs: Zend(PHP_4_4) / zend_language_scanner.l

dmitry          Tue Jan 17 09:42:24 2006 UTC

  Modified files:              (Branch: PHP_4_4)
    /Zend       zend_language_scanner.l 
  Log:
  Fixed bug #36037 (heredoc adds extra line number)
  
  
http://cvs.php.net/viewcvs.cgi/Zend/zend_language_scanner.l?r1=1.54.2.33.2.3&r2=1.54.2.33.2.4&diff_format=u
Index: Zend/zend_language_scanner.l
diff -u Zend/zend_language_scanner.l:1.54.2.33.2.3 
Zend/zend_language_scanner.l:1.54.2.33.2.4
--- Zend/zend_language_scanner.l:1.54.2.33.2.3  Sun Jan  1 13:46:49 2006
+++ Zend/zend_language_scanner.l        Tue Jan 17 09:42:24 2006
@@ -1632,7 +1632,6 @@
 <ST_HEREDOC>^{LABEL}(";")?{NEWLINE} {
        int label_len;
 
-       CG(zend_lineno)++;
        if (yytext[yyleng-2]=='\r') {
                label_len = yyleng-2;
        } else {
@@ -1653,6 +1652,7 @@
                BEGIN(ST_IN_SCRIPTING);
                return T_END_HEREDOC;
        } else {
+               CG(zend_lineno)++;
                zend_copy_value(zendlval, yytext, yyleng);
                zendlval->type = IS_STRING;
                return T_STRING;

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