Changeset 2316

Timestamp:

03/14/10 06:45:43 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Arrays and lists can now be compared with == and <>.

Location:

cobra/trunk

Files:

• Source/Boxes.cobra (modified) (1 diff)
• Source/Compiler.cobra (modified) (2 diffs)
• Source/Expr.cobra (modified) (3 diffs)
• Source/TypeProxies.cobra (modified) (3 diffs)
• Source/Types.cobra (modified) (13 diffs)
• Tests/240-generics/100-use-generics-collections/100-use-list.cobra (modified) (2 diffs)

cobra/trunk/Source/Boxes.cobra

@@ -537 +537 @@
             r = true
         if not r and ('dynamic' in .name or 'dynamic' in t.name)  # TODO: hacky
+            r = true
+        if not r and t inherits ArrayType and (t to ArrayType).isEquatableTo(this)  # TODO: hacky
             r = true
         return r

cobra/trunk/Source/Compiler.cobra

@@ -486 +486 @@
     var _anyFloatType as AnyFloatType?
     var _anyIntType as AnyIntType?
+    var _arrayTypes as Dictionary<of IType, ArrayType>?
     var _boolType as BoolType?
     var _charType as CharType?
@@ -518 +519 @@
             _anyIntType = AnyIntType()
         return _anyIntType to !
+
+    def arrayType(type as IType) as ArrayType
+        if _arrayTypes is nil, _arrayTypes = Dictionary<of IType, ArrayType>()
+        if _arrayTypes.containsKey(type)
+            return _arrayTypes[type]
+        else
+            _arrayTypes[type] = at = ArrayType(type)
+            at.bindInh
+            at.bindInt
+            return at
 
     get boolType as BoolType

cobra/trunk/Source/Expr.cobra

@@ -1204 +1204 @@
             if _target.isKindOf(.compiler.typeType)
                 if _target inherits IPotentialTypeExpr and (pt = (_target to IPotentialTypeExpr).potentialType)
-                    _transformTo(TypeExpr(.token, ArrayType(pt)))
-                    return                  
+                    _transformTo(TypeExpr(.token, .typeProvider.arrayType(pt to !)))
+                    return
                 else
                     .throwError('Unknown array type.')
@@ -2838 +2838 @@
 
 
-class ArrayLit
-    is partial
-    inherits SequenceLit
+class ArrayLit inherits SequenceLit is partial
 
     # CC: should just inherit this because no initializers are defined
@@ -2847 +2845 @@
 
     def _makeTypeWith(type as IType) as IType is override
-        return ArrayType(type)
+        return .typeProvider.arrayType(type)
 
     get brackets as List<of String> is override

cobra/trunk/Source/TypeProxies.cobra

@@ -185 +185 @@
         if clrType.isArray
             # assert clrType.name.endsWith(r'[]') # could be [,] so TODO: handle multidim arrays
-            return ArrayType(_realTypeWithCache(clrType.getElementType to !))
+            return .typeProvider.arrayType(_realTypeWithCache(clrType.getElementType to !))
         else if clrType.isNested and not clrType.isGenericParameter
             declaringType = _realTypeWithCache(clrType.declaringType to !)
@@ -462 +462 @@
 
 
-class ArrayTypeIdentifier
-    inherits WrappedTypeIdentifier
+class ArrayTypeIdentifier inherits WrappedTypeIdentifier
 
     cue init(token as IToken, typeId as AbstractTypeIdentifier)
@@ -472 +471 @@
 
     def _resolveType as IType is override
-        t = ArrayType(_typeId.realType)
-        t.bindInh
-        t.bindInt
-        return t
+        return .typeProvider.arrayType(_typeId.realType)
 
 

cobra/trunk/Source/Types.cobra

@@ -70 +70 @@
     def typeOrNilForName(name as String) as IType?
 
+    def arrayType(type as IType) as ArrayType
+
     get boolType as BoolType
 
@@ -122 +124 @@
     var _anyFloatType       as AnyFloatType?
     var _anyIntType         as AnyIntType?
+    var _arrayTypes         as Dictionary<of IType, ArrayType>?
     var _boolType           as BoolType?
     var _charType           as CharType?
@@ -154 +157 @@
             _anyIntType = AnyIntType()
         return _anyIntType to !
+
+    def arrayType(type as IType) as ArrayType
+        if _arrayTypes is nil, _arrayTypes = Dictionary<of IType, ArrayType>()
+        if _arrayTypes.containsKey(type)
+            return _arrayTypes[type]
+        else
+            _arrayTypes[type] = at = ArrayType(type)
+            at.bindInh
+            at.bindInt
+            return at
 
     get boolType as BoolType
@@ -975 +988 @@
         return r
 
