From: Zeev Suraski <zeev@php.net>
Date: Mon, 22 Nov 1999 17:11:36 +0000 (+0000)
Subject: Fix inconsistencies with here-docs implementation
X-Git-Tag: PRE_RETURN_REF_PATCH~309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b9673ca5832878a9a5142c163837378e4146056;p=php

Fix inconsistencies with here-docs implementation
---

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 3960c5692d..d08b1864dc 100644
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -1441,7 +1441,7 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 	return T_CHARACTER;
 }
 
-<ST_DOUBLE_QUOTES,ST_BACKQUOTE>"\\". {
+<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"\\". {
 	switch (yytext[1]) {
 		case 'n':
 			zendlval->value.chval='\n';
@@ -1472,12 +1472,6 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 }
 
 
-<ST_HEREDOC>"\\$"|"\\{" {
-	zendlval->value.chval = yytext[1];
-	return T_CHARACTER;
-}
-
-
 <ST_HEREDOC>["'`]+ {
 	zendlval->value.str.val = (char *) estrndup(yytext, yyleng);
 	zendlval->value.str.len = yyleng;
@@ -1515,6 +1509,6 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 	
 
 
-<ST_IN_SCRIPTING,INITIAL,ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_SINGLE_QUOTE>. {
+<ST_IN_SCRIPTING,INITIAL,ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_SINGLE_QUOTE,ST_HEREDOC>. {
 	zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d",yytext[0],yytext[0],YYSTATE);
 }