Skip to content

Commit

Permalink
fix build part1
Browse files Browse the repository at this point in the history
  • Loading branch information
@edgarfgp
edgarfgp committed Sep 22, 2024
1 parent 4d45b1a commit 9c05432
Show file tree
Hide file tree
Showing 9 changed files with 89 additions and 89 deletions.
6 changes: 3 additions & 3 deletions tests/FSharp.Compiler.Service.Tests/PatternMatchCompilationTests.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ let r as _ = 10
let s as Id0 = 11
let t as (u) = 12
let v as struct(w, x) = 13, 14
let y as z : int = 15{set { 'a'..'x' } - set [ 'p'; 'v' ] |> Set.map (sprintf " + %c") |> System.String.Concat}
let y as z : int = 15{set (seq { 'a'..'x' }) - set [ 'p'; 'v' ] |> Set.map (sprintf " + %c") |> System.String.Concat}
Some p |> eq<AAA>
Some v |> eq<struct(int * int)>
()
Expand Down Expand Up @@ -590,7 +590,7 @@ let _ as r = 10
let Id0 as s = 11
let (t) as u = 12
let struct(w, v) as x = 13, 14
let (y : int) as z = 15{set { 'a'..'v' } - set [ 'h'; 'q' ] |> Set.map (sprintf " + %c") |> System.String.Concat}
let (y : int) as z = 15{set (seq { 'a'..'v' }) - set [ 'h'; 'q' ] |> Set.map (sprintf " + %c") |> System.String.Concat}
Some h |> eq<int * int>
Some q |> eq<AAA>
Some x |> eq<struct(int * int)>
Expand Down Expand Up @@ -917,7 +917,7 @@ let :? z as

