Changeset 1767

Timestamp:

11/15/08 23:31:17 (8 weeks ago)

Author:

Chuck.Esterbrook

Message:

Fixed: Cannot properly invoke delegates whose delegate types come from binary libraries.
Improved error messages regarding the use of += and -= with events and delegates.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/BackEndClr/SharpGenerator.cobra (modified) (2 diffs)
• Source/BinaryOpExpr.cobra (modified) (1 diff)
• Source/Expr.cobra (modified) (1 diff)
• Source/Members.cobra (modified) (1 diff)
• Source/Statements.cobra (modified) (1 diff)
• Tests/220-delegates-etc/100-delegates/150-use-delegates-from-library.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -222 +222 @@
 
 * Fixed: No warning for derived methods that are not marked "override" or "new" when the parameters differ by being nilable (String?) or not (String). ticket:59
+
+* Fixed: Cannot properly invoke delegates whose delegate types come from binary libraries.

cobra/trunk/Source/BackEndClr/SharpGenerator.cobra

@@ -2 +2 @@
 Eventually this file will contain all C# code generation.
 In the future, you can expect (or contribute!) alternate code generators such as IL, JVM and Objective-C.
+
+There should be not use .throwError, or recording of warnings, etc. in this file.
+All of that happens during .bindFoo phases.
 """
 
@@ -3371 +3374 @@
                                         .writeSharpArgs(sw)
                                         sw.write(')')
-                                else if expr.type inherits MethodSig or (expr.type inherits NilableType and (expr.type to NilableType).theWrappedType inherits MethodSig)
+                                else if expr.type.isDescendantOf(.compiler.delegateType)
+                                        isMethodSig = true
+                                else if expr.type inherits NilableType and (expr.type to NilableType).theWrappedType.isDescendantOf(.compiler.delegateType)
                                         isMethodSig = true
                                 else if expr.type.isSystemTypeClass or _type.isDynamic
                                         isDynamic = true
                                 else
-                                        assert false, expr  # TODO: .throwError
+                                        assert false, expr
                         else if expr inherits IndexExpr
-                                if expr.type inherits MethodSig
+                                if expr.type.isDescendantOf(.compiler.delegateType)
                                         isMethodSig = true
                                 else if expr.type.isSystemTypeClass or _type.isDynamic
                                         isDynamic = true
                                 else
-                                        assert false, expr  # TODO: .throwError
+                                        assert false, expr
                         else
-                                assert false, expr  # TODO: .throwError
+                                assert false, expr
                         if isMethodSig
-                                expr.writeSharpDef(sw)
+                                expr.writeSharpDef(sw, false)
                                 sw.write('(')
                                 .writeSharpArgs(sw)

cobra/trunk/Source/BinaryOpExpr.cobra

@@ -384 +384 @@
                         pass
                 else if .left.type.isDescendantOf(.compiler.delegateType)
-                        # TODO: distinguish between events and delegates
                         leftSource = .left.toCobraSource
                         rightSource = .right.toCobraSource
                         if not .right inherits RefExpr, rightSource = 'ref ' + rightSource
                         branch .op
-                                on 'PLUS_EQUALS',  .throwError('Cannot use "+=". Use "listen [leftSource], [rightSource]" for events and "[leftSource] = Delegate.combine([leftSource], [rightSource])" for delegates.')
-                                on 'MINUS_EQUALS', .throwError('Cannot use "-=". Use "ignore [leftSource], [rightSource]" for events and "[leftSource] = Delegate.remove([rightSource])" for delegates.')
-                                else, .throwError('Cannot use the operator "[.token.text]" on events or delegates.')
-
+                                on 'PLUS_EQUALS'
+                                        msg = 'Cannot use "+=". '
+                                        if .left.definition inherits BoxEvent, msg += 'Use "listen [leftSource], [rightSource]" for events.'
+                                        else, msg += 'Use "[leftSource] = Delegate.combine([leftSource], [rightSource])" for delegates.'
+                                on 'MINUS_EQUALS'
+                                        msg = 'Cannot use "-=". '
+                                        if .left.definition inherits BoxEvent, msg += 'Use "ignore [leftSource], [rightSource]" for events.'
+                                        else, msg += 'Use "[leftSource] = Delegate.remove([rightSource])" for delegates.'
+                                else
+                                        msg = 'Cannot use the operator "[.token.text]" on events or delegates.'
+                        .throwError(msg)
 
 class AugAssignBitwiseExpr

cobra/trunk/Source/Expr.cobra

@@ -1570 +1570 @@
                         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
+                        if exprType inherits MethodSig
                                 _type = exprType.returnType
+                        else if exprType.isDescendantOf(.compiler.delegateType)
+                                member = exprType.memberForName('invoke')
+                                if member inherits Method
+                                        _type = member.resultType
+                                else
+                                        .throwError('Cannot find a single "invoke" method for "_eventType.name".')
                         else if expr.receiverType and expr.receiverType.isSystemTypeClass
                                 _type = .compiler.dynamicType

cobra/trunk/Source/Members.cobra

@@ -374 +374 @@
                         _handlerType = _handlerTypeProxy.realType
                 # TODO: error check that _handlerType is a delegate
-                # _handlerType.isDescendantOf(.compiler.libraryType('System.Delegate'))
+                # _handlerType.isDescendantOf(.compiler.delegateType)
 
 

cobra/trunk/Source/Statements.cobra

@@ -915 +915 @@
                                 assert expr.potentialType
                                 _eventType = expr.potentialType
-                                if _eventType.isDescendantOf(.compiler.libraryType('System.Delegate')) or _eventType inherits MethodSig
+                                if _eventType.isDescendantOf(.compiler.delegateType)
                                         pass
                                 else if _eventType.isDescendantOf(.compiler.exceptionType)