From f5ee0fd52135315aba8441420cd647a06b718c59 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 27 Nov 2007 02:21:17 +0000 Subject: * include/ruby/encoding.h, encoding.c, re.c, string.c, parse.y: rename ENC_CODERANGE_SINGLE to ENC_CODERANGE_7BIT. rename ENC_CODERANGE_MULTI to ENC_CODERANGE_8BIT. Because single byte 8bit character, such as Shift_JIS 1byte katakana, is represented by ENC_CODERANGE_MULTI even if it is not multi byte. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index 1ee24c2286..403572070e 100644 --- a/encoding.c +++ b/encoding.c @@ -407,12 +407,12 @@ rb_enc_compatible(VALUE str1, VALUE str2) cr2 = rb_enc_str_coderange(str2); if (cr1 != cr2) { /* may need to handle ENC_CODERANGE_BROKEN */ - if (cr1 == ENC_CODERANGE_SINGLE) return rb_enc_from_index(idx2); - if (cr2 == ENC_CODERANGE_SINGLE) return rb_enc_from_index(idx1); + if (cr1 == ENC_CODERANGE_7BIT) return rb_enc_from_index(idx2); + if (cr2 == ENC_CODERANGE_7BIT) return rb_enc_from_index(idx1); } - if (cr1 == ENC_CODERANGE_SINGLE) return rb_enc_from_index(0); + if (cr1 == ENC_CODERANGE_7BIT) return rb_enc_from_index(0); } - if (cr1 == ENC_CODERANGE_SINGLE && + if (cr1 == ENC_CODERANGE_7BIT && rb_enc_asciicompat(enc = rb_enc_from_index(idx2))) return enc; } -- cgit v1.2.3