move mruby's showcallinfo into the core

1 files changed, 2 insertions, 64 deletions

diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
index 6d79eaef0..7285c9fdb 100644
--- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
@@ -162,68 +162,6 @@ cleanup(mrb_state *mrb, struct _args *args)
   mrb_close(mrb);
 }
 
-static void
-showcallinfo(mrb_state *mrb)
-{
-  mrb_callinfo *ci;
-  mrb_int ciidx;
-  const char *filename, *method, *sep;
-  int i, line;
-
-  printf("trace:\n");
-  ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern(mrb, "ciidx")));
-  if (ciidx >= mrb->ciend - mrb->cibase)
-    ciidx = 10; /* ciidx is broken... */
-
-  for (i = ciidx; i >= 0; i--) {
-    ci = &mrb->cibase[i];
-    filename = "(unknown)";
-    line = -1;
-
-    if (MRB_PROC_CFUNC_P(ci->proc)) {
-      continue;
-    }
-    else {
-      mrb_irep *irep = ci->proc->body.irep;
-      if (irep->filename != NULL)
-        filename = irep->filename;
-      if (irep->lines != NULL) {
-        mrb_code *pc;
-
-        if (i+1 <= ciidx) {
-          pc = mrb->cibase[i+1].pc;
-        }
-        else {
-          pc = (mrb_code*)mrb_voidp(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern(mrb, "lastpc")));
-        }
-        if (irep->iseq <= pc && pc < irep->iseq + irep->ilen) {
-          line = irep->lines[pc - irep->iseq - 1];
-        }
-      }
-    }
-    if (line == -1) continue;
-    if (ci->target_class == ci->proc->target_class)
-      sep = ".";
-    else
-      sep = "#";
-
-    method = mrb_sym2name(mrb, ci->mid);
-    if (method) {
-      const char *cn = mrb_class_name(mrb, ci->proc->target_class);
-
-      if (cn) {
-        printf("\t[%d] %s:%d:in %s%s%s\n", i, filename, line, cn, sep, method);
-      }
-      else {
-        printf("\t[%d] %s:%d:in %s\n", i, filename, line, method);
-      }
-    }
-    else {
-      printf("\t[%d] %s:%d\n", i, filename, line);
-    }
-  }
-}
-
 int
 main(int argc, char **argv)
 {
@@ -260,7 +198,7 @@ main(int argc, char **argv)
       mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb));
       n = 0;
       if (mrb->exc) {
-        showcallinfo(mrb);
+        mrb_print_backtrace(mrb);
         p(mrb, mrb_obj_value(mrb->exc));
         n = -1;
       }
@@ -292,7 +230,7 @@ main(int argc, char **argv)
     mrbc_context_free(mrb, c);
     if (mrb->exc) {
       if (!mrb_undef_p(v)) {
-        showcallinfo(mrb);
+        mrb_print_backtrace(mrb);
         p(mrb, mrb_obj_value(mrb->exc));
       }
       n = -1;