From b247743048c50efd3d7203b9513e44c63bbb6c43 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 23 Sep 2014 17:39:48 +0000
Subject: merge revision(s) r47696,r47697: [Backport #10279]

	* parse.y (parse_ident): just after a label, new expression should
	  start, cannot be a modifier.  [ruby-core:65211] [Bug #10279]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 5991376820..37e3cbdcd6 100644
--- a/parse.y
+++ b/parse.y
@@ -8195,7 +8195,7 @@ parser_yylex(struct parser_params *parser)
 			    return keyword_do_block;
 			return keyword_do;
 		    }
-		    if (IS_lex_state_for(state, (EXPR_BEG | EXPR_VALUE)))
+		    if (IS_lex_state_for(state, (EXPR_BEG | EXPR_VALUE | EXPR_LABELARG)))
 			return kw->id[0];
 		    else {
 			if (kw->id[0] != kw->id[1])
-- 
cgit v1.2.3