diff options
Diffstat (limited to '')
31 files changed, 40 insertions, 59 deletions
diff --git a/stdlib/source/lux/tool/compiler/phase/generation.lux b/stdlib/source/lux/tool/compiler/phase/generation.lux index 4482daa3b..93dc97518 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation.lux @@ -9,7 +9,7 @@ ["." error (#+ Error)] ["." name ("#@." equivalence)] ["." text - format] + ["%" format (#+ format)]] [collection ["." row (#+ Row)] ["." dictionary (#+ Dictionary)] @@ -31,25 +31,25 @@ (exception: #export (unknown-lux-name {name Name} {registry Registry}) (exception.report - ["Name" (%name name)] + ["Name" (%.name name)] ["Registry" (|> registry dictionary.keys (list.sort (:: name.order <)) - (list@map %name) + (list@map %.name) (text.join-with text.new-line))])) (exception: #export (cannot-overwrite-lux-name {lux-name Name} {old-host-name Text} {new-host-name Text}) (exception.report - ["Lux Name" (%name lux-name)] + ["Lux Name" (%.name lux-name)] ["Old Host Name" old-host-name] ["New Host Name" new-host-name])) (template [<name>] [(exception: #export (<name> {name Name}) (exception.report - ["Output" (%name name)]))] + ["Output" (%.name name)]))] [cannot-overwrite-output] [no-buffer-for-saving-code] @@ -109,7 +109,7 @@ (Operation anchor expression statement [Text output]))) (function (_ [bundle state]) (let [[old-scope old-inner] (get@ #context state) - new-scope (format old-scope "c" (%n old-inner))] + new-scope (format old-scope "c" (%.nat old-inner))] (case (expr [bundle (set@ #context [new-scope 0] state)]) (#error.Success [[bundle' state'] output]) (#error.Success [[bundle' (set@ #context [old-scope (inc old-inner)] state')] @@ -192,7 +192,7 @@ (def: #export (gensym prefix) (All [anchor expression statement] (-> Text (Operation anchor expression statement Text))) - (:: //.monad map (|>> %n (format prefix)) ..next)) + (:: //.monad map (|>> %.nat (format prefix)) ..next)) (template [<name> <inputT>] [(def: #export (<name> label code) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/case.lux index 6f24f6c23..6b782a24d 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/case.lux @@ -5,8 +5,7 @@ [control ["ex" exception (#+ exception:)]] [data - ["." text - format] + ["." text] [collection ["." list ("#@." functor fold)] ["." set]]] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/function.lux index d32f1b772..c8edd4e46 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/function.lux @@ -6,8 +6,6 @@ pipe] [data ["." product] - [text - format] [collection ["." list ("#@." functor fold)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/loop.lux index 29326e358..13e049e1d 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/loop.lux @@ -5,7 +5,7 @@ [data ["." product] [text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] [target @@ -21,7 +21,7 @@ (def: #export (scope generate [start initsS+ bodyS]) (-> Phase (Scope Synthesis) (Operation (Expression Any))) (do ////.monad - [@scope (:: @ map (|>> %n (format "scope") _.var) ///.next) + [@scope (:: @ map (|>> %.nat (format "scope") _.var) ///.next) initsG+ (monad.map @ generate initsS+) bodyG (///.with-anchor @scope (generate bodyS))] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/runtime.lux index 65c355ecf..19594bac9 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/common-lisp/runtime.lux @@ -10,7 +10,7 @@ [number (#+ hex) ["." i64]] ["." text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] ["." macro diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux index 3a5e8f2d3..f17b2b983 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux @@ -5,8 +5,7 @@ [control ["ex" exception (#+ exception:)]] [data - ["." text - format] + ["." text] [collection ["." list ("#@." functor fold)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux index e43e71fe4..a0418b839 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux @@ -6,8 +6,6 @@ pipe] [data ["." product] - [text - format] [collection ["." list ("#@." functor fold)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux index fd2d3de58..65e691c51 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux @@ -4,8 +4,7 @@ ["." monad (#+ do)]] [data ["." product] - ["." text - format] + ["." text] [collection ["." list ("#@." functor)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux index 6bd6565dd..949e663c7 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux @@ -10,7 +10,7 @@ [number (#+ hex) ["." i64]] ["." text - format] + ["%" format (#+ format)]] [collection ["." list ("#;." functor)]]] ["." macro diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/case.lux index d69668611..c74ceb8c7 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/case.lux @@ -5,8 +5,7 @@ [control ["ex" exception (#+ exception:)]] [data - ["." text - format] + ["." text] [collection ["." list ("#@." functor fold)] ["." set]]] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/function.lux index 325ac58a6..eb0a5e71b 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/function.lux @@ -6,8 +6,6 @@ pipe] [data ["." product] - [text - format] [collection ["." list ("#@." functor fold)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/loop.lux index 49180db8b..b575ec97b 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/loop.lux @@ -5,7 +5,7 @@ [data ["." product] [text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] [target @@ -21,7 +21,7 @@ (def: #export (scope generate [start initsS+ bodyS]) (-> Phase (Scope Synthesis) (Operation (Expression Any))) (do ////.monad - [@loop (:: @ map (|>> %n (format "loop") _.var) ///.next) + [@loop (:: @ map (|>> %.nat (format "loop") _.var) ///.next) initsO+ (monad.map @ generate initsS+) bodyO (///.with-anchor @loop (generate bodyS)) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux index e5ce5a201..47e58fc57 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/lua/runtime.lux @@ -10,7 +10,7 @@ [number (#+ hex) ["." i64]] ["." text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] ["." macro diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/case.lux index 4bd86c94e..abd31b7f2 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/case.lux @@ -7,7 +7,7 @@ [data ["." product] ["." text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor fold)] ["." set]]] @@ -209,7 +209,7 @@ (def: (gensym prefix) (-> Text (Operation Text)) - (:: ////.monad map (|>> %n (format prefix)) ///.next)) + (:: ////.monad map (|>> %.nat (format prefix)) ///.next)) (def: #export (case generate [valueS pathP]) (-> Phase [Synthesis Path] (Operation (Expression Any))) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/function.lux index 5cbf855b6..8dfb9668e 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/function.lux @@ -6,8 +6,7 @@ pipe] [data ["." product] - ["." text - format] + ["." text] [collection ["." list ("#@." functor fold)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/loop.lux index 94857fe4f..75cdedae3 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/loop.lux @@ -5,7 +5,7 @@ [data ["." product] [text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] [target @@ -21,7 +21,7 @@ (def: #export (scope generate [start initsS+ bodyS]) (-> Phase (Scope Synthesis) (Operation (Expression Any))) (do ////.monad - [@loop (:: @ map (|>> %n (format "loop")) ///.next) + [@loop (:: @ map (|>> %.nat (format "loop")) ///.next) #let [@loopG (_.global @loop) @loopL (_.var @loop)] initsO+ (monad.map @ generate initsS+) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux index 4af1c01ac..3adf01716 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/php/runtime.lux @@ -10,7 +10,7 @@ [number (#+ hex) ["." i64]] ["." text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] ["." macro diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux index d0f887385..80a142b37 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux @@ -6,7 +6,7 @@ ["ex" exception (#+ exception:)]] [data ["." text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor fold)] ["." set]]] @@ -206,7 +206,7 @@ (def: (gensym prefix) (-> Text (Operation SVar)) - (:: ////.monad map (|>> %n (format prefix) _.var) ///.next)) + (:: ////.monad map (|>> %.nat (format prefix) _.var) ///.next)) (def: #export (case generate [valueS pathP]) (-> Phase [Synthesis Path] (Operation (Expression Any))) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux index 0cbcdde37..c70ca9c37 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux @@ -6,8 +6,6 @@ pipe] [data ["." product] - [text - format] [collection ["." list ("#@." functor fold)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux index a58f02141..f0d75ef29 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux @@ -5,7 +5,7 @@ [data ["." product] [text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] [target @@ -21,7 +21,7 @@ (def: #export (scope generate [start initsS+ bodyS]) (-> Phase (Scope Synthesis) (Operation (Expression Any))) (do ////.monad - [@loop (:: @ map (|>> %n (format "loop") _.var) ///.next) + [@loop (:: @ map (|>> %.nat (format "loop") _.var) ///.next) initsO+ (monad.map @ generate initsS+) bodyO (///.with-anchor @loop (generate bodyS)) diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux index 3fd58ef1b..5524980f6 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux @@ -10,7 +10,7 @@ [number (#+ hex) ["." i64]] ["." text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] ["." macro diff --git a/stdlib/source/lux/tool/compiler/phase/generation/reference.lux b/stdlib/source/lux/tool/compiler/phase/generation/reference.lux index 534d58cb1..110d78d0d 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/reference.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/reference.lux @@ -4,7 +4,7 @@ pipe] [data [text - format]] + ["%" format (#+ format)]]] [type (#+ :share)]] ["." // ["#/" // ("#@." monad) @@ -31,7 +31,7 @@ (All [expression] (-> Text (-> Text expression) (-> Register expression))) - (|>> %n (format prefix) variable)) + (|>> %.nat (format prefix) variable)) (def: #export foreign (All [expression] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/case.lux index 25d6ff91a..41e55749e 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/case.lux @@ -5,8 +5,7 @@ [control ["ex" exception (#+ exception:)]] [data - ["." text - format] + ["." text] [collection ["." list ("#@." functor fold)] ["." set]]] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/function.lux index 52ef8fd1a..ef3920d23 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/function.lux @@ -6,8 +6,6 @@ pipe] [data ["." product] - [text - format] [collection ["." list ("#@." functor fold)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/loop.lux index b7774d396..6503d23f8 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/loop.lux @@ -5,7 +5,7 @@ [data ["." product] [text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] [target @@ -21,7 +21,7 @@ (def: #export (scope generate [start initsS+ bodyS]) (-> Phase (Scope Synthesis) (Operation (Expression Any))) (do ////.monad - [@loop (:: @ map (|>> %n (format "loop") _.local) ///.next) + [@loop (:: @ map (|>> %.nat (format "loop") _.local) ///.next) initsO+ (monad.map @ generate initsS+) bodyO (///.with-anchor @loop (generate bodyS))] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux index f0d88923e..a4062693c 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/ruby/runtime.lux @@ -10,7 +10,7 @@ [number (#+ hex) ["." i64]] ["." text - format] + ["%" format (#+ format)]] [collection ["." list ("#@." functor)]]] ["." macro diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux index bd478f921..861032fc7 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.lux @@ -6,8 +6,7 @@ ["ex" exception (#+ exception:)]] [data ["." number] - ["." text - format] + ["." text] [collection ["." list ("#@." functor fold)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux index 8140c769f..42c1d196d 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.lux @@ -10,8 +10,7 @@ [data ["e" error] ["." product] - ["." text - format] + ["." text] [number (#+ hex)] [collection ["." list ("#;." functor)] diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux index 36de9712e..41a2e6b17 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.lux @@ -7,7 +7,7 @@ [data ["." product] [text - format] + ["%" format (#+ format)]] [collection ["." list ("#;." functor)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux index 086d53fe3..a0a5d74eb 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.lux @@ -4,8 +4,7 @@ ["." monad (#+ do)]] [data ["." product] - ["." text - format] + ["." text] [collection ["." list ("#;." functor)]]] [target diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux index 4a617e29c..992701393 100644 --- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux +++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.lux @@ -9,7 +9,7 @@ [data [number (#+ hex)] [text - format] + ["%" format (#+ format)]] [collection ["." list ("#;." monad)]]] [macro |