Changeset 1733

Timestamp:

11/05/08 12:12:45 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Fixed: Nilable delegates cannot be called (foo(arg1, arg2)).

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Expr.cobra (modified) (1 diff)
• Source/SharpGenerator.cobra (modified) (1 diff)
• Tests/220-delegates-etc/100-delegates/110-declare-sig.cobra (modified) (2 diffs)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -203 +203 @@
 
 * Fixed: Cannot add a doc string for a `sig` declaration.
+
+* Fixed: Nilable delegates cannot be called (`foo(arg1, arg2)`).

cobra/trunk/Source/Expr.cobra

@@ -1497 +1497 @@
                 if _type is nil
                         assert expr.type is not nil
-                        if expr.type inherits MethodSig  # TODO: probably still need to handle case of a method sig coming from a DLL
-                                _type = (expr.type to MethodSig).returnType
+                        exprType = expr.type
+                        if exprType inherits NilableType
+                                exprType = exprType.theWrappedType
+                        if exprType inherits MethodSig  # TODO: probably still need to handle case of a method sig coming from a DLL
+                                _type = exprType.returnType
                         else if expr.receiverType and expr.receiverType.isSystemTypeClass
                                 _type = .compiler.dynamicType
-                        else if expr.type inherits Box
+                        else if exprType inherits Box
                                 _type = expr.receiverType  # for example, an IdentifierExpr of 'SomeClass' has a .receiverType of that class
-                        else if expr.type.isDynamic
+                        else if exprType.isDynamic
                                 _type = .compiler.nilableDynamicType
                         else

cobra/trunk/Source/SharpGenerator.cobra

@@ -3348 +3348 @@
                                         .writeSharpArgs(sw)
                                         sw.write(')')
-                                else if expr.type inherits MethodSig
+                                else if expr.type inherits MethodSig or (expr.type inherits NilableType and (expr.type to NilableType).theWrappedType inherits MethodSig)
                                         isMethodSig = true
                                 else if expr.type.isSystemTypeClass or _type.isDynamic

cobra/trunk/Tests/220-delegates-etc/100-delegates/110-declare-sig.cobra

@@ -31 +31 @@
 
         def eval1 as int
+                # use the var with .invoke
                 if _op
                         return _op.invoke(_a, _b)
@@ -37 +38 @@
 
         def eval2 as int
+                # use the var with direct call
                 if _op
                         return _op(_a, _b)
+                else
+                        return 0
+
+        def eval3 as int
+                # use a property with invoke
+                # also testing nilable delegate
+                if .op
+                        op = .op
+                        return op.invoke(_a, _b)
+                else
+                        return 0
+
+        def eval4 as int
+                # use a property with direct call
+                # also testing nilable delegate
+                if .op
+                        op = .op
+                        return op(_a, _b)
                 else
                         return 0