cvs: ZendEngine2 / zend_language_scanner.l /tests bug36037.phpt

dmitry          Tue Jan 17 09:39:33 2006 UTC

  Added files:                 
    /ZendEngine2/tests  bug36037.phpt 

  Modified files:              
    /ZendEngine2        zend_language_scanner.l 
  Log:
  Fixed bug #36037 (heredoc adds extra line number)
  
  
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_language_scanner.l?r1=1.142&r2=1.143&diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.142 
ZendEngine2/zend_language_scanner.l:1.143
--- ZendEngine2/zend_language_scanner.l:1.142   Wed Jan  4 23:52:06 2006
+++ ZendEngine2/zend_language_scanner.l Tue Jan 17 09:39:33 2006
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_language_scanner.l,v 1.142 2006/01/04 23:52:06 andi Exp $ */
+/* $Id: zend_language_scanner.l,v 1.143 2006/01/17 09:39:33 dmitry Exp $ */
 
 #define yyleng SCNG(yy_leng)
 #define yytext SCNG(yy_text)
@@ -2286,7 +2286,6 @@
 <ST_HEREDOC>^{LABEL}(";")?{NEWLINE} {
        int label_len;
 
-       CG(zend_lineno)++;
        if (yytext[yyleng-2]=='\r') {
                label_len = yyleng-2;
        } else {
@@ -2307,6 +2306,7 @@
                BEGIN(ST_IN_SCRIPTING);
                return T_END_HEREDOC;
        } else {
+               CG(zend_lineno)++;
                if (!zend_copy_string_value(zendlval, yytext, yyleng, 
CG(literal_type) TSRMLS_CC)) {
                        return 0;
                }

http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/bug36037.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/bug36037.phpt
+++ ZendEngine2/tests/bug36037.phpt
--TEST--
Bug #36037 (heredoc adds extra line number)
--FILE--
<?php
echo __LINE__, "\n";
$x=<<<XXX
123
YYY;
XXX;
echo __LINE__, "\n";
?>
--EXPECT--
2
7

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