From 3d4c1d68869f98e5703973316ce86c7163b6b6f9 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 8 Dec 2005 03:09:14 +0000
Subject: Improve fix for bug #35382

---
 Zend/zend_language_scanner.l | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 332e5c0bf8..af4059fef7 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1461,16 +1461,22 @@ NEWLINE ("\r"|"\n"|"\r\n")
 	yymore();
 }
 
-<ST_ONE_LINE_COMMENT>[^\n\r?%>]+ {
-	yymore();
-}
-
-<ST_ONE_LINE_COMMENT><<EOF>> {
-	zendlval->value.str.val = yytext; /* no copying - intentional */
-	zendlval->value.str.len = yyleng;
-	zendlval->type = IS_STRING;
-	BEGIN(INITIAL);
-	return EOF;
+<ST_ONE_LINE_COMMENT>[^\n\r?%>]+{ANY_CHAR} {
+	switch (yytext[yyleng-1]) {
+		case '?': case '%': case '>':
+			yyless(yyleng-1);
+			yymore();
+			break;
+		case '\n':
+			CG(zend_lineno)++;
+			/* intentional fall through */
+		default:
+			zendlval->value.str.val = yytext; /* no copying - intentional */
+			zendlval->value.str.len = yyleng;
+			zendlval->type = IS_STRING;
+			BEGIN(ST_IN_SCRIPTING);
+			return T_COMMENT;
+	}
 }
 
 <ST_ONE_LINE_COMMENT>{NEWLINE} {
-- 
cgit v1.2.1