From 7a7c1cf128d91ce05c5b9e884ff4201e8f13e217 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Fri, 1 Jun 2012 01:52:57 +0900 Subject: stop using mrb_exec_recursive_paired() from Array comparison --- src/array.c | 79 +++++++++++++++++++++++-------------------------------------- 1 file changed, 29 insertions(+), 50 deletions(-) (limited to 'src/array.c') diff --git a/src/array.c b/src/array.c index 7b486430f..335d0b524 100644 --- a/src/array.c +++ b/src/array.c @@ -200,25 +200,6 @@ mrb_ary_plus(mrb_state *mrb, mrb_value self) return ary; } -static mrb_value -recursive_cmp(mrb_state *mrb, mrb_value ary1, mrb_value ary2, int recur) -{ - long i, len; - - if (recur) return mrb_undef_value(); /* Subtle! */ - len = RARRAY_LEN(ary1); - if (len > RARRAY_LEN(ary2)) { - len = RARRAY_LEN(ary2); - } - - for (i=0; i", 1, ary_elt(ary2, i)); - if (mrb_type(r) != MRB_TT_FIXNUM || mrb_fixnum(r) != 0) return r; - } - - return mrb_undef_value(); -} - /* * call-seq: * ary <=> other_ary -> -1, 0, +1 or nil @@ -242,15 +223,23 @@ mrb_ary_cmp(mrb_state *mrb, mrb_value ary1) { mrb_value ary2; struct RArray *a1, *a2; - mrb_value r; - long len; + mrb_value r = mrb_nil_value(); + long i, len; mrb_get_args(mrb, "o", &ary2); if (mrb_type(ary2) != MRB_TT_ARRAY) return mrb_nil_value(); a1 = RARRAY(ary1); a2 = RARRAY(ary2); if (a1->len == a2->len && a1->buf == a2->buf) return mrb_fixnum_value(0); - r = mrb_exec_recursive_paired(mrb, recursive_cmp, ary1, ary2, &ary2); - if (mrb_type(r) != MRB_TT_UNDEF) return r; + else { + len = RARRAY_LEN(ary1); + if (len > RARRAY_LEN(ary2)) { + len = RARRAY_LEN(ary2); + } + for (i=0; i", 1, ary_elt(ary2, i)); + if (mrb_type(r) != MRB_TT_FIXNUM || mrb_fixnum(r) != 0) return r; + } + } len = a1->len - a2->len; return mrb_fixnum_value((len == 0)? 0: (len > 0)? 1: -1); } @@ -923,19 +912,6 @@ mrb_ary_join_m(mrb_state *mrb, mrb_value ary) return mrb_ary_join(mrb, ary, sep); } -static mrb_value -recursive_equal(mrb_state *mrb, mrb_value ary1, mrb_value ary2, int recur) -{ - long i; - - if (recur) return mrb_true_value(); /* Subtle! */ - for (i=0; i Date: Fri, 1 Jun 2012 01:54:11 +0900 Subject: remove prototype for mrb_exec_recursive_paired() --- src/array.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/array.c') diff --git a/src/array.c b/src/array.c index 335d0b524..94396ccf6 100644 --- a/src/array.c +++ b/src/array.c @@ -10,9 +10,6 @@ #include "mruby/string.h" #include "mruby/class.h" -mrb_value mrb_exec_recursive_paired(mrb_state *mrb, mrb_value (*func) (mrb_state *, mrb_value, mrb_value, int), - mrb_value obj, mrb_value paired_obj, void* arg); - //#define ARY_DEFAULT_LEN 16 #define ARY_DEFAULT_LEN 4 #define ARY_SHRINK_RATIO 5 /* must be larger than 2 */ -- cgit v1.2.3 From f56abcbb5a78b51b0edf0603b4e0e54ed70fd0d2 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Fri, 1 Jun 2012 02:18:30 +0900 Subject: reorder mrb_ary_new_from_values() args to (argc, argv) --- include/mruby/array.h | 2 +- src/array.c | 25 ++++++++++++++++--------- src/string.c | 2 +- src/struct.c | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) (limited to 'src/array.c') diff --git a/include/mruby/array.h b/include/mruby/array.h index 5c3098ebe..e2acee535 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -32,7 +32,7 @@ void mrb_ary_concat(mrb_state*, mrb_value, mrb_value); mrb_value mrb_ary_splat(mrb_state*, mrb_value); void mrb_ary_push(mrb_state*, mrb_value, mrb_value); mrb_value mrb_ary_pop(mrb_state *mrb, mrb_value ary); -mrb_value mrb_ary_new_from_values(mrb_state *mrb, mrb_value *vals, size_t size); +mrb_value mrb_ary_new_from_values(mrb_state *mrb, size_t size, mrb_value *vals); mrb_value mrb_ary_aget(mrb_state *mrb, mrb_value self); mrb_value mrb_ary_ref(mrb_state *mrb, mrb_value ary, mrb_int n); void mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val); diff --git a/src/array.c b/src/array.c index 94396ccf6..187a8404d 100644 --- a/src/array.c +++ b/src/array.c @@ -27,8 +27,8 @@ ary_elt(mrb_value ary, long offset) return RARRAY_PTR(ary)[offset]; } -mrb_value -mrb_ary_new_capa(mrb_state *mrb, size_t capa) +static struct RArray* +ary_new_capa(mrb_state *mrb, size_t capa) { struct RArray *a; size_t blen; @@ -52,6 +52,13 @@ mrb_ary_new_capa(mrb_state *mrb, size_t capa) a->capa = capa; a->len = 0; + return a; +} + +mrb_value +mrb_ary_new_capa(mrb_state *mrb, size_t capa) +{ + struct RArray *a = ary_new_capa(mrb, capa); return mrb_obj_value(a); } @@ -62,7 +69,7 @@ mrb_ary_new(mrb_state *mrb) } mrb_value -mrb_ary_new_from_values(mrb_state *mrb, mrb_value *vals, size_t size) +mrb_ary_new_from_values(mrb_state *mrb, size_t size, mrb_value *vals) { mrb_value ary; struct RArray *a; @@ -81,7 +88,7 @@ mrb_assoc_new(mrb_state *mrb, mrb_value car, mrb_value cdr) mrb_value arv[2]; arv[0] = car; arv[1] = cdr; - return mrb_ary_new_from_values(mrb, arv, 2); + return mrb_ary_new_from_values(mrb, 2, arv); } void @@ -153,7 +160,7 @@ mrb_ary_s_create(mrb_state *mrb, mrb_value self) int len; mrb_get_args(mrb, "*", &vals, &len); - return mrb_ary_new_from_values(mrb, vals, (size_t)len); + return mrb_ary_new_from_values(mrb, (size_t)len, vals); } void @@ -555,7 +562,7 @@ mrb_ary_aget(mrb_state *mrb, mrb_value self) if ((len = mrb_fixnum(argv[0])) < 0) return mrb_nil_value(); if (a->len == (size_t)index) return mrb_ary_new(mrb); if ((size_t)len > a->len - index) len = a->len - index; - return mrb_ary_new_from_values(mrb, a->buf + index, len); + return mrb_ary_new_from_values(mrb, len, a->buf + index); default: mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments"); @@ -640,7 +647,7 @@ mrb_ary_first(mrb_state *mrb, mrb_value self) /* len == 1 */ size = mrb_fixnum(*vals); if (size > a->len) size = a->len; - return mrb_ary_new_from_values(mrb, a->buf, size); + return mrb_ary_new_from_values(mrb, size, a->buf); } mrb_value @@ -662,7 +669,7 @@ mrb_ary_last(mrb_state *mrb, mrb_value self) /* len == 1 */ size = mrb_fixnum(*vals); if (size > a->len) size = a->len; - return mrb_ary_new_from_values(mrb, a->buf + a->len - size, size); + return mrb_ary_new_from_values(mrb, size, a->buf + a->len - size); } mrb_value @@ -702,7 +709,7 @@ mrb_ary_splat(mrb_state *mrb, mrb_value v) return v; } else { - return mrb_ary_new_from_values(mrb, &v, 1); + return mrb_ary_new_from_values(mrb, 1, &v); } } diff --git a/src/string.c b/src/string.c index 0714c360c..b6ca9e489 100644 --- a/src/string.c +++ b/src/string.c @@ -2111,7 +2111,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str) else if (lim == 1) { if (RSTRING_LEN(str) == 0) return mrb_ary_new_capa(mrb, 0); - return mrb_ary_new_from_values(mrb, &str, 1); + return mrb_ary_new_from_values(mrb, 1, &str); } i = 1; } diff --git a/src/struct.c b/src/struct.c index 699825cff..d06124b50 100644 --- a/src/struct.c +++ b/src/struct.c @@ -379,7 +379,7 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass) pargv = &argv[0]; argcnt++; } - rest = mrb_ary_new_from_values(mrb, pargv, argcnt); + rest = mrb_ary_new_from_values(mrb, argcnt, pargv); } st = make_struct(mrb, name, rest, struct_class(mrb)); if (!mrb_nil_p(b)) { -- cgit v1.2.3