From: Andi Gutmans <andi@php.net>
Date: Mon, 18 Nov 2002 05:27:46 +0000 (+0000)
Subject: - MFZE1
X-Git-Tag: RELEASE_1_0b2~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d8a643edbd6c40fd608a09a42b92cf0a26c7410;p=php

- MFZE1
---

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index ec09999d65..dd6d5637fe 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -474,7 +474,8 @@ DNUM	([0-9]*[\.][0-9]+)|([0-9]+[\.][0-9]*)
 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 @@ NEWLINE ("\r"|"\n"|"\r\n")
 }
 
 
-<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 @@ NEWLINE ("\r"|"\n"|"\r\n")
 }
 
 
-<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;