Merge pull request #669 from skandhas/pr-add-Module-class-variable-defined

Add Module#class_variable_defined? for mruby

4 files changed, 62 insertions, 0 deletions

diff --git a/include/mruby/variable.h b/include/mruby/variable.h
index 9f4a62317..f2f22e65a 100644
--- a/include/mruby/variable.h
+++ b/include/mruby/variable.h
@@ -59,6 +59,8 @@ 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);
 void mrb_mod_cv_set(mrb_state *mrb, struct RClass * c, mrb_sym sym, mrb_value v);
 void mrb_cv_set(mrb_state *mrb, mrb_value mod, mrb_sym sym, mrb_value v);
+int mrb_mod_cv_defined(mrb_state *mrb, struct RClass * c, mrb_sym sym);
+int mrb_cv_defined(mrb_state *mrb, mrb_value mod, mrb_sym sym);
 
 /* GC functions */
 void mrb_gc_mark_gv(mrb_state*);
diff --git a/src/class.c b/src/class.c
index 8d14319f2..0ed18e1c5 100644
--- a/src/class.c
+++ b/src/class.c
@@ -1456,6 +1456,36 @@ check_cv_name(mrb_state *mrb, mrb_sym id)
   }
 }
 
+/* 15.2.2.4.16 */
+/*
+ *  call-seq:
+ *     obj.class_variable_defined?(symbol)    -> true or false
+ *
+ *  Returns <code>true</code> if the given class variable is defined
+ *  in <i>obj</i>.
+ *
+ *     class Fred
+ *       @@foo = 99
+ *     end
+ *     Fred.class_variable_defined?(:@@foo)    #=> true
+ *     Fred.class_variable_defined?(:@@bar)    #=> false
+ */
+
+static mrb_value
+mrb_mod_cvar_defined(mrb_state *mrb, mrb_value mod)
+{
+  mrb_value sym;
+  mrb_sym id;
+  mrb_get_args(mrb, "o", &sym);
+
+  id = mrb_sym_value(mrb,sym);
+  check_cv_name(mrb, id);
+
+  if(mrb_cv_defined(mrb, mod, id))
+    return mrb_true_value();
+  return mrb_false_value();
+}
+
 /* 15.2.2.4.17 */
 /*
  *  call-seq:
@@ -1616,6 +1646,7 @@ mrb_init_class(mrb_state *mrb)
   mrb_define_method(mrb, cls, "superclass", mrb_class_superclass, ARGS_NONE());      /* 15.2.3.3.4 */
   mrb_define_method(mrb, cls, "new", mrb_instance_new, ARGS_ANY());                  /* 15.2.3.3.3 */
   mrb_define_method(mrb, cls, "inherited", mrb_bob_init, ARGS_REQ(1));
+  mrb_define_method(mrb, mod, "class_variable_defined?", mrb_mod_cvar_defined, ARGS_REQ(1));  /* 15.2.2.4.16 */
   mrb_define_method(mrb, mod, "class_variable_get", mrb_mod_cvar_get, ARGS_REQ(1));  /* 15.2.2.4.17 */
   mrb_define_method(mrb, mod, "class_variable_set", mrb_mod_cvar_set, ARGS_REQ(2));  /* 15.2.2.4.18 */
   mrb_define_method(mrb, mod, "extend_object", mrb_mod_extend_object, ARGS_REQ(1));  /* 15.2.2.4.25 */
diff --git a/src/variable.c b/src/variable.c
index 71187af5f..5d46ffc60 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -730,6 +730,26 @@ mrb_cv_set(mrb_state *mrb, mrb_value mod, mrb_sym sym, mrb_value v)
   mrb_mod_cv_set(mrb, mrb_class_ptr(mod), sym, v);
 }
 
+int
+mrb_mod_cv_defined(mrb_state *mrb, struct RClass * c, mrb_sym sym)
+{
+  while (c) {
+    if (c->iv) {
+      iv_tbl *t = c->iv;
+      if (iv_get(mrb, t, sym, NULL)) return TRUE;
+    }
+    c = c->super;
+  }
+
+  return FALSE;
+}
+
+int
+mrb_cv_defined(mrb_state *mrb, mrb_value mod, mrb_sym sym)
+{
+  return mrb_mod_cv_defined(mrb, mrb_class_ptr(mod), sym);
+}
+
 mrb_value
 mrb_vm_cv_get(mrb_state *mrb, mrb_sym sym)
 {
diff --git a/test/t/module.rb b/test/t/module.rb
index 54d4f3015..b3b1ccf1a 100644
--- a/test/t/module.rb
+++ b/test/t/module.rb
@@ -46,6 +46,15 @@ assert('Module#class_eval', '15.2.2.4.15') do
   r.class == Array and r.include?(:method1)
 end
 
+assert('Module#class_variable_defined?', '15.2.2.4.16') do
+  class Test4ClassVariableDefined
+    @@cv = 99
+  end
+
+  Test4ClassVariableDefined.class_variable_defined?(:@@cv) and
+  not Test4ClassVariableDefined.class_variable_defined?(:@@noexisting)
+end
+
 assert('Module#class_variable_get', '15.2.2.4.17') do
   class Test4ClassVariableGet
     @@cv = 99