diff options
Diffstat (limited to 'stdlib/source/lux/math')
| -rw-r--r-- | stdlib/source/lux/math/infix.lux | 24 | ||||
| -rw-r--r-- | stdlib/source/lux/math/logic/continuous.lux | 6 | ||||
| -rw-r--r-- | stdlib/source/lux/math/modular.lux | 18 | ||||
| -rw-r--r-- | stdlib/source/lux/math/random.lux | 8 |
4 files changed, 28 insertions, 28 deletions
diff --git a/stdlib/source/lux/math/infix.lux b/stdlib/source/lux/math/infix.lux index 3b4b89da2..e2cfc455c 100644 --- a/stdlib/source/lux/math/infix.lux +++ b/stdlib/source/lux/math/infix.lux @@ -2,11 +2,11 @@ [lux #* [control monad - ["p" parser ("#/." functor)]] + ["p" parser ("#;." functor)]] [data ["." product] [collection - ["." list ("#/." fold)]]] + ["." list ("#;." fold)]]] [macro ["s" syntax (#+ syntax: Syntax)] ["." code]]]) @@ -22,14 +22,14 @@ (<| p.rec (function (_ infix^)) ($_ p.or ($_ p.either - (p/map code.bit s.bit) - (p/map code.nat s.nat) - (p/map code.int s.int) - (p/map code.rev s.rev) - (p/map code.frac s.frac) - (p/map code.text s.text) - (p/map code.identifier s.identifier) - (p/map code.tag s.tag)) + (p;map code.bit s.bit) + (p;map code.nat s.nat) + (p;map code.int s.int) + (p;map code.rev s.rev) + (p;map code.frac s.frac) + (p;map code.text s.text) + (p;map code.identifier s.identifier) + (p;map code.tag s.tag)) (s.form (p.many s.any)) (s.tuple (p.and s.any infix^)) (s.tuple ($_ p.either @@ -39,7 +39,7 @@ init-op s.any init-param infix^ steps (p.some (p.and s.any infix^))] - (wrap (product.right (list/fold (function (_ [op param] [subject [_subject _op _param]]) + (wrap (product.right (list;fold (function (_ [op param] [subject [_subject _op _param]]) [param [(#Binary _subject _op _param) (` and) (#Binary subject op param)]]) @@ -50,7 +50,7 @@ init-op s.any init-param infix^ steps (p.some (p.and s.any infix^))] - (wrap (list/fold (function (_ [op param] [_subject _op _param]) + (wrap (list;fold (function (_ [op param] [_subject _op _param]) [(#Binary _subject _op _param) op param]) [init-subject init-op init-param] steps))) diff --git a/stdlib/source/lux/math/logic/continuous.lux b/stdlib/source/lux/math/logic/continuous.lux index 3e6ea581b..33b93f9ae 100644 --- a/stdlib/source/lux/math/logic/continuous.lux +++ b/stdlib/source/lux/math/logic/continuous.lux @@ -2,10 +2,10 @@ [lux (#- false true or and not) [data [number - ["." rev ("#/." interval)]]]]) + ["." rev ("#;." interval)]]]]) -(def: #export true Rev rev/top) -(def: #export false Rev rev/bottom) +(def: #export true Rev rev;top) +(def: #export false Rev rev;bottom) (do-template [<name> <chooser>] [(def: #export <name> diff --git a/stdlib/source/lux/math/modular.lux b/stdlib/source/lux/math/modular.lux index 2d33e0c9d..313255d82 100644 --- a/stdlib/source/lux/math/modular.lux +++ b/stdlib/source/lux/math/modular.lux @@ -8,8 +8,8 @@ [data ["." error (#+ Error)] [number - ["." int ("#/." decimal)]] - ["." text ("#/." monoid) + ["." int ("#;." decimal)]] + ["." text ("#;." monoid) ["l" lexer (#+ Lexer)]]] [type abstract] @@ -38,13 +38,13 @@ (exception: #export [m] (incorrect-modulus {modulus (Modulus m)} {parsed Int}) - (ex.report ["Expected" (int/encode (to-int modulus))] - ["Actual" (int/encode parsed)])) + (ex.report ["Expected" (int;encode (to-int modulus))] + ["Actual" (int;encode parsed)])) (exception: #export [rm sm] (cannot-equalize-moduli {reference (Modulus rm)} {sample (Modulus sm)}) - (ex.report ["Reference" (int/encode (to-int reference))] - ["Sample" (int/encode (to-int sample))])) + (ex.report ["Reference" (int;encode (to-int reference))] + ["Sample" (int;encode (to-int sample))])) (def: #export (congruent? modulus reference sample) (All [m] (-> (Modulus m) Int Int Bit)) @@ -90,10 +90,10 @@ (def: (encode modular) (let [[remainder modulus] (:representation modular)] - ($_ text/compose - (int/encode remainder) + ($_ text;compose + (int;encode remainder) separator - (int/encode (to-int modulus))))) + (int;encode (to-int modulus))))) (def: (decode text) (<| (l.run text) diff --git a/stdlib/source/lux/math/random.lux b/stdlib/source/lux/math/random.lux index 1d0d03b8e..24fa17dbe 100644 --- a/stdlib/source/lux/math/random.lux +++ b/stdlib/source/lux/math/random.lux @@ -13,10 +13,10 @@ ["r" ratio] ["c" complex] ["." frac]] - ["." text (#+ Char) ("#/." monoid) + ["." text (#+ Char) ("#;." monoid) ["." unicode (#+ Segment)]] [collection - ["." list ("#/." fold)] + ["." list ("#;." fold)] ["." array (#+ Array)] ["." dictionary (#+ Dictionary)] ["." queue (#+ Queue)] @@ -134,7 +134,7 @@ (do ..monad [x char-gen xs (text char-gen (dec size))] - (wrap (text/compose (text.from-code x) xs))))) + (wrap (text;compose (text.from-code x) xs))))) (do-template [<name> <set>] [(def: #export <name> @@ -230,7 +230,7 @@ [array Array array.from-list] [queue Queue queue.from-list] - [stack Stack (list/fold stack.push stack.empty)] + [stack Stack (list;fold stack.push stack.empty)] ) (def: #export (set Hash<a> size value-gen) |