nlopess         Sun Jul  6 16:20:51 2008 UTC

  Added files:                 (Branch: PHP_5_3)
    /php-src/tests/lang bug44654.phpt 

  Modified files:              
    /ZendEngine2        zend_language_scanner.l 
  Log:
  fix last part of bug #44654
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.131.2.11.2.13.2.20&r2=1.131.2.11.2.13.2.21&diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.20 
ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.21
--- ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.20    Sun Jul  6 
15:53:23 2008
+++ ZendEngine2/zend_language_scanner.l Sun Jul  6 16:20:51 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.20 2008/07/06 15:53:23 
nlopess Exp $ */
+/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.21 2008/07/06 16:20:51 
nlopess Exp $ */
 
 #if 0
 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
@@ -1620,6 +1620,7 @@
                /* ignore first line when it's started with a # */
                goto restart;
        } else {
+               YYCURSOR = yytext+1;
                goto inline_char_handler;
        }
 }
@@ -1640,7 +1641,7 @@
                        YYCURSOR = ptr + 1;
 
                        /* if it can be an opening tag, stop */
-                       if (ptr < YYLIMIT && (*YYCURSOR == '?' || *YYCURSOR == 
'%')) {
+                       if (YYCURSOR < YYLIMIT && (*YYCURSOR == '?' || 
*YYCURSOR == '%')) {
                                --YYCURSOR;
                                yyleng = YYCURSOR - SCNG(yy_text);
                                break;

http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug44654.phpt?view=markup&rev=1.1
Index: php-src/tests/lang/bug44654.phpt
+++ php-src/tests/lang/bug44654.phpt



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

Reply via email to