From f93dffb5eef2517b54769cfffda4a01ea3e9fd60 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 15 Jun 2020 07:47:22 +0900 Subject: Remove unused `MRB_TT_FILE`. --- include/mruby/boxing_word.h | 1 - include/mruby/value.h | 16 ++++++---------- mrbgems/mruby-objectspace/src/mruby_objectspace.c | 1 - src/etc.c | 1 - src/object.c | 1 - 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/include/mruby/boxing_word.h b/include/mruby/boxing_word.h index c0d7087e0..1b7815b7f 100644 --- a/include/mruby/boxing_word.h +++ b/include/mruby/boxing_word.h @@ -137,7 +137,6 @@ MRB_API mrb_value mrb_word_boxing_float_pool(struct mrb_state*, mrb_float); #define mrb_sclass_p(o) BOXWORD_OBJ_TYPE_P(o, SCLASS) #define mrb_proc_p(o) BOXWORD_OBJ_TYPE_P(o, PROC) #define mrb_range_p(o) BOXWORD_OBJ_TYPE_P(o, RANGE) -#define mrb_file_p(o) BOXWORD_OBJ_TYPE_P(o, FILE) #define mrb_env_p(o) BOXWORD_OBJ_TYPE_P(o, ENV) #define mrb_data_p(o) BOXWORD_OBJ_TYPE_P(o, DATA) #define mrb_fiber_p(o) BOXWORD_OBJ_TYPE_P(o, FIBER) diff --git a/include/mruby/value.h b/include/mruby/value.h index 33c70f15a..bafebfe75 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -122,13 +122,12 @@ enum mrb_vtype { MRB_TT_STRING, /* 16 */ MRB_TT_RANGE, /* 17 */ MRB_TT_EXCEPTION, /* 18 */ - MRB_TT_FILE, /* 19 */ - MRB_TT_ENV, /* 20 */ - MRB_TT_DATA, /* 21 */ - MRB_TT_FIBER, /* 22 */ - MRB_TT_ISTRUCT, /* 23 */ - MRB_TT_BREAK, /* 24 */ - MRB_TT_MAXDEFINE /* 25 */ + MRB_TT_ENV, /* 19 */ + MRB_TT_DATA, /* 20 */ + MRB_TT_FIBER, /* 21 */ + MRB_TT_ISTRUCT, /* 22 */ + MRB_TT_BREAK, /* 23 */ + MRB_TT_MAXDEFINE /* 24 */ }; #include @@ -240,9 +239,6 @@ struct RCptr { #ifndef mrb_range_p #define mrb_range_p(o) (mrb_type(o) == MRB_TT_RANGE) #endif -#ifndef mrb_file_p -#define mrb_file_p(o) (mrb_type(o) == MRB_TT_FILE) -#endif #ifndef mrb_env_p #define mrb_env_p(o) (mrb_type(o) == MRB_TT_ENV) #endif diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c index 651c04d92..b89fb0580 100644 --- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c +++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c @@ -89,7 +89,6 @@ os_count_objects(mrb_state *mrb, mrb_value self) COUNT_TYPE(T_STRING); COUNT_TYPE(T_RANGE); COUNT_TYPE(T_EXCEPTION); - COUNT_TYPE(T_FILE); COUNT_TYPE(T_ENV); COUNT_TYPE(T_DATA); COUNT_TYPE(T_FIBER); diff --git a/src/etc.c b/src/etc.c index 6e1533e3d..785f49357 100644 --- a/src/etc.c +++ b/src/etc.c @@ -132,7 +132,6 @@ mrb_obj_id(mrb_value obj) case MRB_TT_HASH: case MRB_TT_RANGE: case MRB_TT_EXCEPTION: - case MRB_TT_FILE: case MRB_TT_DATA: case MRB_TT_ISTRUCT: default: diff --git a/src/object.c b/src/object.c index 8de42a641..cc62343a1 100644 --- a/src/object.c +++ b/src/object.c @@ -366,7 +366,6 @@ static const struct types { {MRB_TT_STRING, "String"}, {MRB_TT_RANGE, "Range"}, /* {MRB_TT_BIGNUM, "Bignum"}, */ - {MRB_TT_FILE, "File"}, {MRB_TT_DATA, "Data"}, /* internal use: wrapped C pointers */ /* {MRB_TT_VARMAP, "Varmap"}, */ /* internal use: dynamic variables */ /* {MRB_TT_NODE, "Node"}, */ /* internal use: syntax tree node */ -- cgit v1.2.3