diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/lux/type/unit.lux | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/stdlib/source/lux/type/unit.lux b/stdlib/source/lux/type/unit.lux index d6cd4ac6b..3aece5ff1 100644 --- a/stdlib/source/lux/type/unit.lux +++ b/stdlib/source/lux/type/unit.lux @@ -2,7 +2,7 @@ (.module: [lux #* [control - [monad (#+ do Monad)] + [monad (#+ Monad do)] ["p" parser] [equivalence (#+ Equivalence)] [order (#+ Order)] @@ -83,7 +83,7 @@ (def: ratio^ (s.Syntax r.Ratio) - (s.tuple (do p.Monad<Parser> + (s.tuple (do p.monad [numerator s.int _ (p.assert (format "Numerator must be positive: " (%i numerator)) (i/> +0 numerator)) @@ -164,12 +164,12 @@ (unit: #export Litre) (unit: #export Second) -(structure: #export Equivalence<Unit> (All [unit] (Equivalence (Qty unit))) +(structure: #export equivalence (All [unit] (Equivalence (Qty unit))) (def: (= reference sample) (i/= (out reference) (out sample)))) -(`` (structure: #export Order<Unit> (All [unit] (Order (Qty unit))) - (def: eq Equivalence<Unit>) +(`` (structure: #export order (All [unit] (Order (Qty unit))) + (def: &equivalence ..equivalence) (~~ (do-template [<name> <func>] [(def: (<name> reference sample) @@ -180,7 +180,7 @@ [> i/>] [>= i/>=])))) -(structure: #export Enum<Unit> (All [unit] (Enum (Qty unit))) - (def: order Order<Unit>) +(structure: #export enum (All [unit] (Enum (Qty unit))) + (def: &order ..order) (def: succ (|>> ..out inc ..in)) (def: pred (|>> ..out dec ..in))) |