Merge pull request #135 from tjhance/module_desc

made __module__ a member descriptor for functions

src/runtime/types.cpp

@@ -89,6 +89,8 @@ llvm::iterator_range<BoxIterator> Box::pyElements() {
     raiseExcHelper(TypeError, "'%s' object is not iterable", getTypeName(this)->c_str());
 }
 
+std::string builtinStr("__builtin__");
+
 extern "C" BoxedFunction::BoxedFunction(CLFunction* f)
     : Box(function_cls), f(f), closure(NULL), isGenerator(false), ndefaults(0), defaults(NULL) {
     if (f->source) {
@@ -96,8 +98,9 @@ extern "C" BoxedFunction::BoxedFunction(CLFunction* f)
         // this->giveAttr("__name__", boxString(&f->source->ast->name));
         this->giveAttr("__name__", boxString(f->source->getName()));
 
-        Box* modname = f->source->parent_module->getattr("__name__", NULL);
-        this->giveAttr("__module__", modname);
+        this->modname = f->source->parent_module->getattr("__name__", NULL);
+    } else {
+        this->modname = boxStringPtr(&builtinStr);
     }
 
     this->giveAttr("__doc__", None);
@@ -121,8 +124,9 @@ extern "C" BoxedFunction::BoxedFunction(CLFunction* f, std::initializer_list<Box
         // this->giveAttr("__name__", boxString(&f->source->ast->name));
         this->giveAttr("__name__", boxString(f->source->getName()));
 
-        Box* modname = f->source->parent_module->getattr("__name__", NULL);
-        this->giveAttr("__module__", modname);
+        this->modname = f->source->parent_module->getattr("__name__", NULL);
+    } else {
+        this->modname = boxStringPtr(&builtinStr);
     }
 
     this->giveAttr("__doc__", None);
@@ -748,6 +752,8 @@ void setupRuntime() {
     function_cls->giveAttr("__name__", boxStrConstant("function"));
     function_cls->giveAttr("__repr__", new BoxedFunction(boxRTFunction((void*)functionRepr, STR, 1)));
     function_cls->giveAttr("__str__", function_cls->getattr("__repr__"));
+    function_cls->giveAttr("__module__",
+                           new BoxedMemberDescriptor(BoxedMemberDescriptor::OBJECT, offsetof(BoxedFunction, modname)));
     function_cls->freeze();
 
     instancemethod_cls->giveAttr("__name__", boxStrConstant("instancemethod"));

src/runtime/types.h

@@ -299,6 +299,9 @@ public:
     int ndefaults;
     GCdArray* defaults;
 
+    // Accessed via member descriptor
+    Box* modname; // __module__
+
     BoxedFunction(CLFunction* f);
     BoxedFunction(CLFunction* f, std::initializer_list<Box*> defaults, BoxedClosure* closure = NULL,
                   bool isGenerator = false);

test/tests/68.py

@@ -3,3 +3,5 @@ def f():
 
 print f.__name__
 print f.__module__
+
+print sum.__module__