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

* cont.c (rb_fiber_start): calls with exact argument number.

Browse source 
[ruby-core:20088]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-12-01 03:00:48 +00:00
parent dd9f8e5ac9
commit a918afe05e
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Dec 1 12:00:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* cont.c (rb_fiber_start): calls with exact argument number.
[ruby-core:20088]
Sun Nov 30 21:41:10 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* man/rake.1: new manual page

9
cont.c
View file

@ -25,6 +25,7 @@ enum context_type {
typedef struct rb_context_struct {
enum context_type type;
VALUE self;
int argc;
VALUE value;
VALUE *vm_stack;
#ifdef CAPTURE_JUST_VALID_VM_STACK
@ -558,6 +559,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
}
}
cont->argc = argc;
cont->value = make_passing_arg(argc, argv);
cont_restore_0(cont, &contval);
@ -685,7 +687,6 @@ rb_fiber_start(void)
rb_fiber_t *fib;
rb_context_t *cont;
rb_proc_t *proc;
VALUE args;
int state;
GetFiberPtr(th->fiber, fib);
@ -693,15 +694,18 @@ rb_fiber_start(void)
TH_PUSH_TAG(th);
if ((state = EXEC_TAG()) == 0) {
int argc;
VALUE *argv, args;
GetProcPtr(cont->saved_thread.first_proc, proc);
args = cont->value;
argv = (argc = cont->argc) > 1 ? RARRAY_PTR(args) : &args;
cont->value = Qnil;
th->errinfo = Qnil;
th->local_lfp = proc->block.lfp;
th->local_svar = Qnil;
fib->status = RUNNING;
cont->value = vm_invoke_proc(th, proc, proc->block.self, 1, &args, 0);
cont->value = vm_invoke_proc(th, proc, proc->block.self, argc, argv, 0);
}
TH_POP_TAG();
@ -798,6 +802,7 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
fib->prev = rb_fiber_current();
}
cont->argc = argc;
cont->value = make_passing_arg(argc, argv);
if ((value = fiber_store(fib)) == Qundef) {

4
test/ruby/test_fiber.rb
View file

@ -14,6 +14,10 @@ class TestFiber < Test::Unit::TestCase
assert_equal([:a, :b], Fiber.new{|a, b| [a, b]}.resume(:a, :b))
end
def test_argument
assert_equal(4, Fiber.new {|i=4| i}.resume)
end
def test_term
assert_equal(:ok, Fiber.new{:ok}.resume)
assert_equal([:a, :b, :c, :d, :e],