-    # TODO?
-#   def isComparableTo(t as IType) as bool
-#       return this is t
-
-#   def isEquatableTo(t as IType) as bool
-
     def isComparableTo(t as IType) as bool
         return this is t or base.isComparableTo(t)
+
+# TODO?
+#   def isEquatableTo(t as IType) as bool
 
 
@@ -1671 +1681 @@
     """
     Represents an array.
+
     Only single dimension arrays have been tested and are officially supported. These are common in
     the BCL as return types and sometimes as parameters. Multi-dim and jagged arrays are not popular.
     Also, most projects can get by just fine with nested List<of>s.
-    TODO: Nevertheless, this should be expanded.
+
+    Rather than instantiating this type directly, use:
+    
+        .typeProvider.arrayType(t)
+
+    Or if the code block already belongs to a type provider:
+    
+        .arrayType(t)
+        
     TODO: Get this related to System.Array.
     """
@@ -1689 +1708 @@
             Node.typeProvider = saveTP
 
+    var _ilistOf as Interface?
+    
     cue init(wrappedType as IType)
         base.init(wrappedType)
@@ -1725 +1746 @@
         return base.isDescendantOf(type) or .box.isDescendantOf(type)
 
+    def isEquatableTo(t as IType) as bool
+        assert .didBindInh
+        return base.isEquatableTo(t) or t.isDescendantOf(_ilistOf to !) or _ilistOf.isDescendantOf(t)
+
     def memberForName(name as String) as IMember? is override
         m = base.memberForName(name)
@@ -1736 +1761 @@
         return m
 
+    def secondaryConstructedTypeFor(box as Box, gpToType as Dictionary<of GenericParam, IType>) as IType is override
+        at = ArrayType(_wrappedType.secondaryConstructedTypeFor(box, gpToType))
+        at.bindInh
+        at.bindInt
+        return at
+
     def suggestionsForBadMemberName(name as String) as List<of String> is override
         return .box.suggestionsForBadMemberName(name)
@@ -1745 +1776 @@
             icoll = (.compiler.libraryType('System.Collections.Generic.ICollection<of>') to Box).constructedTypeFor([.theWrappedType])
             ienum = .compiler.enumerableOfType.constructedTypeFor([.theWrappedType])
-            # TODO: ilist = .compiler.ilistOfType.constructedTypeFor([.theWrappedType])
-            interfaces = [iclone to ITypeProxy, icoll, ienum]  # TODO:, ilist]  -- problems with cobra -ert:yes hello and extension method String.split
+            _ilistOf = .compiler.ilistOfType.constructedTypeFor([.theWrappedType]) to Interface
+            interfaces = [iclone to ITypeProxy, icoll, ienum]  # TODO:, _ilistOf]  -- problems with cobra -ert:yes hello and extension method String.split
             _box = Class(Token.empty, Token.empty, '[.getType.name]_[.serialNum]', List<of IType>(), List<of String>(), AttributeList(), nil, interfaces, List<of ITypeProxy>(), nil)
             # TODO: make members based on System.Array
@@ -1765 +1796 @@
 
 
-class VariType
-    is partial
-    inherits ArrayType
+class VariType inherits ArrayType is partial
     """
     Represents the type for variable number of arguments:
@@ -1774 +1803 @@
     """
 
-    var _ilistOf as Interface?  # TODO: does ArrayType need _ilistOf too?
-
     cue init(wrappedType as IType)
         base.init(wrappedType)
@@ -1785 +1812 @@
         return _wrappedType
 
-    def isEquatableTo(t as IType) as bool is override
-        # vari type inherits IList<of>
-        assert .didBindInh
-        return base.isEquatableTo(t) or t.isDescendantOf(_ilistOf to !) or _ilistOf.isDescendantOf(t)
-
     get name as String is override
         return 'vari ' + _wrappedType.name
@@ -1795 +1817 @@
     def _bindInh
         base._bindInh
-        if .compiler  # will be nil during unit tests
-            _ilistOf = .compiler.ilistOfType.constructedTypeFor([.theWrappedType]) to Interface
-            _ilistOf.bindInh
 
     def _bindInt

cobra/trunk/Tests/240-generics/100-use-generics-collections/100-use-list.cobra

@@ -1 +1 @@
 class Test
 
-    def main is shared
-
+    def main
+        .testBasics
+        .compareWithArrays
+    
+    def testBasics
         t as List<of String> = List<of String>()
         assert t.count == 0
@@ -22 +25 @@
 #       assert v[0].equals('aoeu')
 #       assert v[1].equals(1)
+
+    def compareWithArrays
+        a as int[] = @[1, 2, 3]
+        b as List<of int> = [1, 2, 3]
+        c as List<of int> = [1, 2, 3, 4]
+        assert a == b
+        assert b == a
+        assert a <> c
+        assert c <> a