mruby should print error properly

franckverrot · Jul 14, 2012 · 72f7c51 · 72f7c51
1 parent afb983e
commit 72f7c51
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/parse.y b/src/parse.y
@@ -4871,6 +4871,7 @@ static mrb_value
 load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
 {
   int n;
+  mrb_value v;
 
   if (!p) {
     mrb_parser_free(p);
@@ -4900,7 +4901,9 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
     if (c->dump_result) codedump_all(mrb, n);
     if (c->no_exec) return mrb_fixnum_value(n);
   }
-  return mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb));
+  v = mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb));
+  if (!mrb->exc) return mrb_undef_value();
+  return v;
 }
 
 mrb_value

diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c
@@ -196,9 +196,12 @@ main(int argc, char **argv)
       v = mrb_load_file_cxt(mrb, args.rfp, c);
     }
     mrbc_context_free(mrb, c);
-    if (!mrb->exc && args.check_syntax) {
+    if (args.check_syntax) {
       printf("Syntax OK\n");
     }
+    else if (!mrb_undef_p(v) && mrb->exc) {
+      mrb_p(mrb, mrb_obj_value(mrb->exc));
+    }
   }
   cleanup(mrb, &args);