diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/codegen.c | 4 | ||||
| -rw-r--r-- | src/error.c | 6 | ||||
| -rw-r--r-- | src/parse.y | 2 | ||||
| -rw-r--r-- | src/range.c | 4 | ||||
| -rw-r--r-- | src/vm.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/codegen.c b/src/codegen.c index 015631a7a..2733e8a13 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -1448,7 +1448,7 @@ codegen(codegen_scope *s, node *tree, int val) codegen(s, tree->cdr, val); if (val) { pop(); pop(); - genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), 0)); + genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), FALSE)); push(); } break; @@ -1458,7 +1458,7 @@ codegen(codegen_scope *s, node *tree, int val) codegen(s, tree->cdr, val); if (val) { pop(); pop(); - genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), 1)); + genop(s, MKOP_ABC(OP_RANGE, cursp(), cursp(), TRUE)); push(); } break; 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)); diff --git a/src/parse.y b/src/parse.y index 43c0c7321..0d281feeb 100644 --- a/src/parse.y +++ b/src/parse.y @@ -5263,8 +5263,8 @@ static void parser_init_cxt(parser_state *p, mrbc_context *cxt) { if (!cxt) return; - if (cxt->lineno) p->lineno = cxt->lineno; if (cxt->filename) mrb_parser_set_filename(p, cxt->filename); + if (cxt->lineno) p->lineno = cxt->lineno; if (cxt->syms) { int i; diff --git a/src/range.c b/src/range.c index 6b1f7faa2..b59b234ef 100644 --- a/src/range.c +++ b/src/range.c @@ -33,7 +33,7 @@ range_check(mrb_state *mrb, mrb_value a, mrb_value b) } mrb_value -mrb_range_new(mrb_state *mrb, mrb_value beg, mrb_value end, int excl) +mrb_range_new(mrb_state *mrb, mrb_value beg, mrb_value end, mrb_bool excl) { struct RRange *r; @@ -95,7 +95,7 @@ mrb_range_excl(mrb_state *mrb, mrb_value range) } static void -range_init(mrb_state *mrb, mrb_value range, mrb_value beg, mrb_value end, int exclude_end) +range_init(mrb_state *mrb, mrb_value range, mrb_value beg, mrb_value end, mrb_bool exclude_end) { struct RRange *r = mrb_range_ptr(range); @@ -1114,7 +1114,7 @@ RETRY_TRY_BLOCK: } regs = mrb->c->stack; regs[0] = m->env->stack[0]; - pc = m->body.irep->iseq; + pc = irep->iseq; JUMP; } } |