diff options
| -rw-r--r-- | include/mruby/boxing_nan.h | 2 | ||||
| -rw-r--r-- | include/mruby/boxing_nix.h | 2 | ||||
| -rw-r--r-- | include/mruby/boxing_word.h | 2 | ||||
| -rw-r--r-- | include/mruby/value.h | 2 | ||||
| -rw-r--r-- | src/vm.c | 12 |
5 files changed, 10 insertions, 10 deletions
diff --git a/include/mruby/boxing_nan.h b/include/mruby/boxing_nan.h index c8054a15d..ab5807b08 100644 --- a/include/mruby/boxing_nan.h +++ b/include/mruby/boxing_nan.h @@ -84,7 +84,7 @@ typedef struct mrb_value { #define SET_FALSE_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_FALSE, value.i, 1) #define SET_TRUE_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_TRUE, value.i, 1) #define SET_BOOL_VALUE(r,b) BOXNAN_SET_VALUE(r, b ? MRB_TT_TRUE : MRB_TT_FALSE, value.i, 1) -#define SET_FIXNUM_VALUE(r,n) BOXNAN_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n)) +#define SET_INT_VALUE(r,n) BOXNAN_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n)) #define SET_SYM_VALUE(r,v) BOXNAN_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v)) #define SET_OBJ_VALUE(r,v) BOXNAN_SET_VALUE(r, (((struct RObject*)(v))->tt), value.p, (v)) #define SET_PROC_VALUE(r,v) BOXNAN_SET_VALUE(r, MRB_TT_PROC, value.p, v) diff --git a/include/mruby/boxing_nix.h b/include/mruby/boxing_nix.h index a6744c008..2f5082fd2 100644 --- a/include/mruby/boxing_nix.h +++ b/include/mruby/boxing_nix.h @@ -38,7 +38,7 @@ typedef struct mrb_value { #define SET_FALSE_VALUE(r) BOXNIX_SET_VALUE(r, MRB_TT_FALSE, value.i, 1) #define SET_TRUE_VALUE(r) BOXNIX_SET_VALUE(r, MRB_TT_TRUE, value.i, 1) #define SET_BOOL_VALUE(r,b) BOXNIX_SET_VALUE(r, b ? MRB_TT_TRUE : MRB_TT_FALSE, value.i, 1) -#define SET_FIXNUM_VALUE(r,n) BOXNIX_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n)) +#define SET_INT_VALUE(r,n) BOXNIX_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n)) #define SET_FLOAT_VALUE(mrb,r,v) BOXNIX_SET_VALUE(r, MRB_TT_FLOAT, value.f, (v)) #define SET_SYM_VALUE(r,v) BOXNIX_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v)) #define SET_OBJ_VALUE(r,v) BOXNIX_SET_VALUE(r, (((struct RObject*)(v))->tt), value.p, (v)) diff --git a/include/mruby/boxing_word.h b/include/mruby/boxing_word.h index 09e4794e6..9984a5e22 100644 --- a/include/mruby/boxing_word.h +++ b/include/mruby/boxing_word.h @@ -100,7 +100,7 @@ mrb_type(mrb_value o) #define SET_FALSE_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_FALSE, value.i, 1) #define SET_TRUE_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_TRUE, value.i, 1) #define SET_BOOL_VALUE(r,b) BOXWORD_SET_VALUE(r, b ? MRB_TT_TRUE : MRB_TT_FALSE, value.i, 1) -#define SET_FIXNUM_VALUE(r,n) BOXWORD_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n)) +#define SET_INT_VALUE(r,n) BOXWORD_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n)) #define SET_SYM_VALUE(r,v) BOXWORD_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v)) #define SET_OBJ_VALUE(r,v) BOXWORD_SET_VALUE(r, (((struct RObject*)(v))->tt), value.p, (v)) #define SET_PROC_VALUE(r,v) BOXWORD_SET_VALUE(r, MRB_TT_PROC, value.p, v) diff --git a/include/mruby/value.h b/include/mruby/value.h index 1c57cf26c..bed29ba9c 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -145,7 +145,7 @@ static inline mrb_value mrb_fixnum_value(mrb_int i) { mrb_value v; - SET_FIXNUM_VALUE(v, i); + SET_INT_VALUE(v, i); return v; } @@ -788,7 +788,7 @@ RETRY_TRY_BLOCK: CASE(OP_LOADI) { /* A sBx R(A) := sBx */ - SET_FIXNUM_VALUE(regs[GETARG_A(i)], GETARG_sBx(i)); + SET_INT_VALUE(regs[GETARG_A(i)], GETARG_sBx(i)); NEXT; } @@ -1688,7 +1688,7 @@ RETRY_TRY_BLOCK: SET_FLOAT_VALUE(mrb, regs_a[0], (mrb_float)x + (mrb_float)y); break; } - SET_FIXNUM_VALUE(regs[a], z); + SET_INT_VALUE(regs[a], z); } break; case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT): @@ -1746,7 +1746,7 @@ RETRY_TRY_BLOCK: SET_FLOAT_VALUE(mrb, regs[a], (mrb_float)x - (mrb_float)y); break; } - SET_FIXNUM_VALUE(regs[a], z); + SET_INT_VALUE(regs[a], z); } break; case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT): @@ -1799,7 +1799,7 @@ RETRY_TRY_BLOCK: switch (mrb_type(z)) { case MRB_TT_FIXNUM: { - SET_FIXNUM_VALUE(regs[a], mrb_fixnum(z)); + SET_INT_VALUE(regs[a], mrb_fixnum(z)); } break; case MRB_TT_FLOAT: @@ -1931,7 +1931,7 @@ RETRY_TRY_BLOCK: #endif break; default: - SET_FIXNUM_VALUE(regs[a+1], GETARG_C(i)); + SET_INT_VALUE(regs[a+1], GETARG_C(i)); i = MKOP_ABC(OP_SEND, a, GETARG_B(i), 1); goto L_SEND; } @@ -1970,7 +1970,7 @@ RETRY_TRY_BLOCK: #endif break; default: - SET_FIXNUM_VALUE(regs_a[1], GETARG_C(i)); + SET_INT_VALUE(regs_a[1], GETARG_C(i)); i = MKOP_ABC(OP_SEND, a, GETARG_B(i), 1); goto L_SEND; } |