summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-08 06:00:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-08 06:00:57 +0000
commit838a91633c3a50f43bcc4ccec11b41b5a102fd90 (patch)
treef95618cadb1fb1a07bf33f33e681cda1f8650870
parent6a34a8c403717f1ffd894f54bff611f3cde28543 (diff)
parse.y: fix a typo
* parse.y (f_kw): fix typo. needs the argument value, not the label twice. [ruby-core:83174] [Bug #13987] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--parse.y2
-rw-r--r--test/ripper/test_sexp.rb14
2 files changed, 15 insertions, 1 deletions
diff --git a/parse.y b/parse.y
index 2ce4134df9..678e7575c3 100644
--- a/parse.y
+++ b/parse.y
@@ -4408,7 +4408,7 @@ f_kw : f_label arg_value
/*%%%*/
$$ = new_kw_arg($$);
/*%
- $$ = rb_assoc_new(get_value($$), get_value($1));
+ $$ = rb_assoc_new(get_value($$), get_value($2));
%*/
}
| f_label
diff --git a/test/ripper/test_sexp.rb b/test/ripper/test_sexp.rb
index 253b198442..064c0f1536 100644
--- a/test/ripper/test_sexp.rb
+++ b/test/ripper/test_sexp.rb
@@ -96,6 +96,20 @@ eot
assert_equal("t", fname)
end
+ def test_named_with_default
+ sexp = Ripper.sexp("def hello(bln: true, int: 1, str: 'str', sym: :sym) end")
+ named = String.new
+ search_sexp(:params, sexp)[5].each { |i| named << "#{i}\n" } # join flattens
+ exp = "#{<<-"{#"}#{<<~'};'}"
+ {#
+ [[:@label, "bln:", [1, 10]], [:var_ref, [:@kw, "true", [1, 15]]]]
+ [[:@label, "int:", [1, 21]], [:@int, "1", [1, 26]]]
+ [[:@label, "str:", [1, 29]], [:string_literal, [:string_content, [:@tstring_content, "str", [1, 35]]]]]
+ [[:@label, "sym:", [1, 41]], [:symbol_literal, [:symbol, [:@ident, "sym", [1, 47]]]]]
+ };
+ assert_equal(exp, named)
+ end
+
def search_sexp(sym, sexp)
return sexp if !sexp or sexp[0] == sym
sexp.find do |e|