diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/library/lux/type/unit.lux | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/stdlib/source/library/lux/type/unit.lux b/stdlib/source/library/lux/type/unit.lux index e7327e551..994e7ad11 100644 --- a/stdlib/source/library/lux/type/unit.lux +++ b/stdlib/source/library/lux/type/unit.lux @@ -15,25 +15,25 @@ ["[0]" // (.only) [primitive (.except)]]) -(primitive .public (Qty scale unit) +(primitive .public (Measure scale unit) Int - (def .public quantity - (All (_ scale unit) (-> Int (Qty scale unit))) + (def .public measure + (All (_ scale unit) (-> Int (Measure scale unit))) (|>> abstraction)) (def .public number - (All (_ scale unit) (-> (Qty scale unit) Int)) + (All (_ scale unit) (-> (Measure scale unit) Int)) (|>> representation)) (def .public equivalence - (All (_ scale unit) (Equivalence (Qty scale unit))) + (All (_ scale unit) (Equivalence (Measure scale unit))) (implementation (def (= reference sample) (i.= (representation reference) (representation sample))))) (def .public order - (All (_ scale unit) (Order (Qty scale unit))) + (All (_ scale unit) (Order (Measure scale unit))) (implementation (def equivalence ..equivalence) @@ -41,7 +41,7 @@ (i.< (representation reference) (representation sample))))) (def .public enum - (All (_ scale unit) (Enum (Qty scale unit))) + (All (_ scale unit) (Enum (Measure scale unit))) (implementation (def order ..order) (def succ (|>> representation ++ abstraction)) @@ -49,7 +49,7 @@ (with_template [<name> <op>] [(def .public (<name> param subject) - (All (_ scale unit) (-> (Qty scale unit) (Qty scale unit) (Qty scale unit))) + (All (_ scale unit) (-> (Measure scale unit) (Measure scale unit) (Measure scale unit))) (abstraction (<op> (representation param) (representation subject))))] @@ -59,7 +59,7 @@ (with_template [<name> <op> <p> <s> <p*s>] [(def .public (<name> param subject) - (All (_ scale p s) (-> (Qty scale <p>) (Qty scale <s>) (Qty scale <p*s>))) + (All (_ scale p s) (-> (Measure scale <p>) (Measure scale <s>) (Measure scale <p*s>))) (abstraction (<op> (representation param) (representation subject))))] @@ -69,15 +69,15 @@ (.type .public (Unit a) (Interface - (is (-> Int (Qty Any a)) + (is (-> Int (Measure Any a)) in) - (is (-> (Qty Any a) Int) + (is (-> (Measure Any a) Int) out))) (def .public (unit _) (Ex (_ a) (-> Any (Unit a))) (implementation - (def in ..quantity) + (def in ..measure) (def out ..number))) ) |