aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source
diff options
context:
space:
mode:
authorEduardo Julian2022-03-08 05:06:57 -0400
committerEduardo Julian2022-03-08 05:06:57 -0400
commitbf0562d72b7d42be2b378a7f312fe48ac1f4284c (patch)
treea77566d968c29284408f46db6aa9fc7c84ff62aa /stdlib/source
parent2ac6926be617bf764c4c18a4f6fbba199f6be697 (diff)
Finishing the meta-compiler [Part 6 / Done... for now]
Diffstat (limited to '')
-rw-r--r--stdlib/source/library/lux/data/sum.lux20
-rw-r--r--stdlib/source/library/lux/tool/compiler.lux16
-rw-r--r--stdlib/source/library/lux/tool/compiler/default/platform.lux346
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux48
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux3
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux3
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux25
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux9
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux60
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux38
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux (renamed from stdlib/source/library/lux/tool/compiler/language/lux/synthesis/member.lux)0
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux (renamed from stdlib/source/library/lux/tool/compiler/language/lux/synthesis/side.lux)0
-rw-r--r--stdlib/source/library/lux/tool/compiler/meta/io/archive.lux58
-rw-r--r--stdlib/source/program/compositor.lux2
-rw-r--r--stdlib/source/test/lux/data/sum.lux53
-rw-r--r--stdlib/source/test/lux/target/python.lux33
-rw-r--r--stdlib/source/test/lux/tool.lux4
-rw-r--r--stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access.lux14
-rw-r--r--stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/member.lux41
-rw-r--r--stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/side.lux (renamed from stdlib/source/test/lux/tool/compiler/language/lux/synthesis/side.lux)4
-rw-r--r--stdlib/source/test/lux/tool/compiler/meta/cache/module.lux12
22 files changed, 510 insertions, 283 deletions
diff --git a/stdlib/source/library/lux/data/sum.lux b/stdlib/source/library/lux/data/sum.lux
index ce9003cb6..8d3fe4fc0 100644
--- a/stdlib/source/library/lux/data/sum.lux
+++ b/stdlib/source/library/lux/data/sum.lux
@@ -1,9 +1,9 @@
(.using
- [library
- [lux "*"
- [abstract
- [equivalence {"+" Equivalence}]
- [hash {"+" Hash}]]]])
+ [library
+ [lux "*"
+ [abstract
+ [equivalence {"+" Equivalence}]
+ [hash {"+" Hash}]]]])
(template [<right?> <name>]
[(def: .public (<name> value)
@@ -82,9 +82,9 @@
(..equivalence (# left &equivalence)
(# right &equivalence)))
(def: (hash value)
- (case value
- {.#Left value}
- (# left hash value)
+ (.nat (case value
+ {.#Left value}
+ ("lux i64 *" +2 (.int (# left hash value)))
- {.#Right value}
- (# right hash value)))))
+ {.#Right value}
+ ("lux i64 *" +3 (.int (# right hash value))))))))
diff --git a/stdlib/source/library/lux/tool/compiler.lux b/stdlib/source/library/lux/tool/compiler.lux
index f2210209a..b4d956198 100644
--- a/stdlib/source/library/lux/tool/compiler.lux
+++ b/stdlib/source/library/lux/tool/compiler.lux
@@ -3,10 +3,14 @@
[lux {"-" Module Code}
[control
["[0]" try {"+" Try}]
- ["[0]" exception {"+" exception:}]]
+ ["[0]" exception {"+" exception:}]
+ ["<>" parser
+ ["<[0]>" binary {"+" Parser}]]]
[data
[binary {"+" Binary}]
- ["[0]" text]]
+ ["[0]" text]
+ ["[0]" format "_"
+ ["[1]" binary {"+" Writer}]]]
[world
["[0]" file {"+" Path}]]]]
[/
@@ -35,14 +39,18 @@
[#dependencies (List Module)
#process (-> s Archive
(Try [s (Either (Compilation s d o)
- (archive.Entry Any))]))]))
+ (archive.Entry d))]))]))
(type: .public (Compiler s d o)
(-> Input (Compilation s d o)))
(type: .public Custom
(Ex (_ state document object)
- (-> (List Text) (Try [state (Compiler state document object)]))))
+ [state
+ (Key document)
+ (Writer document)
+ (Parser document)
+ (-> Input (Try (Compilation state document object)))]))
(type: .public (Instancer s d o)
(-> (Key d) (List Parameter) (Compiler s d o)))
diff --git a/stdlib/source/library/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux
index d9d794a7b..6aa9f8b77 100644
--- a/stdlib/source/library/lux/tool/compiler/default/platform.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux
@@ -3,6 +3,7 @@
[lux "*"
["@" target]
["[0]" debug]
+ ["[0]" static]
[abstract
["[0]" monad {"+" Monad do}]]
[control
@@ -52,14 +53,15 @@
["[0]" extension {"+" Extender}]]]]
[meta
[import {"+" Import}]
- ["[0]" context {"+" Context}]
+ ["[0]" context]
["[0]" cache
["[1]/[0]" archive]
["[1]/[0]" module]
["[1]/[0]" artifact]]
[cli {"+" Compilation Library}
- ["[0]" compiler {"+" Compiler}]]
+ ["[0]" compiler]]
["[0]" archive {"+" Output Archive}
+ [key {"+" Key}]
["[0]" registry {"+" Registry}]
["[0]" artifact]
["[0]" module
@@ -94,27 +96,29 @@
<State+> (as_is (///directive.State+ <type_vars>))
<Bundle> (as_is (///generation.Bundle <type_vars>))]
- (def: writer
- (Writer [(module.Module .Module) Registry])
+ (def: (writer //)
+ (All (_ a)
+ (-> (Writer a)
+ (Writer [(module.Module a) Registry])))
($_ _.and
($_ _.and
_.nat
descriptor.writer
- (document.writer $.writer))
+ (document.writer //))
registry.writer
))
- (def: (cache_module context platform module_id entry)
- (All (_ <type_vars>)
- (-> Context <Platform> module.ID (archive.Entry Any)
+ (def: (cache_module context platform @module key format entry)
+ (All (_ <type_vars> document)
+ (-> context.Context <Platform> module.ID (Key document) (Writer document) (archive.Entry document)
(Async (Try Any))))
(let [system (value@ #&file_system platform)
write_artifact! (: (-> [artifact.ID (Maybe Text) Binary] (Action Any))
(function (_ [artifact_id custom content])
- (cache/artifact.cache! system context module_id artifact_id content)))]
+ (cache/artifact.cache! system context @module artifact_id content)))]
(do [! ..monad]
[_ (: (Async (Try Any))
- (cache/module.enable! async.monad system context module_id))
+ (cache/module.enable! async.monad system context @module))
_ (for [@.python (|> entry
(value@ archive.#output)
sequence.list
@@ -127,13 +131,13 @@
(monad.each ..monad write_artifact!)
(: (Action (List Any)))))
document (# async.monad in
- (document.marked? $.key (value@ [archive.#module module.#document] entry)))]
+ (document.marked? key (value@ [archive.#module module.#document] entry)))]
(|> [(|> entry
(value@ archive.#module)
(with@ module.#document document))
(value@ archive.#registry entry)]
- (_.result ..writer)
- (cache/module.cache! system context module_id)))))
+ (_.result (..writer format))
+ (cache/module.cache! system context @module)))))
... TODO: Inline ASAP
(def: initialize_buffer!
@@ -246,7 +250,7 @@
(def: .public (initialize context module expander host_analysis platform generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender
import compilation_sources compilation_configuration)
(All (_ <type_vars>)
- (-> Context
+ (-> context.Context
descriptor.Module
Expander
///analysis.Bundle
@@ -268,7 +272,7 @@
generation_bundle)]
_ (: (Async (Try Any))
(cache.enable! async.monad (value@ #&file_system platform) context))
- [archive analysis_state bundles] (ioW.thaw compilation_configuration (value@ #host platform) (value@ #&file_system platform) context import compilation_sources)
+ [archive analysis_state bundles] (ioW.thaw (list) compilation_configuration (value@ #host platform) (value@ #&file_system platform) context import compilation_sources)
.let [with_missing_extensions
(: (All (_ <type_vars>)
(-> <Platform> (Program expression directive) <State+>
@@ -291,7 +295,7 @@
[[state [archive payload]] (|> (..process_runtime archive platform)
(///phase.result' state)
async#in)
- _ (..cache_module context platform 0 payload)
+ _ (..cache_module context platform 0 $.key $.writer payload)
[phase_wrapper state] (with_missing_extensions platform program state)]
(in [state archive phase_wrapper])))))
@@ -457,37 +461,58 @@
state (with_synthesis_extensions from state)
state (with_generation_extensions from state)]
(with_directive_extensions from state)))
+
+ (type: (Context state)
+ [Archive state])
+
+ (type: (Result state)
+ (Try (Context state)))
+
+ (type: (Return state)
+ (Async (Result state)))
+
+ (type: (Signal state)
+ (Resolver (Result state)))
+
+ (type: (Pending state)
+ [(Return state)
+ (Signal state)])
+
+ (type: (Importer state)
+ (-> (List ///.Custom) descriptor.Module descriptor.Module (Return state)))
+
+ (type: (Compiler state)
+ (-> (List ///.Custom) descriptor.Module (Importer state) module.ID (Context state) descriptor.Module (Return state)))
- (with_expansions [<Context> (as_is [Archive <State+>])
- <Result> (as_is (Try <Context>))
- <Return> (as_is (Async <Result>))
- <Signal> (as_is (Resolver <Result>))
- <Pending> (as_is [<Return> <Signal>])
- <Importer> (as_is (-> descriptor.Module descriptor.Module <Return>))
- <Compiler> (as_is (-> descriptor.Module <Importer> module.ID <Context> descriptor.Module <Return>))]
+ (with_expansions [Lux_Context (..Context <State+>)
+ Lux_Return (..Return <State+>)
+ Lux_Signal (..Signal <State+>)
+ Lux_Pending (..Pending <State+>)
+ Lux_Importer (..Importer <State+>)
+ Lux_Compiler (..Compiler <State+>)]
(def: (parallel initial)
(All (_ <type_vars>)
- (-> <Context>
- (-> <Compiler> <Importer>)))
+ (-> Lux_Context
+ (-> Lux_Compiler Lux_Importer)))
(let [current (stm.var initial)
pending (:sharing [<type_vars>]
- <Context>
+ Lux_Context
initial
- (Var (Dictionary descriptor.Module <Pending>))
+ (Var (Dictionary descriptor.Module Lux_Pending))
(:expected (stm.var (dictionary.empty text.hash))))
dependence (: (Var Dependence)
(stm.var ..independence))]
(function (_ compile)
- (function (import! importer module)
+ (function (import! customs importer module)
(do [! async.monad]
[[return signal] (:sharing [<type_vars>]
- <Context>
+ Lux_Context
initial
- (Async [<Return> (Maybe [<Context>
- module.ID
- <Signal>])])
+ (Async [Lux_Return (Maybe [Lux_Context
+ module.ID
+ Lux_Signal])])
(:expected
(stm.commit!
(do [! stm.monad]
@@ -517,22 +542,22 @@
{.#None}
(case (if (archive.reserved? archive module)
(do try.monad
- [module_id (archive.id module archive)]
- (in [module_id archive]))
+ [@module (archive.id module archive)]
+ (in [@module archive]))
(archive.reserve module archive))
- {try.#Success [module_id archive]}
+ {try.#Success [@module archive]}
(do !
[_ (stm.write [archive state] current)
.let [[return signal] (:sharing [<type_vars>]
- <Context>
+ Lux_Context
initial
- <Pending>
+ Lux_Pending
(async.async []))]
_ (stm.update (dictionary.has module [return signal]) pending)]
(in [return
{.#Some [[archive state]
- module_id
+ @module
signal]}]))
{try.#Failure error}
@@ -542,9 +567,9 @@
{.#None}
(in [])
- {.#Some [context module_id resolver]}
+ {.#Some [context @module resolver]}
(do !
- [result (compile importer import! module_id context module)
+ [result (compile customs importer import! @module context module)
result (case result
{try.#Failure error}
(in result)
@@ -622,33 +647,44 @@
new_dependencies))]
[all_dependencies duplicates]))
- (def: (after_imports import! module duplicates new_dependencies [archive state])
- (All (_ <type_vars>)
- (-> <Importer> descriptor.Module (Set descriptor.Module) (List descriptor.Module) <Context> <Return>))
+ (def: (any|after_imports customs import! module duplicates new_dependencies archive)
+ (All (_ <type_vars>
+ state document object)
+ (-> (List ///.Custom) (..Importer state) descriptor.Module (Set descriptor.Module) (List descriptor.Module) Archive
+ (Async (Try [Archive (List state)]))))
(do [! (try.with async.monad)]
[]
(if (set.empty? duplicates)
(case new_dependencies
{.#End}
- (in [archive state])
+ (in [archive (list)])
{.#Item _}
(do !
- [archive,document+ (|> new_dependencies
- (list#each (import! module))
- (monad.all ..monad))
- .let [archive (|> archive,document+
- (list#each product.left)
- (list#mix archive.merged archive))]]
- (in [archive (try.trusted
- (..updated_state archive
- (list#each product.right archive,document+)
- state))])))
+ [archive,state/* (|> new_dependencies
+ (list#each (import! customs module))
+ (monad.all ..monad))]
+ (in [(|> archive,state/*
+ (list#each product.left)
+ (list#mix archive.merged archive))
+ (list#each product.right archive,state/*)])))
(async#in (exception.except ..cannot_import_twice [module duplicates])))))
+ (def: (lux|after_imports customs import! module duplicates new_dependencies [archive state])
+ (All (_ <type_vars>)
+ (-> (List ///.Custom) Lux_Importer descriptor.Module (Set descriptor.Module) (List descriptor.Module) Lux_Context Lux_Return))
+ (do (try.with async.monad)
+ [[archive state/*] (any|after_imports customs import! module duplicates new_dependencies archive)]
+ (in [archive (case state/*
+ {.#End}
+ state
+
+ {.#Item _}
+ (try.trusted (..updated_state archive state/* state)))])))
+
(def: (next_compilation module [archive state] compilation)
(All (_ <type_vars>)
- (-> descriptor.Module <Context> (///.Compilation <State+> .Module Any)
+ (-> descriptor.Module Lux_Context (///.Compilation <State+> .Module Any)
(Try [<State+> (Either (///.Compilation <State+> .Module Any)
(archive.Entry Any))])))
((value@ ///.#process compilation)
@@ -667,11 +703,116 @@
(let [instancer (//init.compiler phase_wrapper expander syntax.prelude (value@ #write platform))]
(instancer $.key (list))))
+ (def: (custom_compiler import context platform compilation_sources compiler
+ custom_key custom_format custom_compilation)
+ (All (_ <type_vars>
+ state document object)
+ (-> Import context.Context <Platform> (List _io.Context) (///.Compiler <State+> .Module Any)
+ (Key document) (Writer document) (///.Compilation state document object)
+ (-> (List ///.Custom) descriptor.Module Lux_Importer module.ID (..Context state) descriptor.Module (..Return state))))
+ (function (_ customs importer import! @module [archive state] module)
+ (loop [[archive state] [archive state]
+ compilation custom_compilation
+ all_dependencies (: (Set descriptor.Module)
+ (set.of_list text.hash (list)))]
+ (do [! (try.with async.monad)]
+ [.let [new_dependencies (value@ ///.#dependencies compilation)
+ [all_dependencies duplicates] (with_new_dependencies new_dependencies all_dependencies)]
+ [archive _] (any|after_imports customs import! module duplicates new_dependencies archive)]
+ (case ((value@ ///.#process compilation) state archive)
+ {try.#Success [state more|done]}
+ (case more|done
+ {.#Left more}
+ (let [continue! (:sharing [state document object]
+ (///.Compilation state document object)
+ custom_compilation
+
+ (-> (..Context state) (///.Compilation state document object) (Set descriptor.Module)
+ (..Return state))
+ (:expected again))]
+ (continue! [archive state] more all_dependencies))
+
+ {.#Right entry}
+ (do !
+ [.let [entry (with@ [archive.#module module.#descriptor descriptor.#references] all_dependencies entry)]
+ _ (..cache_module context platform @module custom_key custom_format entry)]
+ (async#in (do try.monad
+ [archive (archive.has module entry archive)]
+ (in [archive state])))))
+
+ {try.#Failure error}
+ (do !
+ [_ (cache/archive.cache! (value@ #&file_system platform) context archive)]
+ (async#in {try.#Failure error})))))))
+
+ (def: (lux_compiler import context platform compilation_sources compiler compilation)
+ (All (_ <type_vars>)
+ (-> Import context.Context <Platform> (List _io.Context) (///.Compiler <State+> .Module Any)
+ (///.Compilation <State+> .Module Any)
+ Lux_Compiler))
+ (function (_ customs importer import! @module [archive state] module)
+ (loop [[archive state] [archive (..set_current_module module state)]
+ compilation compilation
+ all_dependencies (: (Set descriptor.Module)
+ (set.of_list text.hash (list)))]
+ (do [! (try.with async.monad)]
+ [.let [new_dependencies (value@ ///.#dependencies compilation)
+ [all_dependencies duplicates] (with_new_dependencies new_dependencies all_dependencies)]
+ [archive state] (lux|after_imports customs import! module duplicates new_dependencies [archive state])]
+ (case (next_compilation module [archive state] compilation)
+ {try.#Success [state more|done]}
+ (case more|done
+ {.#Left more}
+ (let [continue! (:sharing [<type_vars>]
+ <Platform>
+ platform
+
+ (-> Lux_Context (///.Compilation <State+> .Module Any) (Set descriptor.Module)
+ (Action [Archive <State+>]))
+ (:expected again))]
+ (continue! [archive state] more all_dependencies))
+
+ {.#Right entry}
+ (do !
+ [_ (let [report (..module_compilation_log module state)]
+ (with_expansions [<else> (in (debug.log! report))]
+ (for [@.js (case console.default
+ {.#None}
+ <else>
+
+ {.#Some console}
+ (console.write_line report console))]
+ <else>)))
+ .let [entry (with@ [archive.#module module.#descriptor descriptor.#references] all_dependencies entry)]
+ _ (..cache_module context platform @module $.key $.writer (:as (archive.Entry .Module) entry))]
+ (async#in (do try.monad
+ [archive (archive.has module entry archive)]
+ (in [archive
+ (..with_reset_log state)])))))
+
+ {try.#Failure error}
+ (do !
+ [_ (cache/archive.cache! (value@ #&file_system platform) context archive)]
+ (async#in {try.#Failure error})))))))
+
+ (for [@.old (as_is (def: Fake_State
+ Type
+ {.#Primitive (%.nat (static.random_nat)) (list)})
+
+ (def: Fake_Document
+ Type
+ {.#Primitive (%.nat (static.random_nat)) (list)})
+
+ (def: Fake_Object
+ Type
+ {.#Primitive (%.nat (static.random_nat)) (list)}))]
+ (as_is))
+
(def: (serial_compiler import context platform compilation_sources compiler)
(All (_ <type_vars>)
- (-> Import Context <Platform> (List _io.Context) (///.Compiler <State+> .Module Any)
- <Compiler>))
- (function (_ importer import! module_id [archive state] module)
+ (-> Import context.Context <Platform> (List _io.Context) (///.Compiler <State+> .Module Any)
+ Lux_Compiler))
+ (function (_ all_customs importer import! @module [archive lux_state] module)
(do [! (try.with async.monad)]
[input (io.read (value@ #&file_system platform)
importer
@@ -679,67 +820,44 @@
compilation_sources
(value@ context.#host_module_extension context)
module)]
- (loop [[archive state] [archive (..set_current_module module state)]
- compilation (compiler input)
- all_dependencies (: (Set descriptor.Module)
- (set.of_list text.hash (list)))]
- (do !
- [.let [new_dependencies (value@ ///.#dependencies compilation)
- [all_dependencies duplicates] (with_new_dependencies new_dependencies all_dependencies)]
- [archive state] (after_imports import! module duplicates new_dependencies [archive state])]
- (case (next_compilation module [archive state] compilation)
- {try.#Success [state more|done]}
- (case more|done
- {.#Left more}
- (let [continue! (:sharing [<type_vars>]
- <Platform>
- platform
-
- (-> <Context> (///.Compilation <State+> .Module Any) (Set descriptor.Module)
- (Action [Archive <State+>]))
- (:expected again))]
- (continue! [archive state] more all_dependencies))
-
- {.#Right entry}
- (do !
- [_ (let [report (..module_compilation_log module state)]
- (with_expansions [<else> (in (debug.log! report))]
- (for [@.js (case console.default
- {.#None}
- <else>
-
- {.#Some console}
- (console.write_line report console))]
- <else>)))
- .let [entry (with@ [archive.#module module.#descriptor descriptor.#references] all_dependencies entry)]
- _ (..cache_module context platform module_id entry)]
- (case (archive.has module entry archive)
- {try.#Success archive}
- (in [archive
- (..with_reset_log state)])
-
- {try.#Failure error}
- (async#in {try.#Failure error}))))
-
- {try.#Failure error}
+ (loop [customs (for [@.old (:as (List (///.Custom Fake_State Fake_Document Fake_Object))
+ all_customs)]
+ all_customs)]
+ (case customs
+ {.#End}
+ ((..lux_compiler import context platform compilation_sources compiler (compiler input))
+ all_customs importer import! @module [archive lux_state] module)
+
+ {.#Item [custom_state custom_key custom_format custom_parser custom_compiler] tail}
+ (case (custom_compiler input)
+ {try.#Failure _}
+ (again tail)
+
+ {try.#Success custom_compilation}
(do !
- [_ (cache/archive.cache! (value@ #&file_system platform) context archive)]
- (async#in {try.#Failure error}))))))))
+ [[archive' custom_state'] ((..custom_compiler import context platform compilation_sources compiler
+ custom_key custom_format custom_compilation)
+ all_customs importer import! @module [archive custom_state] module)]
+ (in [archive' lux_state]))))))))
+
+ (def: .public Custom
+ Type
+ (type (-> (List Text) (Try ///.Custom))))
(exception: .public (invalid_custom_compiler [definition Symbol
type Type])
(exception.report
["Definition" (%.symbol definition)]
- ["Expected Type" (%.type ///.Custom)]
+ ["Expected Type" (%.type ..Custom)]
["Actual Type" (%.type type)]))
- (def: (custom_compiler importer it)
+ (def: (custom import! it)
(All (_ <type_vars>)
- (-> <Importer> Compiler (Async (Try [<Context> (List Text) Any]))))
+ (-> Lux_Importer compiler.Compiler (Async (Try [Lux_Context (List Text) Any]))))
(let [/#definition (value@ compiler.#definition it)
[/#module /#name] /#definition]
(do ..monad
- [context (importer descriptor.runtime /#module)
+ [context (import! (list) descriptor.runtime /#module)
.let [[archive state] context
meta_state (value@ [extension.#state
///directive.#analysis
@@ -750,25 +868,25 @@
meta.export
(meta.result meta_state)
async#in)]
- (async#in (if (check.subsumes? ///.Custom /#type)
+ (async#in (if (check.subsumes? ..Custom /#type)
{try.#Success [context (value@ compiler.#parameters it) /#value]}
(exception.except ..invalid_custom_compiler [/#definition /#type]))))))
(def: .public (compile lux_compiler phase_wrapper import file_context expander platform compilation context)
(All (_ <type_vars>)
- (-> (-> Any ///.Custom) ///phase.Wrapper Import Context Expander <Platform> Compilation <Context> <Return>))
+ (-> (-> Any ..Custom) ///phase.Wrapper Import context.Context Expander <Platform> Compilation Lux_Context Lux_Return))
(let [[host_dependencies libraries compilers sources target module configuration] compilation
- importer (|> (..compiler phase_wrapper expander platform)
- (serial_compiler import file_context platform sources)
- (..parallel context))]
+ import! (|> (..compiler phase_wrapper expander platform)
+ (serial_compiler import file_context platform sources)
+ (..parallel context))]
(do [! ..monad]
[customs (|> compilers
(list#each (function (_ it)
(do !
- [[context parameters custom] (custom_compiler importer it)]
+ [[context parameters custom] (..custom import! it)]
(async#in (|> custom
lux_compiler
(function.on parameters))))))
(monad.all !))]
- (importer descriptor.runtime module))))
+ (import! customs descriptor.runtime module))))
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index df3c8bd71..8e12692c9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -2172,7 +2172,7 @@
bodyA
2
- (let [forced_refencing (/////analysis.tuple (list#each (|>> /////analysis.local) (list.indices arity)))]
+ (let [forced_refencing (/////analysis.tuple (list#each (|>> /////analysis.local) (list.indices (++ arity))))]
{/////analysis.#Case (/////analysis.unit)
[[/////analysis.#when
{pattern.#Bind 2}
@@ -2182,7 +2182,7 @@
(list)]})
_
- (let [forced_refencing (/////analysis.tuple (list#each (|>> /////analysis.local) (list.indices arity)))]
+ (let [forced_refencing (/////analysis.tuple (list#each (|>> /////analysis.local) (list.indices (++ arity))))]
{/////analysis.#Case (/////analysis.unit)
[[/////analysis.#when
{pattern.#Complex
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
index 296f0394b..cb078ad43 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
@@ -11,7 +11,8 @@
["<[0]>" synthesis {"+" Parser}]]]
[data
["[0]" product]
- ["[0]" text ("[1]#[0]" equivalence)]
+ ["[0]" text ("[1]#[0]" equivalence)
+ ["%" format]]
[collection
["[0]" list ("[1]#[0]" monad mix monoid)]
["[0]" dictionary {"+" Dictionary}]
@@ -848,28 +849,29 @@
(def: .public (hidden_method_body arity body)
(-> Nat Synthesis Synthesis)
- (case [arity body]
- (^or [0 _]
- [1 _])
- body
-
- (^ [2 {//////synthesis.#Control {//////synthesis.#Branch {//////synthesis.#Let _ 2 (//////synthesis.tuple (list _ hidden))}}}])
- hidden
-
- [_ {//////synthesis.#Control {//////synthesis.#Branch {//////synthesis.#Case _ path}}}]
- (loop [path (: Path path)]
- (case path
- {//////synthesis.#Seq _ next}
- (again next)
-
- (^ {//////synthesis.#Then (//////synthesis.tuple (list _ hidden))})
- hidden
-
- _
- (undefined)))
-
- _
- (undefined)))
+ (with_expansions [<oops> (panic! (%.format (%.nat arity) " " (//////synthesis.%synthesis body)))]
+ (case [arity body]
+ (^or [0 _]
+ [1 _])
+ body
+
+ (^ [2 {//////synthesis.#Control {//////synthesis.#Branch {//////synthesis.#Let _ 2 (//////synthesis.tuple (list _ hidden))}}}])
+ hidden
+
+ [_ {//////synthesis.#Control {//////synthesis.#Branch {//////synthesis.#Case _ path}}}]
+ (loop [path (: Path path)]
+ (case path
+ {//////synthesis.#Seq _ next}
+ (again next)
+
+ (^ {//////synthesis.#Then (//////synthesis.tuple (list _ hidden))})
+ hidden
+
+ _
+ <oops>))
+
+ _
+ <oops>)))
(def: overriden_method_definition
(Parser [(Environment Synthesis) (/.Overriden_Method Synthesis)])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
index e2e1df881..325700c72 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
@@ -30,7 +30,8 @@
[////
["[0]" generation]
["[0]" synthesis {"+" Path Fork Synthesis}
- ["[0]" member {"+" Member}]]
+ [access
+ ["[0]" member {"+" Member}]]]
[///
["[0]" phase ("operation#[0]" monad)]
[reference
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
index 1e285ebb2..8b10f2833 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
@@ -27,7 +27,8 @@
["/[1]" // "_"
["[1][0]" generation]
["[1][0]" synthesis {"+" Synthesis Path}
- ["[0]" member {"+" Member}]]
+ [access
+ ["[0]" member {"+" Member}]]]
["//[1]" /// "_"
[reference
["[1][0]" variable {"+" Register}]]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index 5441ec92f..ebab6fe8a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -25,8 +25,9 @@
["[2][0]" complex]
["[2][0]" pattern {"+" Pattern}]]
["/" synthesis {"+" Path Synthesis Operation Phase}
- ["[1][0]" side]
- ["[1][0]" member {"+" Member}]]
+ ["[1][0]" access
+ ["[2][0]" side]
+ ["[2][0]" member {"+" Member}]]]
[///
["[1]" phase ("[1]#[0]" monad)]
["[1][0]" reference
@@ -68,8 +69,8 @@
thenC)
{///pattern.#Complex {///complex.#Variant [lefts right? value_pattern]}}
- (<| (///#each (|>> {/.#Seq {/.#Access {/.#Side [/side.#lefts lefts
- /side.#right? right?]}}}))
+ (<| (///#each (|>> {/.#Seq {/.#Access {/access.#Side [/side.#lefts lefts
+ /side.#right? right?]}}}))
(path' value_pattern end?)
(when> [(new> (not end?) [])] [(///#each ..clean_up)])
thenC)
@@ -84,10 +85,10 @@
_
(let [right? (n.= tuple::last tuple::lefts)
end?' (and end? right?)]
- (<| (///#each (|>> {/.#Seq {/.#Access {/.#Member [/member.#lefts (if right?
- (-- tuple::lefts)
- tuple::lefts)
- /member.#right? right?]}}}))
+ (<| (///#each (|>> {/.#Seq {/.#Access {/access.#Member [/member.#lefts (if right?
+ (-- tuple::lefts)
+ tuple::lefts)
+ /member.#right? right?]}}}))
(path' tuple::member end?')
(when> [(new> (not end?') [])] [(///#each ..clean_up)])
nextC))))
@@ -182,11 +183,11 @@
(if (n.= newL oldL)
old
<default>)])
- ([/.#Side #0 /side.#lefts /side.#right?]
- [/.#Side #1 /side.#lefts /side.#right?]
+ ([/access.#Side #0 /side.#lefts /side.#right?]
+ [/access.#Side #1 /side.#lefts /side.#right?]
- [/.#Member #0 /member.#lefts /member.#right?]
- [/.#Member #1 /member.#lefts /member.#right?])
+ [/access.#Member #0 /member.#lefts /member.#right?]
+ [/access.#Member #1 /member.#lefts /member.#right?])
[{/.#Bind newR} {/.#Bind oldR}]
(if (n.= newR oldR)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
index ba6f29f89..74abfe432 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
@@ -19,9 +19,10 @@
[number
["n" nat]]]]]
[////
- ["/" synthesis {"+" Path Synthesis}]
["[0]" analysis
["[1]/[0]" complex]]
+ ["/" synthesis {"+" Path Synthesis}
+ ["[1][0]" access]]
[///
[arity {"+" Arity}]
["[0]" reference
@@ -49,17 +50,17 @@
register)}
(again post)})
- (^or {/.#Seq {/.#Access {/.#Member member}}
+ (^or {/.#Seq {/.#Access {/access.#Member member}}
{/.#Seq {/.#Bind register}
post}}
... This alternative form should never occur in practice.
... Yet, it is "technically" possible to construct it.
- {/.#Seq {/.#Seq {/.#Access {/.#Member member}}
+ {/.#Seq {/.#Seq {/.#Access {/access.#Member member}}
{/.#Bind register}}
post})
(if (n.= redundant register)
(again post)
- {/.#Seq {/.#Access {/.#Member member}}
+ {/.#Seq {/.#Access {/access.#Member member}}
{/.#Seq {/.#Bind (if (n.> redundant register)
(-- register)
register)}
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
index a5767f301..819c44a5f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
@@ -26,8 +26,9 @@
["f" frac]]]]]
["[0]" / "_"
["[1][0]" simple {"+" Simple}]
- ["[1][0]" side {"+" Side}]
- ["[1][0]" member {"+" Member}]
+ ["[1][0]" access {"+" Access}
+ ["[2][0]" side {"+" Side}]
+ ["[2][0]" member {"+" Member}]]
[//
["[0]" analysis {"+" Environment Analysis}
["[1]/[0]" complex {"+" Complex}]]
@@ -57,11 +58,6 @@
[#locals 0
#currying? false])
-(type: .public Access
- (Variant
- {#Side Side}
- {#Member Member}))
-
(type: .public (Fork value next)
[[value next] (List [value next])])
@@ -152,8 +148,8 @@
{<kind>}
content)])]
- [path/side ..#Side]
- [path/member ..#Member]
+ [path/side /access.#Side]
+ [path/member /access.#Member]
)
(template [<name> <access> <lefts> <right?>]
@@ -163,8 +159,8 @@
[<lefts> lefts
<right?> right?])])]
- [side ..#Side /side.#lefts /side.#right?]
- [member ..#Member /member.#lefts /member.#right?]
+ [side /access.#Side /side.#lefts /side.#right?]
+ [member /access.#Member /member.#lefts /member.#right?]
)
(template [<access> <side> <name>]
@@ -303,13 +299,8 @@
[#F64_Fork %.frac]
[#Text_Fork %.text])
- {#Access access}
- (case access
- {#Side it}
- (/side.format it)
-
- {#Member it}
- (/member.format it))
+ {#Access it}
+ (/access.format it)
{#Bind register}
(format "(@ " (%.nat register) ")")
@@ -381,7 +372,7 @@
{#Get members record}
(|> (format (%.list (%path' %synthesis)
- (list#each (|>> {#Member} {#Access}) members))
+ (list#each (|>> {/access.#Member} {#Access}) members))
" " (%synthesis record))
(text.enclosed ["{#get " "}"]))
@@ -416,33 +407,6 @@
(Format Path)
(%path' %synthesis))
-(implementation: .public access_equivalence
- (Equivalence Access)
-
- (def: (= reference sample)
- (case [reference sample]
- (^template [<tag> <equivalence>]
- [[{<tag> reference} {<tag> sample}]
- (# <equivalence> = reference sample)])
- ([#Side /side.equivalence]
- [#Member /member.equivalence])
-
- _
- false)))
-
-(implementation: access_hash
- (Hash Access)
-
- (def: &equivalence ..access_equivalence)
-
- (def: (hash value)
- (case value
- (^template [<tag> <hash>]
- [{<tag> value}
- (# <hash> hash value)])
- ([#Side /side.hash]
- [#Member /member.hash]))))
-
(implementation: .public (path'_equivalence equivalence)
(All (_ a) (-> (Equivalence a) (Equivalence (Path' a))))
@@ -470,7 +434,7 @@
(^template [<tag> <equivalence>]
[[{<tag> reference'} {<tag> sample'}]
(# <equivalence> = reference' sample')])
- ([#Access ..access_equivalence]
+ ([#Access /access.equivalence]
[#Then equivalence])
[{#Bind reference'} {#Bind sample'}]
@@ -498,7 +462,7 @@
2
{#Access access}
- (n.* 3 (# ..access_hash hash access))
+ (n.* 3 (# /access.hash hash access))
{#Bind register}
(n.* 5 (# n.hash hash register))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux
new file mode 100644
index 000000000..cb3e3f50a
--- /dev/null
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux
@@ -0,0 +1,38 @@
+(.using
+ [library
+ [lux "*"
+ [abstract
+ [equivalence {"+" Equivalence}]
+ [hash {"+" Hash}]]
+ [data
+ ["[0]" sum]
+ [text
+ ["%" format {"+" Format}]]]]]
+ ["[0]" / "_"
+ ["[1][0]" side {"+" Side}]
+ ["[1][0]" member {"+" Member}]])
+
+(type: .public Access
+ (Variant
+ {#Side Side}
+ {#Member Member}))
+
+(def: .public (format it)
+ (Format Access)
+ (case it
+ {#Side it}
+ (/side.format it)
+
+ {#Member it}
+ (/member.format it)))
+
+(def: .public hash
+ (Hash Access)
+ ($_ sum.hash
+ /side.hash
+ /member.hash
+ ))
+
+(def: .public equivalence
+ (Equivalence Access)
+ (# ..hash &equivalence))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/member.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux
index 4e1ed910b..4e1ed910b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/member.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/side.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux
index dd9bf4223..dd9bf4223 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/side.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux
diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
index f625ba952..212006bbe 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
@@ -1,7 +1,7 @@
(.using
[library
[lux "*"
- [target {"+" Target}]
+ ["@" target {"+" Target}]
[abstract
["[0]" monad {"+" Monad do}]]
[control
@@ -31,6 +31,7 @@
[import {"+" Import}]
["[0]" context {"+" Context}]
["[0]" archive {"+" Output Archive}
+ [key {"+" Key}]
["[0]" registry {"+" Registry}]
["[0]" unit]
["[0]" artifact {"+" Artifact}
@@ -44,7 +45,7 @@
["[1]/[0]" purge {"+" Cache Purge}]
["[0]" dependency "_"
["[1]" module]]]
- [//
+ [// {"+" Custom}
[language
["$" lux
["[0]" analysis]
@@ -53,17 +54,19 @@
["[0]" directive]
["[1]/[0]" program]]]]]])
-(def: module_parser
- (Parser (module.Module .Module))
+(def: (module_parser key parser)
+ (All (_ document)
+ (-> (Key document) (Parser document) (Parser (module.Module document))))
($_ <>.and
<binary>.nat
descriptor.parser
- (document.parser $.key $.parser)))
+ (document.parser key parser)))
-(def: parser
- (Parser [(module.Module .Module) Registry])
+(def: (parser key parser)
+ (All (_ document)
+ (-> (Key document) (Parser document) (Parser [(module.Module document) Registry])))
($_ <>.and
- ..module_parser
+ (..module_parser key parser)
registry.parser))
(def: (fresh_analysis_state host configuration)
@@ -262,30 +265,43 @@
Text
"(Lux Caching System)")
-(def: (valid_cache fs context import contexts [module_name @module])
- (-> (file.System Async) Context Import (List //.Context)
+(def: (cache_parser customs)
+ (-> (List Custom) (Parser [(module.Module Any) Registry]))
+ (case (for [@.old (:as (List (Custom Any Any Any))
+ customs)]
+ customs)
+ {.#End}
+ (..parser $.key $.parser)
+
+ {.#Item [custom_state custom_key custom_format custom_parser custom_compiler] tail}
+ ($_ <>.either
+ (..parser custom_key custom_parser)
+ (cache_parser tail)
+ )))
+
+(def: (valid_cache customs fs context import contexts [module_name @module])
+ (-> (List Custom) (file.System Async) Context Import (List //.Context)
[descriptor.Module module.ID]
(Async (Try Cache)))
(with_expansions [<cache> (as_is module_name @module module registry)]
(do [! (try.with async.monad)]
[data (: (Async (Try Binary))
(cache/module.cache fs context @module))
- [module registry] (async#in (<binary>.result ..parser data))]
+ [module registry] (async#in (<binary>.result (..cache_parser customs) data))]
(if (text#= descriptor.runtime module_name)
(in [true <cache>])
(do !
[input (//context.read fs ..pseudo_module import contexts (value@ context.#host_module_extension context) module_name)]
(in [(cache/purge.valid? (value@ module.#descriptor module) input) <cache>]))))))
-(def: (pre_loaded_caches fs context import contexts archive)
- (-> (file.System Async) Context Import (List //.Context) Archive
+(def: (pre_loaded_caches customs fs context import contexts archive)
+ (-> (List Custom) (file.System Async) Context Import (List //.Context) Archive
(Async (Try (List Cache))))
(do [! (try.with async.monad)]
[... TODO: Stop needing to wrap this expression in an unnecessary "do" expression.
it (|> archive
archive.reservations
- (monad.each !
- (..valid_cache fs context import contexts)))]
+ (monad.each ! (..valid_cache customs fs context import contexts)))]
(in it)))
(def: (load_order archive pre_loaded_caches)
@@ -319,12 +335,12 @@
bundles])))))]
(in it)))
-(def: (load_every_reserved_module configuration host_environment fs context import contexts archive)
+(def: (load_every_reserved_module customs configuration host_environment fs context import contexts archive)
(All (_ expression directive)
- (-> Configuration (generation.Host expression directive) (file.System Async) Context Import (List //.Context) Archive
+ (-> (List Custom) Configuration (generation.Host expression directive) (file.System Async) Context Import (List //.Context) Archive
(Async (Try [Archive .Lux Bundles]))))
(do [! (try.with async.monad)]
- [pre_loaded_caches (..pre_loaded_caches fs context import contexts archive)
+ [pre_loaded_caches (..pre_loaded_caches customs fs context import contexts archive)
load_order (async#in (load_order archive pre_loaded_caches))
.let [purge (cache/purge.purge pre_loaded_caches load_order)]
_ (|> purge
@@ -350,9 +366,9 @@
..empty_bundles
loaded_caches)])))))
-(def: .public (thaw configuration host_environment fs context import contexts)
+(def: .public (thaw customs configuration host_environment fs context import contexts)
(All (_ expression directive)
- (-> Configuration (generation.Host expression directive) (file.System Async) Context Import (List //.Context)
+ (-> (List Custom) Configuration (generation.Host expression directive) (file.System Async) Context Import (List //.Context)
(Async (Try [Archive .Lux Bundles]))))
(do async.monad
[binary (# fs read (cache/archive.descriptor fs context))]
@@ -360,7 +376,7 @@
{try.#Success binary}
(do (try.with async.monad)
[archive (async#in (archive.import ///.version binary))]
- (..load_every_reserved_module configuration host_environment fs context import contexts archive))
+ (..load_every_reserved_module customs configuration host_environment fs context import contexts archive))
{try.#Failure error}
(in {try.#Success [archive.empty
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index 70e392965..c835643dd 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -135,7 +135,7 @@
service
packager,package)
(All (_ <parameters>)
- (-> (-> Any compiler.Custom)
+ (-> (-> Any platform.Custom)
Context
Expander
analysis.Bundle
diff --git a/stdlib/source/test/lux/data/sum.lux b/stdlib/source/test/lux/data/sum.lux
index 73ffe0e21..2aa3c5058 100644
--- a/stdlib/source/test/lux/data/sum.lux
+++ b/stdlib/source/test/lux/data/sum.lux
@@ -1,24 +1,25 @@
(.using
- [library
- [lux "*"
- ["_" test {"+" Test}]
- [abstract
- [monad {"+" do}]
- [\\specification
- ["$[0]" equivalence]]]
- [control
- pipe]
- [data
- ["[0]" text]
- [collection
- ["[0]" list ("[1]#[0]" functor)]]]
- [math
- ["[0]" random]
- [number
- ["n" nat]
- ["i" int]]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux "*"
+ ["_" test {"+" Test}]
+ [abstract
+ [monad {"+" do}]
+ [\\specification
+ ["$[0]" equivalence]
+ ["$[0]" hash]]]
+ [control
+ pipe]
+ [data
+ ["[0]" text]
+ [collection
+ ["[0]" list ("[1]#[0]" functor)]]]
+ [math
+ ["[0]" random]
+ [number
+ ["n" nat]
+ ["i" int]]]]]
+ [\\library
+ ["[0]" /]])
(def: .public test
Test
@@ -31,15 +32,9 @@
(_.for [/.equivalence]
($equivalence.spec (/.equivalence n.equivalence n.equivalence)
(random.or random.nat random.nat)))
- (do random.monad
- [left random.int
- right random.nat]
- (_.cover [/.hash]
- (let [hash (/.hash i.hash n.hash)]
- (and (n.= (# i.hash hash left)
- (# hash hash {.#Left left}))
- (n.= (# n.hash hash right)
- (# hash hash {.#Right right}))))))
+ (_.for [/.hash]
+ ($hash.spec (/.hash n.hash n.hash)
+ (random.or random.nat random.nat)))
(_.cover [/.left]
(|> (/.left expected)
diff --git a/stdlib/source/test/lux/target/python.lux b/stdlib/source/test/lux/target/python.lux
index b09be8b72..cb9a3551c 100644
--- a/stdlib/source/test/lux/target/python.lux
+++ b/stdlib/source/test/lux/target/python.lux
@@ -141,6 +141,13 @@
(/.repr/1 (/.float subject))))
))))
+(def: python_3?
+ (/.Expression Any)
+ (|> (/.__import__/1 (/.unicode "sys"))
+ (/.the "version_info")
+ (/.the "major")
+ (/.= (/.int +3))))
+
(def: int/16
(-> Int Int)
(i64.and (-- (i64.left_shifted 15 1))))
@@ -164,6 +171,16 @@
[/.bit_xor i64.xor]
[/.bit_and i64.and]
))
+ (~~ (template [</> <lux>]
+ [(_.cover [</>]
+ (let [left (.int shift)
+ right (i.* (.int shift) i16)
+ expected (<lux> left right)]
+ (expression (|>> (:as Int) (i.= expected))
+ (</> (/.int left) (/.int right)))))]
+
+ [/.// i./]
+ ))
(_.cover [/.opposite]
(expression (|>> (:as Int) (i.= (i.* -1 left)))
(/.opposite (/.int left))))
@@ -183,6 +200,11 @@
(_.cover [/.str/1]
(expression (|>> (:as Text) (text#= (text.replaced "+" "" (%.int left))))
(/.str/1 (/.int left))))
+ (_.cover [/.long]
+ (or (expression (|>> (:as Bit))
+ ..python_3?)
+ (expression (|>> (:as Int) (i.= left))
+ (/.long left))))
))))
(def: test|text
@@ -191,11 +213,16 @@
[expected_code (# ! each (n.% 128) random.nat)
.let [expected_char (text.of_char expected_code)]]
($_ _.and
- (_.cover [/.chr/1 /.ord/1]
+ (_.cover [/.chr/1 /.ord/1
+ /.unichr/1 /.unicode/1]
(and (expression (|>> (:as Int) .nat (n.= expected_code))
- (/.ord/1 (/.chr/1 (/.int (.int expected_code)))))
+ (/.? python_3?
+ (/.ord/1 (/.chr/1 (/.int (.int expected_code))))
+ (/.unicode/1 (/.unichr/1 (/.int (.int expected_code))))))
(expression (|>> (:as Text) (text#= expected_char))
- (/.chr/1 (/.ord/1 (/.string expected_char))))))
+ (/.? python_3?
+ (/.chr/1 (/.ord/1 (/.string expected_char)))
+ (/.unichr/1 (/.unicode/1 (/.string expected_char)))))))
)))
(def: test|array
diff --git a/stdlib/source/test/lux/tool.lux b/stdlib/source/test/lux/tool.lux
index 1009e3239..d21012a13 100644
--- a/stdlib/source/test/lux/tool.lux
+++ b/stdlib/source/test/lux/tool.lux
@@ -14,7 +14,7 @@
["[1][0]" analysis]
["[1][0]" synthesis "_"
["[1]/[0]" simple]
- ["[1]/[0]" side]]
+ ["[1]/[0]" access]]
["[1][0]" phase "_"
["[1]/[0]" extension]
["[1]/[0]" analysis]
@@ -38,7 +38,7 @@
/phase.test
/analysis.test
/synthesis/simple.test
- /synthesis/side.test
+ /synthesis/access.test
/meta/archive.test
/meta/cli.test
/meta/export.test
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access.lux b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access.lux
new file mode 100644
index 000000000..cb6859350
--- /dev/null
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access.lux
@@ -0,0 +1,14 @@
+(.using
+ [library
+ [lux "*"
+ ["_" test {"+" Test}]]]
+ ["[0]" / "_"
+ ["[1][0]" side]
+ ["[1][0]" member]])
+
+(def: .public test
+ Test
+ ($_ _.and
+ /side.test
+ /member.test
+ ))
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/member.lux b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/member.lux
new file mode 100644
index 000000000..db4f15bfa
--- /dev/null
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/member.lux
@@ -0,0 +1,41 @@
+(.using
+ [library
+ [lux "*"
+ ["_" test {"+" Test}]
+ [abstract
+ [monad {"+" do}]
+ [\\specification
+ ["$[0]" equivalence]
+ ["$[0]" hash]]]
+ [data
+ ["[0]" bit ("[1]#[0]" equivalence)]
+ ["[0]" text ("[1]#[0]" equivalence)]]
+ [math
+ ["[0]" random {"+" Random}]]]]
+ [\\library
+ ["[0]" /]])
+
+(def: .public random
+ (Random /.Member)
+ ($_ random.and
+ random.nat
+ random.bit
+ ))
+
+(def: .public test
+ Test
+ (<| (_.covering /._)
+ (_.for [/.Member])
+ (do [! random.monad]
+ [left ..random
+ right ..random]
+ ($_ _.and
+ (_.for [/.equivalence]
+ ($equivalence.spec /.equivalence ..random))
+ (_.for [/.hash]
+ ($hash.spec /.hash ..random))
+
+ (_.cover [/.format]
+ (bit#= (# /.equivalence = left right)
+ (text#= (/.format left) (/.format right))))
+ ))))
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/side.lux b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/side.lux
index 3dccec159..adc2b142d 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/side.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/side.lux
@@ -11,9 +11,7 @@
["[0]" bit ("[1]#[0]" equivalence)]
["[0]" text ("[1]#[0]" equivalence)]]
[math
- ["[0]" random {"+" Random}]
- [number
- ["n" nat]]]]]
+ ["[0]" random {"+" Random}]]]]
[\\library
["[0]" /]])
diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux
index b73f420aa..841167110 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux
@@ -49,13 +49,13 @@
Test
(<| (_.covering /._)
(do [! random.monad]
- [.let [/ "/"
- fs (file.mock /)]
- context $///context.random
+ [context $///context.random
@module random.nat]
($_ _.and
(in (do [! async.monad]
- [pre/0 (# fs directory? (/.path fs context @module))
+ [.let [/ "/"
+ fs (file.mock /)]
+ pre/0 (# fs directory? (/.path fs context @module))
pre/1 (/.enabled? fs context @module)
outcome (/.enable! ! fs context @module)
post/0 (# fs directory? (/.path fs context @module))
@@ -71,7 +71,9 @@
post/0
post/1))))
(in (do [! async.monad]
- [pre/0 (# fs directory? (/.path fs context @module))
+ [.let [/ "/"
+ fs (file.mock /)]
+ pre/0 (# fs directory? (/.path fs context @module))
pre/1 (/.enabled? fs context @module)
outcome (/.enable! ! (..bad fs) context @module)
post/0 (# fs directory? (/.path fs context @module))