diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | vm_eval.c | 6 | ||||
-rw-r--r-- | vm_insnhelper.c | 2 | ||||
-rw-r--r-- | vm_insnhelper.h | 2 |
4 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Thu Oct 6 18:46:23 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + + * vm_eval.c (make_no_method_exception): fix typo. + + * vm_insnhelper.c, vm_insnhelper.h: ditto. + Thu Oct 6 16:29:30 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_eval.c (make_no_method_execption): extract from @@ -118,7 +124,7 @@ Tue Oct 4 07:59:16 2011 Eric Hodel <drbrain@segment7.net> Tue Oct 4 07:43:18 2011 Eric Hodel <drbrain@segment7.net> - * array.c (rb_ary_initalize): Make Array.new description match + * array.c (rb_ary_initialize): Make Array.new description match call-seq. Patch by Henry Maddocks. [Ruby 1.9 - Bug #5344] Tue Oct 4 07:35:23 2011 Eric Hodel <drbrain@segment7.net> @@ -496,7 +496,7 @@ rb_method_missing(int argc, const VALUE *argv, VALUE obj) #define NOEX_MISSING 0x80 static VALUE -make_no_method_execption(VALUE exc, const char *format, VALUE obj, int argc, const VALUE *argv) +make_no_method_exception(VALUE exc, const char *format, VALUE obj, int argc, const VALUE *argv) { int n = 0; VALUE mesg; @@ -550,7 +550,7 @@ raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, VALUE obj, } { - exc = make_no_method_execption(exc, format, obj, argc, argv); + exc = make_no_method_exception(exc, format, obj, argc, argv); if (!(last_call_status & NOEX_MISSING)) { th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp); } @@ -717,7 +717,7 @@ send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope) id = rb_check_id(&vid); if (!id) { if (rb_method_basic_definition_p(CLASS_OF(recv), idMethodMissing)) { - VALUE exc = make_no_method_execption(rb_eNoMethodError, NULL, + VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL, recv, ++argc, --argv); rb_exc_raise(exc); } diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 68eb3093b8..250ea3e954 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -589,7 +589,7 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, } else if (!(id = rb_check_id(&sym))) { if (rb_method_basic_definition_p(CLASS_OF(recv), idMethodMissing)) { - VALUE exc = make_no_method_execption(rb_eNoMethodError, NULL, recv, + VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL, recv, rb_long2int(num), &TOPN(i)); rb_exc_raise(exc); } diff --git a/vm_insnhelper.h b/vm_insnhelper.h index 02c0cac1ac..050b8d8ae0 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -226,7 +226,7 @@ static VALUE ruby_vm_global_state_version = 1; } while (0) static void vm_clear_all_cache(void); -static VALUE make_no_method_execption(VALUE exc, const char *format, +static VALUE make_no_method_exception(VALUE exc, const char *format, VALUE obj, int argc, const VALUE *argv); |