diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-26 19:46:58 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-26 19:46:58 +0000 |
| commit | e41b84895efbf8d8bd80b5e88f52a1baf46f5da7 (patch) | |
| tree | f4d3751948e808ce3ca94ac998c5bd044ace5989 /encoding.c | |
| parent | b416cc6f3f843fd17cef94bdb10eb6af63fd5b18 (diff) | |
* encoding.c (rb_enc_associate_index): deal with ASCII compatible
flags.
* encoding.c (rb_enc_check): allow ASCII compatible strings.
* parse.y (rb_intern_str): use ASCII encoding for ASCII string.
* string.c (rb_enc_str_coderange): check for code-range.
* string.c (rb_str_modify): clear code-range flags.
* string.c (rb_str_hash, rb_str_eql): ASCII compatible strings are
comparable.
* include/ruby/encoding.h: added code-range flags.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index a6ee890ce7..bb9e77b5bd 100644 --- a/encoding.c +++ b/encoding.c @@ -122,6 +122,10 @@ void rb_enc_associate_index(VALUE obj, int idx) { enc_check_capable(obj); + if (!ENC_CODERANGE_ASCIIONLY(obj) || + !rb_enc_asciicompat(rb_enc_from_index(idx))) { + ENC_CODERANGE_CLEAR(obj); + } if (idx < ENCODING_INLINE_MAX) { ENCODING_SET(obj, idx); return; @@ -204,6 +208,14 @@ rb_enc_check(VALUE str1, VALUE str2) return enc; } } + if (BUILTIN_TYPE(str1) == T_STRING && + BUILTIN_TYPE(str2) == T_STRING && + rb_enc_asciicompat(rb_enc_from_index(idx1)) && + rb_enc_asciicompat(rb_enc_from_index(idx2)) && + rb_enc_str_coderange(str1) == ENC_CODERANGE_SINGLE && + rb_enc_str_coderange(str2) == ENC_CODERANGE_SINGLE) { + return ONIG_ENCODING_ASCII; + } rb_raise(rb_eArgError, "character encodings differ"); } |