diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-09 14:25:52 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-09 14:25:52 +0000 |
commit | 26ae6455014e0155cf37a3a0b77ed7323e15ed39 (patch) | |
tree | 4a05786d0cbd9c814b0f6b234bc8825b9c5e3ec0 /ext/-test-/proc | |
parent | ad58f04833b6d9f6b0d01c5fc8adc61df6d088cc (diff) |
vm.c: super in bmethod
* vm_eval.c (vm_call_super): allow bound proc method to call super
method.
* vm_insnhelper.c (vm_yield_with_cfunc): push defined class and
bound proc method entry to the control frame.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/-test-/proc')
-rw-r--r-- | ext/-test-/proc/call_super.c | 23 | ||||
-rw-r--r-- | ext/-test-/proc/extconf.rb | 7 | ||||
-rw-r--r-- | ext/-test-/proc/init.c | 11 |
3 files changed, 41 insertions, 0 deletions
diff --git a/ext/-test-/proc/call_super.c b/ext/-test-/proc/call_super.c new file mode 100644 index 0000000000..c5cb3eb46a --- /dev/null +++ b/ext/-test-/proc/call_super.c @@ -0,0 +1,23 @@ +#include "ruby.h" + +static VALUE +bug_proc_call_super(VALUE yieldarg, VALUE procarg) +{ + VALUE args[2]; + args[0] = yieldarg; + args[1] = procarg; + return rb_call_super(2, args); +} + +static VALUE +bug_proc_make_caller(VALUE self, VALUE procarg) +{ + return rb_proc_new(bug_proc_call_super, procarg); +} + +void +Init_call_super(VALUE klass) +{ + rb_define_method(klass, "call_super", bug_proc_call_super, 1); + rb_define_singleton_method(klass, "make_caller", bug_proc_make_caller, 1); +} diff --git a/ext/-test-/proc/extconf.rb b/ext/-test-/proc/extconf.rb new file mode 100644 index 0000000000..40741d07cc --- /dev/null +++ b/ext/-test-/proc/extconf.rb @@ -0,0 +1,7 @@ +$INCFLAGS << " -I$(topdir) -I$(top_srcdir)" +$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")] +inits = $srcs.map {|s| File.basename(s, ".*")} +inits.delete("init") +inits.map! {|s|"X(#{s})"} +$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\"" +create_makefile("-test-/proc") diff --git a/ext/-test-/proc/init.c b/ext/-test-/proc/init.c new file mode 100644 index 0000000000..814c55d98b --- /dev/null +++ b/ext/-test-/proc/init.c @@ -0,0 +1,11 @@ +#include "ruby.h" + +#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);} + +void +Init_proc(void) +{ + VALUE mBug = rb_define_module("Bug"); + VALUE klass = rb_define_module_under(mBug, "Proc"); + TEST_INIT_FUNCS(init); +} |