2008-05-24 21:12:12 -04:00
|
|
|
/**********************************************************************
|
|
|
|
|
|
|
|
vm_eval.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Sat May 24 16:02:32 JST 2008
|
|
|
|
|
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
|
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
static inline VALUE method_missing(VALUE obj, ID id, int argc, const VALUE *argv, int call_status);
|
|
|
|
static inline VALUE vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *argv, const NODE *cref);
|
|
|
|
static inline VALUE vm_yield(rb_thread_t *th, int argc, const VALUE *argv);
|
2013-11-29 03:06:19 -05:00
|
|
|
static inline VALUE vm_yield_with_block(rb_thread_t *th, int argc, const VALUE *argv, const rb_block_t *blockargptr);
|
2009-12-03 13:25:57 -05:00
|
|
|
static NODE *vm_cref_push(rb_thread_t *th, VALUE klass, int noex, rb_block_t *blockptr);
|
* common.mk: clean up
- remove blockinlining.$(OBJEXT) to built
- make ENCODING_H_INCLDUES variable (include/ruby/encoding.h)
- make VM_CORE_H_INCLUDES variable (vm_core.h)
- simplify rules.
- make depends rule to output depend status using gcc -MM.
* include/ruby/mvm.h, include/ruby/vm.h: rename mvm.h to vm.h.
* include/ruby.h: ditto.
* load.c: add inclusion explicitly.
* enumerator.c, object.c, parse.y, thread.c, vm_dump.c:
remove useless inclusion.
* eval_intern.h: cleanup inclusion.
* vm_core.h: rb_thread_t should be defined in this file.
* vm_evalbody.c, vm_exec.c: rename vm_evalbody.c to vm_exec.c.
* vm.h, vm_exec.h: rename vm.h to vm_exec.h.
* insnhelper.h, vm_insnhelper.h: rename insnhelper.h to vm_insnhelper.h.
* vm.c, vm_insnhelper.c, vm_insnhelper.h:
- rename vm_eval() to vm_exec_core().
- rename vm_eval_body() to vm_exec().
- cleanup include order.
* vm_method.c: fix comment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-22 20:20:28 -04:00
|
|
|
static VALUE vm_exec(rb_thread_t *th);
|
* iseq.c, vm_eval.c: set th->base_block properly.
th->base_block is information for (a) parsing, (b) compiling
and (c) setting up the frame to execute the program passed by
`eval' method. For example, (1) parser need to know up-level
variables to detect it is variable or method without paren.
Befor (a), (b) and (c), VM set th->base_block by passed bindng
(or previous frame information). After execute (a), (b) and (c),
VM should clear th->base_block. However, if (a), (b) or (c)
raises an exception, then th->base_block is not cleared.
Problem is that the uncleared value th->balo_block is used for
irrelevant iseq compilation. It causes SEGV or critical error.
I tried to solve this problem: to clear them before exception,
but finally I found out that it is difficult to do it (Ruby
program can be run in many places).
Because of this background, I set th->base_block before
compiling iseq and restore it after compiling.
Basically, th->base_block is dirty hack (similar to global
variable) and this patch is also dirty.
* bootstraptest/test_eval.rb: add a test for above.
* internal.h: remove unused decl.
* iseq.c (rb_iseq_compile_with_option): add base_block parameter.
set th->base_block before compation and restore it after
compilation.
* ruby.c (require_libraries): pass 0 as base_block instead of
setting th->base_block
* tool/compile_prelude.rb (prelude_eval): apply above changes.
* vm.c, vm_eval.c: ditto.
* vm_core.h: add comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-22 05:32:56 -04:00
|
|
|
static void vm_set_eval_stack(rb_thread_t * th, VALUE iseqval, const NODE *cref, rb_block_t *base_block);
|
2009-01-18 19:13:44 -05:00
|
|
|
static int vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE ary);
|
2009-07-15 10:59:41 -04:00
|
|
|
|
2012-06-02 11:59:37 -04:00
|
|
|
/* vm_backtrace.c */
|
2013-03-06 01:30:03 -05:00
|
|
|
VALUE rb_vm_backtrace_str_ary(rb_thread_t *th, int lev, int n);
|
2012-05-24 02:09:23 -04:00
|
|
|
|
2009-07-15 10:59:41 -04:00
|
|
|
typedef enum call_type {
|
|
|
|
CALL_PUBLIC,
|
|
|
|
CALL_FCALL,
|
|
|
|
CALL_VCALL,
|
2009-10-30 04:01:48 -04:00
|
|
|
CALL_TYPE_MAX
|
2009-07-15 10:59:41 -04:00
|
|
|
} call_type;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2009-10-30 03:57:21 -04:00
|
|
|
static VALUE send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope);
|
|
|
|
|
2012-10-14 13:54:21 -04:00
|
|
|
static VALUE vm_call0_body(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv);
|
|
|
|
|
|
|
|
static VALUE
|
2013-09-07 02:44:31 -04:00
|
|
|
vm_call0(rb_thread_t* th, VALUE recv, ID id, int argc, const VALUE *argv,
|
2012-08-02 07:08:44 -04:00
|
|
|
const rb_method_entry_t *me, VALUE defined_class)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
* insns.def (send, invokesuper, invokeblock, opt_*), vm_core.h:
use only a `ci' (rb_call_info_t) parameter instead of using
parameters such as `op_id', 'op_argc', `blockiseq' and flag.
These information are stored in rb_call_info_t at the compile
time.
This technique simplifies parameter passings at related
function calls (~10% speedups for simple mehtod invocation at
my machine).
`rb_call_info_t' also has new function pointer variable `call'.
This `call' variable enables to customize method (block)
invocation process for each place. However, it always call
`vm_call_general()' at this changes.
`rb_call_info_t' also has temporary variables for method
(block) invocation.
* vm_core.h, compile.c, insns.def: introduce VM_CALL_ARGS_SKIP_SETUP
VM_CALL macro. This flag indicates that this call can skip
caller_setup (block arg and splat arg).
* compile.c: catch up above changes.
* iseq.c: catch up above changes (especially for TS_CALLINFO).
* tool/instruction.rb: catch up above chagnes.
* vm_insnhelper.c, vm_insnhelper.h: ditto. Macros and functions
parameters are changed.
* vm_eval.c (vm_call0): ditto (it will be rewriten soon).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-14 12:59:05 -04:00
|
|
|
rb_call_info_t ci_entry, *ci = &ci_entry;
|
|
|
|
|
|
|
|
ci->flag = 0;
|
|
|
|
ci->mid = id;
|
|
|
|
ci->recv = recv;
|
|
|
|
ci->defined_class = defined_class;
|
|
|
|
ci->argc = argc;
|
|
|
|
ci->me = me;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-10-14 13:54:21 -04:00
|
|
|
return vm_call0_body(th, ci, argv);
|
|
|
|
}
|
|
|
|
|
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
add a new otpimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
This optimization makes all cfunc method calls `frameless', which
is fster than ordinal cfunc method call.
If `frame' is needed (for example, it calls another method with
`rb_funcall()'), then build a frame. In other words, this
optimization delays frame building.
However, to delay the frame building, we need additional overheads:
(1) Store the last call information.
(2) Check the delayed frame buidling before the frame is needed.
(3) Overhead to build a delayed frame.
rb_thread_t::passed_ci is storage of delayed cfunc call information.
(1) is lightweight because it is only 1 assignment to `passed_ci'.
To achieve (2), we modify GET_THREAD() to check `passed_ci' every
time. It causes 10% overhead on my envrionment.
This optimization only works for cfunc methods which do not need
their `frame'.
After evaluation on my environment, this optimization does not
effective every time. Because of this evaluation results, this
optimization is disabled at default.
* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
of VM internals. I will extend this feature.
* vm_method.c, method.h: change parameters of the `invoker' function.
Receive `func' pointer as the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-23 00:22:31 -04:00
|
|
|
#if OPT_CALL_CFUNC_WITHOUT_FRAME
|
|
|
|
static VALUE
|
|
|
|
vm_call0_cfunc(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv)
|
|
|
|
{
|
|
|
|
VALUE val;
|
|
|
|
|
2012-11-30 21:13:06 -05:00
|
|
|
RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, ci->defined_class, ci->mid);
|
2012-11-20 04:48:24 -05:00
|
|
|
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, ci->recv, ci->mid, ci->defined_class, Qnil);
|
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
add a new otpimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
This optimization makes all cfunc method calls `frameless', which
is fster than ordinal cfunc method call.
If `frame' is needed (for example, it calls another method with
`rb_funcall()'), then build a frame. In other words, this
optimization delays frame building.
However, to delay the frame building, we need additional overheads:
(1) Store the last call information.
(2) Check the delayed frame buidling before the frame is needed.
(3) Overhead to build a delayed frame.
rb_thread_t::passed_ci is storage of delayed cfunc call information.
(1) is lightweight because it is only 1 assignment to `passed_ci'.
To achieve (2), we modify GET_THREAD() to check `passed_ci' every
time. It causes 10% overhead on my envrionment.
This optimization only works for cfunc methods which do not need
their `frame'.
After evaluation on my environment, this optimization does not
effective every time. Because of this evaluation results, this
optimization is disabled at default.
* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
of VM internals. I will extend this feature.
* vm_method.c, method.h: change parameters of the `invoker' function.
Receive `func' pointer as the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-23 00:22:31 -04:00
|
|
|
{
|
|
|
|
rb_control_frame_t *reg_cfp = th->cfp;
|
|
|
|
const rb_method_entry_t *me = ci->me;
|
|
|
|
const rb_method_cfunc_t *cfunc = &me->def->body.cfunc;
|
|
|
|
int len = cfunc->argc;
|
|
|
|
|
|
|
|
if (len >= 0) rb_check_arity(ci->argc, len, len);
|
|
|
|
|
|
|
|
th->passed_ci = ci;
|
|
|
|
ci->aux.inc_sp = 0;
|
|
|
|
VM_PROFILE_UP(2);
|
|
|
|
val = (*cfunc->invoker)(cfunc->func, ci, argv);
|
|
|
|
|
|
|
|
if (reg_cfp == th->cfp) {
|
|
|
|
if (UNLIKELY(th->passed_ci != ci)) {
|
|
|
|
rb_bug("vm_call0_cfunc: passed_ci error (ci: %p, passed_ci: %p)", ci, th->passed_ci);
|
|
|
|
}
|
|
|
|
th->passed_ci = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (reg_cfp != th->cfp + 1) {
|
|
|
|
rb_bug("vm_call0_cfunc: cfp consistency error");
|
|
|
|
}
|
|
|
|
VM_PROFILE_UP(3);
|
|
|
|
vm_pop_frame(th);
|
|
|
|
}
|
|
|
|
}
|
2012-11-20 04:48:24 -05:00
|
|
|
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, ci->recv, ci->mid, ci->defined_class, val);
|
2012-11-30 21:13:06 -05:00
|
|
|
RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, ci->defined_class, ci->mid);
|
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
add a new otpimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
This optimization makes all cfunc method calls `frameless', which
is fster than ordinal cfunc method call.
If `frame' is needed (for example, it calls another method with
`rb_funcall()'), then build a frame. In other words, this
optimization delays frame building.
However, to delay the frame building, we need additional overheads:
(1) Store the last call information.
(2) Check the delayed frame buidling before the frame is needed.
(3) Overhead to build a delayed frame.
rb_thread_t::passed_ci is storage of delayed cfunc call information.
(1) is lightweight because it is only 1 assignment to `passed_ci'.
To achieve (2), we modify GET_THREAD() to check `passed_ci' every
time. It causes 10% overhead on my envrionment.
This optimization only works for cfunc methods which do not need
their `frame'.
After evaluation on my environment, this optimization does not
effective every time. Because of this evaluation results, this
optimization is disabled at default.
* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
of VM internals. I will extend this feature.
* vm_method.c, method.h: change parameters of the `invoker' function.
Receive `func' pointer as the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-23 00:22:31 -04:00
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static VALUE
|
|
|
|
vm_call0_cfunc_with_frame(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv)
|
|
|
|
{
|
|
|
|
VALUE val;
|
2012-11-13 04:48:08 -05:00
|
|
|
const rb_method_entry_t *me = ci->me;
|
|
|
|
const rb_method_cfunc_t *cfunc = &me->def->body.cfunc;
|
|
|
|
int len = cfunc->argc;
|
|
|
|
VALUE recv = ci->recv;
|
|
|
|
VALUE defined_class = ci->defined_class;
|
|
|
|
int argc = ci->argc;
|
|
|
|
ID mid = ci->mid;
|
|
|
|
rb_block_t *blockptr = ci->blockptr;
|
|
|
|
|
2012-11-30 21:13:06 -05:00
|
|
|
RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, defined_class, mid);
|
2012-11-20 04:48:24 -05:00
|
|
|
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, mid, defined_class, Qnil);
|
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
add a new otpimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
This optimization makes all cfunc method calls `frameless', which
is fster than ordinal cfunc method call.
If `frame' is needed (for example, it calls another method with
`rb_funcall()'), then build a frame. In other words, this
optimization delays frame building.
However, to delay the frame building, we need additional overheads:
(1) Store the last call information.
(2) Check the delayed frame buidling before the frame is needed.
(3) Overhead to build a delayed frame.
rb_thread_t::passed_ci is storage of delayed cfunc call information.
(1) is lightweight because it is only 1 assignment to `passed_ci'.
To achieve (2), we modify GET_THREAD() to check `passed_ci' every
time. It causes 10% overhead on my envrionment.
This optimization only works for cfunc methods which do not need
their `frame'.
After evaluation on my environment, this optimization does not
effective every time. Because of this evaluation results, this
optimization is disabled at default.
* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
of VM internals. I will extend this feature.
* vm_method.c, method.h: change parameters of the `invoker' function.
Receive `func' pointer as the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-23 00:22:31 -04:00
|
|
|
{
|
|
|
|
rb_control_frame_t *reg_cfp = th->cfp;
|
|
|
|
|
2012-11-13 04:48:08 -05:00
|
|
|
vm_push_frame(th, 0, VM_FRAME_MAGIC_CFUNC, recv, defined_class,
|
2013-08-06 04:33:05 -04:00
|
|
|
VM_ENVVAL_BLOCK_PTR(blockptr), 0, reg_cfp->sp, 1, me, 0);
|
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
add a new otpimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
This optimization makes all cfunc method calls `frameless', which
is fster than ordinal cfunc method call.
If `frame' is needed (for example, it calls another method with
`rb_funcall()'), then build a frame. In other words, this
optimization delays frame building.
However, to delay the frame building, we need additional overheads:
(1) Store the last call information.
(2) Check the delayed frame buidling before the frame is needed.
(3) Overhead to build a delayed frame.
rb_thread_t::passed_ci is storage of delayed cfunc call information.
(1) is lightweight because it is only 1 assignment to `passed_ci'.
To achieve (2), we modify GET_THREAD() to check `passed_ci' every
time. It causes 10% overhead on my envrionment.
This optimization only works for cfunc methods which do not need
their `frame'.
After evaluation on my environment, this optimization does not
effective every time. Because of this evaluation results, this
optimization is disabled at default.
* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
of VM internals. I will extend this feature.
* vm_method.c, method.h: change parameters of the `invoker' function.
Receive `func' pointer as the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-23 00:22:31 -04:00
|
|
|
|
2012-11-13 04:48:08 -05:00
|
|
|
if (len >= 0) rb_check_arity(argc, len, len);
|
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
add a new otpimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
This optimization makes all cfunc method calls `frameless', which
is fster than ordinal cfunc method call.
If `frame' is needed (for example, it calls another method with
`rb_funcall()'), then build a frame. In other words, this
optimization delays frame building.
However, to delay the frame building, we need additional overheads:
(1) Store the last call information.
(2) Check the delayed frame buidling before the frame is needed.
(3) Overhead to build a delayed frame.
rb_thread_t::passed_ci is storage of delayed cfunc call information.
(1) is lightweight because it is only 1 assignment to `passed_ci'.
To achieve (2), we modify GET_THREAD() to check `passed_ci' every
time. It causes 10% overhead on my envrionment.
This optimization only works for cfunc methods which do not need
their `frame'.
After evaluation on my environment, this optimization does not
effective every time. Because of this evaluation results, this
optimization is disabled at default.
* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
of VM internals. I will extend this feature.
* vm_method.c, method.h: change parameters of the `invoker' function.
Receive `func' pointer as the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-23 00:22:31 -04:00
|
|
|
|
|
|
|
VM_PROFILE_UP(2);
|
2012-11-13 04:48:08 -05:00
|
|
|
val = (*cfunc->invoker)(cfunc->func, recv, argc, argv);
|
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
add a new otpimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
This optimization makes all cfunc method calls `frameless', which
is fster than ordinal cfunc method call.
If `frame' is needed (for example, it calls another method with
`rb_funcall()'), then build a frame. In other words, this
optimization delays frame building.
However, to delay the frame building, we need additional overheads:
(1) Store the last call information.
(2) Check the delayed frame buidling before the frame is needed.
(3) Overhead to build a delayed frame.
rb_thread_t::passed_ci is storage of delayed cfunc call information.
(1) is lightweight because it is only 1 assignment to `passed_ci'.
To achieve (2), we modify GET_THREAD() to check `passed_ci' every
time. It causes 10% overhead on my envrionment.
This optimization only works for cfunc methods which do not need
their `frame'.
After evaluation on my environment, this optimization does not
effective every time. Because of this evaluation results, this
optimization is disabled at default.
* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
of VM internals. I will extend this feature.
* vm_method.c, method.h: change parameters of the `invoker' function.
Receive `func' pointer as the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-23 00:22:31 -04:00
|
|
|
|
|
|
|
if (UNLIKELY(reg_cfp != th->cfp + 1)) {
|
|
|
|
rb_bug("vm_call0_cfunc_with_frame: cfp consistency error");
|
|
|
|
}
|
|
|
|
VM_PROFILE_UP(3);
|
|
|
|
vm_pop_frame(th);
|
|
|
|
}
|
2012-11-20 04:48:24 -05:00
|
|
|
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, mid, defined_class, val);
|
2012-11-30 21:13:06 -05:00
|
|
|
RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, defined_class, mid);
|
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
add a new otpimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
This optimization makes all cfunc method calls `frameless', which
is fster than ordinal cfunc method call.
If `frame' is needed (for example, it calls another method with
`rb_funcall()'), then build a frame. In other words, this
optimization delays frame building.
However, to delay the frame building, we need additional overheads:
(1) Store the last call information.
(2) Check the delayed frame buidling before the frame is needed.
(3) Overhead to build a delayed frame.
rb_thread_t::passed_ci is storage of delayed cfunc call information.
(1) is lightweight because it is only 1 assignment to `passed_ci'.
To achieve (2), we modify GET_THREAD() to check `passed_ci' every
time. It causes 10% overhead on my envrionment.
This optimization only works for cfunc methods which do not need
their `frame'.
After evaluation on my environment, this optimization does not
effective every time. Because of this evaluation results, this
optimization is disabled at default.
* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
of VM internals. I will extend this feature.
* vm_method.c, method.h: change parameters of the `invoker' function.
Receive `func' pointer as the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-23 00:22:31 -04:00
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
vm_call0_cfunc(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv)
|
|
|
|
{
|
|
|
|
return vm_call0_cfunc_with_frame(th, ci, argv);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-10-15 08:29:42 -04:00
|
|
|
/* `ci' should point temporal value (on stack value) */
|
2012-10-14 13:54:21 -04:00
|
|
|
static VALUE
|
|
|
|
vm_call0_body(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv)
|
|
|
|
{
|
2013-02-18 18:53:41 -05:00
|
|
|
VALUE ret;
|
|
|
|
|
2012-10-14 13:54:21 -04:00
|
|
|
if (!ci->me->def) return Qnil;
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
if (th->passed_block) {
|
* insns.def (send, invokesuper, invokeblock, opt_*), vm_core.h:
use only a `ci' (rb_call_info_t) parameter instead of using
parameters such as `op_id', 'op_argc', `blockiseq' and flag.
These information are stored in rb_call_info_t at the compile
time.
This technique simplifies parameter passings at related
function calls (~10% speedups for simple mehtod invocation at
my machine).
`rb_call_info_t' also has new function pointer variable `call'.
This `call' variable enables to customize method (block)
invocation process for each place. However, it always call
`vm_call_general()' at this changes.
`rb_call_info_t' also has temporary variables for method
(block) invocation.
* vm_core.h, compile.c, insns.def: introduce VM_CALL_ARGS_SKIP_SETUP
VM_CALL macro. This flag indicates that this call can skip
caller_setup (block arg and splat arg).
* compile.c: catch up above changes.
* iseq.c: catch up above changes (especially for TS_CALLINFO).
* tool/instruction.rb: catch up above chagnes.
* vm_insnhelper.c, vm_insnhelper.h: ditto. Macros and functions
parameters are changed.
* vm_eval.c (vm_call0): ditto (it will be rewriten soon).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-14 12:59:05 -04:00
|
|
|
ci->blockptr = (rb_block_t *)th->passed_block;
|
2008-05-24 21:12:12 -04:00
|
|
|
th->passed_block = 0;
|
|
|
|
}
|
* insns.def (send, invokesuper, invokeblock, opt_*), vm_core.h:
use only a `ci' (rb_call_info_t) parameter instead of using
parameters such as `op_id', 'op_argc', `blockiseq' and flag.
These information are stored in rb_call_info_t at the compile
time.
This technique simplifies parameter passings at related
function calls (~10% speedups for simple mehtod invocation at
my machine).
`rb_call_info_t' also has new function pointer variable `call'.
This `call' variable enables to customize method (block)
invocation process for each place. However, it always call
`vm_call_general()' at this changes.
`rb_call_info_t' also has temporary variables for method
(block) invocation.
* vm_core.h, compile.c, insns.def: introduce VM_CALL_ARGS_SKIP_SETUP
VM_CALL macro. This flag indicates that this call can skip
caller_setup (block arg and splat arg).
* compile.c: catch up above changes.
* iseq.c: catch up above changes (especially for TS_CALLINFO).
* tool/instruction.rb: catch up above chagnes.
* vm_insnhelper.c, vm_insnhelper.h: ditto. Macros and functions
parameters are changed.
* vm_eval.c (vm_call0): ditto (it will be rewriten soon).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-14 12:59:05 -04:00
|
|
|
else {
|
|
|
|
ci->blockptr = 0;
|
|
|
|
}
|
2009-07-15 10:59:41 -04:00
|
|
|
|
2008-12-15 00:39:39 -05:00
|
|
|
again:
|
2012-10-14 13:54:21 -04:00
|
|
|
switch (ci->me->def->type) {
|
2012-10-23 16:34:25 -04:00
|
|
|
case VM_METHOD_TYPE_ISEQ:
|
|
|
|
{
|
|
|
|
rb_control_frame_t *reg_cfp = th->cfp;
|
|
|
|
int i;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-12-25 04:57:07 -05:00
|
|
|
CHECK_VM_STACK_OVERFLOW(reg_cfp, ci->argc + 1);
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-10-23 16:34:25 -04:00
|
|
|
*reg_cfp->sp++ = ci->recv;
|
|
|
|
for (i = 0; i < ci->argc; i++) {
|
|
|
|
*reg_cfp->sp++ = argv[i];
|
|
|
|
}
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-10-23 16:34:25 -04:00
|
|
|
vm_call_iseq_setup(th, reg_cfp, ci);
|
|
|
|
th->cfp->flag |= VM_FRAME_FLAG_FINISH;
|
2013-02-18 18:53:41 -05:00
|
|
|
return vm_exec(th); /* CHECK_INTS in this function */
|
2012-10-23 16:34:25 -04:00
|
|
|
}
|
2010-08-07 00:33:33 -04:00
|
|
|
case VM_METHOD_TYPE_NOTIMPLEMENTED:
|
* vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
add a new otpimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
This optimization makes all cfunc method calls `frameless', which
is fster than ordinal cfunc method call.
If `frame' is needed (for example, it calls another method with
`rb_funcall()'), then build a frame. In other words, this
optimization delays frame building.
However, to delay the frame building, we need additional overheads:
(1) Store the last call information.
(2) Check the delayed frame buidling before the frame is needed.
(3) Overhead to build a delayed frame.
rb_thread_t::passed_ci is storage of delayed cfunc call information.
(1) is lightweight because it is only 1 assignment to `passed_ci'.
To achieve (2), we modify GET_THREAD() to check `passed_ci' every
time. It causes 10% overhead on my envrionment.
This optimization only works for cfunc methods which do not need
their `frame'.
After evaluation on my environment, this optimization does not
effective every time. Because of this evaluation results, this
optimization is disabled at default.
* vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
of VM internals. I will extend this feature.
* vm_method.c, method.h: change parameters of the `invoker' function.
Receive `func' pointer as the first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-23 00:22:31 -04:00
|
|
|
case VM_METHOD_TYPE_CFUNC:
|
2013-02-18 18:53:41 -05:00
|
|
|
ret = vm_call0_cfunc(th, ci, argv);
|
|
|
|
goto success;
|
2012-10-23 16:34:25 -04:00
|
|
|
case VM_METHOD_TYPE_ATTRSET:
|
2012-10-14 13:54:21 -04:00
|
|
|
rb_check_arity(ci->argc, 1, 1);
|
2013-02-18 18:53:41 -05:00
|
|
|
ret = rb_ivar_set(ci->recv, ci->me->def->body.attr.id, argv[0]);
|
|
|
|
goto success;
|
2012-10-23 16:34:25 -04:00
|
|
|
case VM_METHOD_TYPE_IVAR:
|
2012-10-14 13:54:21 -04:00
|
|
|
rb_check_arity(ci->argc, 0, 0);
|
2013-02-18 18:53:41 -05:00
|
|
|
ret = rb_attr_get(ci->recv, ci->me->def->body.attr.id);
|
|
|
|
goto success;
|
2012-10-23 16:34:25 -04:00
|
|
|
case VM_METHOD_TYPE_BMETHOD:
|
2013-02-18 18:53:41 -05:00
|
|
|
ret = vm_call_bmethod_body(th, ci, argv);
|
|
|
|
goto success;
|
2012-10-14 13:54:21 -04:00
|
|
|
case VM_METHOD_TYPE_ZSUPER:
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
case VM_METHOD_TYPE_REFINED:
|
2012-10-14 13:54:21 -04:00
|
|
|
{
|
2014-01-30 05:32:32 -05:00
|
|
|
const rb_method_type_t type = ci->me->def->type;
|
|
|
|
if (type == VM_METHOD_TYPE_REFINED &&
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
ci->me->def->body.orig_me) {
|
|
|
|
ci->me = ci->me->def->body.orig_me;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
|
2012-10-14 13:54:21 -04:00
|
|
|
ci->defined_class = RCLASS_SUPER(ci->defined_class);
|
|
|
|
|
|
|
|
if (!ci->defined_class || !(ci->me = rb_method_entry(ci->defined_class, ci->mid, &ci->defined_class))) {
|
2014-01-30 12:51:17 -05:00
|
|
|
int ex = type == VM_METHOD_TYPE_ZSUPER ? NOEX_SUPER : 0;
|
2014-01-30 05:10:32 -05:00
|
|
|
ret = method_missing(ci->recv, ci->mid, ci->argc, argv, ex);
|
2013-02-18 18:53:41 -05:00
|
|
|
goto success;
|
2012-10-14 13:54:21 -04:00
|
|
|
}
|
|
|
|
RUBY_VM_CHECK_INTS(th);
|
|
|
|
if (!ci->me->def) return Qnil;
|
|
|
|
goto again;
|
2009-07-15 20:38:07 -04:00
|
|
|
}
|
2012-10-23 16:34:25 -04:00
|
|
|
case VM_METHOD_TYPE_MISSING:
|
|
|
|
{
|
|
|
|
VALUE new_args = rb_ary_new4(ci->argc, argv);
|
|
|
|
|
|
|
|
rb_ary_unshift(new_args, ID2SYM(ci->mid));
|
|
|
|
th->passed_block = ci->blockptr;
|
2014-03-07 05:30:51 -05:00
|
|
|
ret = rb_funcall2(ci->recv, idMethodMissing, ci->argc+1,
|
|
|
|
RARRAY_CONST_PTR(new_args));
|
2014-03-07 05:21:28 -05:00
|
|
|
RB_GC_GUARD(new_args);
|
|
|
|
return ret;
|
2012-10-23 16:34:25 -04:00
|
|
|
}
|
|
|
|
case VM_METHOD_TYPE_OPTIMIZED:
|
2012-10-14 13:54:21 -04:00
|
|
|
switch (ci->me->def->body.optimize_type) {
|
2009-07-15 20:38:07 -04:00
|
|
|
case OPTIMIZED_METHOD_TYPE_SEND:
|
2013-02-18 18:53:41 -05:00
|
|
|
ret = send_internal(ci->argc, argv, ci->recv, CALL_FCALL);
|
|
|
|
goto success;
|
2012-10-23 16:34:25 -04:00
|
|
|
case OPTIMIZED_METHOD_TYPE_CALL:
|
|
|
|
{
|
|
|
|
rb_proc_t *proc;
|
|
|
|
GetProcPtr(ci->recv, proc);
|
2013-02-18 18:53:41 -05:00
|
|
|
ret = rb_vm_invoke_proc(th, proc, ci->argc, argv, ci->blockptr);
|
|
|
|
goto success;
|
2012-10-23 16:34:25 -04:00
|
|
|
}
|
2009-07-15 20:38:07 -04:00
|
|
|
default:
|
2012-10-14 13:54:21 -04:00
|
|
|
rb_bug("vm_call0: unsupported optimized method type (%d)", ci->me->def->body.optimize_type);
|
2009-07-15 20:38:07 -04:00
|
|
|
}
|
|
|
|
break;
|
2012-10-23 16:34:25 -04:00
|
|
|
case VM_METHOD_TYPE_UNDEF:
|
|
|
|
break;
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
2012-10-23 16:34:25 -04:00
|
|
|
rb_bug("vm_call0: unsupported method type (%d)", ci->me->def->type);
|
|
|
|
return Qundef;
|
2013-02-18 18:53:41 -05:00
|
|
|
|
|
|
|
success:
|
|
|
|
RUBY_VM_CHECK_INTS(th);
|
|
|
|
return ret;
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2009-07-15 10:59:41 -04:00
|
|
|
rb_vm_call(rb_thread_t *th, VALUE recv, VALUE id, int argc, const VALUE *argv,
|
2012-08-02 07:08:44 -04:00
|
|
|
const rb_method_entry_t *me, VALUE defined_class)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
2012-08-02 07:08:44 -04:00
|
|
|
return vm_call0(th, recv, id, argc, argv, me, defined_class);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline VALUE
|
2009-07-15 10:59:41 -04:00
|
|
|
vm_call_super(rb_thread_t *th, int argc, const VALUE *argv)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
|
|
|
VALUE recv = th->cfp->self;
|
|
|
|
VALUE klass;
|
|
|
|
ID id;
|
2009-07-15 10:59:41 -04:00
|
|
|
rb_method_entry_t *me;
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_control_frame_t *cfp = th->cfp;
|
|
|
|
|
2012-08-06 08:18:10 -04:00
|
|
|
if (cfp->iseq || NIL_P(cfp->klass)) {
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_bug("vm_call_super: should not be reached");
|
|
|
|
}
|
|
|
|
|
2012-08-06 08:18:10 -04:00
|
|
|
klass = RCLASS_SUPER(cfp->klass);
|
|
|
|
id = cfp->me->def->original_id;
|
2012-08-02 07:08:44 -04:00
|
|
|
me = rb_method_entry(klass, id, &klass);
|
2009-07-15 10:59:41 -04:00
|
|
|
if (!me) {
|
2009-10-30 03:57:21 -04:00
|
|
|
return method_missing(recv, id, argc, argv, NOEX_SUPER);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2012-08-02 07:08:44 -04:00
|
|
|
return vm_call0(th, recv, id, argc, argv, me, klass);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_call_super(int argc, const VALUE *argv)
|
|
|
|
{
|
|
|
|
PASS_PASSED_BLOCK();
|
|
|
|
return vm_call_super(GET_THREAD(), argc, argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
stack_check(void)
|
|
|
|
{
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
|
|
|
|
if (!rb_thread_raised_p(th, RAISED_STACKOVERFLOW) && ruby_stack_check()) {
|
|
|
|
rb_thread_raised_set(th, RAISED_STACKOVERFLOW);
|
|
|
|
rb_exc_raise(sysstack_error);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-02 07:08:44 -04:00
|
|
|
static inline rb_method_entry_t *
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
rb_search_method_entry(VALUE recv, ID mid, VALUE *defined_class_ptr);
|
2011-08-04 23:18:25 -04:00
|
|
|
static inline int rb_method_call_status(rb_thread_t *th, const rb_method_entry_t *me, call_type scope, VALUE self);
|
2009-10-30 03:42:04 -04:00
|
|
|
#define NOEX_OK NOEX_NOSUPER
|
|
|
|
|
2009-08-29 09:39:44 -04:00
|
|
|
/*!
|
|
|
|
* \internal
|
|
|
|
* calls the specified method.
|
|
|
|
*
|
|
|
|
* This function is called by functions in rb_call* family.
|
|
|
|
* \param recv receiver of the method
|
|
|
|
* \param mid an ID that represents the name of the method
|
|
|
|
* \param argc the number of method arguments
|
|
|
|
* \param argv a pointer to an array of method arguments
|
2010-05-29 14:51:39 -04:00
|
|
|
* \param scope
|
2012-12-05 11:10:41 -05:00
|
|
|
* \param self self in the caller. Qundef means no self is considered and
|
|
|
|
* protected methods cannot be called
|
2009-08-29 09:39:44 -04:00
|
|
|
*
|
|
|
|
* \note \a self is used in order to controlling access to protected methods.
|
|
|
|
*/
|
2008-05-24 21:12:12 -04:00
|
|
|
static inline VALUE
|
2009-07-15 10:59:41 -04:00
|
|
|
rb_call0(VALUE recv, ID mid, int argc, const VALUE *argv,
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
call_type scope, VALUE self)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
2012-08-02 07:08:44 -04:00
|
|
|
VALUE defined_class;
|
2012-11-02 01:48:29 -04:00
|
|
|
rb_method_entry_t *me =
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
rb_search_method_entry(recv, mid, &defined_class);
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2009-10-30 03:42:04 -04:00
|
|
|
int call_status = rb_method_call_status(th, me, scope, self);
|
|
|
|
|
|
|
|
if (call_status != NOEX_OK) {
|
|
|
|
return method_missing(recv, mid, argc, argv, call_status);
|
|
|
|
}
|
|
|
|
stack_check();
|
2012-08-02 07:08:44 -04:00
|
|
|
return vm_call0(th, recv, mid, argc, argv, me, defined_class);
|
2009-10-30 03:42:04 -04:00
|
|
|
}
|
|
|
|
|
2009-10-31 11:32:22 -04:00
|
|
|
struct rescue_funcall_args {
|
|
|
|
VALUE recv;
|
|
|
|
VALUE sym;
|
|
|
|
int argc;
|
2013-08-27 03:08:32 -04:00
|
|
|
const VALUE *argv;
|
2009-10-31 11:32:22 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
check_funcall_exec(struct rescue_funcall_args *args)
|
|
|
|
{
|
|
|
|
VALUE new_args = rb_ary_new4(args->argc, args->argv);
|
2014-03-07 05:21:28 -05:00
|
|
|
VALUE ret;
|
2009-10-31 11:32:22 -04:00
|
|
|
|
|
|
|
rb_ary_unshift(new_args, args->sym);
|
2014-03-07 05:21:28 -05:00
|
|
|
ret = rb_funcall2(args->recv, idMethodMissing,
|
2014-03-07 05:30:51 -05:00
|
|
|
args->argc+1, RARRAY_CONST_PTR(new_args));
|
2014-03-07 05:21:28 -05:00
|
|
|
RB_GC_GUARD(new_args);
|
|
|
|
return ret;
|
2009-10-31 11:32:22 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
check_funcall_failed(struct rescue_funcall_args *args, VALUE e)
|
|
|
|
{
|
2009-11-29 02:56:25 -05:00
|
|
|
if (rb_respond_to(args->recv, SYM2ID(args->sym))) {
|
2009-10-31 11:32:22 -04:00
|
|
|
rb_exc_raise(e);
|
2009-11-27 19:26:27 -05:00
|
|
|
}
|
2009-10-31 11:32:22 -04:00
|
|
|
return Qundef;
|
|
|
|
}
|
|
|
|
|
2012-12-23 01:05:50 -05:00
|
|
|
static int
|
|
|
|
check_funcall_respond_to(rb_thread_t *th, VALUE klass, VALUE recv, ID mid)
|
2009-10-30 03:42:04 -04:00
|
|
|
{
|
2012-08-02 07:08:44 -04:00
|
|
|
VALUE defined_class;
|
2012-12-23 01:05:50 -05:00
|
|
|
const rb_method_entry_t *me = rb_method_entry(klass, idRespond_to, &defined_class);
|
2011-08-04 23:18:25 -04:00
|
|
|
|
|
|
|
if (me && !(me->flag & NOEX_BASIC)) {
|
2013-03-23 04:39:55 -04:00
|
|
|
const rb_block_t *passed_block = th->passed_block;
|
|
|
|
VALUE args[2], result;
|
2012-02-11 14:15:36 -05:00
|
|
|
int arity = rb_method_entry_arity(me);
|
|
|
|
|
2012-03-14 18:12:53 -04:00
|
|
|
if (arity > 2)
|
|
|
|
rb_raise(rb_eArgError, "respond_to? must accept 1 or 2 arguments (requires %d)", arity);
|
|
|
|
|
|
|
|
if (arity < 1) arity = 2;
|
2011-10-20 08:30:13 -04:00
|
|
|
|
2012-02-10 20:22:05 -05:00
|
|
|
args[0] = ID2SYM(mid);
|
|
|
|
args[1] = Qtrue;
|
2013-03-23 04:39:55 -04:00
|
|
|
result = vm_call0(th, recv, idRespond_to, arity, args, me, defined_class);
|
|
|
|
th->passed_block = passed_block;
|
|
|
|
if (!RTEST(result)) {
|
2012-12-23 01:05:50 -05:00
|
|
|
return FALSE;
|
2011-08-04 23:18:25 -04:00
|
|
|
}
|
|
|
|
}
|
2012-12-23 01:05:50 -05:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_funcall_callable(rb_thread_t *th, const rb_method_entry_t *me)
|
|
|
|
{
|
|
|
|
return rb_method_call_status(th, me, CALL_FCALL, th->cfp->self) == NOEX_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2013-08-27 03:08:32 -04:00
|
|
|
check_funcall_missing(rb_thread_t *th, VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv)
|
2012-12-23 01:05:50 -05:00
|
|
|
{
|
|
|
|
if (rb_method_basic_definition_p(klass, idMethodMissing)) {
|
|
|
|
return Qundef;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
struct rescue_funcall_args args;
|
|
|
|
|
|
|
|
th->method_missing_reason = 0;
|
|
|
|
args.recv = recv;
|
|
|
|
args.sym = ID2SYM(mid);
|
|
|
|
args.argc = argc;
|
|
|
|
args.argv = argv;
|
|
|
|
return rb_rescue2(check_funcall_exec, (VALUE)&args,
|
|
|
|
check_funcall_failed, (VALUE)&args,
|
|
|
|
rb_eNoMethodError, (VALUE)0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2013-08-27 03:08:32 -04:00
|
|
|
rb_check_funcall(VALUE recv, ID mid, int argc, const VALUE *argv)
|
2012-12-23 01:05:50 -05:00
|
|
|
{
|
|
|
|
VALUE klass = CLASS_OF(recv);
|
|
|
|
const rb_method_entry_t *me;
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
VALUE defined_class;
|
|
|
|
|
|
|
|
if (!check_funcall_respond_to(th, klass, recv, mid))
|
|
|
|
return Qundef;
|
2009-10-30 03:42:04 -04:00
|
|
|
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
me = rb_search_method_entry(recv, mid, &defined_class);
|
2012-12-23 01:05:50 -05:00
|
|
|
if (check_funcall_callable(th, me) != NOEX_OK) {
|
|
|
|
return check_funcall_missing(th, klass, recv, mid, argc, argv);
|
2009-10-30 03:42:04 -04:00
|
|
|
}
|
|
|
|
stack_check();
|
2012-08-02 07:08:44 -04:00
|
|
|
return vm_call0(th, recv, mid, argc, argv, me, defined_class);
|
2009-10-30 03:42:04 -04:00
|
|
|
}
|
|
|
|
|
2009-10-31 11:32:22 -04:00
|
|
|
VALUE
|
2013-08-27 03:08:32 -04:00
|
|
|
rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv,
|
2012-12-23 01:05:50 -05:00
|
|
|
rb_check_funcall_hook *hook, VALUE arg)
|
2009-10-31 11:32:22 -04:00
|
|
|
{
|
2012-12-23 01:05:50 -05:00
|
|
|
VALUE klass = CLASS_OF(recv);
|
|
|
|
const rb_method_entry_t *me;
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
VALUE defined_class;
|
|
|
|
|
|
|
|
if (!check_funcall_respond_to(th, klass, recv, mid))
|
|
|
|
return Qundef;
|
|
|
|
|
|
|
|
me = rb_search_method_entry(recv, mid, &defined_class);
|
|
|
|
if (check_funcall_callable(th, me) != NOEX_OK) {
|
|
|
|
(*hook)(FALSE, recv, mid, argc, argv, arg);
|
|
|
|
return check_funcall_missing(th, klass, recv, mid, argc, argv);
|
|
|
|
}
|
|
|
|
stack_check();
|
|
|
|
(*hook)(TRUE, recv, mid, argc, argv, arg);
|
|
|
|
return vm_call0(th, recv, mid, argc, argv, me, defined_class);
|
2009-10-30 03:42:04 -04:00
|
|
|
}
|
|
|
|
|
2009-11-18 12:52:12 -05:00
|
|
|
static const char *
|
|
|
|
rb_type_str(enum ruby_value_type type)
|
|
|
|
{
|
|
|
|
#define type_case(t) case t: return #t;
|
|
|
|
switch (type) {
|
|
|
|
type_case(T_NONE)
|
|
|
|
type_case(T_OBJECT)
|
|
|
|
type_case(T_CLASS)
|
|
|
|
type_case(T_MODULE)
|
|
|
|
type_case(T_FLOAT)
|
|
|
|
type_case(T_STRING)
|
|
|
|
type_case(T_REGEXP)
|
|
|
|
type_case(T_ARRAY)
|
|
|
|
type_case(T_HASH)
|
|
|
|
type_case(T_STRUCT)
|
|
|
|
type_case(T_BIGNUM)
|
|
|
|
type_case(T_FILE)
|
|
|
|
type_case(T_DATA)
|
|
|
|
type_case(T_MATCH)
|
|
|
|
type_case(T_COMPLEX)
|
|
|
|
type_case(T_RATIONAL)
|
|
|
|
type_case(T_NIL)
|
|
|
|
type_case(T_TRUE)
|
|
|
|
type_case(T_FALSE)
|
|
|
|
type_case(T_SYMBOL)
|
|
|
|
type_case(T_FIXNUM)
|
|
|
|
type_case(T_UNDEF)
|
|
|
|
type_case(T_NODE)
|
|
|
|
type_case(T_ICLASS)
|
|
|
|
type_case(T_ZOMBIE)
|
|
|
|
default: return NULL;
|
|
|
|
}
|
|
|
|
#undef type_case
|
|
|
|
}
|
|
|
|
|
2009-10-30 03:42:04 -04:00
|
|
|
static inline rb_method_entry_t *
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
rb_search_method_entry(VALUE recv, ID mid, VALUE *defined_class_ptr)
|
2009-10-30 03:42:04 -04:00
|
|
|
{
|
|
|
|
VALUE klass = CLASS_OF(recv);
|
2008-05-24 21:12:12 -04:00
|
|
|
|
|
|
|
if (!klass) {
|
2014-01-30 03:43:04 -05:00
|
|
|
VALUE flags;
|
|
|
|
if (SPECIAL_CONST_P(recv)) {
|
2009-11-21 04:49:30 -05:00
|
|
|
rb_raise(rb_eNotImpError,
|
2014-01-30 03:25:46 -05:00
|
|
|
"method `%"PRIsVALUE"' called on unexpected immediate object (%p)",
|
|
|
|
rb_id2str(mid), (void *)recv);
|
2009-11-21 04:49:30 -05:00
|
|
|
}
|
2009-11-25 06:47:19 -05:00
|
|
|
flags = RBASIC(recv)->flags;
|
|
|
|
if (flags == 0) {
|
2009-11-21 04:49:30 -05:00
|
|
|
rb_raise(rb_eNotImpError,
|
2014-01-30 03:25:46 -05:00
|
|
|
"method `%"PRIsVALUE"' called on terminated object"
|
2014-01-30 03:43:04 -05:00
|
|
|
" (%p flags=0x%"PRIxVALUE")",
|
|
|
|
rb_id2str(mid), (void *)recv, flags);
|
2009-11-21 04:49:30 -05:00
|
|
|
}
|
|
|
|
else {
|
2009-11-18 12:52:12 -05:00
|
|
|
int type = BUILTIN_TYPE(recv);
|
|
|
|
const char *typestr = rb_type_str(type);
|
2009-11-25 06:47:19 -05:00
|
|
|
if (typestr && T_OBJECT <= type && type < T_NIL)
|
2009-11-18 12:52:12 -05:00
|
|
|
rb_raise(rb_eNotImpError,
|
2014-01-30 03:25:46 -05:00
|
|
|
"method `%"PRIsVALUE"' called on hidden %s object"
|
2014-01-30 03:43:04 -05:00
|
|
|
" (%p flags=0x%"PRIxVALUE")",
|
|
|
|
rb_id2str(mid), typestr, (void *)recv, flags);
|
2009-11-25 06:47:19 -05:00
|
|
|
if (typestr)
|
|
|
|
rb_raise(rb_eNotImpError,
|
2014-01-30 03:25:46 -05:00
|
|
|
"method `%"PRIsVALUE"' called on unexpected %s object"
|
2014-01-30 03:43:04 -05:00
|
|
|
" (%p flags=0x%"PRIxVALUE")",
|
|
|
|
rb_id2str(mid), typestr, (void *)recv, flags);
|
2009-11-18 12:52:12 -05:00
|
|
|
else
|
|
|
|
rb_raise(rb_eNotImpError,
|
2014-01-30 03:25:46 -05:00
|
|
|
"method `%"PRIsVALUE"' called on broken T_???" "(0x%02x) object"
|
2014-01-30 03:43:04 -05:00
|
|
|
" (%p flags=0x%"PRIxVALUE")",
|
|
|
|
rb_id2str(mid), type, (void *)recv, flags);
|
2009-11-18 12:52:12 -05:00
|
|
|
}
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
return rb_method_entry(klass, mid, defined_class_ptr);
|
2009-10-30 03:42:04 -04:00
|
|
|
}
|
2009-07-15 10:59:41 -04:00
|
|
|
|
2009-10-30 03:42:04 -04:00
|
|
|
static inline int
|
2011-08-04 23:18:25 -04:00
|
|
|
rb_method_call_status(rb_thread_t *th, const rb_method_entry_t *me, call_type scope, VALUE self)
|
2009-10-30 03:42:04 -04:00
|
|
|
{
|
|
|
|
VALUE klass;
|
|
|
|
ID oid;
|
|
|
|
int noex;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2009-10-30 03:42:04 -04:00
|
|
|
if (UNDEFINED_METHOD_ENTRY_P(me)) {
|
|
|
|
return scope == CALL_VCALL ? NOEX_VCALL : 0;
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
2009-10-30 03:42:04 -04:00
|
|
|
klass = me->klass;
|
2009-08-27 22:45:41 -04:00
|
|
|
oid = me->def->original_id;
|
2009-07-15 10:59:41 -04:00
|
|
|
noex = me->flag;
|
|
|
|
|
|
|
|
if (oid != idMethodMissing) {
|
2008-05-24 21:12:12 -04:00
|
|
|
/* receiver specified form for private method */
|
|
|
|
if (UNLIKELY(noex)) {
|
2009-07-15 10:59:41 -04:00
|
|
|
if (((noex & NOEX_MASK) & NOEX_PRIVATE) && scope == CALL_PUBLIC) {
|
2009-10-30 03:42:04 -04:00
|
|
|
return NOEX_PRIVATE;
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* self must be kind of a specified form for protected method */
|
2009-07-15 10:59:41 -04:00
|
|
|
if (((noex & NOEX_MASK) & NOEX_PROTECTED) && scope == CALL_PUBLIC) {
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE defined_class = klass;
|
2009-02-22 09:23:33 -05:00
|
|
|
|
2011-09-29 07:07:45 -04:00
|
|
|
if (RB_TYPE_P(defined_class, T_ICLASS)) {
|
2008-05-24 21:12:12 -04:00
|
|
|
defined_class = RBASIC(defined_class)->klass;
|
|
|
|
}
|
|
|
|
|
2012-12-05 11:10:41 -05:00
|
|
|
if (self == Qundef || !rb_obj_is_kind_of(self, defined_class)) {
|
2009-10-30 03:42:04 -04:00
|
|
|
return NOEX_PROTECTED;
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (NOEX_SAFE(noex) > th->safe_level) {
|
2009-10-30 03:42:04 -04:00
|
|
|
rb_raise(rb_eSecurityError, "calling insecure method: %s",
|
|
|
|
rb_id2name(me->called_id));
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-10-30 03:42:04 -04:00
|
|
|
return NOEX_OK;
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2009-08-29 09:39:44 -04:00
|
|
|
|
|
|
|
/*!
|
|
|
|
* \internal
|
|
|
|
* calls the specified method.
|
|
|
|
*
|
|
|
|
* This function is called by functions in rb_call* family.
|
|
|
|
* \param recv receiver
|
|
|
|
* \param mid an ID that represents the name of the method
|
|
|
|
* \param argc the number of method arguments
|
|
|
|
* \param argv a pointer to an array of method arguments
|
2010-05-29 14:51:39 -04:00
|
|
|
* \param scope
|
2009-08-29 09:39:44 -04:00
|
|
|
*/
|
2008-05-24 21:12:12 -04:00
|
|
|
static inline VALUE
|
2009-07-15 10:59:41 -04:00
|
|
|
rb_call(VALUE recv, ID mid, int argc, const VALUE *argv, call_type scope)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
2012-12-05 11:10:41 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
return rb_call0(recv, mid, argc, argv, scope, th->cfp->self);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2009-02-21 20:43:59 -05:00
|
|
|
NORETURN(static void raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
|
|
|
|
VALUE obj, int call_status));
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* obj.method_missing(symbol [, *args] ) -> result
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* Invoked by Ruby when <i>obj</i> is sent a message it cannot handle.
|
|
|
|
* <i>symbol</i> is the symbol for the method called, and <i>args</i>
|
|
|
|
* are any arguments that were passed to it. By default, the interpreter
|
|
|
|
* raises an error when this method is called. However, it is possible
|
|
|
|
* to override the method to provide more dynamic behavior.
|
|
|
|
* If it is decided that a particular method should not be handled, then
|
|
|
|
* <i>super</i> should be called, so that ancestors can pick up the
|
|
|
|
* missing method.
|
|
|
|
* The example below creates
|
|
|
|
* a class <code>Roman</code>, which responds to methods with names
|
|
|
|
* consisting of roman numerals, returning the corresponding integer
|
|
|
|
* values.
|
|
|
|
*
|
|
|
|
* class Roman
|
2011-03-07 03:44:45 -05:00
|
|
|
* def roman_to_int(str)
|
2008-05-24 21:12:12 -04:00
|
|
|
* # ...
|
|
|
|
* end
|
|
|
|
* def method_missing(methId)
|
|
|
|
* str = methId.id2name
|
2011-03-07 03:44:45 -05:00
|
|
|
* roman_to_int(str)
|
2008-05-24 21:12:12 -04:00
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* r = Roman.new
|
|
|
|
* r.iv #=> 4
|
|
|
|
* r.xxiii #=> 23
|
|
|
|
* r.mm #=> 2000
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_method_missing(int argc, const VALUE *argv, VALUE obj)
|
2009-02-21 20:43:59 -05:00
|
|
|
{
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
raise_method_missing(th, argc, argv, obj, th->method_missing_reason);
|
2012-04-13 20:36:26 -04:00
|
|
|
UNREACHABLE;
|
2009-02-21 20:43:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#define NOEX_MISSING 0x80
|
|
|
|
|
2011-10-06 03:29:33 -04:00
|
|
|
static VALUE
|
2011-10-06 07:51:55 -04:00
|
|
|
make_no_method_exception(VALUE exc, const char *format, VALUE obj, int argc, const VALUE *argv)
|
2011-10-06 03:29:33 -04:00
|
|
|
{
|
|
|
|
int n = 0;
|
|
|
|
VALUE mesg;
|
|
|
|
VALUE args[3];
|
|
|
|
|
|
|
|
if (!format) {
|
|
|
|
format = "undefined method `%s' for %s";
|
|
|
|
}
|
|
|
|
mesg = rb_const_get(exc, rb_intern("message"));
|
|
|
|
if (rb_method_basic_definition_p(CLASS_OF(mesg), '!')) {
|
|
|
|
args[n++] = rb_name_err_mesg_new(mesg, rb_str_new2(format), obj, argv[0]);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
args[n++] = rb_funcall(mesg, '!', 3, rb_str_new2(format), obj, argv[0]);
|
|
|
|
}
|
|
|
|
args[n++] = argv[0];
|
|
|
|
if (exc == rb_eNoMethodError) {
|
|
|
|
args[n++] = rb_ary_new4(argc - 1, argv + 1);
|
|
|
|
}
|
|
|
|
return rb_class_new_instance(n, args, exc);
|
|
|
|
}
|
|
|
|
|
2009-02-21 20:43:59 -05:00
|
|
|
static void
|
|
|
|
raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, VALUE obj,
|
|
|
|
int last_call_status)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
|
|
|
VALUE exc = rb_eNoMethodError;
|
2008-05-31 05:28:20 -04:00
|
|
|
const char *format = 0;
|
2009-02-21 20:43:59 -05:00
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
if (argc == 0 || !SYMBOL_P(argv[0])) {
|
|
|
|
rb_raise(rb_eArgError, "no id given");
|
|
|
|
}
|
|
|
|
|
|
|
|
stack_check();
|
|
|
|
|
|
|
|
if (last_call_status & NOEX_PRIVATE) {
|
|
|
|
format = "private method `%s' called for %s";
|
|
|
|
}
|
|
|
|
else if (last_call_status & NOEX_PROTECTED) {
|
|
|
|
format = "protected method `%s' called for %s";
|
|
|
|
}
|
|
|
|
else if (last_call_status & NOEX_VCALL) {
|
|
|
|
format = "undefined local variable or method `%s' for %s";
|
|
|
|
exc = rb_eNameError;
|
|
|
|
}
|
|
|
|
else if (last_call_status & NOEX_SUPER) {
|
|
|
|
format = "super: no superclass method `%s' for %s";
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2011-10-06 07:51:55 -04:00
|
|
|
exc = make_no_method_exception(exc, format, obj, argc, argv);
|
2009-02-21 20:43:59 -05:00
|
|
|
if (!(last_call_status & NOEX_MISSING)) {
|
2014-01-09 05:12:59 -05:00
|
|
|
rb_vm_pop_cfunc_frame();
|
2009-02-21 20:43:59 -05:00
|
|
|
}
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_exc_raise(exc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline VALUE
|
|
|
|
method_missing(VALUE obj, ID id, int argc, const VALUE *argv, int call_status)
|
|
|
|
{
|
2014-01-01 11:40:11 -05:00
|
|
|
VALUE *nargv, result, work;
|
2008-12-15 00:15:26 -05:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2012-01-30 05:08:23 -05:00
|
|
|
const rb_block_t *blockptr = th->passed_block;
|
2008-12-15 00:15:26 -05:00
|
|
|
|
|
|
|
th->method_missing_reason = call_status;
|
|
|
|
th->passed_block = 0;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2008-12-15 00:15:26 -05:00
|
|
|
if (id == idMethodMissing) {
|
2009-02-21 20:43:59 -05:00
|
|
|
raise_method_missing(th, argc, argv, obj, call_status | NOEX_MISSING);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2014-01-01 11:40:11 -05:00
|
|
|
nargv = ALLOCV_N(VALUE, work, argc + 1);
|
2008-05-24 21:12:12 -04:00
|
|
|
nargv[0] = ID2SYM(id);
|
|
|
|
MEMCPY(nargv + 1, argv, VALUE, argc);
|
|
|
|
|
2009-10-29 00:55:10 -04:00
|
|
|
if (rb_method_basic_definition_p(CLASS_OF(obj) , idMethodMissing)) {
|
|
|
|
raise_method_missing(th, argc+1, nargv, obj, call_status | NOEX_MISSING);
|
|
|
|
}
|
2012-01-30 05:08:23 -05:00
|
|
|
th->passed_block = blockptr;
|
2008-12-15 00:15:26 -05:00
|
|
|
result = rb_funcall2(obj, idMethodMissing, argc + 1, nargv);
|
2014-01-01 11:40:11 -05:00
|
|
|
if (work) ALLOCV_END(work);
|
2008-12-15 00:15:26 -05:00
|
|
|
return result;
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2009-02-21 20:43:59 -05:00
|
|
|
void
|
|
|
|
rb_raise_method_missing(rb_thread_t *th, int argc, VALUE *argv,
|
|
|
|
VALUE obj, int call_status)
|
|
|
|
{
|
|
|
|
th->passed_block = 0;
|
|
|
|
raise_method_missing(th, argc, argv, obj, call_status | NOEX_MISSING);
|
|
|
|
}
|
|
|
|
|
2009-08-29 09:39:44 -04:00
|
|
|
/*!
|
|
|
|
* Calls a method
|
|
|
|
* \param recv receiver of the method
|
|
|
|
* \param mid an ID that represents the name of the method
|
|
|
|
* \param args an Array object which contains method arguments
|
|
|
|
*
|
|
|
|
* \pre \a args must refer an Array object.
|
|
|
|
*/
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE
|
|
|
|
rb_apply(VALUE recv, ID mid, VALUE args)
|
|
|
|
{
|
|
|
|
int argc;
|
2011-07-29 10:53:47 -04:00
|
|
|
VALUE *argv, ret;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2009-05-20 12:43:41 -04:00
|
|
|
argc = RARRAY_LENINT(args);
|
2011-07-29 10:53:47 -04:00
|
|
|
if (argc >= 0x100) {
|
|
|
|
args = rb_ary_subseq(args, 0, argc);
|
* include/ruby/ruby.h: constify RBasic::klass and add
RBASIC_CLASS(obj) macro which returns a class of `obj'.
This change is a part of RGENGC branch [ruby-trunk - Feature #8339].
* object.c: add new function rb_obj_reveal().
This function reveal interal (hidden) object by rb_obj_hide().
Note that do not change class before and after hiding.
Only permitted example is:
klass = RBASIC_CLASS(obj);
rb_obj_hide(obj);
....
rb_obj_reveal(obj, klass);
TODO: API design. rb_obj_reveal() should be replaced with others.
TODO: modify constified variables using cast may be harmful for
compiler's analysis and optimizaton.
Any idea to prohibt inserting RBasic::klass directly?
If rename RBasic::klass and force to use RBASIC_CLASS(obj),
then all codes such as `RBASIC(obj)->klass' will be
compilation error. Is it acceptable? (We have similar
experience at Ruby 1.9,
for example "RARRAY(ary)->ptr" to "RARRAY_PTR(ary)".
* internal.h: add some macros.
* RBASIC_CLEAR_CLASS(obj) clear RBasic::klass to make it internal
object.
* RBASIC_SET_CLASS(obj, cls) set RBasic::klass.
* RBASIC_SET_CLASS_RAW(obj, cls) same as RBASIC_SET_CLASS
without write barrier (planned).
* RCLASS_SET_SUPER(a, b) set super class of a.
* array.c, class.c, compile.c, encoding.c, enum.c, error.c, eval.c,
file.c, gc.c, hash.c, io.c, iseq.c, marshal.c, object.c,
parse.y, proc.c, process.c, random.c, ruby.c, sprintf.c,
string.c, thread.c, transcode.c, vm.c, vm_eval.c, win32/file.c:
Use above macros and functions to access RBasic::klass.
* ext/coverage/coverage.c, ext/readline/readline.c,
ext/socket/ancdata.c, ext/socket/init.c,
* ext/zlib/zlib.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-05-13 06:49:11 -04:00
|
|
|
RBASIC_CLEAR_CLASS(args);
|
2011-07-29 10:53:47 -04:00
|
|
|
OBJ_FREEZE(args);
|
|
|
|
ret = rb_call(recv, mid, argc, RARRAY_PTR(args), CALL_FCALL);
|
|
|
|
RB_GC_GUARD(args);
|
|
|
|
return ret;
|
|
|
|
}
|
2008-05-24 21:12:12 -04:00
|
|
|
argv = ALLOCA_N(VALUE, argc);
|
2013-11-07 21:37:47 -05:00
|
|
|
MEMCPY(argv, RARRAY_CONST_PTR(args), VALUE, argc);
|
2009-07-15 10:59:41 -04:00
|
|
|
return rb_call(recv, mid, argc, argv, CALL_FCALL);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2009-08-29 09:39:44 -04:00
|
|
|
/*!
|
|
|
|
* Calls a method
|
|
|
|
* \param recv receiver of the method
|
|
|
|
* \param mid an ID that represents the name of the method
|
|
|
|
* \param n the number of arguments
|
|
|
|
* \param ... arbitrary number of method arguments
|
|
|
|
*
|
|
|
|
* \pre each of arguments after \a n must be a VALUE.
|
|
|
|
*/
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE
|
|
|
|
rb_funcall(VALUE recv, ID mid, int n, ...)
|
|
|
|
{
|
|
|
|
VALUE *argv;
|
|
|
|
va_list ar;
|
|
|
|
|
|
|
|
if (n > 0) {
|
|
|
|
long i;
|
|
|
|
|
2010-11-15 08:48:37 -05:00
|
|
|
va_init_list(ar, n);
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
argv = ALLOCA_N(VALUE, n);
|
|
|
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
argv[i] = va_arg(ar, VALUE);
|
|
|
|
}
|
|
|
|
va_end(ar);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
argv = 0;
|
|
|
|
}
|
2009-07-15 10:59:41 -04:00
|
|
|
return rb_call(recv, mid, n, argv, CALL_FCALL);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2009-08-29 09:39:44 -04:00
|
|
|
/*!
|
|
|
|
* Calls a method
|
|
|
|
* \param recv receiver of the method
|
|
|
|
* \param mid an ID that represents the name of the method
|
|
|
|
* \param argc the number of arguments
|
|
|
|
* \param argv pointer to an array of method arguments
|
|
|
|
*/
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE
|
2013-05-31 04:27:06 -04:00
|
|
|
rb_funcallv(VALUE recv, ID mid, int argc, const VALUE *argv)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
2009-07-15 10:59:41 -04:00
|
|
|
return rb_call(recv, mid, argc, argv, CALL_FCALL);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2009-08-29 09:39:44 -04:00
|
|
|
/*!
|
|
|
|
* Calls a method.
|
|
|
|
*
|
|
|
|
* Same as rb_funcall2 but this function can call only public methods.
|
|
|
|
* \param recv receiver of the method
|
|
|
|
* \param mid an ID that represents the name of the method
|
|
|
|
* \param argc the number of arguments
|
|
|
|
* \param argv pointer to an array of method arguments
|
|
|
|
*/
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE
|
2013-05-31 04:27:06 -04:00
|
|
|
rb_funcallv_public(VALUE recv, ID mid, int argc, const VALUE *argv)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
2009-07-15 10:59:41 -04:00
|
|
|
return rb_call(recv, mid, argc, argv, CALL_PUBLIC);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2010-09-24 10:45:19 -04:00
|
|
|
VALUE
|
|
|
|
rb_funcall_passing_block(VALUE recv, ID mid, int argc, const VALUE *argv)
|
|
|
|
{
|
|
|
|
PASS_PASSED_BLOCK_TH(GET_THREAD());
|
|
|
|
|
|
|
|
return rb_call(recv, mid, argc, argv, CALL_PUBLIC);
|
|
|
|
}
|
|
|
|
|
2013-06-17 08:47:26 -04:00
|
|
|
VALUE
|
|
|
|
rb_funcall_with_block(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE pass_procval)
|
|
|
|
{
|
|
|
|
if (!NIL_P(pass_procval)) {
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_block_t *block = 0;
|
|
|
|
|
|
|
|
rb_proc_t *pass_proc;
|
|
|
|
GetProcPtr(pass_procval, pass_proc);
|
|
|
|
block = &pass_proc->block;
|
|
|
|
|
|
|
|
th->passed_block = block;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rb_call(recv, mid, argc, argv, CALL_PUBLIC);
|
|
|
|
}
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
static VALUE
|
2009-10-30 03:57:21 -04:00
|
|
|
send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
2011-10-06 03:29:33 -04:00
|
|
|
ID id;
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE vid;
|
2012-12-05 11:10:41 -05:00
|
|
|
VALUE self;
|
* vm.c, eval_intern.h (PASS_PASSED_BLOCK):
set a VM_FRAME_FLAG_PASSED flag to skip this frame when
searching ruby-level-cfp.
* eval.c, eval_intern.h, proc.c: fix to check cfp. if there is
no valid ruby-level-cfp, cause RuntimeError exception.
[ruby-dev:34128]
* vm_core.h, vm_evalbody.c, vm.c, vm_dump.c, vm_insnhelper.c,
insns.def: rename FRAME_MAGIC_* to VM_FRAME_MAGIC_*.
* KNOWNBUGS.rb, bootstraptest/test*.rb: move solved bugs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-10 17:46:43 -04:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-12-05 11:10:41 -05:00
|
|
|
if (scope == CALL_PUBLIC) {
|
|
|
|
self = Qundef;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
self = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp)->self;
|
|
|
|
}
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
if (argc == 0) {
|
|
|
|
rb_raise(rb_eArgError, "no method name given");
|
|
|
|
}
|
|
|
|
|
|
|
|
vid = *argv++; argc--;
|
* vm.c, eval_intern.h (PASS_PASSED_BLOCK):
set a VM_FRAME_FLAG_PASSED flag to skip this frame when
searching ruby-level-cfp.
* eval.c, eval_intern.h, proc.c: fix to check cfp. if there is
no valid ruby-level-cfp, cause RuntimeError exception.
[ruby-dev:34128]
* vm_core.h, vm_evalbody.c, vm.c, vm_dump.c, vm_insnhelper.c,
insns.def: rename FRAME_MAGIC_* to VM_FRAME_MAGIC_*.
* KNOWNBUGS.rb, bootstraptest/test*.rb: move solved bugs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-10 17:46:43 -04:00
|
|
|
|
2011-10-06 03:29:33 -04:00
|
|
|
id = rb_check_id(&vid);
|
|
|
|
if (!id) {
|
|
|
|
if (rb_method_basic_definition_p(CLASS_OF(recv), idMethodMissing)) {
|
2011-10-06 07:51:55 -04:00
|
|
|
VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL,
|
2011-10-06 03:29:33 -04:00
|
|
|
recv, ++argc, --argv);
|
|
|
|
rb_exc_raise(exc);
|
|
|
|
}
|
|
|
|
id = rb_to_id(vid);
|
|
|
|
}
|
2011-12-23 11:23:13 -05:00
|
|
|
PASS_PASSED_BLOCK_TH(th);
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
entry with VM_METHOD_TYPE_REFINED holds only the original method
definition, so ci->me is set to a method entry allocated in the
stack, and it causes SEGV/ILL. In this commit, a method entry
with VM_METHOD_TYPE_REFINED holds the whole original method entry.
Furthermore, rb_thread_mark() is changed to mark cfp->klass to
avoid GC for iclasses created by copy_refinement_iclass().
* vm_method.c (rb_method_entry_make): add a method entry with
VM_METHOD_TYPE_REFINED to the class refined by the refinement if
the target module is a refinement. When a method entry with
VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
the same name is searched in refinements. If such a method is
found, the method is invoked. Otherwise, the original method in
the refined class (rb_method_definition_t::body.orig_me) is
invoked. This change is made to simplify the normal method lookup
and to improve the performance of normal method calls.
* vm_method.c (EXPR1, search_method, rb_method_entry),
vm_eval.c (rb_call0, rb_search_method_entry): do not use
refinements for method lookup.
* vm_insnhelper.c (vm_call_method): search methods in refinements if
ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
super (i.e., ci->call == vm_call_super_method), skip the same
method entry as the current method to avoid infinite call of the
same method.
* class.c (include_modules_at): add a refined method entry for each
method defined in a module included in a refinement.
* class.c (rb_prepend_module): set an empty table to
RCLASS_M_TBL(klass) to add refined method entries, because
refinements should have priority over prepended modules.
* proc.c (mnew): use rb_method_entry_with_refinements() to get
a refined method.
* vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
copy_refinement_iclass().
* vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
* test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
the test because it should pass successfully.
* test/ruby/test_refinement.rb (test_redefine_refined_method): new
test for the case a refined method is redefined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-06 08:08:41 -05:00
|
|
|
return rb_call0(recv, id, argc, argv, scope, self);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2013-02-23 23:24:52 -05:00
|
|
|
* call-seq:
|
|
|
|
* foo.send(symbol [, args...]) -> obj
|
|
|
|
* foo.__send__(symbol [, args...]) -> obj
|
|
|
|
* foo.send(string [, args...]) -> obj
|
|
|
|
* foo.__send__(string [, args...]) -> obj
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* Invokes the method identified by _symbol_, passing it any
|
|
|
|
* arguments specified. You can use <code>__send__</code> if the name
|
|
|
|
* +send+ clashes with an existing method in _obj_.
|
2013-02-23 23:24:52 -05:00
|
|
|
* When the method is identified by a string, the string is converted
|
|
|
|
* to a symbol.
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* class Klass
|
|
|
|
* def hello(*args)
|
|
|
|
* "Hello " + args.join(' ')
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* k = Klass.new
|
|
|
|
* k.send :hello, "gentle", "readers" #=> "Hello gentle readers"
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_f_send(int argc, VALUE *argv, VALUE recv)
|
|
|
|
{
|
2009-10-30 03:57:21 -04:00
|
|
|
return send_internal(argc, argv, recv, CALL_FCALL);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* obj.public_send(symbol [, args...]) -> obj
|
2013-02-23 23:24:52 -05:00
|
|
|
* obj.public_send(string [, args...]) -> obj
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* Invokes the method identified by _symbol_, passing it any
|
|
|
|
* arguments specified. Unlike send, public_send calls public
|
|
|
|
* methods only.
|
2013-02-23 23:24:52 -05:00
|
|
|
* When the method is identified by a string, the string is converted
|
|
|
|
* to a symbol.
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* 1.public_send(:puts, "hello") # causes NoMethodError
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_f_public_send(int argc, VALUE *argv, VALUE recv)
|
|
|
|
{
|
2009-10-30 03:57:21 -04:00
|
|
|
return send_internal(argc, argv, recv, CALL_PUBLIC);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* yield */
|
|
|
|
|
|
|
|
static inline VALUE
|
|
|
|
rb_yield_0(int argc, const VALUE * argv)
|
|
|
|
{
|
|
|
|
return vm_yield(GET_THREAD(), argc, argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_yield(VALUE val)
|
|
|
|
{
|
|
|
|
if (val == Qundef) {
|
|
|
|
return rb_yield_0(0, 0);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return rb_yield_0(1, &val);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_yield_values(int n, ...)
|
|
|
|
{
|
|
|
|
if (n == 0) {
|
|
|
|
return rb_yield_0(0, 0);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int i;
|
|
|
|
VALUE *argv;
|
|
|
|
va_list args;
|
|
|
|
argv = ALLOCA_N(VALUE, n);
|
|
|
|
|
|
|
|
va_init_list(args, n);
|
|
|
|
for (i=0; i<n; i++) {
|
|
|
|
argv[i] = va_arg(args, VALUE);
|
|
|
|
}
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
return rb_yield_0(n, argv);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_yield_values2(int argc, const VALUE *argv)
|
|
|
|
{
|
|
|
|
return rb_yield_0(argc, argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_yield_splat(VALUE values)
|
|
|
|
{
|
|
|
|
VALUE tmp = rb_check_array_type(values);
|
|
|
|
volatile VALUE v;
|
|
|
|
if (NIL_P(tmp)) {
|
|
|
|
rb_raise(rb_eArgError, "not an array");
|
|
|
|
}
|
2013-11-07 21:37:47 -05:00
|
|
|
v = rb_yield_0(RARRAY_LENINT(tmp), RARRAY_CONST_PTR(tmp));
|
2008-05-24 21:12:12 -04:00
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
2013-11-29 03:06:19 -05:00
|
|
|
VALUE
|
|
|
|
rb_yield_block(VALUE val, VALUE arg, int argc, const VALUE *argv, VALUE blockarg)
|
|
|
|
{
|
|
|
|
const rb_block_t *blockptr = 0;
|
|
|
|
if (!NIL_P(blockarg)) {
|
2013-11-29 23:21:26 -05:00
|
|
|
rb_proc_t *blockproc;
|
|
|
|
GetProcPtr(blockarg, blockproc);
|
|
|
|
blockptr = &blockproc->block;
|
2013-11-29 03:06:19 -05:00
|
|
|
}
|
|
|
|
return vm_yield_with_block(GET_THREAD(), argc, argv, blockptr);
|
|
|
|
}
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
static VALUE
|
|
|
|
loop_i(void)
|
|
|
|
{
|
|
|
|
for (;;) {
|
|
|
|
rb_yield_0(0, 0);
|
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2012-11-06 12:12:20 -05:00
|
|
|
static VALUE
|
2013-06-26 09:43:22 -04:00
|
|
|
rb_f_loop_size(VALUE self, VALUE args, VALUE eobj)
|
2012-11-06 17:50:30 -05:00
|
|
|
{
|
2012-11-06 12:12:20 -05:00
|
|
|
return DBL2NUM(INFINITY);
|
|
|
|
}
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-13 01:49:55 -04:00
|
|
|
* loop { block }
|
|
|
|
* loop -> an_enumerator
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* Repeatedly executes the block.
|
|
|
|
*
|
2010-05-13 01:49:55 -04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2008-05-24 21:12:12 -04:00
|
|
|
* loop do
|
|
|
|
* print "Input: "
|
|
|
|
* line = gets
|
|
|
|
* break if !line or line =~ /^qQ/
|
|
|
|
* # ...
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* StopIteration raised in the block breaks the loop.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2008-12-27 04:28:26 -05:00
|
|
|
rb_f_loop(VALUE self)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
2012-11-06 12:12:20 -05:00
|
|
|
RETURN_SIZED_ENUMERATOR(self, 0, 0, rb_f_loop_size);
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_rescue2(loop_i, (VALUE)0, 0, 0, rb_eStopIteration, (VALUE)0);
|
|
|
|
return Qnil; /* dummy */
|
|
|
|
}
|
|
|
|
|
2010-02-17 03:05:42 -05:00
|
|
|
#if VMDEBUG
|
2010-01-24 08:52:32 -05:00
|
|
|
static const char *
|
|
|
|
vm_frametype_name(const rb_control_frame_t *cfp);
|
2010-02-17 03:05:42 -05:00
|
|
|
#endif
|
2010-01-24 08:52:32 -05:00
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE
|
|
|
|
rb_iterate(VALUE (* it_proc) (VALUE), VALUE data1,
|
|
|
|
VALUE (* bl_proc) (ANYARGS), VALUE data2)
|
|
|
|
{
|
|
|
|
int state;
|
|
|
|
volatile VALUE retval = Qnil;
|
2009-12-20 09:20:46 -05:00
|
|
|
NODE *node = NEW_IFUNC(bl_proc, data2);
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2009-02-28 07:56:10 -05:00
|
|
|
rb_control_frame_t *volatile cfp = th->cfp;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2010-07-14 07:23:10 -04:00
|
|
|
node->nd_aid = rb_frame_this_func();
|
2008-05-24 21:12:12 -04:00
|
|
|
TH_PUSH_TAG(th);
|
|
|
|
state = TH_EXEC_TAG();
|
|
|
|
if (state == 0) {
|
|
|
|
iter_retry:
|
2009-12-20 09:20:46 -05:00
|
|
|
{
|
|
|
|
rb_block_t *blockptr;
|
|
|
|
if (bl_proc) {
|
|
|
|
blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(th->cfp);
|
2009-12-20 12:47:02 -05:00
|
|
|
blockptr->iseq = (void *)node;
|
2009-12-20 09:20:46 -05:00
|
|
|
blockptr->proc = 0;
|
|
|
|
}
|
|
|
|
else {
|
2012-06-10 23:14:59 -04:00
|
|
|
blockptr = VM_CF_BLOCK_PTR(th->cfp);
|
2009-12-20 09:20:46 -05:00
|
|
|
}
|
|
|
|
th->passed_block = blockptr;
|
|
|
|
}
|
2008-05-24 21:12:12 -04:00
|
|
|
retval = (*it_proc) (data1);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE err = th->errinfo;
|
|
|
|
if (state == TAG_BREAK) {
|
2012-06-10 23:14:59 -04:00
|
|
|
VALUE *escape_ep = GET_THROWOBJ_CATCH_POINT(err);
|
|
|
|
VALUE *cep = cfp->ep;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-06-10 23:14:59 -04:00
|
|
|
if (cep == escape_ep) {
|
2008-05-24 21:12:12 -04:00
|
|
|
state = 0;
|
|
|
|
th->state = 0;
|
|
|
|
th->errinfo = Qnil;
|
2012-01-24 00:20:48 -05:00
|
|
|
retval = GET_THROWOBJ_VAL(err);
|
2010-01-24 08:52:32 -05:00
|
|
|
|
|
|
|
/* check skipped frame */
|
|
|
|
while (th->cfp != cfp) {
|
2010-02-17 03:05:42 -05:00
|
|
|
#if VMDEBUG
|
|
|
|
printf("skipped frame: %s\n", vm_frametype_name(th->cfp));
|
|
|
|
#endif
|
2014-01-09 05:12:59 -05:00
|
|
|
if (VM_FRAME_TYPE(th->cfp) != VM_FRAME_MAGIC_CFUNC) {
|
|
|
|
vm_pop_frame(th);
|
|
|
|
}
|
|
|
|
else { /* unlikely path */
|
|
|
|
rb_vm_pop_cfunc_frame();
|
2010-01-24 08:52:32 -05:00
|
|
|
}
|
|
|
|
}
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
else{
|
|
|
|
/* SDR(); printf("%p, %p\n", cdfp, escape_dfp); */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (state == TAG_RETRY) {
|
2012-06-10 23:14:59 -04:00
|
|
|
VALUE *escape_ep = GET_THROWOBJ_CATCH_POINT(err);
|
|
|
|
VALUE *cep = cfp->ep;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-06-10 23:14:59 -04:00
|
|
|
if (cep == escape_ep) {
|
2008-05-24 21:12:12 -04:00
|
|
|
state = 0;
|
|
|
|
th->state = 0;
|
|
|
|
th->errinfo = Qnil;
|
|
|
|
th->cfp = cfp;
|
|
|
|
goto iter_retry;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
TH_POP_TAG();
|
|
|
|
|
|
|
|
switch (state) {
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
TH_JUMP_TAG(th, state);
|
|
|
|
}
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct iter_method_arg {
|
|
|
|
VALUE obj;
|
|
|
|
ID mid;
|
|
|
|
int argc;
|
2013-11-29 03:02:51 -05:00
|
|
|
const VALUE *argv;
|
2008-05-24 21:12:12 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
iterate_method(VALUE obj)
|
|
|
|
{
|
|
|
|
const struct iter_method_arg * arg =
|
|
|
|
(struct iter_method_arg *) obj;
|
|
|
|
|
2009-07-15 10:59:41 -04:00
|
|
|
return rb_call(arg->obj, arg->mid, arg->argc, arg->argv, CALL_FCALL);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2013-11-29 03:02:51 -05:00
|
|
|
rb_block_call(VALUE obj, ID mid, int argc, const VALUE * argv,
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE (*bl_proc) (ANYARGS), VALUE data2)
|
|
|
|
{
|
|
|
|
struct iter_method_arg arg;
|
|
|
|
|
|
|
|
arg.obj = obj;
|
|
|
|
arg.mid = mid;
|
|
|
|
arg.argc = argc;
|
|
|
|
arg.argv = argv;
|
|
|
|
return rb_iterate(iterate_method, (VALUE)&arg, bl_proc, data2);
|
|
|
|
}
|
|
|
|
|
2012-09-19 11:42:26 -04:00
|
|
|
static VALUE
|
|
|
|
iterate_check_method(VALUE obj)
|
|
|
|
{
|
|
|
|
const struct iter_method_arg * arg =
|
|
|
|
(struct iter_method_arg *) obj;
|
|
|
|
|
|
|
|
return rb_check_funcall(arg->obj, arg->mid, arg->argc, arg->argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2013-11-29 03:02:51 -05:00
|
|
|
rb_check_block_call(VALUE obj, ID mid, int argc, const VALUE *argv,
|
2012-09-19 11:42:26 -04:00
|
|
|
VALUE (*bl_proc) (ANYARGS), VALUE data2)
|
|
|
|
{
|
|
|
|
struct iter_method_arg arg;
|
|
|
|
|
|
|
|
arg.obj = obj;
|
|
|
|
arg.mid = mid;
|
|
|
|
arg.argc = argc;
|
|
|
|
arg.argv = argv;
|
|
|
|
return rb_iterate(iterate_check_method, (VALUE)&arg, bl_proc, data2);
|
|
|
|
}
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE
|
|
|
|
rb_each(VALUE obj)
|
|
|
|
{
|
2009-07-15 10:59:41 -04:00
|
|
|
return rb_call(obj, idEach, 0, 0, CALL_FCALL);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2013-08-16 04:04:38 -04:00
|
|
|
eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *const cref_arg, volatile VALUE file, volatile int line)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
|
|
|
int state;
|
|
|
|
VALUE result = Qundef;
|
|
|
|
VALUE envval;
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_env_t *env = NULL;
|
* iseq.c, vm_eval.c: set th->base_block properly.
th->base_block is information for (a) parsing, (b) compiling
and (c) setting up the frame to execute the program passed by
`eval' method. For example, (1) parser need to know up-level
variables to detect it is variable or method without paren.
Befor (a), (b) and (c), VM set th->base_block by passed bindng
(or previous frame information). After execute (a), (b) and (c),
VM should clear th->base_block. However, if (a), (b) or (c)
raises an exception, then th->base_block is not cleared.
Problem is that the uncleared value th->balo_block is used for
irrelevant iseq compilation. It causes SEGV or critical error.
I tried to solve this problem: to clear them before exception,
but finally I found out that it is difficult to do it (Ruby
program can be run in many places).
Because of this background, I set th->base_block before
compiling iseq and restore it after compiling.
Basically, th->base_block is dirty hack (similar to global
variable) and this patch is also dirty.
* bootstraptest/test_eval.rb: add a test for above.
* internal.h: remove unused decl.
* iseq.c (rb_iseq_compile_with_option): add base_block parameter.
set th->base_block before compation and restore it after
compilation.
* ruby.c (require_libraries): pass 0 as base_block instead of
setting th->base_block
* tool/compile_prelude.rb (prelude_eval): apply above changes.
* vm.c, vm_eval.c: ditto.
* vm_core.h: add comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-22 05:32:56 -04:00
|
|
|
rb_block_t block, *base_block;
|
2008-06-24 09:16:44 -04:00
|
|
|
volatile int parse_in_eval;
|
2008-07-01 12:55:30 -04:00
|
|
|
volatile int mild_compile_error;
|
2013-08-06 03:15:18 -04:00
|
|
|
NODE *orig_cref;
|
|
|
|
VALUE crefval;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
|
|
|
if (file == 0) {
|
2013-07-29 04:00:34 -04:00
|
|
|
file = rb_sourcefilename();
|
2008-05-24 21:12:12 -04:00
|
|
|
line = rb_sourceline();
|
|
|
|
}
|
|
|
|
|
2008-06-24 09:16:44 -04:00
|
|
|
parse_in_eval = th->parse_in_eval;
|
2008-07-01 12:55:30 -04:00
|
|
|
mild_compile_error = th->mild_compile_error;
|
2012-10-23 16:42:45 -04:00
|
|
|
TH_PUSH_TAG(th);
|
|
|
|
if ((state = TH_EXEC_TAG()) == 0) {
|
2013-08-16 04:04:38 -04:00
|
|
|
NODE *cref = cref_arg;
|
2013-05-15 04:06:07 -04:00
|
|
|
rb_binding_t *bind = 0;
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_iseq_t *iseq;
|
|
|
|
volatile VALUE iseqval;
|
2013-06-15 11:31:44 -04:00
|
|
|
VALUE absolute_path = Qnil;
|
2013-07-29 04:00:34 -04:00
|
|
|
VALUE fname;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
|
|
|
if (scope != Qnil) {
|
2013-07-22 03:32:52 -04:00
|
|
|
bind = Check_TypedStruct(scope, &ruby_binding_data_type);
|
|
|
|
{
|
2008-05-24 21:12:12 -04:00
|
|
|
envval = bind->env;
|
2013-07-29 04:00:34 -04:00
|
|
|
if (file != Qundef) {
|
|
|
|
absolute_path = file;
|
2013-07-21 20:48:38 -04:00
|
|
|
}
|
2013-07-29 04:00:34 -04:00
|
|
|
else if (!NIL_P(bind->path)) {
|
|
|
|
file = bind->path;
|
2012-06-03 22:49:37 -04:00
|
|
|
line = bind->first_lineno;
|
2013-06-14 19:37:35 -04:00
|
|
|
absolute_path = rb_current_realfilepath();
|
2010-05-09 14:41:51 -04:00
|
|
|
}
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
GetEnvPtr(envval, env);
|
* iseq.c, vm_eval.c: set th->base_block properly.
th->base_block is information for (a) parsing, (b) compiling
and (c) setting up the frame to execute the program passed by
`eval' method. For example, (1) parser need to know up-level
variables to detect it is variable or method without paren.
Befor (a), (b) and (c), VM set th->base_block by passed bindng
(or previous frame information). After execute (a), (b) and (c),
VM should clear th->base_block. However, if (a), (b) or (c)
raises an exception, then th->base_block is not cleared.
Problem is that the uncleared value th->balo_block is used for
irrelevant iseq compilation. It causes SEGV or critical error.
I tried to solve this problem: to clear them before exception,
but finally I found out that it is difficult to do it (Ruby
program can be run in many places).
Because of this background, I set th->base_block before
compiling iseq and restore it after compiling.
Basically, th->base_block is dirty hack (similar to global
variable) and this patch is also dirty.
* bootstraptest/test_eval.rb: add a test for above.
* internal.h: remove unused decl.
* iseq.c (rb_iseq_compile_with_option): add base_block parameter.
set th->base_block before compation and restore it after
compilation.
* ruby.c (require_libraries): pass 0 as base_block instead of
setting th->base_block
* tool/compile_prelude.rb (prelude_eval): apply above changes.
* vm.c, vm_eval.c: ditto.
* vm_core.h: add comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-22 05:32:56 -04:00
|
|
|
base_block = &env->block;
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
else {
|
2009-02-13 01:25:59 -05:00
|
|
|
rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
|
* vm.c, eval_intern.h (PASS_PASSED_BLOCK):
set a VM_FRAME_FLAG_PASSED flag to skip this frame when
searching ruby-level-cfp.
* eval.c, eval_intern.h, proc.c: fix to check cfp. if there is
no valid ruby-level-cfp, cause RuntimeError exception.
[ruby-dev:34128]
* vm_core.h, vm_evalbody.c, vm.c, vm_dump.c, vm_insnhelper.c,
insns.def: rename FRAME_MAGIC_* to VM_FRAME_MAGIC_*.
* KNOWNBUGS.rb, bootstraptest/test*.rb: move solved bugs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-10 17:46:43 -04:00
|
|
|
|
|
|
|
if (cfp != 0) {
|
|
|
|
block = *RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp);
|
* iseq.c, vm_eval.c: set th->base_block properly.
th->base_block is information for (a) parsing, (b) compiling
and (c) setting up the frame to execute the program passed by
`eval' method. For example, (1) parser need to know up-level
variables to detect it is variable or method without paren.
Befor (a), (b) and (c), VM set th->base_block by passed bindng
(or previous frame information). After execute (a), (b) and (c),
VM should clear th->base_block. However, if (a), (b) or (c)
raises an exception, then th->base_block is not cleared.
Problem is that the uncleared value th->balo_block is used for
irrelevant iseq compilation. It causes SEGV or critical error.
I tried to solve this problem: to clear them before exception,
but finally I found out that it is difficult to do it (Ruby
program can be run in many places).
Because of this background, I set th->base_block before
compiling iseq and restore it after compiling.
Basically, th->base_block is dirty hack (similar to global
variable) and this patch is also dirty.
* bootstraptest/test_eval.rb: add a test for above.
* internal.h: remove unused decl.
* iseq.c (rb_iseq_compile_with_option): add base_block parameter.
set th->base_block before compation and restore it after
compilation.
* ruby.c (require_libraries): pass 0 as base_block instead of
setting th->base_block
* tool/compile_prelude.rb (prelude_eval): apply above changes.
* vm.c, vm_eval.c: ditto.
* vm_core.h: add comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-22 05:32:56 -04:00
|
|
|
base_block = █
|
|
|
|
base_block->self = self;
|
|
|
|
base_block->iseq = cfp->iseq; /* TODO */
|
* vm.c, eval_intern.h (PASS_PASSED_BLOCK):
set a VM_FRAME_FLAG_PASSED flag to skip this frame when
searching ruby-level-cfp.
* eval.c, eval_intern.h, proc.c: fix to check cfp. if there is
no valid ruby-level-cfp, cause RuntimeError exception.
[ruby-dev:34128]
* vm_core.h, vm_evalbody.c, vm.c, vm_dump.c, vm_insnhelper.c,
insns.def: rename FRAME_MAGIC_* to VM_FRAME_MAGIC_*.
* KNOWNBUGS.rb, bootstraptest/test*.rb: move solved bugs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-10 17:46:43 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_raise(rb_eRuntimeError, "Can't eval on top of Fiber or Thread");
|
|
|
|
}
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2013-07-29 04:00:34 -04:00
|
|
|
if ((fname = file) == Qundef) {
|
|
|
|
fname = rb_usascii_str_new_cstr("(eval)");
|
|
|
|
}
|
|
|
|
|
2013-11-26 18:30:25 -05:00
|
|
|
if (RTEST(fname))
|
|
|
|
fname = rb_fstring(fname);
|
|
|
|
if (RTEST(absolute_path))
|
|
|
|
absolute_path = rb_fstring(absolute_path);
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
/* make eval iseq */
|
|
|
|
th->parse_in_eval++;
|
2008-07-01 12:55:30 -04:00
|
|
|
th->mild_compile_error++;
|
2013-07-29 04:00:34 -04:00
|
|
|
iseqval = rb_iseq_compile_with_option(src, fname, absolute_path, INT2FIX(line), base_block, Qnil);
|
2008-07-01 12:55:30 -04:00
|
|
|
th->mild_compile_error--;
|
2008-05-24 21:12:12 -04:00
|
|
|
th->parse_in_eval--;
|
|
|
|
|
2013-08-06 03:15:18 -04:00
|
|
|
if (!cref && base_block->iseq) {
|
|
|
|
orig_cref = rb_vm_get_cref(base_block->iseq, base_block->ep);
|
|
|
|
cref = NEW_CREF(Qnil);
|
|
|
|
crefval = (VALUE) cref;
|
|
|
|
COPY_CREF(cref, orig_cref);
|
|
|
|
}
|
* iseq.c, vm_eval.c: set th->base_block properly.
th->base_block is information for (a) parsing, (b) compiling
and (c) setting up the frame to execute the program passed by
`eval' method. For example, (1) parser need to know up-level
variables to detect it is variable or method without paren.
Befor (a), (b) and (c), VM set th->base_block by passed bindng
(or previous frame information). After execute (a), (b) and (c),
VM should clear th->base_block. However, if (a), (b) or (c)
raises an exception, then th->base_block is not cleared.
Problem is that the uncleared value th->balo_block is used for
irrelevant iseq compilation. It causes SEGV or critical error.
I tried to solve this problem: to clear them before exception,
but finally I found out that it is difficult to do it (Ruby
program can be run in many places).
Because of this background, I set th->base_block before
compiling iseq and restore it after compiling.
Basically, th->base_block is dirty hack (similar to global
variable) and this patch is also dirty.
* bootstraptest/test_eval.rb: add a test for above.
* internal.h: remove unused decl.
* iseq.c (rb_iseq_compile_with_option): add base_block parameter.
set th->base_block before compation and restore it after
compilation.
* ruby.c (require_libraries): pass 0 as base_block instead of
setting th->base_block
* tool/compile_prelude.rb (prelude_eval): apply above changes.
* vm.c, vm_eval.c: ditto.
* vm_core.h: add comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-22 05:32:56 -04:00
|
|
|
vm_set_eval_stack(th, iseqval, cref, base_block);
|
2013-08-06 03:15:18 -04:00
|
|
|
RB_GC_GUARD(crefval);
|
2008-05-24 21:12:12 -04:00
|
|
|
|
|
|
|
if (0) { /* for debug */
|
2011-02-20 02:23:55 -05:00
|
|
|
VALUE disasm = rb_iseq_disasm(iseqval);
|
|
|
|
printf("%s\n", StringValuePtr(disasm));
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* save new env */
|
|
|
|
GetISeqPtr(iseqval, iseq);
|
2009-09-01 06:58:31 -04:00
|
|
|
if (bind && iseq->local_table_size > 0) {
|
* vm.c: add a prefix "rb_" to exposed functions
vm_get_ruby_level_next_cfp(), rb_vm_make_env_object(),
vm_stack_to_heap(), vm_make_proc(), vm_invoke_proc(),
vm_get_sourceline(), vm_cref(), vm_localjump_error(),
vm_make_jump_tag_but_local_jump(), vm_jump_tag_but_local_jump().
This changes may affect only core because most of renamed functions
require a pointer of not-exposed struct such as rb_thread_t or NODE.
In short, they are core functions.
* cont.c, eval.c, eval_intern.h, load.c, proc.c, thread.c,
vm_core.h, vm_dump.c, vm_eval.c, vm_exec.c, vm_insnhelper.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-18 21:38:11 -05:00
|
|
|
bind->env = rb_vm_make_env_object(th, th->cfp);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* kick */
|
* common.mk: clean up
- remove blockinlining.$(OBJEXT) to built
- make ENCODING_H_INCLDUES variable (include/ruby/encoding.h)
- make VM_CORE_H_INCLUDES variable (vm_core.h)
- simplify rules.
- make depends rule to output depend status using gcc -MM.
* include/ruby/mvm.h, include/ruby/vm.h: rename mvm.h to vm.h.
* include/ruby.h: ditto.
* load.c: add inclusion explicitly.
* enumerator.c, object.c, parse.y, thread.c, vm_dump.c:
remove useless inclusion.
* eval_intern.h: cleanup inclusion.
* vm_core.h: rb_thread_t should be defined in this file.
* vm_evalbody.c, vm_exec.c: rename vm_evalbody.c to vm_exec.c.
* vm.h, vm_exec.h: rename vm.h to vm_exec.h.
* insnhelper.h, vm_insnhelper.h: rename insnhelper.h to vm_insnhelper.h.
* vm.c, vm_insnhelper.c, vm_insnhelper.h:
- rename vm_eval() to vm_exec_core().
- rename vm_eval_body() to vm_exec().
- cleanup include order.
* vm_method.c: fix comment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-22 20:20:28 -04:00
|
|
|
result = vm_exec(th);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
2012-10-23 16:42:45 -04:00
|
|
|
TH_POP_TAG();
|
2008-07-01 12:55:30 -04:00
|
|
|
th->mild_compile_error = mild_compile_error;
|
2008-06-24 09:16:44 -04:00
|
|
|
th->parse_in_eval = parse_in_eval;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
|
|
|
if (state) {
|
|
|
|
if (state == TAG_RAISE) {
|
|
|
|
VALUE errinfo = th->errinfo;
|
2013-07-29 04:00:34 -04:00
|
|
|
if (file == Qundef) {
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE mesg, errat, bt2;
|
2009-03-29 23:12:48 -04:00
|
|
|
ID id_mesg;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2009-03-29 23:12:48 -04:00
|
|
|
CONST_ID(id_mesg, "mesg");
|
2008-05-24 21:12:12 -04:00
|
|
|
errat = rb_get_backtrace(errinfo);
|
2009-03-29 23:12:48 -04:00
|
|
|
mesg = rb_attr_get(errinfo, id_mesg);
|
2011-09-29 07:07:45 -04:00
|
|
|
if (!NIL_P(errat) && RB_TYPE_P(errat, T_ARRAY) &&
|
2013-03-06 01:30:03 -05:00
|
|
|
(bt2 = rb_vm_backtrace_str_ary(th, 0, 0), RARRAY_LEN(bt2) > 0)) {
|
2011-09-29 07:07:45 -04:00
|
|
|
if (!NIL_P(mesg) && RB_TYPE_P(mesg, T_STRING) && !RSTRING_LEN(mesg)) {
|
2009-03-29 23:12:48 -04:00
|
|
|
if (OBJ_FROZEN(mesg)) {
|
2013-05-13 05:56:22 -04:00
|
|
|
VALUE m = rb_str_cat(rb_str_dup(RARRAY_AREF(errat, 0)), ": ", 2);
|
2009-03-29 23:12:48 -04:00
|
|
|
rb_ivar_set(errinfo, id_mesg, rb_str_append(m, mesg));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_str_update(mesg, 0, 0, rb_str_new2(": "));
|
2013-05-13 05:56:22 -04:00
|
|
|
rb_str_update(mesg, 0, 0, RARRAY_AREF(errat, 0));
|
2009-03-29 23:12:48 -04:00
|
|
|
}
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
2013-06-21 07:32:57 -04:00
|
|
|
RARRAY_ASET(errat, 0, RARRAY_AREF(bt2, 0));
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
rb_exc_raise(errinfo);
|
|
|
|
}
|
|
|
|
JUMP_TAG(state);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2013-07-29 04:00:34 -04:00
|
|
|
eval_string(VALUE self, VALUE src, VALUE scope, VALUE file, int line)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
|
|
|
return eval_string_with_cref(self, src, scope, 0, file, line);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* eval(string [, binding [, filename [,lineno]]]) -> obj
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* Evaluates the Ruby expression(s) in <em>string</em>. If
|
2009-10-14 10:08:26 -04:00
|
|
|
* <em>binding</em> is given, which must be a <code>Binding</code>
|
|
|
|
* object, the evaluation is performed in its context. If the
|
|
|
|
* optional <em>filename</em> and <em>lineno</em> parameters are
|
|
|
|
* present, they will be used when reporting syntax errors.
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
2011-03-07 03:44:45 -05:00
|
|
|
* def get_binding(str)
|
2008-05-24 21:12:12 -04:00
|
|
|
* return binding
|
|
|
|
* end
|
|
|
|
* str = "hello"
|
|
|
|
* eval "str + ' Fred'" #=> "hello Fred"
|
2011-03-07 03:44:45 -05:00
|
|
|
* eval "str + ' Fred'", get_binding("bye") #=> "bye Fred"
|
2008-05-24 21:12:12 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_f_eval(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
VALUE src, scope, vfile, vline;
|
2013-07-29 04:00:34 -04:00
|
|
|
VALUE file = Qundef;
|
2008-05-24 21:12:12 -04:00
|
|
|
int line = 1;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
|
2013-08-18 06:36:51 -04:00
|
|
|
SafeStringValue(src);
|
2008-05-24 21:12:12 -04:00
|
|
|
if (argc >= 3) {
|
|
|
|
StringValue(vfile);
|
|
|
|
}
|
|
|
|
if (argc >= 4) {
|
|
|
|
line = NUM2INT(vline);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!NIL_P(vfile))
|
2013-07-29 04:00:34 -04:00
|
|
|
file = vfile;
|
2008-05-24 21:12:12 -04:00
|
|
|
return eval_string(self, src, scope, file, line);
|
|
|
|
}
|
|
|
|
|
2012-07-10 23:25:26 -04:00
|
|
|
/** @note This function name is not stable. */
|
|
|
|
VALUE
|
2012-09-03 22:52:44 -04:00
|
|
|
ruby_eval_string_from_file(const char *str, const char *filename)
|
|
|
|
{
|
2013-07-29 04:00:34 -04:00
|
|
|
VALUE file = filename ? rb_str_new_cstr(filename) : 0;
|
|
|
|
return eval_string(rb_vm_top_self(), rb_str_new2(str), Qnil, file, 1);
|
2012-07-10 23:25:26 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
struct eval_string_from_file_arg {
|
2013-07-29 04:00:34 -04:00
|
|
|
VALUE str;
|
|
|
|
VALUE filename;
|
2012-07-10 23:25:26 -04:00
|
|
|
};
|
2012-09-03 22:52:44 -04:00
|
|
|
|
2012-07-10 23:25:26 -04:00
|
|
|
static VALUE
|
2013-07-29 01:52:50 -04:00
|
|
|
eval_string_from_file_helper(VALUE data)
|
2012-09-03 22:52:44 -04:00
|
|
|
{
|
2012-07-10 23:25:26 -04:00
|
|
|
const struct eval_string_from_file_arg *const arg = (struct eval_string_from_file_arg*)data;
|
2013-07-29 04:00:34 -04:00
|
|
|
return eval_string(rb_vm_top_self(), arg->str, Qnil, arg->filename, 1);
|
2012-07-10 23:25:26 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2012-09-03 22:52:44 -04:00
|
|
|
ruby_eval_string_from_file_protect(const char *str, const char *filename, int *state)
|
|
|
|
{
|
2012-09-03 22:35:47 -04:00
|
|
|
struct eval_string_from_file_arg arg;
|
2013-07-29 04:00:34 -04:00
|
|
|
arg.str = rb_str_new_cstr(str);
|
|
|
|
arg.filename = filename ? rb_str_new_cstr(filename) : 0;
|
2013-07-29 01:52:50 -04:00
|
|
|
return rb_protect(eval_string_from_file_helper, (VALUE)&arg, state);
|
2012-07-10 23:25:26 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Evaluates the given string in an isolated binding.
|
|
|
|
*
|
|
|
|
* Here "isolated" means the binding does not inherit any other binding. This
|
|
|
|
* behaves same as the binding for required libraries.
|
|
|
|
*
|
|
|
|
* __FILE__ will be "(eval)", and __LINE__ starts from 1 in the evaluation.
|
|
|
|
*
|
|
|
|
* @param str Ruby code to evaluate.
|
|
|
|
* @return The evaluated result.
|
|
|
|
* @throw Exception Raises an exception on error.
|
|
|
|
*/
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE
|
|
|
|
rb_eval_string(const char *str)
|
|
|
|
{
|
2012-07-10 23:25:26 -04:00
|
|
|
return ruby_eval_string_from_file(str, "eval");
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2012-07-10 23:25:26 -04:00
|
|
|
/**
|
|
|
|
* Evaluates the given string in an isolated binding.
|
|
|
|
*
|
|
|
|
* __FILE__ will be "(eval)", and __LINE__ starts from 1 in the evaluation.
|
|
|
|
*
|
|
|
|
* @sa rb_eval_string
|
|
|
|
* @param str Ruby code to evaluate.
|
|
|
|
* @param state Being set to zero if succeeded. Nonzero if an error occurred.
|
|
|
|
* @return The evaluated result if succeeded, an undefined value if otherwise.
|
|
|
|
*/
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE
|
|
|
|
rb_eval_string_protect(const char *str, int *state)
|
|
|
|
{
|
|
|
|
return rb_protect((VALUE (*)(VALUE))rb_eval_string, (VALUE)str, state);
|
|
|
|
}
|
|
|
|
|
2012-07-10 23:25:26 -04:00
|
|
|
/**
|
|
|
|
* Evaluates the given string under a module binding in an isolated binding.
|
|
|
|
* This is same as the binding for required libraries on "require('foo', true)".
|
|
|
|
*
|
|
|
|
* __FILE__ will be "(eval)", and __LINE__ starts from 1 in the evaluation.
|
|
|
|
*
|
|
|
|
* @sa rb_eval_string
|
|
|
|
* @param str Ruby code to evaluate.
|
|
|
|
* @param state Being set to zero if succeeded. Nonzero if an error occurred.
|
|
|
|
* @return The evaluated result if succeeded, an undefined value if otherwise.
|
|
|
|
*/
|
2008-05-24 21:12:12 -04:00
|
|
|
VALUE
|
|
|
|
rb_eval_string_wrap(const char *str, int *state)
|
|
|
|
{
|
|
|
|
int status;
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
VALUE self = th->top_self;
|
|
|
|
VALUE wrapper = th->top_wrapper;
|
|
|
|
VALUE val;
|
|
|
|
|
|
|
|
th->top_wrapper = rb_module_new();
|
|
|
|
th->top_self = rb_obj_clone(rb_vm_top_self());
|
|
|
|
rb_extend_object(th->top_self, th->top_wrapper);
|
|
|
|
|
|
|
|
val = rb_eval_string_protect(str, &status);
|
|
|
|
|
|
|
|
th->top_self = self;
|
|
|
|
th->top_wrapper = wrapper;
|
|
|
|
|
|
|
|
if (state) {
|
|
|
|
*state = status;
|
|
|
|
}
|
|
|
|
else if (status) {
|
|
|
|
JUMP_TAG(status);
|
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_eval_cmd(VALUE cmd, VALUE arg, int level)
|
|
|
|
{
|
|
|
|
int state;
|
2013-05-15 04:06:10 -04:00
|
|
|
volatile VALUE val = Qnil; /* OK */
|
2008-05-24 21:12:12 -04:00
|
|
|
volatile int safe = rb_safe_level();
|
|
|
|
|
|
|
|
if (OBJ_TAINTED(cmd)) {
|
|
|
|
level = 4;
|
|
|
|
}
|
|
|
|
|
2011-09-29 07:07:45 -04:00
|
|
|
if (!RB_TYPE_P(cmd, T_STRING)) {
|
2008-05-24 21:12:12 -04:00
|
|
|
PUSH_TAG();
|
|
|
|
rb_set_safe_level_force(level);
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
2009-05-20 12:43:41 -04:00
|
|
|
val = rb_funcall2(cmd, rb_intern("call"), RARRAY_LENINT(arg),
|
2008-05-24 21:12:12 -04:00
|
|
|
RARRAY_PTR(arg));
|
|
|
|
}
|
|
|
|
POP_TAG();
|
|
|
|
|
|
|
|
rb_set_safe_level_force(safe);
|
|
|
|
|
|
|
|
if (state)
|
2011-09-29 07:06:42 -04:00
|
|
|
JUMP_TAG(state);
|
2008-05-24 21:12:12 -04:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
PUSH_TAG();
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
|
|
|
val = eval_string(rb_vm_top_self(), cmd, Qnil, 0, 0);
|
|
|
|
}
|
|
|
|
POP_TAG();
|
|
|
|
|
|
|
|
rb_set_safe_level_force(safe);
|
2012-10-19 09:22:03 -04:00
|
|
|
if (state) JUMP_TAG(state);
|
2008-05-24 21:12:12 -04:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* block eval under the class/module context */
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
yield_under(VALUE under, VALUE self, VALUE values)
|
|
|
|
{
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_block_t block, *blockptr;
|
2009-12-03 13:25:57 -05:00
|
|
|
NODE *cref;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-06-10 23:14:59 -04:00
|
|
|
if ((blockptr = VM_CF_BLOCK_PTR(th->cfp)) != 0) {
|
2008-05-24 21:12:12 -04:00
|
|
|
block = *blockptr;
|
|
|
|
block.self = self;
|
2012-06-10 23:14:59 -04:00
|
|
|
VM_CF_LEP(th->cfp)[0] = VM_ENVVAL_BLOCK_PTR(&block);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
2009-12-04 02:09:17 -05:00
|
|
|
cref = vm_cref_push(th, under, NOEX_PUBLIC, blockptr);
|
2009-12-03 13:25:57 -05:00
|
|
|
cref->flags |= NODE_FL_CREF_PUSHED_BY_EVAL;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
|
|
|
if (values == Qundef) {
|
2009-12-03 13:25:57 -05:00
|
|
|
return vm_yield_with_cref(th, 1, &self, cref);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
else {
|
* include/ruby/ruby.h: rename RARRAY_RAWPTR() to RARRAY_CONST_PTR().
RARRAY_RAWPTR(ary) returns (const VALUE *) type pointer and
usecase of this macro is not acquire raw pointer, but acquire
read-only pointer. So we rename to better name.
RSTRUCT_RAWPTR() is also renamed to RSTRUCT_CONST_PTR()
(I expect that nobody use it).
* array.c, compile.c, cont.c, enumerator.c, gc.c, proc.c, random.c,
string.c, struct.c, thread.c, vm_eval.c, vm_insnhelper.c:
catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-25 04:24:34 -04:00
|
|
|
return vm_yield_with_cref(th, RARRAY_LENINT(values), RARRAY_CONST_PTR(values), cref);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-07 21:37:16 -05:00
|
|
|
VALUE
|
|
|
|
rb_yield_refine_block(VALUE refinement, VALUE refinements)
|
|
|
|
{
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_block_t block, *blockptr;
|
|
|
|
NODE *cref;
|
|
|
|
|
|
|
|
if ((blockptr = VM_CF_BLOCK_PTR(th->cfp)) != 0) {
|
|
|
|
block = *blockptr;
|
|
|
|
block.self = refinement;
|
|
|
|
VM_CF_LEP(th->cfp)[0] = VM_ENVVAL_BLOCK_PTR(&block);
|
|
|
|
}
|
|
|
|
cref = vm_cref_push(th, refinement, NOEX_PUBLIC, blockptr);
|
|
|
|
cref->flags |= NODE_FL_CREF_PUSHED_BY_EVAL;
|
* include/ruby/ruby.h: rename OBJ_WRITE and OBJ_WRITTEN into
RB_OBJ_WRITE and RB_OBJ_WRITTEN.
* array.c, class.c, compile.c, hash.c, internal.h, iseq.c,
proc.c, process.c, re.c, string.c, variable.c, vm.c,
vm_eval.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-20 03:07:47 -05:00
|
|
|
RB_OBJ_WRITE(cref, &cref->nd_refinements, refinements);
|
2012-12-07 21:37:16 -05:00
|
|
|
|
|
|
|
return vm_yield_with_cref(th, 0, NULL, cref);
|
|
|
|
}
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
/* string eval under the class/module context */
|
|
|
|
static VALUE
|
2013-07-29 04:00:34 -04:00
|
|
|
eval_under(VALUE under, VALUE self, VALUE src, VALUE file, int line)
|
2008-05-24 21:12:12 -04:00
|
|
|
{
|
2009-12-03 13:25:57 -05:00
|
|
|
NODE *cref = vm_cref_push(GET_THREAD(), under, NOEX_PUBLIC, NULL);
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-08-08 09:51:32 -04:00
|
|
|
if (SPECIAL_CONST_P(self) && !NIL_P(under)) {
|
2012-08-06 11:31:13 -04:00
|
|
|
cref->flags |= NODE_FL_CREF_PUSHED_BY_EVAL;
|
|
|
|
}
|
2013-08-18 06:36:51 -04:00
|
|
|
SafeStringValue(src);
|
2008-05-24 21:12:12 -04:00
|
|
|
|
|
|
|
return eval_string_with_cref(self, src, Qnil, cref, file, line);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
specific_eval(int argc, VALUE *argv, VALUE klass, VALUE self)
|
|
|
|
{
|
|
|
|
if (rb_block_given_p()) {
|
2012-03-14 17:10:34 -04:00
|
|
|
rb_check_arity(argc, 0, 0);
|
2008-05-24 21:12:12 -04:00
|
|
|
return yield_under(klass, self, Qundef);
|
|
|
|
}
|
|
|
|
else {
|
2013-07-29 04:00:34 -04:00
|
|
|
VALUE file = Qundef;
|
2008-05-24 21:12:12 -04:00
|
|
|
int line = 1;
|
|
|
|
|
2012-03-14 17:10:34 -04:00
|
|
|
rb_check_arity(argc, 1, 3);
|
2013-08-18 06:36:51 -04:00
|
|
|
SafeStringValue(argv[0]);
|
2012-03-14 17:10:34 -04:00
|
|
|
if (argc > 2)
|
|
|
|
line = NUM2INT(argv[2]);
|
|
|
|
if (argc > 1) {
|
2013-07-29 04:00:34 -04:00
|
|
|
file = argv[1];
|
|
|
|
if (!NIL_P(file)) StringValue(file);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
return eval_under(klass, self, argv[0], file, line);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* obj.instance_eval(string [, filename [, lineno]] ) -> obj
|
|
|
|
* obj.instance_eval {| | block } -> obj
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* Evaluates a string containing Ruby source code, or the given block,
|
|
|
|
* within the context of the receiver (_obj_). In order to set the
|
|
|
|
* context, the variable +self+ is set to _obj_ while
|
|
|
|
* the code is executing, giving the code access to _obj_'s
|
|
|
|
* instance variables. In the version of <code>instance_eval</code>
|
|
|
|
* that takes a +String+, the optional second and third
|
|
|
|
* parameters supply a filename and starting line number that are used
|
|
|
|
* when reporting compilation errors.
|
|
|
|
*
|
|
|
|
* class KlassWithSecret
|
|
|
|
* def initialize
|
|
|
|
* @secret = 99
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* k = KlassWithSecret.new
|
|
|
|
* k.instance_eval { @secret } #=> 99
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_obj_instance_eval(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
VALUE klass;
|
|
|
|
|
|
|
|
if (SPECIAL_CONST_P(self)) {
|
2012-08-06 11:31:13 -04:00
|
|
|
klass = rb_special_singleton_class(self);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
klass = rb_singleton_class(self);
|
|
|
|
}
|
|
|
|
return specific_eval(argc, argv, klass, self);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* obj.instance_exec(arg...) {|var...| block } -> obj
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* Executes the given block within the context of the receiver
|
|
|
|
* (_obj_). In order to set the context, the variable +self+ is set
|
|
|
|
* to _obj_ while the code is executing, giving the code access to
|
|
|
|
* _obj_'s instance variables. Arguments are passed as block parameters.
|
|
|
|
*
|
|
|
|
* class KlassWithSecret
|
|
|
|
* def initialize
|
|
|
|
* @secret = 99
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* k = KlassWithSecret.new
|
|
|
|
* k.instance_exec(5) {|x| @secret+x } #=> 104
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_obj_instance_exec(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
VALUE klass;
|
|
|
|
|
|
|
|
if (SPECIAL_CONST_P(self)) {
|
2012-08-06 11:31:13 -04:00
|
|
|
klass = rb_special_singleton_class(self);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
klass = rb_singleton_class(self);
|
|
|
|
}
|
|
|
|
return yield_under(klass, self, rb_ary_new4(argc, argv));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* mod.class_eval(string [, filename [, lineno]]) -> obj
|
|
|
|
* mod.module_eval {|| block } -> obj
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
2012-03-16 01:28:55 -04:00
|
|
|
* Evaluates the string or block in the context of _mod_, except that when
|
2012-03-16 01:38:52 -04:00
|
|
|
* a block is given, constant/class variable lookup is not affected. This
|
|
|
|
* can be used to add methods to a class. <code>module_eval</code> returns
|
|
|
|
* the result of evaluating its argument. The optional _filename_ and
|
|
|
|
* _lineno_ parameters set the text for error messages.
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* class Thing
|
|
|
|
* end
|
|
|
|
* a = %q{def hello() "Hello there!" end}
|
|
|
|
* Thing.module_eval(a)
|
|
|
|
* puts Thing.new.hello()
|
|
|
|
* Thing.module_eval("invalid code", "dummy", 123)
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* Hello there!
|
|
|
|
* dummy:123:in `module_eval': undefined local variable
|
|
|
|
* or method `code' for Thing:Class
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_mod_module_eval(int argc, VALUE *argv, VALUE mod)
|
|
|
|
{
|
|
|
|
return specific_eval(argc, argv, mod, mod);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* mod.module_exec(arg...) {|var...| block } -> obj
|
|
|
|
* mod.class_exec(arg...) {|var...| block } -> obj
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* Evaluates the given block in the context of the class/module.
|
|
|
|
* The method defined in the block will belong to the receiver.
|
2013-06-01 10:17:14 -04:00
|
|
|
* Any arguments passed to the method will be passed to the block.
|
|
|
|
* This can be used if the block needs to access instance variables.
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* class Thing
|
|
|
|
* end
|
|
|
|
* Thing.class_exec{
|
|
|
|
* def hello() "Hello there!" end
|
|
|
|
* }
|
|
|
|
* puts Thing.new.hello()
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* Hello there!
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_mod_module_exec(int argc, VALUE *argv, VALUE mod)
|
|
|
|
{
|
|
|
|
return yield_under(mod, mod, rb_ary_new4(argc, argv));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2009-06-12 18:06:59 -04:00
|
|
|
* throw(tag [, obj])
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* Transfers control to the end of the active +catch+ block
|
2009-06-12 18:06:59 -04:00
|
|
|
* waiting for _tag_. Raises +ArgumentError+ if there
|
|
|
|
* is no +catch+ block for the _tag_. The optional second
|
2008-05-24 21:12:12 -04:00
|
|
|
* parameter supplies a return value for the +catch+ block,
|
|
|
|
* which otherwise defaults to +nil+. For examples, see
|
|
|
|
* <code>Kernel::catch</code>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_f_throw(int argc, VALUE *argv)
|
|
|
|
{
|
|
|
|
VALUE tag, value;
|
2009-03-13 05:10:07 -04:00
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", &tag, &value);
|
|
|
|
rb_throw_obj(tag, value);
|
2012-04-13 20:36:26 -04:00
|
|
|
UNREACHABLE;
|
2009-03-13 05:10:07 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
rb_throw_obj(VALUE tag, VALUE value)
|
|
|
|
{
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
struct rb_vm_tag *tt = th->tag;
|
|
|
|
|
|
|
|
while (tt) {
|
|
|
|
if (tt->tag == tag) {
|
|
|
|
tt->retval = value;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tt = tt->prev;
|
|
|
|
}
|
|
|
|
if (!tt) {
|
|
|
|
VALUE desc = rb_inspect(tag);
|
2013-06-24 07:31:21 -04:00
|
|
|
rb_raise(rb_eArgError, "uncaught throw %"PRIsVALUE, desc);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
th->errinfo = NEW_THROW_OBJECT(tag, 0, TAG_THROW);
|
|
|
|
|
|
|
|
JUMP_TAG(TAG_THROW);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
rb_throw(const char *tag, VALUE val)
|
|
|
|
{
|
2009-03-13 05:10:07 -04:00
|
|
|
rb_throw_obj(ID2SYM(rb_intern(tag)), val);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
|
2009-09-15 17:18:04 -04:00
|
|
|
static VALUE
|
* compile.c, cont.c, gc.c, insns.def, iseq.c, iseq.h, process.c,
thread.c, vm.c, vm_core.h, vm_dump.c, vm_eval.c,
vm_insnhelper.c, vm_method.c, template/insns_info.inc.tmpl,
tool/instruction.rb: fixed types.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-09-21 16:58:26 -04:00
|
|
|
catch_i(VALUE tag, VALUE data)
|
|
|
|
{
|
2009-09-15 17:18:04 -04:00
|
|
|
return rb_yield_0(1, &tag);
|
|
|
|
}
|
* compile.c, cont.c, gc.c, insns.def, iseq.c, iseq.h, process.c,
thread.c, vm.c, vm_core.h, vm_dump.c, vm_eval.c,
vm_insnhelper.c, vm_method.c, template/insns_info.inc.tmpl,
tool/instruction.rb: fixed types.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-09-21 16:58:26 -04:00
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* catch([arg]) {|tag| block } -> obj
|
2008-05-24 21:12:12 -04:00
|
|
|
*
|
|
|
|
* +catch+ executes its block. If a +throw+ is
|
|
|
|
* executed, Ruby searches up its stack for a +catch+ block
|
|
|
|
* with a tag corresponding to the +throw+'s
|
2009-06-12 18:06:59 -04:00
|
|
|
* _tag_. If found, that block is terminated, and
|
2008-05-24 21:12:12 -04:00
|
|
|
* +catch+ returns the value given to +throw+. If
|
|
|
|
* +throw+ is not called, the block terminates normally, and
|
|
|
|
* the value of +catch+ is the value of the last expression
|
|
|
|
* evaluated. +catch+ expressions may be nested, and the
|
|
|
|
* +throw+ call need not be in lexical scope.
|
|
|
|
*
|
|
|
|
* def routine(n)
|
|
|
|
* puts n
|
|
|
|
* throw :done if n <= 0
|
|
|
|
* routine(n-1)
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* catch(:done) { routine(3) }
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* 3
|
|
|
|
* 2
|
|
|
|
* 1
|
|
|
|
* 0
|
2009-06-12 18:06:59 -04:00
|
|
|
*
|
|
|
|
* when _arg_ is given, +catch+ yields it as is, or when no
|
|
|
|
* _arg_ is given, +catch+ assigns a new unique object to
|
2009-11-03 12:46:28 -05:00
|
|
|
* +throw+. this is useful for nested +catch+. _arg_ can
|
2009-06-12 18:06:59 -04:00
|
|
|
* be an arbitrary object, not only Symbol.
|
|
|
|
*
|
2008-05-24 21:12:12 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_f_catch(int argc, VALUE *argv)
|
|
|
|
{
|
|
|
|
VALUE tag;
|
|
|
|
|
|
|
|
if (argc == 0) {
|
|
|
|
tag = rb_obj_alloc(rb_cObject);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_scan_args(argc, argv, "01", &tag);
|
|
|
|
}
|
2009-09-15 17:18:04 -04:00
|
|
|
return rb_catch_obj(tag, catch_i, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_catch(const char *tag, VALUE (*func)(), VALUE data)
|
|
|
|
{
|
|
|
|
VALUE vtag = tag ? ID2SYM(rb_intern(tag)) : rb_obj_alloc(rb_cObject);
|
|
|
|
return rb_catch_obj(vtag, func, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2013-05-16 04:17:00 -04:00
|
|
|
rb_catch_obj(VALUE t, VALUE (*func)(), VALUE data)
|
2013-12-03 07:53:18 -05:00
|
|
|
{
|
|
|
|
int state;
|
2013-12-05 00:26:25 -05:00
|
|
|
VALUE val = rb_catch_protect(t, (rb_block_call_func *)func, data, &state);
|
2013-12-03 07:53:18 -05:00
|
|
|
if (state)
|
|
|
|
JUMP_TAG(state);
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_catch_protect(VALUE t, rb_block_call_func *func, VALUE data, int *stateptr)
|
2009-09-15 17:18:04 -04:00
|
|
|
{
|
|
|
|
int state;
|
|
|
|
volatile VALUE val = Qnil; /* OK */
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_control_frame_t *saved_cfp = th->cfp;
|
2013-05-16 04:17:00 -04:00
|
|
|
volatile VALUE tag = t;
|
2009-09-15 17:18:04 -04:00
|
|
|
|
2012-10-19 03:57:56 -04:00
|
|
|
TH_PUSH_TAG(th);
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2013-11-18 08:47:56 -05:00
|
|
|
_tag.tag = tag;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
2012-10-19 03:57:56 -04:00
|
|
|
if ((state = TH_EXEC_TAG()) == 0) {
|
2009-09-15 17:18:04 -04:00
|
|
|
/* call with argc=1, argv = [tag], block = Qnil to insure compatibility */
|
2013-12-03 07:53:18 -05:00
|
|
|
val = (*func)(tag, data, 1, (const VALUE *)&tag, Qnil);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|
|
|
|
else if (state == TAG_THROW && RNODE(th->errinfo)->u1.value == tag) {
|
|
|
|
th->cfp = saved_cfp;
|
|
|
|
val = th->tag->retval;
|
|
|
|
th->errinfo = Qnil;
|
|
|
|
state = 0;
|
|
|
|
}
|
2012-10-19 03:57:56 -04:00
|
|
|
TH_POP_TAG();
|
2013-12-03 07:53:18 -05:00
|
|
|
if (stateptr)
|
|
|
|
*stateptr = state;
|
2008-05-24 21:12:12 -04:00
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2009-01-18 19:13:44 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* local_variables -> array
|
2009-01-18 19:13:44 -05:00
|
|
|
*
|
|
|
|
* Returns the names of the current local variables.
|
|
|
|
*
|
|
|
|
* fred = 1
|
|
|
|
* for i in 1..10
|
|
|
|
* # ...
|
|
|
|
* end
|
2009-06-12 18:08:46 -04:00
|
|
|
* local_variables #=> [:fred, :i]
|
2009-01-18 19:13:44 -05:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_f_local_variables(void)
|
|
|
|
{
|
|
|
|
VALUE ary = rb_ary_new();
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_control_frame_t *cfp =
|
|
|
|
vm_get_ruby_level_caller_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp));
|
|
|
|
int i;
|
|
|
|
|
|
|
|
while (cfp) {
|
|
|
|
if (cfp->iseq) {
|
|
|
|
for (i = 0; i < cfp->iseq->local_table_size; i++) {
|
|
|
|
ID lid = cfp->iseq->local_table[i];
|
|
|
|
if (lid) {
|
|
|
|
const char *vname = rb_id2name(lid);
|
|
|
|
/* should skip temporary variable */
|
|
|
|
if (vname) {
|
|
|
|
rb_ary_push(ary, ID2SYM(lid));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-06-10 23:14:59 -04:00
|
|
|
if (!VM_EP_LEP_P(cfp->ep)) {
|
2009-01-18 19:13:44 -05:00
|
|
|
/* block */
|
2012-06-10 23:14:59 -04:00
|
|
|
VALUE *ep = VM_CF_PREV_EP(cfp);
|
2009-01-18 19:13:44 -05:00
|
|
|
|
2012-06-10 23:14:59 -04:00
|
|
|
if (vm_collect_local_variables_in_heap(th, ep, ary)) {
|
2009-01-18 19:13:44 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
2012-06-10 23:14:59 -04:00
|
|
|
while (cfp->ep != ep) {
|
2009-01-18 19:13:44 -05:00
|
|
|
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2009-01-18 22:03:09 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* block_given? -> true or false
|
|
|
|
* iterator? -> true or false
|
2009-01-18 22:03:09 -05:00
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <code>yield</code> would execute a
|
|
|
|
* block in the current context. The <code>iterator?</code> form
|
|
|
|
* is mildly deprecated.
|
|
|
|
*
|
|
|
|
* def try
|
|
|
|
* if block_given?
|
|
|
|
* yield
|
|
|
|
* else
|
|
|
|
* "no block"
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* try #=> "no block"
|
|
|
|
* try { "hello" } #=> "hello"
|
|
|
|
* try do "hello" end #=> "hello"
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_f_block_given_p(void)
|
|
|
|
{
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_control_frame_t *cfp = th->cfp;
|
|
|
|
cfp = vm_get_ruby_level_caller_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp));
|
|
|
|
|
2012-06-10 23:14:59 -04:00
|
|
|
if (cfp != 0 && VM_CF_BLOCK_PTR(cfp)) {
|
2009-01-18 22:03:09 -05:00
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-16 13:40:00 -04:00
|
|
|
VALUE
|
|
|
|
rb_current_realfilepath(void)
|
|
|
|
{
|
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_control_frame_t *cfp = th->cfp;
|
|
|
|
cfp = vm_get_ruby_level_caller_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp));
|
2012-06-03 22:49:37 -04:00
|
|
|
if (cfp != 0) return cfp->iseq->location.absolute_path;
|
2010-03-16 13:40:00 -04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
void
|
|
|
|
Init_vm_eval(void)
|
|
|
|
{
|
2008-09-25 14:04:34 -04:00
|
|
|
rb_define_global_function("eval", rb_f_eval, -1);
|
2009-01-18 19:13:44 -05:00
|
|
|
rb_define_global_function("local_variables", rb_f_local_variables, 0);
|
2009-01-18 22:03:09 -05:00
|
|
|
rb_define_global_function("iterator?", rb_f_block_given_p, 0);
|
|
|
|
rb_define_global_function("block_given?", rb_f_block_given_p, 0);
|
2009-01-18 19:13:44 -05:00
|
|
|
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_define_global_function("catch", rb_f_catch, -1);
|
|
|
|
rb_define_global_function("throw", rb_f_throw, -1);
|
|
|
|
|
|
|
|
rb_define_global_function("loop", rb_f_loop, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cBasicObject, "instance_eval", rb_obj_instance_eval, -1);
|
|
|
|
rb_define_method(rb_cBasicObject, "instance_exec", rb_obj_instance_exec, -1);
|
|
|
|
rb_define_private_method(rb_cBasicObject, "method_missing", rb_method_missing, -1);
|
|
|
|
|
2009-07-15 10:59:41 -04:00
|
|
|
#if 1
|
|
|
|
rb_add_method(rb_cBasicObject, rb_intern("__send__"),
|
|
|
|
VM_METHOD_TYPE_OPTIMIZED, (void *)OPTIMIZED_METHOD_TYPE_SEND, 0);
|
|
|
|
rb_add_method(rb_mKernel, rb_intern("send"),
|
|
|
|
VM_METHOD_TYPE_OPTIMIZED, (void *)OPTIMIZED_METHOD_TYPE_SEND, 0);
|
|
|
|
#else
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_define_method(rb_cBasicObject, "__send__", rb_f_send, -1);
|
|
|
|
rb_define_method(rb_mKernel, "send", rb_f_send, -1);
|
2009-07-15 10:59:41 -04:00
|
|
|
#endif
|
2008-05-24 21:12:12 -04:00
|
|
|
rb_define_method(rb_mKernel, "public_send", rb_f_public_send, -1);
|
|
|
|
|
|
|
|
rb_define_method(rb_cModule, "module_exec", rb_mod_module_exec, -1);
|
|
|
|
rb_define_method(rb_cModule, "class_exec", rb_mod_module_exec, -1);
|
2008-09-25 14:04:34 -04:00
|
|
|
rb_define_method(rb_cModule, "module_eval", rb_mod_module_eval, -1);
|
|
|
|
rb_define_method(rb_cModule, "class_eval", rb_mod_module_eval, -1);
|
2008-05-24 21:12:12 -04:00
|
|
|
}
|