make typing less verbose

Object's type method is now used by default so all
subtypes can use the inherited implementation

Author: thomasmulvaney

pixie/vm/array.py

@@ -14,8 +14,6 @@
 class Array(object.Object):
     _type = object.Type(u"pixie.stdlib.Array")
     _immutable_fields_ = ["_list"]
-    def type(self):
-        return Array._type
 
     def __init__(self, lst):
         self._list = lst
@@ -98,9 +96,6 @@ def reduce(self, f, init):
             init = f.invoke([init, rt.nth(self._w_array, rt.wrap(x))])
         return init
 
-    def type(self):
-        return self._type
-
 @extend(proto._first, ArraySeq)
 def _first(self):
     assert isinstance(self, ArraySeq)
@@ -174,9 +169,6 @@ def __init__(self, size):
         for x in range(size):
             self._buffer[x] = chr(0)
 
-    def type(self):
-        return ByteArray._type
-
 
     def __del__(self):
         lltype.free(self._buffer, flavor="raw")

pixie/vm/atom.py

@@ -7,9 +7,6 @@
 class Atom(object.Object):
     _type = object.Type(u"pixie.stdlib.Atom")
 
-    def type(self):
-        return Atom._type
-
     def with_meta(self, meta):
         return Atom(self._boxed_value, meta)
 

pixie/vm/code.py

@@ -148,9 +148,6 @@ class MultiArityFn(BaseCode):
 
     _immutable_fields_ = ["_arities[*]", "_required_arity", "_rest_fn"]
 
-    def type(self):
-        return MultiArityFn._type
-
     def __init__(self, name, arities, required_arity=0, rest_fn=None, meta=nil):
         BaseCode.__init__(self)
         self._name = name
@@ -199,9 +196,6 @@ class NativeFn(BaseCode):
     def __init__(self, doc=None):
         BaseCode.__init__(self)
 
-    def type(self):
-        return NativeFn._type
-
     def invoke(self, args):
         return self.inner_invoke(args)
 
@@ -217,9 +211,6 @@ class Code(BaseCode):
     _type = object.Type(u"pixie.stdlib.Code")
     _immutable_fields_ = ["_arity", "_consts[*]", "_bytecode", "_stack_size", "_meta", "_debug_points"]
 
-    def type(self):
-        return Code._type
-
     def __init__(self, name, arity, bytecode, consts, stack_size, debug_points, meta=nil):
         BaseCode.__init__(self)
         self._arity = arity
@@ -277,9 +268,6 @@ class VariadicCode(BaseCode):
     _immutable_fields_ = ["_required_arity", "_code", "_meta"]
     _type = object.Type(u"pixie.stdlib.VariadicCode")
 
-    def type(self):
-        return VariadicCode._type
-
     def __init__(self, code, required_arity, meta=nil):
         BaseCode.__init__(self)
         self._required_arity = r_uint(required_arity)
@@ -319,9 +307,6 @@ class Closure(BaseCode):
     _type = object.Type(u"pixie.stdlib.Closure")
     _immutable_fields_ = ["_closed_overs[*]", "_code", "_meta"]
 
-    def type(self):
-        return Closure._type
-
     def __init__(self, code, closed_overs, meta=nil):
         BaseCode.__init__(self)
         affirm(isinstance(code, Code), u"Code argument to Closure must be an instance of Code")
@@ -373,9 +358,6 @@ def get_debug_points(self):
 class Undefined(object.Object):
     _type = object.Type(u"pixie.stdlib.Undefined")
 
-    def type(self):
-        return Undefined._type
-
 undefined = Undefined()
 
 
@@ -413,9 +395,6 @@ class Var(BaseCode):
     _type = object.Type(u"pixie.stdlib.Var")
     _immutable_fields_ = ["_ns_ref"]
 
-    def type(self):
-        return Var._type
-
     def __init__(self, ns_ref, ns, name):
         BaseCode.__init__(self)
         self._ns_ref = ns_ref
@@ -497,9 +476,6 @@ class Namespace(object.Object):
 
     _immutable_fields_ = ["_rev?"]
 
-    def type(self):
-        return Namespace._type
-
     def __init__(self, name):
         self._rev = 0
         self._registry = {}
@@ -636,9 +612,6 @@ class Protocol(object.Object):
 
     _immutable_fields_ = ["_rev?"]
 
