Changeset 2310

Timestamp:

03/11/10 09:47:16 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Taught the compiler that arrays implement ICloneable, ICollection<of> and IEnumerable<of>. Extensions methods are picked up so someArray.toList now works.

Location:

cobra/trunk

Files:

• Source/BinaryOpExpr.cobra (modified) (1 diff)
• Source/Members.cobra (modified) (2 diffs)
• Source/Types.cobra (modified) (9 diffs)
• Tests/110-basics-two/800-arrays/200-array-interfaces.cobra (added)
• Tests/700-command-line/112-run-hello.cobra (modified) (1 diff)

cobra/trunk/Source/BinaryOpExpr.cobra

@@ -782 +782 @@
             else if not _canContain(.right.type to !, .left.type to !)
                 .recordError('The left expression ([.left.toCobraSource]) cannot be "in" the right-hand expression because the left type is "[.left.type.name]" and the right-hand expression contains type "[.right.type.innerType.name]".')
+            else if _right.type inherits ArrayType
+                pass
             else if not _right.type.isDynamic
                 # try to use right.contains(left)

cobra/trunk/Source/Members.cobra

@@ -756 +756 @@
 
     def unNilReturnType is override
-        assert _returnType is nil
-        if _returnTypeNode inherits NilableTypeProxy
+        if _returnType
+            if _returnType inherits NilableType
+                _returnType = _returnType.nonNil
+        else if _returnTypeNode inherits NilableTypeProxy
             _returnTypeNode = _returnTypeNode.innerTypeProxy
         
@@ -1274 +1276 @@
 
     def unNilReturnType is override
-        assert _returnType is nil
-        if _returnTypeNode inherits NilableTypeProxy
+        if _returnType
+            if _returnType inherits NilableType
+                _returnType = _returnType.nonNil
+        else if _returnTypeNode inherits NilableTypeProxy
             _returnTypeNode = _returnTypeNode.innerTypeProxy
 

cobra/trunk/Source/Types.cobra

@@ -673 +673 @@
     def isEquatableTo(t as IType) as bool
         t = t.nonNil
-        if this == t
-            return true
-        if .isAssignableTo(t) or t.isAssignableTo(this)
-            return true
+        if this == t, return true
+        if .isAssignableTo(t) or t.isAssignableTo(this), return true
         return false
 
     get nonNil as IType
+        ensure not result inherits NilableType
         return this
 
@@ -770 +769 @@
         Returns a named member of System.Object by default.
         """
-        assert .didBindInh and .didBindInt
+        assert .didBindInh and .didBindInt  # don't `require` because subclass overrides may check and fix before invoking base
         objectClass = .compiler.objectType
         return objectClass.memberForName(name)
@@ -969 +968 @@
         member = base.memberForName(name)
         if member is nil
-            member = _box.symbolForName(name, true)
+            member = _box.symbolForName(name, true)  # TODO: should that be .memberForName instead of .symbolForName?
         return member
 
     def isAssignableTo(type as IType) as bool
         r = base.isAssignableTo(type)
-        if not r
-            r = _systemAliasType == type
+        if not r, r = _systemAliasType == type
         return r
 
@@ -985 +983 @@
 
     def isComparableTo(t as IType) as bool
-        if this is t
-            return true
-        else
-            return base.isComparableTo(t)
+        return this is t or base.isComparableTo(t)
 
 
@@ -1343 +1338 @@
     
         .nilableType(t)
+        
+    Note that NilableType will not wrap another NilableType. Also, .typeProvider.nilableType(t)
+    silently handles this so in practice you don't have to guard against it.
     """
 
     cue init(t as IType?)
+        require not t inherits NilableType
         base.init(t)
 
@@ -1409 +1408 @@
         return .typeProvider.nilableType(_wrappedType.greatestCommonDenominatorWith(type))
 
+    def secondaryConstructedTypeFor(box as Box, gpToType as Dictionary<of GenericParam, IType>) as IType is override
+        wt = _wrappedType.secondaryConstructedTypeFor(box, gpToType)
+        if not wt inherits NilableType
+            thisType = .getType
+            return thisType(wt)
+        else
+            return wt
+
     def suggestionsForBadMemberName(name as String) as List<of String> is override
         return _wrappedType.suggestionsForBadMemberName(name)
