Fix constant lookups on metaclass of objects

adambeynon · adambeynon · commit 617461b88da3 · 2013-07-30T17:55:51.000+01:00
diff --git a/corelib/opal/kernel.rb b/corelib/opal/kernel.rb
@@ -423,6 +423,8 @@ def singleton_class
         meta._proto = #{self}.constructor.prototype;
         meta._isSingleton = true;
 
+        meta._scope = #{self}._scope;
+
         return meta;
       }
 
@@ -445,6 +447,7 @@ def singleton_class
         meta._proto = #{self};
         #{self}._singleton = meta;
         meta._klass = orig_class._klass;
+        meta._scope = orig_class._scope;
 
         return meta;
       }
diff --git a/spec/rubyspec/language/metaclass_spec.rb b/spec/rubyspec/language/metaclass_spec.rb
@@ -38,19 +38,19 @@ class << @object
     end
   end
 
-  pending "can be accessed after the metaclass body is reopened" do
+  it "can be accessed after the metaclass body is reopened" do
     class << @object
       CONST.should == self
     end
   end
 
-  pending "can be accessed via self::CONST" do
+  it "can be accessed via self::CONST" do
     class << @object
       self::CONST.should == self
     end
   end
 
-  pending "can be accessed via const_get" do
+  it "can be accessed via const_get" do
     class << @object
       const_get(:CONST).should == self
     end

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,8 @@ def singleton_class`
`423`	`423`	`meta._proto = #{self}.constructor.prototype;`
`424`	`424`	`meta._isSingleton = true;`
`425`	`425`
	`426`	`+ meta._scope = #{self}._scope;`
	`427`	`+`
`426`	`428`	`return meta;`
`427`	`429`	`}`
`428`	`430`
`@@ -445,6 +447,7 @@ def singleton_class`
`445`	`447`	`meta._proto = #{self};`
`446`	`448`	`#{self}._singleton = meta;`
`447`	`449`	`meta._klass = orig_class._klass;`
	`450`	`+ meta._scope = orig_class._scope;`
`448`	`451`
`449`	`452`	`return meta;`
`450`	`453`	`}`