Merge pull request #715 from krekoten/module_const_get

Module#const_get
topazproject · May 19, 2013 · 5d64b2bb96ba63de574fe8b4aef437d331bf84d2 · 5d64b2b
2 parents 32c1cb2 + a2502b6
commit 5d64b2bb96ba63de574fe8b4aef437d331bf84d2
Unified Split

Showing with 6 additions and 8 deletions.

+0 −1 spec/tags/core/module/const_get_tags.txt

+0 −2 spec/tags/core/module/const_missing_tags.txt

+6 −5 topaz/objects/moduleobject.py
diff --git a/spec/tags/core/module/const_get_tags.txt b/spec/tags/core/module/const_get_tags.txt
diff --git a/spec/tags/core/module/const_missing_tags.txt b/spec/tags/core/module/const_missing_tags.txt
diff --git a/topaz/objects/moduleobject.py b/topaz/objects/moduleobject.py
@@ -505,7 +505,11 @@ def method_constants(self, space, w_inherit=None):
 
     @classdef.method("const_missing", name="symbol")
     def method_const_missing(self, space, name):
-        raise space.error(space.w_NameError, "uninitialized constant %s" % name)
+        if self is space.w_object:
+            raise space.error(space.w_NameError, "uninitialized constant %s" % (name))
+        else:
+            self_name = space.obj_to_s(self)
+            raise space.error(space.w_NameError, "uninitialized constant %s::%s" % (self_name, name))
 
     @classdef.method("class_eval", string="str", filename="str")
     @classdef.method("module_eval", string="str", filename="str")
@@ -541,10 +545,7 @@ def method_const_get(self, space, const, inherit=True):
         else:
             w_res = self.find_local_const(space, const)
         if w_res is None:
-            name = space.obj_to_s(self)
-            raise space.error(space.w_NameError,
-                "uninitialized constant %s::%s" % (name, const)
-            )
+            return space.send(self, "const_missing", [space.newsymbol(const)])
         return w_res
 
     @classdef.method("const_set", const="symbol")