Changeset 2304

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.

Location:

cobra/trunk/Source

Files:

• BinaryOpExpr.cobra (modified) (1 diff)
• Compiler.cobra (modified) (3 diffs)
• Container.cobra (modified) (1 diff)
• Expr.cobra (modified) (1 diff)
• Phases/BindInheritancePhase.cobra (modified) (1 diff)
• Phases/BindInterfacePhase.cobra (modified) (1 diff)
• TypeProxies.cobra (modified) (5 diffs)
• Types.cobra (modified) (12 diffs)

cobra/trunk/Source/BinaryOpExpr.cobra

@@ -962 +962 @@
         base._bindImp
         if not _type inherits NilableType
-            _type = NilableType(_type).bindAll to NilableType  # CC: axe cast when 'as this' is supported
+            _type = .typeProvider.nilableType(_type to !)
         # warn about redundancy
         if not .left.hasError and not .right.hasError

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

cobra/trunk/Source/Container.cobra

@@ -220 +220 @@
             return type.greatestCommonDenominatorWith(this)
         if type inherits NilType
-            return NilableType(this)
+            return .typeProvider.nilableType(this)
         if .isDescendantOf(type)
             return type

cobra/trunk/Source/Expr.cobra

@@ -3039 +3039 @@
     def _bindImp
         base._bindImp
-        if _expr.type inherits NilableType
-            _type = _expr.type
-            .compiler.warning(this, 'The given expression is already nilable so "to ?" is redundant. You can remove it.')  # TODO: needs test case
-        else
-            _type = NilableType(_expr.type)
+        if not _expr.hasError
+            assert _expr.type
+            if _expr.type inherits NilableType
+                _type = _expr.type
+                .compiler.warning(this, 'The given expression is already nilable so "to ?" is redundant. You can remove it.')  # TODO: needs test case
+            else
+                _type = .typeProvider.nilableType(_expr.type to !)
 
 

cobra/trunk/Source/Phases/BindInheritancePhase.cobra

@@ -17 +17 @@
         c.objectType.bindInh
         c.stringType.bindInh
+        c.dynamicType.bindInh
+        c.passThroughType.bindInh
         for mod in c.modules.clone
             c.curModule = mod

cobra/trunk/Source/Phases/BindInterfacePhase.cobra

@@ -18 +18 @@
         c.objectType.bindInt
         c.stringType.bindInt
+        c.dynamicType.bindInt
+        c.passThroughType.bindInt
         for mod in c.modules.clone
             c.curModule = mod

cobra/trunk/Source/TypeProxies.cobra

@@ -84 +84 @@
 
     get realType as IType is override
-        return NilableType(_innerType.realType)
+        return .typeProvider.nilableType(_innerType.realType)
 
 
@@ -267 +267 @@
                     if member.qualifiedName == 'System.Nullable<of>'
                         assert args.count == 1
-                        member = NilableType(args[0])
+                        member = .typeProvider.nilableType(args[0])
                     else
                         member = (member to Box).constructedTypeFor(args)
@@ -472 +472 @@
 
     def _resolveType as IType is override
-        return ArrayType(_typeId.realType)
+        t = ArrayType(_typeId.realType)
+        t.bindInh
+        t.bindInt
+        return t
 
 
@@ -485 +488 @@
 
     def _resolveType as IType is override
-        return NilableType(_typeId.realType)
+        return .typeProvider.nilableType(_typeId.realType)
 
     get name as String is override
@@ -493 +496 @@
         m = container.memberForName(.name[:-1])
         if m inherits IType
-            return NilableType(m)
+            return .typeProvider.nilableType(m)
         else
             return m

cobra/trunk/Source/Types.cobra

@@ -103 +103 @@
     get voidType as VoidType
 
-    # TODO: def nilableType ... just like .variType. cache and get "is" testing
+    def nilableType(t as IType) as NilableType
 
     def variType(type as IType) as VariType
@@ -133 +133 @@
     var _unspecifiedType    as UnspecifiedType?
     var _voidType           as VoidType?
+    var _nilableTypes       as Dictionary<of IType, NilableType>?
     var _variTypes          as Dictionary<of IType, VariType>?
     var _defaultType        as IType?
@@ -231 +232 @@
         return _voidType to !
 
+    def nilableType(type as IType) as NilableType
+        if type inherits NilableType, return type
+        if _nilableTypes is nil
+            _nilableTypes = Dictionary<of IType, 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
@@ -247 +260 @@
     def defaultType as IType
         if _defaultType is nil
-            _defaultType = NilableType(.dynamicType)
+            _defaultType = .nilableType(.dynamicType)
         return _defaultType to !
 
@@ -698 +711 @@
             return type.greatestCommonDenominatorWith(this)
         if type inherits NilType
-            return NilableType(this)
+            return .typeProvider.nilableType(this)
         if .isDescendantOf(type)
             return type
@@ -757 +770 @@
         Returns a named member of System.Object by default.
         """
+        assert .didBindInh and .didBindInt
         objectClass = .compiler.objectType
         return objectClass.memberForName(name)
@@ -1064 +1078 @@
         if this == type
             return this
-        if type inherits NilableType
-            return NilableType(this)
-        if type inherits NilType
-            return NilableType(this)
+        if type inherits NilableType or type inherits NilType
+            return .typeProvider.nilableType(this)
         return this
 
@@ -1323 +1335 @@
 
 class NilableType inherits WrappedType is partial
+    """
+    Rather than instantiating this type directly, use:
+    
+        .typeProvider.nilableType(t)
+
+    Or if the code block already belongs to a type provider:
+    
+        .nilableType(t)
+    """
 
     cue init(t as IType?)
@@ -1373 +1394 @@
 
     def memberForName(name as String) as IMember? is override
+        _bindBasics
         return _wrappedType.memberForName(name)
 
@@ -1384 +1406 @@
                 return this
             else
-                return NilableType(_wrappedType.greatestCommonDenominatorWith(type.nonNil))
-        return NilableType(_wrappedType.greatestCommonDenominatorWith(type))
+                return .typeProvider.nilableType(_wrappedType.greatestCommonDenominatorWith(type.nonNil))
+        return .typeProvider.nilableType(_wrappedType.greatestCommonDenominatorWith(type))
 
     def suggestionsForBadMemberName(name as String) as List<of String> is override
@@ -1419 +1441 @@
             return type
         else
-            return NilableType(type)
+            return .typeProvider.nilableType(type)
 
 # TODO:
@@ -1623 +1645 @@
 
     get innerType as IType? is override
-        return _wrappedType.innerType  # TODO: 2008-11-22, I think this should just be _wrappedType
+        return _wrappedType.innerType  # TODO: 2008-11-22, I think this should just be _wrappedType; 2010-03-07: or abstract and make subclasses specify
 
     get suffix as String is abstract
-    
+
+    def memberForName(name as String) as IMember? is override
+        _bindBasics
+        return base.memberForName(name)
+
     def secondaryConstructedTypeFor(box as Box, gpToType as Dictionary<of GenericParam, IType>) as IType is override
         thisType = .getType
         return thisType(_wrappedType.secondaryConstructedTypeFor(box, gpToType))
+
+    def _bindBasics
+        .bindInh
+        .bindInt