Changeset 2307 for cobra/trunk/Source/Statements.cobra

Timestamp:

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

Author:

Chuck.Esterbrook

Message:

Code cleanup.

Files:

• cobra/trunk/Source/Statements.cobra (modified) (2 diffs)

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 !