From 44dc05f12a06e329119b6bf5606e4836b653c48f Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Fri, 2 May 2014 23:20:48 +0900 Subject: Implement Struct#values_at and Array#values_at . Add API `mrb_get_values_at()` to mruby/range.h . --- src/range.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'src/range.c') diff --git a/src/range.c b/src/range.c index b59b234ef..340d64ec1 100644 --- a/src/range.c +++ b/src/range.c @@ -8,6 +8,7 @@ #include "mruby/class.h" #include "mruby/range.h" #include "mruby/string.h" +#include "mruby/array.h" #define RANGE_CLASS (mrb_class_get(mrb, "Range")) @@ -395,6 +396,33 @@ range_initialize_copy(mrb_state *mrb, mrb_value copy) return copy; } +mrb_value +mrb_get_values_at(mrb_state *mrb, mrb_value obj, mrb_int olen, mrb_int argc, const mrb_value *argv, mrb_value (*func)(mrb_state*, mrb_value, mrb_int)) +{ + mrb_int i, j, beg, len; + mrb_value result; + result = mrb_ary_new(mrb); + + for (i = 0; i < argc; ++i) { + if (mrb_fixnum_p(argv[i])) { + mrb_ary_push(mrb, result, func(mrb, obj, mrb_fixnum(argv[i]))); + } else if (mrb_range_beg_len(mrb, argv[i], &beg, &len, olen)) { + mrb_int const end = RARRAY_LEN(obj) < beg + len ? RARRAY_LEN(obj) : beg + len; + for (j = beg; j < end; ++j) { + mrb_ary_push(mrb, result, func(mrb, obj, j)); + } + + for (; j < beg + len; ++j) { + mrb_ary_push(mrb, result, mrb_nil_value()); + } + } else { + mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid values selector: %S", argv[i]); + } + } + + return result; +} + void mrb_init_range(mrb_state *mrb) { -- cgit v1.2.3 From 342f124702138f0052982de382cbbe0e372608cd Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 3 May 2014 21:17:22 +0900 Subject: raise TypeError instead of ArgumentError when argument of wrong type given to the values_at --- src/range.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/range.c') diff --git a/src/range.c b/src/range.c index 627b572d4..a1f1ccc18 100644 --- a/src/range.c +++ b/src/range.c @@ -392,7 +392,7 @@ mrb_get_values_at(mrb_state *mrb, mrb_value obj, mrb_int olen, mrb_int argc, con mrb_ary_push(mrb, result, mrb_nil_value()); } } else { - mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid values selector: %S", argv[i]); + mrb_raisef(mrb, E_TYPE_ERROR, "invalid values selector: %S", argv[i]); } } -- cgit v1.2.3 From bd681269f4d84059782db60689e72492ec5dbcc0 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 3 May 2014 21:18:25 +0900 Subject: do not raise error in mrb_range_beg_len() --- src/range.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/range.c') diff --git a/src/range.c b/src/range.c index a1f1ccc18..2e0830b6b 100644 --- a/src/range.c +++ b/src/range.c @@ -240,9 +240,7 @@ mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int beg, end, b, e; struct RRange *r = mrb_range_ptr(range); - if (mrb_type(range) != MRB_TT_RANGE) { - mrb_raise(mrb, E_TYPE_ERROR, "expected Range."); - } + if (mrb_type(range) != MRB_TT_RANGE) return FALSE; beg = b = mrb_fixnum(r->edges->beg); end = e = mrb_fixnum(r->edges->end); -- cgit v1.2.3 From 0c294af091f26f7febc4ae35fcb805e38353c479 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 3 May 2014 21:19:06 +0900 Subject: convert range edges to integers --- src/range.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/range.c') diff --git a/src/range.c b/src/range.c index 2e0830b6b..5ea33ab85 100644 --- a/src/range.c +++ b/src/range.c @@ -242,8 +242,8 @@ mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, if (mrb_type(range) != MRB_TT_RANGE) return FALSE; - beg = b = mrb_fixnum(r->edges->beg); - end = e = mrb_fixnum(r->edges->end); + beg = b = mrb_fixnum(mrb_to_int(mrb, r->edges->beg)); + end = e = mrb_fixnum(mrb_to_int(mrb, r->edges->end)); if (beg < 0) { beg += len; -- cgit v1.2.3 From 206c96e4a7ae37af6244ae37bc95751a2b36e73d Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 3 May 2014 21:20:14 +0900 Subject: reindent else --- src/range.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/range.c') diff --git a/src/range.c b/src/range.c index 5ea33ab85..a064f4ab4 100644 --- a/src/range.c +++ b/src/range.c @@ -380,7 +380,8 @@ mrb_get_values_at(mrb_state *mrb, mrb_value obj, mrb_int olen, mrb_int argc, con for (i = 0; i < argc; ++i) { if (mrb_fixnum_p(argv[i])) { mrb_ary_push(mrb, result, func(mrb, obj, mrb_fixnum(argv[i]))); - } else if (mrb_range_beg_len(mrb, argv[i], &beg, &len, olen)) { + } + else if (mrb_range_beg_len(mrb, argv[i], &beg, &len, olen)) { mrb_int const end = RARRAY_LEN(obj) < beg + len ? RARRAY_LEN(obj) : beg + len; for (j = beg; j < end; ++j) { mrb_ary_push(mrb, result, func(mrb, obj, j)); @@ -389,7 +390,8 @@ mrb_get_values_at(mrb_state *mrb, mrb_value obj, mrb_int olen, mrb_int argc, con for (; j < beg + len; ++j) { mrb_ary_push(mrb, result, mrb_nil_value()); } - } else { + } + else { mrb_raisef(mrb, E_TYPE_ERROR, "invalid values selector: %S", argv[i]); } } -- cgit v1.2.3 From 1519e441a0676b8aaea8dbc123ad09cd9e6e449e Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 3 May 2014 23:35:24 +0900 Subject: use proper length for mrb_get_values_at() separate mrb_range_beg_len() into two: the one truncates range into the sequence size, and the one does not. #values_at uses the latter. --- mrbgems/mruby-array-ext/src/array.c | 2 +- mrbgems/mruby-struct/src/struct.c | 2 +- src/range.c | 21 +++++++++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) (limited to 'src/range.c') diff --git a/mrbgems/mruby-array-ext/src/array.c b/mrbgems/mruby-array-ext/src/array.c index 12d0ec743..ae9d8296e 100644 --- a/mrbgems/mruby-array-ext/src/array.c +++ b/mrbgems/mruby-array-ext/src/array.c @@ -131,7 +131,7 @@ mrb_ary_values_at(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "*", &argv, &argc); - return mrb_get_values_at(mrb, self, MRB_INT_MAX, argc, argv, mrb_ary_ref); + return mrb_get_values_at(mrb, self, RARRAY_LEN(self), argc, argv, mrb_ary_ref); } void diff --git a/mrbgems/mruby-struct/src/struct.c b/mrbgems/mruby-struct/src/struct.c index 40ad88aca..3c2a89b77 100644 --- a/mrbgems/mruby-struct/src/struct.c +++ b/mrbgems/mruby-struct/src/struct.c @@ -843,7 +843,7 @@ mrb_struct_values_at(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "*", &argv, &argc); - return mrb_get_values_at(mrb, self, MRB_INT_MAX, argc, argv, struct_values_at_getter); + return mrb_get_values_at(mrb, self, RSTRUCT_LEN(self), argc, argv, struct_values_at_getter); } /* diff --git a/src/range.c b/src/range.c index a064f4ab4..b392f37b2 100644 --- a/src/range.c +++ b/src/range.c @@ -235,7 +235,7 @@ mrb_range_include(mrb_state *mrb, mrb_value range) } mrb_bool -mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len) +range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len, mrb_bool trunc) { mrb_int beg, end, b, e; struct RRange *r = mrb_range_ptr(range); @@ -250,11 +250,14 @@ mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, if (beg < 0) return FALSE; } - if (beg > len) return FALSE; - if (end > len) end = len; + if (trunc) { + if (beg > len) return FALSE; + if (end > len) end = len; + } if (end < 0) end += len; - if (!r->excl && end < len) end++; /* include end point */ + if (!r->excl && (!trunc || end < len)) + end++; /* include end point */ len = end - beg; if (len < 0) len = 0; @@ -263,6 +266,12 @@ mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, return TRUE; } +mrb_bool +mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len) +{ + return range_beg_len(mrb, range, begp, lenp, len, TRUE); +} + /* 15.2.14.4.12(x) */ /* * call-seq: @@ -381,8 +390,8 @@ mrb_get_values_at(mrb_state *mrb, mrb_value obj, mrb_int olen, mrb_int argc, con if (mrb_fixnum_p(argv[i])) { mrb_ary_push(mrb, result, func(mrb, obj, mrb_fixnum(argv[i]))); } - else if (mrb_range_beg_len(mrb, argv[i], &beg, &len, olen)) { - mrb_int const end = RARRAY_LEN(obj) < beg + len ? RARRAY_LEN(obj) : beg + len; + else if (range_beg_len(mrb, argv[i], &beg, &len, olen, FALSE)) { + mrb_int const end = olen < beg + len ? olen : beg + len; for (j = beg; j < end; ++j) { mrb_ary_push(mrb, result, func(mrb, obj, j)); } -- cgit v1.2.3 From f977772359a8a5582df618568a229a7f1112c6cd Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 3 May 2014 23:45:40 +0900 Subject: new macro mrb_int(mrb,x) to retrieve mrb_int from mrb_value with conversion if needed --- include/mruby.h | 1 + src/range.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/range.c') diff --git a/include/mruby.h b/include/mruby.h index 9cf578836..db3b06aa8 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -381,6 +381,7 @@ mrb_value mrb_yield_with_class(mrb_state *mrb, mrb_value b, mrb_int argc, const void mrb_gc_protect(mrb_state *mrb, mrb_value obj); mrb_value mrb_to_int(mrb_state *mrb, mrb_value val); +#define mrb_int(mrb, val) mrb_fixnum(mrb_to_int(mrb, val)) void mrb_check_type(mrb_state *mrb, mrb_value x, enum mrb_vtype t); typedef enum call_type { diff --git a/src/range.c b/src/range.c index b392f37b2..3e5af1894 100644 --- a/src/range.c +++ b/src/range.c @@ -242,8 +242,8 @@ range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb if (mrb_type(range) != MRB_TT_RANGE) return FALSE; - beg = b = mrb_fixnum(mrb_to_int(mrb, r->edges->beg)); - end = e = mrb_fixnum(mrb_to_int(mrb, r->edges->end)); + beg = b = mrb_int(mrb, r->edges->beg); + end = e = mrb_int(mrb, r->edges->end); if (beg < 0) { beg += len; -- cgit v1.2.3