diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-29 02:20:23 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-29 02:20:23 +0000 |
| commit | 7fc16c237724a5f4377cea47e3434f53d42af5f4 (patch) | |
| tree | f617167d6c1cedde26b8ad9a083cbbb7f61717bd /encoding.c | |
| parent | d2d37173e7803d6ceec22233a903eb26e0617151 (diff) | |
* encoding.c (rb_enc_compatible): ASCII compatible string and US-ASCII
regexp is compatible. [ruby-dev:36033]
* string.c (rb_str_index_m): second argument is position of character.
by usa. [ruby-dev:36033]
* string.c (rb_str_rindex_m): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index 5e8412a026..291070dd19 100644 --- a/encoding.c +++ b/encoding.c @@ -631,6 +631,10 @@ rb_enc_compatible(VALUE str1, VALUE str2) if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) { return 0; } + if (BUILTIN_TYPE(str2) == T_REGEXP && idx2 == ENCINDEX_US_ASCII) + return enc1; + if (BUILTIN_TYPE(str1) == T_REGEXP && idx1 == ENCINDEX_US_ASCII) + return enc2; if (BUILTIN_TYPE(str1) != T_STRING) { VALUE tmp = str1; @@ -652,7 +656,7 @@ rb_enc_compatible(VALUE str1, VALUE str2) if (cr2 == ENC_CODERANGE_7BIT) return enc1; } if (cr2 == ENC_CODERANGE_7BIT) { - if (idx1 == 0) return enc2; + if (idx1 == ENCINDEX_ASCII) return enc2; return enc1; } } |