なかだです。

At Thu, 29 Oct 2009 13:55:12 +0900 (JST),
matz / ruby-lang.org wrote in [ruby-cvs:32774]:
>     * eval.c (rb_check_funcall): new function with method existence
>       check.  returns Qundef when the method does not exist.

この変更で、to_aryやto_str内部でのNoMethodErrorがわからなくなっ
ています。

$ ruby -v -e 'def (o=Object.new).to_str; foo(); end' -e '"".concat(o)'
ruby 1.9.2dev (2009-10-18 trunk 25555) [universal.x86_64-darwin9.0]
-e:1:in `to_str': undefined method `foo' for #<Object:0x000001002e31b8> (NoMethodError)
	from -e:2:in `concat'
	from -e:2:in `<main>'

$ ./ruby -v -e 'def (o=Object.new).to_str; foo(); end' -e '"".concat(o)'
ruby 1.9.2dev (2009-10-30 trunk 25565) [universal.x86_64-darwin9.0]
-e:2:in `concat': can't convert Object into String (TypeError)
	from -e:2:in `<main>'

>     * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_debug): test
>       suites changed to ignore exceptions caused by just-call policy.

ついでに、-dをつけたときの警告の山もあまり嬉しくありません。


Index: vm_eval.c =================================================================== --- vm_eval.c (revision 25565) +++ vm_eval.c (working copy) @@ -200,4 +200,8 @@ stack_check(void) } +static inline VALUE living_class_for_method(VALUE recv, ID mid); +static inline int rb_method_call_status(rb_thread_t *th, rb_method_entry_t *me, call_type scope, VALUE self); +#define NOEX_OK NOEX_NOSUPER + /*! * \internal @@ -218,10 +222,35 @@ rb_call0(VALUE recv, ID mid, int argc, c call_type scope, VALUE self) { - VALUE klass = CLASS_OF(recv); - rb_method_entry_t *me; - struct cache_entry *ent; + VALUE klass = living_class_for_method(recv, mid); + rb_method_entry_t *me = rb_method_entry(klass, mid); rb_thread_t *th = GET_THREAD(); - ID oid; - int noex; + int call_status = rb_method_call_status(th, me, scope, self); + + if (call_status != NOEX_OK) { + return method_missing(recv, mid, argc, argv, call_status); + } + stack_check(); + return vm_call0(th, recv, mid, argc, argv, me); +} + +VALUE +rb_check_funcall(VALUE recv, ID mid, int argc, VALUE *argv) +{ + VALUE klass = living_class_for_method(recv, mid); + rb_method_entry_t *me = rb_method_entry(klass, mid); + rb_thread_t *th = GET_THREAD(); + int call_status = rb_method_call_status(th, me, CALL_FCALL, Qundef); + + if (call_status != NOEX_OK) { + return Qundef; + } + stack_check(); + return vm_call0(th, recv, mid, argc, argv, me); +} + +static inline VALUE +living_class_for_method(VALUE recv, ID mid) +{ + VALUE klass = CLASS_OF(recv); if (!klass) { @@ -233,27 +262,18 @@ rb_call0(VALUE recv, ID mid, int argc, c rb_id2name(mid), adj, (void *)recv); } + return klass; +} - /* is it in the method cache? */ - ent = cache + EXPR1(klass, mid); +static inline int +rb_method_call_status(rb_thread_t *th, rb_method_entry_t *me, call_type scope, VALUE self) +{ + VALUE klass; + ID oid; + int noex; - if (ent->mid == mid && ent->klass == klass) { - me = ent->me; - if (UNDEFINED_METHOD_ENTRY_P(me)) { - return method_missing(recv, mid, argc, argv, - scope == CALL_VCALL ? NOEX_VCALL : 0); - } - klass = me->klass; - } - else if ((me = rb_method_entry_without_cache(klass, mid)) != 0 && me->def) { - klass = me->klass; + if (UNDEFINED_METHOD_ENTRY_P(me)) { + return scope == CALL_VCALL ? NOEX_VCALL : 0; } - else { - if (scope == 3) { - return method_missing(recv, mid, argc, argv, NOEX_SUPER); - } - return method_missing(recv, mid, argc, argv, - scope == CALL_VCALL ? NOEX_VCALL : 0); - } - + klass = me->klass; oid = me->def->original_id; noex = me->flag; @@ -263,5 +283,5 @@ rb_call0(VALUE recv, ID mid, int argc, c if (UNLIKELY(noex)) { if (((noex & NOEX_MASK) & NOEX_PRIVATE) && scope == CALL_PUBLIC) { - return method_missing(recv, mid, argc, argv, NOEX_PRIVATE); + return NOEX_PRIVATE; } @@ -278,16 +298,15 @@ rb_call0(VALUE recv, ID mid, int argc, c } if (!rb_obj_is_kind_of(self, rb_class_real(defined_class))) { - return method_missing(recv, mid, argc, argv, NOEX_PROTECTED); + return NOEX_PROTECTED; } } if (NOEX_SAFE(noex) > th->safe_level) { - rb_raise(rb_eSecurityError, "calling insecure method: %s", rb_id2name(mid)); + rb_raise(rb_eSecurityError, "calling insecure method: %s", + rb_id2name(me->called_id)); } } } - - stack_check(); - return vm_call0(th, recv, mid, argc, argv, me); + return NOEX_OK; } @@ -537,36 +556,4 @@ rb_funcall3(VALUE recv, ID mid, int argc } -struct rescue_funcall_args { - VALUE obj; - ID id; - int argc; - VALUE *argv; -}; - -static VALUE -check_funcall(struct rescue_funcall_args *args) -{ - return rb_funcall2(args->obj, args->id, args->argc, args->argv); -} - -static VALUE -check_failed(VALUE data) -{ - return data; -} - -VALUE -rb_check_funcall(VALUE obj, ID id, int argc, VALUE *argv) -{ - struct rescue_funcall_args args; - - args.obj = obj; - args.id = id; - args.argc = argc; - args.argv = argv; - return rb_rescue2(check_funcall, (VALUE)&args, check_failed, Qundef, - rb_eNoMethodError, (VALUE)0); -} - VALUE rb_funcall_no_recursive(VALUE obj, ID id, int argc, VALUE *argv, VALUE (*func)()) Index: test/ruby/test_array.rb =================================================================== --- test/ruby/test_array.rb (revision 25565) +++ test/ruby/test_array.rb (working copy) @@ -1225,4 +1225,16 @@ class TestArray < Test::Unit::TestCase assert_equal(a_id, a.to_ary.__id__) end + + o = Object.new + def o.to_ary + [4, 5] + end + assert_equal([1, 2, 3, 4, 5], a.concat(o)) + + o = Object.new + def o.to_ary + foo_bar() + end + assert_match(/foo_bar/, assert_raise(NoMethodError) {a.concat(o)}.message) end Index: test/ruby/test_string.rb =================================================================== --- test/ruby/test_string.rb (revision 25565) +++ test/ruby/test_string.rb (working copy) @@ -1409,4 +1409,16 @@ class TestString < Test::Unit::TestCase assert_equal("me", a.to_s) assert_equal(a.__id__, a.to_s.__id__) if @cls == String + + o = Object.new + def o.to_str + "at" + end + assert_equal("meat", a.concat(o)) + + o = Object.new + def o.to_str + foo_bar() + end + assert_match(/foo_bar/, assert_raise(NoMethodError) {a.concat(o)}.message) end Index: test/ruby/test_rubyoptions.rb =================================================================== --- test/ruby/test_rubyoptions.rb (revision 25565) +++ test/ruby/test_rubyoptions.rb (working copy) @@ -54,7 +54,7 @@ class TestRubyOptions < Test::Unit::Test def test_debug - assert_in_out_err(%w(-de) + ["p $DEBUG"], "", %w(true), //) + assert_in_out_err(%w(-de) + ["p $DEBUG"], "", %w(true), []) - assert_in_out_err(%w(--debug -e) + ["p $DEBUG"], "", %w(true), //) + assert_in_out_err(%w(--debug -e) + ["p $DEBUG"], "", %w(true), []) end
-- --- 僕の前にBugはない。 --- 僕の後ろにBugはできる。 中田 伸悦