@@ -1683 +1690 @@
             Node.typeProvider = saveTP
 
-    var _box as Box?
-
     cue init(wrappedType as IType?)
         base.init(wrappedType)
@@ -1697 +1702 @@
         return true
 
+    get box from var as Box?
+
     get name as String is override
         return _wrappedType.name + r'[]'
@@ -1704 +1711 @@
 
     def isAssignableTo(type as IType) as bool is override
-        if base.isAssignableTo(type)
-            return true
+        if base.isAssignableTo(type), return true
         if type inherits ArrayType
-            if _wrappedType == type.theWrappedType
-                return true
+            if _wrappedType == type.theWrappedType, return true
             # covariance with arrays
-            if _wrappedType.isAssignableTo(type.theWrappedType)
-                return true
+            if _wrappedType.isAssignableTo(type.theWrappedType), return true
         if type inherits StreamType
-            if .isAssignableTo(type.box to !)
-                return true
+            if .isAssignableTo(type.box to !), return true
             # covariance with streams
-            if _wrappedType.isAssignableTo(type.innerType to !)
-                return true 
-        return false
+            if _wrappedType.isAssignableTo(type.innerType to !), return true
+        if _box.isAssignableTo(type), return true
+        return false
+
+    def isDescendantOf(type as IType) as bool
+        return base.isDescendantOf(type) or .box.isDescendantOf(type)
+
+    def memberForName(name as String) as IMember? is override
+        m = base.memberForName(name)
+        if m is nil, m = .box.memberForName(name)
+        # TODO: dup'ed from StreamType:
+        if m is nil and _box and .compiler and .compiler.nodeStack.count and (.compiler.nodeStack.peek to Node).isBindingImp
+            # look for an extension member, but it has to be accessible according to namespaces
+            if .compiler.nameSpaceStack.count
+                # don't need to go through the whole namespace stack because the namespace will check its parent
+                m = .compiler.curNameSpace.extensionMemberFor(_box to !, name)
+        return m
+
+    def suggestionsForBadMemberName(name as String) as List<of String> is override
+        return .box.suggestionsForBadMemberName(name)
 
     def _bindInh
         base._bindInh
-        _superType = .compiler.enumerableOfType.constructedTypeFor([.theWrappedType])
-
-    def memberForName(name as String) as IMember?
-        member = base.memberForName(name)
-        if member is nil
-            if _box is nil
-                # TODO: make members based on System.Array
-                _box = Class(Token.empty, Token.empty, '[.getType.name]_[.serialNum]', List<of IType>(), List<of String>(), AttributeList(), nil, List<of ITypeProxy>(), List<of ITypeProxy>(), nil)
-                indexer = Indexer(Token.empty, Token.empty, _box, r'[]', [Param(Token('', 1, 1, 1, 'ID', 'index', nil), .compiler.intType)], _wrappedType, List<of String>(), AttributeList(), '')
-                _box.addDecl(indexer)
-                lengthProp = Property(Token.empty, Token.empty, _box, 'length', .compiler.intType, List<of String>(), AttributeList(), '')
-                _box.addDecl(lengthProp)
-                _box.bindAll
-            member = _box.symbolForName(name, true)
-        return member
+        if .compiler  # will be nil during unit tests
+            iclone = .compiler.libraryType('System.ICloneable')
+            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
+            _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
+            indexer = Indexer(Token.empty, Token.empty, _box, r'[]', [Param(Token('', 1, 1, 1, 'ID', 'index', nil), .compiler.intType)], _wrappedType, List<of String>(), AttributeList(), '')
+            _box.addDecl(indexer)
+            lengthProp = Property(Token.empty, Token.empty, _box, 'length', .compiler.intType, List<of String>(), AttributeList(), '')
+            _box.addDecl(lengthProp)
+            _box.bindInh
+            _superType = _box
+
+    def _bindInt
+        base._bindInt
+        _box.bindInt
+    
+    def _bindImp
+        base._bindImp
+        _box.bindImp
 
 

cobra/trunk/Tests/700-command-line/112-run-hello.cobra

@@ -39 +39 @@
 
             assert p.exitCode == 0
-            assert output.trim == 'Hello'
+            assert output.trim == 'Hello', args
 
         def flush