Changeset 2360

Timestamp:

05/01/10 11:10:17 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Missing inout produces a C# error message rather than a Cobra error message.
ticket:199
credit:hopscc

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Expr.cobra (modified) (1 diff)
• Source/Vars.cobra (modified) (1 diff)
• Tests/200-misc/400-arguments/120-in-out-errors-mismatch.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -458 +458 @@
 
 * Fixed: Failure to infer types related to System.Text.RegularExpressions (MatchCollection and GroupCollections items). ticket:163
+
+* Fixed: Missing `inout` produces a C# error message rather than a Cobra error message.  ticket:199

cobra/trunk/Source/Expr.cobra

@@ -746 +746 @@
             assert arg.didBindImp
             assert param.didBindInt
+            # check any in/out/inout expectations are matched
+            if not param.matchLabel(arg.argumentLabel)
+                arg.recordError('Argument [i+1] of method "[_name]" expects a parameter labeled as ([param.kind]), but the call is supplying a label of ([arg.argumentLabel]).')
             if arg.canBeAssignedTo(param.type)
                 arg.contextType = param.type

cobra/trunk/Source/Vars.cobra

@@ -216 +216 @@
             catch ne as NodeException
                 .compiler.recordError(ne)
-
-
+                
+    def matchLabel(label as ArgumentLabel) as bool
+        """ Verify argumentLabel from method argument matches parameter kind """
+        isValid = false
+        branch label 
+            on ArgumentLabel.None
+                isValid = .kind == .KindEnum.Value
+            on ArgumentLabel.Out
+                isValid = .kind == .KindEnum.Out
+            on ArgumentLabel.InOut
+                isValid = .kind == .KindEnum.InOut
+        return isValid
+            
 class LocalVar inherits AbstractLocalVar is partial