kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

sprintf.c: hash default value

Browse source 
* 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-11-11 00:03:15 +00:00
parent 8d9e360007
commit def4370a55
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Tue Nov 10 20:35:12 2015 Tanaka Akira <akr@fsij.org>
* lib/open-uri.rb: Remove indicator for "frozen_string_literal: true". * lib/open-uri.rb: Remove indicator for "frozen_string_literal: true".

6
sprintf.c
View file

@ -605,11 +605,11 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
} }
CHECKNAMEARG(start, len, enc); CHECKNAMEARG(start, len, enc);
get_hash(&hash, argc, argv); get_hash(&hash, argc, argv);
sym = rb_check_symbol_cstr(start + 1, sym = rb_cstr_intern(start + 1,
len - 2 /* without parenthesis */, len - 2 /* without parenthesis */,
enc); enc);
if (sym != Qnil) nextvalue = rb_hash_lookup2(hash, sym, Qundef); nextvalue = rb_hash_aref(hash, sym);
if (nextvalue == Qundef) { if (NIL_P(nextvalue) && !FL_TEST(hash, HASH_PROC_DEFAULT)) {
rb_enc_raise(enc, rb_eKeyError, "key%.*s not found", len, start); rb_enc_raise(enc, rb_eKeyError, "key%.*s not found", len, start);
} }
if (term == '}') goto format_s; if (term == '}') goto format_s;

6
test/ruby/test_sprintf.rb
View file

@ -409,4 +409,10 @@ class TestSprintf < Test::Unit::TestCase
assert_equal(enc, e.message.encoding) assert_equal(enc, e.message.encoding)
end end
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 end