kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm_insnhelper.c (vm_search_superclass): checks for implicit

Browse source 
argument passing before method search.  [ruby-core:24244]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-07-10 01:25:26 +00:00
parent b16c326d5e
commit bee49b3494
3 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jul 10 10:25:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (vm_search_superclass): checks for implici
argument passing before method search. [ruby-core:24244]
Fri Jul 10 07:22:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jul 10 07:22:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_data_type): typed. * parse.y (parser_data_type): typed.

8
test/ruby/test_super.rb
View file

@ -130,5 +130,13 @@ class TestSuper < Test::Unit::TestCase
a = A.new a = A.new
a.uu(12) a.uu(12)
assert_equal("A#tt", a.tt(12), "[ruby-core:3856]") assert_equal("A#tt", a.tt(12), "[ruby-core:3856]")
e = assert_raise(RuntimeError, "[ruby-core:24244]") {
lambda {
Class.new do
define_method(:a) {super}.call
end
}.call
}
assert_match(/implicit argument passing of super from method defined by define_method/, e.message)
end end
end end

24
vm_insnhelper.c
View file

@ -360,10 +360,18 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
int num, ID id, ID oid, VALUE recv, VALUE klass, int num, ID id, ID oid, VALUE recv, VALUE klass,
VALUE flag, const NODE *mn, const rb_block_t *blockptr) VALUE flag, const NODE *mn, const rb_block_t *blockptr)
{ {
VALUE val; VALUE val = 0;
int state = 0;
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass); EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass);
{ TH_PUSH_TAG(th);
if (th->event_flags & RUBY_EVENT_C_RETURN) {
state = TH_EXEC_TAG();
}
else {
_th->tag = _tag.prev;
}
if (state == 0) {
rb_control_frame_t *cfp = rb_control_frame_t *cfp =
vm_push_frame(th, 0, VM_FRAME_MAGIC_CFUNC, vm_push_frame(th, 0, VM_FRAME_MAGIC_CFUNC,
recv, (VALUE) blockptr, 0, reg_cfp->sp, 0, 1); recv, (VALUE) blockptr, 0, reg_cfp->sp, 0, 1);
@ -381,7 +389,9 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
vm_pop_frame(th); vm_pop_frame(th);
} }
TH_POP_TAG();
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, id, klass); EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, id, klass);
if (state) TH_JUMP_TAG(th, state);
return val; return val;
} }
@ -1228,6 +1238,11 @@ vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *ip,
/* defined by Module#define_method() */ /* defined by Module#define_method() */
rb_control_frame_t *lcfp = GET_CFP(); rb_control_frame_t *lcfp = GET_CFP();
if (!sigval) {
/* zsuper */
rb_raise(rb_eRuntimeError, "implicit argument passing of super from method defined by define_method() is not supported. Specify all arguments explicitly.");
}
while (lcfp->iseq != ip) { while (lcfp->iseq != ip) {
VALUE *tdfp = GET_PREV_DFP(lcfp->dfp); VALUE *tdfp = GET_PREV_DFP(lcfp->dfp);
while (1) { while (1) {
@ -1240,11 +1255,6 @@ vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *ip,
id = lcfp->method_id; id = lcfp->method_id;
klass = vm_search_normal_superclass(lcfp->method_class, recv); klass = vm_search_normal_superclass(lcfp->method_class, recv);
if (sigval == Qfalse) {
/* zsuper */
rb_raise(rb_eRuntimeError, "implicit argument passing of super from method defined by define_method() is not supported. Specify all arguments explicitly.");
}
} }
else { else {
klass = vm_search_normal_superclass(ip->klass, recv); klass = vm_search_normal_superclass(ip->klass, recv);