Skip to content

Evaluate traverse left to right #418

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 15 commits into from
Feb 23, 2021
Merged

Evaluate traverse left to right #418

Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
77e3f2e
Traverse lists evaluating left to right
Jan 7, 2021
7bf3827
Traverse arrays left-to-right
Jan 8, 2021
d2c53de
Traverse map left to right
Jan 8, 2021
5f516ac
Simplify list traversal
Jan 8, 2021
578d5e4
Remove unused Traverse overloads
Jan 8, 2021
af58e31
Try remove optimization
gusty Feb 21, 2021
b074005
Revert #578d5e41
gusty Feb 21, 2021
f529239
Remove 2nd optimization
gusty Feb 21, 2021
9a19623
Revert Map
gusty Feb 21, 2021
5136030
fix previous
gusty Feb 21, 2021
4a63588
Revert Array
gusty Feb 21, 2021
7d5e75b
Back to first commit, without optimization
gusty Feb 21, 2021
e0b1bbb
Restore fix for Map
gusty Feb 22, 2021
82d4c2f
Restore array but as self contained
gusty Feb 22, 2021
9766da8
+Traversable order tests
wallymathieu Feb 22, 2021
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
25 changes: 18 additions & 7 deletions src/FSharpPlus/Control/Traversable.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ type Traverse =
static member inline Traverse (t: option<_>, f, [<Optional>]_output: 'R, [<Optional>]_impl: Traverse) : 'R = match t with Some x -> Map.Invoke Some (f x) | _ -> result None

static member inline Traverse (t:Map<_,_> , f, [<Optional>]_output: 'R, [<Optional>]_impl: Traverse) : 'R =
let insert_f k x ys = Map.Invoke (Map.add k) (f x) <*> ys
Map.foldBack insert_f t (result Map.empty)
let insert_f m k v = Map.Invoke (Map.add k) v <*> m
Map.fold insert_f (result Map.empty) (Map.mapValues f t)

static member inline Traverse (t: Result<'T,'Error>, f: 'T->'``Functor<'U>``, [<Optional>]_output: '``Functor<Result<'U,'Error>>``, [<Optional>]_impl: Traverse) : '``Functor<Result<'U,'Error>>`` =
match t with
Expand All @@ -95,13 +95,24 @@ type Traverse =
| Choice2Of2 e -> Return.Invoke (Choice<'U,'Error>.Choice2Of2 e)

static member inline Traverse (t:list<_> ,f , [<Optional>]_output: 'R, [<Optional>]_impl: Traverse) : 'R =
let cons_f x ys = Map.Invoke List.cons (f x) <*> ys
List.foldBack cons_f t (result [])
let rec loop acc = function
| [] -> acc
| x::xs ->
let v = f x
loop (v::acc) xs
let cons_f x xs = Map.Invoke List.cons xs <*> x
List.fold cons_f (result []) (loop [] t)

static member inline Traverse (t:_ [] ,f , [<Optional>]_output: 'R, [<Optional>]_impl: Traverse) : 'R =
let cons x y = Array.append [|x|] y
let cons_f x ys = Map.Invoke cons (f x) <*> ys
Array.foldBack cons_f t (result [||])
let cons x y = Array.append [|x|] y
let rec loop acc = function
| [||] -> acc
| xxs ->
let x, xs = Array.head xxs, Array.tail xxs
let v = f x
loop (cons v acc) xs
let cons_f x xs = Map.Invoke cons xs <*> x
Array.fold cons_f (result [||]) (loop [||] t)

static member inline Invoke (f: 'T->'``Functor<'U>``) (t: '``Traversable<'T>``) : '``Functor<'Traversable<'U>>`` =
let inline call_3 (a: ^a, b: ^b, c: ^c, f) = ((^a or ^b or ^c) : (static member Traverse : _*_*_*_ -> _) b, f, c, a)
Expand Down