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_force_encoding): should clear coderange at changing

Browse source 
encoding.  [ruby-core:22437]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-02-25 03:28:00 +00:00
parent ac9d09ba3c
commit 43b9684962
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Feb 25 12:27:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_force_encoding): should clear coderange at changing
encoding. [ruby-core:22437]
Wed Feb 25 12:06:09 2009 <nobu@ruby-lang.org> Wed Feb 25 12:06:09 2009 <nobu@ruby-lang.org>
* io.c (rb_io_getline_1): enables limit even if rs is given. * io.c (rb_io_getline_1): enables limit even if rs is given.

1
string.c
View file

@ -6889,6 +6889,7 @@ rb_str_force_encoding(VALUE str, VALUE enc)
{ {
str_modifiable(str); str_modifiable(str);
rb_enc_associate(str, rb_to_encoding(enc)); rb_enc_associate(str, rb_to_encoding(enc));
ENC_CODERANGE_CLEAR(str);
return str; return str;
} }

10
test/ruby/test_m17n.rb
View file

@ -1107,10 +1107,10 @@ class TestM17N < Test::Unit::TestCase
end end
def test_symbol_op def test_symbol_op
ops = %w[ ops = %w"
.. ... + - +(binary) -(binary) * / % ** +@ -@ | ^ & ! <=> > >= < <= == .. ... + - +(binary) -(binary) * / % ** +@ -@ | ^ & ! <=> > >= < <= ==
=== != =~ !~ ~ ! [] []= << >> :: ` === != =~ !~ ~ ! [] []= << >> :: `
] #` "
ops.each do |op| ops.each do |op|
assert_equal(Encoding::US_ASCII, op.intern.encoding, "[ruby-dev:33449]") assert_equal(Encoding::US_ASCII, op.intern.encoding, "[ruby-dev:33449]")
end end
@ -1164,7 +1164,7 @@ class TestM17N < Test::Unit::TestCase
end end
def test_bignum_to_s def test_bignum_to_s
assert_equal(Encoding::US_ASCII, (1<<129).to_s.encoding) assert_equal(Encoding::US_ASCII, (1 << 129).to_s.encoding)
end end
def test_array_to_s def test_array_to_s
@ -1306,6 +1306,10 @@ class TestM17N < Test::Unit::TestCase
def test_force_encoding def test_force_encoding
assert(("".center(1, "\x80".force_encoding("utf-8")); true), assert(("".center(1, "\x80".force_encoding("utf-8")); true),
"moved from btest/knownbug, [ruby-dev:33807]") "moved from btest/knownbug, [ruby-dev:33807]")
a = "".force_encoding("ascii-8bit") << 0xC3 << 0xB6
assert_equal(1, a.force_encoding("utf-8").size, '[ruby-core:22437]')
b = "".force_encoding("ascii-8bit") << 0xC3.chr << 0xB6.chr
assert_equal(1, b.force_encoding("utf-8").size, '[ruby-core:22437]')
end end
def test_combchar_codepoint def test_combchar_codepoint