cvs: ZendEngine2 / zend_language_scanner.l
| From: | Andi Gutmans | Date: | Mon, 18 Nov 2002 05:27:47 +0000 |
| Subject: | cvs: ZendEngine2 / zend_language_scanner.l | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-637@lists.php.net to get a copy of this message | ||
andi Mon Nov 18 00:27:47 2002 EDT
Modified files:
/ZendEngine2 zend_language_scanner.l
Log:
- MFZE1
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.64 ZendEngine2/zend_language_scanner.l:1.65
--- ZendEngine2/zend_language_scanner.l:1.64 Sat Nov 16 02:37:03 2002
+++ ZendEngine2/zend_language_scanner.l Mon Nov 18 00:27:46 2002
@@ -474,7 +474,8 @@
EXPONENT_DNUM (({LNUM}|{DNUM})[eE][+-]?{LNUM})
HNUM "0x"[0-9a-fA-F]+
LABEL [a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*
-ENCAPSED_STRING_WITH_NEWLINE ([a-zA-Z0-9_\x7f-\xff \t\n\r
#'.:;,()|^&+/*=%!~<>?@]|"-"[^>])+
+ENCAPSED_STRING ([a-zA-Z0-9_\x7f-\xff \t
#'.:;,()|^&+/*=%!~<>?@]|"-"[a-zA-Z0-9_\x7f-\xff \t
#'.:;,()|^&+/*=%!~<?@])+
+ENCAPSED_STRING_WITH_NEWLINE ([a-zA-Z0-9_\x7f-\xff \t\n\r
#'.:;,()|^&+/*=%!~<>?@]|"-"[a-zA-Z0-9_\x7f-\xff \t\n\r
#'.:;,()|^&+/*=%!~<?@])+
WHITESPACE [ \n\r\t]+
TABS_AND_SPACES [ \t]*
TOKENS [;:,.\[\]()|^&+-/*=%!~$<>?@]
@@ -1093,7 +1094,7 @@
}
-<ST_HEREDOC>{LABEL} {
+<ST_HEREDOC>{ENCAPSED_STRING} {
zendlval->value.str.val = (char *)estrndup(yytext, yyleng);
zendlval->value.str.len = yyleng;
zendlval->type = IS_STRING;
@@ -1382,7 +1383,7 @@
}
-<ST_HEREDOC>{ESCAPED_AND_WHITESPACE} {
+<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>{ESCAPED_AND_WHITESPACE} {
HANDLE_NEWLINES(yytext, yyleng);
zendlval->value.str.val = (char *) estrndup(yytext, yyleng);
zendlval->value.str.len = yyleng;