diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/array.c | 2 | ||||
| -rw-r--r-- | src/class.c | 71 | ||||
| -rw-r--r-- | src/hash.c | 2 | ||||
| -rw-r--r-- | src/kernel.c | 6 | ||||
| -rw-r--r-- | src/numeric.c | 3 | ||||
| -rw-r--r-- | src/parse.y | 2 | ||||
| -rw-r--r-- | src/range.c | 2 | ||||
| -rw-r--r-- | src/sprintf.c | 2 | ||||
| -rw-r--r-- | src/state.c | 2 | ||||
| -rw-r--r-- | src/string.c | 2 | ||||
| -rw-r--r-- | src/variable.c | 52 | ||||
| -rw-r--r-- | src/vm.c | 26 |
12 files changed, 117 insertions, 55 deletions
diff --git a/src/array.c b/src/array.c index a200de3aa..ea461e029 100644 --- a/src/array.c +++ b/src/array.c @@ -772,7 +772,7 @@ mrb_value mrb_ary_first(mrb_state *mrb, mrb_value self) { struct RArray *a = mrb_ary_ptr(self); - int size; + mrb_int size; if (mrb_get_args(mrb, "|i", &size) == 0) { return (a->len > 0)? a->ptr[0]: mrb_nil_value(); diff --git a/src/class.c b/src/class.c index cf2f6df50..d95a05789 100644 --- a/src/class.c +++ b/src/class.c @@ -64,25 +64,38 @@ mrb_name_class(mrb_state *mrb, struct RClass *c, mrb_sym name) mrb_intern(mrb, "__classid__"), mrb_symbol_value(name)); } +#define make_metaclass(mrb, c) prepare_singleton_class((mrb), (struct RBasic*)(c)) + static void -make_metaclass(mrb_state *mrb, struct RClass *c) +prepare_singleton_class(mrb_state *mrb, struct RBasic *o) { - struct RClass *sc; + struct RClass *sc, *c; - if (c->c->tt == MRB_TT_SCLASS) { - return; - } + if (o->c->tt == MRB_TT_SCLASS) return; sc = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class); sc->mt = 0; - if (!c->super) { - sc->super = mrb->class_class; + sc->iv = 0; + if (o->tt == MRB_TT_CLASS) { + c = (struct RClass*)o; + if (!c->super) { + sc->super = mrb->class_class; + } + else { + sc->super = c->super->c; + } } - else { + else if (o->tt == MRB_TT_SCLASS) { + c = (struct RClass*)o; + make_metaclass(mrb, c->super); sc->super = c->super->c; } - c->c = sc; - mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)sc); - mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)sc->super); + else { + sc->super = o->c; + } + o->c = sc; + mrb_field_write_barrier(mrb, (struct RBasic*)o, (struct RBasic*)sc); + mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)o); + mrb_obj_iv_set(mrb, (struct RObject*)sc, mrb_intern(mrb, "__attached__"), mrb_obj_value(o)); } struct RClass* @@ -178,7 +191,6 @@ mrb_vm_define_class(mrb_state *mrb, mrb_value outer, mrb_value super, mrb_sym id mrb_raisef(mrb, E_TYPE_ERROR, "superclass mismatch for class %s", mrb_sym2name(mrb, id)); } } - return c; } @@ -758,22 +770,6 @@ mrb_mod_included_modules(mrb_state *mrb, mrb_value self) return result; } -static struct RClass * -mrb_singleton_class_ptr(mrb_state *mrb, struct RClass *c) -{ - struct RClass *sc; - - if (c->tt == MRB_TT_SCLASS) { - return c; - } - sc = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class); - sc->mt = 0; - sc->super = c; - mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)c); - - return sc; -} - mrb_value mrb_singleton_class(mrb_state *mrb, mrb_value v) { @@ -797,14 +793,14 @@ mrb_singleton_class(mrb_state *mrb, mrb_value v) break; } obj = mrb_object(v); - obj->c = mrb_singleton_class_ptr(mrb, obj->c); + prepare_singleton_class(mrb, obj); return mrb_obj_value(obj->c); } void mrb_define_singleton_method(mrb_state *mrb, struct RObject *o, const char *name, mrb_func_t func, int aspec) { - o->c = mrb_singleton_class_ptr(mrb, o->c); + prepare_singleton_class(mrb, (struct RBasic*)o); mrb_define_method_id(mrb, o->c, mrb_intern(mrb, name), func, aspec); } @@ -945,15 +941,14 @@ mrb_value mrb_class_superclass(mrb_state *mrb, mrb_value klass) { struct RClass *c; - mrb_value superclass; c = mrb_class_ptr(klass); - if (c->super) - superclass = mrb_obj_value(mrb_class_real(c->super)); - else - superclass = mrb_nil_value(); - - return superclass; + c = c->super; + while (c && c->tt == MRB_TT_ICLASS) { + c = c->super; + } + if (!c) return mrb_nil_value(); + return mrb_obj_value(c); } static mrb_value @@ -1224,6 +1219,7 @@ mrb_mod_to_s(mrb_state *mrb, mrb_value klass) switch (mrb_type(v)) { case MRB_TT_CLASS: case MRB_TT_MODULE: + case MRB_TT_SCLASS: mrb_str_append(mrb, s, mrb_inspect(mrb, v)); break; default: @@ -1440,6 +1436,7 @@ mrb_init_class(mrb_state *mrb) mrb_define_method(mrb, mod, "const_get", mrb_mod_const_get, ARGS_REQ(1)); /* 15.2.2.4.21 */ mrb_define_method(mrb, mod, "const_set", mrb_mod_const_set, ARGS_REQ(2)); /* 15.2.2.4.23 */ mrb_define_method(mrb, mod, "define_method", mod_define_method, ARGS_REQ(1)); + mrb_define_method(mrb, mod, "class_variables", mrb_mod_class_variables, ARGS_NONE()); /* 15.2.2.4.19 */ mrb_define_method(mrb, mod, "===", mrb_mod_eqq, ARGS_REQ(1)); mrb_undef_method(mrb, cls, "append_features"); diff --git a/src/hash.c b/src/hash.c index 229e61db7..c74ac837b 100644 --- a/src/hash.c +++ b/src/hash.c @@ -965,7 +965,7 @@ mrb_hash_to_hash(mrb_state *mrb, mrb_value hash) * */ -static mrb_value +mrb_value mrb_hash_keys(mrb_state *mrb, mrb_value hash) { khash_t(ht) *h = RHASH_TBL(hash); diff --git a/src/kernel.c b/src/kernel.c index ac3c10f46..adb616466 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -287,7 +287,8 @@ mrb_singleton_class_clone(mrb_state *mrb, mrb_value obj) clone->super = klass->super; if (klass->iv) { - clone->iv = klass->iv; + mrb_iv_copy(mrb, mrb_obj_value(clone), mrb_obj_value(klass)); + mrb_obj_iv_set(mrb, (struct RObject*)clone, mrb_intern(mrb, "__attached__"), obj); } if (klass->mt) { clone->mt = kh_copy(mt, mrb, klass->mt); @@ -307,6 +308,9 @@ init_copy(mrb_state *mrb, mrb_value dest, mrb_value obj) case MRB_TT_OBJECT: case MRB_TT_CLASS: case MRB_TT_MODULE: + case MRB_TT_SCLASS: + case MRB_TT_HASH: + case MRB_TT_DATA: mrb_iv_copy(mrb, dest, obj); break; diff --git a/src/numeric.c b/src/numeric.c index 562562340..98a60ed30 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -523,7 +523,8 @@ static mrb_value flo_round(mrb_state *mrb, mrb_value num) { double number, f; - int ndigits = 0, i; + mrb_int ndigits = 0; + int i; mrb_get_args(mrb, "|i", &ndigits); number = mrb_float(num); diff --git a/src/parse.y b/src/parse.y index abec59e3f..bfea1f69c 100644 --- a/src/parse.y +++ b/src/parse.y @@ -1749,7 +1749,7 @@ aref_args : none } | assocs trailer { - $$ = new_hash(p, $1); + $$ = cons(new_hash(p, $1), 0); } ; diff --git a/src/range.c b/src/range.c index 6fe7964fe..085d5b1c0 100644 --- a/src/range.c +++ b/src/range.c @@ -286,7 +286,7 @@ mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, if (end > len) end = len; } if (end < 0) end += len; - if (!r->excl) end++; /* include end point */ + if (!r->excl && end < len) end++; /* include end point */ len = end - beg; if (len < 0) len = 0; diff --git a/src/sprintf.c b/src/sprintf.c index 630875a88..0e8ac830f 100644 --- a/src/sprintf.c +++ b/src/sprintf.c @@ -671,7 +671,7 @@ retry: tmp = mrb_check_string_type(mrb, val); if (!mrb_nil_p(tmp)) { if (RSTRING_LEN(tmp) != 1 ) { - mrb_raise(mrb, E_ARGUMENT_ERROR, "%%c requires a character"); + mrb_raise(mrb, E_ARGUMENT_ERROR, "%c requires a character"); } c = RSTRING_PTR(tmp)[0]; n = 1; diff --git a/src/state.c b/src/state.c index db31d7037..106ab2aa3 100644 --- a/src/state.c +++ b/src/state.c @@ -126,7 +126,7 @@ mrb_add_irep(mrb_state *mrb, int idx) mrb->irep_capa *= 2; } mrb->irep = (mrb_irep **)mrb_realloc(mrb, mrb->irep, sizeof(mrb_irep*)*mrb->irep_capa); - for (i = old_capa; i < mrb->irep_capa - old_capa; i++) { + for (i = old_capa; i < mrb->irep_capa; i++) { mrb->irep[i] = NULL; } } diff --git a/src/string.c b/src/string.c index 2ac4359c8..425b79ca7 100644 --- a/src/string.c +++ b/src/string.c @@ -2125,7 +2125,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str) mrb_value spat = mrb_nil_value(); enum {awk, string, regexp} split_type = string; long beg, end, i = 0; - int lim = -1; + mrb_int lim = -1; mrb_value result, tmp; argc = mrb_get_args(mrb, "|oi", &spat, &lim); diff --git a/src/variable.c b/src/variable.c index b3b3b3d87..7d583da40 100644 --- a/src/variable.c +++ b/src/variable.c @@ -71,13 +71,13 @@ iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val) t->size++; return; } - if (key == 0 && !matched_seg) { + if (!matched_seg && key == 0) { matched_seg = seg; matched_idx = i; } else if (key == sym) { - seg->val[i] = val; - return; + seg->val[i] = val; + return; } } prev = seg; @@ -223,10 +223,10 @@ iv_copy(mrb_state *mrb, iv_tbl *t) mrb_sym key = seg->key[i]; mrb_value val = seg->val[i]; - iv_put(mrb, t2, key, val); if ((seg->next == NULL) && (i >= t->last_len)) { return t2; } + iv_put(mrb, t2, key, val); } seg = seg->next; } @@ -615,6 +615,50 @@ mrb_obj_instance_variables(mrb_state *mrb, mrb_value self) return ary; } +static int +cv_i(mrb_state *mrb, mrb_sym sym, mrb_value v, void *p) +{ + mrb_value ary; + const char* s; + int len; + + ary = *(mrb_value*)p; + s = mrb_sym2name_len(mrb, sym, &len); + if (len > 2 && s[0] == '@' && s[1] == '@') { + mrb_ary_push(mrb, ary, mrb_symbol_value(sym)); + } + return 0; +} + +/* 15.2.2.4.19 */ +/* + * call-seq: + * mod.class_variables -> array + * + * Returns an array of the names of class variables in <i>mod</i>. + * + * class One + * @@var1 = 1 + * end + * class Two < One + * @@var2 = 2 + * end + * One.class_variables #=> [:@@var1] + * Two.class_variables #=> [:@@var2] + */ +mrb_value +mrb_mod_class_variables(mrb_state *mrb, mrb_value mod) +{ + mrb_value ary; + + ary = mrb_ary_new(mrb); + if (obj_iv_p(mod) && mrb_obj_ptr(mod)->iv) { + iv_foreach(mrb, mrb_obj_ptr(mod)->iv, cv_i, &ary); + } + return ary; +} + + mrb_value mrb_vm_cv_get(mrb_state *mrb, mrb_sym sym) { @@ -151,6 +151,18 @@ uvset(mrb_state *mrb, int up, int idx, mrb_value v) mrb_write_barrier(mrb, (struct RBasic*)e); } +struct REnv* +top_env(struct RProc *proc) +{ + struct REnv *e = proc->env; + + while (e->c) { + if (!e) return 0; + e = (struct REnv*)e->c; + } + return e; +} + static mrb_callinfo* cipush(mrb_state *mrb) { @@ -1153,11 +1165,15 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) break; case OP_R_RETURN: if (!proc->env) goto NORMAL_RETURN; - if (proc->env->cioff < 0) { - localjump_error(mrb, "return"); - goto L_RAISE; - } - ci = mrb->ci = mrb->cibase + proc->env->cioff; + else { + struct REnv *e = top_env(proc); + + if (e->cioff < 0) { + localjump_error(mrb, "return"); + goto L_RAISE; + } + ci = mrb->ci = mrb->cibase + e->cioff; + } break; default: /* cannot happen */ |