From 5a65a7258f2bbd92901531ccafcccb48a5f66f52 Mon Sep 17 00:00:00 2001 From: skandhas Date: Thu, 20 Dec 2012 21:29:35 +0800 Subject: add mrb_mod_cv_get --- src/variable.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/variable.c') diff --git a/src/variable.c b/src/variable.c index 992663408..b4e262f8d 100644 --- a/src/variable.c +++ b/src/variable.c @@ -673,6 +673,21 @@ mrb_mod_class_variables(mrb_state *mrb, mrb_value mod) return ary; } +mrb_value +mrb_mod_cv_get(mrb_state *mrb, struct RClass * c, mrb_sym sym) +{ + while (c) { + if (c->iv) { + iv_tbl *t = c->iv; + mrb_value v; + + if (iv_get(mrb, t, sym, &v)) + return v; + } + c = c->super; + } + return mrb_nil_value(); +} mrb_value mrb_vm_cv_get(mrb_state *mrb, mrb_sym sym) -- cgit v1.2.3 From a9f1c4593c83194a5a53f856d3b26fc7376b44de Mon Sep 17 00:00:00 2001 From: skandhas Date: Thu, 20 Dec 2012 21:33:30 +0800 Subject: add mrb_cv_get --- include/mruby/variable.h | 1 + src/variable.c | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'src/variable.c') diff --git a/include/mruby/variable.h b/include/mruby/variable.h index d33a20d5e..8754e8a90 100644 --- a/include/mruby/variable.h +++ b/include/mruby/variable.h @@ -56,6 +56,7 @@ mrb_value mrb_obj_iv_inspect(mrb_state*, struct RObject*); mrb_sym mrb_class_sym(mrb_state *mrb, struct RClass *c, struct RClass *outer); mrb_value mrb_mod_class_variables(mrb_state*, mrb_value); mrb_value mrb_mod_cv_get(mrb_state *mrb, struct RClass * c, mrb_sym sym); +mrb_value mrb_cv_get(mrb_state *mrb, mrb_value mod, mrb_sym sym); /* GC functions */ void mrb_gc_mark_gv(mrb_state*); diff --git a/src/variable.c b/src/variable.c index b4e262f8d..816b703bf 100644 --- a/src/variable.c +++ b/src/variable.c @@ -689,6 +689,12 @@ mrb_mod_cv_get(mrb_state *mrb, struct RClass * c, mrb_sym sym) return mrb_nil_value(); } +mrb_value +mrb_cv_get(mrb_state *mrb, mrb_value mod, mrb_sym sym) +{ + return mrb_mod_cv_get(mrb, mrb_class_ptr(mod), sym); +} + mrb_value mrb_vm_cv_get(mrb_state *mrb, mrb_sym sym) { -- cgit v1.2.3 From e6a47323b8d67fdf85f095c30b2d66a00d2d2ca5 Mon Sep 17 00:00:00 2001 From: skandhas Date: Thu, 20 Dec 2012 22:29:26 +0800 Subject: refactor mrb_vm_cv_get --- src/variable.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/variable.c') diff --git a/src/variable.c b/src/variable.c index 816b703bf..147373bd4 100644 --- a/src/variable.c +++ b/src/variable.c @@ -701,17 +701,8 @@ mrb_vm_cv_get(mrb_state *mrb, mrb_sym sym) struct RClass *c = mrb->ci->proc->target_class; if (!c) c = mrb->ci->target_class; - while (c) { - if (c->iv) { - iv_tbl *t = c->iv; - mrb_value v; - - if (iv_get(mrb, t, sym, &v)) - return v; - } - c = c->super; - } - return mrb_nil_value(); + + return mrb_mod_cv_get(mrb, c, sym); } void -- cgit v1.2.3