kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* enumerator.c (sym_call): initialize first.

Browse source 
* enumerator.c (enum_iter): typedefed.

* enumerator.c (next_i): suppress a warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-08-23 07:57:03 +00:00
parent 4af553f1e7
commit e1b18be016
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,4 +1,4 @@
Thu Aug 23 16:55:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Aug 23 16:57:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* cont.c (rb_cont_call, fiber_switch, rb_fiber_resume, rb_fiber_yield): * cont.c (rb_cont_call, fiber_switch, rb_fiber_resume, rb_fiber_yield):
suppress warnings. suppress warnings.
@ -6,6 +6,12 @@ Thu Aug 23 16:55:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* cont.c (rb_fiber_start): change on non-volatile variable between * cont.c (rb_fiber_start): change on non-volatile variable between
setjmp and longjmp may not has an effect. setjmp and longjmp may not has an effect.
* enumerator.c (sym_call): initialize first.
* enumerator.c (enum_iter): typedefed.
* enumerator.c (next_i): suppress a warning.
Thu Aug 23 16:04:11 2007 Koichi Sasada <ko1@atdot.net> Thu Aug 23 16:04:11 2007 Koichi Sasada <ko1@atdot.net>
* compile.c, insns.def, parse.y: fix massign order. This change * compile.c, insns.def, parse.y: fix massign order. This change

20
enumerator.c
View file

@ -22,7 +22,7 @@
* object. * object.
*/ */
static VALUE rb_cEnumerator; static VALUE rb_cEnumerator;
static VALUE sym_each, sym_each_with_index, sym_each_slice, sym_each_cons; static VALUE sym_each, sym_each_with_index, sym_each_slice, sym_each_cons, sym_call;
VALUE rb_eStopIteration; VALUE rb_eStopIteration;
@ -35,11 +35,14 @@ proc_call(VALUE proc, VALUE args)
return rb_proc_call(proc, args); return rb_proc_call(proc, args);
} }
struct enumerator;
typedef VALUE enum_iter(VALUE, struct enumerator *);
struct enumerator { struct enumerator {
VALUE method; VALUE method;
VALUE proc; VALUE proc;
VALUE args; VALUE args;
VALUE (*iter)(VALUE, struct enumerator *); enum_iter *iter;
VALUE fib; VALUE fib;
VALUE next; VALUE next;
VALUE dst; VALUE dst;
@ -154,7 +157,7 @@ enum_each_slice(VALUE obj, VALUE n)
args[0] = rb_ary_new2(size); args[0] = rb_ary_new2(size);
args[1] = (VALUE)size; args[1] = (VALUE)size;
rb_block_call(obj, rb_intern("each"), 0, 0, each_slice_i, (VALUE)args); rb_block_call(obj, SYM2ID(sym_each), 0, 0, each_slice_i, (VALUE)args);
ary = args[0]; ary = args[0];
if (RARRAY_LEN(ary) > 0) rb_yield(ary); if (RARRAY_LEN(ary) > 0) rb_yield(ary);
@ -210,7 +213,7 @@ enum_each_cons(VALUE obj, VALUE n)
args[0] = rb_ary_new2(size); args[0] = rb_ary_new2(size);
args[1] = (VALUE)size; args[1] = (VALUE)size;
rb_block_call(obj, rb_intern("each"), 0, 0, each_cons_i, (VALUE)args); rb_block_call(obj, SYM2ID(sym_each), 0, 0, each_cons_i, (VALUE)args);
return Qnil; return Qnil;
} }
@ -234,7 +237,7 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
ptr->iter = enumerator_iter_i; ptr->iter = enumerator_iter_i;
} }
else { else {
ptr->iter = (VALUE (*)(VALUE, struct enumerator *))rb_yield; ptr->iter = (enum_iter *)rb_yield;
} }
if (argc) ptr->args = rb_ary_new4(argc, argv); if (argc) ptr->args = rb_ary_new4(argc, argv);
ptr->fib = 0; ptr->fib = 0;
@ -317,7 +320,7 @@ enumerator_each(VALUE obj)
argc = RARRAY_LEN(e->args); argc = RARRAY_LEN(e->args);
argv = RARRAY_PTR(e->args); argv = RARRAY_PTR(e->args);
} }
return rb_block_call(e->method, rb_intern("call"), argc, argv, e->iter, (VALUE)e); return rb_block_call(e->method, SYM2ID(sym_call), argc, argv, e->iter, (VALUE)e);
} }
static VALUE static VALUE
@ -349,7 +352,7 @@ enumerator_with_index(VALUE obj)
argc = RARRAY_LEN(e->args); argc = RARRAY_LEN(e->args);
argv = RARRAY_PTR(e->args); argv = RARRAY_PTR(e->args);
} }
return rb_block_call(e->method, rb_intern("call"), argc, argv, return rb_block_call(e->method, SYM2ID(sym_call), argc, argv,
enumerator_with_index_i, (VALUE)&memo); enumerator_with_index_i, (VALUE)&memo);
} }
@ -388,7 +391,7 @@ next_i(VALUE curr, VALUE obj)
rb_block_call(obj, rb_intern("each"), 0, 0, next_ii, obj); rb_block_call(obj, rb_intern("each"), 0, 0, next_ii, obj);
e->has_next = Qfalse; e->has_next = Qfalse;
rb_fiber_yield(1, &e->next); return rb_fiber_yield(1, &e->next);
} }
static void static void
@ -498,6 +501,7 @@ Init_Enumerator(void)
sym_each_with_index = ID2SYM(rb_intern("each_with_index")); sym_each_with_index = ID2SYM(rb_intern("each_with_index"));
sym_each_slice = ID2SYM(rb_intern("each_slice")); sym_each_slice = ID2SYM(rb_intern("each_slice"));
sym_each_cons = ID2SYM(rb_intern("each_cons")); sym_each_cons = ID2SYM(rb_intern("each_cons"));
sym_call = ID2SYM(rb_intern("call"));
rb_provide("enumerator.so"); /* for backward compatibility */ rb_provide("enumerator.so"); /* for backward compatibility */
} }