archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-27 23:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

* parse.y (rb_check_id_cstr): new function to check if ID is

Browse source 
registered with NUL-terminated C string.
* sprintf.c (rb_str_format): avoid inadvertent symbol creation.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-04-11 13:31:23 +00:00
parent a5d1da5d74
commit db5265a82c
7 changed files with 58 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/ruby/test_sprintf.rb
View file

@ -331,6 +331,8 @@ class TestSprintf < Test::Unit::TestCase
assert_equal("named<key2> after unnumbered(2)", e.message)
e = assert_raise(ArgumentError) {sprintf("%<key><key2>s", :key => "value")}
assert_equal("named<key2> after <key>", e.message)
e = assert_raise(KeyError) {sprintf("%<key>s", {})}
assert_equal("key<key> not found", e.message)
end
def test_named_untyped_enc
@ -349,6 +351,9 @@ class TestSprintf < Test::Unit::TestCase
e = assert_raise(ArgumentError) {sprintf("%<#{k}><key>s", k.to_sym => "value")}
assert_equal(enc, e.message.encoding)
assert_equal("named<key> after <#{k}>", e.message)
e = assert_raise(KeyError) {sprintf("%<#{k}>s", {})}
assert_equal(enc, e.message.encoding)
assert_equal("key<#{k}> not found", e.message)
end
end
@ -361,6 +366,8 @@ class TestSprintf < Test::Unit::TestCase
e = assert_raise(ArgumentError) {sprintf("%<key>{key2}", :key => "value")}
assert_equal("named{key2} after <key>", e.message)
assert_equal("value{key2}", sprintf("%{key}{key2}", :key => "value"))
e = assert_raise(KeyError) {sprintf("%{key}", {})}
assert_equal("key{key} not found", e.message)
end
def test_named_typed_enc
@ -379,6 +386,9 @@ class TestSprintf < Test::Unit::TestCase
e = assert_raise(ArgumentError) {sprintf("%<#{k}>{key}s", k.to_sym => "value")}
assert_equal(enc, e.message.encoding)
assert_equal("named{key} after <#{k}>", e.message)
e = assert_raise(KeyError) {sprintf("%{#{k}}", {})}
assert_equal(enc, e.message.encoding)
assert_equal("key{#{k}} not found", e.message)
end
end
end