From 5a2862f94425f339805e0551f7672a5d280de275 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 17 Feb 2008 06:49:11 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@15519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/encoding.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include/ruby') diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index a65efa316..9cd1f9e1e 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 { \ -- cgit