Skip to content

Fix 2730 #2843

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
merged 1 commit into from
Apr 13, 2017
Merged

Fix 2730 #2843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 73 additions & 1 deletion src/fsharp/TypeChecker.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8681,15 +8681,87 @@ and TcItemThen cenv overallTy env tpenv (item,mItem,rest,afterOverloadResolution
let expr = Expr.Op(TOp.TraitCall(traitInfo), [], ves, mItem)
let expr = mkLambdas mItem [] vs (expr,retTy)

let rec isSimpleArgument e =
match e with
| SynExpr.New(_, _, synExpr, _)
| SynExpr.Paren(synExpr, _, _, _)
| SynExpr.Typed(synExpr, _, _)
| SynExpr.TypeApp (synExpr, _, _, _, _, _, _)
| SynExpr.TypeTest (synExpr, _, _)
| SynExpr.Upcast(synExpr, _, _)
| SynExpr.DotGet(synExpr, _, _, _)
| SynExpr.Downcast(synExpr, _, _)
| SynExpr.InferredUpcast(synExpr, _)
| SynExpr.InferredDowncast(synExpr, _)
| SynExpr.AddressOf(_, synExpr, _, _)
| SynExpr.Quote(_, _, synExpr, _, _) -> isSimpleArgument synExpr

| SynExpr.Null _
| SynExpr.Ident _
| SynExpr.Const _
| SynExpr.LongIdent _ -> true

| SynExpr.Tuple(synExprs, _, _)
| SynExpr.StructTuple(synExprs, _, _)
| SynExpr.ArrayOrList(_, synExprs, _) -> synExprs |> List.forall isSimpleArgument
| SynExpr.Record(_,copyOpt,fields, _) -> copyOpt |> Option.forall (fst >> isSimpleArgument) && fields |> List.forall (p23 >> Option.forall isSimpleArgument)
| SynExpr.App (_, _, synExpr, synExpr2, _) -> isSimpleArgument synExpr && isSimpleArgument synExpr2
| SynExpr.IfThenElse(synExpr, synExpr2, synExprOpt, _, _, _, _) -> isSimpleArgument synExpr && isSimpleArgument synExpr2 && Option.forall isSimpleArgument synExprOpt
| SynExpr.DotIndexedGet(synExpr, _, _, _) -> isSimpleArgument synExpr
| SynExpr.ObjExpr _
| SynExpr.While _
| SynExpr.For _
| SynExpr.ForEach _
| SynExpr.ArrayOrListOfSeqExpr _
| SynExpr.CompExpr _
| SynExpr.Lambda _
| SynExpr.MatchLambda _
| SynExpr.Match _
| SynExpr.Do _
| SynExpr.Assert _
| SynExpr.Fixed _
| SynExpr.TryWith _
| SynExpr.TryFinally _
| SynExpr.Lazy _
| SynExpr.Sequential _
| SynExpr.LetOrUse _
| SynExpr.DotSet _
| SynExpr.DotIndexedSet _
| SynExpr.LongIdentSet _
| SynExpr.JoinIn _
| SynExpr.NamedIndexedPropertySet _
| SynExpr.DotNamedIndexedPropertySet _
| SynExpr.LibraryOnlyILAssembly _
| SynExpr.LibraryOnlyStaticOptimization _
| SynExpr.LibraryOnlyUnionCaseFieldGet _
| SynExpr.LibraryOnlyUnionCaseFieldSet _
| SynExpr.ArbitraryAfterError(_, _)
| SynExpr.FromParseError(_, _)
| SynExpr.DiscardAfterMissingQualificationAfterDot(_, _)
| SynExpr.ImplicitZero _
| SynExpr.YieldOrReturn _
| SynExpr.YieldOrReturnFrom _
| SynExpr.LetOrUseBang _
| SynExpr.DoBang _
| SynExpr.TraitCall _
-> false


// Propagte the known application structure into function types
Propagate cenv overallTy env tpenv (MakeApplicableExprNoFlex cenv expr) (tyOfExpr cenv.g expr) delayed

let delayed1, delayed2 = List.takeWhile (function (DelayedApp _) -> true | _ -> false) delayed, List.skipWhile (function (DelayedApp _) -> true | _ -> false) delayed
// Take all simple arguments and process them before applying the constraint.
let delayed1, delayed2 =
let pred = (function (DelayedApp (_,arg,_)) -> isSimpleArgument arg | _ -> false)
List.takeWhile pred delayed, List.skipWhile pred delayed
let intermediateTy = if isNil delayed2 then overallTy else NewInferenceType ()

let resultExpr, tpenv = TcDelayed cenv intermediateTy env tpenv mItem (MakeApplicableExprNoFlex cenv expr) (tyOfExpr cenv.g expr) ExprAtomicFlag.NonAtomic delayed1

// Add the constraint after the application arguments have been checked to allow annotations to kick in on rigid type parameters
AddCxMethodConstraint env.DisplayEnv cenv.css mItem NoTrace traitInfo

// Process all remaining arguments after the constraint is asserted
let resultExpr2, tpenv2 = TcDelayed cenv overallTy env tpenv mItem (MakeApplicableExprNoFlex cenv resultExpr) intermediateTy ExprAtomicFlag.NonAtomic delayed2
resultExpr2, tpenv2

Expand Down
42 changes: 42 additions & 0 deletions tests/fsharp/core/syntax/test.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,48 @@ module CheckDynamicOperatorsOnTypesUnconstrained =
let op = OpDynamic ()
op?Hello.Prop

module MoreDynamicOpTests =
module Test1 =
type 'a Doge () = class end
with
static member (|~>) (_ : 'b Doge, _ : 'b -> 'c) : 'c Doge = Doge ()

let x : System.DateTime Doge = Doge ()

let y = x |~> (fun dt -> dt.Year) // error on this line around 'dt.Year'


module Test2 =
type OpDynamic() =
static member ( ? ) (x, n) = x
member x.Prop = 1

let f() =
let op = OpDynamic ()
op?Hello.Prop

module Test3 =
type M() =
static member ($) (x:string, M) = ""
static member ($) (x:int , M) = 0
static member ($) (x:float , M) = 0.0

let inline empty< ^R, ^M when (^R or ^M) : (static member ($) : ^R * M -> ^R) and ^M :> M> =
let m = M()
((^R or ^M) : (static member ($): ^R * M -> ^R ) (Unchecked.defaultof<'R>, m))

let a :int = empty< _ , M >
let b :string = empty< _ , M >

module Test4 =
type M() =
static member ($) (x:string, M) = ""
static member ($) (x:int , M) = 0
static member ($) (x:float , M) = 0.0

let inline empty< ^R when ( ^R or M) : (static member ( $ ) : ^R * M -> ^R)> =
let m = M()
Unchecked.defaultof< ^R> $ m: ^R

// Copyright (c) Microsoft Corporation 2005-2006. .

Expand Down