зеркало из https://github.com/github/ruby.git
Use `defined?(yield)` and `SIZED_ENUMERATOR`
Prefer built-in features over method calls that may be overridden.
This commit is contained in:
Родитель
df63e5bef6
Коммит
3dccb716da
2
array.rb
2
array.rb
|
@ -44,7 +44,7 @@ class Array
|
|||
def each
|
||||
Primitive.attr! :inline_block
|
||||
unless defined?(yield)
|
||||
return to_enum(:each) { self.length }
|
||||
return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, ary_enum_length)'
|
||||
end
|
||||
_i = 0
|
||||
value = nil
|
||||
|
|
|
@ -129,7 +129,7 @@ module Kernel
|
|||
#
|
||||
def then
|
||||
Primitive.attr! :inline_block
|
||||
unless block_given?
|
||||
unless defined?(yield)
|
||||
return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, rb_obj_size)'
|
||||
end
|
||||
yield(self)
|
||||
|
@ -145,7 +145,7 @@ module Kernel
|
|||
#
|
||||
def yield_self
|
||||
Primitive.attr! :inline_block
|
||||
unless block_given?
|
||||
unless defined?(yield)
|
||||
return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, rb_obj_size)'
|
||||
end
|
||||
yield(self)
|
||||
|
@ -182,8 +182,8 @@ module Kernel
|
|||
# } #=> :ok
|
||||
def loop
|
||||
Primitive.attr! :inline_block
|
||||
unless block_given?
|
||||
return enum_for(:loop) { Float::INFINITY }
|
||||
unless defined?(yield)
|
||||
return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, rb_f_loop_size)'
|
||||
end
|
||||
|
||||
begin
|
||||
|
|
|
@ -5664,6 +5664,12 @@ int_downto(VALUE from, VALUE to)
|
|||
return from;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
int_dotimes_size(VALUE num, VALUE args, VALUE eobj)
|
||||
{
|
||||
return int_neg_p(num) ? INT2FIX(0) : num;
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* round(ndigits= 0, half: :up) -> integer
|
||||
|
|
|
@ -230,8 +230,8 @@ class Integer
|
|||
# With no block given, returns an Enumerator.
|
||||
def times
|
||||
Primitive.attr! :inline_block
|
||||
unless block_given?
|
||||
return to_enum(:times) { self < 0 ? 0 : self }
|
||||
unless defined?(yield)
|
||||
return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, int_dotimes_size)'
|
||||
end
|
||||
i = 0
|
||||
while i < self
|
||||
|
|
6
object.c
6
object.c
|
@ -3988,6 +3988,12 @@ f_sprintf(int c, const VALUE *v, VALUE _)
|
|||
return rb_f_sprintf(c, v);
|
||||
}
|
||||
|
||||
static VALUE
|
||||
rb_f_loop_size(VALUE self, VALUE args, VALUE eobj)
|
||||
{
|
||||
return DBL2NUM(HUGE_VAL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Document-class: Class
|
||||
*
|
||||
|
|
Загрузка…
Ссылка в новой задаче