summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-23 17:39:48 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-23 17:39:48 +0000
commitb247743048c50efd3d7203b9513e44c63bbb6c43 (patch)
treeca14df3c73bc1983cd2fe51ad99704b96f6f22a6 /parse.y
parent514b5e8d6ffd1957c71d659d9763dc600b4cb6d6 (diff)
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
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y2
1 files changed, 1 insertions, 1 deletions
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])