mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
b416cc6f3f
commit
e41b84895e
5 changed files with 120 additions and 20 deletions
|
@ -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 */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue