Changeset 2307

Timestamp:

03/10/10 08:30:47 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Code cleanup.

Location:

cobra/trunk/Source

Files:

• Boxes.cobra (modified) (3 diffs)
• Statements.cobra (modified) (2 diffs)

cobra/trunk/Source/Boxes.cobra

@@ -285 +285 @@
         body
             if .genericDef is box, return this
-            for bt in .allBaseTypes
-                if bt.genericDef is box
-                    return bt
+            for bt in .allBaseTypes, if bt.genericDef is box, return bt
             return nil
 
@@ -495 +493 @@
         if this is .compiler.stringType  # TODO: hacky. solution is to look at the specific type of .current property of enumerator. make a test case that shows that
             return .compiler.charType
-# can a for loop go through an IEnumerator<of>?
+# TODO: can a for loop go through an IEnumerator<of>?
 #       if .isConstructed and .genericDef is .compiler.enumeratorOfType
 #           return .genericParams[0]
@@ -831 +829 @@
         return _genericDef is not nil
 
-    def isConstructionOf(box as Box) as bool
-        """
-        Returns true if this type is a construction of the given generic type def, even going more than level deep through `genericDef`.
-        """
-        # TODO: can this implementation be replaced by:
-        # return .constructedTypeOf(box) is not nil
-        if .genericDef is nil
-            return false
-        if .genericDef is box
-            return true
-        if .genericDef.genericDef
-            return .genericDef.isConstructionOf(box) # TODO: would iteration be more efficient here?
-        return false
+    def isDirectConstructionOf(box as Box) as bool
+        """
+        Returns true if this type was directly constructed from the given box.
+        """
+        require
+            .didBindInh
+            box.isGenericDef
+        body
+            return .genericDef is box
+
+    def isIndirectConstructionOf(box as Box) as bool
+        """
+        Returns true if this type or any of its ancestor types
+        is a construction of the given generic type def.
+        """
+        require
+            .didBindInh
+            box.isGenericDef
+        body
+            return .constructedTypeOf(box) is not nil
 
     get isGenericDef as bool

cobra/trunk/Source/Statements.cobra

@@ -591 +591 @@
         isStreamOfKeyValue = .what.type.isDictionaryLike
         if not isStreamOfKeyValue and _var.type inherits Box
-            isStreamOfKeyValue = (_var.type to Box).isConstructionOf(.compiler.libraryType('System.Collections.Generic.KeyValuePair<of,>') to Box)
+            isStreamOfKeyValue = (_var.type to Box).isIndirectConstructionOf(.compiler.libraryType('System.Collections.Generic.KeyValuePair<of,>') to Box)
         if isStreamOfKeyValue
             # This covers:
@@ -1462 +1462 @@
             resultType = curCodeMember.resultType
             if not resultType inherits StreamType and resultType <> .compiler.enumerableType and resultType <> .compiler.enumeratorType
-                okay = false
+                bad = true
                 if resultType inherits Box
                     ienumerableOf = .compiler.enumerableOfType
                     ienumeratorOf = .compiler.enumeratorOfType
-                    okay = not (resultType is not ienumerableOf and resultType is not ienumeratorOf and not resultType.isConstructionOf(ienumerableOf) and not resultType.isConstructionOf(ienumeratorOf))
-                if not okay
-                    .throwError('Cannot yield unless the return type is an iterator type. Try "[expr.type.name]*".')
+                    bad = resultType is not ienumerableOf and resultType is not ienumeratorOf and not resultType.isDirectConstructionOf(ienumerableOf) and not resultType.isDirectConstructionOf(ienumeratorOf)
+                if bad, .throwError('Cannot yield unless the return type is an iterator type. Try "[expr.type.name]*".')
             if resultType inherits StreamType
                 elementType = resultType.innerType to !