Changeset 2304 for cobra/trunk/Source/Compiler.cobra

Timestamp:

03/08/10 06:19:46 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Code cleanup. In CobraType?.memberForName, assert that the type .didBindInh and .didBindInt. Also, create all nilable types through .typeProvider.nilableType(t) and cache.

Files:

• cobra/trunk/Source/Compiler.cobra (modified) (3 diffs)

cobra/trunk/Source/Compiler.cobra

@@ -483 +483 @@
     var _unspecifiedType as UnspecifiedType?
     var _voidType as VoidType?
+    var _nilableTypes as Dictionary<of INode, NilableType>?
     var _variTypes as Dictionary<of INode, VariType>?
     var _nilableDynamicType as NilableType?
@@ -597 +598 @@
         return _voidType to !
 
+    def nilableType(type as IType) as NilableType
+        if type inherits NilableType, return type
+        if _nilableTypes is nil
+            _nilableTypes = Dictionary<of INode, NilableType>()
+        if _nilableTypes.containsKey(type)
+            return _nilableTypes[type]
+        else
+            _nilableTypes[type] = nt = NilableType(type)
+            nt.bindInh
+            nt.bindInt
+            return nt
+
     def variType(type as IType) as VariType
         if _variTypes is nil
@@ -615 +628 @@
 
     ## More type stuff
-
-    def nilableType(t as IType) as NilableType
-        """
-        Returns a NilableType wrapper for t, unless t is already a NilableType in which case
-        it is returned directly.
-        """
-        if t inherits NilableType
-            return t
-        else
-            return NilableType(t).bindAll to NilableType  # CC: axe cast after "as this"
 
     def readSystemTypes