diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sprintf.c | 10 | ||||
| -rw-r--r-- | test/ruby/test_sprintf.rb | 6 |
3 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Wed Nov 11 09:03:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * sprintf.c (rb_str_format): respect default value of a hash. no + longer raises KeyError unless the default value of the hash is + nil. [ruby-core:71354] [Bug #11661] + Tue Nov 10 20:35:12 2015 Tanaka Akira <akr@fsij.org> * lib/open-uri.rb: Remove indicator for "frozen_string_literal: true". @@ -605,11 +605,11 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) } CHECKNAMEARG(start, len, enc); get_hash(&hash, argc, argv); - sym = rb_check_symbol_cstr(start + 1, - len - 2 /* without parenthesis */, - enc); - if (sym != Qnil) nextvalue = rb_hash_lookup2(hash, sym, Qundef); - if (nextvalue == Qundef) { + sym = rb_cstr_intern(start + 1, + len - 2 /* without parenthesis */, + enc); + nextvalue = rb_hash_aref(hash, sym); + if (NIL_P(nextvalue) && !FL_TEST(hash, HASH_PROC_DEFAULT)) { rb_enc_raise(enc, rb_eKeyError, "key%.*s not found", len, start); } if (term == '}') goto format_s; diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb index 15c809c695..97eb4809c4 100644 --- a/test/ruby/test_sprintf.rb +++ b/test/ruby/test_sprintf.rb @@ -409,4 +409,10 @@ class TestSprintf < Test::Unit::TestCase assert_equal(enc, e.message.encoding) end end + + def test_named_default + h = Hash.new('world') + assert_equal("hello world", "hello %{location}" % h) + assert_equal("hello world", "hello %<location>s" % h) + end end |