2007-02-02 18:21:41 +03:00
|
|
|
/**********************************************************************
|
|
|
|
|
2007-08-30 09:06:52 +04:00
|
|
|
proc.c - Proc, Binding, Env
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Wed Jan 17 12:13:14 2007
|
|
|
|
|
|
|
|
Copyright (C) 2004-2007 Koichi Sasada
|
|
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
#include "eval_intern.h"
|
|
|
|
#include "gc.h"
|
|
|
|
|
|
|
|
struct METHOD {
|
2007-11-22 04:17:52 +03:00
|
|
|
VALUE oclass; /* class that holds the method */
|
2008-02-09 12:49:31 +03:00
|
|
|
VALUE rclass; /* class of the receiver */
|
2007-02-02 18:21:41 +03:00
|
|
|
VALUE recv;
|
|
|
|
ID id, oid;
|
|
|
|
NODE *body;
|
|
|
|
};
|
|
|
|
|
|
|
|
VALUE rb_cUnboundMethod;
|
|
|
|
VALUE rb_cMethod;
|
|
|
|
VALUE rb_cBinding;
|
|
|
|
VALUE rb_cProc;
|
|
|
|
|
|
|
|
static VALUE bmcall(VALUE, VALUE);
|
|
|
|
static int method_arity(VALUE);
|
|
|
|
static VALUE rb_obj_is_method(VALUE m);
|
|
|
|
|
|
|
|
/* Proc */
|
|
|
|
|
|
|
|
static void
|
|
|
|
proc_free(void *ptr)
|
|
|
|
{
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_FREE_ENTER("proc");
|
2007-02-02 18:21:41 +03:00
|
|
|
if (ptr) {
|
|
|
|
ruby_xfree(ptr);
|
|
|
|
}
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_FREE_LEAVE("proc");
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
proc_mark(void *ptr)
|
|
|
|
{
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_proc_t *proc;
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_MARK_ENTER("proc");
|
2007-02-02 18:21:41 +03:00
|
|
|
if (ptr) {
|
|
|
|
proc = ptr;
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_MARK_UNLESS_NULL(proc->envval);
|
|
|
|
RUBY_MARK_UNLESS_NULL(proc->blockprocval);
|
|
|
|
RUBY_MARK_UNLESS_NULL(proc->block.proc);
|
2008-01-11 14:20:18 +03:00
|
|
|
RUBY_MARK_UNLESS_NULL(proc->block.self);
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
if (proc->block.iseq && RUBY_VM_IFUNC_P(proc->block.iseq)) {
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_MARK_UNLESS_NULL((VALUE)(proc->block.iseq));
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
}
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_MARK_LEAVE("proc");
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
* blockinlining.c: remove "yarv" prefix.
* array.c, numeric.c: ditto.
* insnhelper.ci, insns.def, vm_evalbody.ci: ditto.
* yarvcore.c: removed.
* yarvcore.h: renamed to core.h.
* cont.c, debug.c, error.c, process.c, signal.c : ditto.
* ext/probeprofiler/probeprofiler.c: ditto.
* id.c, id.h: added.
* inits.c: ditto.
* compile.c: rename internal functions.
* compile.h: fix debug flag.
* eval.c, object.c, vm.c: remove ruby_top_self.
use rb_vm_top_self() instead.
* eval_intern.h, eval_load: ditto.
* gc.c: rename yarv_machine_stack_mark() to
rb_gc_mark_machine_stack().
* insnhelper.h: remove unused macros.
* iseq.c: add iseq_compile() to create iseq object
from source string.
* proc.c: rename a internal function.
* template/insns.inc.tmpl: remove YARV prefix.
* thread.c:
* vm.c (rb_iseq_eval): added.
* vm.c: move some functions from yarvcore.c.
* vm_dump.c: fix to remove compiler warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-12 08:25:46 +04:00
|
|
|
VALUE
|
|
|
|
rb_proc_alloc(VALUE klass)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
VALUE obj;
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_proc_t *proc;
|
|
|
|
obj = Data_Make_Struct(klass, rb_proc_t, proc_mark, proc_free, proc);
|
|
|
|
MEMZERO(proc, rb_proc_t, 1);
|
2007-02-02 18:21:41 +03:00
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_obj_is_proc(VALUE proc)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
if (TYPE(proc) == T_DATA &&
|
|
|
|
RDATA(proc)->dfree == (RUBY_DATA_FUNC) proc_free) {
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_dup(VALUE self)
|
|
|
|
{
|
* blockinlining.c: remove "yarv" prefix.
* array.c, numeric.c: ditto.
* insnhelper.ci, insns.def, vm_evalbody.ci: ditto.
* yarvcore.c: removed.
* yarvcore.h: renamed to core.h.
* cont.c, debug.c, error.c, process.c, signal.c : ditto.
* ext/probeprofiler/probeprofiler.c: ditto.
* id.c, id.h: added.
* inits.c: ditto.
* compile.c: rename internal functions.
* compile.h: fix debug flag.
* eval.c, object.c, vm.c: remove ruby_top_self.
use rb_vm_top_self() instead.
* eval_intern.h, eval_load: ditto.
* gc.c: rename yarv_machine_stack_mark() to
rb_gc_mark_machine_stack().
* insnhelper.h: remove unused macros.
* iseq.c: add iseq_compile() to create iseq object
from source string.
* proc.c: rename a internal function.
* template/insns.inc.tmpl: remove YARV prefix.
* thread.c:
* vm.c (rb_iseq_eval): added.
* vm.c: move some functions from yarvcore.c.
* vm_dump.c: fix to remove compiler warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-12 08:25:46 +04:00
|
|
|
VALUE procval = rb_proc_alloc(rb_cProc);
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_proc_t *src, *dst;
|
2007-02-02 18:21:41 +03:00
|
|
|
GetProcPtr(self, src);
|
|
|
|
GetProcPtr(procval, dst);
|
|
|
|
|
|
|
|
dst->block = src->block;
|
2007-10-02 02:02:23 +04:00
|
|
|
dst->block.proc = procval;
|
2007-02-02 18:21:41 +03:00
|
|
|
dst->envval = src->envval;
|
2008-05-22 00:47:26 +04:00
|
|
|
dst->safe_level = src->safe_level;
|
2008-03-30 18:50:55 +04:00
|
|
|
dst->is_lambda = src->is_lambda;
|
2007-10-02 02:02:23 +04:00
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
return procval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_clone(VALUE self)
|
|
|
|
{
|
|
|
|
VALUE procval = proc_dup(self);
|
|
|
|
CLONESETUP(procval, self);
|
|
|
|
return procval;
|
|
|
|
}
|
|
|
|
|
2007-12-23 18:36:00 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* prc.lambda? => true or false
|
|
|
|
*
|
2007-12-26 06:49:10 +03:00
|
|
|
* Returns true for a Proc object which argument handling is rigid.
|
2007-12-23 18:36:00 +03:00
|
|
|
* Such procs are typically generated by lambda.
|
|
|
|
*
|
2007-12-26 06:49:10 +03:00
|
|
|
* A Proc object generated by proc ignore extra arguments.
|
|
|
|
*
|
|
|
|
* proc {|a,b| [a,b] }.call(1,2,3) => [1,2]
|
|
|
|
*
|
|
|
|
* It provides nil for lacked arguments.
|
|
|
|
*
|
|
|
|
* proc {|a,b| [a,b] }.call(1) => [1,nil]
|
|
|
|
*
|
|
|
|
* It expand single-array argument.
|
|
|
|
*
|
|
|
|
* proc {|a,b| [a,b] }.call([1,2]) => [1,2]
|
|
|
|
*
|
|
|
|
* A Proc object generated by lambda doesn't have such tricks.
|
|
|
|
*
|
|
|
|
* lambda {|a,b| [a,b] }.call(1,2,3) => ArgumentError
|
|
|
|
* lambda {|a,b| [a,b] }.call(1) => ArgumentError
|
|
|
|
* lambda {|a,b| [a,b] }.call([1,2]) => ArgumentError
|
|
|
|
*
|
|
|
|
* Proc#lambda? is a predicate for the tricks.
|
|
|
|
* It returns true if no tricks.
|
2007-12-23 18:36:00 +03:00
|
|
|
*
|
2007-12-26 06:49:10 +03:00
|
|
|
* lambda {}.lambda? => true
|
2007-12-23 18:36:00 +03:00
|
|
|
* proc {}.lambda? => false
|
2007-12-26 06:49:10 +03:00
|
|
|
*
|
|
|
|
* Proc.new is same as proc.
|
2007-12-24 09:56:06 +03:00
|
|
|
*
|
2007-12-23 18:36:00 +03:00
|
|
|
* Proc.new {}.lambda? => false
|
|
|
|
*
|
2007-12-26 06:49:10 +03:00
|
|
|
* lambda, proc and Proc.new preserves the tricks of
|
|
|
|
* a Proc object given by & argument.
|
|
|
|
*
|
|
|
|
* lambda(&lambda {}).lambda? => true
|
|
|
|
* proc(&lambda {}).lambda? => true
|
|
|
|
* Proc.new(&lambda {}).lambda? => true
|
|
|
|
*
|
|
|
|
* lambda(&proc {}).lambda? => false
|
|
|
|
* proc(&proc {}).lambda? => false
|
|
|
|
* Proc.new(&proc {}).lambda? => false
|
|
|
|
*
|
|
|
|
* A Proc object generated by & argument has the tricks
|
2007-12-23 18:36:00 +03:00
|
|
|
*
|
|
|
|
* def n(&b) b.lambda? end
|
|
|
|
* n {} => false
|
2007-12-26 06:49:10 +03:00
|
|
|
*
|
|
|
|
* The & argument preserves the tricks if a Proc object is given
|
|
|
|
* by & argument.
|
|
|
|
*
|
|
|
|
* n(&lambda {}) => true
|
2007-12-23 18:36:00 +03:00
|
|
|
* n(&proc {}) => false
|
|
|
|
* n(&Proc.new {}) => false
|
2007-12-26 06:49:10 +03:00
|
|
|
*
|
|
|
|
* A Proc object converted from a method has no tricks.
|
|
|
|
*
|
|
|
|
* def m() end
|
|
|
|
* method(:m).to_proc.lambda? => true
|
|
|
|
*
|
2007-12-24 09:56:06 +03:00
|
|
|
* n(&method(:m)) => true
|
2008-02-09 12:49:31 +03:00
|
|
|
* n(&method(:m).to_proc) => true
|
2007-12-23 18:36:00 +03:00
|
|
|
*
|
2007-12-26 06:49:10 +03:00
|
|
|
* define_method is treated same as method definition.
|
|
|
|
* The defined method has no tricks.
|
|
|
|
*
|
2007-12-24 21:36:30 +03:00
|
|
|
* class C
|
|
|
|
* define_method(:d) {}
|
|
|
|
* end
|
2007-12-26 06:49:10 +03:00
|
|
|
* C.new.e(1,2) => ArgumentError
|
2007-12-24 21:36:30 +03:00
|
|
|
* C.new.method(:d).to_proc.lambda? => true
|
|
|
|
*
|
2007-12-26 06:49:10 +03:00
|
|
|
* define_method always defines a method without the tricks,
|
|
|
|
* even if a non-lambda Proc object is given.
|
2008-01-05 06:35:13 +03:00
|
|
|
* This is the only exception which the tricks are not preserved.
|
2007-12-26 06:49:10 +03:00
|
|
|
*
|
|
|
|
* class C
|
|
|
|
* define_method(:e, &proc {})
|
|
|
|
* end
|
|
|
|
* C.new.e(1,2) => ArgumentError
|
|
|
|
* C.new.method(:e).to_proc.lambda? => true
|
|
|
|
*
|
|
|
|
* This exception is for a wrapper of define_method.
|
|
|
|
* It eases defining a method defining method which defines a usual method which has no tricks.
|
|
|
|
*
|
|
|
|
* class << C
|
|
|
|
* def def2(name, &body)
|
|
|
|
* define_method(name, &body)
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* class C
|
|
|
|
* def2(:f) {}
|
|
|
|
* end
|
|
|
|
* C.new.f(1,2) => ArgumentError
|
|
|
|
*
|
|
|
|
* The wrapper, def2, defines a method which has no tricks.
|
|
|
|
*
|
2007-12-23 18:36:00 +03:00
|
|
|
*/
|
|
|
|
|
2007-06-05 21:26:00 +04:00
|
|
|
static VALUE
|
|
|
|
proc_lambda_p(VALUE procval)
|
|
|
|
{
|
|
|
|
rb_proc_t *proc;
|
|
|
|
GetProcPtr(procval, proc);
|
|
|
|
|
|
|
|
return proc->is_lambda ? Qtrue : Qfalse;
|
|
|
|
}
|
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
/* Binding */
|
|
|
|
|
|
|
|
static void
|
|
|
|
binding_free(void *ptr)
|
|
|
|
{
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_binding_t *bind;
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_FREE_ENTER("binding");
|
2007-02-02 18:21:41 +03:00
|
|
|
if (ptr) {
|
|
|
|
bind = ptr;
|
|
|
|
ruby_xfree(ptr);
|
|
|
|
}
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_FREE_LEAVE("binding");
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
binding_mark(void *ptr)
|
|
|
|
{
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_binding_t *bind;
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_MARK_ENTER("binding");
|
2007-02-02 18:21:41 +03:00
|
|
|
if (ptr) {
|
|
|
|
bind = ptr;
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_MARK_UNLESS_NULL(bind->env);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
2007-06-25 06:44:20 +04:00
|
|
|
RUBY_MARK_LEAVE("binding");
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
binding_alloc(VALUE klass)
|
|
|
|
{
|
|
|
|
VALUE obj;
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_binding_t *bind;
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
obj = Data_Make_Struct(klass, rb_binding_t, binding_mark, binding_free, bind);
|
2007-02-02 18:21:41 +03:00
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
binding_dup(VALUE self)
|
|
|
|
{
|
|
|
|
VALUE bindval = binding_alloc(rb_cBinding);
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_binding_t *src, *dst;
|
2007-02-02 18:21:41 +03:00
|
|
|
GetBindingPtr(self, src);
|
|
|
|
GetBindingPtr(bindval, dst);
|
|
|
|
dst->env = src->env;
|
|
|
|
return bindval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
binding_clone(VALUE self)
|
|
|
|
{
|
|
|
|
VALUE bindval = binding_dup(self);
|
|
|
|
CLONESETUP(bindval, self);
|
|
|
|
return bindval;
|
|
|
|
}
|
|
|
|
|
2008-07-01 21:11:35 +04:00
|
|
|
rb_control_frame_t *vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
|
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
VALUE
|
|
|
|
rb_binding_new(void)
|
|
|
|
{
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 09:37:46 +03:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
2008-07-01 21:11:35 +04:00
|
|
|
rb_control_frame_t *cfp = vm_get_ruby_level_next_cfp(th, th->cfp);
|
2007-02-02 18:21:41 +03:00
|
|
|
VALUE bindval = binding_alloc(rb_cBinding);
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_binding_t *bind;
|
2007-02-02 18:21:41 +03:00
|
|
|
|
* 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-11 01:46:43 +04:00
|
|
|
if (cfp == 0) {
|
|
|
|
rb_raise(rb_eRuntimeError, "Can't create Binding Object on top of Fiber.");
|
|
|
|
}
|
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
GetBindingPtr(bindval, bind);
|
* vm.c: some refactoring.
* rename th_* to vm_*.
* remove unused variables functions.
* add prototypes.
* blockinlining.c, compile.c, cont.c, eval.c, eval_intern.h,
eval_jump.h, eval_load.c, inits.c, insns.def, iseq.c, parse.y,
proc.c, process.c, signal.c, thread.c, vm.c, vm_dump.c,
vm_evalbody.ci, yarvcore.c, yarvcore.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-24 19:42:41 +04:00
|
|
|
bind->env = vm_make_env_object(th, cfp);
|
2007-02-02 18:21:41 +03:00
|
|
|
return bindval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* binding -> a_binding
|
|
|
|
*
|
|
|
|
* Returns a +Binding+ object, describing the variable and
|
|
|
|
* method bindings at the point of call. This object can be used when
|
|
|
|
* calling +eval+ to execute the evaluated command in this
|
|
|
|
* environment. Also see the description of class +Binding+.
|
|
|
|
*
|
|
|
|
* def getBinding(param)
|
|
|
|
* return binding
|
|
|
|
* end
|
|
|
|
* b = getBinding("hello")
|
|
|
|
* eval("param", b) #=> "hello"
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_f_binding(VALUE self)
|
|
|
|
{
|
|
|
|
return rb_binding_new();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* binding.eval(string [, filename [,lineno]]) => obj
|
|
|
|
*
|
|
|
|
* Evaluates the Ruby expression(s) in <em>string</em>, in the
|
|
|
|
* <em>binding</em>'s context. If the optional <em>filename</em> and
|
|
|
|
* <em>lineno</em> parameters are present, they will be used when
|
|
|
|
* reporting syntax errors.
|
|
|
|
*
|
|
|
|
* def getBinding(param)
|
|
|
|
* return binding
|
|
|
|
* end
|
|
|
|
* b = getBinding("hello")
|
|
|
|
* b.eval("param") #=> "hello"
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-02-05 21:50:35 +03:00
|
|
|
bind_eval(int argc, VALUE *argv, VALUE bindval)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
2007-02-05 21:50:35 +03:00
|
|
|
VALUE args[4];
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "12", &args[0], &args[2], &args[3]);
|
|
|
|
args[1] = bindval;
|
|
|
|
return rb_f_eval(argc+1, args, Qnil /* self will be searched in eval */);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_new(VALUE klass, int is_lambda)
|
|
|
|
{
|
|
|
|
VALUE procval = Qnil;
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 09:37:46 +03:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_control_frame_t *cfp = th->cfp;
|
|
|
|
rb_block_t *block;
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
if ((GC_GUARDED_PTR_REF(cfp->lfp[0])) != 0 &&
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
!RUBY_VM_CLASS_SPECIAL_P(cfp->lfp[0])) {
|
2007-05-01 08:35:58 +04:00
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
block = GC_GUARDED_PTR_REF(cfp->lfp[0]);
|
2007-05-01 08:35:58 +04:00
|
|
|
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
else {
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
|
2007-05-01 08:35:58 +04:00
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
if ((GC_GUARDED_PTR_REF(cfp->lfp[0])) != 0 &&
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
!RUBY_VM_CLASS_SPECIAL_P(cfp->lfp[0])) {
|
2007-05-01 08:35:58 +04:00
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
block = GC_GUARDED_PTR_REF(cfp->lfp[0]);
|
|
|
|
|
2008-06-19 19:43:25 +04:00
|
|
|
if (block->proc) {
|
|
|
|
return block->proc;
|
|
|
|
}
|
|
|
|
|
2007-05-01 08:35:58 +04:00
|
|
|
/* TODO: check more (cfp limit, called via cfunc, etc) */
|
|
|
|
while (cfp->dfp != block->dfp) {
|
|
|
|
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
|
|
|
|
}
|
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
if (is_lambda) {
|
|
|
|
rb_warn("tried to create Proc object without a block");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_raise(rb_eArgError,
|
|
|
|
"tried to create Proc object without a block");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-06-29 11:42:16 +04:00
|
|
|
if (block->proc) {
|
|
|
|
return block->proc;
|
|
|
|
}
|
|
|
|
|
* vm.c: some refactoring.
* rename th_* to vm_*.
* remove unused variables functions.
* add prototypes.
* blockinlining.c, compile.c, cont.c, eval.c, eval_intern.h,
eval_jump.h, eval_load.c, inits.c, insns.def, iseq.c, parse.y,
proc.c, process.c, signal.c, thread.c, vm.c, vm_dump.c,
vm_evalbody.ci, yarvcore.c, yarvcore.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-24 19:42:41 +04:00
|
|
|
procval = vm_make_proc(th, cfp, block);
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
if (is_lambda) {
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_proc_t *proc;
|
2007-02-02 18:21:41 +03:00
|
|
|
GetProcPtr(procval, proc);
|
|
|
|
proc->is_lambda = Qtrue;
|
|
|
|
}
|
|
|
|
return procval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Proc.new {|...| block } => a_proc
|
|
|
|
* Proc.new => a_proc
|
|
|
|
*
|
|
|
|
* Creates a new <code>Proc</code> object, bound to the current
|
|
|
|
* context. <code>Proc::new</code> may be called without a block only
|
|
|
|
* within a method with an attached block, in which case that block is
|
|
|
|
* converted to the <code>Proc</code> object.
|
|
|
|
*
|
|
|
|
* def proc_from
|
|
|
|
* Proc.new
|
|
|
|
* end
|
|
|
|
* proc = proc_from { "hello" }
|
|
|
|
* proc.call #=> "hello"
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-12-05 10:18:52 +03:00
|
|
|
rb_proc_s_new(int argc, VALUE *argv, VALUE klass)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
2007-12-05 10:18:52 +03:00
|
|
|
VALUE block = proc_new(klass, Qfalse);
|
|
|
|
|
|
|
|
rb_obj_call_init(block, argc, argv);
|
|
|
|
return block;
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* proc { |...| block } => a_proc
|
|
|
|
*
|
|
|
|
* Equivalent to <code>Proc.new</code>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_block_proc(void)
|
|
|
|
{
|
|
|
|
return proc_new(rb_cProc, Qfalse);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_block_lambda(void)
|
|
|
|
{
|
|
|
|
return proc_new(rb_cProc, Qtrue);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_f_lambda(void)
|
|
|
|
{
|
|
|
|
rb_warn("rb_f_lambda() is deprecated; use rb_block_proc() instead");
|
|
|
|
return rb_block_lambda();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* lambda { |...| block } => a_proc
|
|
|
|
*
|
|
|
|
* Equivalent to <code>Proc.new</code>, except the resulting Proc objects
|
|
|
|
* check the number of parameters passed when called.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_lambda(void)
|
|
|
|
{
|
|
|
|
return rb_block_lambda();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* CHECKME: are the argument checking semantics correct? */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* prc.call(params,...) => obj
|
|
|
|
* prc[params,...] => obj
|
|
|
|
*
|
|
|
|
* Invokes the block, setting the block's parameters to the values in
|
|
|
|
* <i>params</i> using something close to method calling semantics.
|
|
|
|
* Generates a warning if multiple values are passed to a proc that
|
|
|
|
* expects just one (previously this silently converted the parameters
|
|
|
|
* to an array).
|
|
|
|
*
|
|
|
|
* For procs created using <code>Kernel.proc</code>, generates an
|
|
|
|
* error if the wrong number of parameters
|
|
|
|
* are passed to a proc with multiple parameters. For procs created using
|
|
|
|
* <code>Proc.new</code>, extra parameters are silently discarded.
|
|
|
|
*
|
|
|
|
* Returns the value of the last expression evaluated in the block. See
|
|
|
|
* also <code>Proc#yield</code>.
|
|
|
|
*
|
|
|
|
* a_proc = Proc.new {|a, *b| b.collect {|i| i*a }}
|
|
|
|
* a_proc.call(9, 1, 2, 3) #=> [9, 18, 27]
|
|
|
|
* a_proc[9, 1, 2, 3] #=> [9, 18, 27]
|
|
|
|
* a_proc = Proc.new {|a,b| a}
|
|
|
|
* a_proc.call(1,2,3)
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* prog.rb:5: wrong number of arguments (3 for 2) (ArgumentError)
|
|
|
|
* from prog.rb:4:in `call'
|
|
|
|
* from prog.rb:5
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_call(int argc, VALUE *argv, VALUE procval)
|
|
|
|
{
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_proc_t *proc;
|
2007-12-20 10:07:35 +03:00
|
|
|
rb_block_t *blockptr = 0;
|
2007-02-02 18:21:41 +03:00
|
|
|
GetProcPtr(procval, proc);
|
2007-05-01 08:35:58 +04:00
|
|
|
|
2008-06-09 19:52:51 +04:00
|
|
|
if (BUILTIN_TYPE(proc->block.iseq) == T_NODE ||
|
2007-12-20 10:07:35 +03:00
|
|
|
proc->block.iseq->arg_block != -1) {
|
2007-02-02 18:21:41 +03:00
|
|
|
|
2007-12-20 10:07:35 +03:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
rb_proc_t *proc;
|
|
|
|
VALUE procval;
|
|
|
|
procval = rb_block_proc();
|
|
|
|
GetProcPtr(procval, proc);
|
|
|
|
blockptr = &proc->block;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
|
|
|
|
argc, argv, blockptr);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2008-06-10 20:33:51 +04:00
|
|
|
rb_proc_call(VALUE self, VALUE args)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
2007-12-20 10:07:35 +03:00
|
|
|
rb_proc_t *proc;
|
|
|
|
GetProcPtr(self, proc);
|
|
|
|
return vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
|
2008-06-10 20:33:51 +04:00
|
|
|
RARRAY_LEN(args), RARRAY_PTR(args), 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval)
|
|
|
|
{
|
|
|
|
rb_proc_t *proc, *pass_proc = 0;
|
|
|
|
GetProcPtr(self, proc);
|
|
|
|
|
|
|
|
if (!NIL_P(pass_procval)) {
|
|
|
|
GetProcPtr(pass_procval, pass_proc);
|
|
|
|
}
|
|
|
|
|
|
|
|
return vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
|
|
|
|
argc, argv, &pass_proc->block);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* prc.arity -> fixnum
|
|
|
|
*
|
|
|
|
* Returns the number of arguments that would not be ignored. If the block
|
|
|
|
* is declared to take no arguments, returns 0. If the block is known
|
|
|
|
* to take exactly n arguments, returns n. If the block has optional
|
|
|
|
* arguments, return -n-1, where n is the number of mandatory
|
|
|
|
* arguments. A <code>proc</code> with no argument declarations
|
|
|
|
* is the same a block declaring <code>||</code> as its arguments.
|
|
|
|
*
|
|
|
|
* Proc.new {}.arity #=> 0
|
|
|
|
* Proc.new {||}.arity #=> 0
|
|
|
|
* Proc.new {|a|}.arity #=> 1
|
|
|
|
* Proc.new {|a,b|}.arity #=> 2
|
|
|
|
* Proc.new {|a,b,c|}.arity #=> 3
|
|
|
|
* Proc.new {|*a|}.arity #=> -1
|
|
|
|
* Proc.new {|a,*b|}.arity #=> -2
|
2007-05-01 08:35:58 +04:00
|
|
|
* Proc.new {|a,*b, c|}.arity #=> -3
|
2007-02-02 18:21:41 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_arity(VALUE self)
|
|
|
|
{
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_proc_t *proc;
|
|
|
|
rb_iseq_t *iseq;
|
2007-02-02 18:21:41 +03:00
|
|
|
GetProcPtr(self, proc);
|
|
|
|
iseq = proc->block.iseq;
|
2007-05-01 09:01:15 +04:00
|
|
|
if (iseq) {
|
|
|
|
if (BUILTIN_TYPE(iseq) != T_NODE) {
|
|
|
|
if (iseq->arg_rest < 0) {
|
|
|
|
return INT2FIX(iseq->argc);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return INT2FIX(-(iseq->argc + 1 + iseq->arg_post_len));
|
|
|
|
}
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
else {
|
2007-05-01 09:01:15 +04:00
|
|
|
NODE *node = (NODE *)iseq;
|
|
|
|
if (nd_type(node) == NODE_IFUNC && node->nd_cfnc == bmcall) {
|
|
|
|
/* method(:foo).to_proc.arity */
|
|
|
|
return INT2FIX(method_arity(node->nd_tval));
|
|
|
|
}
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
}
|
2007-05-01 09:01:15 +04:00
|
|
|
return INT2FIX(-1);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
rb_proc_arity(VALUE proc)
|
|
|
|
{
|
|
|
|
return FIX2INT(proc_arity(proc));
|
|
|
|
}
|
|
|
|
|
2007-12-05 10:18:52 +03:00
|
|
|
static rb_iseq_t *
|
|
|
|
get_proc_iseq(VALUE self)
|
|
|
|
{
|
|
|
|
rb_proc_t *proc;
|
|
|
|
rb_iseq_t *iseq;
|
|
|
|
|
|
|
|
GetProcPtr(self, proc);
|
|
|
|
iseq = proc->block.iseq;
|
|
|
|
if (!RUBY_VM_NORMAL_ISEQ_P(iseq))
|
|
|
|
return 0;
|
|
|
|
return iseq;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_proc_location(VALUE self)
|
|
|
|
{
|
|
|
|
rb_iseq_t *iseq = get_proc_iseq(self);
|
|
|
|
VALUE loc[2];
|
|
|
|
|
|
|
|
if (!iseq) return Qnil;
|
|
|
|
loc[0] = iseq->filename;
|
|
|
|
if (iseq->insn_info_table) {
|
|
|
|
loc[1] = INT2FIX(iseq->insn_info_table[0].line_no);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
loc[1] = Qnil;
|
|
|
|
}
|
|
|
|
return rb_ary_new4(2, loc);
|
|
|
|
}
|
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* prc == other_proc => true or false
|
|
|
|
*
|
|
|
|
* Return <code>true</code> if <i>prc</i> is the same object as
|
|
|
|
* <i>other_proc</i>, or if they are both procs with the same body.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_eq(VALUE self, VALUE other)
|
|
|
|
{
|
|
|
|
if (self == other) {
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (TYPE(other) == T_DATA &&
|
|
|
|
RBASIC(other)->klass == rb_cProc &&
|
|
|
|
CLASS_OF(self) == CLASS_OF(other)) {
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_proc_t *p1, *p2;
|
2007-02-02 18:21:41 +03:00
|
|
|
GetProcPtr(self, p1);
|
|
|
|
GetProcPtr(other, p2);
|
|
|
|
if (p1->block.iseq == p2->block.iseq && p1->envval == p2->envval) {
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* prc.hash => integer
|
|
|
|
*
|
|
|
|
* Return hash value corresponding to proc body.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_hash(VALUE self)
|
|
|
|
{
|
|
|
|
int hash;
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_proc_t *proc;
|
2007-02-02 18:21:41 +03:00
|
|
|
GetProcPtr(self, proc);
|
|
|
|
hash = (long)proc->block.iseq;
|
|
|
|
hash ^= (long)proc->envval;
|
|
|
|
hash ^= (long)proc->block.lfp >> 16;
|
|
|
|
return INT2FIX(hash);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* prc.to_s => string
|
|
|
|
*
|
|
|
|
* Shows the unique identifier for this proc, along with
|
|
|
|
* an indication of where the proc was defined.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_to_s(VALUE self)
|
|
|
|
{
|
|
|
|
VALUE str = 0;
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_proc_t *proc;
|
2008-05-31 13:28:20 +04:00
|
|
|
const char *cname = rb_obj_classname(self);
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_iseq_t *iseq;
|
2007-06-24 11:35:49 +04:00
|
|
|
const char *is_lambda;
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
GetProcPtr(self, proc);
|
|
|
|
iseq = proc->block.iseq;
|
2007-06-24 11:35:49 +04:00
|
|
|
is_lambda = proc->is_lambda ? " (lambda)" : "";
|
2007-02-02 18:21:41 +03:00
|
|
|
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
if (RUBY_VM_NORMAL_ISEQ_P(iseq)) {
|
2007-02-02 18:21:41 +03:00
|
|
|
int line_no = 0;
|
|
|
|
|
2007-06-30 22:04:35 +04:00
|
|
|
if (iseq->insn_info_table) {
|
|
|
|
line_no = iseq->insn_info_table[0].line_no;
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
2007-06-24 11:10:46 +04:00
|
|
|
str = rb_sprintf("#<%s:%p@%s:%d%s>", cname, (void *)self,
|
2007-02-25 04:34:33 +03:00
|
|
|
RSTRING_PTR(iseq->filename),
|
2007-06-24 11:10:46 +04:00
|
|
|
line_no, is_lambda);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
else {
|
2007-06-22 14:34:19 +04:00
|
|
|
str = rb_sprintf("#<%s:%p%s>", cname, proc->block.iseq,
|
2007-06-24 11:10:46 +04:00
|
|
|
is_lambda);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (OBJ_TAINTED(self)) {
|
|
|
|
OBJ_TAINT(str);
|
|
|
|
}
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* prc.to_proc -> prc
|
|
|
|
*
|
|
|
|
* Part of the protocol for converting objects to <code>Proc</code>
|
|
|
|
* objects. Instances of class <code>Proc</code> simply return
|
|
|
|
* themselves.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
proc_to_proc(VALUE self)
|
|
|
|
{
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2007-12-24 12:09:21 +03:00
|
|
|
static void
|
2007-02-02 18:21:41 +03:00
|
|
|
bm_mark(struct METHOD *data)
|
|
|
|
{
|
2007-11-22 04:17:52 +03:00
|
|
|
rb_gc_mark(data->rclass);
|
|
|
|
rb_gc_mark(data->oclass);
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_gc_mark(data->recv);
|
|
|
|
rb_gc_mark((VALUE)data->body);
|
|
|
|
}
|
|
|
|
|
2007-12-24 12:09:21 +03:00
|
|
|
NODE *
|
|
|
|
rb_method_body(VALUE method)
|
|
|
|
{
|
|
|
|
struct METHOD *data;
|
|
|
|
|
|
|
|
if (TYPE(method) == T_DATA &&
|
|
|
|
RDATA(method)->dmark == (RUBY_DATA_FUNC) bm_mark) {
|
|
|
|
Data_Get_Struct(method, struct METHOD, data);
|
|
|
|
return data->body;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
NODE *rb_get_method_body(VALUE klass, ID id, ID *idp);
|
|
|
|
|
|
|
|
static VALUE
|
2007-12-18 02:01:50 +03:00
|
|
|
mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
VALUE method;
|
|
|
|
NODE *body;
|
|
|
|
struct METHOD *data;
|
2007-11-22 04:17:52 +03:00
|
|
|
VALUE rclass = klass;
|
2007-02-02 18:21:41 +03:00
|
|
|
ID oid = id;
|
|
|
|
|
|
|
|
again:
|
|
|
|
if ((body = rb_get_method_body(klass, id, 0)) == 0) {
|
2007-12-18 02:01:50 +03:00
|
|
|
rb_print_undef(rclass, oid, 0);
|
|
|
|
}
|
|
|
|
if (scope && (body->nd_noex & NOEX_MASK) != NOEX_PUBLIC) {
|
|
|
|
rb_print_undef(rclass, oid, (body->nd_noex & NOEX_MASK));
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
klass = body->nd_clss;
|
|
|
|
body = body->nd_body;
|
|
|
|
|
|
|
|
if (nd_type(body) == NODE_ZSUPER) {
|
2007-09-28 10:21:46 +04:00
|
|
|
klass = RCLASS_SUPER(klass);
|
2007-02-02 18:21:41 +03:00
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
|
2007-11-22 04:17:52 +03:00
|
|
|
while (rclass != klass &&
|
|
|
|
(FL_TEST(rclass, FL_SINGLETON) || TYPE(rclass) == T_ICLASS)) {
|
|
|
|
rclass = RCLASS_SUPER(rclass);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
if (TYPE(klass) == T_ICLASS)
|
|
|
|
klass = RBASIC(klass)->klass;
|
2007-11-22 04:17:52 +03:00
|
|
|
method = Data_Make_Struct(mclass, struct METHOD, bm_mark, -1, data);
|
|
|
|
data->oclass = klass;
|
2007-02-02 18:21:41 +03:00
|
|
|
data->recv = obj;
|
|
|
|
|
|
|
|
data->id = id;
|
|
|
|
data->body = body;
|
2007-11-22 04:17:52 +03:00
|
|
|
data->rclass = rclass;
|
2007-02-02 18:21:41 +03:00
|
|
|
data->oid = oid;
|
|
|
|
OBJ_INFECT(method, klass);
|
|
|
|
|
|
|
|
return method;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
*
|
|
|
|
* Document-class : Method
|
|
|
|
*
|
|
|
|
* Method objects are created by <code>Object#method</code>, and are
|
|
|
|
* associated with a particular object (not just with a class). They
|
|
|
|
* may be used to invoke the method within the object, and as a block
|
|
|
|
* associated with an iterator. They may also be unbound from one
|
|
|
|
* object (creating an <code>UnboundMethod</code>) and bound to
|
|
|
|
* another.
|
|
|
|
*
|
|
|
|
* class Thing
|
|
|
|
* def square(n)
|
|
|
|
* n*n
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* thing = Thing.new
|
|
|
|
* meth = thing.method(:square)
|
|
|
|
*
|
|
|
|
* meth.call(9) #=> 81
|
|
|
|
* [ 1, 2, 3 ].collect(&meth) #=> [1, 4, 9]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* meth == other_meth => true or false
|
|
|
|
*
|
|
|
|
* Two method objects are equal if that are bound to the same
|
|
|
|
* object and contain the same body.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
static VALUE
|
2007-02-05 21:31:08 +03:00
|
|
|
method_eq(VALUE method, VALUE other)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
struct METHOD *m1, *m2;
|
|
|
|
|
|
|
|
if (TYPE(other) != T_DATA
|
|
|
|
|| RDATA(other)->dmark != (RUBY_DATA_FUNC) bm_mark)
|
|
|
|
return Qfalse;
|
|
|
|
if (CLASS_OF(method) != CLASS_OF(other))
|
|
|
|
return Qfalse;
|
|
|
|
|
|
|
|
Data_Get_Struct(method, struct METHOD, m1);
|
|
|
|
Data_Get_Struct(other, struct METHOD, m2);
|
|
|
|
|
2007-11-22 04:17:52 +03:00
|
|
|
if (m1->oclass != m2->oclass || m1->rclass != m2->rclass ||
|
2007-02-02 18:21:41 +03:00
|
|
|
m1->recv != m2->recv || m1->body != m2->body)
|
|
|
|
return Qfalse;
|
|
|
|
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* meth.hash => integer
|
|
|
|
*
|
|
|
|
* Return a hash value corresponding to the method object.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-02-05 21:31:08 +03:00
|
|
|
method_hash(VALUE method)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
struct METHOD *m;
|
|
|
|
long hash;
|
|
|
|
|
|
|
|
Data_Get_Struct(method, struct METHOD, m);
|
2007-11-22 04:17:52 +03:00
|
|
|
hash = (long)m->oclass;
|
|
|
|
hash ^= (long)m->rclass;
|
2007-02-02 18:21:41 +03:00
|
|
|
hash ^= (long)m->recv;
|
|
|
|
hash ^= (long)m->body;
|
|
|
|
|
|
|
|
return INT2FIX(hash);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* meth.unbind => unbound_method
|
|
|
|
*
|
|
|
|
* Dissociates <i>meth</i> from it's current receiver. The resulting
|
|
|
|
* <code>UnboundMethod</code> can subsequently be bound to a new object
|
|
|
|
* of the same class (see <code>UnboundMethod</code>).
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-02-05 21:31:08 +03:00
|
|
|
method_unbind(VALUE obj)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
VALUE method;
|
|
|
|
struct METHOD *orig, *data;
|
|
|
|
|
|
|
|
Data_Get_Struct(obj, struct METHOD, orig);
|
|
|
|
method =
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, -1, data);
|
2007-11-22 04:17:52 +03:00
|
|
|
data->oclass = orig->oclass;
|
2007-02-02 18:21:41 +03:00
|
|
|
data->recv = Qundef;
|
|
|
|
data->id = orig->id;
|
|
|
|
data->body = orig->body;
|
2007-11-22 04:17:52 +03:00
|
|
|
data->rclass = orig->rclass;
|
2007-02-02 18:21:41 +03:00
|
|
|
data->oid = orig->oid;
|
|
|
|
OBJ_INFECT(method, obj);
|
|
|
|
|
|
|
|
return method;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* meth.receiver => object
|
|
|
|
*
|
|
|
|
* Returns the bound receiver of the method object.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
method_receiver(VALUE obj)
|
|
|
|
{
|
|
|
|
struct METHOD *data;
|
|
|
|
|
|
|
|
Data_Get_Struct(obj, struct METHOD, data);
|
|
|
|
return data->recv;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2008-04-28 06:12:21 +04:00
|
|
|
* meth.name => symbol
|
2007-02-02 18:21:41 +03:00
|
|
|
*
|
|
|
|
* Returns the name of the method.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
method_name(VALUE obj)
|
|
|
|
{
|
|
|
|
struct METHOD *data;
|
|
|
|
|
|
|
|
Data_Get_Struct(obj, struct METHOD, data);
|
2008-04-28 06:12:21 +04:00
|
|
|
return ID2SYM(data->id);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* meth.owner => class_or_module
|
|
|
|
*
|
|
|
|
* Returns the class or module that defines the method.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
method_owner(VALUE obj)
|
|
|
|
{
|
|
|
|
struct METHOD *data;
|
|
|
|
|
|
|
|
Data_Get_Struct(obj, struct METHOD, data);
|
2007-11-22 04:17:52 +03:00
|
|
|
return data->oclass;
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* obj.method(sym) => method
|
|
|
|
*
|
|
|
|
* Looks up the named method as a receiver in <i>obj</i>, returning a
|
|
|
|
* <code>Method</code> object (or raising <code>NameError</code>). The
|
|
|
|
* <code>Method</code> object acts as a closure in <i>obj</i>'s object
|
|
|
|
* instance, so instance variables and the value of <code>self</code>
|
|
|
|
* remain available.
|
|
|
|
*
|
|
|
|
* class Demo
|
|
|
|
* def initialize(n)
|
|
|
|
* @iv = n
|
|
|
|
* end
|
|
|
|
* def hello()
|
|
|
|
* "Hello, @iv = #{@iv}"
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* k = Demo.new(99)
|
|
|
|
* m = k.method(:hello)
|
|
|
|
* m.call #=> "Hello, @iv = 99"
|
|
|
|
*
|
|
|
|
* l = Demo.new('Fred')
|
|
|
|
* m = l.method("hello")
|
|
|
|
* m.call #=> "Hello, @iv = Fred"
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
2007-02-05 21:31:08 +03:00
|
|
|
rb_obj_method(VALUE obj, VALUE vid)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
2007-12-18 02:01:50 +03:00
|
|
|
return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod, Qfalse);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_obj_public_method(VALUE obj, VALUE vid)
|
|
|
|
{
|
|
|
|
return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod, Qtrue);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* mod.instance_method(symbol) => unbound_method
|
|
|
|
*
|
|
|
|
* Returns an +UnboundMethod+ representing the given
|
|
|
|
* instance method in _mod_.
|
|
|
|
*
|
|
|
|
* class Interpreter
|
|
|
|
* def do_a() print "there, "; end
|
|
|
|
* def do_d() print "Hello "; end
|
|
|
|
* def do_e() print "!\n"; end
|
|
|
|
* def do_v() print "Dave"; end
|
|
|
|
* Dispatcher = {
|
|
|
|
* ?a => instance_method(:do_a),
|
|
|
|
* ?d => instance_method(:do_d),
|
|
|
|
* ?e => instance_method(:do_e),
|
|
|
|
* ?v => instance_method(:do_v)
|
|
|
|
* }
|
|
|
|
* def interpret(string)
|
|
|
|
* string.each_byte {|b| Dispatcher[b].bind(self).call }
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* interpreter = Interpreter.new
|
|
|
|
* interpreter.interpret('dave')
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* Hello there, Dave!
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-12-18 02:01:50 +03:00
|
|
|
rb_mod_instance_method(VALUE mod, VALUE vid)
|
|
|
|
{
|
|
|
|
return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod, Qfalse);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_mod_public_instance_method(VALUE mod, VALUE vid)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
2007-12-18 02:01:50 +03:00
|
|
|
return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod, Qtrue);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* define_method(symbol, method) => new_method
|
|
|
|
* define_method(symbol) { block } => proc
|
|
|
|
*
|
|
|
|
* Defines an instance method in the receiver. The _method_
|
|
|
|
* parameter can be a +Proc+ or +Method+ object.
|
|
|
|
* If a block is specified, it is used as the method body. This block
|
|
|
|
* is evaluated using <code>instance_eval</code>, a point that is
|
|
|
|
* tricky to demonstrate because <code>define_method</code> is private.
|
|
|
|
* (This is why we resort to the +send+ hack in this example.)
|
|
|
|
*
|
|
|
|
* class A
|
|
|
|
* def fred
|
|
|
|
* puts "In Fred"
|
|
|
|
* end
|
|
|
|
* def create_method(name, &block)
|
|
|
|
* self.class.send(:define_method, name, &block)
|
|
|
|
* end
|
|
|
|
* define_method(:wilma) { puts "Charge it!" }
|
|
|
|
* end
|
|
|
|
* class B < A
|
|
|
|
* define_method(:barney, instance_method(:fred))
|
|
|
|
* end
|
|
|
|
* a = B.new
|
|
|
|
* a.barney
|
|
|
|
* a.wilma
|
|
|
|
* a.create_method(:betty) { p self }
|
|
|
|
* a.betty
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* In Fred
|
|
|
|
* Charge it!
|
|
|
|
* #<B:0x401b39e8>
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
|
|
|
|
{
|
|
|
|
ID id;
|
|
|
|
VALUE body;
|
|
|
|
NODE *node;
|
|
|
|
int noex = NOEX_PUBLIC;
|
|
|
|
|
|
|
|
if (argc == 1) {
|
|
|
|
id = rb_to_id(argv[0]);
|
|
|
|
body = rb_block_lambda();
|
|
|
|
}
|
|
|
|
else if (argc == 2) {
|
|
|
|
id = rb_to_id(argv[0]);
|
|
|
|
body = argv[1];
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
if (!rb_obj_is_method(body) && !rb_obj_is_proc(body)) {
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_raise(rb_eTypeError,
|
|
|
|
"wrong argument type %s (expected Proc/Method)",
|
|
|
|
rb_obj_classname(body));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (RDATA(body)->dmark == (RUBY_DATA_FUNC) bm_mark) {
|
|
|
|
struct METHOD *method = (struct METHOD *)DATA_PTR(body);
|
2007-11-22 04:17:52 +03:00
|
|
|
VALUE rclass = method->rclass;
|
|
|
|
if (rclass != mod) {
|
|
|
|
if (FL_TEST(rclass, FL_SINGLETON)) {
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_raise(rb_eTypeError,
|
|
|
|
"can't bind singleton method to a different class");
|
|
|
|
}
|
2007-11-22 04:17:52 +03:00
|
|
|
if (!RTEST(rb_class_inherited_p(mod, rclass))) {
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_raise(rb_eTypeError,
|
|
|
|
"bind argument must be a subclass of %s",
|
2007-11-22 04:17:52 +03:00
|
|
|
rb_class2name(rclass));
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
node = method->body;
|
|
|
|
}
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
else if (rb_obj_is_proc(body)) {
|
|
|
|
rb_proc_t *proc;
|
|
|
|
body = proc_dup(body);
|
2007-02-02 18:21:41 +03:00
|
|
|
GetProcPtr(body, proc);
|
|
|
|
if (BUILTIN_TYPE(proc->block.iseq) != T_NODE) {
|
|
|
|
proc->block.iseq->defined_method_id = id;
|
|
|
|
proc->block.iseq->klass = mod;
|
|
|
|
proc->is_lambda = Qtrue;
|
2007-08-19 08:02:21 +04:00
|
|
|
proc->is_from_method = Qtrue;
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
node = NEW_BMETHOD(body);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* type error */
|
|
|
|
rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TODO: visibility */
|
|
|
|
|
|
|
|
rb_add_method(mod, id, node, noex);
|
|
|
|
return body;
|
|
|
|
}
|
|
|
|
|
2007-08-30 09:06:52 +04:00
|
|
|
static VALUE
|
|
|
|
rb_obj_define_method(int argc, VALUE *argv, VALUE obj)
|
|
|
|
{
|
|
|
|
VALUE klass = rb_singleton_class(obj);
|
|
|
|
|
|
|
|
return rb_mod_define_method(argc, argv, klass);
|
|
|
|
}
|
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* MISSING: documentation
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-02-05 21:31:08 +03:00
|
|
|
method_clone(VALUE self)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
VALUE clone;
|
|
|
|
struct METHOD *orig, *data;
|
|
|
|
|
|
|
|
Data_Get_Struct(self, struct METHOD, orig);
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
clone = Data_Make_Struct(CLASS_OF(self), struct METHOD, bm_mark, -1, data);
|
2007-02-02 18:21:41 +03:00
|
|
|
CLONESETUP(clone, self);
|
|
|
|
*data = *orig;
|
|
|
|
|
|
|
|
return clone;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* meth.call(args, ...) => obj
|
|
|
|
* meth[args, ...] => obj
|
|
|
|
*
|
|
|
|
* Invokes the <i>meth</i> with the specified arguments, returning the
|
|
|
|
* method's return value.
|
|
|
|
*
|
|
|
|
* m = 12.method("+")
|
|
|
|
* m.call(3) #=> 15
|
|
|
|
* m.call(20) #=> 32
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_method_call(int argc, VALUE *argv, VALUE method)
|
|
|
|
{
|
|
|
|
VALUE result = Qnil; /* OK */
|
|
|
|
struct METHOD *data;
|
|
|
|
int state;
|
|
|
|
volatile int safe = -1;
|
|
|
|
|
|
|
|
Data_Get_Struct(method, struct METHOD, data);
|
|
|
|
if (data->recv == Qundef) {
|
|
|
|
rb_raise(rb_eTypeError, "can't call unbound method; bind first");
|
|
|
|
}
|
2007-04-25 05:35:13 +04:00
|
|
|
PUSH_TAG();
|
2007-02-02 18:21:41 +03:00
|
|
|
if (OBJ_TAINTED(method)) {
|
|
|
|
safe = rb_safe_level();
|
|
|
|
if (rb_safe_level() < 4) {
|
|
|
|
rb_set_safe_level_force(4);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((state = EXEC_TAG()) == 0) {
|
* 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-11 01:46:43 +04:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
* eval_method.c: renamed from vm_method.c. "vm_method.c" is included
by "vm.c".
* vm_eval.c: added. Some codes are moved from "eval.c"
* common.mk: fix for above changes.
* compile.c: make a vm_eval(0)
* eval.c, eval_error.c, eval_intern.h, eval_jump.c, proc.c, vm.c,
id.c, id.h, vm_core.h, vm_dump.c, vm_evalbody.c, vm_insnhelper.c,
blockinlining.c: fix for above changes. and do some refactoring.
this changes improve rb_yield() performance.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-05-24 21:50:17 +04:00
|
|
|
VALUE rb_vm_call(rb_thread_t * th, VALUE klass, VALUE recv, VALUE id, ID oid,
|
|
|
|
int argc, const VALUE *argv, const NODE *body, int nosuper);
|
|
|
|
|
* 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-11 01:46:43 +04:00
|
|
|
PASS_PASSED_BLOCK_TH(th);
|
|
|
|
result = rb_vm_call(th, data->oclass, data->recv, data->id, data->oid,
|
* eval_method.c: renamed from vm_method.c. "vm_method.c" is included
by "vm.c".
* vm_eval.c: added. Some codes are moved from "eval.c"
* common.mk: fix for above changes.
* compile.c: make a vm_eval(0)
* eval.c, eval_error.c, eval_intern.h, eval_jump.c, proc.c, vm.c,
id.c, id.h, vm_core.h, vm_dump.c, vm_evalbody.c, vm_insnhelper.c,
blockinlining.c: fix for above changes. and do some refactoring.
this changes improve rb_yield() performance.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-05-24 21:50:17 +04:00
|
|
|
argc, argv, data->body, 0);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
POP_TAG();
|
|
|
|
if (safe >= 0)
|
|
|
|
rb_set_safe_level_force(safe);
|
|
|
|
if (state)
|
|
|
|
JUMP_TAG(state);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
*
|
|
|
|
* Document-class: UnboundMethod
|
|
|
|
*
|
|
|
|
* Ruby supports two forms of objectified methods. Class
|
|
|
|
* <code>Method</code> is used to represent methods that are associated
|
|
|
|
* with a particular object: these method objects are bound to that
|
|
|
|
* object. Bound method objects for an object can be created using
|
|
|
|
* <code>Object#method</code>.
|
|
|
|
*
|
|
|
|
* Ruby also supports unbound methods; methods objects that are not
|
|
|
|
* associated with a particular object. These can be created either by
|
|
|
|
* calling <code>Module#instance_method</code> or by calling
|
|
|
|
* <code>unbind</code> on a bound method object. The result of both of
|
|
|
|
* these is an <code>UnboundMethod</code> object.
|
|
|
|
*
|
|
|
|
* Unbound methods can only be called after they are bound to an
|
|
|
|
* object. That object must be be a kind_of? the method's original
|
|
|
|
* class.
|
|
|
|
*
|
|
|
|
* class Square
|
|
|
|
* def area
|
|
|
|
* @side * @side
|
|
|
|
* end
|
|
|
|
* def initialize(side)
|
|
|
|
* @side = side
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* area_un = Square.instance_method(:area)
|
|
|
|
*
|
|
|
|
* s = Square.new(12)
|
|
|
|
* area = area_un.bind(s)
|
|
|
|
* area.call #=> 144
|
|
|
|
*
|
|
|
|
* Unbound methods are a reference to the method at the time it was
|
|
|
|
* objectified: subsequent changes to the underlying class will not
|
|
|
|
* affect the unbound method.
|
|
|
|
*
|
|
|
|
* class Test
|
|
|
|
* def test
|
|
|
|
* :original
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* um = Test.instance_method(:test)
|
|
|
|
* class Test
|
|
|
|
* def test
|
|
|
|
* :modified
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* t = Test.new
|
|
|
|
* t.test #=> :modified
|
|
|
|
* um.bind(t).call #=> :original
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* umeth.bind(obj) -> method
|
|
|
|
*
|
|
|
|
* Bind <i>umeth</i> to <i>obj</i>. If <code>Klass</code> was the class
|
|
|
|
* from which <i>umeth</i> was obtained,
|
|
|
|
* <code>obj.kind_of?(Klass)</code> must be true.
|
|
|
|
*
|
|
|
|
* class A
|
|
|
|
* def test
|
|
|
|
* puts "In test, class = #{self.class}"
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* class B < A
|
|
|
|
* end
|
|
|
|
* class C < B
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* um = B.instance_method(:test)
|
|
|
|
* bm = um.bind(C.new)
|
|
|
|
* bm.call
|
|
|
|
* bm = um.bind(B.new)
|
|
|
|
* bm.call
|
|
|
|
* bm = um.bind(A.new)
|
|
|
|
* bm.call
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* In test, class = C
|
|
|
|
* In test, class = B
|
|
|
|
* prog.rb:16:in `bind': bind argument must be an instance of B (TypeError)
|
|
|
|
* from prog.rb:16
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-02-05 21:31:08 +03:00
|
|
|
umethod_bind(VALUE method, VALUE recv)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
struct METHOD *data, *bound;
|
|
|
|
|
|
|
|
Data_Get_Struct(method, struct METHOD, data);
|
2007-11-22 04:17:52 +03:00
|
|
|
if (data->rclass != CLASS_OF(recv)) {
|
|
|
|
if (FL_TEST(data->rclass, FL_SINGLETON)) {
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_raise(rb_eTypeError,
|
|
|
|
"singleton method called for a different object");
|
|
|
|
}
|
2007-11-22 04:17:52 +03:00
|
|
|
if (!rb_obj_is_kind_of(recv, data->rclass)) {
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
|
2007-11-22 04:17:52 +03:00
|
|
|
rb_class2name(data->rclass));
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
method = Data_Make_Struct(rb_cMethod, struct METHOD, bm_mark, -1, bound);
|
2007-02-02 18:21:41 +03:00
|
|
|
*bound = *data;
|
|
|
|
bound->recv = recv;
|
2007-11-22 04:17:52 +03:00
|
|
|
bound->rclass = CLASS_OF(recv);
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
return method;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2007-02-05 21:31:08 +03:00
|
|
|
rb_node_arity(NODE* body)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
switch (nd_type(body)) {
|
2007-06-24 11:35:49 +04:00
|
|
|
case NODE_CFUNC:
|
2007-02-02 18:21:41 +03:00
|
|
|
if (body->nd_argc < 0)
|
|
|
|
return -1;
|
|
|
|
return body->nd_argc;
|
2007-06-24 11:35:49 +04:00
|
|
|
case NODE_ZSUPER:
|
2007-02-02 18:21:41 +03:00
|
|
|
return -1;
|
2007-06-24 11:35:49 +04:00
|
|
|
case NODE_ATTRSET:
|
2007-02-02 18:21:41 +03:00
|
|
|
return 1;
|
2007-06-24 11:35:49 +04:00
|
|
|
case NODE_IVAR:
|
2007-02-02 18:21:41 +03:00
|
|
|
return 0;
|
2007-06-24 11:35:49 +04:00
|
|
|
case NODE_BMETHOD:
|
2007-02-02 18:21:41 +03:00
|
|
|
return rb_proc_arity(body->nd_cval);
|
2007-06-24 11:35:49 +04:00
|
|
|
case RUBY_VM_METHOD_NODE:
|
|
|
|
{
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 22:00:03 +03:00
|
|
|
rb_iseq_t *iseq;
|
2007-02-02 18:21:41 +03:00
|
|
|
GetISeqPtr((VALUE)body->nd_body, iseq);
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 14:15:15 +03:00
|
|
|
if (iseq->arg_rest == -1 && iseq->arg_opts == 0) {
|
2007-02-02 18:21:41 +03:00
|
|
|
return iseq->argc;
|
|
|
|
}
|
|
|
|
else {
|
2007-05-01 08:35:58 +04:00
|
|
|
return -(iseq->argc + 1 + iseq->arg_post_len);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
}
|
2007-06-24 11:35:49 +04:00
|
|
|
default:
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* meth.arity => fixnum
|
|
|
|
*
|
|
|
|
* Returns an indication of the number of arguments accepted by a
|
|
|
|
* method. Returns a nonnegative integer for methods that take a fixed
|
|
|
|
* number of arguments. For Ruby methods that take a variable number of
|
|
|
|
* arguments, returns -n-1, where n is the number of required
|
|
|
|
* arguments. For methods written in C, returns -1 if the call takes a
|
|
|
|
* variable number of arguments.
|
|
|
|
*
|
|
|
|
* class C
|
|
|
|
* def one; end
|
|
|
|
* def two(a); end
|
|
|
|
* def three(*a); end
|
|
|
|
* def four(a, b); end
|
|
|
|
* def five(a, b, *c); end
|
|
|
|
* def six(a, b, *c, &d); end
|
|
|
|
* end
|
|
|
|
* c = C.new
|
|
|
|
* c.method(:one).arity #=> 0
|
|
|
|
* c.method(:two).arity #=> 1
|
|
|
|
* c.method(:three).arity #=> -1
|
|
|
|
* c.method(:four).arity #=> 2
|
|
|
|
* c.method(:five).arity #=> -3
|
|
|
|
* c.method(:six).arity #=> -3
|
|
|
|
*
|
|
|
|
* "cat".method(:size).arity #=> 0
|
|
|
|
* "cat".method(:replace).arity #=> 1
|
|
|
|
* "cat".method(:squeeze).arity #=> -1
|
|
|
|
* "cat".method(:count).arity #=> -1
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-02-05 21:31:08 +03:00
|
|
|
method_arity_m(VALUE method)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
int n = method_arity(method);
|
|
|
|
return INT2FIX(n);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2007-02-05 21:31:08 +03:00
|
|
|
method_arity(VALUE method)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
struct METHOD *data;
|
|
|
|
|
|
|
|
Data_Get_Struct(method, struct METHOD, data);
|
|
|
|
return rb_node_arity(data->body);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2007-02-05 21:31:08 +03:00
|
|
|
rb_mod_method_arity(VALUE mod, ID id)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
NODE *node = rb_method_node(mod, id);
|
|
|
|
return rb_node_arity(node);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2007-02-05 21:31:08 +03:00
|
|
|
rb_obj_method_arity(VALUE obj, ID id)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
return rb_mod_method_arity(CLASS_OF(obj), id);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* meth.to_s => string
|
|
|
|
* meth.inspect => string
|
|
|
|
*
|
|
|
|
* Show the name of the underlying method.
|
|
|
|
*
|
|
|
|
* "cat".method(:count).inspect #=> "#<Method: String#count>"
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
method_inspect(VALUE method)
|
|
|
|
{
|
|
|
|
struct METHOD *data;
|
|
|
|
VALUE str;
|
|
|
|
const char *s;
|
2008-05-31 13:28:20 +04:00
|
|
|
const char *sharp = "#";
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
Data_Get_Struct(method, struct METHOD, data);
|
|
|
|
str = rb_str_buf_new2("#<");
|
|
|
|
s = rb_obj_classname(method);
|
|
|
|
rb_str_buf_cat2(str, s);
|
|
|
|
rb_str_buf_cat2(str, ": ");
|
|
|
|
|
2007-11-22 04:17:52 +03:00
|
|
|
if (FL_TEST(data->oclass, FL_SINGLETON)) {
|
|
|
|
VALUE v = rb_iv_get(data->oclass, "__attached__");
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
if (data->recv == Qundef) {
|
2007-11-22 04:17:52 +03:00
|
|
|
rb_str_buf_append(str, rb_inspect(data->oclass));
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
else if (data->recv == v) {
|
|
|
|
rb_str_buf_append(str, rb_inspect(v));
|
|
|
|
sharp = ".";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_str_buf_append(str, rb_inspect(data->recv));
|
|
|
|
rb_str_buf_cat2(str, "(");
|
|
|
|
rb_str_buf_append(str, rb_inspect(v));
|
|
|
|
rb_str_buf_cat2(str, ")");
|
|
|
|
sharp = ".";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2007-11-22 04:17:52 +03:00
|
|
|
rb_str_buf_cat2(str, rb_class2name(data->rclass));
|
|
|
|
if (data->rclass != data->oclass) {
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_str_buf_cat2(str, "(");
|
2007-11-22 04:17:52 +03:00
|
|
|
rb_str_buf_cat2(str, rb_class2name(data->oclass));
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_str_buf_cat2(str, ")");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rb_str_buf_cat2(str, sharp);
|
2007-12-25 06:24:50 +03:00
|
|
|
rb_str_append(str, rb_id2str(data->oid));
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_str_buf_cat2(str, ">");
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
mproc(VALUE method)
|
|
|
|
{
|
|
|
|
return rb_funcall(Qnil, rb_intern("proc"), 0);
|
|
|
|
}
|
|
|
|
|
2007-06-25 23:06:00 +04:00
|
|
|
static VALUE
|
|
|
|
mlambda(VALUE method)
|
|
|
|
{
|
|
|
|
return rb_funcall(Qnil, rb_intern("lambda"), 0);
|
|
|
|
}
|
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
static VALUE
|
|
|
|
bmcall(VALUE args, VALUE method)
|
|
|
|
{
|
|
|
|
volatile VALUE a;
|
2007-06-25 23:06:00 +04:00
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
if (CLASS_OF(args) != rb_cArray) {
|
|
|
|
args = rb_ary_new3(1, args);
|
|
|
|
}
|
|
|
|
|
|
|
|
a = args;
|
|
|
|
return rb_method_call(RARRAY_LEN(a), RARRAY_PTR(a), method);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_proc_new(
|
|
|
|
VALUE (*func)(ANYARGS), /* VALUE yieldarg[, VALUE procarg] */
|
|
|
|
VALUE val)
|
|
|
|
{
|
2007-12-24 07:55:37 +03:00
|
|
|
VALUE procval = rb_iterate(mproc, 0, func, val);
|
2007-02-02 18:21:41 +03:00
|
|
|
return procval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* meth.to_proc => prc
|
|
|
|
*
|
|
|
|
* Returns a <code>Proc</code> object corresponding to this method.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
method_proc(VALUE method)
|
|
|
|
{
|
2007-08-19 08:02:21 +04:00
|
|
|
VALUE procval;
|
|
|
|
rb_proc_t *proc;
|
2007-02-02 18:21:41 +03:00
|
|
|
/*
|
|
|
|
* class Method
|
|
|
|
* def to_proc
|
|
|
|
* proc{|*args|
|
|
|
|
* self.call(*args)
|
|
|
|
* }
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*/
|
2007-12-24 07:55:37 +03:00
|
|
|
procval = rb_iterate(mlambda, 0, bmcall, method);
|
2007-08-19 08:02:21 +04:00
|
|
|
GetProcPtr(procval, proc);
|
|
|
|
proc->is_from_method = 1;
|
|
|
|
return procval;
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_obj_is_method(VALUE m)
|
|
|
|
{
|
|
|
|
if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC) bm_mark) {
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call_seq:
|
|
|
|
* local_jump_error.exit_value => obj
|
|
|
|
*
|
|
|
|
* Returns the exit value associated with this +LocalJumpError+.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
localjump_xvalue(VALUE exc)
|
|
|
|
{
|
|
|
|
return rb_iv_get(exc, "@exit_value");
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* local_jump_error.reason => symbol
|
|
|
|
*
|
|
|
|
* The reason this block was terminated:
|
|
|
|
* :break, :redo, :retry, :next, :return, or :noreason.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
localjump_reason(VALUE exc)
|
|
|
|
{
|
|
|
|
return rb_iv_get(exc, "@reason");
|
|
|
|
}
|
|
|
|
|
2007-12-20 11:20:02 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* prc.binding => binding
|
|
|
|
*
|
|
|
|
* Returns the binding associated with <i>prc</i>. Note that
|
|
|
|
* <code>Kernel#eval</code> accepts either a <code>Proc</code> or a
|
|
|
|
* <code>Binding</code> object as its second parameter.
|
|
|
|
*
|
|
|
|
* def fred(param)
|
|
|
|
* proc {}
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* b = fred(99)
|
|
|
|
* eval("param", b.binding) #=> 99
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
proc_binding(VALUE self)
|
|
|
|
{
|
|
|
|
rb_proc_t *proc;
|
|
|
|
VALUE bindval = binding_alloc(rb_cBinding);
|
|
|
|
rb_binding_t *bind;
|
|
|
|
|
|
|
|
GetProcPtr(self, proc);
|
|
|
|
GetBindingPtr(bindval, bind);
|
|
|
|
|
|
|
|
if (TYPE(proc->block.iseq) == T_NODE) {
|
|
|
|
rb_raise(rb_eArgError, "Can't create Binding from C level Proc");
|
|
|
|
}
|
|
|
|
|
|
|
|
bind->env = proc->envval;
|
|
|
|
return bindval;
|
|
|
|
}
|
2007-02-02 18:21:41 +03:00
|
|
|
|
2008-06-10 20:33:51 +04:00
|
|
|
static VALUE curry(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc);
|
2008-02-13 15:51:31 +03:00
|
|
|
|
|
|
|
static VALUE
|
|
|
|
make_curry_proc(VALUE proc, VALUE passed, VALUE arity)
|
|
|
|
{
|
|
|
|
VALUE args = rb_ary_new2(3);
|
|
|
|
RARRAY_PTR(args)[0] = proc;
|
|
|
|
RARRAY_PTR(args)[1] = passed;
|
|
|
|
RARRAY_PTR(args)[2] = arity;
|
|
|
|
RARRAY_LEN(args) = 3;
|
|
|
|
rb_ary_freeze(passed);
|
|
|
|
rb_ary_freeze(args);
|
|
|
|
return rb_proc_new(curry, args);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2008-06-10 20:33:51 +04:00
|
|
|
curry(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc)
|
2008-02-13 15:51:31 +03:00
|
|
|
{
|
|
|
|
VALUE proc, passed, arity;
|
|
|
|
proc = RARRAY_PTR(args)[0];
|
|
|
|
passed = RARRAY_PTR(args)[1];
|
|
|
|
arity = RARRAY_PTR(args)[2];
|
|
|
|
|
|
|
|
passed = rb_ary_plus(passed, rb_ary_new4(argc, argv));
|
|
|
|
rb_ary_freeze(passed);
|
2008-06-10 20:33:51 +04:00
|
|
|
|
2008-02-13 15:51:31 +03:00
|
|
|
if(RARRAY_LEN(passed) < FIX2INT(arity)) {
|
2008-06-10 20:33:51 +04:00
|
|
|
if (!NIL_P(passed_proc)) {
|
2008-06-09 19:52:51 +04:00
|
|
|
rb_warn("given block not used");
|
|
|
|
}
|
2008-02-13 15:51:31 +03:00
|
|
|
arity = make_curry_proc(proc, passed, arity);
|
|
|
|
return arity;
|
|
|
|
}
|
2008-06-10 20:33:51 +04:00
|
|
|
else {
|
|
|
|
return rb_proc_call_with_block(proc, RARRAY_LEN(passed), RARRAY_PTR(passed), passed_proc);
|
|
|
|
}
|
2008-02-13 15:51:31 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* prc.curry => a_proc
|
|
|
|
* prc.curry(arity) => a_proc
|
|
|
|
*
|
|
|
|
* Returns a curried proc. If the optional <i>arity</i> argument is given,
|
|
|
|
* it determines the number of arguments.
|
|
|
|
* A curried proc receives some arguments. If a sufficient number of
|
|
|
|
* arguments are supplied, it passes the supplied arguments to the original
|
|
|
|
* proc and returns the result. Otherwise, returns another curried proc that
|
|
|
|
* takes the rest of arguments.
|
|
|
|
*
|
|
|
|
* b = proc {|x, y, z| (x||0) + (y||0) + (z||0) }
|
|
|
|
* p b.curry[1][2][3] #=> 6
|
|
|
|
* p b.curry[1, 2][3, 4] #=> 6
|
|
|
|
* p b.curry(5)[1][2][3][4][5] #=> 6
|
|
|
|
* p b.curry(5)[1, 2][3, 4][5] #=> 6
|
|
|
|
* p b.curry(1)[1] #=> 1
|
|
|
|
*
|
|
|
|
* b = proc {|x, y, z, *w| (x||0) + (y||0) + (z||0) + w.inject(0, &:+) }
|
|
|
|
* p b.curry[1][2][3] #=> 6
|
|
|
|
* p b.curry[1, 2][3, 4] #=> 10
|
|
|
|
* p b.curry(5)[1][2][3][4][5] #=> 15
|
|
|
|
* p b.curry(5)[1, 2][3, 4][5] #=> 15
|
|
|
|
* p b.curry(1)[1] #=> 1
|
|
|
|
*
|
|
|
|
* b = lambda {|x, y, z| (x||0) + (y||0) + (z||0) }
|
|
|
|
* p b.curry[1][2][3] #=> 6
|
|
|
|
* p b.curry[1, 2][3, 4] #=> wrong number of arguments (4 or 3)
|
|
|
|
* p b.curry(5) #=> wrong number of arguments (5 or 3)
|
|
|
|
* p b.curry(1) #=> wrong number of arguments (1 or 3)
|
|
|
|
*
|
|
|
|
* b = lambda {|x, y, z, *w| (x||0) + (y||0) + (z||0) + w.inject(0, &:+) }
|
|
|
|
* p b.curry[1][2][3] #=> 6
|
|
|
|
* p b.curry[1, 2][3, 4] #=> 10
|
|
|
|
* p b.curry(5)[1][2][3][4][5] #=> 15
|
|
|
|
* p b.curry(5)[1, 2][3, 4][5] #=> 15
|
|
|
|
* p b.curry(1) #=> wrong number of arguments (1 or 3)
|
|
|
|
*
|
|
|
|
* b = proc { :foo }
|
|
|
|
* p b.curry[] #=> :foo
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
proc_curry(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
int sarity, marity = FIX2INT(proc_arity(self));
|
|
|
|
VALUE arity, opt = Qfalse;
|
|
|
|
|
|
|
|
if (marity < 0) {
|
|
|
|
marity = -marity - 1;
|
|
|
|
opt = Qtrue;
|
|
|
|
}
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "01", &arity);
|
|
|
|
if (NIL_P(arity)) {
|
|
|
|
arity = INT2FIX(marity);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sarity = FIX2INT(arity);
|
|
|
|
if (proc_lambda_p(self) && (sarity < marity || (sarity > marity && !opt))) {
|
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", sarity, marity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return make_curry_proc(self, rb_ary_new(), arity);
|
|
|
|
}
|
|
|
|
|
2007-02-02 18:21:41 +03:00
|
|
|
/*
|
|
|
|
* <code>Proc</code> objects are blocks of code that have been bound to
|
|
|
|
* a set of local variables. Once bound, the code may be called in
|
|
|
|
* different contexts and still access those variables.
|
|
|
|
*
|
|
|
|
* def gen_times(factor)
|
|
|
|
* return Proc.new {|n| n*factor }
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* times3 = gen_times(3)
|
|
|
|
* times5 = gen_times(5)
|
|
|
|
*
|
|
|
|
* times3.call(12) #=> 36
|
|
|
|
* times5.call(5) #=> 25
|
|
|
|
* times3.call(times5.call(4)) #=> 60
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
2007-02-05 21:31:08 +03:00
|
|
|
Init_Proc(void)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
|
|
|
/* Proc */
|
|
|
|
rb_cProc = rb_define_class("Proc", rb_cObject);
|
|
|
|
rb_undef_alloc_func(rb_cProc);
|
2007-12-05 10:18:52 +03:00
|
|
|
rb_define_singleton_method(rb_cProc, "new", rb_proc_s_new, -1);
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_define_method(rb_cProc, "call", proc_call, -1);
|
|
|
|
rb_define_method(rb_cProc, "[]", proc_call, -1);
|
2007-12-20 10:07:35 +03:00
|
|
|
rb_define_method(rb_cProc, "yield", proc_call, -1);
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_define_method(rb_cProc, "to_proc", proc_to_proc, 0);
|
|
|
|
rb_define_method(rb_cProc, "arity", proc_arity, 0);
|
|
|
|
rb_define_method(rb_cProc, "clone", proc_clone, 0);
|
|
|
|
rb_define_method(rb_cProc, "dup", proc_dup, 0);
|
|
|
|
rb_define_method(rb_cProc, "==", proc_eq, 1);
|
|
|
|
rb_define_method(rb_cProc, "eql?", proc_eq, 1);
|
|
|
|
rb_define_method(rb_cProc, "hash", proc_hash, 0);
|
|
|
|
rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
|
2007-06-05 21:26:00 +04:00
|
|
|
rb_define_method(rb_cProc, "lambda?", proc_lambda_p, 0);
|
2007-12-20 11:20:02 +03:00
|
|
|
rb_define_method(rb_cProc, "binding", proc_binding, 0);
|
2008-02-13 15:51:31 +03:00
|
|
|
rb_define_method(rb_cProc, "curry", proc_curry, -1);
|
2007-02-02 18:21:41 +03:00
|
|
|
|
2007-02-05 21:31:08 +03:00
|
|
|
/* Exceptions */
|
2007-02-02 18:21:41 +03:00
|
|
|
rb_eLocalJumpError = rb_define_class("LocalJumpError", rb_eStandardError);
|
|
|
|
rb_define_method(rb_eLocalJumpError, "exit_value", localjump_xvalue, 0);
|
|
|
|
rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);
|
|
|
|
|
|
|
|
rb_eSysStackError = rb_define_class("SystemStackError", rb_eException);
|
2008-07-03 02:02:58 +04:00
|
|
|
sysstack_error = rb_exc_new3(rb_eSysStackError,
|
|
|
|
rb_obj_freeze(rb_str_new2("stack level too deep")));
|
2007-02-02 18:21:41 +03:00
|
|
|
OBJ_TAINT(sysstack_error);
|
2008-06-15 13:17:06 +04:00
|
|
|
OBJ_FREEZE(sysstack_error);
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
/* utility functions */
|
|
|
|
rb_define_global_function("proc", rb_block_proc, 0);
|
|
|
|
rb_define_global_function("lambda", proc_lambda, 0);
|
|
|
|
|
|
|
|
/* Method */
|
|
|
|
rb_cMethod = rb_define_class("Method", rb_cObject);
|
|
|
|
rb_undef_alloc_func(rb_cMethod);
|
|
|
|
rb_undef_method(CLASS_OF(rb_cMethod), "new");
|
|
|
|
rb_define_method(rb_cMethod, "==", method_eq, 1);
|
|
|
|
rb_define_method(rb_cMethod, "eql?", method_eq, 1);
|
|
|
|
rb_define_method(rb_cMethod, "hash", method_hash, 0);
|
|
|
|
rb_define_method(rb_cMethod, "clone", method_clone, 0);
|
|
|
|
rb_define_method(rb_cMethod, "call", rb_method_call, -1);
|
|
|
|
rb_define_method(rb_cMethod, "[]", rb_method_call, -1);
|
|
|
|
rb_define_method(rb_cMethod, "arity", method_arity_m, 0);
|
|
|
|
rb_define_method(rb_cMethod, "inspect", method_inspect, 0);
|
|
|
|
rb_define_method(rb_cMethod, "to_s", method_inspect, 0);
|
|
|
|
rb_define_method(rb_cMethod, "to_proc", method_proc, 0);
|
|
|
|
rb_define_method(rb_cMethod, "receiver", method_receiver, 0);
|
|
|
|
rb_define_method(rb_cMethod, "name", method_name, 0);
|
|
|
|
rb_define_method(rb_cMethod, "owner", method_owner, 0);
|
|
|
|
rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
|
|
|
|
rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
|
2007-12-18 02:01:50 +03:00
|
|
|
rb_define_method(rb_mKernel, "public_method", rb_obj_public_method, 1);
|
2007-02-02 18:21:41 +03:00
|
|
|
|
|
|
|
/* UnboundMethod */
|
|
|
|
rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject);
|
|
|
|
rb_undef_alloc_func(rb_cUnboundMethod);
|
|
|
|
rb_undef_method(CLASS_OF(rb_cUnboundMethod), "new");
|
|
|
|
rb_define_method(rb_cUnboundMethod, "==", method_eq, 1);
|
|
|
|
rb_define_method(rb_cUnboundMethod, "eql?", method_eq, 1);
|
|
|
|
rb_define_method(rb_cUnboundMethod, "hash", method_hash, 0);
|
|
|
|
rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0);
|
|
|
|
rb_define_method(rb_cUnboundMethod, "arity", method_arity_m, 0);
|
|
|
|
rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0);
|
|
|
|
rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0);
|
|
|
|
rb_define_method(rb_cUnboundMethod, "name", method_name, 0);
|
|
|
|
rb_define_method(rb_cUnboundMethod, "owner", method_owner, 0);
|
|
|
|
rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
|
|
|
|
|
|
|
|
/* Module#*_method */
|
2007-12-18 02:01:50 +03:00
|
|
|
rb_define_method(rb_cModule, "instance_method", rb_mod_instance_method, 1);
|
|
|
|
rb_define_method(rb_cModule, "public_instance_method", rb_mod_public_instance_method, 1);
|
2007-06-02 11:47:20 +04:00
|
|
|
rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1);
|
2007-08-30 09:06:52 +04:00
|
|
|
|
|
|
|
/* Kernel */
|
|
|
|
rb_define_method(rb_mKernel, "define_singleton_method", rb_obj_define_method, -1);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Objects of class <code>Binding</code> encapsulate the execution
|
|
|
|
* context at some particular place in the code and retain this context
|
|
|
|
* for future use. The variables, methods, value of <code>self</code>,
|
|
|
|
* and possibly an iterator block that can be accessed in this context
|
|
|
|
* are all retained. Binding objects can be created using
|
|
|
|
* <code>Kernel#binding</code>, and are made available to the callback
|
|
|
|
* of <code>Kernel#set_trace_func</code>.
|
|
|
|
*
|
|
|
|
* These binding objects can be passed as the second argument of the
|
|
|
|
* <code>Kernel#eval</code> method, establishing an environment for the
|
|
|
|
* evaluation.
|
|
|
|
*
|
|
|
|
* class Demo
|
|
|
|
* def initialize(n)
|
|
|
|
* @secret = n
|
|
|
|
* end
|
|
|
|
* def getBinding
|
|
|
|
* return binding()
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* k1 = Demo.new(99)
|
|
|
|
* b1 = k1.getBinding
|
|
|
|
* k2 = Demo.new(-3)
|
|
|
|
* b2 = k2.getBinding
|
|
|
|
*
|
|
|
|
* eval("@secret", b1) #=> 99
|
|
|
|
* eval("@secret", b2) #=> -3
|
|
|
|
* eval("@secret") #=> nil
|
|
|
|
*
|
|
|
|
* Binding objects have no class-specific methods.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
2007-02-05 21:31:08 +03:00
|
|
|
Init_Binding(void)
|
2007-02-02 18:21:41 +03:00
|
|
|
{
|
2007-02-05 21:31:08 +03:00
|
|
|
rb_cBinding = rb_define_class("Binding", rb_cObject);
|
|
|
|
rb_undef_alloc_func(rb_cBinding);
|
|
|
|
rb_undef_method(CLASS_OF(rb_cBinding), "new");
|
|
|
|
rb_define_method(rb_cBinding, "clone", binding_clone, 0);
|
|
|
|
rb_define_method(rb_cBinding, "dup", binding_dup, 0);
|
2007-02-05 21:50:35 +03:00
|
|
|
rb_define_method(rb_cBinding, "eval", bind_eval, -1);
|
2007-02-05 21:31:08 +03:00
|
|
|
rb_define_global_function("binding", rb_f_binding, 0);
|
2007-02-02 18:21:41 +03:00
|
|
|
}
|
|
|
|
|