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

* string.c (rb_str_inspect): refix r40413, on Ruby 1.9 usual character

Browse source 
escape uses hex/Unicode escapes, so fix to use Unicode escape on
  Unicode strings and hex on others. [ruby-core:54458] [Bug #8290]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-04-23 12:24:56 +00:00
parent bac8fa5f9d
commit a5fadaadd3
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Apr 23 21:14:38 2013 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (rb_str_inspect): refix r40413, on Ruby 1.9 usual character
escape uses hex/Unicode escapes, so fix to use Unicode escape on
Unicode strings and hex on others. [ruby-core:54458] [Bug #8290]
Tue Apr 23 20:10:02 2013 Tanaka Akira <akr@fsij.org>
* missing/isnan.c (isnan): Don't define if isnan() macro is defined.

5
string.c
View file

@ -4572,11 +4572,6 @@ rb_str_inspect(VALUE str)
}
}
switch (c) {
case '\0':
if (p - n > prev) str_buf_cat(result, prev, p - n - prev);
str_buf_cat(result, "\\000", 4);
prev = p;
continue;
case '\n': cc = 'n'; break;
case '\r': cc = 'r'; break;
case '\t': cc = 't'; break;

4
test/ruby/test_module.rb
View file

@ -609,7 +609,7 @@ class TestModule < Test::Unit::TestCase
assert_raise(TypeError, bug5084) { c1.const_get(1) }
bug7574 = '[ruby-dev:46749]'
e = assert_raise(NameError) { Object.const_get("String\0") }
assert_equal("wrong constant name \"String\\000\"", e.message, bug7574)
assert_equal("wrong constant name \"String\\u0000\"", e.message, bug7574)
end
def test_const_defined_invalid_name
@ -619,7 +619,7 @@ class TestModule < Test::Unit::TestCase
assert_raise(TypeError, bug5084) { c1.const_defined?(1) }
bug7574 = '[ruby-dev:46749]'
e = assert_raise(NameError) { Object.const_defined?("String\0") }
assert_equal("wrong constant name \"String\\000\"", e.message, bug7574)
assert_equal("wrong constant name \"String\\u0000\"", e.message, bug7574)
end
def test_const_get_no_inherited

6
test/ruby/test_string.rb
View file

@ -1986,9 +1986,11 @@ class TestString < Test::Unit::TestCase
end
def test_inspect_nul
bug8290 = '[ruby-core:54458]'
s = "\0" + "12"
assert_not_equal '"\\012"', eval(s.inspect)
assert_equal s, eval(s.inspect)
assert_equal '"\u000012"', s.inspect, bug8290
s = "\0".b + "12"
assert_equal '"\x0012"', s.inspect, bug8290
end
def test_partition