diff options
| -rw-r--r-- | include/mruby/class.h | 6 | ||||
| -rw-r--r-- | include/mruby/value.h | 28 | ||||
| -rw-r--r-- | src/etc.c | 1 | ||||
| -rw-r--r-- | src/object.c | 2 |
4 files changed, 12 insertions, 25 deletions
diff --git a/include/mruby/class.h b/include/mruby/class.h index ca05c0d9f..e2f1bae46 100644 --- a/include/mruby/class.h +++ b/include/mruby/class.h @@ -41,12 +41,6 @@ mrb_class(mrb_state *mrb, mrb_value v) return mrb->float_class; case MRB_TT_MAIN: return mrb->object_class; - - case MRB_TT_REGEX: - case MRB_TT_MATCH: - mrb_raisef(mrb, E_TYPE_ERROR, "type mismatch: %s given", - mrb_obj_classname(mrb, v)); - return mrb->nil_class; /* not reach */ default: return mrb_object(v)->c; } diff --git a/include/mruby/value.h b/include/mruby/value.h index 4e90aca9c..17f51db94 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -29,14 +29,12 @@ enum mrb_vtype { MRB_TT_HASH, /* 16 */ MRB_TT_STRING, /* 17 */ MRB_TT_RANGE, /* 18 */ - MRB_TT_REGEX, /* 19 */ - MRB_TT_STRUCT, /* 20 */ - MRB_TT_EXCEPTION, /* 21 */ - MRB_TT_MATCH, /* 22 */ - MRB_TT_FILE, /* 23 */ - MRB_TT_ENV, /* 24 */ - MRB_TT_DATA, /* 25 */ - MRB_TT_MAXDEFINE /* 26 */ + MRB_TT_STRUCT, /* 19 */ + MRB_TT_EXCEPTION, /* 20 */ + MRB_TT_FILE, /* 21 */ + MRB_TT_ENV, /* 22 */ + MRB_TT_DATA, /* 23 */ + MRB_TT_MAXDEFINE /* 24 */ }; typedef struct mrb_value { @@ -91,14 +89,12 @@ enum mrb_vtype { MRB_TT_HASH, /* 17 */ MRB_TT_STRING, /* 18 */ MRB_TT_RANGE, /* 19 */ - MRB_TT_REGEX, /* 20 */ - MRB_TT_STRUCT, /* 21 */ - MRB_TT_EXCEPTION, /* 22 */ - MRB_TT_MATCH, /* 23 */ - MRB_TT_FILE, /* 24 */ - MRB_TT_ENV, /* 25 */ - MRB_TT_DATA, /* 26 */ - MRB_TT_MAXDEFINE /* 27 */ + MRB_TT_STRUCT, /* 20 */ + MRB_TT_EXCEPTION, /* 21 */ + MRB_TT_FILE, /* 22 */ + MRB_TT_ENV, /* 23 */ + MRB_TT_DATA, /* 24 */ + MRB_TT_MAXDEFINE /* 25 */ }; #ifdef MRB_ENDIAN_BIG @@ -173,7 +173,6 @@ mrb_obj_id(mrb_value obj) case MRB_TT_RANGE: case MRB_TT_STRUCT: case MRB_TT_EXCEPTION: - case MRB_TT_MATCH: case MRB_TT_FILE: case MRB_TT_DATA: default: diff --git a/src/object.c b/src/object.c index cc8475cf1..e087c35c0 100644 --- a/src/object.c +++ b/src/object.c @@ -379,12 +379,10 @@ static const struct types { {MRB_TT_HASH, "Hash"}, {MRB_TT_STRING, "String"}, {MRB_TT_RANGE, "Range"}, - {MRB_TT_REGEX, "Regexp"}, {MRB_TT_STRUCT, "Struct"}, // {MRB_TT_BIGNUM, "Bignum"}, {MRB_TT_FILE, "File"}, {MRB_TT_DATA, "Data"}, /* internal use: wrapped C pointers */ - {MRB_TT_MATCH, "MatchData"}, /* data of $~ */ // {MRB_TT_VARMAP, "Varmap"}, /* internal use: dynamic variables */ // {MRB_TT_NODE, "Node"}, /* internal use: syntax tree node */ // {MRB_TT_UNDEF, "undef"}, /* internal use: #undef; should not happen */ |