Added Mirror#instance_fields, #instance_variables.

rubinius · Aug 13, 2016 · ed43535 · ed43535
1 parent 828bbe4
commit ed43535
Showing 6 changed files with 35 additions and 27 deletions.
diff --git a/core/basic_object.rb b/core/basic_object.rb
@@ -55,22 +55,6 @@ def singleton_method_removed(name) end
   def singleton_method_undefined(name) end
   private :singleton_method_undefined
 
-  def __all_instance_variables__
-    Rubinius.primitive :object_ivar_names
-
-    raise PrimitiveFailure, "BasicObject#__instance_variables__ failed"
-  end
-  private :__all_instance_variables__
-
-  def __instance_variables__
-    ary = []
-    __all_instance_variables__.each do |sym|
-      ary << sym if sym.is_ivar?
-    end
-
-    ary
-  end
-
   ##
   # :call-seq:
   #   obj.instance_eval(string [, filename [, lineno]] )   => obj

diff --git a/core/kernel.rb b/core/kernel.rb
@@ -460,7 +460,7 @@ def inspect
     # method is overridden, the new Ruby method is never called. So, we inline
     # the code for Kernel#to_s here because we simply dispatch to Ruby
     # methods.
-    ivars = __instance_variables__
+    ivars = Rubinius.invoke_primitive :object_instance_variables, self
 
     if ivars.empty?
       return Rubinius::Type.infect "#{prefix}>", self
@@ -527,12 +527,7 @@ def instance_variable_set(sym, value)
   alias_method :__instance_variable_set__, :instance_variable_set
 
   def instance_variables
-    ary = []
-    __all_instance_variables__.each do |sym|
-      ary << sym if sym.is_ivar?
-    end
-
-    ary
+    Rubinius.invoke_primitive :object_instance_variables, self
   end
 
   def instance_variable_defined?(name)

diff --git a/core/marshal.rb b/core/marshal.rb
@@ -945,7 +945,7 @@ def serialize_extended_object(obj)
     end
 
     def serializable_instance_variables(obj, exclude_ivars)
-      ivars = obj.__instance_variables__
+      ivars = Rubinius.invoke_primitive :object_instance_variables, obj
       ivars -= exclude_ivars if exclude_ivars
       ivars
     end

diff --git a/core/mirror.rb b/core/mirror.rb
@@ -23,6 +23,14 @@ class Object < Mirror
       self.subject = ::Object
     end
 
+    def instance_fields
+      Rubinius.invoke_primitive :object_instance_fields, @object
+    end
+
+    def instance_variables
+      Rubinius.invoke_primitive :object_instance_variables, @object
+    end
+
     def inspect
       "#<#{self.class.name}:0x#{self.object_id.to_s(16)} object=#{@object.inspect}>"
     end

diff --git a/machine/builtin/object.cpp b/machine/builtin/object.cpp
@@ -312,13 +312,31 @@ namespace rubinius {
     return table_ivar_defined(state, sym);
   }
 
+  Array* Object::instance_fields(STATE) {
+    if(!reference_p()) return Array::create(state, 0);
+
+    TypeInfo* ti = state->memory()->type_info[type_id()];
+
+    Array* fields = Array::create(state, ti->slots.size());
+    int index = 0;
+
+    for(TypeInfo::Slots::iterator i = ti->slots.begin();
+        i != ti->slots.end();
+        ++i) {
+      Symbol* sym = Symbol::from_index(i->first);
+      if(sym->is_ivar_p(state)->true_p()) {
+        fields->set(state, index++, sym);
+      }
+    }
+
+    return fields;
+  }
+
   Array* Object::ivar_names(STATE) {
     return ivar_names(state, Array::create(state, 3));
   }
 
   Array* Object::ivar_names(STATE, Array* ary) {
-    // We don't check slots, because we don't advertise them
-    // as normal ivars.
     class ivar_match : public ObjectMatcher {
     public:
       virtual bool match_p(STATE, Object* match) {

diff --git a/machine/builtin/object.hpp b/machine/builtin/object.hpp
@@ -202,8 +202,11 @@ namespace rubinius {
     // Rubinius.primitive :object_ivar_defined
     Object*   ivar_defined_prim(STATE, Symbol* sym);
 
+    // Rubinius.primitive :object_instance_fields
+    Array* instance_fields(STATE);
+
     /** Returns the structure containing this object's instance variables. */
-    // Rubinius.primitive :object_ivar_names
+    // Rubinius.primitive :object_instance_variables
     Array*   ivar_names(STATE);
 
     Array*   ivar_names(STATE, Array* ary);