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

Jump to bottom

WIP: try to fix record init order bug described in #212 #214

Closed
wants to merge 2 commits into from
Closed

WIP: try to fix record init order bug described in #212 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5341ccf
Add a failing test which shows the error in #212
forki Feb 4, 2015
ff0100e
Oversimplified attempt to fix #212
forki Feb 4, 2015
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
1 change: 1 addition & 0 deletions src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<ItemGroup>
<Compile Include="NUnitFrameworkShims.fs" Condition="'$(TargetFramework)' == 'sl3-wp'" />
<Compile Include="ManglingNameOfProvidedTypes.fs" />
<Compile Include="RecordInitialisation.fs" />
<Compile Include="HashIfExpression.fs" />
</ItemGroup>
<ItemGroup>
Expand Down
197 changes: 197 additions & 0 deletions src/fsharp/FSharp.Compiler.Unittests/RecordInitialisation.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
// Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace FSharp.Compiler.Unittests

open System
open System.Text
open NUnit.Framework
open Microsoft.FSharp.Compiler

type RecordWithInts =
{ A : int
B : int
C : int }

[<TestFixture>]
type OrderOfRecordInitialisation() =

let expected =
{ A = 1
B = 2
C = 3 }

[<Test>]
member this.ShouldInitialzeInGivenOrder1() =
let order = ref ""
let actual =
{ A = let _ = order := !order + "1" in 1
B = let _ = order := !order + "2" in 2
C = let _ = order := !order + "3" in 3 }

Assert.AreEqual(expected, actual)
Assert.AreEqual("123", !order)

[<Test>]
member this.ShouldInitialzeInGivenOrder2() =
let order = ref ""
let actual =
{ A = let _ = order := !order + "1" in 1
C = let _ = order := !order + "2" in 3
B = let _ = order := !order + "3" in 2 }

Assert.AreEqual(expected, actual)
Assert.AreEqual("123", !order)

[<Test>]
member this.ShouldInitialzeInGivenOrder3() =
let order = ref ""
let actual =
{ B = let _ = order := !order + "1" in 2
A = let _ = order := !order + "2" in 1
C = let _ = order := !order + "3" in 3 }

Assert.AreEqual(expected, actual)
Assert.AreEqual("123", !order)

[<Test>]
member this.ShouldInitialzeInGivenOrder4() =
let order = ref ""
let actual =
{ B = let _ = order := !order + "1" in 2
C = let _ = order := !order + "2" in 3
A = let _ = order := !order + "3" in 1 }

Assert.AreEqual(expected, actual)
Assert.AreEqual("123", !order)

[<Test>]
member this.ShouldInitialzeInGivenOrder5() =
let order = ref ""
let actual =
{ C = let _ = order := !order + "1" in 3
A = let _ = order := !order + "2" in 1
B = let _ = order := !order + "3" in 2 }

Assert.AreEqual(expected, actual)
Assert.AreEqual("123", !order)

[<Test>]
member this.ShouldInitialzeInGivenOrder6() =
let order = ref ""
let actual =
{ C = let _ = order := !order + "1" in 3
B = let _ = order := !order + "2" in 2
A = let _ = order := !order + "3" in 1 }

Assert.AreEqual(expected, actual)
Assert.AreEqual("123", !order)


type RecordWithDifferentTypes =
{ A : int
B : string
C : float
D : RecordWithInts }

[<TestFixture>]
type RecordInitialisationWithDifferentTxpes() =

let expected =
{ A = 1
B = "2"
C = 3.0
D =
{ A = 4
B = 5
C = 6 }}

[<Test>]
member this.ShouldInitialzeInGivenOrder1() =
let order = ref ""
let actual =
{ A = let _ = order := !order + "1" in 1
B = let _ = order := !order + "2" in "2"
C = let _ = order := !order + "3" in 3.0
D = let _ = order := !order + "4" in
{ A = let _ = order := !order + "5" in 4
B = let _ = order := !order + "6" in 5
C = let _ = order := !order + "7" in 6 } }

Assert.AreEqual(expected, actual)
Assert.AreEqual("1234567", !order)

[<Test>]
member this.ShouldInitialzeInGivenOrder2() =
let order = ref ""
let actual =
{ A = let _ = order := !order + "1" in 1
C = let _ = order := !order + "2" in 3.0
D = let _ = order := !order + "3" in
{ A = let _ = order := !order + "4" in 4
B = let _ = order := !order + "5" in 5
C = let _ = order := !order + "6" in 6 }

B = let _ = order := !order + "7" in "2" }

Assert.AreEqual(expected, actual)
Assert.AreEqual("1234567", !order)

[<Test>]
member this.ShouldInitialzeInGivenOrder3() =
let order = ref ""
let actual =
{ A = let _ = order := !order + "1" in 1
C = let _ = order := !order + "2" in 3.0
B = let _ = order := !order + "3" in "2"
D = let _ = order := !order + "4" in
{ A = let _ = order := !order + "5" in 4
B = let _ = order := !order + "6" in 5
C = let _ = order := !order + "7" in 6 } }

Assert.AreEqual(expected, actual)
Assert.AreEqual("1234567", !order)


[<Test>]
member this.ShouldInitialzeInGivenOrder4() =
let order = ref ""
let actual =
{ B = let _ = order := !order + "1" in "2"
A = let _ = order := !order + "2" in 1
C = let _ = order := !order + "3" in 3.0
D = let _ = order := !order + "4" in
{ A = let _ = order := !order + "5" in 4
B = let _ = order := !order + "6" in 5
C = let _ = order := !order + "7" in 6 } }

Assert.AreEqual(expected, actual)
Assert.AreEqual("1234567", !order)

[<Test>]
member this.ShouldInitialzeInGivenOrder5() =
let order = ref ""
let actual =
{ D = let _ = order := !order + "1" in
{ A = let _ = order := !order + "2" in 4
B = let _ = order := !order + "3" in 5
C = let _ = order := !order + "4" in 6 }
B = let _ = order := !order + "5" in "2"
C = let _ = order := !order + "6" in 3.0
A = let _ = order := !order + "7" in 1 }

Assert.AreEqual(expected, actual)
Assert.AreEqual("1234567", !order)

[<Test>]
member this.ShouldInitialzeInGivenOrder6() =
let order = ref ""
let actual =
{ D = let _ = order := !order + "1" in
{ A = let _ = order := !order + "2" in 4
B = let _ = order := !order + "3" in 5
C = let _ = order := !order + "4" in 6 }
A = let _ = order := !order + "5" in 1
B = let _ = order := !order + "6" in "2"
C = let _ = order := !order + "7" in 3.0 }

Assert.AreEqual(expected, actual)
Assert.AreEqual("1234567", !order)
2 changes: 1 addition & 1 deletion src/fsharp/tastops.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5834,7 +5834,7 @@ let permuteExpr (sigma:int[]) (expr: Expr[]) (typ: TType[]) (names:string[]) =
existsR 0 (i' - 1) (fun j' -> invSigma.[j'] > i)

let rewrite i rbinds (xi:Expr) =
if liftPosition i then
if true || liftPosition i then
let tmpv,tmpe = mkCompGenLocal xi.Range names.[i] typ.[i]
let bind = mkCompGenBind tmpv xi
bind :: rbinds,tmpe
Expand Down