diff options
Diffstat (limited to 'src/variable.c')
| -rw-r--r-- | src/variable.c | 52 |
1 files changed, 48 insertions, 4 deletions
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) { |