* array.c (rb_ary_or): wraps the operand in an array if it is not

  an array.  [ruby-talk:150495]

* array.c (rb_ary_and, rb_ary_plus, rb_ary_diff): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 24 insertions, 7 deletions

diff --git a/array.c b/array.c
index cdb64bf4d8..7250a70c5f 100644
--- a/array.c
+++ b/array.c
@@ -302,6 +302,17 @@ to_ary(ary)
 }
 
 static VALUE
+make_ary(ary)
+    VALUE ary;
+{
+    VALUE tmp = rb_check_array_type(ary);
+    if (NIL_P(tmp)) {
+	return rb_ary_new3(1, ary);
+    }
+    return tmp;
+}
+
+static VALUE
 to_a(ary)
     VALUE ary;
 {
@@ -2344,10 +2355,16 @@ VALUE
 rb_ary_plus(x, y)
     VALUE x, y;
 {
-    VALUE z;
+    VALUE tmp, z;
     long len;
 
-    y = to_ary(y);
+    tmp = rb_check_array_type(y);
+    if (NIL_P(tmp)) {
+	z = rb_ary_dup(x);
+	rb_ary_push(z, y);
+	return z;
+    }
+    y = tmp;
     len = RARRAY(x)->len + RARRAY(y)->len;
     z = rb_ary_new2(len);
     MEMCPY(RARRAY(z)->ptr, RARRAY(x)->ptr, VALUE, RARRAY(x)->len);
@@ -2694,10 +2711,10 @@ static VALUE
 rb_ary_diff(ary1, ary2)
     VALUE ary1, ary2;
 {
-    VALUE ary3, hash;
+    VALUE tmp, ary3, hash;
     long i;
 
-    hash = ary_make_hash(to_ary(ary2), 0);
+    hash = ary_make_hash(make_ary(ary2), 0);
     ary3 = rb_ary_new();
 
     for (i=0; i<RARRAY(ary1)->len; i++) {
@@ -2725,9 +2742,9 @@ rb_ary_and(ary1, ary2)
     VALUE hash, ary3, v, vv;
     long i;
 
-    ary2 = to_ary(ary2);
+    ary2 = make_ary(ary2);
     ary3 = rb_ary_new2(RARRAY(ary1)->len < RARRAY(ary2)->len ?
-	    RARRAY(ary1)->len : RARRAY(ary2)->len);
+		       RARRAY(ary1)->len : RARRAY(ary2)->len);
     hash = ary_make_hash(ary2, 0);
 
     for (i=0; i<RARRAY(ary1)->len; i++) {
@@ -2759,7 +2776,7 @@ rb_ary_or(ary1, ary2)
     VALUE v, vv;
     long i;
 
-    ary2 = to_ary(ary2);
+    ary2 = make_ary(ary2);
     ary3 = rb_ary_new2(RARRAY(ary1)->len+RARRAY(ary2)->len);
     hash = ary_make_hash(ary1, ary2);