diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-17 13:01:52 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-17 13:01:52 +0000 |
| commit | 8dd8dfce21d9ac6c7d791a9d95a11e6f7839d545 (patch) | |
| tree | 3961b89549c90662c8eb531950eacf2dbdc0698b /include | |
| parent | b8fd2fabbef7696b42e2802caf1daf1368cc099e (diff) | |
| download | ruby-8dd8dfce21d9ac6c7d791a9d95a11e6f7839d545.tar.gz | |
* encoding.c (ENC_CODERANGE_AND): fix broken case. [ruby-dev:33826]
* string.c (rb_str_times): fix broken case. [ruby-dev:33826]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/encoding.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 9cd1f9e1e6..dcae15a030 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -56,13 +56,12 @@ #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) + +/* assumed ASCII compatiblity */ +#define ENC_CODERANGE_AND(a, b) \ + (a == ENC_CODERANGE_7BIT ? b : \ + a == ENC_CODERANGE_VALID ? (b == ENC_CODERANGE_7BIT ? ENC_CODERANGE_VALID : b) : \ + ENC_CODERANGE_UNKNOWN) #define ENCODING_CODERANGE_SET(obj, encindex, cr) \ do { \ |