From f8410c5b50b5a4ccc9477f7e7a7e85ade2e97fc2 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 21 Feb 2005 22:25:28 +0000
Subject: * parse.y (parser_yylex): identfier after dot must not be a variable.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 790105c85..2b41cd558 100644
--- a/parse.y
+++ b/parse.y
@@ -1554,7 +1554,7 @@ primary		: literal
 			    nd_set_type($$, NODE_UNTIL);
 			}
 		    }
-		| kUNTIL {COND_PUSH(1);} expr_value do {COND_POP();} 
+		| kUNTIL {COND_PUSH(1);} expr_value do {COND_POP();}
 		  compstmt
 		  kEND
 		    {
@@ -3458,7 +3458,7 @@ yylex()
 	if (c == '<' &&
 	    lex_state != EXPR_END &&
 	    lex_state != EXPR_DOT &&
-	    lex_state != EXPR_ENDARG && 
+	    lex_state != EXPR_ENDARG &&
 	    lex_state != EXPR_CLASS &&
 	    (!IS_ARG() || space_seen)) {
 	    int token = heredoc_identifier();
@@ -4334,6 +4334,7 @@ yylex()
 
     {
 	int result = 0;
+	enum lex_state last_state = lex_state;
 
 	switch (tok()[0]) {
 	  case '$':
@@ -4419,6 +4420,7 @@ yylex()
 	}
 	yylval.id = rb_intern(tok());
 	if (is_local_id(yylval.id) &&
+	    last_state != EXPR_DOT &&
 	    ((dyna_in_block() && rb_dvar_defined(yylval.id)) || local_id(yylval.id))) {
 	    lex_state = EXPR_END;
 	}
-- 
cgit