diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-17 06:49:11 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-17 06:49:11 +0000 |
| commit | 7a257b0110ec9f9dc1269b1b24975530787a135c (patch) | |
| tree | 3730d2ffb9b2ad5c2645553439cb4f85e36d4a3f /include/ruby | |
| parent | a906fce838e51ddaa6c1b22162959968bc77a30c (diff) | |
* encoding.c (ENC_CODERANGE_AND): added.
* string.c (rb_str_plus, srb_str_times): keep coderange.
* parse.y (STR_NEW0) use rb_usascii_str_new.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/encoding.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index a65efa316e..9cd1f9e1e6 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -56,6 +56,13 @@ #define ENC_CODERANGE_SET(obj,cr) (RBASIC(obj)->flags = \ (RBASIC(obj)->flags & ~ENC_CODERANGE_MASK) | (cr)) #define ENC_CODERANGE_CLEAR(obj) ENC_CODERANGE_SET(obj,0) +#define ENC_CODERANGE_AND(a, b) (\ + (a == b) ? a : \ + (a == ENC_CODERANGE_BROKEN) ? ENC_CODERANGE_BROKEN : \ + (b == ENC_CODERANGE_BROKEN) ? ENC_CODERANGE_BROKEN : \ + (a == ENC_CODERANGE_UNKNOWN) ? ENC_CODERANGE_UNKNOWN : \ + (b == ENC_CODERANGE_UNKNOWN) ? ENC_CODERANGE_UNKNOWN : \ + ENC_CODERANGE_VALID) #define ENCODING_CODERANGE_SET(obj, encindex, cr) \ do { \ |