cvs: Zend(PHP_4_3) / zend_language_scanner.l
| From: | Andi Gutmans | Date: | Mon, 18 Nov 2002 05:23:20 +0000 |
| Subject: | cvs: Zend(PHP_4_3) / zend_language_scanner.l | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-636@lists.php.net to get a copy of this message | ||
andi Mon Nov 18 00:23:20 2002 EDT
Modified files: (Branch: PHP_4_3)
/Zend zend_language_scanner.l
Log:
- MFH
Index: Zend/zend_language_scanner.l
diff -u Zend/zend_language_scanner.l:1.54.2.5 Zend/zend_language_scanner.l:1.54.2.6
--- Zend/zend_language_scanner.l:1.54.2.5 Sat Nov 16 12:07:45 2002
+++ Zend/zend_language_scanner.l Mon Nov 18 00:23:19 2002
@@ -707,7 +707,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 [;:,.\[\]()|^&+-/*=%!~$<>?@]
@@ -1302,7 +1303,7 @@
}
-<ST_HEREDOC>{LABEL} {
+<ST_HEREDOC>{ENCAPSED_STRING} {
zend_copy_value(zendlval, yytext, yyleng);
zendlval->type = IS_STRING;
return T_STRING;
@@ -1605,7 +1606,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;