naruse	2008-02-17 15:49:11 +0900 (Sun, 17 Feb 2008)

  New Revision: 15519

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/encoding.h
    trunk/parse.y
    trunk/string.c

  Log:
    * 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.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=15519&r2=15518&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=15519&r2=15518&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15519&r2=15518&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/encoding.h?r1=15519&r2=15518&diff_format=u

Index: include/ruby/encoding.h
===================================================================
--- include/ruby/encoding.h	(revision 15518)
+++ include/ruby/encoding.h	(revision 15519)
@@ -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 { \
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15518)
+++ ChangeLog	(revision 15519)
@@ -1,3 +1,11 @@
+Sun Feb 17 15:25:08 2008  NARUSE, Yui  <naruse@r...>
+
+	* 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.
+
 Sun Feb 17 14:07:24 2008  Tanaka Akira  <akr@f...>
 
 	* string.c (str_strlen): rb_enc_strlen doesn't fail.
Index: string.c
===================================================================
--- string.c	(revision 15518)
+++ string.c	(revision 15519)
@@ -738,7 +738,8 @@
 
     if (OBJ_TAINTED(str1) || OBJ_TAINTED(str2))
 	OBJ_TAINT(str3);
-    rb_enc_associate(str3, enc);
+    ENCODING_CODERANGE_SET(str3, rb_enc_to_index(enc),
+			   ENC_CODERANGE_AND(ENC_CODERANGE(str1), ENC_CODERANGE(str2)));
     return str3;
 }
 
@@ -778,7 +779,7 @@
     }
     RSTRING_PTR(str2)[RSTRING_LEN(str2)] = '\0';
     OBJ_INFECT(str2, str);
-    rb_enc_copy(str2, str);
+    ENCODING_CODERANGE_SET(str2, rb_enc_get_index(str), ENC_CODERANGE(str));
 
     return str2;
 }
Index: parse.y
===================================================================
--- parse.y	(revision 15518)
+++ parse.y	(revision 15519)
@@ -268,7 +268,7 @@
 #define UTF8_ENC() (parser->utf8 ? parser->utf8 : \
 		    (parser->utf8 = rb_utf8_encoding()))
 #define STR_NEW(p,n) rb_enc_str_new((p),(n),parser->enc)
-#define STR_NEW0() rb_enc_str_new(0,0,rb_usascii_encoding())
+#define STR_NEW0() rb_usascii_str_new(0,0)
 #define STR_NEW2(p) rb_enc_str_new((p),strlen(p),parser->enc)
 #define STR_NEW3(p,n,e,func) parser_str_new((p),(n),(e),(func),parser->enc)
 #define STR_ENC(m) ((m)?parser->enc:rb_usascii_encoding())

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/