From 214df72ada42435874953c15ff0e067f1444bfe1 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 26 Sep 2007 19:46:58 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@13529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/encoding.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include/ruby') diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 1b97b6ab6..562f4b14c 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -24,6 +24,17 @@ } while (0) #define ENCODING_GET(obj) ((RBASIC(obj)->flags & ENCODING_MASK)>>ENCODING_SHIFT) +#define ENC_CODERANGE_MASK (FL_USER12|FL_USER13) +#define ENC_CODERANGE_UNKNOWN 0 +#define ENC_CODERANGE_SINGLE FL_USER12 +#define ENC_CODERANGE_MULTI 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_SINGLE) +#define ENC_CODERANGE_SET(obj,cr) (RBASIC(obj)->flags &= ~ENC_CODERANGE_MASK | (cr)) +#define ENC_CODERANGE_CLEAR(obj) ENC_CODERANGE_SET(obj,0) + + typedef OnigEncodingType rb_encoding; int rb_enc_to_index(rb_encoding*); @@ -80,5 +91,6 @@ int rb_enc_toupper(int c, rb_encoding *enc); int rb_enc_tolower(int c, rb_encoding *enc); ID rb_intern3(const char*, long, rb_encoding*); int rb_enc_symname_p(const char*, rb_encoding*); +int rb_enc_str_coderange(VALUE); #endif /* RUBY_ENCODING_H */ -- cgit