naruse	2011-02-15 16:08:24 +0900 (Tue, 15 Feb 2011)

  New Revision: 30880

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30880

  Log:
    * array.c (array_join): copy the encoding of the first element as
      an initial encoding.
    
    * array.c (array_join_0): ditto.
    
    * array.c (array_join_1): ditto.
    
    * array.c (inspect_ary): ditto.
    
    * array.c (array_join_1): add an argument to check the appending is
      first one or not.

  Modified files:
    trunk/ChangeLog
    trunk/array.c
    trunk/test/ruby/test_array.rb

Index: array.c
===================================================================
--- array.c	(revision 30879)
+++ array.c	(revision 30880)
@@ -14,6 +14,7 @@
 #include "ruby/ruby.h"
 #include "ruby/util.h"
 #include "ruby/st.h"
+#include "ruby/encoding.h"
 
 #ifndef ARRAY_DEBUG
 # define NDEBUG
@@ -1590,7 +1591,7 @@
 
 extern VALUE rb_output_fs;
 
-static void ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result);
+static void ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first);
 
 static VALUE
 recursive_join(VALUE obj, VALUE argp, int recur)
@@ -1599,12 +1600,13 @@
     VALUE ary = arg[0];
     VALUE sep = arg[1];
     VALUE result = arg[2];
+    int *first = (int *)arg[3];
 
     if (recur) {
 	rb_raise(rb_eArgError, "recursive array join");
     }
     else {
-	ary_join_1(obj, ary, sep, 0, result);
+	ary_join_1(obj, ary, sep, 0, result, first);
     }
     return Qnil;
 }
@@ -1615,6 +1617,7 @@
     long i;
     VALUE val;
 
+    if (max > 0) rb_enc_copy(result, RARRAY_PTR(ary)[0]);
     for (i=0; i<max; i++) {
 	val = RARRAY_PTR(ary)[i];
 	if (i > 0 && !NIL_P(sep))
@@ -1626,7 +1629,7 @@
 }
 
 static void
-ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result)
+ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 {
     VALUE val, tmp;
 
@@ -1652,6 +1655,7 @@
 		args[0] = val;
 		args[1] = sep;
 		args[2] = result;
+		args[3] = (VALUE)first;
 		rb_exec_recursive(recursive_join, obj, (VALUE)args);
 	    }
 	    break;
@@ -1668,6 +1672,10 @@
 		goto ary_join;
 	    }
 	    val = rb_obj_as_string(val);
+	    if (*first) {
+		rb_enc_copy(result, val);
+		*first = FALSE;
+	    }
 	    goto str_join;
 	}
     }
@@ -1694,11 +1702,14 @@
 	tmp = rb_check_string_type(val);
 
 	if (NIL_P(tmp) || tmp != val) {
+	    int first;
 	    result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10);
+	    rb_enc_associate(result, rb_usascii_encoding());
 	    if (taint) OBJ_TAINT(result);
 	    if (untrust) OBJ_UNTRUST(result);
 	    ary_join_0(ary, sep, i, result);
-	    ary_join_1(ary, ary, sep, i, result);
+	    first = i == 0;
+	    ary_join_1(ary, ary, sep, i, result, &first);
 	    return result;
 	}
 
@@ -1750,6 +1761,7 @@
 	if (OBJ_TAINTED(s)) tainted = TRUE;
 	if (OBJ_UNTRUSTED(s)) untrust = TRUE;
 	if (i > 0) rb_str_buf_cat2(str, ", ");
+	else rb_enc_copy(str, s);
 	rb_str_buf_append(str, s);
     }
     rb_str_buf_cat2(str, "]");
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30879)
+++ ChangeLog	(revision 30880)
@@ -1,3 +1,17 @@
+Tue Feb 15 15:41:30 2011  NARUSE, Yui  <naruse@r...>
+
+	* array.c (array_join): copy the encoding of the first element as
+	  an initial encoding.
+
+	* array.c (array_join_0): ditto.
+
+	* array.c (array_join_1): ditto.
+
+	* array.c (inspect_ary): ditto.
+
+	* array.c (array_join_1): add an argument to check the appending is
+	  first one or not.
+
 Tue Feb 15 15:40:53 2011  NARUSE, Yui  <naruse@r...>
 
 	* hash.c (inspect_i): copy the encoding of the first key as
Index: test/ruby/test_array.rb
===================================================================
--- test/ruby/test_array.rb	(revision 30879)
+++ test/ruby/test_array.rb	(revision 30880)
@@ -914,6 +914,13 @@
     s = a.join
     assert_equal(true, s.tainted?)
     assert_equal(true, s.untrusted?)
+
+    e = ''.force_encoding('EUC-JP')
+    u = ''.force_encoding('UTF-8')
+    assert_equal(Encoding::US_ASCII, [[]].join.encoding)
+    assert_equal(Encoding::US_ASCII, [1, [u]].join.encoding)
+    assert_equal(Encoding::UTF_8, [u, [e]].join.encoding)
+    assert_equal(Encoding::UTF_8, [u, [1]].join.encoding)
   ensure
     $, = nil
   end

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