[前][次][番号順一覧][スレッド一覧]

ruby-changes:15515

From: nobu <ko1@a...>
Date: Tue, 20 Apr 2010 19:26:09 +0900 (JST)
Subject: [ruby-changes:15515] Ruby:r27417 (trunk): * parse.y (parser_yylex): fix for tLPAREN_ARG.

nobu	2010-04-20 19:25:52 +0900 (Tue, 20 Apr 2010)

  New Revision: 27417

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27417

  Log:
    * parse.y (parser_yylex): fix for tLPAREN_ARG.

  Modified files:
    trunk/ChangeLog
    trunk/parse.y

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27416)
+++ ChangeLog	(revision 27417)
@@ -1,3 +1,7 @@
+Tue Apr 20 19:25:50 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (parser_yylex): fix for tLPAREN_ARG.
+
 Tue Apr 20 12:34:23 2010  Takeyuki FUJIOKA  <xibbar@r...>
 
 	* lib/cgi/{core, util}.rb (RFC822_DAYS, RFC822_MONTHS):
Index: parse.y
===================================================================
--- parse.y	(revision 27416)
+++ parse.y	(revision 27417)
@@ -7272,10 +7272,8 @@
 	if (IS_BEG()) {
 	    c = tLPAREN;
 	}
-	else if (space_seen) {
-	    if (IS_ARG()) {
-		c = tLPAREN_ARG;
-	    }
+	else if (IS_SPCARG(-1)) {
+	    c = tLPAREN_ARG;
 	}
 	paren_nest++;
 	COND_PUSH(0);
@@ -7687,9 +7685,9 @@
             ID ident = TOK_INTERN(!ENC_SINGLE(mb));
 
             set_yylval_name(ident);
-            if (last_state != EXPR_DOT && is_local_id(ident) && lvar_defined(ident)) {
-                lex_state = EXPR_VCALL;
-            }
+	    if (last_state != EXPR_DOT && last_state != EXPR_FNAME && is_local_id(ident)) {
+		lex_state = EXPR_VCALL;
+	    }
         }
 	return result;
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]