Skip to content
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

Fix 14097 #14131

Merged
merged 3 commits into from
Oct 17, 2022
Merged

Fix 14097 #14131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06a2d13
Fix 14097
dsyme Oct 17, 2022
ed77d3e
Fix 14097
dsyme Oct 17, 2022
5aa1ad6
Merge branch 'main' into fix-14097
dsyme Oct 17, 2022
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
7 changes: 6 additions & 1 deletion src/Compiler/Checking/CheckExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8540,7 +8540,12 @@ and TcTraitItemThen (cenv: cenv) overallTy env objOpt traitInfo tpenv mItem dela
applicableExpr, exprTy
| _ ->
let vs, ves = argTys |> List.mapi (fun i ty -> mkCompGenLocal mItem ("arg" + string i) ty) |> List.unzip
let traitCall = Expr.Op (TOp.TraitCall traitInfo, [], objArgs@ves, mItem)
// Account for a unit mismtach in logical v. compiled arguments
let compiledArgExprs =
match argTys, traitInfo.GetCompiledArgumentTypes() with
| [_], [] -> []
| _ -> ves
let traitCall = Expr.Op (TOp.TraitCall traitInfo, [], objArgs@compiledArgExprs, mItem)
let v, body = MultiLambdaToTupledLambda g vs traitCall
let expr = mkLambda mItem v (body, retTy)
let exprTy = tyOfExpr g expr
Expand Down
36 changes: 30 additions & 6 deletions ...onentTests/Conformance/TypesAndTypeConstraints/IWSAMsAndSRTPs/testFiles/CheckNewSyntax.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,31 @@ module CheckNewSyntax =

type MyType() =
static member val StaticProperty = 0 with get, set
static member StaticMethod x = x + 5
static member StaticMethod0 () = 5
static member StaticMethod1 x = x + 5
static member StaticMethod2 (x, y) = x + y + 5
member val Length = 0 with get, set
member _.Item with get x = "Hello"
member _.InstanceMethod x = x + 5
member _.InstanceMethod0 () = 5
member _.InstanceMethod1 x = x + 5
member _.InstanceMethod2 (x, y) = x + y + 5

// Check that "property" and "get_ method" constraints are considered logically equivalent
let inline f_StaticProperty<'T when 'T : (static member StaticProperty: int) >() : int = 'T.StaticProperty

let inline f_StaticMethod<'T when 'T : (static member StaticMethod: int -> int) >() : int = 'T.StaticMethod(3)
let inline f_StaticMethod0<'T when 'T : (static member StaticMethod0: unit -> int) >() : int = 'T.StaticMethod0()

let inline f_StaticMethod1<'T when 'T : (static member StaticMethod1: int -> int) >() : int = 'T.StaticMethod1(3)

let inline f_StaticMethod2<'T when 'T : (static member StaticMethod2: int * int -> int) >() : int = 'T.StaticMethod2(3, 3)

let inline f_set_StaticProperty<'T when 'T : (static member StaticProperty: int with set) >() = 'T.set_StaticProperty(3)

let inline f_InstanceMethod<'T when 'T : (member InstanceMethod: int -> int) >(x: 'T) : int = x.InstanceMethod(3)
let inline f_InstanceMethod0<'T when 'T : (member InstanceMethod0: unit -> int) >(x: 'T) : int = x.InstanceMethod0()

let inline f_InstanceMethod1<'T when 'T : (member InstanceMethod1: int -> int) >(x: 'T) : int = x.InstanceMethod1(3)

let inline f_InstanceMethod2<'T when 'T : (member InstanceMethod2: int * int -> int) >(x: 'T) : int = x.InstanceMethod2(3, 3)

let inline f_Length<'T when 'T : (member Length: int) >(x: 'T) = x.Length

Expand All @@ -33,7 +45,13 @@ module CheckNewSyntax =
//let inline f_set_Length2<'T when 'T : (member Length: int with set) >(x: 'T) = x.Length <- 3
//let inline f_Item2<'T when 'T : (member Item: int -> string with get) >(x: 'T) = x[3]

if f_StaticMethod<MyType>() <> 8 then
if f_StaticMethod0<MyType>() <> 5 then
failwith "Unexpected result"

if f_StaticMethod1<MyType>() <> 8 then
failwith "Unexpected result"

if f_StaticMethod2<MyType>() <> 11 then
failwith "Unexpected result"

if f_set_StaticProperty<MyType>() <> () then
Expand All @@ -47,7 +65,13 @@ module CheckNewSyntax =
if f_Length(myInstance) <> 0 then
failwith "Unexpected result"

if f_InstanceMethod(myInstance) <> 8 then
if f_InstanceMethod0(myInstance) <> 5 then
failwith "Unexpected result"

if f_InstanceMethod1(myInstance) <> 8 then
failwith "Unexpected result"

if f_InstanceMethod2(myInstance) <> 11 then
failwith "Unexpected result"

if f_set_Length(myInstance) <> () then
Expand Down