diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/array.c | 16 | ||||
| -rw-r--r-- | src/class.c | 27 | ||||
| -rw-r--r-- | src/codegen.c | 1 | ||||
| -rw-r--r-- | src/encoding.h | 4 | ||||
| -rw-r--r-- | src/error.c | 1 | ||||
| -rw-r--r-- | src/etc.c | 8 | ||||
| -rw-r--r-- | src/gc.c | 31 | ||||
| -rw-r--r-- | src/hash.c | 4 | ||||
| -rw-r--r-- | src/kernel.c | 19 | ||||
| -rw-r--r-- | src/load.c | 2 | ||||
| -rw-r--r-- | src/numeric.c | 18 | ||||
| -rw-r--r-- | src/object.c | 4 | ||||
| -rw-r--r-- | src/parse.y | 5 | ||||
| -rw-r--r-- | src/print.c | 2 | ||||
| -rw-r--r-- | src/re.c | 11 | ||||
| -rw-r--r-- | src/regparse.c | 4 | ||||
| -rw-r--r-- | src/sprintf.c | 8 | ||||
| -rw-r--r-- | src/string.c | 18 | ||||
| -rw-r--r-- | src/struct.c | 24 | ||||
| -rw-r--r-- | src/symbol.c | 4 | ||||
| -rw-r--r-- | src/variable.c | 4 | ||||
| -rw-r--r-- | src/vm.c | 8 |
22 files changed, 119 insertions, 104 deletions
diff --git a/src/array.c b/src/array.c index 2e2536368..a200de3aa 100644 --- a/src/array.c +++ b/src/array.c @@ -294,7 +294,7 @@ mrb_ary_cmp(mrb_state *mrb, mrb_value ary1) int i, len; mrb_get_args(mrb, "o", &ary2); - if (mrb_type(ary2) != MRB_TT_ARRAY) return mrb_nil_value(); + if (!mrb_array_p(ary2)) return mrb_nil_value(); a1 = RARRAY(ary1); a2 = RARRAY(ary2); if (a1->len == a2->len && a1->ptr == a2->ptr) return mrb_fixnum_value(0); else { @@ -616,7 +616,7 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val tail = head + len; /* size check */ - if (mrb_type(rpl) == MRB_TT_ARRAY) { + if (mrb_array_p(rpl)) { argc = RARRAY_LEN(rpl); argv = RARRAY_PTR(rpl); } @@ -719,7 +719,7 @@ mrb_ary_aset(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "*", &argv, &argc); switch(argc) { case 2: - if (FIXNUM_P(argv[0])) { + if (mrb_fixnum_p(argv[0])) { mrb_ary_set(mrb, self, mrb_fixnum(argv[0]), argv[1]); } else { @@ -848,7 +848,7 @@ mrb_ary_rindex_m(mrb_state *mrb, mrb_value self) mrb_value mrb_ary_splat(mrb_state *mrb, mrb_value v) { - if (mrb_type(v) == MRB_TT_ARRAY) { + if (mrb_array_p(v)) { return v; } else { @@ -928,7 +928,7 @@ inspect_ary(mrb_state *mrb, mrb_value ary, mrb_value list) if (i > 0) { mrb_str_buf_cat(mrb, arystr, sep, sizeof(sep)); } - if (mrb_type(RARRAY_PTR(ary)[i]) == MRB_TT_ARRAY) { + if (mrb_array_p(RARRAY_PTR(ary)[i])) { s = inspect_ary(mrb, RARRAY_PTR(ary)[i], list); } else { s = mrb_inspect(mrb, RARRAY_PTR(ary)[i]); @@ -1067,8 +1067,8 @@ mrb_ary_equal(mrb_state *mrb, mrb_value ary1) mrb_get_args(mrb, "o", &ary2); if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_true_value(); - if (SPECIAL_CONST_P(ary2)) return mrb_false_value(); - if (mrb_type(ary2) != MRB_TT_ARRAY) { + if (mrb_special_const_p(ary2)) return mrb_false_value(); + if (!mrb_array_p(ary2)) { if (!mrb_respond_to(mrb, ary2, mrb_intern(mrb, "to_ary"))) { return mrb_false_value(); } @@ -1107,7 +1107,7 @@ mrb_ary_eql(mrb_state *mrb, mrb_value ary1) mrb_get_args(mrb, "o", &ary2); if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_true_value(); - if (mrb_type(ary2) != MRB_TT_ARRAY) return mrb_false_value(); + if (!mrb_array_p(ary2)) return mrb_false_value(); if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return mrb_false_value(); else { int i; diff --git a/src/class.c b/src/class.c index 3e54afede..cf2f6df50 100644 --- a/src/class.c +++ b/src/class.c @@ -503,8 +503,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) case MRB_TT_FIXNUM: *p = (mrb_float)mrb_fixnum(*sp); break; - case MRB_TT_FALSE: - *p = 0.0; + case MRB_TT_STRING: + mrb_raise(mrb, E_TYPE_ERROR, "String can't be coerced into Float"); break; default: { @@ -852,9 +852,12 @@ mrb_method_search(mrb_state *mrb, struct RClass* c, mrb_sym mid) m = mrb_method_search_vm(mrb, &c, mid); if (!m) { + mrb_value inspect = mrb_funcall(mrb, mrb_obj_value(c), "inspect", 0); + if (RSTRING_LEN(inspect) > 64) { + inspect = mrb_any_to_s(mrb, mrb_obj_value(c)); + } mrb_raisef(mrb, E_NAME_ERROR, "undefined method '%s' for class %s", - mrb_sym2name(mrb, mid), - RSTRING_PTR(mrb_funcall(mrb, mrb_obj_value(c), "inspect", 0))); + mrb_sym2name(mrb, mid), RSTRING_PTR(inspect)); } return m; } @@ -1005,14 +1008,20 @@ mrb_bob_missing(mrb_state *mrb, mrb_value mod) { mrb_value name, *a; int alen; + mrb_value inspect; mrb_get_args(mrb, "o*", &name, &a, &alen); - if (!SYMBOL_P(name)) { + if (!mrb_symbol_p(name)) { mrb_raise(mrb, E_TYPE_ERROR, "name should be a symbol"); } + + inspect = mrb_funcall(mrb, mod, "inspect", 0); + if (RSTRING_LEN(inspect) > 64) { + inspect = mrb_any_to_s(mrb, mod); + } + mrb_raisef(mrb, E_NOMETHOD_ERROR, "undefined method '%s' for %s", - mrb_sym2name(mrb, mrb_symbol(name)), - RSTRING_PTR(mrb_funcall(mrb, mod, "inspect", 0))); + mrb_sym2name(mrb, mrb_symbol(name)), RSTRING_PTR(inspect)); /* not reached */ return mrb_nil_value(); } @@ -1322,10 +1331,10 @@ mod_define_method(mrb_state *mrb, mrb_value self) static mrb_sym mrb_sym_value(mrb_state *mrb, mrb_value val) { - if(mrb_type(val) == MRB_TT_STRING) { + if (mrb_string_p(val)) { return mrb_intern_str(mrb, val); } - else if(mrb_type(val) != MRB_TT_SYMBOL) { + else if(!mrb_symbol_p(val)) { mrb_value obj = mrb_funcall(mrb, val, "inspect", 0); mrb_raisef(mrb, E_TYPE_ERROR, "%s is not a symbol", mrb_string_value_ptr(mrb, obj)); diff --git a/src/codegen.c b/src/codegen.c index ca2269d85..82e80ee41 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -635,7 +635,6 @@ scope_body(codegen_scope *s, node *tree) genop(scope, MKOP_A(OP_STOP, 0)); } else { - pop_(scope); if (scope->nregs == 0) { genop(scope, MKOP_A(OP_LOADNIL, 0)); genop(scope, MKOP_AB(OP_RETURN, 0, OP_R_NORMAL)); diff --git a/src/encoding.h b/src/encoding.h index 00cb92bd8..7bc0d9ef0 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -35,8 +35,8 @@ extern "C" { #define ENCODING_MASK (((unsigned int)ENCODING_INLINE_MAX)<<ENCODING_SHIFT) #define ENCODING_SET_INLINED(obj,i) do {\ - RBASIC(obj)->flags &= ~ENCODING_MASK;\ - RBASIC(obj)->flags |= (unsigned int)(i) << ENCODING_SHIFT;\ + mrb_obj_ptr(obj)->flags &= ~ENCODING_MASK;\ + mrb_obj_ptr(obj)->flags |= (unsigned int)(i) << ENCODING_SHIFT;\ } while (0) #define ENCODING_SET(mrb, obj,i) do {\ mrb_value mrb_encoding_set_obj = (obj); \ diff --git a/src/error.c b/src/error.c index 858c70820..430728db0 100644 --- a/src/error.c +++ b/src/error.c @@ -189,6 +189,7 @@ exc_debug_info(mrb_state *mrb, struct RObject *exc) mrb_callinfo *ci = mrb->ci; mrb_code *pc = ci->pc; + mrb_obj_iv_set(mrb, exc, mrb_intern(mrb, "ciidx"), mrb_fixnum_value(ci - mrb->cibase)); ci--; while (ci >= mrb->cibase) { if (ci->proc && !MRB_PROC_CFUNC_P(ci->proc)) { @@ -25,7 +25,7 @@ mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const str void * mrb_get_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *type) { - if (SPECIAL_CONST_P(obj) || (mrb_type(obj) != MRB_TT_DATA)) { + if (mrb_special_const_p(obj) || (mrb_type(obj) != MRB_TT_DATA)) { return NULL; } if (DATA_TYPE(obj) != type) { @@ -39,7 +39,7 @@ mrb_check_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *ty { static const char mesg[] = "wrong argument type %s (expected %s)"; - if (SPECIAL_CONST_P(obj) || (mrb_type(obj) != MRB_TT_DATA)) { + if (mrb_special_const_p(obj) || (mrb_type(obj) != MRB_TT_DATA)) { mrb_check_type(mrb, obj, MRB_TT_DATA); } if (DATA_TYPE(obj) != type) { @@ -103,7 +103,7 @@ mrb_to_id(mrb_state *mrb, mrb_value name) name = mrb_str_intern(mrb, name); /* fall through */ case MRB_TT_SYMBOL: - return SYM2ID(name); + return mrb_symbol(name); } return id; } @@ -156,7 +156,7 @@ mrb_obj_id(mrb_value obj) case MRB_TT_TRUE: return MakeID(1); case MRB_TT_SYMBOL: - return MakeID(SYM2ID(obj)); + return MakeID(mrb_symbol(obj)); case MRB_TT_FIXNUM: return MakeID2(float_id((mrb_float)mrb_fixnum(obj)), MRB_TT_FLOAT); case MRB_TT_FLOAT: @@ -5,7 +5,6 @@ */ #include "mruby.h" -#include "mruby/object.h" #include "mruby/class.h" #include "mruby/array.h" #include "mruby/string.h" @@ -318,8 +317,8 @@ gc_protect(mrb_state *mrb, struct RBasic *p) void mrb_gc_protect(mrb_state *mrb, mrb_value obj) { - if (SPECIAL_CONST_P(obj)) return; - gc_protect(mrb, RBASIC(obj)); + if (mrb_special_const_p(obj)) return; + gc_protect(mrb, mrb_basic(obj)); } struct RBasic* @@ -1076,8 +1075,8 @@ test_mrb_field_write_barrier(void) struct RBasic *obj, *value; puts("test_mrb_field_write_barrier"); - obj = RBASIC(mrb_ary_new(mrb)); - value = RBASIC(mrb_str_new_cstr(mrb, "value")); + obj = mrb_basic(mrb_ary_new(mrb)); + value = mrb_basic(mrb_str_new_cstr(mrb, "value")); paint_black(obj); paint_partial_white(mrb,value); @@ -1118,15 +1117,15 @@ test_mrb_field_write_barrier(void) { puts("test_mrb_field_write_barrier_value"); - obj = RBASIC(mrb_ary_new(mrb)); + obj = mrb_basic(mrb_ary_new(mrb)); mrb_value value = mrb_str_new_cstr(mrb, "value"); paint_black(obj); - paint_partial_white(mrb, RBASIC(value)); + paint_partial_white(mrb, mrb_basic(value)); mrb->gc_state = GC_STATE_MARK; mrb_field_write_barrier_value(mrb, obj, value); - gc_assert(is_gray(RBASIC(value))); + gc_assert(is_gray(mrb_basic(value))); } mrb_close(mrb); @@ -1139,7 +1138,7 @@ test_mrb_write_barrier(void) struct RBasic *obj; puts("test_mrb_write_barrier"); - obj = RBASIC(mrb_ary_new(mrb)); + obj = mrb_basic(mrb_ary_new(mrb)); paint_black(obj); puts(" in GC_STATE_MARK"); @@ -1167,12 +1166,12 @@ test_add_gray_list(void) puts("test_add_gray_list"); gc_assert(mrb->gray_list == NULL); - obj1 = RBASIC(mrb_str_new_cstr(mrb, "test")); + obj1 = mrb_basic(mrb_str_new_cstr(mrb, "test")); add_gray_list(mrb, obj1); gc_assert(mrb->gray_list == obj1); gc_assert(is_gray(obj1)); - obj2 = RBASIC(mrb_str_new_cstr(mrb, "test")); + obj2 = mrb_basic(mrb_str_new_cstr(mrb, "test")); add_gray_list(mrb, obj2); gc_assert(mrb->gray_list == obj2); gc_assert(mrb->gray_list->gcnext == obj1); @@ -1201,12 +1200,12 @@ test_gc_gray_mark(void) puts(" in MRB_TT_ARRAY"); obj_v = mrb_ary_new(mrb); value_v = mrb_str_new_cstr(mrb, "test"); - paint_gray(RBASIC(obj_v)); - paint_partial_white(mrb, RBASIC(value_v)); + paint_gray(mrb_basic(obj_v)); + paint_partial_white(mrb, mrb_basic(value_v)); mrb_ary_push(mrb, obj_v, value_v); - gray_num = gc_gray_mark(mrb, RBASIC(obj_v)); - gc_assert(is_black(RBASIC(obj_v))); - gc_assert(is_gray(RBASIC(value_v))); + gray_num = gc_gray_mark(mrb, mrb_basic(obj_v)); + gc_assert(is_black(mrb_basic(obj_v))); + gc_assert(is_gray(mrb_basic(value_v))); gc_assert(gray_num == 1); mrb_close(mrb); diff --git a/src/hash.c b/src/hash.c index 51f85f4e8..229e61db7 100644 --- a/src/hash.c +++ b/src/hash.c @@ -37,7 +37,7 @@ static void mrb_hash_modify(mrb_state *mrb, mrb_value hash); static inline mrb_value mrb_hash_ht_key(mrb_state *mrb, mrb_value key) { - if (mrb_type(key) == MRB_TT_STRING) + if (mrb_string_p(key)) return mrb_str_dup(mrb, key); else return key; @@ -1106,7 +1106,7 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, int eql) khash_t(ht) *h1, *h2; if (mrb_obj_equal(mrb, hash1, hash2)) return mrb_true_value(); - if (mrb_type(hash2) != MRB_TT_HASH) { + if (!mrb_hash_p(hash2)) { if (!mrb_respond_to(mrb, hash2, mrb_intern(mrb, "to_hash"))) { return mrb_false_value(); } diff --git a/src/kernel.c b/src/kernel.c index 050dd73bc..ac3c10f46 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -269,7 +269,7 @@ mrb_obj_class_m(mrb_state *mrb, mrb_value self) struct RClass* mrb_singleton_class_clone(mrb_state *mrb, mrb_value obj) { - struct RClass *klass = RBASIC(obj)->c; + struct RClass *klass = mrb_basic(obj)->c; if (klass->tt != MRB_TT_SCLASS) return klass; @@ -345,16 +345,18 @@ init_copy(mrb_state *mrb, mrb_value dest, mrb_value obj) mrb_value mrb_obj_clone(mrb_state *mrb, mrb_value self) { - struct RObject *clone; + struct RObject *p; + mrb_value clone; if (mrb_special_const_p(self)) { mrb_raisef(mrb, E_TYPE_ERROR, "can't clone %s", mrb_obj_classname(mrb, self)); } - clone = (struct RObject*)mrb_obj_alloc(mrb, mrb_type(self), mrb_obj_class(mrb, self)); - clone->c = mrb_singleton_class_clone(mrb, self); - init_copy(mrb, mrb_obj_value(clone), self); + p = (struct RObject*)mrb_obj_alloc(mrb, mrb_type(self), mrb_obj_class(mrb, self)); + p->c = mrb_singleton_class_clone(mrb, self); + clone = mrb_obj_value(p); + init_copy(mrb, clone, self); - return mrb_obj_value(clone); + return clone; } /* 15.3.1.3.9 */ @@ -762,7 +764,7 @@ mrb_obj_singleton_methods(mrb_state *mrb, int argc, mrb_value *argv, mrb_value o method_entry_loop(mrb, klass, ary); klass = klass->super; } - if (RTEST(recur)) { + if (mrb_test(recur)) { while (klass && ((klass->tt == MRB_TT_SCLASS) || (klass->tt == MRB_TT_ICLASS))) { method_entry_loop(mrb, klass, ary); klass = klass->super; @@ -1006,7 +1008,7 @@ obj_respond_to(mrb_state *mrb, mrb_value self) if (argc > 1) priv = argv[1]; else priv = mrb_nil_value(); id = mrb_to_id(mrb, mid); - if (basic_obj_respond_to(mrb, self, id, !RTEST(priv))) + if (basic_obj_respond_to(mrb, self, id, !mrb_test(priv))) return mrb_true_value(); return mrb_false_value(); } @@ -1115,4 +1117,5 @@ mrb_init_kernel(mrb_state *mrb) #endif mrb_include_module(mrb, mrb->object_class, mrb->kernel_module); + mrb_alias_method(mrb, mrb->module_class, mrb_intern(mrb, "dup"), mrb_intern(mrb, "clone")); } diff --git a/src/load.c b/src/load.c index 65b6004d3..142c6fdf7 100644 --- a/src/load.c +++ b/src/load.c @@ -613,6 +613,7 @@ hex_to_str(char *hex, char *str, uint16_t *str_len) { char *src, *dst, buf[4]; int escape = 0, base = 0; + char *err_ptr; *str_len = 0; for (src = hex, dst = str; *src != '\0'; src++) { @@ -639,7 +640,6 @@ hex_to_str(char *hex, char *str, uint16_t *str_len) strncpy(buf, src, 2); } - char *err_ptr; *dst++ = (unsigned char) strtol(buf, &err_ptr, base) & 0xff; src += (err_ptr - buf - 1); break; diff --git a/src/numeric.c b/src/numeric.c index c1491ac51..562562340 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -97,7 +97,7 @@ num_pow(mrb_state *mrb, mrb_value x) mrb_float d; mrb_get_args(mrb, "o", &y); - if (FIXNUM_P(x) && FIXNUM_P(y)) both_int = TRUE; + if (mrb_fixnum_p(x) && mrb_fixnum_p(y)) both_int = TRUE; d = pow(mrb_to_flo(mrb, x), mrb_to_flo(mrb, y)); if (both_int && FIXABLE(d)) return mrb_fixnum_value((mrb_int)d); @@ -682,7 +682,7 @@ fix_succ(mrb_state *mrb, mrb_value num) static mrb_value int_succ(mrb_state *mrb, mrb_value num) { - if (FIXNUM_P(num)) return fix_succ(mrb, num); + if (mrb_fixnum_p(num)) return fix_succ(mrb, num); return mrb_funcall(mrb, num, "+", 1, mrb_fixnum_value(1)); } @@ -697,7 +697,7 @@ mrb_fixnum_mul(mrb_state *mrb, mrb_value x, mrb_value y) a = mrb_fixnum(x); if (a == 0) return x; - if (FIXNUM_P(y)) { + if (mrb_fixnum_p(y)) { mrb_int b, c; b = mrb_fixnum(y); @@ -774,7 +774,7 @@ fix_mod(mrb_state *mrb, mrb_value x) mrb_get_args(mrb, "o", &y); a = mrb_fixnum(x); - if (FIXNUM_P(y) && (b=mrb_fixnum(y)) != 0) { + if (mrb_fixnum_p(y) && (b=mrb_fixnum(y)) != 0) { mrb_int mod; if (mrb_fixnum(y) == 0) { @@ -803,7 +803,7 @@ fix_divmod(mrb_state *mrb, mrb_value x) mrb_value y; mrb_get_args(mrb, "o", &y); - if (FIXNUM_P(y)) { + if (mrb_fixnum_p(y)) { mrb_int div, mod; if (mrb_fixnum(y) == 0) { @@ -877,8 +877,8 @@ fix_rev(mrb_state *mrb, mrb_value num) static mrb_value bit_coerce(mrb_state *mrb, mrb_value x) { - while (!FIXNUM_P(x)) { - if (mrb_type(x) == MRB_TT_FLOAT) { + while (!mrb_fixnum_p(x)) { + if (mrb_float_p(x)) { mrb_raise(mrb, E_TYPE_ERROR, "can't convert Float into Integer"); } x = mrb_to_int(mrb, x); @@ -1076,7 +1076,7 @@ mrb_fixnum_plus(mrb_state *mrb, mrb_value x, mrb_value y) a = mrb_fixnum(x); if (a == 0) return y; - if (FIXNUM_P(y)) { + if (mrb_fixnum_p(y)) { mrb_int b, c; b = mrb_fixnum(y); @@ -1114,7 +1114,7 @@ mrb_fixnum_minus(mrb_state *mrb, mrb_value x, mrb_value y) mrb_int a; a = mrb_fixnum(x); - if (FIXNUM_P(y)) { + if (mrb_fixnum_p(y)) { mrb_int b, c; b = mrb_fixnum(y); diff --git a/src/object.c b/src/object.c index a23e397f6..51b5c12d9 100644 --- a/src/object.c +++ b/src/object.c @@ -509,7 +509,7 @@ mrb_to_integer(mrb_state *mrb, mrb_value val, const char *method) { mrb_value v; - if (FIXNUM_P(val)) return val; + if (mrb_fixnum_p(val)) return val; v = convert_type(mrb, val, "Integer", method, TRUE); if (!mrb_obj_is_kind_of(mrb, v, mrb->fixnum_class)) { const char *cname = mrb_obj_classname(mrb, val); @@ -603,5 +603,5 @@ int mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2) { if (mrb_obj_eq(mrb, obj1, obj2)) return TRUE; - return RTEST(mrb_funcall(mrb, obj1, "eql?", 1, obj2)); + return mrb_test(mrb_funcall(mrb, obj1, "eql?", 1, obj2)); } diff --git a/src/parse.y b/src/parse.y index cffb6ba09..abec59e3f 100644 --- a/src/parse.y +++ b/src/parse.y @@ -3162,10 +3162,13 @@ skips(parser_state *p, const char *s) int len = strlen(s); while (len--) { - nextc(p); + nextc(p); } return TRUE; } + else{ + s--; + } } return FALSE; } diff --git a/src/print.c b/src/print.c index e6805edbf..3b762e05f 100644 --- a/src/print.c +++ b/src/print.c @@ -16,7 +16,7 @@ printstr(mrb_state *mrb, mrb_value obj) char *s; int len; - if (mrb_type(obj) == MRB_TT_STRING) { + if (mrb_string_p(obj)) { str = mrb_str_ptr(obj); s = str->ptr; len = str->len; @@ -260,7 +260,7 @@ match_backref_number(mrb_state *mrb, mrb_value match, mrb_value backref) return mrb_fixnum(backref); case MRB_TT_SYMBOL: - name = mrb_sym2name(mrb, SYM2ID(backref)); + name = mrb_sym2name(mrb, mrb_symbol(backref)); break; case MRB_TT_STRING: @@ -344,8 +344,8 @@ mrb_reg_options(mrb_state *mrb, mrb_value re) mrb_reg_check(mrb, re); options = RREGEXP(re)->ptr->options & ARG_REG_OPTION_MASK; - if (RBASIC(re)->flags & KCODE_FIXED) options |= ARG_ENCODING_FIXED; - if (RBASIC(re)->flags & REG_ENCODING_NONE) options |= ARG_ENCODING_NONE; + if (mrb_basic(re)->flags & KCODE_FIXED) options |= ARG_ENCODING_FIXED; + if (mrb_basic(re)->flags & REG_ENCODING_NONE) options |= ARG_ENCODING_NONE; return options; } @@ -361,7 +361,7 @@ mrb_reg_desc(mrb_state *mrb, const char *s, long len, mrb_value re) mrb_reg_check(mrb, re); if (*option_to_str(opts, RREGEXP(re)->ptr->options)) mrb_str_buf_cat(mrb, str, opts, strlen(opts));//mrb_str_buf_cat2(str, opts); - if (RBASIC(re)->flags & REG_ENCODING_NONE) + if (mrb_basic(re)->flags & REG_ENCODING_NONE) mrb_str_buf_cat(mrb, str, "n", 1); } @@ -1192,8 +1192,7 @@ mrb_match_aref(mrb_state *mrb, /*int argc, mrb_value *argv,*/ mrb_value match) switch (mrb_type(idx)) { case MRB_TT_SYMBOL: - //p = mrb_id2name(SYM2ID(idx)); - p = mrb_sym2name(mrb, SYM2ID(idx)); + p = mrb_sym2name(mrb, mrb_symbol(idx)); goto name_to_backref; break; case MRB_TT_STRING: diff --git a/src/regparse.c b/src/regparse.c index f7bb23306..0ecb01018 100644 --- a/src/regparse.c +++ b/src/regparse.c @@ -2831,7 +2831,7 @@ CLOSE_BRACKET_WITHOUT_ESC_WARN(ScanEnv* env, UChar* c) static void CC_DUP_WARN(ScanEnv *env) { - if (onig_warn == onig_null_warn /*|| !RTEST(ruby_verbose)*/) return ; + if (onig_warn == onig_null_warn /*|| !mrb_test(ruby_verbose)*/) return ; if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_DUP) && !((env)->warnings_flag & ONIG_SYN_WARN_CC_DUP)) { @@ -2843,7 +2843,7 @@ CC_DUP_WARN(ScanEnv *env) static void UNKNOWN_ESC_WARN(ScanEnv *env, int c) { - if (onig_warn == onig_null_warn /*|| !RTEST(ruby_verbose)*/) return ; + if (onig_warn == onig_null_warn /*|| !mrb_test(ruby_verbose)*/) return ; onig_syntax_warn(env, "Unknown escape \\%c is ignored", c); } diff --git a/src/sprintf.c b/src/sprintf.c index 2bd72ffc6..630875a88 100644 --- a/src/sprintf.c +++ b/src/sprintf.c @@ -800,7 +800,7 @@ retry: goto bin_retry; } val = mrb_flt2big(mrb, mrb_float(val)); - if (FIXNUM_P(val)) goto bin_retry; + if (mrb_fixnum_p(val)) goto bin_retry; break; case MRB_TT_STRING: val = mrb_str_to_inum(mrb, val, 0, TRUE); @@ -1048,13 +1048,15 @@ retry: } sprint_exit: +#if 0 /* XXX - We cannot validate the number of arguments if (digit)$ style used. */ if (posarg >= 0 && nextarg < argc) { const char *mesg = "too many arguments for format string"; - if (RTEST(ruby_debug)) mrb_raise(mrb, E_ARGUMENT_ERROR, mesg); - if (RTEST(ruby_verbose)) mrb_warn("%s", mesg); + if (mrb_test(ruby_debug)) mrb_raise(mrb, E_ARGUMENT_ERROR, mesg); + if (mrb_test(ruby_verbose)) mrb_warn("%s", mesg); } +#endif mrb_str_resize(mrb, result, blen); return result; diff --git a/src/string.c b/src/string.c index 8eb08562d..760b02883 100644 --- a/src/string.c +++ b/src/string.c @@ -333,7 +333,7 @@ mrb_str_concat(mrb_state *mrb, mrb_value self, mrb_value other) int len; str_modify(mrb, s1); - if (mrb_type(other) != MRB_TT_STRING) { + if (!mrb_string_p(other)) { other = mrb_str_to_str(mrb, other); } s2 = mrb_str_ptr(other); @@ -519,7 +519,7 @@ mrb_str_cmp_m(mrb_state *mrb, mrb_value str1) mrb_int result; mrb_get_args(mrb, "o", &str2); - if (mrb_type(str2) != MRB_TT_STRING) { + if (!mrb_string_p(str2)) { if (!mrb_respond_to(mrb, str2, mrb_intern(mrb, "to_s"))) { return mrb_nil_value(); } @@ -557,7 +557,7 @@ int mrb_str_equal(mrb_state *mrb, mrb_value str1, mrb_value str2) { if (mrb_obj_equal(mrb, str1, str2)) return TRUE; - if (mrb_type(str2) != MRB_TT_STRING) { + if (!mrb_string_p(str2)) { if (mrb_nil_p(str2)) return FALSE; if (!mrb_respond_to(mrb, str2, mrb_intern(mrb, "to_str"))) { return FALSE; @@ -595,7 +595,7 @@ mrb_str_to_str(mrb_state *mrb, mrb_value str) { mrb_value s; - if (mrb_type(str) != MRB_TT_STRING) { + if (!mrb_string_p(str)) { s = mrb_check_convert_type(mrb, str, MRB_TT_STRING, "String", "to_str"); if (mrb_nil_p(s)) { s = mrb_convert_type(mrb, str, MRB_TT_STRING, "String", "to_s"); @@ -609,7 +609,7 @@ mrb_value mrb_string_value(mrb_state *mrb, mrb_value *ptr) { mrb_value s = *ptr; - if (mrb_type(s) != MRB_TT_STRING) { + if (!mrb_string_p(s)) { s = mrb_str_to_str(mrb, s); *ptr = s; } @@ -1317,7 +1317,7 @@ str_gsub(mrb_state *mrb, mrb_value str, mrb_int bang) mrb_str_buf_cat(mrb, dest, cp, RSTRING_LEN(str) - offset); } mrb_reg_search(mrb, pat, str, last, 0); - RBASIC(dest)->c = mrb_obj_class(mrb, str); + mrb_basic(dest)->c = mrb_obj_class(mrb, str); return str; } @@ -1653,11 +1653,11 @@ mrb_obj_as_string(mrb_state *mrb, mrb_value obj) { mrb_value str; - if (mrb_type(obj) == MRB_TT_STRING) { + if (mrb_string_p(obj)) { return obj; } str = mrb_funcall(mrb, obj, "to_s", 0); - if (mrb_type(str) != MRB_TT_STRING) + if (!mrb_string_p(str)) return mrb_any_to_s(mrb, obj); return str; } @@ -2141,7 +2141,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str) split_type = awk; } else { - if (mrb_type(spat) == MRB_TT_STRING) { + if (mrb_string_p(spat)) { split_type = string; #ifdef ENABLE_REGEXP if (RSTRING_LEN(spat) == 0) { diff --git a/src/struct.c b/src/struct.c index 2a391d0b1..85d0fa094 100644 --- a/src/struct.c +++ b/src/struct.c @@ -58,7 +58,7 @@ mrb_struct_s_members(mrb_state *mrb, mrb_value klass) if (mrb_nil_p(members)) { mrb_raise(mrb, E_TYPE_ERROR, "uninitialized struct"); } - if (mrb_type(members) != MRB_TT_ARRAY) { + if (!mrb_array_p(members)) { mrb_raise(mrb, E_TYPE_ERROR, "corrupted struct"); } return members; @@ -220,7 +220,7 @@ mrb_struct_set(mrb_state *mrb, mrb_value obj, mrb_value val) ptr = RSTRUCT_PTR(obj); for (i=0; i<len; i++) { slot = ptr_members[i]; - if (SYM2ID(slot) == mid) { + if (mrb_symbol(slot) == mid) { return ptr[i] = val; } } @@ -290,7 +290,7 @@ make_struct(mrb_state *mrb, mrb_value name, mrb_value members, struct RClass * k ptr_members = RARRAY_PTR(members); len = RARRAY_LEN(members); for (i=0; i< len; i++) { - mrb_sym id = SYM2ID(ptr_members[i]); + mrb_sym id = mrb_symbol(ptr_members[i]); if (mrb_is_local_id(id) || mrb_is_const_id(id)) { if (i < N_REF_FUNC) { mrb_define_method_id(mrb, c, id, ref_func[i], ARGS_NONE()); @@ -381,8 +381,8 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass) else { if (argc > 0) name = argv[0]; if (argc > 1) rest = argv[1]; - if (mrb_type(rest) == MRB_TT_ARRAY) { - if (!mrb_nil_p(name) && SYMBOL_P(name)) { + if (mrb_array_p(rest)) { + if (!mrb_nil_p(name) && mrb_symbol_p(name)) { /* 1stArgument:symbol -> name=nil rest=argv[0]-[n] */ mrb_ary_unshift(mrb, rest, name); name = mrb_nil_value(); @@ -391,7 +391,7 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass) else { pargv = &argv[1]; argcnt = argc-1; - if (!mrb_nil_p(name) && SYMBOL_P(name)) { + if (!mrb_nil_p(name) && mrb_symbol_p(name)) { /* 1stArgument:symbol -> name=nil rest=argv[0]-[n] */ name = mrb_nil_value(); pargv = &argv[0]; @@ -417,7 +417,7 @@ num_members(mrb_state *mrb, struct RClass *klass) { mrb_value members; members = struct_ivar_get(mrb, mrb_obj_value(klass), mrb_intern(mrb, "__members__")); - if (mrb_type(members) != MRB_TT_ARRAY) { + if (!mrb_array_p(members)) { mrb_raise(mrb, E_TYPE_ERROR, "broken members"); } return RARRAY_LEN(members); @@ -492,7 +492,7 @@ inspect_struct(mrb_state *mrb, mrb_value s, mrb_value dummy, int recur) mrb_str_cat2(mrb, str, " "); } slot = ptr_members[i]; - id = SYM2ID(slot); + id = mrb_symbol(slot); if (mrb_is_local_id(id) || mrb_is_const_id(id)) { const char *name; int len; @@ -556,7 +556,7 @@ mrb_struct_aref_id(mrb_state *mrb, mrb_value s, mrb_sym id) ptr_members = RARRAY_PTR(members); len = RARRAY_LEN(members); for (i=0; i<len; i++) { - if (SYM2ID(ptr_members[i]) == id) { + if (mrb_symbol(ptr_members[i]) == id) { return ptr[i]; } } @@ -588,7 +588,7 @@ mrb_struct_aref_n(mrb_state *mrb, mrb_value s, mrb_value idx) { long i; - if (mrb_type(idx) == MRB_TT_STRING || mrb_type(idx) == MRB_TT_SYMBOL) { + if (mrb_string_p(idx) || mrb_symbol_p(idx)) { return mrb_struct_aref_id(mrb, s, mrb_to_id(mrb, idx)); } @@ -628,7 +628,7 @@ mrb_struct_aset_id(mrb_state *mrb, mrb_value s, mrb_sym id, mrb_value val) ptr = RSTRUCT_PTR(s); ptr_members = RARRAY_PTR(members); for (i=0; i<len; i++) { - if (SYM2ID(ptr_members[i]) == id) { + if (mrb_symbol(ptr_members[i]) == id) { ptr[i] = val; return val; } @@ -668,7 +668,7 @@ mrb_struct_aset(mrb_state *mrb, mrb_value s) mrb_get_args(mrb, "oo", &idx, &val); - if (mrb_type(idx) == MRB_TT_STRING || mrb_type(idx) == MRB_TT_SYMBOL) { + if (mrb_string_p(idx) || mrb_symbol_p(idx)) { return mrb_struct_aset_id(mrb, s, mrb_to_id(mrb, idx), val); } diff --git a/src/symbol.c b/src/symbol.c index 353245bb1..81c28d265 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -177,7 +177,7 @@ sym_equal(mrb_state *mrb, mrb_value sym1) mrb_value mrb_sym_to_s(mrb_state *mrb, mrb_value sym) { - mrb_sym id = SYM2ID(sym); + mrb_sym id = mrb_symbol(sym); const char *p; int len; @@ -331,7 +331,7 @@ sym_inspect(mrb_state *mrb, mrb_value sym) mrb_value str; const char *name; int len; - mrb_sym id = SYM2ID(sym); + mrb_sym id = mrb_symbol(sym); name = mrb_sym2name_len(mrb, id, &len); str = mrb_str_new(mrb, 0, len+1); diff --git a/src/variable.c b/src/variable.c index eebe81575..b3b3b3d87 100644 --- a/src/variable.c +++ b/src/variable.c @@ -580,7 +580,7 @@ iv_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p) ary = *(mrb_value*)p; s = mrb_sym2name_len(mrb, sym, &len); - if (len > 1 && s[0] == '@') { + if (len > 1 && s[0] == '@' && s[1] != '@') { mrb_ary_push(mrb, ary, mrb_symbol_value(sym)); } return 0; @@ -927,5 +927,5 @@ mrb_class_sym(mrb_state *mrb, struct RClass *c, struct RClass *outer) return arg.sym; } } - return SYM2ID(name); + return mrb_symbol(name); } @@ -992,7 +992,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) struct RArray *rest; int len = 0; - if (mrb_type(stack[m1]) == MRB_TT_ARRAY) { + if (mrb_array_p(stack[m1])) { struct RArray *ary = mrb_ary_ptr(stack[m1]); pp = ary->ptr; @@ -1047,7 +1047,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) } } } - else if (len > 1 && argc == 1 && mrb_type(argv[0]) == MRB_TT_ARRAY) { + else if (len > 1 && argc == 1 && mrb_array_p(argv[0])) { argc = mrb_ary_ptr(argv[0])->len; argv = mrb_ary_ptr(argv[0])->ptr; } @@ -1592,7 +1592,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) int c = GETARG_C(i); mrb_value v = regs[GETARG_B(i)]; - if (mrb_type(v) != MRB_TT_ARRAY) { + if (!mrb_array_p(v)) { if (c == 0) { regs[GETARG_A(i)] = v; } @@ -1619,7 +1619,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) int pre = GETARG_B(i); int post = GETARG_C(i); - if (mrb_type(v) != MRB_TT_ARRAY) { + if (!mrb_array_p(v)) { regs[a++] = mrb_ary_new_capa(mrb, 0); while (post--) { SET_NIL_VALUE(regs[a]); |