Changeset 2299 for cobra/trunk/Source/Boxes.cobra

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.

Files:

• cobra/trunk/Source/Boxes.cobra (modified) (8 diffs)

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
     """