PrimitiveObject to simplify new types

de.churl.simple/objmodel.py

@@ -11,7 +11,7 @@ class AbstractObject(object):
     def clone(self):
         raise NotImplementedError
 
-    def hasslot(self):
+    def hasslot(self, value):
         raise NotImplementedError
 
     def getvalue(self, name):
@@ -24,6 +24,28 @@ class AbstractObject(object):
         return c3(self)
 
 
+class PrimitiveObject(AbstractObject):
+    def __init__(self, value, trait, space=None):
+        self.value = value
+        self._trait = trait
+        self.space = space
+
+    def getparents(self):
+        if self.space is None:
+            return []  # for tests
+        trait = self.space.getbuiltin(self._trait)
+        assert trait is not None, 'O_o bogus state'
+        return [trait]
+
+    def hasslot(self, name):
+        return False
+
+    def __str__(self):
+        return str(self.value)
+
+    __repr__ = __str__
+
+
 class W_NormalObject(AbstractObject):
     def __init__(self, name=None, slots=None, parents=None, space=None):
         self.space = space
@@ -71,24 +93,21 @@ class W_NormalObject(AbstractObject):
             slots=self.slots.copy())
 
 
-class W_Integer(AbstractObject):
+class W_Integer(PrimitiveObject):
-    def __init__(self, value, space=None, trait="inttrait"):
+    def __init__(self, value, space=None):
-        self.value = int(value)
+        super().__init__(int(value), "inttrait", space)
-        self.space = space
-        self.__trait = trait  # able to extend from W_Integer
 
-    def getparents(self):
+    def istrue(self):
-        if self.space is None:
+        return self.value != 0
-            return []  # for tests
-        trait = self.space.getbuiltin(self.__trait)
-        assert trait is not None, 'O_o bogus state'
-        return [trait]
 
-    def hasslot(self, name):
+
-        return False
+# Project: Boolean
+class W_Boolean(PrimitiveObject):  # don't know if extending is good idea
+    def __init__(self, value, space=None):
+        super().__init__(int(value), "booltrait", space=space)
 
     def __str__(self):
-        return str(self.value)
+        return str(bool(self.value))
 
     __repr__ = __str__
 
@@ -96,69 +115,24 @@ class W_Integer(AbstractObject):
         return self.value != 0
 
 
-# Project: Boolean
-class W_Boolean(W_Integer):  # don't know if extending is good idea
-    def __init__(self, value, space=None):
-        super().__init__(int(value), space=space, trait="booltrait")
-
-    def __str__(self):
-        return str(bool(self.value))
-
-    __repr__ = __str__
-
-
 # Project: String
-class W_String(AbstractObject):
+class W_String(PrimitiveObject):
     def __init__(self, value, space=None):
-        self.value = str(value)
+        super().__init__(str(value), "strtrait", space)
-        self.space = space
-        self.__trait = "strtrait"
-
-    def getparents(self):
-        if self.space is None:
-            return []  # for tests
-        trait = self.space.getbuiltin(self.__trait)
-        assert trait is not None, 'O_o bogus state'
-        return [trait]
-
-    def hasslot(self, name):
-        return False
-
-    def __str__(self):
-        return self.value
-
-    __repr__ = __str__
-
-    def istrue(self):
-        return self.value != 0.
-
-
-# Project: Double
-class W_Double(W_NormalObject):
-    def __init__(self, value, space=None):
-        self.value = float(value)
-        self.space = space
-        self.__trait = "doubletrait"
-
-    def getparents(self):
-        if self.space is None:
-            return []  # for tests
-        trait = self.space.getbuiltin(self.__trait)
-        assert trait is not None, 'O_o bogus state'
-        return [trait]
-
-    def hasslot(self, name):
-        return False
-
-    def __str__(self):
-        return str(self.value)
-
-    __repr__ = __str__
 
     def istrue(self):
         return self.value != ""
 
 
+# Project: Double
+class W_Double(PrimitiveObject):
+    def __init__(self, value, space=None):
+        super().__init__(float(value), "doubletrait", space)
+
+    def istrue(self):
+        return self.value != 0.
+
+
 class W_Method(W_NormalObject):
     def __init__(self, code, *args, **kwargs):
         super(W_Method, self).__init__(*args, **kwargs)