diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-20 02:43:34 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-20 02:43:34 +0000 |
commit | 9d5abbff9754589483938dc539226c2ad4895140 (patch) | |
tree | 4069ea0426a16c1c1f05e2d619d532167d8ab77d | |
parent | a8b0c2529301df76a1ea8c03ead3d0d163ab56bc (diff) | |
download | ruby-9d5abbff9754589483938dc539226c2ad4895140.tar.gz |
parse.y: labeled heredoc
* parse.y (parser_yylex): allow here documents in labeled
argument. [ruby-core:72396] [Bug #11849]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | test/ruby/test_syntax.rb | 6 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Dec 20 11:43:31 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (parser_yylex): allow here documents in labeled + argument. [ruby-core:72396] [Bug #11849] + Sun Dec 20 11:14:11 2015 Koichi Sasada <ko1@atdot.net> * proc.c (rb_mod_define_method): should check Symbol or not. @@ -8330,7 +8330,7 @@ parser_yylex(struct parser_params *parser) if (c == '<' && !IS_lex_state(EXPR_DOT | EXPR_CLASS) && !IS_END() && - (!IS_ARG() || space_seen)) { + (!IS_ARG() || IS_lex_state(EXPR_LABELED) || space_seen)) { int token = heredoc_identifier(); if (token) return token; } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 77cb3ea54e..b8f1619ae2 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -342,6 +342,12 @@ WARN assert_valid_syntax('{label: %w(*)}', bug11812) end + def test_heredoc_after_label + bug11849 = '[ruby-core:72396] [Bug #11849]' + assert_valid_syntax("{label:<<DOC\n""DOC\n""}", bug11849) + assert_valid_syntax("{label: <<DOC\n""DOC\n""}", bug11849) + end + def test_duplicated_arg assert_syntax_error("def foo(a, a) end", /duplicated argument name/) assert_nothing_raised { def foo(_, _) end } |