diff options
| -rw-r--r-- | src/parse.y | 14 | ||||
| -rw-r--r-- | src/time.c | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/parse.y b/src/parse.y index 87962b4bb..a2a12b14d 100644 --- a/src/parse.y +++ b/src/parse.y @@ -4871,25 +4871,27 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c) n = snprintf(buf, sizeof(buf), "line %d: %s\n", p->error_buffer[0].lineno, p->error_buffer[0].message); mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SYNTAX_ERROR, buf, n)); + mrb_parser_free(p); + return mrb_undef_value(); } else { - mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SYNTAX_ERROR, "", 0)); + mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SYNTAX_ERROR, "syntax error", 0)); + mrb_parser_free(p); + return mrb_nil_value(); } - mrb_parser_free(p); - return mrb_undef_value(); } n = mrb_generate_code(mrb, p->tree); mrb_parser_free(p); if (n < 0) { - mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SCRIPT_ERROR, "", 0)); - return mrb_undef_value(); + mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SCRIPT_ERROR, "codegen error", 0)); + return mrb_nil_value(); } if (c) { if (c->dump_result) codedump_all(mrb, n); if (c->no_exec) return mrb_fixnum_value(n); } v = mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb)); - if (mrb->exc) return mrb_undef_value(); + if (mrb->exc) return mrb_nil_value(); return v; } diff --git a/src/time.c b/src/time.c index 45e796069..94b76c8f9 100644 --- a/src/time.c +++ b/src/time.c @@ -227,9 +227,10 @@ mrb_time_now(mrb_state *mrb, mrb_value self) static mrb_value mrb_time_at(mrb_state *mrb, mrb_value self) { - mrb_float f; + mrb_float f, f2 = 0; - mrb_get_args(mrb, "f", &f); + mrb_get_args(mrb, "f|f", &f, &f2); + f += f2 * 1e-6; return mrb_time_make(mrb, mrb_class_ptr(self), f, MRB_TIMEZONE_LOCAL); } |