summaryrefslogtreecommitdiffhomepage
path: root/src/error.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-04-26 01:53:15 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-04-26 01:53:15 +0900
commit2202e412ea6ac44a5bcdaa2640fda0b7485437ca (patch)
tree3e217007696283ad64188ae979a1c0de33a0d947 /src/error.c
parent44ec41a7724ef3591e9d4033655fa12e79b9ff2b (diff)
parentb8e5cb71fe4b7e5377facf23ecebd0dd4bc4d1ab (diff)
downloadmruby-2202e412ea6ac44a5bcdaa2640fda0b7485437ca.tar.gz
mruby-2202e412ea6ac44a5bcdaa2640fda0b7485437ca.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/error.c')
-rw-r--r--src/error.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/error.c b/src/error.c
index feaa61122..8f13dcf77 100644
--- a/src/error.c
+++ b/src/error.c
@@ -199,7 +199,7 @@ exc_debug_info(mrb_state *mrb, struct RObject *exc)
mrb_callinfo *ci = mrb->c->ci;
mrb_code *pc = ci->pc;
- mrb_obj_iv_set(mrb, exc, mrb_intern_lit(mrb, "ciidx"), mrb_fixnum_value(ci - mrb->c->cibase));
+ mrb_obj_iv_set(mrb, exc, mrb_intern_lit(mrb, "ciidx"), mrb_fixnum_value((mrb_int)(ci - mrb->c->cibase)));
while (ci >= mrb->c->cibase) {
mrb_code *err = ci->err;
@@ -207,8 +207,8 @@ exc_debug_info(mrb_state *mrb, struct RObject *exc)
if (err && ci->proc && !MRB_PROC_CFUNC_P(ci->proc)) {
mrb_irep *irep = ci->proc->body.irep;
- int32_t const line = mrb_debug_get_line(irep, err - irep->iseq);
- char const* file = mrb_debug_get_filename(irep, err - irep->iseq);
+ int32_t const line = mrb_debug_get_line(irep, (uint32_t)(err - irep->iseq));
+ char const* file = mrb_debug_get_filename(irep, (uint32_t)(err - irep->iseq));
if (line != -1 && file) {
mrb_obj_iv_set(mrb, exc, mrb_intern_lit(mrb, "file"), mrb_str_new_cstr(mrb, file));
mrb_obj_iv_set(mrb, exc, mrb_intern_lit(mrb, "line"), mrb_fixnum_value(line));