Commit 9d8c1ecc authored by Masaki Muranaka's avatar Masaki Muranaka

Use mrb_true_or_false_value() / in mrb_struct_eql().

parent 0e9512cc
...@@ -735,22 +735,34 @@ mrb_struct_eql(mrb_state *mrb, mrb_value s) ...@@ -735,22 +735,34 @@ mrb_struct_eql(mrb_state *mrb, mrb_value s)
mrb_value s2; mrb_value s2;
mrb_value *ptr, *ptr2; mrb_value *ptr, *ptr2;
mrb_int i, len; mrb_int i, len;
mrb_bool eql_p;
mrb_get_args(mrb, "o", &s2); mrb_get_args(mrb, "o", &s2);
if (mrb_obj_equal(mrb, s, s2)) return mrb_true_value(); if (mrb_obj_equal(mrb, s, s2)) {
if (strcmp(mrb_class_name(mrb, mrb_obj_class(mrb, s2)), "Struct")) return mrb_false_value(); eql_p = 1;
if (mrb_obj_class(mrb, s) != mrb_obj_class(mrb, s2)) return mrb_false_value(); }
if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) { else if (strcmp(mrb_class_name(mrb, mrb_obj_class(mrb, s2)), "Struct") ||
mrb_obj_class(mrb, s) != mrb_obj_class(mrb, s2)) {
eql_p = 0;
}
else if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
mrb_bug("inconsistent struct"); /* should never happen */ mrb_bug("inconsistent struct"); /* should never happen */
eql_p = 0; /* This substuture is just to suppress warnings. never called. */
} }
else {
ptr = RSTRUCT_PTR(s); ptr = RSTRUCT_PTR(s);
ptr2 = RSTRUCT_PTR(s2); ptr2 = RSTRUCT_PTR(s2);
len = RSTRUCT_LEN(s); len = RSTRUCT_LEN(s);
for (i=0; i<len; i++) { eql_p = 1;
if (!mrb_eql(mrb, ptr[i], ptr2[i])) return mrb_false_value(); for (i=0; i<len; i++) {
if (!mrb_eql(mrb, ptr[i], ptr2[i])) {
eql_p = 0;
break;
}
}
} }
return mrb_true_value();
return mrb_true_or_false_value(eql_p);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment