Changeset 2299

Timestamp:

03/05/10 04:41:04 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Fixed: Cobra compile failure on delegates calling .(begin|end)Invoke. ticket:196
Code cleanup. Using IList over List more.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Attributes.cobra (modified) (1 diff)
• Source/Boxes.cobra (modified) (8 diffs)
• Source/CobraParser.cobra (modified) (2 diffs)
• Source/Container.cobra (modified) (1 diff)
• Source/DocGenerator.cobra (modified) (1 diff)
• Source/Members.cobra (modified) (6 diffs)
• Source/NameSpace.cobra (modified) (1 diff)
• Source/Property.cobra (modified) (2 diffs)
• Tests/220-delegates-etc/100-delegates/160-begin-end-invoke.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -436 +436 @@
 
 * Fixed: Cannot instantiate generic params under some circumstances.
+
+* Fixed: Cobra compile failure on delegates calling .(begin|end)Invoke. ticket:196

cobra/trunk/Source/Attributes.cobra

@@ -107 +107 @@
         return true
     
-    get isNames as List<of String>
+    get isNames as IList<of String>
         return List<of String>()
 

cobra/trunk/Source/Boxes.cobra

@@ -41 +41 @@
         """
 
-    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as List<of String>, attribs as AttributeList, baseInterfaceNodes as List<of ITypeProxy>, docString as String?)
+    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as IList<of String>, attribs as AttributeList, baseInterfaceNodes as List<of ITypeProxy>, docString as String?)
         base.init(token, name, isNames, docString)
         _idToken = idToken
@@ -1110 +1110 @@
     var _addsProxies as List<of ITypeProxy>
 
-    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as List<of String>, attribs as AttributeList, implementsNodes as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>, docString as String?)
+    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as IList<of String>, attribs as AttributeList, implementsNodes as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>, docString as String?)
         base.init(token, idToken, name, paramList, isNames, attribs, implementsNodes, docString)
         _addsProxies = addsProxies
@@ -1162 +1162 @@
     var _subclasses = List<of Class>()
 
-    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as List<of String>, attribs as AttributeList, baseNode as ITypeProxy?, implementsNodes as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>, docString as String?)
+    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as IList<of String>, attribs as AttributeList, baseNode as ITypeProxy?, implementsNodes as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>, docString as String?)
         base.init(token, idToken, name, paramList, isNames, attribs, implementsNodes, addsProxies, docString)
         _baseNode = baseNode
@@ -1317 +1317 @@
     # because we need them for class, struct and mixin, but not for interfaces. Awesome!  :-)
     
-    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as List<of String>, attribs as AttributeList, baseNode as ITypeProxy?, implementsNodes as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>, docString as String?)
+    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as IList<of String>, attribs as AttributeList, baseNode as ITypeProxy?, implementsNodes as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>, docString as String?)
         base.init(token, idToken, name, paramList, isNames, attribs, implementsNodes, docString)
         # there are restrictions on mixins which may be relaxed in the future
@@ -1369 +1369 @@
     inherits Box
 
-    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as List<of String>, attribs as AttributeList, baseNodes as List<of ITypeProxy>, docString as String?)
+    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as IList<of String>, attribs as AttributeList, baseNodes as List<of ITypeProxy>, docString as String?)
         base.init(token, idToken, name, paramList, isNames, attribs, baseNodes, docString)
         
@@ -1408 +1408 @@
     inherits ClassOrStruct
 
-    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as List<of String>, attribs as AttributeList, baseName as String?, interfaceNodes as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>, docString as String?)
+    cue init(token as IToken, idToken as IToken, name as String, paramList as List<of IType>, isNames as IList<of String>, attribs as AttributeList, baseName as String?, interfaceNodes as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>, docString as String?)
         base.init(token, idToken, name, paramList, isNames, attribs, interfaceNodes, addsProxies, docString)
 
@@ -1490 +1490 @@
 
     def _bindInt
-        m = Method(.token, .token, this, 'invoke', List<of Param>(.params), .returnType ? .returnTypeProxy, nil, List<of String>(.isNames), AttributeList(), '')
-        m.statements.add(ThrowStmt(.token, PostCallExpr(.token, IdentifierExpr(.token, 'Exception'), List<of Expr>()))) # just to avoid a Cobra warning during .bindImp
-        .addDecl(m)
+        returnType as ITypeProxy = .returnType ? .returnTypeProxy
+        .addDecl(_makeMethod('invoke', .params.clone, returnType))
+        # dynamic type vari length param in list as placeholder for multiple params 
+        params = [Param('vParam', VariTypeIdentifier(.token, TypeIdentifier(.token, DynamicType())))]
+        .addDecl(_makeMethod('beginInvoke', params, TypeIdentifier(.token.copy('ID', 'IAsyncResult')) to ITypeProxy))
+        .addDecl(_makeMethod('endInvoke',   params, returnType ))
         base._bindInt
         for param in .params
@@ -1502 +1505 @@
         pass
 
-
+    def _makeMethod(name as String, params as IList<of Param>, returnTypeProxy as ITypeProxy) as Method
+        m = Method(.token, .token, this, name, params, returnTypeProxy, nil, .isNames.clone, AttributeList(), '')
+        # method body just to avoid a Cobra warning during .bindImp
+        m.statements.add(ThrowStmt(.token, PostCallExpr(.token, IdentifierExpr(.token, 'Exception'), List<of Expr>()))) 
+        return m
+        
 class GenericParam inherits CobraType is partial
     """

