From a2fbd80a473071f76687dda5fda7dbbea7efde9f Mon Sep 17 00:00:00 2001 From: ksss Date: Sat, 19 Nov 2016 09:29:22 +0900 Subject: Fix Range#size results --- mrbgems/mruby-range-ext/test/range.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mrbgems/mruby-range-ext/test/range.rb') diff --git a/mrbgems/mruby-range-ext/test/range.rb b/mrbgems/mruby-range-ext/test/range.rb index 18e7dafe4..ea1e12f2e 100644 --- a/mrbgems/mruby-range-ext/test/range.rb +++ b/mrbgems/mruby-range-ext/test/range.rb @@ -25,5 +25,7 @@ assert('Range#size') do assert_equal 6, (1...6.3).size assert_equal 5, (1...6.0).size assert_equal 5, (1.1...6).size + assert_equal 15, (1.0..15.9).size + assert_equal Float::INFINITY, (0..Float::INFINITY).size assert_nil ('a'..'z').size end -- cgit v1.2.3 From 682237be6ecabe9f35e7a7a1cb16a1eb54b69fb9 Mon Sep 17 00:00:00 2001 From: ksss Date: Mon, 21 Nov 2016 12:39:21 +0900 Subject: Reimplements Range#first Range#first shouldn't call `Range#to_a` on infinity range. --- mrbgems/mruby-range-ext/mrblib/range.rb | 31 +++++++++++++++++++++++++++++++ mrbgems/mruby-range-ext/src/range.c | 27 --------------------------- mrbgems/mruby-range-ext/test/range.rb | 1 + 3 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 mrbgems/mruby-range-ext/mrblib/range.rb (limited to 'mrbgems/mruby-range-ext/test/range.rb') diff --git a/mrbgems/mruby-range-ext/mrblib/range.rb b/mrbgems/mruby-range-ext/mrblib/range.rb new file mode 100644 index 000000000..3b9c3874a --- /dev/null +++ b/mrbgems/mruby-range-ext/mrblib/range.rb @@ -0,0 +1,31 @@ +class Range + ## + # call-seq: + # rng.first -> obj + # rng.first(n) -> an_array + # + # Returns the first object in the range, or an array of the first +n+ + # elements. + # + # (10..20).first #=> 10 + # (10..20).first(3) #=> [10, 11, 12] + # + def first(*args) + return self.begin if args.empty? + + raise ArgumentError, "wrong number of arguments (given #{args.length}, expected 1)" unless args.length == 1 + nv = args[0] + raise TypeError, "no implicit conversion from nil to integer" unless nv.nil?.! + raise TypeError, "no implicit conversion of #{nv.class} into Integer" unless nv.respond_to?(:to_int) + n = nv.to_int + raise TypeError, "no implicit conversion of #{nv.class} into Integer" unless n.kind_of?(Integer) + raise ArgumentError, "negative array size (or size too big)" unless 0 <= n + ary = [] + each do |i| + break if n <= 0 + ary.push(i) + n -= 1 + end + ary + end +end diff --git a/mrbgems/mruby-range-ext/src/range.c b/mrbgems/mruby-range-ext/src/range.c index 1d9312b03..32222a594 100644 --- a/mrbgems/mruby-range-ext/src/range.c +++ b/mrbgems/mruby-range-ext/src/range.c @@ -66,32 +66,6 @@ mrb_range_cover(mrb_state *mrb, mrb_value range) return mrb_false_value(); } -/* - * call-seq: - * rng.first -> obj - * rng.first(n) -> an_array - * - * Returns the first object in the range, or an array of the first +n+ - * elements. - * - * (10..20).first #=> 10 - * (10..20).first(3) #=> [10, 11, 12] - */ -static mrb_value -mrb_range_first(mrb_state *mrb, mrb_value range) -{ - mrb_int num; - mrb_value array; - struct RRange *r = mrb_range_ptr(range); - - if (mrb_get_args(mrb, "|i", &num) == 0) { - return r->edges->beg; - } - - array = mrb_funcall(mrb, range, "to_a", 0); - return mrb_funcall(mrb, array, "first", 1, mrb_fixnum_value(num)); -} - /* * call-seq: * rng.last -> obj @@ -193,7 +167,6 @@ mrb_mruby_range_ext_gem_init(mrb_state* mrb) struct RClass * s = mrb_class_get(mrb, "Range"); mrb_define_method(mrb, s, "cover?", mrb_range_cover, MRB_ARGS_REQ(1)); - mrb_define_method(mrb, s, "first", mrb_range_first, MRB_ARGS_OPT(1)); mrb_define_method(mrb, s, "last", mrb_range_last, MRB_ARGS_OPT(1)); mrb_define_method(mrb, s, "size", mrb_range_size, MRB_ARGS_NONE()); } diff --git a/mrbgems/mruby-range-ext/test/range.rb b/mrbgems/mruby-range-ext/test/range.rb index ea1e12f2e..efcbdabe4 100644 --- a/mrbgems/mruby-range-ext/test/range.rb +++ b/mrbgems/mruby-range-ext/test/range.rb @@ -10,6 +10,7 @@ end assert('Range#first') do assert_equal 10, (10..20).first assert_equal [10, 11, 12], (10..20).first(3) + assert_equal [0, 1, 2], (0..Float::INFINITY).first(3) end assert('Range#last') do -- cgit v1.2.3