merges r22611 from trunk into ruby_1_9_1.

--
* string.c (rb_str_force_encoding): should clear coderange at changing
  encoding.  [ruby-core:22437]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2586326afc..75e06ac6d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* io.c (rb_io_getline_1): enables limit even if rs is given.
diff --git a/string.c b/string.c
index 35991bb7ef..11aaa3eb52 100644
--- a/string.c
+++ b/string.c
@@ -6780,6 +6780,7 @@ rb_str_force_encoding(VALUE str, VALUE enc)
 {
     str_modifiable(str);
     rb_enc_associate(str, rb_to_encoding(enc));
+    ENC_CODERANGE_CLEAR(str);
     return str;
 }
 
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index 4b7543f3e9..2f435f645a 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -1107,10 +1107,10 @@ class TestM17N < Test::Unit::TestCase
   end
 
   def test_symbol_op
-    ops = %w[
+    ops = %w"
       .. ... + - +(binary) -(binary) * / % ** +@ -@ | ^ & ! <=> > >= < <= ==
       === != =~ !~ ~ ! [] []= << >> :: `
-    ] #`
+    "
     ops.each do |op|
       assert_equal(Encoding::US_ASCII, op.intern.encoding, "[ruby-dev:33449]")
     end
@@ -1164,7 +1164,7 @@ class TestM17N < Test::Unit::TestCase
   end
 
   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
 
   def test_array_to_s
@@ -1306,6 +1306,10 @@ class TestM17N < Test::Unit::TestCase
   def test_force_encoding
     assert(("".center(1, "\x80".force_encoding("utf-8")); true),
            "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
 
   def test_combchar_codepoint