diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | include/ruby/encoding.h | 2 | ||||
| -rw-r--r-- | string.c | 4 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Mon Dec 17 14:03:39 2007 Tanaka Akira <akr@fsij.org> + + * include/ruby/encoding.h (ENC_CODERANGE_VALID): rename from + ENC_CODERANGE_8BIT. + + * string.c (rb_enc_str_coderange): follow the renaming. + Mon Dec 17 13:56:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (tr_find): wrong condition fixed. diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 4816e80fd2..eb27dfb625 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -27,7 +27,7 @@ #define ENC_CODERANGE_MASK (FL_USER12|FL_USER13) #define ENC_CODERANGE_UNKNOWN 0 #define ENC_CODERANGE_7BIT FL_USER12 -#define ENC_CODERANGE_8BIT FL_USER13 +#define ENC_CODERANGE_VALID FL_USER13 #define ENC_CODERANGE_BROKEN (FL_USER12|FL_USER13) #define ENC_CODERANGE(obj) (RBASIC(obj)->flags & ENC_CODERANGE_MASK) #define ENC_CODERANGE_ASCIIONLY(obj) (ENC_CODERANGE(obj) == ENC_CODERANGE_7BIT) @@ -106,7 +106,7 @@ rb_enc_str_coderange(VALUE str) rb_encoding *enc = rb_enc_get(str); if (!rb_enc_asciicompat(enc)) { - cr = ENC_CODERANGE_8BIT; + cr = ENC_CODERANGE_VALID; ENC_CODERANGE_SET(str, cr); return cr; } @@ -119,7 +119,7 @@ rb_enc_str_coderange(VALUE str) int c = (unsigned char)*p; if (!rb_enc_isascii(c, enc)) { - cr = ENC_CODERANGE_8BIT; + cr = ENC_CODERANGE_VALID; break; } p++; |