Rename `MRB_TT_FIXNUM` to `MRB_TT_INTEGER`.

We still have `#define MRB_TT_FIXNUM MRB_TT_INTEGER` for compatibility.

10 files changed, 32 insertions, 32 deletions

diff --git a/src/array.c b/src/array.c
index 432599bf7..cd0b59ac2 100644
--- a/src/array.c
+++ b/src/array.c
@@ -885,7 +885,7 @@ mrb_ary_aget(mrb_state *mrb, mrb_value self)
       else {
         return mrb_nil_value();
       }
-    case MRB_TT_FIXNUM:
+    case MRB_TT_INTEGER:
       return mrb_ary_ref(mrb, self, mrb_fixnum(index));
     default:
       return mrb_ary_ref(mrb, self, aget_index(mrb, index));
diff --git a/src/class.c b/src/class.c
index df33feffb..dd713ed7e 100644
--- a/src/class.c
+++ b/src/class.c
@@ -1342,7 +1342,7 @@ mrb_singleton_class_ptr(mrb_state *mrb, mrb_value v)
   case MRB_TT_CPTR:
     return mrb->object_class;
   case MRB_TT_SYMBOL:
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
 #ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
 #endif
diff --git a/src/etc.c b/src/etc.c
index b0019e6de..e9990bec5 100644
--- a/src/etc.c
+++ b/src/etc.c
@@ -114,7 +114,7 @@ mrb_obj_id(mrb_value obj)
     return MakeID(2);
   case MRB_TT_SYMBOL:
     return MakeID(mrb_symbol(obj));
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
 #ifdef MRB_NO_FLOAT
     return MakeID(mrb_fixnum_id(mrb_fixnum(obj)));
 #else
