Merge pull request #1286 from forki/wrongarity

Wrong number of args reported in error message

Author: dsyme

src/fsharp/ConstraintSolver.fs

@@ -2064,8 +2064,7 @@ and ReportNoCandidatesError (csenv:ConstraintSolverEnv) (nUnnamedCallerArgs,nNam
 
     // One or more accessible, all the same arity, none correct 
     | ((cmeth :: cmeths2),_),_,_,_,_ when not cmeth.HasCorrectArity && cmeths2 |> List.forall (fun cmeth2 -> cmeth.TotalNumUnnamedCalledArgs = cmeth2.TotalNumUnnamedCalledArgs) -> 
-        ErrorD (Error (FSComp.SR.csMemberNotAccessible(methodName, (cmeth.ArgSets |> List.sumBy (fun x -> x.NumUnnamedCalledArgs)), methodName, cmeth.TotalNumUnnamedCalledArgs),m))
-
+        ErrorD (Error (FSComp.SR.csMemberNotAccessible(methodName, nUnnamedCallerArgs, methodName, cmeth.TotalNumUnnamedCalledArgs),m))
     // Many methods, all with incorrect number of generic arguments
     | _,_,_,([],(cmeth :: _)),_ -> 
         let msg = FSComp.SR.csIncorrectGenericInstantiation((ShowAccessDomain ad), methodName, cmeth.NumCallerTyArgs)

src/fsharp/FSComp.txt

@@ -343,7 +343,7 @@ csCtorHasNoArgumentOrReturnProperty,"The object constructor '%s' has no argument
 500,csMemberSignatureMismatchArityNamed,"The member or object constructor '%s' requires %d argument(s) but is here given %d unnamed and %d named argument(s). The required signature is '%s'."
 501,csMemberSignatureMismatchArity,"The member or object constructor '%s' takes %d argument(s) but is here given %d. The required signature is '%s'."
 502,csMemberSignatureMismatchArityType,"The member or object constructor '%s' takes %d type argument(s) but is here given %d. The required signature is '%s'."
-503,csMemberNotAccessible,"The member or object constructor '%s' taking %d arguments are not accessible from this code location. All accessible versions of method '%s' take %d arguments."
+503,csMemberNotAccessible,"A member or object constructor '%s' taking %d arguments is not accessible from this code location. All accessible versions of method '%s' take %d arguments."
 504,csIncorrectGenericInstantiation,"Incorrect generic instantiation. No %s member named '%s' takes %d generic arguments."
 505,csMemberOverloadArityMismatch,"The member or object constructor '%s' does not take %d argument(s). An overload was found taking %d arguments."
 506,csNoMemberTakesTheseArguments,"No %s member or object constructor named '%s' takes %d arguments"

tests/fsharpqa/Source/Conformance/Expressions/SyntacticSugar/E_Slices01.fs

@@ -7,8 +7,8 @@
 //<Expects id="FS0041" status="error" span="(24,9)">A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: member Foo\.GetSlice : x1:float option \* x2:int option \* y:int -> unit, member Foo\.GetSlice : x1:int option \* x2:int option \* y:int -> unit</Expects>
 //<Expects id="FS0041" status="error" span="(25,9)">A unique overload for method 'GetSlice' could not be determined based on type information prior to this program point\. A type annotation may be needed\. Candidates: member Foo\.GetSlice : x1:float option \* x2:int option \* y:int -> unit, member Foo\.GetSlice : x1:int option \* x2:int option \* y:int -> unit</Expects>
 //<Expects id="FS0039" status="error" span="(26,9)">The field, constructor or member 'Item' is not defined</Expects>
-//<Expects id="FS0503" status="error" span="(27,9)">The member or object constructor 'GetSlice' taking 3 arguments are not accessible from this code location\. All accessible versions of method 'GetSlice' take 3 arguments\.</Expects>
-//<Expects id="FS0503" status="error" span="(28,9)">The member or object constructor 'GetSlice' taking 3 arguments are not accessible from this code location\. All accessible versions of method 'GetSlice' take 3 arguments\.</Expects>
+//<Expects id="FS0503" status="error" span="(27,9)">A member or object constructor 'GetSlice' taking 4 arguments is not accessible from this code location\. All accessible versions of method 'GetSlice' take 3 arguments\.</Expects>
+//<Expects id="FS0503" status="error" span="(28,9)">A member or object constructor 'GetSlice' taking 5 arguments is not accessible from this code location\. All accessible versions of method 'GetSlice' take 3 arguments\.</Expects>
 
 type Foo<'a>() =
     member this.GetSlice(x : int, y1 : int option, y2 : int option) = ()

tests/fsharpqa/Source/Warnings/WrongArity.fs

@@ -0,0 +1,11 @@
+// #Warnings
+//<Expects status="Error"  id="FS0503">A member or object constructor 'MyMember' taking 3</Expects>
+
+type MyType() = 
+   static member MyMember(arg1, arg2:int ) = () 
+   static member MyMember(arg1, arg2:byte) = ()
+
+ 
+MyType.MyMember("", 0, 0)
+    
+exit 0

tests/fsharpqa/Source/Warnings/env.lst

@@ -5,6 +5,7 @@
 	SOURCE=InvalidRecord.fs # InvalidRecord.fs
 	SOURCE=CommaInRecCtor.fs # CommaInRecCtor.fs
 	SOURCE=ValidCommaInRecCtor.fs # ValidCommaInRecCtor.fs
+	SOURCE=WrongArity.fs # WrongArity.fs
 	SOURCE=AccessOfTypeAbbreviation.fs # AccessOfTypeAbbreviation.fs
 	SOURCE=AccessOfTypeAbbreviation2.fs # AccessOfTypeAbbreviation2.fs
 	SOURCE=AccessOfTypeAbbreviation3.fs # AccessOfTypeAbbreviation3.fs