[<FactForNETCOREAPP>]
let ``As 16 - syntactical precedence matrix testing left with type tests - total patterns`` () =
let validSet = set { 'a'..'x' } - set [ 'p'; 'q' ] |> Set.map string
let validSet = set (seq { 'a'..'x' }) - set [ 'p'; 'q' ] |> Set.map string
let _, checkResults = getParseAndCheckResults70 $"""
let eq<'T> (x:'T option) = () // FS-1093-safe type assert function
let (|Id0|) = ignore
Expand Down
4 changes: 2 additions & 2 deletions tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ type ArrayModule() =
[<Fact>]
member _.Except() =
// integer array
let intArr1 = [| yield! {1..100}
yield! {1..100} |]
let intArr1 = [| yield! seq {1..100}
yield! seq {1..100} |]
let intArr2 = [| 1 .. 10 |]
let expectedIntArr = [| 11 .. 100 |]

Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ArrayModule2.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ type ArrayModule2() =
[<Fact>]
member this.Of_Seq() =
// integer array
let resultInt = Array.ofSeq {1..10}
let resultInt = Array.ofSeq (seq {1..10})
if resultInt <> [|1..10|] then Assert.Fail()

// string array
Expand Down
4 changes: 2 additions & 2 deletions tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ type ListModule() =
[<Fact>]
member _.Except() =
// integer list
let intList1 = [ yield! {1..100}
yield! {1..100} ]
let intList1 = [ yield! seq {1..100}
yield! seq {1..100} ]
let intList2 = [1..10]
let expectedIntList = [11..100]

Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/ListModule2.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ type ListModule02() =
[<Fact>]
member this.Of_Seq() =
// integer List
let resultInt = List.ofSeq {1..10}
let resultInt = List.ofSeq (seq {1..10})
Assert.AreEqual([1..10], resultInt)

// string List
Expand Down
34 changes: 17 additions & 17 deletions tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ type SeqModule() =

// empty Seq
VerifySeqsEqual Seq.empty <| Seq.allPairs Seq.empty Seq.empty
VerifySeqsEqual Seq.empty <| Seq.allPairs { 1..7 } Seq.empty
VerifySeqsEqual Seq.empty <| Seq.allPairs Seq.empty { 1..7 }
VerifySeqsEqual Seq.empty <| Seq.allPairs (seq { 1..7 }) Seq.empty
VerifySeqsEqual Seq.empty <| Seq.allPairs Seq.empty (seq { 1..7 })

// null Seq
CheckThrowsArgumentNullException(fun() -> Seq.allPairs null null |> ignore)
Expand Down Expand Up @@ -349,9 +349,9 @@ type SeqModule() =
|> Seq.iter ((<||) VerifySeqsEqual)

// int Seq
verify [[1..4];[5..8]] <| Seq.chunkBySize 4 {1..8}
verify [[1..4];[5..8];[9..10]] <| Seq.chunkBySize 4 {1..10}
verify [[1]; [2]; [3]; [4]] <| Seq.chunkBySize 1 {1..4}
verify [[1..4];[5..8]] <| Seq.chunkBySize 4 (seq {1..8})
verify [[1..4];[5..8];[9..10]] <| Seq.chunkBySize 4 (seq {1..10})
verify [[1]; [2]; [3]; [4]] <| Seq.chunkBySize 1 (seq {1..4})

Seq.chunkBySize 2 (Seq.initInfinite id)
|> Seq.take 3
Expand All @@ -372,8 +372,8 @@ type SeqModule() =
CheckThrowsArgumentNullException (fun () -> Seq.chunkBySize 3 nullSeq |> ignore)

// invalidArg
CheckThrowsArgumentException (fun () -> Seq.chunkBySize 0 {1..10} |> ignore)
CheckThrowsArgumentException (fun () -> Seq.chunkBySize -1 {1..10} |> ignore)
CheckThrowsArgumentException (fun () -> Seq.chunkBySize 0 (seq {1..10}) |> ignore)
CheckThrowsArgumentException (fun () -> Seq.chunkBySize -1 (seq {1..10}) |> ignore)

()

Expand All @@ -385,12 +385,12 @@ type SeqModule() =
|> Seq.iter ((<||) VerifySeqsEqual)

// int Seq
Seq.splitInto 3 {1..10} |> verify (seq [ {1..4}; {5..7}; {8..10} ])
Seq.splitInto 3 {1..11} |> verify (seq [ {1..4}; {5..8}; {9..11} ])
Seq.splitInto 3 {1..12} |> verify (seq [ {1..4}; {5..8}; {9..12} ])
Seq.splitInto 3 (seq {1..10}) |> verify (seq [ seq {1..4}; seq {5..7}; seq {8..10} ])
Seq.splitInto 3 (seq {1..11}) |> verify (seq [ seq {1..4}; seq {5..8}; seq {9..11} ])
Seq.splitInto 3 (seq {1..12}) |> verify (seq [ seq {1..4}; seq {5..8}; seq {9..12} ])

Seq.splitInto 4 {1..5} |> verify (seq [ [1..2]; [3]; [4]; [5] ])
Seq.splitInto 20 {1..4} |> verify (seq [ [1]; [2]; [3]; [4] ])
Seq.splitInto 4 (seq {1..5}) |> verify (seq [ [1..2]; [3]; [4]; [5] ])
Seq.splitInto 20 (seq {1..4}) |> verify (seq [ [1]; [2]; [3]; [4] ])

// string Seq
Seq.splitInto 3 ["a";"b";"c";"d";"e"] |> verify ([ ["a"; "b"]; ["c";"d"]; ["e"] ])
Expand Down Expand Up @@ -586,10 +586,10 @@ type SeqModule() =
[<Fact>]
member _.Except() =
// integer Seq
let intSeq1 = seq { yield! {1..100}
yield! {1..100} }
let intSeq2 = {1..10}
let expectedIntSeq = {11..100}
let intSeq1 = seq { yield! seq {1..100}
yield! seq {1..100} }
let intSeq2 = seq {1..10}
let expectedIntSeq = seq {11..100}

VerifySeqsEqual expectedIntSeq <| Seq.except intSeq2 intSeq1

Expand All @@ -609,7 +609,7 @@ type SeqModule() =

// empty Seq
let emptyIntSeq = Seq.empty<int>
VerifySeqsEqual {1..100} <| Seq.except emptyIntSeq intSeq1
VerifySeqsEqual (seq {1..100}) <| Seq.except emptyIntSeq intSeq1
VerifySeqsEqual emptyIntSeq <| Seq.except intSeq1 emptyIntSeq
VerifySeqsEqual emptyIntSeq <| Seq.except emptyIntSeq emptyIntSeq
VerifySeqsEqual emptyIntSeq <| Seq.except intSeq1 intSeq1
Expand Down
32 changes: 16 additions & 16 deletions tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Collections/SeqModule2.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ type SeqModule2() =
member _.Length() =

// integer seq
let resultInt = Seq.length {1..8}
let resultInt = Seq.length (seq {1..8})
if resultInt <> 8 then Assert.Fail()

// string Seq
Expand All @@ -505,7 +505,7 @@ type SeqModule2() =
| _ when x % 2 = 0 -> 10*x
| _ -> x

let resultInt = Seq.map funcInt { 1..10 }
let resultInt = Seq.map funcInt (seq { 1..10 })
let expectedint = seq [1;20;3;40;5;60;7;80;9;100]

VerifySeqsEqual expectedint resultInt
Expand All @@ -531,7 +531,7 @@ type SeqModule2() =
member _.Map2() =
// integer Seq
let funcInt x y = x+y
let resultInt = Seq.map2 funcInt { 1..10 } {2..2..20}
let resultInt = Seq.map2 funcInt (seq { 1..10 }) (seq {2..2..20})
let expectedint = seq [3;6;9;12;15;18;21;24;27;30]

VerifySeqsEqual expectedint resultInt
Expand All @@ -558,16 +558,16 @@ type SeqModule2() =
member _.Map3() =
// Integer seq
let funcInt a b c = (a + b) * c
let resultInt = Seq.map3 funcInt { 1..8 } { 2..9 } { 3..10 }
let resultInt = Seq.map3 funcInt (seq { 1..8 }) (seq { 2..9 }) (seq { 3..10 })
let expectedInt = seq [9; 20; 35; 54; 77; 104; 135; 170]
VerifySeqsEqual expectedInt resultInt

// First seq is shorter
VerifySeqsEqual (seq [9; 20]) (Seq.map3 funcInt { 1..2 } { 2..9 } { 3..10 })
VerifySeqsEqual (seq [9; 20]) (Seq.map3 funcInt (seq { 1..2 }) (seq { 2..9 }) (seq { 3..10 }))
// Second seq is shorter
VerifySeqsEqual (seq [9; 20; 35]) (Seq.map3 funcInt { 1..8 } { 2..4 } { 3..10 })
VerifySeqsEqual (seq [9; 20; 35]) (Seq.map3 funcInt (seq { 1..8 }) (seq { 2..4 }) (seq { 3..10 }))
// Third seq is shorter
VerifySeqsEqual (seq [9; 20; 35; 54]) (Seq.map3 funcInt { 1..8 } { 2..6 } { 3..6 })
VerifySeqsEqual (seq [9; 20; 35; 54]) (Seq.map3 funcInt (seq { 1..8 }) (seq { 2..6 }) (seq { 3..6 }))

// String seq
let funcStr a b c = a + b + c
Expand Down Expand Up @@ -812,7 +812,7 @@ type SeqModule2() =
member _.Collect() =
// integer Seq
let funcInt x = seq [x+1]
let resultInt = Seq.collect funcInt { 1..10 }
let resultInt = Seq.collect funcInt (seq { 1..10 })

let expectedint = seq {2..11}

Expand Down Expand Up @@ -843,7 +843,7 @@ type SeqModule2() =

// integer Seq
let funcInt x y = x+y
let resultInt = Seq.mapi funcInt { 10..2..20 }
let resultInt = Seq.mapi funcInt (seq { 10..2..20 })
let expectedint = seq [10;13;16;19;22;25]

VerifySeqsEqual expectedint resultInt
Expand Down Expand Up @@ -871,7 +871,7 @@ type SeqModule2() =
member _.Mapi2() =
// integer Seq
let funcInt x y z = x+y+z
let resultInt = Seq.mapi2 funcInt { 1..10 } {2..2..20}
let resultInt = Seq.mapi2 funcInt (seq { 1..10 }) (seq {2..2..20})
let expectedint = seq [3;7;11;15;19;23;27;31;35;39]

VerifySeqsEqual expectedint resultInt
Expand Down Expand Up @@ -907,7 +907,7 @@ type SeqModule2() =
member _.Indexed() =

// integer Seq
let resultInt = Seq.indexed { 10..2..20 }
let resultInt = Seq.indexed (seq { 10..2..20 })
let expectedint = seq [(0,10);(1,12);(2,14);(3,16);(4,18);(5,20)]

VerifySeqsEqual expectedint resultInt
Expand All @@ -931,7 +931,7 @@ type SeqModule2() =
[<Fact>]
member _.Max() =
// integer Seq
let resultInt = Seq.max { 10..20 }
let resultInt = Seq.max (seq { 10..20 })

Assert.AreEqual(20,resultInt)

Expand All @@ -954,7 +954,7 @@ type SeqModule2() =

// integer Seq
let funcInt x = x % 8
let resultInt = Seq.maxBy funcInt { 2..2..20 }
let resultInt = Seq.maxBy funcInt (seq { 2..2..20 })
Assert.AreEqual(6,resultInt)

// string Seq
Expand All @@ -976,7 +976,7 @@ type SeqModule2() =

// integer Seq
let funcInt x = x % 8
let resultInt = Seq.minBy funcInt { 2..2..20 }
let resultInt = Seq.minBy funcInt (seq { 2..2..20 })
Assert.AreEqual(8,resultInt)

// string Seq
Expand All @@ -998,7 +998,7 @@ type SeqModule2() =
member _.Min() =

// integer Seq
let resultInt = Seq.min { 10..20 }
let resultInt = Seq.min (seq { 10..20 })
Assert.AreEqual(10,resultInt)

// string Seq
Expand All @@ -1017,7 +1017,7 @@ type SeqModule2() =
[<Fact>]
member _.Item() =
// integer Seq
let resultInt = Seq.item 3 { 10..20 }
let resultInt = Seq.item 3 (seq { 10..20 })
Assert.AreEqual(13, resultInt)

// string Seq
Expand Down
Loading

0 comments on commit 9c05432

Please sign in to comment.