summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-04 10:10:06 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-04 10:10:06 (GMT)
commit759773bf0e26265fcc209875b6e1c5584b91e16c (patch)
treef2b49346d9edaf134d7c0cd9c36be07cf0064076 /proc.c
parentc8932036d2d3e32d7e75fcffa4ee4139a5a4b55f (diff)
proc.c: passed_block
* proc.c (passed_block): extract conversion from passed proc value to rb_block_t pointer. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/proc.c b/proc.c
index 6be1136..d67d61e 100644
--- a/proc.c
+++ b/proc.c
@@ -805,6 +805,17 @@ check_argc(long argc)
#define check_argc(argc) (argc)
#endif
+static rb_block_t *
+passed_block(VALUE pass_procval)
+{
+ if (!NIL_P(pass_procval)) {
+ rb_proc_t *pass_proc;
+ GetProcPtr(pass_procval, pass_proc);
+ return &pass_proc->block;
+ }
+ return 0;
+}
+
VALUE
rb_proc_call(VALUE self, VALUE args)
{
@@ -825,12 +836,7 @@ rb_proc_call_with_block(VALUE self, int argc, const VALUE *argv, VALUE pass_proc
rb_block_t *block = 0;
GetProcPtr(self, proc);
- if (!NIL_P(pass_procval)) {
- rb_proc_t *pass_proc;
- GetProcPtr(pass_procval, pass_proc);
- block = &pass_proc->block;
- }
-
+ block = passed_block(pass_procval);
vret = rb_vm_invoke_proc(GET_THREAD(), proc, argc, argv, block);
RB_GC_GUARD(self);
RB_GC_GUARD(pass_procval);
@@ -1977,15 +1983,8 @@ rb_method_call_with_block(int argc, const VALUE *argv, VALUE method, VALUE pass_
}
if ((state = EXEC_TAG()) == 0) {
rb_thread_t *th = GET_THREAD();
- rb_block_t *block = 0;
-
- if (!NIL_P(pass_procval)) {
- rb_proc_t *pass_proc;
- GetProcPtr(pass_procval, pass_proc);
- block = &pass_proc->block;
- }
- th->passed_block = block;
+ th->passed_block = passed_block(pass_procval);
VAR_INITIALIZED(data);
result = rb_vm_call(th, data->recv, data->me->called_id, argc, argv, method_callable_method_entry(data));
}