Changeset 2300

Timestamp:

03/05/10 05:30:16 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Fixed: False compilation error in anonymous method with no return type and a simple return statement.
ticket:197
credit:hopscc

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Statements.cobra (modified) (1 diff)
• Tests/320-misc-two/830-lambdas/300-lambdas-return.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -438 +438 @@
 
 * Fixed: Cobra compile failure on delegates calling .(begin|end)Invoke. ticket:196
+
+* Fixed: False compilation error in anonymous method with no return type and a simple `return` statement. ticket:197

cobra/trunk/Source/Statements.cobra

@@ -1084 +1084 @@
             expr.contextType = curCodeMember.resultType
         else
-            if curCodeMember.resultType is not .compiler.voidType
+            # TODO: the check for .passThroughType below is required only because lambdas are using it for their return value instead of setting it to the correct type. so improving lambdas (AnonExpr) will allow the removal of that check
+            if curCodeMember.resultType is not .compiler.voidType and curCodeMember.resultType is not .compiler.passThroughType
                 .throwError('Return statement must return a [curCodeMember.resultType.name], or [curCodeMember.name] must have its return type removed.')
         curCodeMember.hasReturnStmt = true