diff options
Diffstat (limited to 'stdlib/source/lux/platform/compiler/phase')
28 files changed, 139 insertions, 138 deletions
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} |