summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-05-26 02:13:02 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-05-26 02:13:02 +0900
commit6557ee938a5404b31b064f08c58bb54dfc0ac468 (patch)
treeae233e1c7f91fc3ab23dc5d55d17a232f63d1376
parentd78f23d28b4706e58622493de60e17818b491fde (diff)
downloadmruby-6557ee938a5404b31b064f08c58bb54dfc0ac468.tar.gz
mruby-6557ee938a5404b31b064f08c58bb54dfc0ac468.zip
mruby error messages should be directed to stderr
-rw-r--r--include/mruby.h1
-rw-r--r--mrbgems/mruby-bin-mruby/tools/mruby/mruby.c6
-rw-r--r--src/backtrace.c8
-rw-r--r--src/print.c16
-rw-r--r--tasks/mrbgem_spec.rake3
5 files changed, 24 insertions, 10 deletions
diff --git a/include/mruby.h b/include/mruby.h
index fac7e6fcd..3077c7c35 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -317,6 +317,7 @@ void mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...);
void mrb_warn(mrb_state *mrb, const char *fmt, ...);
void mrb_bug(mrb_state *mrb, const char *fmt, ...);
void mrb_print_backtrace(mrb_state *mrb);
+void mrb_print_error(mrb_state *mrb);
/* macros to get typical exception objects
note:
diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
index 7285c9fdb..97b55687f 100644
--- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
@@ -198,8 +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) {
- mrb_print_backtrace(mrb);
- p(mrb, mrb_obj_value(mrb->exc));
+ mrb_print_error(mrb);
n = -1;
}
}
@@ -230,8 +229,7 @@ main(int argc, char **argv)
mrbc_context_free(mrb, c);
if (mrb->exc) {
if (!mrb_undef_p(v)) {
- mrb_print_backtrace(mrb);
- p(mrb, mrb_obj_value(mrb->exc));
+ mrb_print_error(mrb);
}
n = -1;
}
diff --git a/src/backtrace.c b/src/backtrace.c
index f6e3e2eb0..d5d0818ae 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -17,7 +17,7 @@ mrb_print_backtrace(mrb_state *mrb)
const char *filename, *method, *sep;
int i, line;
- printf("trace:\n");
+ fputs("trace:\n", stderr);
ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern(mrb, "ciidx")));
if (ciidx >= mrb->c->ciend - mrb->c->cibase)
ciidx = 10; /* ciidx is broken... */
@@ -59,14 +59,14 @@ mrb_print_backtrace(mrb_state *mrb)
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);
+ fprintf(stderr, "\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);
+ fprintf(stderr, "\t[%d] %s:%d:in %s\n", i, filename, line, method);
}
}
else {
- printf("\t[%d] %s:%d\n", i, filename, line);
+ fprintf(stderr, "\t[%d] %s:%d\n", i, filename, line);
}
}
#endif
diff --git a/src/print.c b/src/print.c
index 5367781f5..01c9b3cd0 100644
--- a/src/print.c
+++ b/src/print.c
@@ -35,6 +35,22 @@ mrb_p(mrb_state *mrb, mrb_value obj)
}
void
+mrb_print_error(mrb_state *mrb)
+{
+#ifdef ENABLE_STDIO
+ mrb_value s;
+
+ mrb_print_backtrace(mrb);
+ s = mrb_funcall(mrb, mrb_obj_value(mrb->exc), "inspect", 0);
+ if (mrb_string_p(s)) {
+ struct RString *str = mrb_str_ptr(s);
+ fwrite(str->ptr, str->len, 1, stderr);
+ putc('\n', stderr);
+ }
+#endif
+}
+
+void
mrb_show_version(mrb_state *mrb)
{
static const char version_msg[] = "mruby - Embeddable Ruby Copyright (c) 2010-2013 mruby developers\n";
diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake
index 2ed72c3ff..f7029d8ae 100644
--- a/tasks/mrbgem_spec.rake
+++ b/tasks/mrbgem_spec.rake
@@ -136,8 +136,7 @@ module MRuby
unless rbfiles.empty?
f.puts %Q[ mrb_load_irep(mrb, gem_mrblib_irep_#{funcname});]
f.puts %Q[ if (mrb->exc) {]
- f.puts %Q[ mrb_print_backtrace(mrb);]
- f.puts %Q[ mrb_p(mrb, mrb_obj_value(mrb->exc));]
+ f.puts %Q[ mrb_print_error(mrb);]
f.puts %Q[ exit(EXIT_FAILURE);]
f.puts %Q[ }]
end