Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/dist/inductive/list.jl
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ end

function one_of(l::List{T})::Opt.T{T} where T <: Dist
match(l, [
:Nil => () -> Opt.None(T),
:Nil => () -> Opt.OptNone(T),
:Cons => (x, xs) -> @alea_ite if flip_reciprocal(length(l))
Opt.Some(T, x)
Opt.OptSome(T, x)
else
one_of(xs)
end
Expand Down
12 changes: 5 additions & 7 deletions src/dist/inductive/option.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,19 @@ export Opt

module Opt
using Alea
@type T{A} = None() | Some(A)

Some(x) = Some(typeof(x), x)
@type T{A} = OptNone() | OptSome(A)

function bind(f, T, x::Opt.T)
@match x [
None() -> None(T),
Some(x) -> f(x)
OptNone() -> OptNone(T),
OptSome(x) -> f(x)
]
end

function map(f, T, x::Opt.T)
@match x [
None() -> None(T),
Some(x) -> Some(T, f(x))
OptNone() -> OptNone(T),
OptSome(x) -> OptSome(T, f(x))
]
end
end