1 files changed, 46 insertions, 26 deletions

diff --git a/src/array.c b/src/array.c
index 5d7b0e690..ba289997f 100644
--- a/src/array.c
+++ b/src/array.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include "mruby/string.h"
 #include "mruby/class.h"
+#include "value_array.h"
 
 /* SIZE_MAX is not supported by VC++. */
 #ifndef SIZE_MAX
@@ -301,7 +302,7 @@ mrb_ary_cmp(mrb_state *mrb, mrb_value ary1)
   a1 = RARRAY(ary1); a2 = RARRAY(ary2);
   if (a1->len == a2->len && a1->ptr == a2->ptr) return mrb_fixnum_value(0);
   else {
-    mrb_sym cmp = mrb_intern(mrb, "<=>");
+    mrb_sym cmp = mrb_intern2(mrb, "<=>", 3);
 
     len = RARRAY_LEN(ary1);
     if (len > RARRAY_LEN(ary2)) {
@@ -519,7 +520,7 @@ mrb_ary_unshift(mrb_state *mrb, mrb_value self, mrb_value item)
     ary_modify(mrb, a);
     if (a->aux.capa < a->len + 1)
       ary_expand_capa(mrb, a, a->len + 1);
-    memmove(a->ptr + 1, a->ptr, sizeof(mrb_value)*a->len);
+    value_move(a->ptr + 1, a->ptr, a->len);
     a->ptr[0] = item;
   }
   a->len++;
@@ -546,7 +547,7 @@ mrb_ary_unshift_m(mrb_state *mrb, mrb_value self)
     if (len == 0) return self;
     if (a->aux.capa < a->len + len)
       ary_expand_capa(mrb, a, a->len + len);
-    memmove(a->ptr + len, a->ptr, sizeof(mrb_value)*a->len);
+    value_move(a->ptr + len, a->ptr, a->len);
   }
   array_copy(a->ptr, vals, len);
   a->len += len;
@@ -631,7 +632,7 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
     ary_fill_with_nil(a->ptr + a->len, (int)(head - a->len));
   }
   else if (head < a->len) {
-    memmove(a->ptr + head + argc, a->ptr + tail, sizeof(mrb_value)*(a->len - tail));
+    value_move(a->ptr + head + argc, a->ptr + tail, a->len - tail);
   }
 
   for(i = 0; i < argc; i++) {
@@ -702,6 +703,7 @@ mrb_ary_aget(mrb_state *mrb, mrb_value self)
 
   default:
     mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+    break;
   }
 
   return mrb_nil_value(); /* dummy to avoid warning : not reach here */
@@ -877,7 +879,7 @@ mrb_ary_empty_p(mrb_state *mrb, mrb_value self)
 {
   struct RArray *a = mrb_ary_ptr(self);
 
-  return ((a->len == 0)? mrb_true_value(): mrb_false_value());
+  return mrb_bool_value(a->len == 0);
 }
 
 mrb_value
@@ -917,7 +919,7 @@ inspect_ary(mrb_state *mrb, mrb_value ary, mrb_value list)
   mrb_str_buf_cat(mrb, arystr, head, sizeof(head));
 
   for(i=0; i<RARRAY_LEN(ary); i++) {
-    mrb_int ai = mrb_gc_arena_save(mrb);
+    int ai = mrb_gc_arena_save(mrb);
 
     if (i > 0) {
       mrb_str_buf_cat(mrb, arystr, sep, sizeof(sep));
@@ -1058,31 +1060,39 @@ static mrb_value
 mrb_ary_equal(mrb_state *mrb, mrb_value ary1)
 {
   mrb_value ary2;
+  mrb_bool equal_p;
 
   mrb_get_args(mrb, "o", &ary2);
-  if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_true_value();
-  if (mrb_special_const_p(ary2)) return mrb_false_value();
-  if (!mrb_array_p(ary2)) {
-    if (!mrb_respond_to(mrb, ary2, mrb_intern(mrb, "to_ary"))) {
-        return mrb_false_value();
-    }
-    if (mrb_equal(mrb, ary2, ary1)){
-      return mrb_true_value();
+  if (mrb_obj_equal(mrb, ary1, ary2)) {
+    equal_p = 1;
+  }
+  else if (mrb_special_const_p(ary2)) {
+    equal_p = 0;
+  }
+  else if (!mrb_array_p(ary2)) {
+    if (!mrb_respond_to(mrb, ary2, mrb_intern2(mrb, "to_ary", 6))) {
+        equal_p = 0;
     }
     else {
-      return mrb_false_value();
+      equal_p = mrb_equal(mrb, ary2, ary1);
     }
   }
-  if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return mrb_false_value();
+  else if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) {
+    equal_p = 0;
+  }
   else {
     mrb_int i;
 
+    equal_p = 1;
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-      if (!mrb_equal(mrb, ary_elt(ary1, i), ary_elt(ary2, i)))
-        return mrb_false_value();
+      if (!mrb_equal(mrb, ary_elt(ary1, i), ary_elt(ary2, i))) {
+        equal_p = 0;
+        break;
+      }
     }
-    return mrb_true_value();
   }
+
+  return mrb_bool_value(equal_p);
 }
 
 /* 15.2.12.5.34 (x) */
@@ -1098,20 +1108,30 @@ static mrb_value
 mrb_ary_eql(mrb_state *mrb, mrb_value ary1)
 {
   mrb_value ary2;
+  mrb_bool eql_p;
 
   mrb_get_args(mrb, "o", &ary2);
-  if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_true_value();
-  if (!mrb_array_p(ary2)) return mrb_false_value();
-  if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return mrb_false_value();
+  if (mrb_obj_equal(mrb, ary1, ary2)) {
+    eql_p = 1;
+  }
+  else if (!mrb_array_p(ary2)) {
+    eql_p = 0;
+  }
+  else if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) {
+    eql_p = 0;
+  }
   else {
     mrb_int i;
-
+    eql_p = 1;
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-      if (!mrb_eql(mrb, ary_elt(ary1, i), ary_elt(ary2, i)))
-        return mrb_false_value();
+      if (!mrb_eql(mrb, ary_elt(ary1, i), ary_elt(ary2, i))) {
+	eql_p = 0;
+	break;
+      }
     }
-    return mrb_true_value();
   }
+
+  return mrb_bool_value(eql_p);
 }
 
 void