diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-27 02:21:17 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-27 02:21:17 +0000 |
commit | f5ee0fd52135315aba8441420cd647a06b718c59 (patch) | |
tree | 1f6e0fffab463f455a90a2c08ce7d51828dc96a3 /string.c | |
parent | 9c7aab17a54996b7320e7bc34230a1aab7f7a115 (diff) | |
download | ruby-f5ee0fd52135315aba8441420cd647a06b718c59.tar.gz |
* 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
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -92,7 +92,7 @@ VALUE rb_cSymbol; }\ } while (0) -#define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_SINGLE) +#define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) VALUE rb_fs; @@ -105,7 +105,7 @@ rb_enc_str_coderange(VALUE str) rb_encoding *enc = rb_enc_get(str); if (!rb_enc_asciicompat(enc)) { - cr = ENC_CODERANGE_MULTI; + cr = ENC_CODERANGE_8BIT; ENC_CODERANGE_SET(str, cr); return cr; } @@ -113,12 +113,12 @@ rb_enc_str_coderange(VALUE str) const char *p = RSTRING_PTR(str); const char *e = p + RSTRING_LEN(str); - cr = ENC_CODERANGE_SINGLE; + cr = ENC_CODERANGE_7BIT; while (p < e) { int c = (unsigned char)*p; if (!isascii(c)) { - cr = ENC_CODERANGE_MULTI; + cr = ENC_CODERANGE_8BIT; break; } p++; @@ -134,7 +134,7 @@ int rb_enc_str_asciionly_p(VALUE str) rb_encoding *enc = rb_enc_get(str); if (rb_enc_asciicompat(enc) && - rb_enc_str_coderange(str) == ENC_CODERANGE_SINGLE) { + rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) { char *ptr = RSTRING_PTR(str); long len = RSTRING_LEN(str); long i; |