diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 05:54:41 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 05:54:41 +0000 |
| commit | b7a1cb6251c4eb661f15d2990e6d922161ee88dd (patch) | |
| tree | 3093c8ae35fc9ff6a9691537fd6636e678181d62 | |
| parent | 1f161c18242321a0e5f97fc62113166166cc5aa6 (diff) | |
merges r21047 from trunk into ruby_1_9_1.
* transcode.c (str_transcode0): set encoding when String#encode was
given explicit but the same destination and source encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_transcode.rb | 1 | ||||
| -rw-r--r-- | transcode.c | 4 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Dec 25 20:57:01 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * transcode.c (str_transcode0): set encoding when String#encode was + given explicit but the same destination and source encoding. + Thu Dec 25 19:35:51 2008 NARUSE, Yui <naruse@ruby-lang.org> * transcode.c (sym_ignore): remove useless symbol. diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb index 0d1dfa2231..5f9322c693 100644 --- a/test/ruby/test_transcode.rb +++ b/test/ruby/test_transcode.rb @@ -72,6 +72,7 @@ class TestTranscode < Test::Unit::TestCase "\xBE\xD6\xC0\xCE\xB1\xB8\xC7\xD4\x20\xDA\xD3\xC1\xF6\xC0\xCE", 'euc-kr') # 애인구함 朴지인 check_both_ways("\uC544\uD58F\uD58F\u0020\uB620\uBC29\uD6BD\uB2D8\u0020\uC0AC\uB791\uD716", "\xBE\xC6\xC1\x64\xC1\x64\x20\x8C\x63\xB9\xE6\xC4\x4F\xB4\xD4\x20\xBB\xE7\xB6\xFB\xC5\x42", 'cp949') # 아햏햏 똠방횽님 사랑휖 + assert_equal(Encoding::ISO_8859_1, "D\xFCrst".force_encoding('iso-8859-2').encode('iso-8859-1', 'iso-8859-1').encoding) end def test_twostep diff --git a/transcode.c b/transcode.c index e5538a0871..7cdda7b7b2 100644 --- a/transcode.c +++ b/transcode.c @@ -2455,7 +2455,7 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts) ECONV_XML_ATTR_CONTENT_DECORATOR| ECONV_XML_ATTR_QUOTE_DECORATOR)) == 0) { if (senc && senc == denc) { - return -1; + return NIL_P(arg2) ? -1 : dencidx; } if (senc && denc && rb_enc_asciicompat(senc) && rb_enc_asciicompat(denc)) { if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT) { @@ -2463,7 +2463,7 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts) } } if (encoding_equal(sname, dname)) { - return -1; + return NIL_P(arg2) ? -1 : dencidx; } } else { |