cobra/trunk/Source/CobraParser.cobra

@@ -3637 +3637 @@
     """
     
-    cue init(isNames as List<of String>, attributes as AttributeList, inheritsProxies as List<of ITypeProxy>, implementsProxies as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>)
+    cue init(isNames as IList<of String>, attributes as AttributeList, inheritsProxies as List<of ITypeProxy>, implementsProxies as List<of ITypeProxy>, addsProxies as List<of ITypeProxy>)
         base.init
         _isNames = isNames
@@ -3645 +3645 @@
         _addsProxies = addsProxies
     
-    get isNames from var as List<of String>
+    get isNames from var as IList<of String>
     
     get attributes from var as AttributeList

cobra/trunk/Source/Container.cobra

@@ -85 +85 @@
     var _declsByNameCI as Dictionary<of String, TMember>
     var _docString as String
-    var _isNames as List<of String>
-
-    cue init(token as IToken, name as String, isNames as List<of String>, docString as String?)
+    var _isNames as IList<of String>
+
+    cue init(token as IToken, name as String, isNames as IList<of String>, docString as String?)
         .init(nil, token, name, isNames, docString)
 
-    cue init(parent as IParentSpace?, token as IToken, name as String, isNames as List<of String>, docString as String?)
+    cue init(parent as IParentSpace?, token as IToken, name as String, isNames as IList<of String>, docString as String?)
         base.init(token, name)
         _initParent(parent)

cobra/trunk/Source/DocGenerator.cobra

@@ -265 +265 @@
         .writeIsNames(box.isNames)
     
-    def writeIsNames(isNames as List<of String>)
+    def writeIsNames(isNames as IList<of String>)
         if isNames.count
             .write('is ')

cobra/trunk/Source/Members.cobra

@@ -34 +34 @@
     var _parentBox as Box
     var _docString as String?
-    var _isNames as List<of String>?
+    var _isNames as IList<of String>?
     var _attribs as AttributeList
     var _overloadGroup as MemberOverload?
@@ -43 +43 @@
     var _binaryName as String?
 
-    cue init(token as IToken, idToken as IToken, parentBox as Box, name as String, isNames as List<of String>, attribs as AttributeList)
+    cue init(token as IToken, idToken as IToken, parentBox as Box, name as String, isNames as IList<of String>, attribs as AttributeList)
         .init(token, idToken, parentBox, name, isNames, attribs, nil)
 
-    cue init(token as IToken, idToken as IToken, parentBox as Box, name as String, isNames as List<of String>, attribs as AttributeList, docString as String?)
+    cue init(token as IToken, idToken as IToken, parentBox as Box, name as String, isNames as IList<of String>, attribs as AttributeList, docString as String?)
         base.init(idToken, name)
         _idToken = idToken
@@ -655 +655 @@
     var _isCompilerGenerated as bool
 
-    cue init(token as IToken, idToken as IToken, box as Box, parentMethod as AbstractMethod?, name as String, paramsList as List<of Param>, isNames as List<of String>, attribs as AttributeList, docString as String)
+    cue init(token as IToken, idToken as IToken, box as Box, parentMethod as AbstractMethod?, name as String, paramsList as IList<of Param>, isNames as IList<of String>, attribs as AttributeList, docString as String)
         base.init(token, idToken, box, name, isNames, attribs, docString)
         _parentMethod = parentMethod
-        _params = paramsList
+        _params = List<of Param>(paramsList)
         _oldExprs = List<of OldExpr>()
         _locals = List<of LocalVar>()
@@ -1023 +1023 @@
     var _implementsType as IType?
 
-    cue init(token as IToken, idToken as IToken, box as Box, name as String, paramsList as List<of Param>, returnTypeNode as ITypeProxy, implementsTypeNode as ITypeProxy?, isNames as List<of String>, attribs as AttributeList, docString as String)
+    cue init(token as IToken, idToken as IToken, box as Box, name as String, paramsList as IList<of Param>, returnTypeNode as ITypeProxy, implementsTypeNode as ITypeProxy?, isNames as IList<of String>, attribs as AttributeList, docString as String)
         .init(token, idToken, box, name, List<of IType>(), paramsList, returnTypeNode, implementsTypeNode, isNames, attribs, docString)
 
-    cue init(token as IToken, idToken as IToken, box as Box, name as String, genericParams as List<of IType>, paramsList as List<of Param>, returnTypeNode as ITypeProxy, implementsTypeNode as ITypeProxy?, isNames as List<of String>, attribs as AttributeList, docString as String)
+    cue init(token as IToken, idToken as IToken, box as Box, name as String, genericParams as List<of IType>, paramsList as IList<of Param>, returnTypeNode as ITypeProxy, implementsTypeNode as ITypeProxy?, isNames as IList<of String>, attribs as AttributeList, docString as String)
         base.init(token, idToken, box, nil, name, paramsList, isNames, attribs, docString)
         _genericParams = genericParams
@@ -1219 +1219 @@
     var _returnTypeNode as ITypeProxy?
 
-    cue init(token as IToken, idToken as IToken, box as Box, name as String, isNames as List<of String>, attribs as AttributeList, docString as String?)
+    cue init(token as IToken, idToken as IToken, box as Box, name as String, isNames as IList<of String>, attribs as AttributeList, docString as String?)
         base.init(token, idToken, box, name, isNames, attribs, docString)
 
-    cue init(token as IToken, idToken as IToken, box as Box, name as String, returnTypeOrNode as INode, isNames as List<of String>, attribs as AttributeList, docString as String)
+    cue init(token as IToken, idToken as IToken, box as Box, name as String, returnTypeOrNode as INode, isNames as IList<of String>, attribs as AttributeList, docString as String)
         .init(token, idToken, box, name, isNames, attribs, docString)
         if returnTypeOrNode inherits IType
@@ -1338 +1338 @@
     get xetPartName as String is abstract
 
-    get isNames as List<of String>? is override
+    get isNames as IList<of String>? is override
         # may need to get more sophisticated here if, in the future, we support C#'s somewhat recent ability to put access modifiers on just the set or get part of a property
         return _parent.isNames

cobra/trunk/Source/NameSpace.cobra

@@ -8 +8 @@
     def extensionMemberFor(box as Box, name as String) as IMember?
     get isFromBinaryLibrary as bool
-    get isNames as List<of String>
+    get isNames as IList<of String>
 
 

cobra/trunk/Source/Property.cobra

@@ -3 +3 @@
     inherits ProperDexer
 
-    cue init(token as IToken, idToken as IToken, box as Box, name as String, isNames as List<of String>, attribs as AttributeList, coverVar as BoxVar, coverAccess as String, docString as String)
+    cue init(token as IToken, idToken as IToken, box as Box, name as String, isNames as IList<of String>, attribs as AttributeList, coverVar as BoxVar, coverAccess as String, docString as String)
         base.init(token, idToken, box, name, isNames, attribs, docString)
         _coverVar = coverVar
@@ -9 +9 @@
         _isNames = isNames
 
-    cue init(token as IToken, idToken as IToken, box as Box, name as String, returnTypeOrNode as INode, isNames as List<of String>, attribs as AttributeList, docString as String)
+    cue init(token as IToken, idToken as IToken, box as Box, name as String, returnTypeOrNode as INode, isNames as IList<of String>, attribs as AttributeList, docString as String)
         base.init(token, idToken, box, name, returnTypeOrNode, isNames, attribs, docString)