summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
Diffstat (limited to 'array.c')
-rw-r--r--array.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/array.c b/array.c
index 8151925b7e..7e039abf6a 100644
--- a/array.c
+++ b/array.c
@@ -1649,23 +1649,6 @@ rb_ary_cmp(ary1, ary2)
}
static VALUE
-rb_ary_diff(ary1, ary2)
- VALUE ary1, ary2;
-{
- VALUE ary3;
- long i;
-
- ary2 = to_ary(ary2);
- ary3 = rb_ary_new();
- for (i=0; i<RARRAY(ary1)->len; i++) {
- if (rb_ary_includes(ary2, RARRAY(ary1)->ptr[i])) continue;
- if (rb_ary_includes(ary3, RARRAY(ary1)->ptr[i])) continue;
- rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
- }
- return ary3;
-}
-
-static VALUE
ary_make_hash(ary1, ary2)
VALUE ary1, ary2;
{
@@ -1684,6 +1667,23 @@ ary_make_hash(ary1, ary2)
}
static VALUE
+rb_ary_diff(ary1, ary2)
+ VALUE ary1, ary2;
+{
+ VALUE ary3, hash;
+ long i;
+
+ hash = ary_make_hash(to_ary(ary2), 0);
+ ary3 = rb_ary_new();
+
+ for (i=0; i<RARRAY(ary1)->len; i++) {
+ if (st_lookup(RHASH(hash)->tbl, RARRAY(ary1)->ptr[i], 0)) continue;
+ rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
+ }
+ return ary3;
+}
+
+static VALUE
rb_ary_and(ary1, ary2)
VALUE ary1, ary2;
{