cvs: Zend(PHP_4_4) / zend_language_scanner.l
| From: | Dmitry Stogov | Date: | Thu, 13 Apr 2006 13:52:24 +0000 |
| Subject: | cvs: Zend(PHP_4_4) / zend_language_scanner.l | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4813@lists.php.net to get a copy of this message | ||
dmitry Thu Apr 13 13:52:24 2006 UTC
Modified files: (Branch: PHP_4_4)
/Zend zend_language_scanner.l
Log:
Fixed bug #36513 (comment will be outputed in last line)
http://cvs.php.net/viewcvs.cgi/Zend/zend_language_scanner.l?r1=1.54.2.33.2.4&r2=1.54.2.33.2.5&diff_format=u
Index: Zend/zend_language_scanner.l
diff -u Zend/zend_language_scanner.l:1.54.2.33.2.4 Zend/zend_language_scanner.l:1.54.2.33.2.5
--- Zend/zend_language_scanner.l:1.54.2.33.2.4 Tue Jan 17 09:42:24 2006
+++ Zend/zend_language_scanner.l Thu Apr 13 13:52:24 2006
@@ -1374,7 +1374,7 @@
yymore();
}
-<ST_ONE_LINE_COMMENT>[^\n\r?%>]+{ANY_CHAR} {
+<ST_ONE_LINE_COMMENT>[^\n\r?%>]*{ANY_CHAR} {
switch (yytext[yyleng-1]) {
case '?': case '%': case '>':
yyless(yyleng-1);
@@ -1404,7 +1404,7 @@
<ST_ONE_LINE_COMMENT>"?>"|"%>" {
if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
zendlval->value.str.val = yytext; /* no copying - intentional */
- zendlval->value.str.len = yyleng;
+ zendlval->value.str.len = yyleng-2;
zendlval->type = IS_STRING;
yyless(yyleng-2);
BEGIN(ST_IN_SCRIPTING);