From c07d78eb0e8e9d3a8f9e8c860b362964157ff43a Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 26 Feb 2013 01:24:52 +0000 Subject: [PATCH] parse.y: keyword argument without paren * parse.y (IS_LABEL_POSSIBLE): allow labels for keyword arguments just after method definition without a parenthesis. [ruby-core:52820] [Bug #7942] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ parse.y | 2 +- test/ruby/test_keyword.rb | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 46d1af4faf..fec4c59c93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Feb 26 10:24:49 2013 Nobuyoshi Nakada + + * parse.y (IS_LABEL_POSSIBLE): allow labels for keyword arguments just + after method definition without a parenthesis. [ruby-core:52820] + [Bug #7942] + Tue Feb 26 04:50:00 2013 Zachary Scott * error.c: clarify reason for sleep in SignalException example diff --git a/parse.y b/parse.y index 66ed654c38..915db67631 100644 --- a/parse.y +++ b/parse.y @@ -6760,7 +6760,7 @@ parser_prepare(struct parser_params *parser) #define IS_END() IS_lex_state(EXPR_END_ANY) #define IS_BEG() IS_lex_state(EXPR_BEG_ANY) #define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c)) -#define IS_LABEL_POSSIBLE() ((IS_lex_state(EXPR_BEG) && !cmd_state) || IS_ARG()) +#define IS_LABEL_POSSIBLE() ((IS_lex_state(EXPR_BEG | EXPR_ENDFN) && !cmd_state) || IS_ARG()) #define IS_LABEL_SUFFIX(n) (peek_n(':',(n)) && !peek_n(':', (n)+1)) #define IS_AFTER_OPERATOR() IS_lex_state(EXPR_FNAME | EXPR_DOT) diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index 3685024991..66f9cc8dbb 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -274,4 +274,20 @@ class TestKeywordArguments < Test::Unit::TestCase assert_valid_syntax("def bug7662(*, **) end") assert_valid_syntax("def bug7662(a, **) end") end + + def test_without_paren + bug7942 = '[ruby-core:52820] [Bug #7942]' + assert_valid_syntax("def bug7942 a: 1; end") + assert_valid_syntax("def bug7942 a: 1, **; end") + + o = Object.new + eval("def o.bug7942 a: 1; a; end", nil, __FILE__, __LINE__) + assert_equal(1, o.bug7942(), bug7942) + assert_equal(42, o.bug7942(a: 42), bug7942) + + o = Object.new + eval("def o.bug7942 a: 1, **; a; end", nil, __FILE__, __LINE__) + assert_equal(1, o.bug7942(), bug7942) + assert_equal(42, o.bug7942(a: 42), bug7942) + end end