diff options
176 files changed, 508 insertions, 497 deletions
diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux index e0717c88c..9d3ca2032 100644 --- a/stdlib/source/lux.lux +++ b/stdlib/source/lux.lux @@ -4850,9 +4850,10 @@ _ (fail "Wrong syntax for refer"))) -(def: (refer-to-code module-name [r-defs r-opens]) - (-> Text Refer Code) - (let [localizations (: (List Code) +(def: (refer-to-code module-name module-alias' [r-defs r-opens]) + (-> Text (Maybe Text) Refer Code) + (let [module-alias (..default module-name module-alias') + localizations (: (List Code) (case r-defs #All (list (' #*)) @@ -4866,7 +4867,8 @@ #Nothing (list))) openings (list/map (function (_ [alias structs]) - (form$ (list& (text$ alias) (list/map local-identifier$ structs)))) + (form$ (list& (text$ (..replace-all "#" module-alias alias)) + (list/map local-identifier$ structs)))) r-opens)] (` (..refer (~ (text$ module-name)) (~+ localizations) @@ -4906,7 +4908,7 @@ imports) =refers (list/map (: (-> Importation Code) (function (_ [m-name m-alias =refer]) - (refer-to-code m-name =refer))) + (refer-to-code m-name m-alias =refer))) imports) =meta (process-def-meta (list& [(` #.imports) (` [(~+ =imports)])] _meta)) diff --git a/stdlib/source/lux/cli.lux b/stdlib/source/lux/cli.lux index b6c6693ee..e590700bc 100644 --- a/stdlib/source/lux/cli.lux +++ b/stdlib/source/lux/cli.lux @@ -7,8 +7,8 @@ ["." process]]] [data [collection - [list ("list/." monoid monad)]] - ["." text ("text/." equivalence) + ["." list ("#/." monoid monad)]] + ["." text ("#/." equivalence) format] ["." error (#+ Error)]] [macro (#+ with-gensyms) diff --git a/stdlib/source/lux/control/comonad.lux b/stdlib/source/lux/control/comonad.lux index 980935216..10171d0ae 100644 --- a/stdlib/source/lux/control/comonad.lux +++ b/stdlib/source/lux/control/comonad.lux @@ -2,7 +2,7 @@ [lux #* [data [collection - ["." list ("list/." fold)]]]] + ["." list ("#/." fold)]]]] [// ["." functor (#+ Functor)]]) diff --git a/stdlib/source/lux/control/concatenative.lux b/stdlib/source/lux/control/concatenative.lux index 1a628b88a..5806ec898 100644 --- a/stdlib/source/lux/control/concatenative.lux +++ b/stdlib/source/lux/control/concatenative.lux @@ -5,14 +5,14 @@ r/+ r/- r/* r// r/% r/= r/< r/<= r/> r/>= f/+ f/- f/* f// f/% f/= f/< f/<= f/> f/>=) [control - ["p" parser ("parser/." monad)] + ["p" parser ("#/." monad)] ["." monad]] [data ["." text format] - ["." maybe ("maybe/." monad)] + ["." maybe ("#/." monad)] [collection - ["." list ("list/." fold functor)]]] + ["." list ("#/." fold functor)]]] ["." macro (#+ with-gensyms) ["." code] ["s" syntax (#+ syntax:)] @@ -44,8 +44,8 @@ (s.Syntax Stack) (p.either (p.and (p.maybe bottom^) (s.tuple (p.some s.any))) - (p.and (|> bottom^ (parser/map (|>> #.Some))) - (parser/wrap (list))))) + (p.and (|> bottom^ (p/map (|>> #.Some))) + (p/wrap (list))))) (def: (stack-fold tops bottom) (-> (List Code) Code Code) diff --git a/stdlib/source/lux/control/concurrency/actor.lux b/stdlib/source/lux/control/concurrency/actor.lux index 3e288ca42..6707a6c4d 100644 --- a/stdlib/source/lux/control/concurrency/actor.lux +++ b/stdlib/source/lux/control/concurrency/actor.lux @@ -3,14 +3,14 @@ [control monad ["p" parser] ["ex" exception (#+ exception:)]] - ["." io ("io/." monad)] + ["." io ("#/." monad)] [data ["." product] ["e" error] [text format] [collection - ["." list ("list/." monoid monad fold)]]] + ["." list ("#/." monoid monad fold)]]] ["." macro (#+ with-gensyms monad) ["." code] ["s" syntax (#+ syntax: Syntax)] @@ -23,7 +23,7 @@ abstract]] [// ["." atom (#+ Atom atom)] - ["." promise (#+ Promise Resolver) ("promise/." monad)] + ["." promise (#+ Promise Resolver) ("#/." monad)] ["." task (#+ Task)]]) (exception: #export poisoned) diff --git a/stdlib/source/lux/control/concurrency/frp.lux b/stdlib/source/lux/control/concurrency/frp.lux index 5412e5342..52c59f7a4 100644 --- a/stdlib/source/lux/control/concurrency/frp.lux +++ b/stdlib/source/lux/control/concurrency/frp.lux @@ -9,15 +9,15 @@ ["." monad (#+ Monad do)] ["ex" exception (#+ exception:)]] [data - [maybe ("maybe/." functor)] + ["." maybe ("#/." functor)] ["." error (#+ Error)] [collection - [list ("list/." monoid)]]] + ["." list ("#/." monoid)]]] [type (#+ :share) abstract]] [// ["." atom (#+ Atom)] - ["." promise (#+ Promise) ("promise/." functor)]]) + ["." promise (#+ Promise) ("#/." functor)]]) (type: #export (Channel a) {#.doc "An asynchronous channel to distribute values."} diff --git a/stdlib/source/lux/control/concurrency/stm.lux b/stdlib/source/lux/control/concurrency/stm.lux index 5bb537025..8b26eb699 100644 --- a/stdlib/source/lux/control/concurrency/stm.lux +++ b/stdlib/source/lux/control/concurrency/stm.lux @@ -15,7 +15,7 @@ [// ["." atom (#+ Atom atom)] ["." promise (#+ Promise Resolver)] - ["." frp ("frp/." functor)]]) + ["." frp ("#/." functor)]]) (type: #export (Observer a) (-> a (IO Any))) diff --git a/stdlib/source/lux/control/exception.lux b/stdlib/source/lux/control/exception.lux index bac945de2..f5d0721e9 100644 --- a/stdlib/source/lux/control/exception.lux +++ b/stdlib/source/lux/control/exception.lux @@ -7,9 +7,9 @@ ["//" error (#+ Error)] ["." maybe] ["." product] - ["." text ("text/." monoid)] + ["." text ("#/." monoid)] [collection - ["." list ("list/." functor fold)]]] + ["." list ("#/." functor fold)]]] ["." macro ["." code] ["s" syntax (#+ syntax: Syntax)] diff --git a/stdlib/source/lux/control/monad/indexed.lux b/stdlib/source/lux/control/monad/indexed.lux index bd18ab72c..d5ce955a0 100644 --- a/stdlib/source/lux/control/monad/indexed.lux +++ b/stdlib/source/lux/control/monad/indexed.lux @@ -5,7 +5,7 @@ ["p" parser]] [data [collection - ["." list ("list/." functor fold)]]] + ["." list ("#/." functor fold)]]] ["." macro ["s" syntax (#+ Syntax syntax:)]]]) diff --git a/stdlib/source/lux/control/parser.lux b/stdlib/source/lux/control/parser.lux index 4ea39a006..2a724d596 100644 --- a/stdlib/source/lux/control/parser.lux +++ b/stdlib/source/lux/control/parser.lux @@ -7,7 +7,7 @@ [codec (#+ Codec)]] [data [collection - ["." list ("list/." functor monoid)]] + ["." list ("#/." functor monoid)]] ["." product] ["." error (#+ Error)]]]) diff --git a/stdlib/source/lux/control/pipe.lux b/stdlib/source/lux/control/pipe.lux index e5118469f..8e8209b89 100644 --- a/stdlib/source/lux/control/pipe.lux +++ b/stdlib/source/lux/control/pipe.lux @@ -6,7 +6,7 @@ [data ["e" error] [collection - ["." list ("list/." fold monad)]]] + ["." list ("#/." fold monad)]]] [macro (#+ with-gensyms) ["s" syntax (#+ syntax: Syntax)] ["." code]]]) diff --git a/stdlib/source/lux/control/region.lux b/stdlib/source/lux/control/region.lux index 126344514..ddd86876b 100644 --- a/stdlib/source/lux/control/region.lux +++ b/stdlib/source/lux/control/region.lux @@ -10,7 +10,7 @@ ["." text format] [collection - [list ("list/." fold)]]]]) + ["." list ("#/." fold)]]]]) (type: (Cleaner r m) (-> r (m (Error Any)))) diff --git a/stdlib/source/lux/control/remember.lux b/stdlib/source/lux/control/remember.lux index 8085ad176..f497677cf 100644 --- a/stdlib/source/lux/control/remember.lux +++ b/stdlib/source/lux/control/remember.lux @@ -2,7 +2,7 @@ [lux #* [control [monad (#+ do)] - ["p" parser ("p/." functor)] + ["p" parser ("#/." functor)] ["ex" exception (#+ exception:)]] [data ["." error] @@ -10,7 +10,7 @@ format]] [time ["." instant] - ["." date (#+ Date) ("date/." order codec)]] + ["." date (#+ Date) ("#/." order codec)]] ["." macro ["." code] ["s" syntax (#+ Syntax syntax:)]] diff --git a/stdlib/source/lux/control/security/capability.lux b/stdlib/source/lux/control/security/capability.lux index 914a141ab..7e0dd5a6d 100644 --- a/stdlib/source/lux/control/security/capability.lux +++ b/stdlib/source/lux/control/security/capability.lux @@ -10,7 +10,7 @@ [text format] [collection - [list ("list/." functor)]]] + ["." list ("#/." functor)]]] [type abstract] ["." macro diff --git a/stdlib/source/lux/data/collection/array.lux b/stdlib/source/lux/data/collection/array.lux index 65ca3b0f6..4b8695bb0 100644 --- a/stdlib/source/lux/data/collection/array.lux +++ b/stdlib/source/lux/data/collection/array.lux @@ -10,7 +10,7 @@ ["." product] ["." maybe] [collection - ["." list ("list/." fold)]]] + ["." list ("#/." fold)]]] [platform [compiler ["." host]]]]) diff --git a/stdlib/source/lux/data/collection/bits.lux b/stdlib/source/lux/data/collection/bits.lux index 0837a4dbb..47af962d6 100644 --- a/stdlib/source/lux/data/collection/bits.lux +++ b/stdlib/source/lux/data/collection/bits.lux @@ -10,7 +10,7 @@ [text format] [collection - ["." array (#+ Array) ("array/." fold)]]]]) + ["." array (#+ Array) ("#/." fold)]]]]) (type: #export Chunk I64) diff --git a/stdlib/source/lux/data/collection/dictionary.lux b/stdlib/source/lux/data/collection/dictionary.lux index 21aaecf39..fb63dba48 100644 --- a/stdlib/source/lux/data/collection/dictionary.lux +++ b/stdlib/source/lux/data/collection/dictionary.lux @@ -9,8 +9,8 @@ ["." number ["." i64]] [collection - ["." list ("list/." fold functor monoid)] - ["." array (#+ Array) ("array/." functor fold)]]] + ["." list ("#/." fold functor monoid)] + ["." array (#+ Array) ("#/." functor fold)]]] ]) ## This implementation of Hash Array Mapped Trie (HAMT) is based on diff --git a/stdlib/source/lux/data/collection/dictionary/ordered.lux b/stdlib/source/lux/data/collection/dictionary/ordered.lux index b6cda46d1..956f4a1b6 100644 --- a/stdlib/source/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/lux/data/collection/dictionary/ordered.lux @@ -8,7 +8,7 @@ ["p" product] ["." maybe] [collection - [list ("list/." monoid fold)]]] + ["." list ("#/." monoid fold)]]] ["." macro ["." code] ["s" syntax (#+ syntax: Syntax)]]]) diff --git a/stdlib/source/lux/data/collection/dictionary/plist.lux b/stdlib/source/lux/data/collection/dictionary/plist.lux index 7b11ee208..9bc43bb9f 100644 --- a/stdlib/source/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/lux/data/collection/dictionary/plist.lux @@ -2,9 +2,9 @@ [lux #* [data ["." product] - [text ("text/." equivalence)] + ["." text ("#/." equivalence)] [collection - [list ("list/." functor)]]]]) + ["." list ("#/." functor)]]]]) (type: #export (PList a) (List [Text a])) diff --git a/stdlib/source/lux/data/collection/queue.lux b/stdlib/source/lux/data/collection/queue.lux index ce66391c8..c5644e7bf 100644 --- a/stdlib/source/lux/data/collection/queue.lux +++ b/stdlib/source/lux/data/collection/queue.lux @@ -5,7 +5,7 @@ [functor (#+ Functor)]] [data [collection - ["." list ("list/." monoid functor)]]]]) + ["." list ("#/." monoid functor)]]]]) (type: #export (Queue a) {#front (List a) diff --git a/stdlib/source/lux/data/collection/queue/priority.lux b/stdlib/source/lux/data/collection/queue/priority.lux index 59167d2e7..5f882c170 100644 --- a/stdlib/source/lux/data/collection/queue/priority.lux +++ b/stdlib/source/lux/data/collection/queue/priority.lux @@ -6,7 +6,7 @@ [data ["." maybe] [number - ["." nat ("nat/." interval)]] + ["." nat ("#/." interval)]] [collection [tree ["." finger (#+ Tree)]]]]]) diff --git a/stdlib/source/lux/data/collection/row.lux b/stdlib/source/lux/data/collection/row.lux index b3cbfedf1..87af1ee16 100644 --- a/stdlib/source/lux/data/collection/row.lux +++ b/stdlib/source/lux/data/collection/row.lux @@ -15,8 +15,8 @@ [number ["." i64]] [collection - ["." list ("list/." fold functor monoid)] - ["." array (#+ Array) ("array/." functor fold)]]] + ["." list ("#/." fold functor monoid)] + ["." array (#+ Array) ("#/." functor fold)]]] [macro (#+ with-gensyms) ["." code] ["s" syntax (#+ syntax: Syntax)]]]) diff --git a/stdlib/source/lux/data/collection/sequence.lux b/stdlib/source/lux/data/collection/sequence.lux index bd2c7ae03..9cb65d0f4 100644 --- a/stdlib/source/lux/data/collection/sequence.lux +++ b/stdlib/source/lux/data/collection/sequence.lux @@ -11,7 +11,7 @@ [data ["." bit] [collection - [list ("list/." monad)]]]]) + ["." list ("#/." monad)]]]]) (type: #export (Sequence a) {#.doc "An infinite sequence of values."} diff --git a/stdlib/source/lux/data/collection/set.lux b/stdlib/source/lux/data/collection/set.lux index 01a588cc1..7b3e803a3 100644 --- a/stdlib/source/lux/data/collection/set.lux +++ b/stdlib/source/lux/data/collection/set.lux @@ -7,7 +7,7 @@ [data [collection ["dict" dictionary (#+ Dictionary)] - ["." list ("list/." fold)]]] + ["." list ("#/." fold)]]] [type abstract]]) diff --git a/stdlib/source/lux/data/collection/set/multi.lux b/stdlib/source/lux/data/collection/set/multi.lux index de770e30a..e509d41cf 100644 --- a/stdlib/source/lux/data/collection/set/multi.lux +++ b/stdlib/source/lux/data/collection/set/multi.lux @@ -10,7 +10,7 @@ [//// ["." maybe]] [/// - ["." list ("list/." fold)] + ["." list ("#/." fold)] ["." dictionary (#+ Dictionary)]] ["." //]) diff --git a/stdlib/source/lux/data/collection/set/ordered.lux b/stdlib/source/lux/data/collection/set/ordered.lux index a16a42ead..ef9403d06 100644 --- a/stdlib/source/lux/data/collection/set/ordered.lux +++ b/stdlib/source/lux/data/collection/set/ordered.lux @@ -5,7 +5,7 @@ [order (#+ Order)]] [data [collection - ["." list ("list/." fold)] + ["." list ("#/." fold)] [dictionary ["//" ordered]]]] [type diff --git a/stdlib/source/lux/data/collection/tree/rose.lux b/stdlib/source/lux/data/collection/tree/rose.lux index 18ab2bf44..ab2c04059 100644 --- a/stdlib/source/lux/data/collection/tree/rose.lux +++ b/stdlib/source/lux/data/collection/tree/rose.lux @@ -8,7 +8,7 @@ fold] [data [collection - ["." list ("list/." monad fold)]]] + ["." list ("#/." monad fold)]]] ["." macro ["." code] ["s" syntax (#+ syntax: Syntax)]]]) diff --git a/stdlib/source/lux/data/collection/tree/rose/zipper.lux b/stdlib/source/lux/data/collection/tree/rose/zipper.lux index e5d16a07a..663090cf2 100644 --- a/stdlib/source/lux/data/collection/tree/rose/zipper.lux +++ b/stdlib/source/lux/data/collection/tree/rose/zipper.lux @@ -4,14 +4,14 @@ functor comonad] [data - ["." maybe ("maybe/." monad)] + ["." maybe ("#/." monad)] [collection - ["." list ("list/." functor fold monoid)] + ["." list ("#/." functor fold monoid)] ["." stack (#+ Stack)]]] ["." macro ["." code] ["s" syntax (#+ Syntax syntax:)]]] - ["." // (#+ Tree) ("tree/." functor)]) + ["." // (#+ Tree) ("#/." functor)]) ## Adapted from the clojure.zip namespace in the Clojure standard library. @@ -217,9 +217,9 @@ (structure: #export functor (Functor Zipper) (def: (map f fa) {#parent (|> fa (get@ #parent) (maybe/map (map f))) - #lefts (|> fa (get@ #lefts) (list/map (tree/map f))) - #rights (|> fa (get@ #rights) (list/map (tree/map f))) - #node (tree/map f (get@ #node fa))})) + #lefts (|> fa (get@ #lefts) (list/map (///map f))) + #rights (|> fa (get@ #rights) (list/map (///map f))) + #node (///map f (get@ #node fa))})) ## TODO: Add again once new-luxc becomes the standard compiler. ## (structure: #export comonad (CoMonad Zipper) diff --git a/stdlib/source/lux/data/color.lux b/stdlib/source/lux/data/color.lux index e0de8ac88..6fae765ca 100644 --- a/stdlib/source/lux/data/color.lux +++ b/stdlib/source/lux/data/color.lux @@ -4,9 +4,9 @@ [equivalence (#+ Equivalence)]] [data [number - [rev ("rev/." interval)]] + ["." rev ("#/." interval)]] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] ["." math] [type abstract]]) diff --git a/stdlib/source/lux/data/format/binary.lux b/stdlib/source/lux/data/format/binary.lux index 834dbcbe9..361748c49 100644 --- a/stdlib/source/lux/data/format/binary.lux +++ b/stdlib/source/lux/data/format/binary.lux @@ -4,7 +4,7 @@ [monoid (#+ Monoid)] ["." fold] [monad (#+ do Monad)] - ["." parser (#+ Parser) ("parser/." functor)] + ["." parser (#+ Parser) ("#/." functor)] ["ex" exception (#+ exception:)] [equivalence (#+ Equivalence)]] [data @@ -17,7 +17,7 @@ [format (#+ %n)]] [collection ["." list] - ["." row (#+ Row) ("row/." functor)]]] + ["." row (#+ Row) ("#/." functor)]]] [type (#+ :share)] [world ["." binary (#+ Binary)]]]) diff --git a/stdlib/source/lux/data/format/css.lux b/stdlib/source/lux/data/format/css.lux index 4dcd01b05..e44e4f61e 100644 --- a/stdlib/source/lux/data/format/css.lux +++ b/stdlib/source/lux/data/format/css.lux @@ -8,7 +8,7 @@ format ["." encoding (#+ Encoding)]] [collection - [list ("list/." functor)]]] + ["." list ("#/." functor)]]] [type abstract] [world diff --git a/stdlib/source/lux/data/format/css/value.lux b/stdlib/source/lux/data/format/css/value.lux index e9e6ccfbe..a681bde1a 100644 --- a/stdlib/source/lux/data/format/css/value.lux +++ b/stdlib/source/lux/data/format/css/value.lux @@ -9,7 +9,7 @@ ["." text format] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [type abstract] [macro diff --git a/stdlib/source/lux/data/format/html.lux b/stdlib/source/lux/data/format/html.lux index 73820c6c8..a8766b651 100644 --- a/stdlib/source/lux/data/format/html.lux +++ b/stdlib/source/lux/data/format/html.lux @@ -6,7 +6,7 @@ ["." text format] [collection - [list ("list/." functor fold)]]] + ["." list ("#/." functor fold)]]] ["." function] [type abstract] diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux index e06948838..f2f7eef35 100644 --- a/stdlib/source/lux/data/format/json.lux +++ b/stdlib/source/lux/data/format/json.lux @@ -5,7 +5,7 @@ ["." monad (#+ Monad do)] [equivalence (#+ Equivalence)] codec - ["p" parser (#+ Parser) ("parser/." monad)] + ["p" parser (#+ Parser) ("#/." monad)] ["ex" exception (#+ exception:)]] [data ["." bit] @@ -14,12 +14,12 @@ ["." sum] ["." product] [number - ["." frac ("frac/." decimal)]] - ["." text ("text/." equivalence monoid) + ["." frac ("#/." decimal)]] + ["." text ("#/." equivalence monoid) ["l" lexer]] [collection - ["." list ("list/." fold monad)] - ["." row (#+ Row row) ("row/." monad)] + ["." list ("#/." fold monad)] + ["." row (#+ Row row) ("#/." monad)] ["." dictionary (#+ Dictionary)]]] ["." macro (#+ monad with-gensyms) ["s" syntax (#+ syntax:)] @@ -468,19 +468,19 @@ (l.Lexer Text) ($_ p.either (p.after (l.this "\t") - (parser/wrap text.tab)) + (p/wrap text.tab)) (p.after (l.this "\b") - (parser/wrap text.back-space)) + (p/wrap text.back-space)) (p.after (l.this "\n") - (parser/wrap text.new-line)) + (p/wrap text.new-line)) (p.after (l.this "\r") - (parser/wrap text.carriage-return)) + (p/wrap text.carriage-return)) (p.after (l.this "\f") - (parser/wrap text.form-feed)) + (p/wrap text.form-feed)) (p.after (l.this (text/compose "\" text.double-quote)) - (parser/wrap text.double-quote)) + (p/wrap text.double-quote)) (p.after (l.this "\\") - (parser/wrap "\")))) + (p/wrap "\")))) (def: string~ (l.Lexer String) diff --git a/stdlib/source/lux/data/format/markdown.lux b/stdlib/source/lux/data/format/markdown.lux index 5fcf85cbf..58f1f14b3 100644 --- a/stdlib/source/lux/data/format/markdown.lux +++ b/stdlib/source/lux/data/format/markdown.lux @@ -4,7 +4,7 @@ ["." text format] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [type abstract] [world diff --git a/stdlib/source/lux/data/format/xml.lux b/stdlib/source/lux/data/format/xml.lux index 56d603331..a00ff24fa 100644 --- a/stdlib/source/lux/data/format/xml.lux +++ b/stdlib/source/lux/data/format/xml.lux @@ -4,18 +4,18 @@ monad [equivalence (#+ Equivalence)] codec - ["p" parser ("parser/." monad)] + ["p" parser ("#/." monad)] ["ex" exception (#+ exception:)]] [data ["." error (#+ Error)] ["." product] - ["." name ("name/." equivalence codec)] + ["." name ("#/." equivalence codec)] [number ["." int]] - ["." text ("text/." equivalence monoid) + ["." text ("#/." equivalence monoid) ["l" lexer]] [collection - ["." list ("list/." monad)] + ["." list ("#/." monad)] ["d" dictionary]]]]) (type: #export Tag Name) @@ -30,11 +30,11 @@ (def: xml-standard-escape-char^ (l.Lexer Text) ($_ p.either - (p.after (l.this "<") (parser/wrap "<")) - (p.after (l.this ">") (parser/wrap ">")) - (p.after (l.this "&") (parser/wrap "&")) - (p.after (l.this "'") (parser/wrap "'")) - (p.after (l.this """) (parser/wrap text.double-quote)))) + (p.after (l.this "<") (p/wrap "<")) + (p.after (l.this ">") (p/wrap ">")) + (p.after (l.this "&") (p/wrap "&")) + (p.after (l.this "'") (p/wrap "'")) + (p.after (l.this """) (p/wrap text.double-quote)))) (def: xml-unicode-escape-char^ (l.Lexer Text) @@ -142,7 +142,7 @@ (l.Lexer XML) (|> (p.either cdata^ (l.many xml-char^)) - (parser/map (|>> #Text)))) + (p/map (|>> #Text)))) (def: xml^ (l.Lexer XML) diff --git a/stdlib/source/lux/data/name.lux b/stdlib/source/lux/data/name.lux index 5ecea23ba..6f33e115e 100644 --- a/stdlib/source/lux/data/name.lux +++ b/stdlib/source/lux/data/name.lux @@ -5,7 +5,7 @@ [codec (#+ Codec)] hash] [data - ["." text ("text/." monoid hash)]]]) + ["." text ("#/." monoid hash)]]]) ## [Types] ## (type: Name diff --git a/stdlib/source/lux/data/number/complex.lux b/stdlib/source/lux/data/number/complex.lux index a7993dcaf..62928d75e 100644 --- a/stdlib/source/lux/data/number/complex.lux +++ b/stdlib/source/lux/data/number/complex.lux @@ -10,10 +10,10 @@ [data ["." maybe] [number - ["." frac ("frac/." number)]] - [text ("text/." monoid)] + ["." frac ("#/." number)]] + ["." text ("#/." monoid)] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] ["." macro ["." code] ["s" syntax (#+ syntax: Syntax)]]]) diff --git a/stdlib/source/lux/data/number/ratio.lux b/stdlib/source/lux/data/number/ratio.lux index 773baef15..3303b07c9 100644 --- a/stdlib/source/lux/data/number/ratio.lux +++ b/stdlib/source/lux/data/number/ratio.lux @@ -12,8 +12,8 @@ ["." product] ["." maybe] [number - [nat ("nat/." decimal)]] - ["." text ("text/." monoid) + ["." nat ("#/." decimal)]] + ["." text ("#/." monoid) format]] ["." function] ["." math] diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/lux/data/text.lux index a87aa0626..4ff4f8fa5 100644 --- a/stdlib/source/lux/data/text.lux +++ b/stdlib/source/lux/data/text.lux @@ -12,7 +12,7 @@ [number ["." i64]] [collection - ["." list ("list/." fold)]]] + ["." list ("#/." fold)]]] [platform [compiler ["." host]]]]) diff --git a/stdlib/source/lux/data/text/buffer.lux b/stdlib/source/lux/data/text/buffer.lux index 9534f1e3e..061f5a164 100644 --- a/stdlib/source/lux/data/text/buffer.lux +++ b/stdlib/source/lux/data/text/buffer.lux @@ -5,7 +5,7 @@ [text format] [collection - ["." row (#+ Row) ("row/." fold)]]] + ["." row (#+ Row) ("#/." fold)]]] [compiler ["_" host]] [type diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux index ca0c7b151..b93aec640 100644 --- a/stdlib/source/lux/data/text/format.lux +++ b/stdlib/source/lux/data/text/format.lux @@ -16,7 +16,7 @@ ["." xml] ["." json]] [collection - [list ("list/." monad)]]] + ["." list ("#/." monad)]]] [time ["." instant] ["." duration] diff --git a/stdlib/source/lux/data/text/lexer.lux b/stdlib/source/lux/data/text/lexer.lux index b5b0434e4..8b77ac4f6 100644 --- a/stdlib/source/lux/data/text/lexer.lux +++ b/stdlib/source/lux/data/text/lexer.lux @@ -9,12 +9,12 @@ ["." maybe] ["." error (#+ Error)] [number - [nat ("nat/." decimal)]] + ["." nat ("#/." decimal)]] [collection - ["." list ("list/." fold)]]] + ["." list ("#/." fold)]]] [macro ["." code]]] - ["." // ("text/." monoid)]) + ["." // ("#/." monoid)]) (type: #export Offset Nat) @@ -110,10 +110,10 @@ (if (n/= offset where) (#error.Success [[("lux i64 +" (//.size reference) offset) tape] []]) - (#error.Failure ($_ text/compose "Could not match: " (//.encode reference) " @ " (maybe.assume (//.clip' offset tape))))) + (#error.Failure ($_ ///compose "Could not match: " (//.encode reference) " @ " (maybe.assume (//.clip' offset tape))))) _ - (#error.Failure ($_ text/compose "Could not match: " (//.encode reference)))))) + (#error.Failure ($_ ///compose "Could not match: " (//.encode reference)))))) (def: #export (this? reference) {#.doc "Lex a text if it matches the given sample."} @@ -164,14 +164,14 @@ (do p.monad [char any #let [char' (maybe.assume (//.nth 0 char))] - _ (p.assert ($_ text/compose "Character is not within range: " (//.from-code bottom) "-" (//.from-code top)) + _ (p.assert ($_ ///compose "Character is not within range: " (//.from-code bottom) "-" (//.from-code top)) (.and (n/>= bottom char') (n/<= top char')))] (wrap char))) (do-template [<name> <bottom> <top> <desc>] [(def: #export <name> - {#.doc (code.text ($_ text/compose "Only lex " <desc> " characters."))} + {#.doc (code.text ($_ ///compose "Only lex " <desc> " characters."))} (Lexer Text) (range (char <bottom>) (char <top>)))] @@ -201,7 +201,7 @@ (do-template [<name> <description-modifier> <modifier>] [(def: #export (<name> options) - {#.doc (code.text ($_ text/compose "Only lex characters that are" <description-modifier> " part of a piece of text."))} + {#.doc (code.text ($_ ///compose "Only lex characters that are" <description-modifier> " part of a piece of text."))} (-> Text (Lexer Text)) (function (_ [offset tape]) (case (//.nth offset tape) @@ -209,7 +209,7 @@ (let [output (//.from-code output)] (if (<modifier> (//.contains? output options)) (#error.Success [[("lux i64 +" 1 offset) tape] output]) - (#error.Failure ($_ text/compose "Character (" output + (#error.Failure ($_ ///compose "Character (" output ") is should " <description-modifier> "be one of: " options)))) @@ -222,7 +222,7 @@ (do-template [<name> <description-modifier> <modifier>] [(def: #export (<name> options) - {#.doc (code.text ($_ text/compose "Only lex characters that are" <description-modifier> " part of a piece of text."))} + {#.doc (code.text ($_ ///compose "Only lex characters that are" <description-modifier> " part of a piece of text."))} (-> Text (Lexer Slice)) (function (_ [offset tape]) (case (//.nth offset tape) @@ -232,7 +232,7 @@ (#error.Success [[("lux i64 +" 1 offset) tape] {#basis offset #distance 1}]) - (#error.Failure ($_ text/compose "Character (" output + (#error.Failure ($_ ///compose "Character (" output ") is should " <description-modifier> "be one of: " options)))) @@ -251,7 +251,7 @@ (#.Some output) (if (p output) (#error.Success [[("lux i64 +" 1 offset) tape] (//.from-code output)]) - (#error.Failure ($_ text/compose "Character does not satisfy predicate: " (//.from-code output)))) + (#error.Failure ($_ ///compose "Character does not satisfy predicate: " (//.from-code output)))) _ (#error.Failure cannot-lex-error)))) @@ -266,7 +266,7 @@ (do p.monad [=left left =right right] - (wrap ($_ text/compose =left =right)))) + (wrap ($_ ///compose =left =right)))) (def: #export (and! left right) (-> (Lexer Slice) (Lexer Slice) (Lexer Slice)) @@ -277,7 +277,7 @@ (do-template [<name> <base> <doc-modifier>] [(def: #export (<name> lexer) - {#.doc (code.text ($_ text/compose "Lex " <doc-modifier> " characters as a single continuous text."))} + {#.doc (code.text ($_ ///compose "Lex " <doc-modifier> " characters as a single continuous text."))} (-> (Lexer Text) (Lexer Text)) (|> lexer <base> (:: p.monad map //.concat)))] @@ -287,7 +287,7 @@ (do-template [<name> <base> <doc-modifier>] [(def: #export (<name> lexer) - {#.doc (code.text ($_ text/compose "Lex " <doc-modifier> " characters as a single continuous text."))} + {#.doc (code.text ($_ ///compose "Lex " <doc-modifier> " characters as a single continuous text."))} (-> (Lexer Slice) (Lexer Slice)) (with-slices (<base> lexer)))] @@ -297,7 +297,7 @@ (do-template [<name> <base> <doc-modifier>] [(def: #export (<name> amount lexer) - {#.doc (code.text ($_ text/compose "Lex " <doc-modifier> " N characters."))} + {#.doc (code.text ($_ ///compose "Lex " <doc-modifier> " N characters."))} (-> Nat (Lexer Text) (Lexer Text)) (|> lexer (<base> amount) (:: p.monad map //.concat)))] @@ -308,7 +308,7 @@ (do-template [<name> <base> <doc-modifier>] [(def: #export (<name> amount lexer) - {#.doc (code.text ($_ text/compose "Lex " <doc-modifier> " N characters."))} + {#.doc (code.text ($_ ///compose "Lex " <doc-modifier> " N characters."))} (-> Nat (Lexer Slice) (Lexer Slice)) (with-slices (<base> amount lexer)))] diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/lux/data/text/regex.lux index 9b2abb52e..51a2b097e 100644 --- a/stdlib/source/lux/data/text/regex.lux +++ b/stdlib/source/lux/data/text/regex.lux @@ -2,14 +2,15 @@ [lux #* [control monad - ["p" parser ("parser/." monad)]] + ["p" parser ("#/." monad)]] [data ["." product] ["." error] ["." maybe] - ["." number (#+ hex) ("int/." codec)] + ["." number (#+ hex) + ["." int ("#/." codec)]] [collection - ["." list ("list/." fold monad)]]] + ["." list ("#/." fold monad)]]] ["." macro (#+ with-gensyms) ["." code] ["s" syntax (#+ syntax:)]]] @@ -44,7 +45,7 @@ (def: (copy reference) (-> Text (l.Lexer Text)) - (p.after (l.this reference) (parser/wrap reference))) + (p.after (l.this reference) (p/wrap reference))) (def: (join-text^ part^) (-> (l.Lexer (List Text)) (l.Lexer Text)) @@ -67,10 +68,10 @@ (def: (name^ current-module) (-> Text (l.Lexer Name)) ($_ p.either - (p.and (parser/wrap current-module) (p.after (l.this "..") name-part^)) + (p.and (p/wrap current-module) (p.after (l.this "..") name-part^)) (p.and name-part^ (p.after (l.this ".") name-part^)) - (p.and (parser/wrap "lux") (p.after (l.this ".") name-part^)) - (p.and (parser/wrap "") name-part^))) + (p.and (p/wrap "lux") (p.after (l.this ".") name-part^)) + (p.and (p/wrap "") name-part^))) (def: (re-var^ current-module) (-> Text (l.Lexer Code)) diff --git a/stdlib/source/lux/data/text/unicode.lux b/stdlib/source/lux/data/text/unicode.lux index cc783e177..00c60f365 100644 --- a/stdlib/source/lux/data/text/unicode.lux +++ b/stdlib/source/lux/data/text/unicode.lux @@ -5,7 +5,7 @@ [monoid (#+ Monoid)]] [data [number (#+ hex) - ["." nat ("nat/." interval)]] + ["." nat ("#/." interval)]] [collection ["." list] [tree diff --git a/stdlib/source/lux/host.js.lux b/stdlib/source/lux/host.js.lux index eb6123ef8..09d7d2fea 100644 --- a/stdlib/source/lux/host.js.lux +++ b/stdlib/source/lux/host.js.lux @@ -5,7 +5,7 @@ ["p" parser]] [data [collection - [list #* ("list/." fold)]]] + ["." list #* ("#/." fold)]]] [macro (#+ with-gensyms) ["." code] ["s" syntax (#+ syntax: Syntax)]]]) diff --git a/stdlib/source/lux/host.jvm.lux b/stdlib/source/lux/host.jvm.lux index c788380c8..b85bdf2a0 100644 --- a/stdlib/source/lux/host.jvm.lux +++ b/stdlib/source/lux/host.jvm.lux @@ -8,15 +8,15 @@ ["." maybe] ["." product] ["." error (#+ Error)] - [bit ("bit/." codec)] + ["." bit ("#/." codec)] number - ["." text ("text/." equivalence monoid) + ["." text ("#/." equivalence monoid) format] [collection ["." array (#+ Array)] - ["." list ("list/." monad fold monoid)]]] + ["." list ("#/." monad fold monoid)]]] ["." function] - ["." type ("type/." equivalence)] + ["." type ("#/." equivalence)] ["." macro (#+ with-gensyms) ["." code] ["s" syntax (#+ syntax: Syntax)]] diff --git a/stdlib/source/lux/host/jvm/constant.lux b/stdlib/source/lux/host/jvm/constant.lux index 1395e6d5a..e3ec4c334 100644 --- a/stdlib/source/lux/host/jvm/constant.lux +++ b/stdlib/source/lux/host/jvm/constant.lux @@ -10,7 +10,7 @@ ["." frac]] ["." text] [format - ["." binary (#+ Format) ("mutation/." monoid)]] + ["." binary (#+ Format) ("#/." monoid)]] [collection ["." row (#+ Row)]]] [type @@ -20,7 +20,7 @@ ["//." index (#+ Index)] [descriptor (#+ Descriptor)]] [/ - ["/." tag ("tag/." equivalence)]]) + ["/." tag ("#/." equivalence)]]) (type: #export UTF8 Text) @@ -174,7 +174,7 @@ {#binary.reader (do parser.monad [tag (get@ #binary.reader /tag.format)] (`` (cond (~~ (do-template [<case> <tag> <format>] - [(tag/= <tag> tag) + [(/tag/= <tag> tag) (:: @ map (|>> <case>) (get@ #binary.reader <format>))] <constants>)) @@ -185,7 +185,7 @@ (case value (^template [<case> <tag> <format>] (<case> value) - (mutation/compose ((get@ #binary.writer /tag.format) <tag>) - ((get@ #binary.writer <format>) value))) + (binary/compose ((get@ #binary.writer /tag.format) <tag>) + ((get@ #binary.writer <format>) value))) (<constants>) ))})) diff --git a/stdlib/source/lux/host/jvm/constant/pool.lux b/stdlib/source/lux/host/jvm/constant/pool.lux index 7e3119222..c72edbac7 100644 --- a/stdlib/source/lux/host/jvm/constant/pool.lux +++ b/stdlib/source/lux/host/jvm/constant/pool.lux @@ -5,15 +5,15 @@ [monad (#+ do)] ["." state (#+ State)]] [data - [text ("text/." equivalence)] + ["." text ("#/." equivalence)] [format ["." binary (#+ Format)]] [collection - [list ("list/." fold)] + ["." list ("#/." fold)] ["." row (#+ Row)]]] [type abstract]] - ["." // (#+ UTF8 Class Constant) ("class/." class-equivalence) + ["." // (#+ UTF8 Class Constant) ("#/." class-equivalence) [// ["." encoding] ["." index (#+ Index)] @@ -54,7 +54,7 @@ (def: (class' value) (-> Class (State Pool (Index Class))) - (!add value #//.Class class/=)) + (!add value #//.Class ///=)) (def: #export (class name) (-> UTF8 (State Pool (Index Class))) diff --git a/stdlib/source/lux/host/jvm/descriptor.lux b/stdlib/source/lux/host/jvm/descriptor.lux index ffa7e566e..8da571f86 100644 --- a/stdlib/source/lux/host/jvm/descriptor.lux +++ b/stdlib/source/lux/host/jvm/descriptor.lux @@ -4,7 +4,7 @@ ["." text format] [collection - [list ("list/." functor)]]] + ["." list ("#/." functor)]]] [type abstract]] [// diff --git a/stdlib/source/lux/host/jvm/encoding.lux b/stdlib/source/lux/host/jvm/encoding.lux index ca6875eca..203c06560 100644 --- a/stdlib/source/lux/host/jvm/encoding.lux +++ b/stdlib/source/lux/host/jvm/encoding.lux @@ -2,7 +2,7 @@ [lux #* [control [equivalence (#+ Equivalence)] - [parser ("parser/." functor)]] + ["." parser ("#/." functor)]] [data [number ["." i64]] diff --git a/stdlib/source/lux/host/jvm/loader.jvm.lux b/stdlib/source/lux/host/jvm/loader.jvm.lux index 1a19c2e1e..d04a7e82f 100644 --- a/stdlib/source/lux/host/jvm/loader.jvm.lux +++ b/stdlib/source/lux/host/jvm/loader.jvm.lux @@ -11,7 +11,7 @@ format] [collection ["." array] - ["." list ("list/." functor)] + ["." list ("#/." functor)] ["." dictionary (#+ Dictionary)]]] ["." io (#+ IO)] [world diff --git a/stdlib/source/lux/host/jvm/modifier.lux b/stdlib/source/lux/host/jvm/modifier.lux index c9091160c..cb8a29498 100644 --- a/stdlib/source/lux/host/jvm/modifier.lux +++ b/stdlib/source/lux/host/jvm/modifier.lux @@ -10,7 +10,7 @@ [format ["." binary]] [collection - [list ("list/." functor)]]] + ["." list ("#/." functor)]]] [type ["." abstract]] [macro (#+ with-gensyms) diff --git a/stdlib/source/lux/macro.lux b/stdlib/source/lux/macro.lux index a4b439c62..870b905f4 100644 --- a/stdlib/source/lux/macro.lux +++ b/stdlib/source/lux/macro.lux @@ -6,14 +6,14 @@ ["." monad (#+ Monad do)]] [data ["." product] - [name ("name/." codec equivalence)] + ["." name ("#/." codec equivalence)] ["." maybe] ["." error (#+ Error)] [number - ["." nat ("nat/." decimal)]] - ["." text ("text/." monoid equivalence)] + ["." nat ("#/." decimal)]] + ["." text ("#/." monoid equivalence)] [collection - ["." list ("list/." monoid monad)]]]] + ["." list ("#/." monoid monad)]]]] [/ ["." code]]) diff --git a/stdlib/source/lux/macro/code.lux b/stdlib/source/lux/macro/code.lux index 34dd35a3b..34bd2b534 100644 --- a/stdlib/source/lux/macro/code.lux +++ b/stdlib/source/lux/macro/code.lux @@ -10,9 +10,9 @@ ["." int] ["." rev] ["." frac]] - ["." text ("text/." monoid)] + ["." text ("#/." monoid)] [collection - ["." list ("list/." functor fold)]]]]) + ["." list ("#/." functor fold)]]]]) ## (type: (Code' w) ## (#.Bit Bit) diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/lux/macro/poly.lux index 02ffb21fb..200d507eb 100644 --- a/stdlib/source/lux/macro/poly.lux +++ b/stdlib/source/lux/macro/poly.lux @@ -10,14 +10,14 @@ ["." product] ["." bit] ["." maybe] - [name ("name/." codec)] + ["." name ("#/." codec)] ["." error (#+ Error)] ["." number (#+ hex) - ["." nat ("nat/." decimal)]] - ["." text ("text/." monoid) + ["." nat ("#/." decimal)]] + ["." text ("#/." monoid) format] [collection - ["." list ("list/." fold monad monoid)] + ["." list ("#/." fold monad monoid)] ["dict" dictionary (#+ Dictionary)]]] ["." macro (#+ with-gensyms) ["." code] @@ -27,7 +27,7 @@ [common ["csr" reader] ["csw" writer]]]] - ["." type ("type/." equivalence) + ["." type ("#/." equivalence) ["." check]]]) (do-template [<name>] diff --git a/stdlib/source/lux/macro/poly/equivalence.lux b/stdlib/source/lux/macro/poly/equivalence.lux index 5d95b6256..ae8374443 100644 --- a/stdlib/source/lux/macro/poly/equivalence.lux +++ b/stdlib/source/lux/macro/poly/equivalence.lux @@ -9,14 +9,14 @@ ["." bit] ["." maybe] [number - ["." nat ("nat/." codec)] + ["." nat ("#/." codec)] ["." int] ["." rev] ["." frac]] - ["." text ("text/." monoid) + ["." text ("#/." monoid) format] [collection - ["." list ("list/." monad)] + ["." list ("#/." monad)] ["." row] ["." array] ["." queue] diff --git a/stdlib/source/lux/macro/poly/functor.lux b/stdlib/source/lux/macro/poly/functor.lux index 61aba1753..a1d4e040d 100644 --- a/stdlib/source/lux/macro/poly/functor.lux +++ b/stdlib/source/lux/macro/poly/functor.lux @@ -9,7 +9,7 @@ ["." text format] [collection - ["." list ("list/." monad monoid)]]] + ["." list ("#/." monad monoid)]]] ["." macro ["." code] [syntax (#+ syntax: Syntax) diff --git a/stdlib/source/lux/macro/poly/json.lux b/stdlib/source/lux/macro/poly/json.lux index 22b07f064..f273fc8d8 100644 --- a/stdlib/source/lux/macro/poly/json.lux +++ b/stdlib/source/lux/macro/poly/json.lux @@ -11,16 +11,18 @@ ["e" error] ["." sum] ["." product] - [number ("frac/." codec) ("nat/." codec) - ["." i64]] - ["." text ("text/." equivalence) + [number + ["." i64] + ["." nat ("#/." codec)] + ["." frac ("#/." codec)]] + ["." text ("#/." equivalence) ["l" lexer] format] [format ["//" json (#+ JSON)]] [collection - ["." list ("list/." fold monad)] - ["." row (#+ Row row) ("row/." monad)] + ["." list ("#/." fold monad)] + ["." row (#+ Row row) ("#/." monad)] ["d" dictionary]]] [time ## ["i" instant] diff --git a/stdlib/source/lux/macro/syntax.lux b/stdlib/source/lux/macro/syntax.lux index c4580f13f..449194d54 100644 --- a/stdlib/source/lux/macro/syntax.lux +++ b/stdlib/source/lux/macro/syntax.lux @@ -14,11 +14,11 @@ ["." int] ["." rev] ["." frac]] - ["." text ("text/." monoid)] + ["." text ("#/." monoid)] [collection - ["." list ("list/." functor)]]]] + ["." list ("#/." functor)]]]] ["." // (#+ with-gensyms) - ["." code ("code/." equivalence)]]) + ["." code ("#/." equivalence)]]) (def: (join-pairs pairs) (All [a] (-> (List [a a]) (List a))) diff --git a/stdlib/source/lux/macro/syntax/common/reader.lux b/stdlib/source/lux/macro/syntax/common/reader.lux index 93e2ffa09..ee846218e 100644 --- a/stdlib/source/lux/macro/syntax/common/reader.lux +++ b/stdlib/source/lux/macro/syntax/common/reader.lux @@ -2,9 +2,9 @@ [lux #* [control monad - ["p" parser ("parser/." monad)]] + ["p" parser ("#/." monad)]] [data - [name ("name/." equivalence)] + ["." name ("#/." equivalence)] ["." product] ["." maybe] [collection @@ -16,8 +16,8 @@ ## Exports (def: #export export (Syntax Bit) - (p.either (p.after (s.this (' #export)) (parser/wrap #1)) - (parser/wrap #0))) + (p.either (p.after (s.this (' #export)) (p/wrap #1)) + (p/wrap #0))) ## Declarations (def: #export declaration @@ -27,7 +27,7 @@ (foo bar baz))} (Syntax //.Declaration) (p.either (p.and s.local-identifier - (parser/wrap (list))) + (p/wrap (list))) (s.form (p.and s.local-identifier (p.some s.local-identifier))))) @@ -45,7 +45,7 @@ type s.any value s.any] (wrap [(#.Some type) value]))) - (p.and (parser/wrap #.None) + (p.and (p/wrap #.None) s.any))) (def: _definition-anns-tag^ diff --git a/stdlib/source/lux/macro/syntax/common/writer.lux b/stdlib/source/lux/macro/syntax/common/writer.lux index 3a9e2b0a0..0cae624f2 100644 --- a/stdlib/source/lux/macro/syntax/common/writer.lux +++ b/stdlib/source/lux/macro/syntax/common/writer.lux @@ -3,7 +3,7 @@ [lux #* [data [collection - [list ("list/." functor)]] + ["." list ("#/." functor)]] ["." product]] ["." function] [macro diff --git a/stdlib/source/lux/macro/template.lux b/stdlib/source/lux/macro/template.lux index e08446bd8..b069736e5 100644 --- a/stdlib/source/lux/macro/template.lux +++ b/stdlib/source/lux/macro/template.lux @@ -5,7 +5,7 @@ ["p" parser]] [data [collection - ["." list ("list/." monad)]]]] + ["." list ("#/." monad)]]]] ["." // ["." code] ["s" syntax (#+ syntax:)]]) diff --git a/stdlib/source/lux/math/infix.lux b/stdlib/source/lux/math/infix.lux index dec158d52..3b4b89da2 100644 --- a/stdlib/source/lux/math/infix.lux +++ b/stdlib/source/lux/math/infix.lux @@ -2,11 +2,11 @@ [lux #* [control monad - ["p" parser ("parser/." functor)]] + ["p" parser ("#/." functor)]] [data ["." product] [collection - [list ("list/." fold)]]] + ["." list ("#/." fold)]]] [macro ["s" syntax (#+ syntax: Syntax)] ["." code]]]) @@ -22,14 +22,14 @@ (<| p.rec (function (_ infix^)) ($_ p.or ($_ p.either - (parser/map code.bit s.bit) - (parser/map code.nat s.nat) - (parser/map code.int s.int) - (parser/map code.rev s.rev) - (parser/map code.frac s.frac) - (parser/map code.text s.text) - (parser/map code.identifier s.identifier) - (parser/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 diff --git a/stdlib/source/lux/math/logic/continuous.lux b/stdlib/source/lux/math/logic/continuous.lux index 2f384742a..3e6ea581b 100644 --- a/stdlib/source/lux/math/logic/continuous.lux +++ b/stdlib/source/lux/math/logic/continuous.lux @@ -2,7 +2,7 @@ [lux (#- false true or and not) [data [number - [rev ("rev/." interval)]]]]) + ["." rev ("#/." interval)]]]]) (def: #export true Rev rev/top) (def: #export false Rev rev/bottom) diff --git a/stdlib/source/lux/math/modular.lux b/stdlib/source/lux/math/modular.lux index 8c0922af2..2d33e0c9d 100644 --- a/stdlib/source/lux/math/modular.lux +++ b/stdlib/source/lux/math/modular.lux @@ -8,8 +8,8 @@ [data ["." error (#+ Error)] [number - ["." int ("int/." decimal)]] - [text ("text/." monoid) + ["." int ("#/." decimal)]] + ["." text ("#/." monoid) ["l" lexer (#+ Lexer)]]] [type abstract] diff --git a/stdlib/source/lux/math/random.lux b/stdlib/source/lux/math/random.lux index 433cba425..1d694d7e7 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) ("text/." monoid) + ["." text (#+ Char) ("#/." monoid) ["." unicode (#+ Segment)]] [collection - ["." list ("list/." fold)] + ["." list ("#/." fold)] ["." array (#+ Array)] ["." dictionary (#+ Dictionary)] ["." queue (#+ Queue)] diff --git a/stdlib/source/lux/platform/compiler/default/init.lux b/stdlib/source/lux/platform/compiler/default/init.lux index b71596150..a416c0a3b 100644 --- a/stdlib/source/lux/platform/compiler/default/init.lux +++ b/stdlib/source/lux/platform/compiler/default/init.lux @@ -6,7 +6,7 @@ [data ["." product] ["." error (#+ Error)] - ["." text ("text/." hash)] + ["." text ("#/." hash)] [collection ["." dictionary]]] ["." macro] diff --git a/stdlib/source/lux/platform/compiler/host/scheme.lux b/stdlib/source/lux/platform/compiler/host/scheme.lux index f3550ad88..df5a091f3 100644 --- a/stdlib/source/lux/platform/compiler/host/scheme.lux +++ b/stdlib/source/lux/platform/compiler/host/scheme.lux @@ -7,7 +7,7 @@ ["." text format] [collection - ["." list ("list/." functor fold)]]] + ["." list ("#/." functor fold)]]] [type abstract]]) diff --git a/stdlib/source/lux/platform/compiler/meta/cache.lux b/stdlib/source/lux/platform/compiler/meta/cache.lux index c54fac935..7ba16878a 100644 --- a/stdlib/source/lux/platform/compiler/meta/cache.lux +++ b/stdlib/source/lux/platform/compiler/meta/cache.lux @@ -5,7 +5,7 @@ ["ex" exception (#+ exception:)] pipe] [data - ["." bit ("bit/." equivalence)] + ["." bit ("#/." equivalence)] ["." maybe] ["." error] ["." product] @@ -14,7 +14,7 @@ ["." text [format (#- Format)]] [collection - ["." list ("list/." functor fold)] + ["." list ("#/." functor fold)] ["dict" dictionary (#+ Dictionary)] ["." set (#+ Set)]]] [world diff --git a/stdlib/source/lux/platform/compiler/meta/cache/dependency.lux b/stdlib/source/lux/platform/compiler/meta/cache/dependency.lux index d18b92d59..4664ade1d 100644 --- a/stdlib/source/lux/platform/compiler/meta/cache/dependency.lux +++ b/stdlib/source/lux/platform/compiler/meta/cache/dependency.lux @@ -3,7 +3,7 @@ [data ["." text] [collection - [list ("list/." functor fold)] + ["." list ("#/." functor fold)] ["dict" dictionary (#+ Dictionary)]]]] [///io (#+ Module)] [///archive (#+ Archive)]) diff --git a/stdlib/source/lux/platform/compiler/phase.lux b/stdlib/source/lux/platform/compiler/phase.lux index 203ed73bc..66abcc6cd 100644 --- a/stdlib/source/lux/platform/compiler/phase.lux +++ b/stdlib/source/lux/platform/compiler/phase.lux @@ -6,7 +6,7 @@ [monad (#+ do)]] [data ["." product] - ["." error (#+ Error) ("error/." functor)] + ["." error (#+ Error) ("#/." functor)] ["." text format]] [time diff --git a/stdlib/source/lux/platform/compiler/phase/analysis.lux b/stdlib/source/lux/platform/compiler/phase/analysis.lux index d1bd6a986..845346482 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis.lux @@ -6,10 +6,10 @@ ["." product] ["." error] ["." maybe] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format] [collection - ["." list ("list/." functor fold)]]] + ["." list ("#/." functor fold)]]] ["." function]] [// ["." extension (#+ Extension)] diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/case.lux b/stdlib/source/lux/platform/compiler/phase/analysis/case.lux index 343d4c813..37bcfef6e 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis/case.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis/case.lux @@ -10,7 +10,7 @@ [text format] [collection - ["." list ("list/." fold monoid functor)]]] + ["." list ("#/." fold monoid functor)]]] ["." type ["." check]] ["." macro diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/case/coverage.lux b/stdlib/source/lux/platform/compiler/phase/analysis/case/coverage.lux index b21df1fcd..cd6ccd83d 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis/case/coverage.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis/case/coverage.lux @@ -5,16 +5,16 @@ ["ex" exception (#+ exception:)] equivalence] [data - [bit ("bit/." equivalence)] + ["." bit ("#/." equivalence)] ["." number] - ["." error (#+ Error) ("error/." monad)] + ["." error (#+ Error) ("#/." monad)] ["." maybe] ["." text format] [collection - ["." list ("list/." functor fold)] + ["." list ("#/." functor fold)] ["." dictionary (#+ Dictionary)]]]] - ["." //// ("operation/." monad)] + ["." //// ("#/." monad)] ["." /// (#+ Pattern Variant Operation)]) (exception: #export (invalid-tuple-pattern) @@ -92,13 +92,13 @@ (case pattern (^or (#///.Simple #///.Unit) (#///.Bind _)) - (operation/wrap #Exhaustive) + (/////wrap #Exhaustive) ## Primitive patterns always have partial coverage because there ## are too many possibilities as far as values go. (^template [<tag>] (#///.Simple (<tag> _)) - (operation/wrap #Partial)) + (/////wrap #Partial)) ([#///.Nat] [#///.Int] [#///.Rev] @@ -109,7 +109,7 @@ ## "#0", which means it is possible for bit ## pattern-matching to become exhaustive if complementary parts meet. (#///.Simple (#///.Bit value)) - (operation/wrap (#Bit value)) + (/////wrap (#Bit value)) ## Tuple patterns can be exhaustive if there is exhaustiveness for all of ## their sub-patterns. diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/function.lux b/stdlib/source/lux/platform/compiler/phase/analysis/function.lux index a95412e42..cbea165f8 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis/function.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis/function.lux @@ -8,7 +8,7 @@ ["." text format] [collection - ["." list ("list/." fold monoid monad)]]] + ["." list ("#/." fold monoid monad)]]] ["." type ["." check]] ["." macro]] diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/inference.lux b/stdlib/source/lux/platform/compiler/phase/analysis/inference.lux index 7ce10cb32..4ce9c6985 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis/inference.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis/inference.lux @@ -8,11 +8,11 @@ ["." text format] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] ["." type ["." check]] ["." macro]] - ["." /// ("operation/." monad) + ["." /// ("#/." monad) ["." extension]] [// (#+ Tag Analysis Operation Phase)] ["." //type]) @@ -191,7 +191,7 @@ (///.throw invalid-type-application inferT)) (#.Product _) - (operation/wrap (type.function (type.flatten-tuple inferT) inferT)) + (////wrap (type.function (type.flatten-tuple inferT) inferT)) _ (///.throw not-a-record-type inferT))) @@ -224,11 +224,11 @@ (n/< boundary tag))) (case (list.nth tag cases) (#.Some caseT) - (operation/wrap (if (n/= 0 depth) - (type.function (list caseT) currentT) - (let [replace' (replace (|> depth dec (n/* 2)) inferT)] - (type.function (list (replace' caseT)) - (replace' currentT))))) + (////wrap (if (n/= 0 depth) + (type.function (list caseT) currentT) + (let [replace' (replace (|> depth dec (n/* 2)) inferT)] + (type.function (list (replace' caseT)) + (replace' currentT))))) #.None (///.throw variant-tag-out-of-bounds [expected-size tag inferT])) @@ -238,11 +238,11 @@ (n/= boundary tag) (let [caseT (type.variant (list.drop boundary cases))] - (operation/wrap (if (n/= 0 depth) - (type.function (list caseT) currentT) - (let [replace' (replace (|> depth dec (n/* 2)) inferT)] - (type.function (list (replace' caseT)) - (replace' currentT)))))) + (////wrap (if (n/= 0 depth) + (type.function (list caseT) currentT) + (let [replace' (replace (|> depth dec (n/* 2)) inferT)] + (type.function (list (replace' caseT)) + (replace' currentT)))))) ## else (///.throw variant-tag-out-of-bounds [expected-size tag inferT]))) diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/macro.lux b/stdlib/source/lux/platform/compiler/phase/analysis/macro.lux index d02478454..18455b837 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis/macro.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis/macro.lux @@ -9,7 +9,7 @@ format] [collection [array (#+ Array)] - [list ("list/." functor)]]] + ["." list ("#/." functor)]]] ["." macro] ["." host (#+ import:)]] ["." ///]) diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/module.lux b/stdlib/source/lux/platform/compiler/phase/analysis/module.lux index 9905ee2dc..29865f352 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis/module.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis/module.lux @@ -5,11 +5,11 @@ ["ex" exception (#+ exception:)] pipe] [data - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format] ["." error] [collection - ["." list ("list/." fold functor)] + ["." list ("#/." fold functor)] [dictionary ["." plist]]]] ["." macro]] diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/reference.lux b/stdlib/source/lux/platform/compiler/phase/analysis/reference.lux index b7f41a81a..5969b9f5c 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis/reference.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis/reference.lux @@ -5,7 +5,7 @@ ["ex" exception (#+ exception:)]] ["." macro] [data - [text ("text/." equivalence) + ["." text ("#/." equivalence) format]]] ["." // (#+ Analysis Operation) ["." scope] diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/scope.lux b/stdlib/source/lux/platform/compiler/phase/analysis/scope.lux index c724edad2..69d7c80a9 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis/scope.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis/scope.lux @@ -4,13 +4,13 @@ monad ["ex" exception (#+ exception:)]] [data - [text ("text/." equivalence) + ["." text ("#/." equivalence) format] - ["." maybe ("maybe/." monad)] + ["." maybe ("#/." monad)] ["." product] ["e" error] [collection - ["." list ("list/." functor fold monoid)] + ["." list ("#/." functor fold monoid)] [dictionary ["." plist]]]]] [// (#+ Operation Phase) diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/structure.lux b/stdlib/source/lux/platform/compiler/phase/analysis/structure.lux index 21b2b6e2b..6991c67f7 100644 --- a/stdlib/source/lux/platform/compiler/phase/analysis/structure.lux +++ b/stdlib/source/lux/platform/compiler/phase/analysis/structure.lux @@ -13,7 +13,7 @@ [text format] [collection - ["." list ("list/." functor)] + ["." list ("#/." functor)] ["dict" dictionary (#+ Dictionary)]]] ["." type ["." check]] diff --git a/stdlib/source/lux/platform/compiler/phase/extension.lux b/stdlib/source/lux/platform/compiler/phase/extension.lux index 4e5721c5e..0d58cf37a 100644 --- a/stdlib/source/lux/platform/compiler/phase/extension.lux +++ b/stdlib/source/lux/platform/compiler/phase/extension.lux @@ -5,10 +5,10 @@ ["ex" exception (#+ exception:)]] [data ["." error (#+ Error)] - ["." text ("text/." order) + ["." text ("#/." order) format] [collection - ["." list ("list/." functor)] + ["." list ("#/." functor)] ["." dictionary (#+ Dictionary)]]] ["." function]] ["." //]) diff --git a/stdlib/source/lux/platform/compiler/phase/extension/analysis/common.lux b/stdlib/source/lux/platform/compiler/phase/extension/analysis/common.lux index 426c8af9e..fa9b36270 100644 --- a/stdlib/source/lux/platform/compiler/phase/extension/analysis/common.lux +++ b/stdlib/source/lux/platform/compiler/phase/extension/analysis/common.lux @@ -6,7 +6,7 @@ ["." text format] [collection - ["." list ("list/." functor)] + ["." list ("#/." functor)] ["." dictionary (#+ Dictionary)]]] [type ["." check]] diff --git a/stdlib/source/lux/platform/compiler/phase/extension/analysis/host.jvm.lux b/stdlib/source/lux/platform/compiler/phase/extension/analysis/host.jvm.lux index 6b4b7ad36..0654e79c4 100644 --- a/stdlib/source/lux/platform/compiler/phase/extension/analysis/host.jvm.lux +++ b/stdlib/source/lux/platform/compiler/phase/extension/analysis/host.jvm.lux @@ -9,10 +9,10 @@ ["." error (#+ Error)] ["." maybe] ["." product] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format] [collection - ["." list ("list/." fold functor monoid)] + ["." list ("#/." fold functor monoid)] ["." array (#+ Array)] ["." dictionary (#+ Dictionary)]]] ["." type @@ -24,7 +24,7 @@ ["." common] ["/." // ["." bundle] - ["//." // ("operation/." monad) + ["//." // ("#/." monad) ["." analysis (#+ Analysis Operation Handler Bundle) [".A" type] [".A" inference]]]]] @@ -276,13 +276,13 @@ (-> Type (Operation Text)) (case objectT (#.Primitive name _) - (operation/wrap name) + (/////wrap name) (#.Named name unnamed) (check-jvm unnamed) (#.Var id) - (operation/wrap "java.lang.Object") + (/////wrap "java.lang.Object") (^template [<tag>] (<tag> env unquantified) @@ -307,7 +307,7 @@ [name (check-jvm objectT)] (if (dictionary.contains? name boxes) (////.throw primitives-are-not-objects name) - (operation/wrap name)))) + (/////wrap name)))) (def: (box-array-element-type elemT) (-> Type (Operation [Type Text])) @@ -315,13 +315,13 @@ (#.Primitive name #.Nil) (let [boxed-name (|> (dictionary.get name boxes) (maybe.default name))] - (operation/wrap [(#.Primitive boxed-name #.Nil) - boxed-name])) + (/////wrap [(#.Primitive boxed-name #.Nil) + boxed-name])) (#.Primitive name _) (if (dictionary.contains? name boxes) (////.throw primitives-cannot-have-type-parameters name) - (operation/wrap [elemT name])) + (/////wrap [elemT name])) _ (////.throw invalid-type-for-array-element (%type elemT)))) @@ -562,7 +562,7 @@ (def: (java-type-to-class jvm-type) (-> java/lang/reflect/Type (Operation Text)) (cond (host.instance? Class jvm-type) - (operation/wrap (Class::getName (:coerce Class jvm-type))) + (/////wrap (Class::getName (:coerce Class jvm-type))) (host.instance? ParameterizedType jvm-type) (java-type-to-class (ParameterizedType::getRawType (:coerce ParameterizedType jvm-type))) @@ -581,7 +581,7 @@ (let [var-name (TypeVariable::getName (:coerce TypeVariable java-type))] (case (dictionary.get var-name mappings) (#.Some var-type) - (operation/wrap var-type) + (/////wrap var-type) #.None (////.throw unknown-type-var var-name))) @@ -594,21 +594,21 @@ (java-type-to-lux-type mappings bound) _ - (operation/wrap Any))) + (/////wrap Any))) (host.instance? Class java-type) (let [java-type (:coerce (Class Object) java-type) class-name (Class::getName java-type)] - (operation/wrap (case (array.size (Class::getTypeParameters java-type)) - 0 - (#.Primitive class-name (list)) - - arity - (|> (list.indices arity) - list.reverse - (list/map (|>> (n/* 2) inc #.Parameter)) - (#.Primitive class-name) - (type.univ-q arity))))) + (/////wrap (case (array.size (Class::getTypeParameters java-type)) + 0 + (#.Primitive class-name (list)) + + arity + (|> (list.indices arity) + list.reverse + (list/map (|>> (n/* 2) inc #.Parameter)) + (#.Primitive class-name) + (type.univ-q arity))))) (host.instance? ParameterizedType java-type) (let [java-type (:coerce ParameterizedType java-type) @@ -619,8 +619,8 @@ ParameterizedType::getActualTypeArguments array.to-list (monad.map @ (java-type-to-lux-type mappings)))] - (operation/wrap (#.Primitive (Class::getName (:coerce (Class Object) raw)) - paramsT))) + (/////wrap (#.Primitive (Class::getName (:coerce (Class Object) raw)) + paramsT))) (////.throw jvm-type-is-not-a-class raw))) (host.instance? GenericArrayType java-type) @@ -654,9 +654,9 @@ " Type: " (%type type))) ## else - (operation/wrap (|> params - (list.zip2 (list/map (|>> TypeVariable::getName) class-params)) - (dictionary.from-list text.hash))) + (/////wrap (|> params + (list.zip2 (list/map (|>> TypeVariable::getName) class-params)) + (dictionary.from-list text.hash))) )) _ @@ -901,14 +901,14 @@ (def: (java-type-to-parameter type) (-> java/lang/reflect/Type (Operation Text)) (cond (host.instance? Class type) - (operation/wrap (Class::getName (:coerce Class type))) + (/////wrap (Class::getName (:coerce Class type))) (host.instance? ParameterizedType type) (java-type-to-parameter (ParameterizedType::getRawType (:coerce ParameterizedType type))) (or (host.instance? TypeVariable type) (host.instance? WildcardType type)) - (operation/wrap "java.lang.Object") + (/////wrap "java.lang.Object") (host.instance? GenericArrayType type) (do ////.monad diff --git a/stdlib/source/lux/platform/compiler/phase/extension/bundle.lux b/stdlib/source/lux/platform/compiler/phase/extension/bundle.lux index 41879fa0c..643e3b38c 100644 --- a/stdlib/source/lux/platform/compiler/phase/extension/bundle.lux +++ b/stdlib/source/lux/platform/compiler/phase/extension/bundle.lux @@ -6,7 +6,7 @@ ["." text format] [collection - [list ("list/." functor)] + ["." list ("#/." functor)] ["." dictionary (#+ Dictionary)]]]] [// (#+ Handler Bundle)]) diff --git a/stdlib/source/lux/platform/compiler/phase/extension/statement.lux b/stdlib/source/lux/platform/compiler/phase/extension/statement.lux index 02edd7565..c5ae87050 100644 --- a/stdlib/source/lux/platform/compiler/phase/extension/statement.lux +++ b/stdlib/source/lux/platform/compiler/phase/extension/statement.lux @@ -7,7 +7,7 @@ [text format] [collection - [list ("list/." functor)] + ["." list ("#/." functor)] ["." dictionary]]] ["." macro] [type (#+ :share) diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis.lux b/stdlib/source/lux/platform/compiler/phase/synthesis.lux index f1239fdfe..4cc9c7336 100644 --- a/stdlib/source/lux/platform/compiler/phase/synthesis.lux +++ b/stdlib/source/lux/platform/compiler/phase/synthesis.lux @@ -5,11 +5,11 @@ [equivalence (#+ Equivalence)] ["ex" exception (#+ exception:)]] [data - [bit ("bit/." equivalence)] - ["." text ("text/." equivalence) + ["." bit ("#/." equivalence)] + ["." text ("#/." equivalence) format] [collection - [list ("list/." functor)] + ["." list ("#/." functor)] ["." dictionary (#+ Dictionary)]]]] ["." // ["." analysis (#+ Environment Arity Composite Analysis)] diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis/case.lux b/stdlib/source/lux/platform/compiler/phase/synthesis/case.lux index 95adf33f3..b1890688d 100644 --- a/stdlib/source/lux/platform/compiler/phase/synthesis/case.lux +++ b/stdlib/source/lux/platform/compiler/phase/synthesis/case.lux @@ -6,15 +6,16 @@ ["." monad (#+ do)]] [data ["." product] - [bit ("bit/." equivalence)] - [text ("text/." equivalence) + ["." bit ("#/." equivalence)] + ["." text ("#/." equivalence) format] - [number ("frac/." equivalence)] + [number + ["." frac ("#/." equivalence)]] [collection - ["." list ("list/." fold monoid)]]]] + ["." list ("#/." fold monoid)]]]] ["." // (#+ Path Synthesis Operation Phase) ["." function] - ["/." // ("operation/." monad) + ["/." // ("#/." monad) ["." analysis (#+ Pattern Match Analysis)] [// ["." reference]]]]) @@ -33,8 +34,8 @@ (^template [<from> <to>] (<from> value) - (operation/map (|>> (#//.Seq (#//.Test (|> value <to>)))) - thenC)) + (///map (|>> (#//.Seq (#//.Test (|> value <to>)))) + thenC)) ([#analysis.Bit #//.Bit] [#analysis.Nat (<| #//.I64 .i64)] [#analysis.Int (<| #//.I64 .i64)] @@ -48,11 +49,11 @@ thenC) (#analysis.Complex (#analysis.Variant [lefts right? value-pattern])) - (<| (operation/map (|>> (#//.Seq (#//.Access (#//.Side (if right? - (#.Right lefts) - (#.Left lefts))))))) + (<| (///map (|>> (#//.Seq (#//.Access (#//.Side (if right? + (#.Right lefts) + (#.Left lefts))))))) (path' value-pattern end?) - (when (not end?) (operation/map ..clean-up)) + (when (not end?) (///map ..clean-up)) thenC) (#analysis.Complex (#analysis.Tuple tuple)) @@ -60,18 +61,18 @@ (list/fold (function (_ [tuple::lefts tuple::member] nextC) (let [right? (n/= tuple::last tuple::lefts) end?' (and end? right?)] - (<| (operation/map (|>> (#//.Seq (#//.Access (#//.Member (if right? - (#.Right (dec tuple::lefts)) - (#.Left tuple::lefts))))))) + (<| (///map (|>> (#//.Seq (#//.Access (#//.Member (if right? + (#.Right (dec tuple::lefts)) + (#.Left tuple::lefts))))))) (path' tuple::member end?') - (when (not end?') (operation/map ..clean-up)) + (when (not end?') (///map ..clean-up)) nextC))) thenC (list.reverse (list.enumerate tuple)))))) (def: #export (path synthesize pattern bodyA) (-> Phase Pattern Analysis (Operation Path)) - (path' pattern true (operation/map (|>> #//.Then) (synthesize bodyA)))) + (path' pattern true (///map (|>> #//.Then) (synthesize bodyA)))) (def: #export (weave leftP rightP) (-> Path Path Path) diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis/expression.lux b/stdlib/source/lux/platform/compiler/phase/synthesis/expression.lux index 7b836b29a..ac6a82ab8 100644 --- a/stdlib/source/lux/platform/compiler/phase/synthesis/expression.lux +++ b/stdlib/source/lux/platform/compiler/phase/synthesis/expression.lux @@ -7,12 +7,12 @@ ["." maybe] ["." error] [collection - ["." list ("list/." functor)] + ["." list ("#/." functor)] ["." dictionary (#+ Dictionary)]]]] ["." // (#+ Synthesis Phase) ["." function] ["." case] - ["/." // ("operation/." monad) + ["/." // ("#/." monad) ["." analysis (#+ Analysis)] ["." extension] [// @@ -42,7 +42,7 @@ Phase (case analysis (#analysis.Primitive analysis') - (operation/wrap (#//.Primitive (..primitive analysis'))) + (///wrap (#//.Primitive (..primitive analysis'))) (#analysis.Structure structure) (case structure @@ -57,7 +57,7 @@ (:: ///.monad map (|>> //.tuple)))) (#analysis.Reference reference) - (operation/wrap (#//.Reference reference)) + (///wrap (#//.Reference reference)) (#analysis.Case inputA branchesAB+) (case.synthesize phase inputA branchesAB+) diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis/function.lux b/stdlib/source/lux/platform/compiler/phase/synthesis/function.lux index ccc7835a4..ce9efe59b 100644 --- a/stdlib/source/lux/platform/compiler/phase/synthesis/function.lux +++ b/stdlib/source/lux/platform/compiler/phase/synthesis/function.lux @@ -8,11 +8,11 @@ ["." text format] [collection - ["." list ("list/." functor monoid fold)] + ["." list ("#/." functor monoid fold)] ["dict" dictionary (#+ Dictionary)]]]] ["." // (#+ Path Synthesis Operation Phase) ["." loop (#+ Transform)] - ["/." // ("operation/." monad) + ["/." // ("#/." monad) ["." analysis (#+ Environment Arity Analysis)] [// ["." reference (#+ Register Variable)]]]]) @@ -62,7 +62,7 @@ (-> Environment Register (Operation Variable)) (case (list.nth register environment) (#.Some aliased) - (operation/wrap aliased) + (///wrap aliased) #.None (///.throw cannot-find-foreign-variable-in-environment [register environment]))) @@ -71,7 +71,7 @@ (-> (-> Synthesis (Operation Synthesis)) Path (Operation Path)) (case path (#//.Bind register) - (operation/wrap (#//.Bind (inc register))) + (///wrap (#//.Bind (inc register))) (^template [<tag>] (<tag> left right) @@ -84,10 +84,10 @@ (#//.Then thenS) (|> thenS grow - (operation/map (|>> #//.Then))) + (///map (|>> #//.Then))) _ - (operation/wrap path))) + (///wrap path))) (def: (grow-sub-environment super sub) (-> Environment Environment (Operation Environment)) @@ -95,7 +95,7 @@ (function (_ variable) (case variable (#reference.Local register) - (operation/wrap (#reference.Local (inc register))) + (///wrap (#reference.Local (inc register))) (#reference.Foreign register) (find-foreign super register))) @@ -109,30 +109,30 @@ (#analysis.Variant [lefts right? subS]) (|> subS (grow environment) - (operation/map (|>> [lefts right?] //.variant))) + (///map (|>> [lefts right?] //.variant))) (#analysis.Tuple membersS+) (|> membersS+ (monad.map ///.monad (grow environment)) - (operation/map (|>> //.tuple)))) + (///map (|>> //.tuple)))) (^ (..self-reference)) - (operation/wrap (//.function/apply [expression (list (//.variable/local 1))])) + (///wrap (//.function/apply [expression (list (//.variable/local 1))])) (#//.Reference reference) (case reference (#reference.Variable variable) (case variable (#reference.Local register) - (operation/wrap (//.variable/local (inc register))) + (///wrap (//.variable/local (inc register))) (#reference.Foreign register) (|> register (find-foreign environment) - (operation/map (|>> //.variable)))) + (///map (|>> //.variable)))) (#reference.Constant constant) - (operation/wrap expression)) + (///wrap expression)) (#//.Control control) (case control @@ -168,7 +168,7 @@ (#//.Recur argumentsS+) (|> argumentsS+ (monad.map ///.monad (grow environment)) - (operation/map (|>> //.loop/recur)))) + (///map (|>> //.loop/recur)))) (#//.Function function) (case function @@ -180,8 +180,8 @@ (#//.Apply funcS argsS+) (case funcS (^ (//.function/apply [(..self-reference) pre-argsS+])) - (operation/wrap (//.function/apply [(..self-reference) - (list/compose pre-argsS+ argsS+)])) + (///wrap (//.function/apply [(..self-reference) + (list/compose pre-argsS+ argsS+)])) _ (do ///.monad @@ -192,10 +192,10 @@ (#//.Extension name argumentsS+) (|> argumentsS+ (monad.map ///.monad (grow environment)) - (operation/map (|>> (#//.Extension name)))) + (///map (|>> (#//.Extension name)))) _ - (operation/wrap expression))) + (///wrap expression))) (def: #export (abstraction phase environment bodyA) (-> Phase Environment Analysis (Operation Synthesis)) diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis/loop.lux b/stdlib/source/lux/platform/compiler/phase/synthesis/loop.lux index 924a9b413..28517bd42 100644 --- a/stdlib/source/lux/platform/compiler/phase/synthesis/loop.lux +++ b/stdlib/source/lux/platform/compiler/phase/synthesis/loop.lux @@ -4,9 +4,9 @@ ["." monad (#+ do)] ["p" parser]] [data - ["." maybe ("maybe/." monad)] + ["." maybe ("#/." monad)] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [macro ["." code] ["." syntax]]] diff --git a/stdlib/source/lux/platform/compiler/phase/translation.lux b/stdlib/source/lux/platform/compiler/phase/translation.lux index 79c343d5a..d8522adcd 100644 --- a/stdlib/source/lux/platform/compiler/phase/translation.lux +++ b/stdlib/source/lux/platform/compiler/phase/translation.lux @@ -6,7 +6,7 @@ [data ["." product] ["." error (#+ Error)] - ["." name ("name/." equivalence)] + ["." name ("#/." equivalence)] ["." text format] [collection diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/case.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/case.jvm.lux index b50e4485a..92b55cb80 100644 --- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/case.jvm.lux +++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/case.jvm.lux @@ -8,12 +8,12 @@ ["." text format] [collection - [list ("list/." functor fold)] + ["." list ("#/." functor fold)] [set (#+ Set)]]]] [// ["." runtime (#+ Operation Phase)] ["." reference] - ["/." /// ("operation/." monad) + ["/." /// ("#/." monad) ["." synthesis (#+ Synthesis Path)] [// [reference (#+ Register)] @@ -111,16 +111,16 @@ (translate bodyS) #synthesis.Pop - (operation/wrap pop-cursor!) + (/////wrap pop-cursor!) (#synthesis.Bind register) - (operation/wrap (_.define (reference.local' register) [(list) #.None] - cursor-top)) + (/////wrap (_.define (reference.local' register) [(list) #.None] + cursor-top)) (^template [<tag> <format> <=>] (^ (<tag> value)) - (operation/wrap (_.when (|> value <format> (<=> cursor-top) _.not/1) - fail-pm!))) + (/////wrap (_.when (|> value <format> (<=> cursor-top) _.not/1) + fail-pm!))) ([synthesis.path/bit _.bool _.eqv?/2] [synthesis.path/i64 (<| _.int .int) _.=/2] [synthesis.path/f64 _.float _.=/2] @@ -128,16 +128,16 @@ (^template [<pm> <flag> <prep>] (^ (<pm> idx)) - (operation/wrap (_.let (list [@temp (|> idx <prep> .int _.int (runtime.sum//get cursor-top <flag>))]) - (_.if (_.null?/1 @temp) - fail-pm! - (push-cursor! @temp))))) + (/////wrap (_.let (list [@temp (|> idx <prep> .int _.int (runtime.sum//get cursor-top <flag>))]) + (_.if (_.null?/1 @temp) + fail-pm! + (push-cursor! @temp))))) ([synthesis.side/left _.nil (<|)] [synthesis.side/right (_.string "") inc]) (^template [<pm> <getter> <prep>] (^ (<pm> idx)) - (operation/wrap (|> idx <prep> .int _.int (<getter> cursor-top) push-cursor!))) + (/////wrap (|> idx <prep> .int _.int (<getter> cursor-top) push-cursor!))) ([synthesis.member/left runtime.product//left (<|)] [synthesis.member/right runtime.product//right inc]) diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/common.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/common.jvm.lux index 46f0c8102..1c55abf83 100644 --- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/common.jvm.lux +++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/common.jvm.lux @@ -10,7 +10,7 @@ format] [number (#+ hex)] [collection - ["." list ("list/." functor)] + ["." list ("#/." functor)] ["dict" dictionary (#+ Dictionary)]]] ["." macro (#+ with-gensyms) ["." code] diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/function.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/function.jvm.lux index 8d19558dd..fe08b6a50 100644 --- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/function.jvm.lux +++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/function.jvm.lux @@ -8,12 +8,12 @@ [text format] [collection - ["." list ("list/." functor)]]]] + ["." list ("#/." functor)]]]] [// ["." runtime (#+ Operation Phase)] ["." reference] ["/." // - ["//." // ("operation/." monad) + ["//." // ("#/." monad) [analysis (#+ Variant Tuple Environment Arity Abstraction Application Analysis)] [synthesis (#+ Synthesis)] [// @@ -33,7 +33,7 @@ (def: (with-closure function-name inits function-definition) (-> Text (List Expression) Computation (Operation Computation)) (let [@closure (_.var (format function-name "___CLOSURE"))] - (operation/wrap + (/////wrap (case inits #.Nil function-definition diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/loop.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/loop.jvm.lux index e25b96254..0d85654c1 100644 --- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/loop.jvm.lux +++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/loop.jvm.lux @@ -7,7 +7,7 @@ ["." text format] [collection - ["." list ("list/." functor)]]]] + ["." list ("#/." functor)]]]] [// [runtime (#+ Operation Phase)] ["." reference] diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/primitive.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/primitive.jvm.lux index caa71f74f..dc643bcbc 100644 --- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/primitive.jvm.lux +++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/primitive.jvm.lux @@ -3,23 +3,23 @@ [// [runtime (#+ Operation)] [// (#+ State) - [// ("operation/." monad) + ["//." // ("#/." monad) [/// [host ["_" scheme (#+ Expression)]]]]]]) (def: #export bit (-> Bit (Operation Expression)) - (|>> _.bool operation/wrap)) + (|>> _.bool /////wrap)) (def: #export i64 (-> (I64 Any) (Operation Expression)) - (|>> .int _.int operation/wrap)) + (|>> .int _.int /////wrap)) (def: #export f64 (-> Frac (Operation Expression)) - (|>> _.float operation/wrap)) + (|>> _.float /////wrap)) (def: #export text (-> Text (Operation Expression)) - (|>> _.string operation/wrap)) + (|>> _.string /////wrap)) diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/reference.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/reference.jvm.lux index 88e091e83..161d2adea 100644 --- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/reference.jvm.lux +++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/reference.jvm.lux @@ -8,7 +8,7 @@ [// [runtime (#+ Operation)] ["/." // - [// ("operation/." monad) + ["//." // ("#/." monad) [analysis (#+ Variant Tuple)] [synthesis (#+ Synthesis)] [// @@ -33,11 +33,11 @@ (#reference.Foreign register) (foreign' register)) - operation/wrap)) + /////wrap)) (def: #export constant (-> Name (Operation Global)) - (|>> ///.remember (operation/map _.global))) + (|>> ///.remember (/////map _.global))) (def: #export reference (-> Reference (Operation Expression)) diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/runtime.jvm.lux b/stdlib/source/lux/platform/compiler/phase/translation/scheme/runtime.jvm.lux index 97e53d143..d254e8c7d 100644 --- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/runtime.jvm.lux +++ b/stdlib/source/lux/platform/compiler/phase/translation/scheme/runtime.jvm.lux @@ -1,14 +1,14 @@ (.module: [lux #* [control - ["p" parser ("parser/." monad)] + ["p" parser ("#/." monad)] [monad (#+ do)]] [data [number (#+ hex)] [text format] [collection - ["." list ("list/." monad)]]] + ["." list ("#/." monad)]]] ["." function] [macro ["." code] @@ -74,7 +74,7 @@ (def: declaration (s.Syntax [Text (List Text)]) - (p.either (p.and s.local-identifier (parser/wrap (list))) + (p.either (p.and s.local-identifier (p/wrap (list))) (s.form (p.and s.local-identifier (p.some s.local-identifier))))) (syntax: (runtime: {[name args] declaration} diff --git a/stdlib/source/lux/platform/interpreter.lux b/stdlib/source/lux/platform/interpreter.lux index 87206750d..d2fbccfdc 100644 --- a/stdlib/source/lux/platform/interpreter.lux +++ b/stdlib/source/lux/platform/interpreter.lux @@ -5,7 +5,7 @@ ["ex" exception (#+ exception:)]] [data ["." error (#+ Error)] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format]] [type (#+ :share) ["." check]] diff --git a/stdlib/source/lux/platform/mediator/parallelism.lux b/stdlib/source/lux/platform/mediator/parallelism.lux index 251ec1f9f..c694f0490 100644 --- a/stdlib/source/lux/platform/mediator/parallelism.lux +++ b/stdlib/source/lux/platform/mediator/parallelism.lux @@ -4,15 +4,15 @@ ["." monad (#+ Monad do)] ["ex" exception (#+ exception:)]] [concurrency - ["." promise (#+ Promise) ("promise/." functor)] + ["." promise (#+ Promise) ("#/." functor)] ["." task (#+ Task)] ["." stm (#+ Var STM)]] [data - ["." error (#+ Error) ("error/." monad)] - ["." text ("text/." equivalence) + ["." error (#+ Error) ("#/." monad)] + ["." text ("#/." equivalence) format] [collection - [list ("list/." functor)] + ["." list ("#/." functor)] ["." dictionary (#+ Dictionary)]]] ["." io]] ["." // (#+ Source Mediator) diff --git a/stdlib/source/lux/test.lux b/stdlib/source/lux/test.lux index 86957c223..a360bf424 100644 --- a/stdlib/source/lux/test.lux +++ b/stdlib/source/lux/test.lux @@ -4,18 +4,18 @@ ["." monad (#+ Monad do)] ["ex" exception (#+ exception:)] [concurrency - ["." promise (#+ Promise) ("promise/." monad)]]] + ["." promise (#+ Promise) ("#/." monad)]]] [data ["." product] ["." text format] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [time ["." instant] ["." duration]] [math - ["r" random ("random/." monad)]] + ["r" random ("#/." monad)]] ["." io]]) (type: #export Counters @@ -60,12 +60,12 @@ (def: #export (context description) (-> Text Test Test) - (random/map (promise/map (function (_ [counters documentation]) - [counters (|> documentation - (text.split-all-with ..separator) - (list/map (|>> (format context-prefix))) - (text.join-with ..separator) - (format description ..separator))])))) + (r/map (promise/map (function (_ [counters documentation]) + [counters (|> documentation + (text.split-all-with ..separator) + (list/map (|>> (format context-prefix))) + (text.join-with ..separator) + (format description ..separator))])))) (def: failure-prefix "[Failure] ") (def: success-prefix "[Success] ") @@ -75,7 +75,7 @@ (|>> (format ..failure-prefix) [failure] promise/wrap - random/wrap)) + r/wrap)) (def: #export (assert message condition) {#.doc "Check that a condition is #1, and fail with the given message otherwise."} diff --git a/stdlib/source/lux/time/date.lux b/stdlib/source/lux/time/date.lux index 1bee129e4..42ad0c998 100644 --- a/stdlib/source/lux/time/date.lux +++ b/stdlib/source/lux/time/date.lux @@ -5,15 +5,15 @@ [order (#+ Order)] [enum (#+ Enum)] codec - ["p" parser ("p/." functor)] + ["p" parser ("#/." functor)] [monad (#+ do)]] [data ["." error (#+ Error)] ["." maybe] [number - ["." nat ("nat/." decimal)] - ["." int ("int/." decimal)]] - [text ("text/." monoid) + ["." nat ("#/." decimal)] + ["." int ("#/." decimal)]] + ["." text ("#/." monoid) ["l" lexer]] [collection ["." row (#+ Row row)]]]] diff --git a/stdlib/source/lux/time/duration.lux b/stdlib/source/lux/time/duration.lux index 3c3fab0dd..e15004e14 100644 --- a/stdlib/source/lux/time/duration.lux +++ b/stdlib/source/lux/time/duration.lux @@ -9,9 +9,9 @@ [monad (#+ do)]] [data [number - ["." nat ("nat/." decimal)] - ["." int ("int/." decimal number)]] - [text ("text/." monoid) + ["." nat ("#/." decimal)] + ["." int ("#/." decimal number)]] + ["." text ("#/." monoid) ["l" lexer]] ["e" error]] [type diff --git a/stdlib/source/lux/time/instant.lux b/stdlib/source/lux/time/instant.lux index b85e3edd1..1ac559fc2 100644 --- a/stdlib/source/lux/time/instant.lux +++ b/stdlib/source/lux/time/instant.lux @@ -12,16 +12,16 @@ ["." error (#+ Error)] ["." maybe] [number - ["." int ("int/." decimal)]] - [text ("text/." monoid) + ["." int ("#/." decimal)]] + ["." text ("#/." monoid) ["l" lexer]] [collection - ["." list ("list/." fold)] - ["." row (#+ Row row) ("row/." functor fold)]]] + ["." list ("#/." fold)] + ["." row (#+ Row row) ("#/." functor fold)]]] [type abstract]] [// - ["." duration ("duration/." order)] + ["." duration ("#/." order)] ["." date (#+ Date)] ["." month (#+ Month)] ["." day (#+ Day)]]) diff --git a/stdlib/source/lux/type.lux b/stdlib/source/lux/type.lux index e72eccd55..8d0dcad7d 100644 --- a/stdlib/source/lux/type.lux +++ b/stdlib/source/lux/type.lux @@ -5,14 +5,14 @@ [monad (#+ Monad do)] ["p" parser]] [data - ["." text ("text/." monoid equivalence)] - [name ("name/." equivalence codec)] + ["." text ("#/." monoid equivalence)] + ["." name ("#/." equivalence codec)] [number - [nat ("nat/." decimal)]] + ["." nat ("#/." decimal)]] ["." maybe] [collection ["." array] - ["." list ("list/." functor monoid fold)]]] + ["." list ("#/." functor monoid fold)]]] ["." macro ["." code] ["s" syntax (#+ Syntax syntax:)]]]) diff --git a/stdlib/source/lux/type/abstract.lux b/stdlib/source/lux/type/abstract.lux index fb086d2ed..ccaa294b7 100644 --- a/stdlib/source/lux/type/abstract.lux +++ b/stdlib/source/lux/type/abstract.lux @@ -2,15 +2,15 @@ [lux (#- Scope) [control [monad (#+ Monad do)] - ["p" parser ("p/." monad)] + ["p" parser ("#/." monad)] ["ex" exception (#+ exception:)]] [data - [name ("name/." codec)] - [text ("text/." equivalence monoid)] + ["." name ("#/." codec)] + ["." text ("#/." equivalence monoid)] [collection - ["." list ("list/." functor monoid)] + ["." list ("#/." functor monoid)] ["." stack (#+ Stack)]]] - ["." macro ("meta/." monad) + ["." macro ("#/." monad) ["." code] ["s" syntax (#+ Syntax syntax:)] [syntax diff --git a/stdlib/source/lux/type/check.lux b/stdlib/source/lux/type/check.lux index d12b19599..42479451c 100644 --- a/stdlib/source/lux/type/check.lux +++ b/stdlib/source/lux/type/check.lux @@ -10,12 +10,12 @@ ["." product] ["." error (#+ Error)] [number - ["." nat ("nat/." decimal)]] - ["." text ("text/." monoid equivalence)] + ["." nat ("#/." decimal)]] + ["." text ("#/." monoid equivalence)] [collection ["." list] ["." set (#+ Set)]]]] - ["." // ("type/." equivalence)]) + ["." // ("#/." equivalence)]) (template: (!n/= reference subject) ("lux i64 =" subject reference)) @@ -327,8 +327,8 @@ (def: (assumed? [e a] assumptions) (-> Assumption (List Assumption) Bit) (list.any? (function (_ [e' a']) - (and (type/= e e') - (type/= a a'))) + (and (///= e e') + (///= a a'))) assumptions)) (def: (assume! assumption assumptions) diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux index 83a8e9998..762352657 100644 --- a/stdlib/source/lux/type/implicit.lux +++ b/stdlib/source/lux/type/implicit.lux @@ -8,10 +8,10 @@ ["." product] ["." maybe] ["." number] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format] [collection - ["." list ("list/." monad fold)] + ["." list ("#/." monad fold)] ["dict" dictionary (#+ Dictionary)]]] ["." macro ["." code] diff --git a/stdlib/source/lux/type/refinement.lux b/stdlib/source/lux/type/refinement.lux index 5f5673785..0881eb8eb 100644 --- a/stdlib/source/lux/type/refinement.lux +++ b/stdlib/source/lux/type/refinement.lux @@ -6,7 +6,7 @@ ["p" parser]] [data ["." error (#+ Error)]] - ["." type ("type/." equivalence) + ["." type ("#/." equivalence) abstract] ["." macro ["s" syntax (#+ syntax:)] diff --git a/stdlib/source/lux/type/resource.lux b/stdlib/source/lux/type/resource.lux index 963034dbb..80d16164e 100644 --- a/stdlib/source/lux/type/resource.lux +++ b/stdlib/source/lux/type/resource.lux @@ -16,7 +16,7 @@ ["dict" dictionary (#+ Dictionary)] ["." set] ["." row (#+ Row)] - ["." list ("list/." functor fold)]]] + ["." list ("#/." functor fold)]]] [concurrency ["." promise (#+ Promise)]] ["." macro diff --git a/stdlib/source/lux/world/db/jdbc.jvm.lux b/stdlib/source/lux/world/db/jdbc.jvm.lux index e73adef88..cc6dd79c1 100644 --- a/stdlib/source/lux/world/db/jdbc.jvm.lux +++ b/stdlib/source/lux/world/db/jdbc.jvm.lux @@ -6,7 +6,7 @@ [monad (#+ Monad do)] ["ex" exception] [concurrency - ["." promise (#+ Promise) ("promise/." monad)]] + ["." promise (#+ Promise) ("#/." monad)]] [security ["!" capability (#+ capability:)]]] [data @@ -15,7 +15,7 @@ [text format] [collection - [list ("list/." fold)]]] + ["." list ("#/." fold)]]] ["." io (#+ IO)] [world [net (#+ URL)]] diff --git a/stdlib/source/lux/world/db/jdbc/input.jvm.lux b/stdlib/source/lux/world/db/jdbc/input.jvm.lux index 455cddd01..8e1797ab0 100644 --- a/stdlib/source/lux/world/db/jdbc/input.jvm.lux +++ b/stdlib/source/lux/world/db/jdbc/input.jvm.lux @@ -6,7 +6,7 @@ [data ["." error (#+ Error)] [collection - [list ("list/." fold)]]] + ["." list ("#/." fold)]]] [time ["." instant (#+ Instant)]] ["." io (#+ IO)] diff --git a/stdlib/source/lux/world/db/sql.lux b/stdlib/source/lux/world/db/sql.lux index dad0e4893..fc53fc099 100644 --- a/stdlib/source/lux/world/db/sql.lux +++ b/stdlib/source/lux/world/db/sql.lux @@ -3,10 +3,10 @@ [control [monad (#+ do)]] [data - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format] [collection - [list ("list/." functor)]]] + ["." list ("#/." functor)]]] [type abstract]]) diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/lux/world/file.lux index 1dd29acfe..b909578d8 100644 --- a/stdlib/source/lux/world/file.lux +++ b/stdlib/source/lux/world/file.lux @@ -9,12 +9,12 @@ ["!" capability (#+ capability:)]]] [data ["." maybe] - ["." error (#+ Error) ("error/." functor)] + ["." error (#+ Error) ("#/." functor)] ["." text format] [collection ["." array (#+ Array)] - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [time ["." instant (#+ Instant)] ["." duration]] @@ -22,7 +22,7 @@ ["." template]] [world ["." binary (#+ Binary)]] - ["." io (#+ IO) ("io/." functor)] + ["." io (#+ IO) ("#/." functor)] [host (#+ import:)] [platform [compiler diff --git a/stdlib/source/lux/world/net/http/cookie.lux b/stdlib/source/lux/world/net/http/cookie.lux index 315a9e12f..4f10a6dc8 100644 --- a/stdlib/source/lux/world/net/http/cookie.lux +++ b/stdlib/source/lux/world/net/http/cookie.lux @@ -2,7 +2,7 @@ [lux #* [control [monad (#+ do)] - ["p" parser ("p/." monad)]] + ["p" parser ("#/." monad)]] [data ["." error (#+ Error)] [text diff --git a/stdlib/source/lux/world/net/http/request.lux b/stdlib/source/lux/world/net/http/request.lux index b8c4b6b4e..b0d177c09 100644 --- a/stdlib/source/lux/world/net/http/request.lux +++ b/stdlib/source/lux/world/net/http/request.lux @@ -16,7 +16,7 @@ ["." json (#+ JSON)] ["." context (#+ Context Property)]] [collection - [list ("list/." functor fold)] + ["." list ("#/." functor fold)] ["." dictionary]]] [world ["." binary (#+ Binary)]]] diff --git a/stdlib/source/lux/world/net/http/response.lux b/stdlib/source/lux/world/net/http/response.lux index 9b83e9cad..93d6f0df9 100644 --- a/stdlib/source/lux/world/net/http/response.lux +++ b/stdlib/source/lux/world/net/http/response.lux @@ -3,7 +3,7 @@ [control [concurrency ["." promise] - ["." frp ("channel/." monad)]]] + ["." frp ("#/." monad)]]] [data ["." text format @@ -12,7 +12,7 @@ ["." html] ["." css (#+ CSS)] ["." context] - ["." json (#+ JSON) ("json/." codec)]]] + ["." json (#+ JSON) ("#/." codec)]]] ["." io] [world ["." binary (#+ Binary)]]] @@ -29,7 +29,7 @@ (def: #export empty (-> Status Response) - (let [body (channel/wrap (encoding.to-utf8 ""))] + (let [body (frp/wrap (encoding.to-utf8 ""))] (function (_ status) [status {#//.headers (|> context.empty @@ -52,7 +52,7 @@ {#//.headers (|> context.empty (header.content-length (binary.size data)) (header.content-type type)) - #//.body (channel/wrap data)}]) + #//.body (frp/wrap data)}]) (def: #export bad-request (-> Text Response) diff --git a/stdlib/source/lux/world/net/http/route.lux b/stdlib/source/lux/world/net/http/route.lux index c15972ca6..c35b06773 100644 --- a/stdlib/source/lux/world/net/http/route.lux +++ b/stdlib/source/lux/world/net/http/route.lux @@ -6,7 +6,7 @@ ["." promise]]] [data ["." maybe] - ["." text ("text/." equivalence)]]] + ["." text ("#/." equivalence)]]] ["." // (#+ URI Server) ["//." status] ["//." response]]) diff --git a/stdlib/source/lux/world/service/journal.lux b/stdlib/source/lux/world/service/journal.lux index 3919d11f9..1bd9c3fda 100644 --- a/stdlib/source/lux/world/service/journal.lux +++ b/stdlib/source/lux/world/service/journal.lux @@ -7,9 +7,9 @@ ["!" capability (#+ capability:)]]] [data [error (#+ Error)] - [text ("text/." equivalence)]] + ["." text ("#/." equivalence)]] [time - ["." instant (#+ Instant) ("instant/." equivalence)]]]) + ["." instant (#+ Instant) ("#/." equivalence)]]]) (type: #export (Entry a) {#what a diff --git a/stdlib/source/program/licentia.lux b/stdlib/source/program/licentia.lux index 42af77bf2..479af7793 100644 --- a/stdlib/source/program/licentia.lux +++ b/stdlib/source/program/licentia.lux @@ -26,7 +26,7 @@ [format ["." json]]] ["." cli (#+ program:)] - ["." io ("io/." Monad<IO>)] + ["." io ("#/." monad)] [world ["." file (#+ File)]] [host (#+ import:)]] diff --git a/stdlib/source/program/licentia/document.lux b/stdlib/source/program/licentia/document.lux index bb128807b..9afbb8d7b 100644 --- a/stdlib/source/program/licentia/document.lux +++ b/stdlib/source/program/licentia/document.lux @@ -4,7 +4,7 @@ ["." text format] [collection - [list ("list/." functor)]]]]) + ["." list ("#/." functor)]]]]) (def: #export (quote text) (-> Text Text) diff --git a/stdlib/source/program/licentia/license/black-list.lux b/stdlib/source/program/licentia/license/black-list.lux index 7f30acadf..1b1ec2dff 100644 --- a/stdlib/source/program/licentia/license/black-list.lux +++ b/stdlib/source/program/licentia/license/black-list.lux @@ -1,11 +1,11 @@ (.module: [lux #* [data - ["." maybe ("maybe/." functor)] + ["." maybe ("#/." functor)] ["." text format] [collection - ["." list ("list/." functor)]]]] + ["." list ("#/." functor)]]]] ["." // (#+ Entity Black-List) ["_" term] [// diff --git a/stdlib/source/program/licentia/license/commercial.lux b/stdlib/source/program/licentia/license/commercial.lux index a80ccbde2..37b2e2d74 100644 --- a/stdlib/source/program/licentia/license/commercial.lux +++ b/stdlib/source/program/licentia/license/commercial.lux @@ -4,7 +4,7 @@ ["." text format] [collection - [list ("list/." monoid)]]]] + ["." list ("#/." monoid)]]]] ["." // (#+ Commercial) ["_" term] [// diff --git a/stdlib/source/program/licentia/license/distribution.lux b/stdlib/source/program/licentia/license/distribution.lux index 346f3a3b4..a42a83ba9 100644 --- a/stdlib/source/program/licentia/license/distribution.lux +++ b/stdlib/source/program/licentia/license/distribution.lux @@ -4,7 +4,7 @@ ["." text format] [collection - [list ("list/." monoid)]]]] + ["." list ("#/." monoid)]]]] ["." // (#+ Distribution) ["_" term] [// diff --git a/stdlib/source/program/licentia/license/extension.lux b/stdlib/source/program/licentia/license/extension.lux index 1ce3bfccc..7a12f45b9 100644 --- a/stdlib/source/program/licentia/license/extension.lux +++ b/stdlib/source/program/licentia/license/extension.lux @@ -4,7 +4,7 @@ ["." text format] [collection - [list ("list/." monoid)]]]] + ["." list ("#/." monoid)]]]] ["." // (#+ Extension) ["_" term] ["." grant] diff --git a/stdlib/source/program/licentia/license/notice.lux b/stdlib/source/program/licentia/license/notice.lux index 320dd4d7c..b16dfbc9e 100644 --- a/stdlib/source/program/licentia/license/notice.lux +++ b/stdlib/source/program/licentia/license/notice.lux @@ -4,7 +4,7 @@ ["." text format] [collection - [list ("list/." functor)]]]] + ["." list ("#/." functor)]]]] [// ["//." time] ["//." copyright] diff --git a/stdlib/source/program/licentia/output.lux b/stdlib/source/program/licentia/output.lux index 4f9a4ab2c..475c4b908 100644 --- a/stdlib/source/program/licentia/output.lux +++ b/stdlib/source/program/licentia/output.lux @@ -1,11 +1,11 @@ (.module: [lux (#- Definition) [data - ["." maybe ("maybe/." functor)] + ["." maybe ("#/." functor)] ["." text format] [collection - [list ("list/." functor monoid)]]]] + ["." list ("#/." functor monoid)]]]] [// ["." license (#+ Identification Termination diff --git a/stdlib/source/program/scriptum.lux b/stdlib/source/program/scriptum.lux index 16ede26de..04570a9bb 100644 --- a/stdlib/source/program/scriptum.lux +++ b/stdlib/source/program/scriptum.lux @@ -13,12 +13,12 @@ ["." error (#+ Error)] [format ["md" markdown (#+ Markdown Span Block)]] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format ["." encoding]] [collection - ["." sequence (#+ Sequence) ("sequence/." functor)] - ["." list ("list/." functor fold)]]] + ["." sequence (#+ Sequence) ("#/." functor)] + ["." list ("#/." functor fold)]]] ["." function] ["." type] ["." macro] diff --git a/stdlib/source/test/licentia.lux b/stdlib/source/test/licentia.lux index 7b723ad0e..0dd3183ca 100644 --- a/stdlib/source/test/licentia.lux +++ b/stdlib/source/test/licentia.lux @@ -6,13 +6,13 @@ [control [monad (#+ do)]] [data - [bit ("bit/." equivalence)] - ["." maybe ("maybe/." functor)] + ["." bit ("#/." equivalence)] + ["." maybe ("#/." functor)] [number - [nat ("nat/." interval)]] + ["." nat ("#/." interval)]] ["." text] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [math ["r" random (#+ Random)]]] {#program diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index adc14e47a..e498c1445 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -10,7 +10,7 @@ ["." i64]]] ["." function] ["." math - ["r" random (#+ Random) ("r/." functor)]] + ["r" random (#+ Random) ("#/." functor)]] ["_" test (#+ Test)] ## These modules do not need to be tested. [type diff --git a/stdlib/source/test/lux/cli.lux b/stdlib/source/test/lux/cli.lux index e202b3aa7..8c04a119d 100644 --- a/stdlib/source/test/lux/cli.lux +++ b/stdlib/source/test/lux/cli.lux @@ -7,8 +7,8 @@ [data ["." error] [number - ["." nat ("nat/." decimal)]] - [text ("text/." equivalence) + ["." nat ("#/." decimal)]] + ["." text ("#/." equivalence) format] [collection ["." list]]] diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux index 2bf02bb0e..a05eda326 100644 --- a/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux +++ b/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux @@ -6,12 +6,12 @@ [data ["." product] ["." maybe] - ["." text ("text/." equivalence)] + ["." text ("#/." equivalence)] [collection - ["." list ("list/." monad)] + ["." list ("#/." monad)] ["." set]]] [math - ["r" random ("random/." monad)]] + ["r" random ("#/." monad)]] ["." type ["." check]] [macro @@ -47,7 +47,7 @@ (-> Bit (List [Code Code]) Code (r.Random (List Code))) (case inputC [_ (#.Bit _)] - (random/wrap (list (' #1) (' #0))) + (r/wrap (list (' #1) (' #0))) (^template [<tag> <gen> <wrapper>] [_ (<tag> _)] @@ -62,7 +62,7 @@ #.None (wrap (list (' _))))) - (random/wrap (list (' _))))) + (r/wrap (list (' _))))) ([#.Nat r.nat code.nat] [#.Int r.int code.int] [#.Rev r.rev code.rev] @@ -70,10 +70,10 @@ [#.Text (r.unicode 5) code.text]) (^ [_ (#.Tuple (list))]) - (random/wrap (list (' []))) + (r/wrap (list (' []))) (^ [_ (#.Record (list))]) - (random/wrap (list (' {}))) + (r/wrap (list (' {}))) [_ (#.Tuple members)] (do r.monad @@ -103,7 +103,7 @@ (wrap (list/join bundles))) _ - (random/wrap (list)) + (r/wrap (list)) )) (def: #export (input variant-tags record-tags primitivesC) @@ -111,7 +111,7 @@ (r.rec (function (_ input) ($_ r.either - (random/map product.right _primitive.primitive) + (r/map product.right _primitive.primitive) (do r.monad [choice (|> r.nat (:: @ map (n/% (list.size variant-tags)))) #let [choiceT (maybe.assume (list.nth choice variant-tags)) @@ -121,7 +121,7 @@ [size (|> r.nat (:: @ map (n/% 3))) elems (r.list size input)] (wrap (code.tuple elems))) - (random/wrap (code.record (list.zip2 record-tags primitivesC))) + (r/wrap (code.record (list.zip2 record-tags primitivesC))) )))) (def: (branch body pattern) diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux index 0ec5d4766..829f83713 100644 --- a/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux +++ b/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux @@ -7,10 +7,10 @@ ["." error] ["." maybe] ["." product] - [text ("text/." equivalence) + ["." text ("#/." equivalence) format] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [math ["r" random]] ["." type] diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux index de079094b..b73e4f81c 100644 --- a/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux +++ b/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux @@ -9,8 +9,8 @@ [text format]] [math - ["r" random ("random/." monad)]] - [".L" type ("type/." equivalence)] + ["r" random ("#/." monad)]] + ["." type ("#/." equivalence)] [macro ["." code]] [compiler @@ -35,13 +35,13 @@ (def: unit (r.Random Code) - (random/wrap (' []))) + (r/wrap (' []))) (def: #export primitive (r.Random [Type Code]) (`` ($_ r.either (~~ (do-template [<type> <code-wrapper> <value-gen>] - [(r.and (random/wrap <type>) (random/map <code-wrapper> <value-gen>))] + [(r.and (r/wrap <type>) (r/map <code-wrapper> <value-gen>))] [Any code.tuple (r.list 0 ..unit)] [Bit code.bit r.bit] diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux index 6576ae90d..5464981a1 100644 --- a/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux +++ b/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux @@ -13,7 +13,7 @@ format]] [math ["r" random]] - [type ("type/." equivalence)] + ["." type ("#/." equivalence)] [macro ["." code]] [compiler diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux index 18ab58fa9..b2f64ac19 100644 --- a/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux +++ b/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux @@ -5,11 +5,11 @@ pipe] [data ["." error (#+ Error)] - [name ("name/." equivalence)] - [text ("text/." equivalence)]] + ["." name ("#/." equivalence)] + ["." text ("#/." equivalence)]] [math ["r" random]] - [type ("type/." equivalence)] + ["." type ("#/." equivalence)] [macro ["." code]] [compiler diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux index 63c6da493..34a43c042 100644 --- a/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux +++ b/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux @@ -4,17 +4,17 @@ [monad (#+ do)] pipe] [data - [bit ("bit/." equivalence)] + ["." bit ("#/." equivalence)] ["e" error] ["." product] ["." maybe] ["." text] [collection - ["." list ("list/." functor)] + ["." list ("#/." functor)] ["." set]]] [math ["r" random]] - ["." type ("type/." equivalence) + ["." type ("#/." equivalence) ["." check]] [macro ["." code]] diff --git a/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux index 319d4ab57..7a67e4bfa 100644 --- a/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux +++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux @@ -4,7 +4,7 @@ [monad (#+ do)] pipe] [data - ["." error ("error/." functor)]] + ["." error ("#/." functor)]] [compiler [default ["." reference] diff --git a/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux index f2565dfa0..4866086aa 100644 --- a/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux +++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux @@ -11,7 +11,7 @@ [text format] [collection - ["." list ("list/." functor fold)] + ["." list ("#/." functor fold)] ["dict" dictionary (#+ Dictionary)] ["." set]]] [compiler diff --git a/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux index 7f9eae209..97d4c037d 100644 --- a/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux +++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux @@ -4,7 +4,7 @@ [monad (#+ do)] pipe] [data - [bit ("bit/." equivalence)] + ["." bit ("#/." equivalence)] ["." product] ["." error] [collection diff --git a/stdlib/source/test/lux/compiler/default/syntax.lux b/stdlib/source/test/lux/compiler/default/syntax.lux index fb83bda4c..6f1d2152d 100644 --- a/stdlib/source/test/lux/compiler/default/syntax.lux +++ b/stdlib/source/test/lux/compiler/default/syntax.lux @@ -11,7 +11,7 @@ ["." list] ["." dictionary (#+ Dictionary)]]] [math - ["r" random ("r/." monad)]] + ["r" random ("#/." monad)]] [macro ["." code]] [compiler diff --git a/stdlib/source/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux index c035cabe2..791fefec8 100644 --- a/stdlib/source/test/lux/control/concurrency/actor.lux +++ b/stdlib/source/test/lux/control/concurrency/actor.lux @@ -5,7 +5,7 @@ ["M" monad (#+ do Monad)] ["ex" exception] [concurrency - ["P" promise ("promise/." monad)] + ["." promise ("#/." monad)] ["T" task] ["&" actor (#+ actor: message:)]]] [data diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux index cfe70ff0e..7c1552f41 100644 --- a/stdlib/source/test/lux/control/concurrency/frp.lux +++ b/stdlib/source/test/lux/control/concurrency/frp.lux @@ -4,7 +4,7 @@ [control ["." monad (#+ do Monad)] [concurrency - ["." promise ("promise/." monad)] + ["." promise ("#/." monad)] ["." frp (#+ Channel)] ["." atom (#+ Atom atom)]]] [data diff --git a/stdlib/source/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux index 0c4167ee7..3ceac16b7 100644 --- a/stdlib/source/test/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux @@ -8,10 +8,10 @@ ["." atom (#+ Atom)]]] [data ["." maybe] - ["." text ("text/." equivalence monoid) + ["." text ("#/." equivalence monoid) format] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] ["." io] [math ["r" random]]] diff --git a/stdlib/source/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux index 966ab6007..869a995b0 100644 --- a/stdlib/source/test/lux/control/concurrency/stm.lux +++ b/stdlib/source/test/lux/control/concurrency/stm.lux @@ -12,7 +12,7 @@ [data ["." number] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [math ["r" random]]] lux/test) diff --git a/stdlib/source/test/lux/control/pipe.lux b/stdlib/source/test/lux/control/pipe.lux index 21d7b8b90..371021ddd 100644 --- a/stdlib/source/test/lux/control/pipe.lux +++ b/stdlib/source/test/lux/control/pipe.lux @@ -5,7 +5,7 @@ [monad (#+ do)]] [data ["." identity] - [text ("text/." equivalence) + ["." text ("#/." equivalence) format]] [math ["r" random]]] diff --git a/stdlib/source/test/lux/control/security/integrity.lux b/stdlib/source/test/lux/control/security/integrity.lux index f306cf7e5..dfd7bf5ea 100644 --- a/stdlib/source/test/lux/control/security/integrity.lux +++ b/stdlib/source/test/lux/control/security/integrity.lux @@ -7,7 +7,7 @@ ["@" integrity]]] [data ["." error] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format]] [math ["r" random]]] diff --git a/stdlib/source/test/lux/control/security/privacy.lux b/stdlib/source/test/lux/control/security/privacy.lux index 72c23e4c1..5505433ed 100644 --- a/stdlib/source/test/lux/control/security/privacy.lux +++ b/stdlib/source/test/lux/control/security/privacy.lux @@ -6,7 +6,7 @@ [security ["@" privacy (#+ Context Privilege Private with-privacy)]]] [data - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format]] [math ["r" random]]] diff --git a/stdlib/source/test/lux/control/writer.lux b/stdlib/source/test/lux/control/writer.lux index 5c2c47a3e..12670c58e 100644 --- a/stdlib/source/test/lux/control/writer.lux +++ b/stdlib/source/test/lux/control/writer.lux @@ -13,7 +13,7 @@ [".T" monad]]}] [data ["." product] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format]] [math ["r" random]]] diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux index 3ad45704e..b3a275238 100644 --- a/stdlib/source/test/lux/data/collection/dictionary.lux +++ b/stdlib/source/test/lux/data/collection/dictionary.lux @@ -8,7 +8,7 @@ ["." maybe] [collection ["&" dictionary] - ["." list ("list/." fold functor)]]] + ["." list ("#/." fold functor)]]] [math ["r" random]]] lux/test) diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index 6b1f131cb..233afe569 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -1,7 +1,7 @@ (.module: [lux #* [control - [monad (#+ do Monad)] + [monad (#+ Monad do)] [equivalence (#+ Equivalence)]] [data ["." product] @@ -10,7 +10,7 @@ ["s" set] ["dict" dictionary ["&" ordered]] - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [math ["r" random]]] lux/test) diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux index 2eb342e6e..dd70b7272 100644 --- a/stdlib/source/test/lux/data/collection/row.lux +++ b/stdlib/source/test/lux/data/collection/row.lux @@ -7,7 +7,7 @@ ["." maybe] [collection ["&" row] - [list ("list/." fold)]]] + ["." list ("#/." fold)]]] [math ["r" random]]] lux/test) diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux index de398e6f6..6e806e629 100644 --- a/stdlib/source/test/lux/data/collection/sequence.lux +++ b/stdlib/source/test/lux/data/collection/sequence.lux @@ -5,8 +5,9 @@ comonad] [data ["." maybe] - ["." number ("nat/." codec)] - ["." text ("text/." monoid)] + [number + ["." nat ("#/." codec)]] + ["." text ("#/." monoid)] [collection ["." list] ["&" sequence]]] diff --git a/stdlib/source/test/lux/data/collection/tree/rose.lux b/stdlib/source/test/lux/data/collection/tree/rose.lux index 47dbf94cf..388065ef0 100644 --- a/stdlib/source/test/lux/data/collection/tree/rose.lux +++ b/stdlib/source/test/lux/data/collection/tree/rose.lux @@ -5,10 +5,10 @@ [data ["." product] ["." number] - [text ("text/." equivalence) + ["." text ("#/." equivalence) format] [collection - ["." list ("list/." functor fold)] + ["." list ("#/." functor fold)] [tree ["&" rose]]]] [math diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux index 503421db2..24ed8f615 100644 --- a/stdlib/source/test/lux/data/color.lux +++ b/stdlib/source/test/lux/data/color.lux @@ -4,7 +4,8 @@ [monad (#+ do)]] [data ["@" color] - [number ("frac/." number)]] + [number + ["." frac ("#/." number)]]] ["." math ["r" random]]] lux/test) diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux index 0f86eb63d..05784915f 100644 --- a/stdlib/source/test/lux/data/format/xml.lux +++ b/stdlib/source/test/lux/data/format/xml.lux @@ -8,15 +8,15 @@ ["." name] ["E" error] ["." maybe] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format] [format ["&" xml]] [collection ["dict" dictionary] - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] [math - ["r" random ("r/." monad)]]] + ["r" random ("#/." monad)]]] lux/test) (def: char-range diff --git a/stdlib/source/test/lux/data/identity.lux b/stdlib/source/test/lux/data/identity.lux index 31bf105cd..22511e7b3 100644 --- a/stdlib/source/test/lux/data/identity.lux +++ b/stdlib/source/test/lux/data/identity.lux @@ -5,7 +5,7 @@ comonad] [data ["&" identity] - [text ("text/." monoid equivalence)]]] + ["." text ("#/." monoid equivalence)]]] lux/test) (context: "Identity" diff --git a/stdlib/source/test/lux/data/maybe.lux b/stdlib/source/test/lux/data/maybe.lux index eb09491a1..a6ec17131 100644 --- a/stdlib/source/test/lux/data/maybe.lux +++ b/stdlib/source/test/lux/data/maybe.lux @@ -4,9 +4,9 @@ ["M" monad (#+ Monad do)] pipe] [data - ["&" maybe ("&/." monoid)] - ["." text ("text/." monoid)]] - ["." io ("io/." monad)]] + ["&" maybe ("#/." monoid)] + ["." text ("#/." monoid)]] + ["." io ("#/." monad)]] lux/test) (context: "Maybe" diff --git a/stdlib/source/test/lux/data/name.lux b/stdlib/source/test/lux/data/name.lux index 3855fe221..57d4d9a1e 100644 --- a/stdlib/source/test/lux/data/name.lux +++ b/stdlib/source/test/lux/data/name.lux @@ -5,7 +5,7 @@ pipe] [data ["&" name] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format]] [math ["r" random]]] diff --git a/stdlib/source/test/lux/data/number.lux b/stdlib/source/test/lux/data/number.lux index 9d870ab08..9460b149b 100644 --- a/stdlib/source/test/lux/data/number.lux +++ b/stdlib/source/test/lux/data/number.lux @@ -5,7 +5,7 @@ pipe] [data number - [text ("text/." equivalence) + ["." text ("#/." equivalence) format]] [math ["r" random]]] diff --git a/stdlib/source/test/lux/data/number/complex.lux b/stdlib/source/test/lux/data/number/complex.lux index 850845296..a622ef6b3 100644 --- a/stdlib/source/test/lux/data/number/complex.lux +++ b/stdlib/source/test/lux/data/number/complex.lux @@ -4,10 +4,11 @@ [monad (#+ do Monad)] pipe] [data - ["." number ("frac/." number) + ["." number + ["." frac ("#/." number)] ["&" complex]] [collection - ["." list ("list/." functor)]]] + ["." list ("#/." functor)]]] ["." math ["r" random]]] lux/test) diff --git a/stdlib/source/test/lux/data/text/lexer.lux b/stdlib/source/test/lux/data/text/lexer.lux index a1e52b64c..dc8cf75c9 100644 --- a/stdlib/source/test/lux/data/text/lexer.lux +++ b/stdlib/source/test/lux/data/text/lexer.lux @@ -6,7 +6,7 @@ ["p" parser]] [data ["." error (#+ Error)] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format ["&" lexer]] [collection diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux index f6bc7d098..cbb44f332 100644 --- a/stdlib/source/test/lux/data/text/regex.lux +++ b/stdlib/source/test/lux/data/text/regex.lux @@ -6,7 +6,7 @@ ["p" parser]] [data [number (#+ hex)] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format ["." lexer (#+ Lexer)] ["&" regex]]] diff --git a/stdlib/source/test/lux/host.jvm.lux b/stdlib/source/test/lux/host.jvm.lux index 3de5e28d7..318a66cec 100644 --- a/stdlib/source/test/lux/host.jvm.lux +++ b/stdlib/source/test/lux/host.jvm.lux @@ -4,7 +4,7 @@ [monad (#+ Monad do)] pipe] [data - [text ("text/." equivalence)]] + ["." text ("#/." equivalence)]] [math ["r" random]] ["_" test (#+ Test)]] diff --git a/stdlib/source/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux index 02baf04a5..cc5997606 100644 --- a/stdlib/source/test/lux/macro/code.lux +++ b/stdlib/source/test/lux/macro/code.lux @@ -5,7 +5,7 @@ [monad (#+ do Monad)]] [data [number] - ["." text ("text/." equivalence) + ["." text ("#/." equivalence) format]] [math ["r" random]] diff --git a/stdlib/source/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux index 3d943f6e6..3c6bfd234 100644 --- a/stdlib/source/test/lux/macro/poly/equivalence.lux +++ b/stdlib/source/test/lux/macro/poly/equivalence.lux @@ -6,7 +6,8 @@ [data ["." bit] ["." maybe] - [number ("int/." int-number)] + [number + ["." int ("#/." number)]] ["." text format] [collection diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux index 002cdaa41..0ed9cab76 100644 --- a/stdlib/source/test/lux/math.lux +++ b/stdlib/source/test/lux/math.lux @@ -3,8 +3,9 @@ [control [monad (#+ Monad do)]] [data - [bit ("bit/." equivalence)] - [number ("frac/." number)]] + ["." bit ("#/." equivalence)] + [number + ["." frac ("#/." number)]]] ["&" math infix ["r" random]]] diff --git a/stdlib/source/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux index 60223e8a3..b64b3cb8c 100644 --- a/stdlib/source/test/lux/math/logic/fuzzy.lux +++ b/stdlib/source/test/lux/math/logic/fuzzy.lux @@ -3,7 +3,7 @@ [control [monad (#+ do Monad)]] [data - [bit ("bit/." equivalence)] + ["." bit ("#/." equivalence)] ["." number] [text format] diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux index b5ff0e40b..462fad44a 100644 --- a/stdlib/source/test/lux/math/modular.lux +++ b/stdlib/source/test/lux/math/modular.lux @@ -4,14 +4,14 @@ [monad (#+ do)]] [data ["." product] - [bit ("bit/." equivalence)] + ["." bit ("#/." equivalence)] ["." error] [text format]] [math ["r" random] ["/" modular]] - [type ("type/." equivalence)]] + ["." type ("#/." equivalence)]] lux/test) (def: %3 (/.modulus +3)) diff --git a/stdlib/source/test/lux/time/date.lux b/stdlib/source/test/lux/time/date.lux index d89ccccc8..2aee2dcb0 100644 --- a/stdlib/source/test/lux/time/date.lux +++ b/stdlib/source/test/lux/time/date.lux @@ -6,7 +6,7 @@ [data ["." error]] [math - ["r" random ("random/." monad)]] + ["r" random ("#/." monad)]] [time ["@." instant] ["@" date]]] @@ -16,18 +16,18 @@ (def: month (r.Random @.Month) - (r.either (r.either (r.either (random/wrap #@.January) - (r.either (random/wrap #@.February) - (random/wrap #@.March))) - (r.either (random/wrap #@.April) - (r.either (random/wrap #@.May) - (random/wrap #@.June)))) - (r.either (r.either (random/wrap #@.July) - (r.either (random/wrap #@.August) - (random/wrap #@.September))) - (r.either (random/wrap #@.October) - (r.either (random/wrap #@.November) - (random/wrap #@.December)))))) + (r.either (r.either (r.either (r/wrap #@.January) + (r.either (r/wrap #@.February) + (r/wrap #@.March))) + (r.either (r/wrap #@.April) + (r.either (r/wrap #@.May) + (r/wrap #@.June)))) + (r.either (r.either (r/wrap #@.July) + (r.either (r/wrap #@.August) + (r/wrap #@.September))) + (r.either (r/wrap #@.October) + (r.either (r/wrap #@.November) + (r/wrap #@.December)))))) (context: "(Month) Equivalence." (<| (times 100) @@ -64,13 +64,13 @@ (def: day (r.Random @.Day) - (r.either (r.either (r.either (random/wrap #@.Sunday) - (random/wrap #@.Monday)) - (r.either (random/wrap #@.Tuesday) - (random/wrap #@.Wednesday))) - (r.either (r.either (random/wrap #@.Thursday) - (random/wrap #@.Friday)) - (random/wrap #@.Saturday)))) + (r.either (r.either (r.either (r/wrap #@.Sunday) + (r/wrap #@.Monday)) + (r.either (r/wrap #@.Tuesday) + (r/wrap #@.Wednesday))) + (r.either (r.either (r/wrap #@.Thursday) + (r/wrap #@.Friday)) + (r/wrap #@.Saturday)))) (context: "(Day) Equivalence." (<| (times 100) diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux index 426127fb6..bd0b14167 100644 --- a/stdlib/source/test/lux/type/check.lux +++ b/stdlib/source/test/lux/type/check.lux @@ -7,13 +7,13 @@ ["." product] ["." maybe] ["." number] - [text ("text/." equivalence)] + ["." text ("#/." equivalence)] [collection - ["." list ("list/." functor)] + ["." list ("#/." functor)] ["." set]]] [math ["r" random]] - ["." type ("type/." equivalence) + ["." type ("#/." equivalence) ["@" check]]] lux/test ["." //]) diff --git a/stdlib/source/test/lux/type/implicit.lux b/stdlib/source/test/lux/type/implicit.lux index 98b647bf1..49c52aa48 100644 --- a/stdlib/source/test/lux/type/implicit.lux +++ b/stdlib/source/test/lux/type/implicit.lux @@ -6,7 +6,7 @@ [functor] [monad (#+ Monad do)]] [data - [bit ("bit/." equivalence)] + ["." bit ("#/." equivalence)] [number] [collection [list]]] [math diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux index 4beb4fd69..361cf99ba 100644 --- a/stdlib/source/test/lux/world/file.lux +++ b/stdlib/source/test/lux/world/file.lux @@ -19,7 +19,7 @@ ["@" file (#+ Path File)] ["." binary (#+ Binary)]] [math - ["r" random ("r/." monad)]]] + ["r" random ("#/." monad)]]] lux/test [// ["_." binary]]) diff --git a/stdlib/source/test/lux/world/net/tcp.lux b/stdlib/source/test/lux/world/net/tcp.lux index fae5ac05d..78be41610 100644 --- a/stdlib/source/test/lux/world/net/tcp.lux +++ b/stdlib/source/test/lux/world/net/tcp.lux @@ -8,7 +8,7 @@ ["." taint]]] [concurrency ["." promise (#+ Promise promise)] - [frp ("frp/." functor)]] + ["." frp ("#/." functor)]] [data ["." error] ["." text |