diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-29 08:18:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-29 08:18:36 +0000 |
| commit | 7e093fcf1f3401f6b6ea2031c30b57c725d2bae6 (patch) | |
| tree | ca0ebf9f353ed9963ce5c92495879ddfebb5b93c /encoding.c | |
| parent | b74c9a6d66b2e77e431b85437e5126aeadc14032 (diff) | |
| download | ruby-7e093fcf1f3401f6b6ea2031c30b57c725d2bae6.tar.gz ruby-7e093fcf1f3401f6b6ea2031c30b57c725d2bae6.tar.xz ruby-7e093fcf1f3401f6b6ea2031c30b57c725d2bae6.zip | |
* encoding.c (rb_enc_compatible): ASCII encoding is compatible with
ASCII-compatible encoding, even for non-string objects.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index 2c2563ab0..52cce8c66 100644 --- a/encoding.c +++ b/encoding.c @@ -360,6 +360,11 @@ rb_enc_compatible(VALUE str1, VALUE str2) return rb_enc_from_index(idx1); } + if (idx1 == 0 && rb_enc_asciicompat(enc = rb_enc_from_index(idx2))) + return enc; + if (idx2 == 0 && rb_enc_asciicompat(enc = rb_enc_from_index(idx1))) + return enc; + if (BUILTIN_TYPE(str1) != T_STRING) { VALUE tmp = str1; str1 = str2; |