From: Andi Gutmans <andi@php.net>
Date: Fri, 23 Apr 1999 06:14:06 +0000 (+0000)
Subject: - Use yyless() instead of unput() where possible. I'll erase the commented
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~206
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01575b9d9d2b1608c79522c6ce1079410cf5aad9;p=php

- Use yyless() instead of unput() where possible. I'll erase the commented
  out code in a day or so.
---

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 9f0813a907..49239c7ccc 100644
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -617,7 +617,8 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 }
 
 <LOOKING_FOR_PROPERTY>. {
-	unput(yytext[0]);
+	/*unput(yytext[0]);*/
+	yyless(1);
 	yy_pop_state();
 }
 
@@ -1161,9 +1162,10 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 <DOUBLE_QUOTES,BACKQUOTE,HEREDOC>"$"[^a-zA-Z_\x7f-\xff{] {
 	zendlval->value.chval = yytext[0];
 	if (yyleng == 2) {
-		unput(yytext[1]);
+		yyless(1);
+		/*unput(yytext[1]);
 		yytext[1] = 0;
-		yyleng--;
+		yyleng--;*/
 	}
 	return T_CHARACTER;	
 }
@@ -1177,7 +1179,8 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 <DOUBLE_QUOTES,BACKQUOTE,HEREDOC>"{$" {
 	zendlval->value.chval = yytext[0];
 	yy_push_state(IN_SCRIPTING);
-	unput('$');
+	/*unput('$');*/
+	yyless(1);
 	return T_CURLY_OPEN;
 }