refactor mrb_bob_missing to share raising NoMethodError code; fix #2878

Note: arguments of mrb_no_method_error() has changed. You need to replace
3rd and 4th argument (say n, argv) to mrb_ary_new_from_values(mrb, n, argv).

1 files changed, 11 insertions, 2 deletions

diff --git a/src/vm.c b/src/vm.c
index 15a3926e3..22ea177e0 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -723,6 +723,8 @@ argnum_error(mrb_state *mrb, mrb_int num)
 
 #define CALL_MAXARGS 127
 
+void mrb_method_missing(mrb_state *mrb, mrb_sym name, mrb_value self, mrb_value args);
+
 MRB_API mrb_value
 mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stack_keep)
 {
@@ -1078,8 +1080,15 @@ RETRY_TRY_BLOCK:
 
         m = mrb_method_search_vm(mrb, &c, missing);
         if (!m) {
-          mrb_no_method_error(mrb, mid, n, regs+a+1,
-                              "undefined method '%S' for %S", mrb_sym2str(mrb, mid), recv);
+          mrb_value args;
+
+          if (n == CALL_MAXARGS) {
+            args = regs[a+1];
+          }
+          else {
+            args = mrb_ary_new_from_values(mrb, n, regs+a+1);
+          }
+          mrb_method_missing(mrb, mid, recv, args);
         }
         mid = missing;
         if (n == CALL_MAXARGS) {