diff --git a/src/gc.c b/src/gc.c
index fd472217e..393f7f62c 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -779,7 +779,7 @@ obj_free(mrb_state *mrb, struct RBasic *obj, int end)
   switch (obj->tt) {
     /* immediate - no mark */
   case MRB_TT_TRUE:
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
   case MRB_TT_SYMBOL:
     /* cannot happen */
     return;
diff --git a/src/hash.c b/src/hash.c
index 84ed00001..79cec4b71 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -64,7 +64,7 @@ ht_hash_func(mrb_state *mrb, htable *t, mrb_value key)
   case MRB_TT_TRUE:
   case MRB_TT_FALSE:
   case MRB_TT_SYMBOL:
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
 #ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
 #endif
@@ -95,7 +95,7 @@ ht_hash_equal(mrb_state *mrb, htable *t, mrb_value a, mrb_value b)
     if (!mrb_symbol_p(b)) return FALSE;
     return mrb_symbol(a) == mrb_symbol(b);
 
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
     if (!mrb_fixnum_p(b)) return FALSE;
     return mrb_fixnum(a) == mrb_fixnum(b);
 
diff --git a/src/numeric.c b/src/numeric.c
index 617348254..99d32f919 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -35,7 +35,7 @@ MRB_API mrb_float
 mrb_to_flo(mrb_state *mrb, mrb_value val)
 {
   switch (mrb_type(val)) {
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
     return (mrb_float)mrb_fixnum(val);
   case MRB_TT_FLOAT:
     break;
@@ -450,7 +450,7 @@ flo_eq(mrb_state *mrb, mrb_value x)
   mrb_value y = mrb_get_arg1(mrb);
 
   switch (mrb_type(y)) {
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
     return mrb_bool_value(mrb_float(x) == (mrb_float)mrb_fixnum(y));
   case MRB_TT_FLOAT:
     return mrb_bool_value(mrb_float(x) == mrb_float(y));
@@ -463,7 +463,7 @@ static int64_t
 value_int64(mrb_state *mrb, mrb_value x)
 {
   switch (mrb_type(x)) {
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
     return (int64_t)mrb_fixnum(x);
   case MRB_TT_FLOAT:
     return (int64_t)mrb_float(x);
@@ -1031,7 +1031,7 @@ int_equal(mrb_state *mrb, mrb_value x)
   mrb_value y = mrb_get_arg1(mrb);
 
   switch (mrb_type(y)) {
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
     return mrb_bool_value(mrb_fixnum(x) == mrb_fixnum(y));
 #ifndef MRB_NO_FLOAT
   case MRB_TT_FLOAT:
@@ -1477,7 +1477,7 @@ cmpnum(mrb_state *mrb, mrb_value v1, mrb_value v2)
   x = mrb_to_flo(mrb, v1);
 #endif
   switch (mrb_type(v2)) {
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
 #ifdef MRB_NO_FLOAT
     y = mrb_fixnum(v2);
 #else
@@ -1584,7 +1584,7 @@ mrb_cmp(mrb_state *mrb, mrb_value obj1, mrb_value obj2)
   mrb_value v;
 
   switch (mrb_type(obj1)) {
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
   case MRB_TT_FLOAT:
     return cmpnum(mrb, obj1, obj2);
   case MRB_TT_STRING:
@@ -1657,7 +1657,7 @@ mrb_init_numeric(mrb_state *mrb)
 
   /* Integer Class */
   mrb->integer_class = integer = mrb_define_class(mrb, "Integer",  numeric);     /* 15.2.8 */
-  MRB_SET_INSTANCE_TT(integer, MRB_TT_FIXNUM);
+  MRB_SET_INSTANCE_TT(integer, MRB_TT_INTEGER);
   mrb_undef_class_method(mrb, integer, "new");
   mrb_define_method(mrb, integer, "to_i",     int_to_i,        MRB_ARGS_NONE()); /* 15.2.8.3.24 */
   mrb_define_method(mrb, integer, "to_int",   int_to_i,        MRB_ARGS_NONE());
diff --git a/src/object.c b/src/object.c
index 634f70830..a6357a6a8 100644
--- a/src/object.c
+++ b/src/object.c
@@ -19,7 +19,7 @@ mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
     return TRUE;
 
   case MRB_TT_FALSE:
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
     return (mrb_fixnum(v1) == mrb_fixnum(v2));
   case MRB_TT_SYMBOL:
     return (mrb_symbol(v1) == mrb_symbol(v2));
@@ -322,7 +322,7 @@ static const struct types {
 /*    {MRB_TT_NIL,  "nil"}, */
   {MRB_TT_FALSE,  "false"},
   {MRB_TT_TRUE,   "true"},
-  {MRB_TT_FIXNUM, "Fixnum"},
+  {MRB_TT_INTEGER,"Integer"},
   {MRB_TT_SYMBOL, "Symbol"},  /* :symbol */
   {MRB_TT_MODULE, "Module"},
   {MRB_TT_OBJECT, "Object"},
@@ -536,7 +536,7 @@ mrb_convert_to_integer(mrb_state *mrb, mrb_value val, mrb_int base)
       return mrb_flo_to_fixnum(mrb, val);
 #endif
 
-    case MRB_TT_FIXNUM:
+    case MRB_TT_INTEGER:
       if (base != 0) goto arg_error;
       return val;
 
@@ -574,7 +574,7 @@ mrb_Float(mrb_state *mrb, mrb_value val)
     mrb_raise(mrb, E_TYPE_ERROR, "can't convert nil into Float");
   }
   switch (mrb_type(val)) {
-    case MRB_TT_FIXNUM:
+    case MRB_TT_INTEGER:
       return mrb_float_value(mrb, (mrb_float)mrb_fixnum(val));
 
     case MRB_TT_FLOAT:
diff --git a/src/range.c b/src/range.c
index 8f09eda24..0a76c9939 100644
--- a/src/range.c
+++ b/src/range.c
@@ -24,10 +24,10 @@ r_check(mrb_state *mrb, mrb_value a, mrb_value b)
   ta = mrb_type(a);
   tb = mrb_type(b);
 #ifdef MRB_NO_FLOAT
-  if (ta == MRB_TT_FIXNUM && tb == MRB_TT_FIXNUM ) {
+  if (ta == MRB_TT_INTEGER && tb == MRB_TT_INTEGER ) {
 #else
-  if ((ta == MRB_TT_FIXNUM || ta == MRB_TT_FLOAT) &&
-      (tb == MRB_TT_FIXNUM || tb == MRB_TT_FLOAT)) {
+  if ((ta == MRB_TT_INTEGER || ta == MRB_TT_FLOAT) &&
+      (tb == MRB_TT_INTEGER || tb == MRB_TT_FLOAT)) {
 #endif
     return;
   }
diff --git a/src/string.c b/src/string.c
index a8dfb5503..e88ba2be5 100644
--- a/src/string.c
+++ b/src/string.c
@@ -1093,7 +1093,7 @@ mrb_str_to_str(mrb_state *mrb, mrb_value str)
     return str;
   case MRB_TT_SYMBOL:
     return mrb_sym_str(mrb, mrb_symbol(str));
-  case MRB_TT_FIXNUM:
+  case MRB_TT_INTEGER:
     return mrb_fixnum_to_str(mrb, str, 10);
   case MRB_TT_SCLASS:
   case MRB_TT_CLASS:
@@ -1154,7 +1154,7 @@ str_convert_range(mrb_state *mrb, mrb_value str, mrb_value indx, mrb_value alen,
   }
   else {
     switch (mrb_type(indx)) {
-      case MRB_TT_FIXNUM:
+      case MRB_TT_INTEGER:
         *beg = mrb_fixnum(indx);
         *len = 1;
         return STR_CHAR_RANGE;
diff --git a/src/vm.c b/src/vm.c
index 401d52414..979c67424 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -2256,7 +2256,7 @@ RETRY_TRY_BLOCK:
   }                                                                         \
   NEXT;
 #define OP_MATH_CASE_FIXNUM(op_name)                                        \
-  case TYPES2(MRB_TT_FIXNUM, MRB_TT_FIXNUM):                                \
+  case TYPES2(MRB_TT_INTEGER, MRB_TT_INTEGER):                                \
     {                                                                       \
       mrb_int x = mrb_fixnum(regs[a]), y = mrb_fixnum(regs[a+1]), z;        \
       if (mrb_int_##op_name##_overflow(x, y, &z))                           \
@@ -2289,7 +2289,7 @@ RETRY_TRY_BLOCK:
 #define OP_MATH_OP_add +
 #define OP_MATH_OP_sub -
 #define OP_MATH_OP_mul *
-#define OP_MATH_TT_fixnum MRB_TT_FIXNUM
+#define OP_MATH_TT_fixnum MRB_TT_INTEGER
 #define OP_MATH_TT_float  MRB_TT_FLOAT
 
     CASE(OP_ADD, B) {
@@ -2311,7 +2311,7 @@ RETRY_TRY_BLOCK:
 
       /* need to check if op is overridden */
       switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):
+      case TYPES2(MRB_TT_INTEGER,MRB_TT_INTEGER):
         {
           mrb_int x = mrb_fixnum(regs[a]);
           mrb_int y = mrb_fixnum(regs[a+1]);
@@ -2345,11 +2345,11 @@ RETRY_TRY_BLOCK:
         }
         NEXT;
 #ifndef MRB_NO_FLOAT
-      case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):
+      case TYPES2(MRB_TT_INTEGER,MRB_TT_FLOAT):
         x = (mrb_float)mrb_fixnum(regs[a]);
         y = mrb_float(regs[a+1]);
         break;
-      case TYPES2(MRB_TT_FLOAT,MRB_TT_FIXNUM):
+      case TYPES2(MRB_TT_FLOAT,MRB_TT_INTEGER):
         x = mrb_float(regs[a]);
         y = (mrb_float)mrb_fixnum(regs[a+1]);
         break;
@@ -2391,7 +2391,7 @@ RETRY_TRY_BLOCK:
   }                                                                         \
   NEXT;
 #define OP_MATHI_CASE_FIXNUM(op_name)                                       \
-  case MRB_TT_FIXNUM:                                                       \
+  case MRB_TT_INTEGER:                                                      \
     {                                                                       \
       mrb_int x = mrb_fixnum(regs[a]), y = (mrb_int)b, z;                   \
       if (mrb_int_##op_name##_overflow(x, y, &z))                           \
@@ -2427,7 +2427,7 @@ RETRY_TRY_BLOCK:
   int result;\
   /* need to check if - is overridden */\
   switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {\
-  case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):\
+  case TYPES2(MRB_TT_INTEGER,MRB_TT_INTEGER):\
     result = OP_CMP_BODY(op,mrb_fixnum,mrb_fixnum);\
     break;\
   default:\
@@ -2447,13 +2447,13 @@ RETRY_TRY_BLOCK:
   int result;\
   /* need to check if - is overridden */\
   switch (TYPES2(mrb_type(regs[a]),mrb_type(regs[a+1]))) {\
-  case TYPES2(MRB_TT_FIXNUM,MRB_TT_FIXNUM):\
+  case TYPES2(MRB_TT_INTEGER,MRB_TT_INTEGER):\
     result = OP_CMP_BODY(op,mrb_fixnum,mrb_fixnum);\
     break;\
-  case TYPES2(MRB_TT_FIXNUM,MRB_TT_FLOAT):\
+  case TYPES2(MRB_TT_INTEGER,MRB_TT_FLOAT):\
     result = OP_CMP_BODY(op,mrb_fixnum,mrb_float);\
     break;\
-  case TYPES2(MRB_TT_FLOAT,MRB_TT_FIXNUM):\
+  case TYPES2(MRB_TT_FLOAT,MRB_TT_INTEGER):\
     result = OP_CMP_BODY(op,mrb_float,mrb_fixnum);\
     break;\
   case TYPES2(MRB_TT_FLOAT,MRB_TT_FLOAT):\