From f8410c5b50b5a4ccc9477f7e7a7e85ade2e97fc2 Mon Sep 17 00:00:00 2001 From: nobu 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 --- ChangeLog | 6 +++++- parse.y | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b44a55ef9..590fc0897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Feb 22 07:25:18 2005 Nobuyoshi Nakada + + * parse.y (parser_yylex): identfier after dot must not be a variable. + Mon Feb 21 10:04:49 2005 NAKAMURA Usaku * {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl. @@ -101,7 +105,7 @@ Mon Feb 14 23:58:17 2005 Kouhei Sutou Mon Feb 14 13:12:38 2005 GOTOU Yuuzou - * ext/openssl/lib/openssl/ssl.rb + * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_check): new method. Mon Feb 14 00:40:49 2005 Masatoshi SEKI 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