Skip to content

More robust check for isSequential #2189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 3 commits into from
Jan 9, 2017
Merged

More robust check for isSequential #2189

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6935770
more robust check for isSequential
liboz Jan 7, 2017
a0180b5
using type inference for the signature
liboz Jan 7, 2017
8244572
using even more type inferencing
liboz Jan 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/fsharp/ConstraintSolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1992,7 +1992,7 @@ and ArgsEquivInsideUndo (csenv:ConstraintSolverEnv) isConstraint calledArg (Call
if not (typeEquiv csenv.g calledArgTy callerArgTy) then ErrorD(Error(FSComp.SR.csArgumentTypesDoNotMatch(),m)) else
CompleteD

and ReportNoCandidatesError (csenv:ConstraintSolverEnv) (nUnnamedCallerArgs,nNamedCallerArgs) methodName ad (calledMethGroup:CalledMeth<_> list) =
and ReportNoCandidatesError (csenv:ConstraintSolverEnv) (nUnnamedCallerArgs,nNamedCallerArgs) methodName ad (calledMethGroup:CalledMeth<_> list) isSequential =

let amap = csenv.amap
let m = csenv.m
Expand Down Expand Up @@ -2054,7 +2054,7 @@ and ReportNoCandidatesError (csenv:ConstraintSolverEnv) (nUnnamedCallerArgs,nNam
cmeth.ArgSets
|> List.exists (fun argSet ->
argSet.UnnamedCallerArgs
|> List.exists (fun c -> c.Expr.ToString().EndsWith "Sequential"))
|> List.exists (fun c -> isSequential c.Expr))

if couldBeNameArgs then
Error (FSComp.SR.csCtorSignatureMismatchArityProp(methodName, nReqd, nActual, signature), m)
Expand Down Expand Up @@ -2106,6 +2106,13 @@ and ReportNoCandidatesError (csenv:ConstraintSolverEnv) (nUnnamedCallerArgs,nNam
Error (msg,m)
|> ErrorD

and ReportNoCandidatesErrorExpr csenv callerArgCounts methodName ad calledMethGroup =
let isSequential e = match e with | Expr.Sequential (_,_,_,_,_) -> true | _ -> false
ReportNoCandidatesError csenv callerArgCounts methodName ad calledMethGroup isSequential

and ReportNoCandidatesErrorSynExpr csenv callerArgCounts methodName ad calledMethGroup =
let isSequential e = match e with | SynExpr.Sequential (_,_,_,_,_) -> true | _ -> false
ReportNoCandidatesError csenv callerArgCounts methodName ad calledMethGroup isSequential

// Resolve the overloading of a method
// This is used after analyzing the types of arguments
Expand Down Expand Up @@ -2138,7 +2145,7 @@ and ResolveOverloading
None, ErrorD (Error (FSComp.SR.csMethodNotFound(methodName),m)), NoTrace

| _,[] when not isOpConversion ->
None, ReportNoCandidatesError csenv callerArgCounts methodName ad calledMethGroup, NoTrace
None, ReportNoCandidatesErrorExpr csenv callerArgCounts methodName ad calledMethGroup, NoTrace

| _,_ ->

Expand Down Expand Up @@ -2447,7 +2454,7 @@ let UnifyUniqueOverloading
| [],_ ->
ErrorD (Error (FSComp.SR.csMethodNotFound(methodName),m))
| _,[] ->
ReportNoCandidatesError csenv callerArgCounts methodName ad calledMethGroup
ReportNoCandidatesErrorSynExpr csenv callerArgCounts methodName ad calledMethGroup
++ (fun () -> ResultD false)
| _ ->
ResultD false
Expand Down