make everything inherit from Object

halgari · halgari · commit 61bea2f9b490 · 2015-04-14T05:57:58.000-06:00
diff --git a/pixie/vm/object.py b/pixie/vm/object.py
@@ -67,14 +67,18 @@ def get_type_by_name(nm):
     return _type_registry.get_by_name(nm)
 
 class Type(Object):
-    def __init__(self, name, parent = None):
+    def __init__(self, name, parent=None, object_inited=True):
         assert isinstance(name, unicode), u"Type names must be unicode"
         _type_registry.register_type(name, self)
         self._name = name
-        self._parent = parent
-        if parent is not None:
+
+        if object_inited:
+            if parent is None:
+                parent = Object._type
+
             parent.add_subclass(self)
 
+        self._parent = parent
         self._subclasses = []
 
     def name(self):
@@ -89,7 +93,8 @@ def add_subclass(self, tp):
     def subclasses(self):
         return self._subclasses
 
-Type._type = Type(u"Type")
+Object._type = Type(u"pixie.stdlib.Object", None, False)
+Type._type = Type(u"pixie.stdlib.Type")
 
 @jit.elidable_promote()
 def istypeinstance(obj, t):
diff --git a/tests/pixie/tests/test-object.pxi b/tests/pixie/tests/test-object.pxi
@@ -4,3 +4,12 @@
 (t/deftest test-hash
   (t/assert= (hash (var foo)) (hash (var foo)))
   (t/assert  (not= (hash (var foo)) (hash (var bar)))))
+
+
+(deftype FooType [])
+
+(t/deftest test-everything-is-an-object
+  (t/assert (instance? Object 42))
+  (t/assert (instance? Object []))
+  (t/assert (instance? Object "Foo"))
+  (t/assert (instance? Object FooType)))
