| Zeev Suraski 2005-03-07, 3:57 pm |
| zeev Mon Mar 7 11:48:14 2005 EDT
Modified files: (Branch: PHP_5_0)
/ZendEngine2 zend_language_scanner.l
Log:
Revert // </script> patch
http://cvs.php.net/diff.php/ZendEng...=1.111.2.8&ty=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.111.2.7 ZendEngine2/zend_language_scanner.l:1.111.2.8
--- ZendEngine2/zend_language_scanner.l:1.111.2.7 Mon Feb 28 21:21:58 2005
+++ ZendEngine2/zend_language_scanner.l Mon Mar 7 11:48:12 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.l,v 1.111.2.7 2005/03/01 02:21:58 sniper Exp $ */
+/* $Id: zend_language_scanner.l,v 1.111.2.8 2005/03/07 16:48:12 zeev Exp $ */
#define yyleng SCNG(yy_leng)
#define yytext SCNG(yy_text)
@@ -1432,11 +1432,11 @@
yymore();
}
-<ST_ONE_LINE_COMMENT>"?"|"%"|">"|"<" {
+<ST_ONE_LINE_COMMENT>"?"|"%"|">" {
yymore();
}
-<ST_ONE_LINE_COMMENT>[^\n\r?%><]+ {
+<ST_ONE_LINE_COMMENT>[^\n\r?%>]+ {
yymore();
}
@@ -1449,15 +1449,6 @@
return T_COMMENT;
}
-<ST_ONE_LINE_COMMENT>"</script>" {
- zendlval->value.str.val = yytext; /* no copying - intentional */
- zendlval->value.str.len = yyleng;
- zendlval->type = IS_STRING;
- yyless(yyleng-9);
- BEGIN(ST_IN_SCRIPTING);
- return T_COMMENT;
-}
-
<ST_ONE_LINE_COMMENT>"?>"|"%>" {
if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1506,7 +1497,7 @@
yymore();
}
-<ST_IN_SCRIPTING>("?>"|"</script>"){NEWLINE}? {
+<ST_IN_SCRIPTING>("?>"|"</script"{WHITESPACE}*">"){NEWLINE}? {
zendlval->value.str.val = yytext; /* no copying - intentional */
zendlval->value.str.len = yyleng;
zendlval->type = IS_STRING;
|