-    def type(self):
-        return Protocol._type
-
     def __init__(self, name):
         self._name = name
         self._polyfns = {}
@@ -663,9 +636,6 @@ def satisfies(self, tp):
 class PolymorphicFn(BaseCode):
     _type = object.Type(u"pixie.stdlib.PolymorphicFn")
 
-    def type(self):
-        return PolymorphicFn._type
-
     _immutable_fields_ = ["_rev?"]
 
     def __init__(self, name, protocol):
@@ -745,9 +715,6 @@ class DoublePolymorphicFn(BaseCode):
     """A function that is polymorphic on the first two arguments"""
     _type = object.Type(u"pixie.stdlib.DoublePolymorphicFn")
 
-    def type(self):
-        return DefaultProtocolFn._type
-
     _immutable_fields_ = ["_rev?"]
 
     def __init__(self, name, protocol):

pixie/vm/cons.py

@@ -7,9 +7,6 @@
 class Cons(object.Object):
     _type = object.Type(u"pixie.stdlib.Cons")
 
-    def type(self):
-        return Cons._type
-
     def __init__(self, head, tail, meta=nil):
         self._first = head
         self._next = tail

pixie/vm/custom_types.py

@@ -216,8 +216,6 @@ def get_field(inst, field):
 
 class AbstractMutableCell(Object):
     _type = Type(u"pixie.stdlib.AbstractMutableCell")
-    def type(self):
-        return self._type
 
     def set_mutable_cell_value(self, ct, fields, nm, idx, value):
         pass

pixie/vm/interpreter.py

@@ -159,10 +159,6 @@ def __init__(self, frame, val):
         self._frame = frame
         self._val = val
 
-    def type(self):
-        return ShallowContinuation._type
-
-
     def is_finished(self):
         return self._frame.finished
 

pixie/vm/lazy_seq.py

@@ -9,9 +9,6 @@
 class LazySeq(object.Object):
     _type = object.Type(u"pixie.stdlib.LazySeq")
 
-    def type(self):
-        return LazySeq._type
-
     def __init__(self, fn, meta=nil):
         self._fn = fn
         self._meta = meta

pixie/vm/libs/env.py

@@ -10,9 +10,6 @@
 class Environment(Object):
     _type = Type(u"pixie.stdlib.Environment")
 
-    def type(self):
-        return Environment._type
-
     def val_at(self, key, not_found):
         if not isinstance(key, String):
             runtime_error(u"Environment variables are strings ")

pixie/vm/libs/ffi.py

@@ -41,9 +41,6 @@ def __init__(self, name):
 class ExternalLib(object.Object):
     _type = object.Type(u"pixie.stdlib.ExternalLib")
 
-    def type(self):
-        return ExternalLib._type
-
     def __init__(self, nm):
         assert isinstance(nm, unicode)
         self._name = nm
@@ -94,9 +91,6 @@ class FFIFn(object.Object):
     _type = object.Type(u"pixie.stdlib.FFIFn")
     _immutable_fields_ = ["_name", "_f_ptr", "_c_fn_type"]
 
-    def type(self):
-        return FFIFn._type
-
     def __init__(self, name, fn_ptr, c_fn_type):
         assert isinstance(c_fn_type, CFunctionType)
         self._rev = 0
@@ -219,9 +213,6 @@ class Buffer(PointerType):
     """
     _type = object.Type(u"pixie.stdlib.Buffer")
 
-    def type(self):
-        return Buffer._type
-
     def __init__(self, size):
         self._size = size
         self._used_size = 0
@@ -502,8 +493,6 @@ def ffi_type(self):
 
 class VoidP(PointerType):
     _type = cvoidp
-    def type(self):
-        return VoidP._type
 
     def __init__(self, raw_data):
         self._raw_data = raw_data
@@ -604,9 +593,6 @@ def __init__(self, cft, raw_closure, id, fn):
         self._is_invoked = False
         self._unique_id = id
 
-    def type(self):
-        return CCallback._type
-
     def get_raw_closure(self):
         return self._raw_closure
 

pixie/vm/libs/path.py

@@ -8,9 +8,6 @@
 class Path(Object):
     _type = Type(u"pixie.path.Path")
 
-    def type(self):
-        return Path._type
-
     def __init__(self, top):
         self._path = rt.name(top)