diff options
Diffstat (limited to '')
16 files changed, 72 insertions, 72 deletions
diff --git a/stdlib/source/lux/tool/compiler/language/lux/generation.lux b/stdlib/source/lux/tool/compiler/language/lux/generation.lux index 8a6e0825d..64e66be2d 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/generation.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/generation.lux @@ -219,7 +219,7 @@ (def: #export (save! name code) (All [anchor expression directive] (-> Text directive (Operation anchor expression directive Any))) - (do {@ phase.monad} + (do {! phase.monad} [?buffer (extension.read (get@ #buffer))] (case ?buffer (#.Some buffer) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/case.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/case.lux index ab1cc08de..6d66678ac 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/case.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/case.lux @@ -230,7 +230,7 @@ (///////phase@wrap (_.define (..register register) ..peek-cursor)) (#/////synthesis.Bit-Fork when thenP elseP) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [then! (recur thenP) else! (.case elseP (#.Some elseP) @@ -247,9 +247,9 @@ then!)))) (#/////synthesis.I64-Fork cons) - (do {@ ///////phase.monad} - [clauses (monad.map @ (function (_ [match then]) - (do @ + (do {! ///////phase.monad} + [clauses (monad.map ! (function (_ [match then]) + (do ! [then! (recur then)] (wrap [(//runtime.i64//= (//primitive.i64 (.int match)) ..peek-cursor) @@ -259,9 +259,9 @@ (^template [<tag> <format> <type>] (<tag> cons) - (do {@ ///////phase.monad} - [cases (monad.map @ (function (_ [match then]) - (:: @ map (|>> [(list (<format> match))]) (recur then))) + (do {! ///////phase.monad} + [cases (monad.map ! (function (_ [match then]) + (:: ! map (|>> [(list (<format> match))]) (recur then))) (#.Cons cons))] (wrap (_.switch ..peek-cursor cases diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux index 93b400c37..0f311d61b 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux @@ -30,9 +30,9 @@ (def: #export (apply generate archive [functionS argsS+]) (Generator (Application Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [functionO (generate archive functionS) - argsO+ (monad.map @ (generate archive) argsS+)] + argsO+ (monad.map ! (generate archive) argsS+)] (wrap (_.apply/* functionO argsO+)))) (def: (with-closure @self inits function-body) @@ -64,10 +64,10 @@ (def: #export (function statement expression archive [environment arity bodyS]) (-> Phase! (Generator (Abstraction Synthesis))) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [[function-name body!] (/////generation.with-new-context archive - (do @ - [scope (:: @ map ..@scope + (do ! + [scope (:: ! map ..@scope (/////generation.context archive))] (/////generation.with-anchor [1 scope] (statement expression archive bodyS)))) @@ -84,7 +84,7 @@ (_.define (..input post) (_.at (_.i32 (.int post)) @@arguments)))) initialize-self! (list.indices arity))] - environment (monad.map @ (expression archive) environment) + environment (monad.map ! (expression archive) environment) #let [[definition instantiation] (with-closure @self environment ($_ _.then (_.define @num-args (_.the "length" @@arguments)) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux index 05ac70a6a..f73decb82 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux @@ -85,8 +85,8 @@ (syntax: #export (with-vars {vars (s.tuple (p.some s.local-identifier))} body) - (do {@ macro.monad} - [ids (monad.seq @ (list.repeat (list.size vars) macro.count))] + (do {! macro.monad} + [ids (monad.seq ! (list.repeat (list.size vars) macro.count))] (wrap (list (` (let [(~+ (|> vars (list.zip/2 ids) (list@map (function (_ [id var]) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/structure.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/structure.lux index dee0aa051..acd36a5ba 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/structure.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/structure.lux @@ -23,8 +23,8 @@ (generate archive singletonS) _ - (do {@ ///////phase.monad} - [elemsT+ (monad.map @ (generate archive) elemsS+)] + (do {! ///////phase.monad} + [elemsT+ (monad.map ! (generate archive) elemsS+)] (wrap (_.array elemsT+))))) (def: #export (variant generate archive [lefts right? valueS]) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux index 0f440080f..8f9a4ce74 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux @@ -27,9 +27,9 @@ (def: #export (apply generate archive [functionS argsS+]) (Generator (Application Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [functionO (generate archive functionS) - argsO+ (monad.map @ (generate archive) argsS+)] + argsO+ (monad.map ! (generate archive) argsS+)] (wrap (_.apply/* argsO+ functionO)))) (def: #export capture @@ -45,8 +45,8 @@ (wrap (|> (_.var function-name) (_.apply/* inits)))) _ - (do {@ ///////phase.monad} - [@closure (:: @ map _.var (/////generation.gensym "closure")) + (do {! ///////phase.monad} + [@closure (:: ! map _.var (/////generation.gensym "closure")) #let [directive (_.function @closure (|> (list.enumeration inits) (list@map (|>> product.left ..capture))) @@ -62,15 +62,15 @@ (def: #export (function generate archive [environment arity bodyS]) (Generator (Abstraction Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [[function-name bodyO] (/////generation.with-new-context - (do @ - [function-name (:: @ map ///reference.artifact-name + (do ! + [function-name (:: ! map ///reference.artifact-name /////generation.context)] (/////generation.with-anchor (_.var function-name) (generate archive bodyS)))) closureO+ (: (Operation (List (Expression Any))) - (monad.map @ (:: //reference.system variable) environment)) + (monad.map ! (:: //reference.system variable) environment)) #let [function-name (///reference.artifact-name function-name) @curried (_.var "curried") arityO (|> arity .int _.int) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux index 957924e8f..f65883c4c 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux @@ -27,9 +27,9 @@ (def: #export (scope generate archive [start initsS+ bodyS]) (Generator (Scope Synthesis)) - (do {@ ///////phase.monad} - [@loop (:: @ map ..loop-name /////generation.next) - initsO+ (monad.map @ (generate archive) initsS+) + (do {! ///////phase.monad} + [@loop (:: ! map ..loop-name /////generation.next) + initsO+ (monad.map ! (generate archive) initsS+) bodyO (/////generation.with-anchor @loop (generate archive bodyS)) #let [directive (_.function @loop (|> initsS+ @@ -42,7 +42,7 @@ (def: #export (recur generate archive argsS+) (Generator (List Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [@scope /////generation.anchor - argsO+ (monad.map @ (generate archive) argsS+)] + argsO+ (monad.map ! (generate archive) argsS+)] (wrap (_.apply/* argsO+ @scope)))) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/case.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/case.lux index 34368c147..811ce3c93 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/case.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/case.lux @@ -216,13 +216,13 @@ (def: #export (case generate [valueS pathP]) (-> Phase [Synthesis Path] (Operation (Expression Any))) - (do {@ ////.monad} + (do {! ////.monad} [initG (generate valueS) pattern-matching! (pattern-matching generate pathP) @case (..gensym "case") #let [@caseG (_.global @case) @caseL (_.var @case)] - @init (:: @ map _.var (..gensym "init")) + @init (:: ! map _.var (..gensym "init")) #let [@dependencies+ (|> (case.storage pathP) (get@ #case.dependencies) set.to-list diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/function.lux index d03d4babc..58fb0a4b9 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/function.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/function.lux @@ -26,9 +26,9 @@ (def: #export (apply generate [functionS argsS+]) (-> Phase (Application Synthesis) (Operation (Expression Any))) - (do {@ ////.monad} + (do {! ////.monad} [functionG (generate functionS) - argsG+ (monad.map @ generate argsS+)] + argsG+ (monad.map ! generate argsS+)] (wrap (_.apply/* argsG+ functionG)))) (def: #export capture @@ -39,15 +39,15 @@ (def: #export (function generate [environment arity bodyS]) (-> Phase (Abstraction Synthesis) (Operation (Expression Any))) - (do {@ ////.monad} + (do {! ////.monad} [[function-name bodyG] (///.with-context - (do @ + (do ! [function-name ///.context] (///.with-anchor (_.var function-name) (generate bodyS)))) closureG+ (: (Operation (List Argument)) - (monad.map @ (|>> (:: //reference.system variable) - (:: @ map _.reference)) + (monad.map ! (|>> (:: //reference.system variable) + (:: ! map _.reference)) environment)) #let [@curried (_.var "curried") arityG (|> arity .int _.int) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux index 15734c737..000789484 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux @@ -22,11 +22,11 @@ (def: #export (scope generate [start initsS+ bodyS]) (-> Phase (Scope Synthesis) (Operation (Expression Any))) - (do {@ ////.monad} - [@loop (:: @ map (|>> %.nat (format "loop")) ///.next) + (do {! ////.monad} + [@loop (:: ! map (|>> %.nat (format "loop")) ///.next) #let [@loopG (_.global @loop) @loopL (_.var @loop)] - initsO+ (monad.map @ generate initsS+) + initsO+ (monad.map ! generate initsS+) bodyO (///.with-anchor @loopL (generate bodyS)) #let [directive ($_ _.then @@ -44,7 +44,7 @@ (def: #export (recur generate argsS+) (-> Phase (List Synthesis) (Operation (Expression Any))) - (do {@ ////.monad} + (do {! ////.monad} [@scope ///.anchor - argsO+ (monad.map @ generate argsS+)] + argsO+ (monad.map ! generate argsS+)] (wrap (_.apply/* argsO+ @scope)))) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux index 30f3f38fd..043941530 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux @@ -27,9 +27,9 @@ (def: #export (apply generate archive [functionS argsS+]) (Generator (Application Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [functionO (generate archive functionS) - argsO+ (monad.map @ (generate archive) argsS+)] + argsO+ (monad.map ! (generate archive) argsS+)] (wrap (_.apply/* functionO argsO+)))) (def: #export capture @@ -45,8 +45,8 @@ (wrap (_.apply/* (_.var function-name) inits))) _ - (do {@ ///////phase.monad} - [@closure (:: @ map _.var (/////generation.gensym "closure")) + (do {! ///////phase.monad} + [@closure (:: ! map _.var (/////generation.gensym "closure")) #let [directive (_.def @closure (|> (list.enumeration inits) (list@map (|>> product.left ..capture))) @@ -62,15 +62,15 @@ (def: #export (function generate archive [environment arity bodyS]) (Generator (Abstraction Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [[function-name bodyO] (/////generation.with-new-context - (do @ - [function-name (:: @ map ///reference.artifact-name + (do ! + [function-name (:: ! map ///reference.artifact-name /////generation.context)] (/////generation.with-anchor (_.var function-name) (generate archive bodyS)))) closureO+ (: (Operation (List (Expression Any))) - (monad.map @ (:: //reference.system variable) environment)) + (monad.map ! (:: //reference.system variable) environment)) #let [function-name (///reference.artifact-name function-name) @curried (_.var "curried") arityO (|> arity .int _.int) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux index 042cbba35..49fd86575 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux @@ -27,9 +27,9 @@ (def: #export (scope generate archive [start initsS+ bodyS]) (Generator (Scope Synthesis)) - (do {@ ///////phase.monad} - [@loop (:: @ map ..loop-name /////generation.next) - initsO+ (monad.map @ (generate archive) initsS+) + (do {! ///////phase.monad} + [@loop (:: ! map ..loop-name /////generation.next) + initsO+ (monad.map ! (generate archive) initsS+) bodyO (/////generation.with-anchor @loop (generate archive bodyS)) #let [directive (_.def @loop (|> initsS+ @@ -42,7 +42,7 @@ (def: #export (recur generate archive argsS+) (Generator (List Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [@scope /////generation.anchor - argsO+ (monad.map @ (generate archive) argsS+)] + argsO+ (monad.map ! (generate archive) argsS+)] (wrap (_.apply/* @scope argsO+)))) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux index 76a25d333..df8fccb33 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux @@ -27,9 +27,9 @@ (def: #export (apply generate archive [functionS argsS+]) (Generator (Application Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [functionO (generate archive functionS) - argsO+ (monad.map @ (generate archive) argsS+)] + argsO+ (monad.map ! (generate archive) argsS+)] (wrap (_.do "call" argsO+ functionO)))) (def: #export capture @@ -54,15 +54,15 @@ (def: #export (function generate archive [environment arity bodyS]) (Generator (Abstraction Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [[function-name bodyO] (/////generation.with-new-context - (do @ - [function-name (:: @ map ///reference.artifact-name + (do ! + [function-name (:: ! map ///reference.artifact-name /////generation.context)] (/////generation.with-anchor (_.local function-name) (generate archive bodyS)))) closureO+ (: (Operation (List (Expression Any))) - (monad.map @ (:: //reference.system variable) environment)) + (monad.map ! (:: //reference.system variable) environment)) #let [function-name (///reference.artifact-name function-name) @curried (_.local "curried") arityO (|> arity .int _.int) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux index 149e67c31..c9c68139c 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux @@ -27,9 +27,9 @@ (def: #export (scope generate archive [start initsS+ bodyS]) (Generator (Scope Synthesis)) - (do {@ ///////phase.monad} - [@loop (:: @ map ..loop-name /////generation.next) - initsO+ (monad.map @ (generate archive) initsS+) + (do {! ///////phase.monad} + [@loop (:: ! map ..loop-name /////generation.next) + initsO+ (monad.map ! (generate archive) initsS+) bodyO (/////generation.with-anchor @loop (generate archive bodyS))] (wrap (|> (_.return bodyO) @@ -41,7 +41,7 @@ (def: #export (recur generate archive argsS+) (Generator (List Synthesis)) - (do {@ ///////phase.monad} + (do {! ///////phase.monad} [@scope /////generation.anchor - argsO+ (monad.map @ (generate archive) argsS+)] + argsO+ (monad.map ! (generate archive) argsS+)] (wrap (_.apply/* argsO+ @scope)))) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux index a413a878a..034c72a19 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux @@ -164,8 +164,8 @@ (def: #export (case generate [valueS pathP]) (-> Phase [Synthesis Path] (Operation Computation)) - (do {@ ////.monad} + (do {! ////.monad} [valueO (generate valueS)] - (<| (:: @ map (_.let (list [@cursor (_.list/* (list valueO))] + (<| (:: ! map (_.let (list [@cursor (_.list/* (list valueO))] [@savepoint (_.list/* (list))]))) (pattern-matching generate pathP)))) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux index d56ae6504..18a74a4a3 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux @@ -22,8 +22,8 @@ (generate singletonS) _ - (do {@ ///.monad} - [elemsT+ (monad.map @ generate elemsS+)] + (do {! ///.monad} + [elemsT+ (monad.map ! generate elemsS+)] (wrap (_.vector/* elemsT+))))) (def: #export (variant generate [lefts right? valueS]) |