1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor sym_step_i function

Browse Source
This commit is contained in:
S.H 2021-10-10 11:40:04 +09:00 committed by GitHub
parent f6048e592c
commit afb95d1004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2021-10-10 11:40:24 +09:00 
Merged: https://github.com/ruby/ruby/pull/4923

Merged-By: nobu <nobu@ruby-lang.org>
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
range.c
View File

@ -308,8 +308,8 @@ range_each_func(VALUE range, int (*func)(VALUE, VALUE), VALUE arg)
} }
} }
static int static VALUE*
sym_step_i(VALUE i, VALUE arg) step_i_iter(VALUE arg)
{ {
VALUE *iter = (VALUE *)arg; VALUE *iter = (VALUE *)arg;
@ -319,6 +319,14 @@ sym_step_i(VALUE i, VALUE arg)
else { else {
iter[0] = rb_funcall(iter[0], '-', 1, INT2FIX(1)); iter[0] = rb_funcall(iter[0], '-', 1, INT2FIX(1));
} }
return iter;
}
static int
sym_step_i(VALUE i, VALUE arg)
{
VALUE *iter = step_i_iter(arg);
if (iter[0] == INT2FIX(0)) { if (iter[0] == INT2FIX(0)) {
rb_yield(rb_str_intern(i)); rb_yield(rb_str_intern(i));
iter[0] = iter[1]; iter[0] = iter[1];
@ -329,14 +337,8 @@ sym_step_i(VALUE i, VALUE arg)
static int static int
step_i(VALUE i, VALUE arg) step_i(VALUE i, VALUE arg)
{ {
VALUE *iter = (VALUE *)arg; VALUE *iter = step_i_iter(arg);
if (FIXNUM_P(iter[0])) {
iter[0] -= INT2FIX(1) & ~FIXNUM_FLAG;
}
else {
iter[0] = rb_funcall(iter[0], '-', 1, INT2FIX(1));
}
if (iter[0] == INT2FIX(0)) { if (iter[0] == INT2FIX(0)) {
rb_yield(i); rb_yield(i);
iter[0] = iter[1]; iter[0] = iter[1];