aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/library/lux/tool/compiler
diff options
context:
space:
mode:
authorEduardo Julian2022-04-06 21:52:30 -0400
committerEduardo Julian2022-04-06 21:52:30 -0400
commitb0d725f24335e82eefc77175efc0a5282951316e (patch)
tree18a5cc4b318776250442311636a415a5cc2c1f20 /stdlib/source/library/lux/tool/compiler
parenta0ed5fd377daf5754697636504de8e180abf9ec0 (diff)
More efficient binary formatting.
Diffstat (limited to 'stdlib/source/library/lux/tool/compiler')
-rw-r--r--stdlib/source/library/lux/tool/compiler/default/init.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/default/platform.lux6
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux24
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux148
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux46
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux10
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux28
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux10
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux28
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux26
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux136
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux28
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux6
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux28
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux10
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux68
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux28
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux28
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux10
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux28
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux28
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux10
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux68
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux52
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux56
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux10
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/meta/archive.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/meta/io/archive.lux8
45 files changed, 515 insertions, 507 deletions
diff --git a/stdlib/source/library/lux/tool/compiler/default/init.lux b/stdlib/source/library/lux/tool/compiler/default/init.lux
index f6c30c1cd..c46cbfa7b 100644
--- a/stdlib/source/library/lux/tool/compiler/default/init.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/init.lux
@@ -87,8 +87,8 @@
(-> (///directive.State+ anchor expression directive)
(///directive.State+ anchor expression directive))))
(function (_ [directive_extensions sub_state])
- [(dictionary.merged directive_extensions
- (luxD.bundle expander host_analysis program anchorT,expressionT,directiveT extender))
+ [(dictionary.composite directive_extensions
+ (luxD.bundle expander host_analysis program anchorT,expressionT,directiveT extender))
sub_state]))
(type: Reader
diff --git a/stdlib/source/library/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux
index c93c30c99..0e6a0f2bc 100644
--- a/stdlib/source/library/lux/tool/compiler/default/platform.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux
@@ -247,7 +247,7 @@
[analysers
synthesizers
generators
- (dictionary.merged directives (host_directive_bundle phase_wrapper))])
+ (dictionary.composite directives (host_directive_bundle phase_wrapper))])
(def: .public (initialize context module expander host_analysis platform generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender
import compilation_sources compilation_configuration)
@@ -579,7 +579,7 @@
{try.#Success [resulting_archive resulting_state]}
(stm.commit! (do stm.monad
[[_ [merged_archive _]] (stm.update (function (_ [archive state])
- [(archive.merged resulting_archive archive)
+ [(archive.composite resulting_archive archive)
state])
current)]
(in {try.#Success [merged_archive resulting_state]}))))]
@@ -668,7 +668,7 @@
(monad.all ..monad))]
(in [(|> archive,state/*
(list#each product.left)
- (list#mix archive.merged archive))
+ (list#mix archive.composite archive))
(list#each product.right archive,state/*)])))
(async#in (exception.except ..cannot_import_twice [module duplicates])))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux
index ac0c5d9a8..3529ba762 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux
@@ -1,16 +1,16 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- [////
- [analysis {"+" Bundle}
- [evaluation {"+" Eval}]]]
- ["[0]" / "_"
- ["[1][0]" lux]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ [////
+ [analysis {"+" Bundle}
+ [evaluation {"+" Eval}]]]
+ ["[0]" / "_"
+ ["[1][0]" lux]])
(def: .public (bundle eval host_specific)
(-> Eval Bundle Bundle)
- (dictionary.merged host_specific
- (/lux.bundle eval)))
+ (dictionary.composite host_specific
+ (/lux.bundle eval)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux
index 61dc4713e..5acdad833 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux
@@ -221,8 +221,8 @@
Bundle
(<| (bundle.prefix "js")
(|> bundle.empty
- (dictionary.merged bundle::array)
- (dictionary.merged bundle::object)
+ (dictionary.composite bundle::array)
+ (dictionary.composite bundle::object)
(bundle.install "constant" js::constant)
(bundle.install "apply" js::apply)
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 6d7804b9a..4b7c3e153 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
@@ -786,50 +786,50 @@
Bundle
(<| (///bundle.prefix "array")
(|> ///bundle.empty
- (dictionary.merged (<| (///bundle.prefix "length")
- (|> ///bundle.empty
- (///bundle.install (reflection.reflection reflection.boolean) (primitive_array_length_handler jvm.boolean))
- (///bundle.install (reflection.reflection reflection.byte) (primitive_array_length_handler jvm.byte))
- (///bundle.install (reflection.reflection reflection.short) (primitive_array_length_handler jvm.short))
- (///bundle.install (reflection.reflection reflection.int) (primitive_array_length_handler jvm.int))
- (///bundle.install (reflection.reflection reflection.long) (primitive_array_length_handler jvm.long))
- (///bundle.install (reflection.reflection reflection.float) (primitive_array_length_handler jvm.float))
- (///bundle.install (reflection.reflection reflection.double) (primitive_array_length_handler jvm.double))
- (///bundle.install (reflection.reflection reflection.char) (primitive_array_length_handler jvm.char))
- (///bundle.install "object" array::length::object))))
- (dictionary.merged (<| (///bundle.prefix "new")
- (|> ///bundle.empty
- (///bundle.install (reflection.reflection reflection.boolean) (new_primitive_array_handler jvm.boolean))
- (///bundle.install (reflection.reflection reflection.byte) (new_primitive_array_handler jvm.byte))
- (///bundle.install (reflection.reflection reflection.short) (new_primitive_array_handler jvm.short))
- (///bundle.install (reflection.reflection reflection.int) (new_primitive_array_handler jvm.int))
- (///bundle.install (reflection.reflection reflection.long) (new_primitive_array_handler jvm.long))
- (///bundle.install (reflection.reflection reflection.float) (new_primitive_array_handler jvm.float))
- (///bundle.install (reflection.reflection reflection.double) (new_primitive_array_handler jvm.double))
- (///bundle.install (reflection.reflection reflection.char) (new_primitive_array_handler jvm.char))
- (///bundle.install "object" array::new::object))))
- (dictionary.merged (<| (///bundle.prefix "read")
- (|> ///bundle.empty
- (///bundle.install (reflection.reflection reflection.boolean) (read_primitive_array_handler ..boolean jvm.boolean))
- (///bundle.install (reflection.reflection reflection.byte) (read_primitive_array_handler ..byte jvm.byte))
- (///bundle.install (reflection.reflection reflection.short) (read_primitive_array_handler ..short jvm.short))
- (///bundle.install (reflection.reflection reflection.int) (read_primitive_array_handler ..int jvm.int))
- (///bundle.install (reflection.reflection reflection.long) (read_primitive_array_handler ..long jvm.long))
- (///bundle.install (reflection.reflection reflection.float) (read_primitive_array_handler ..float jvm.float))
- (///bundle.install (reflection.reflection reflection.double) (read_primitive_array_handler ..double jvm.double))
- (///bundle.install (reflection.reflection reflection.char) (read_primitive_array_handler ..char jvm.char))
- (///bundle.install "object" array::read::object))))
- (dictionary.merged (<| (///bundle.prefix "write")
- (|> ///bundle.empty
- (///bundle.install (reflection.reflection reflection.boolean) (write_primitive_array_handler ..boolean jvm.boolean))
- (///bundle.install (reflection.reflection reflection.byte) (write_primitive_array_handler ..byte jvm.byte))
- (///bundle.install (reflection.reflection reflection.short) (write_primitive_array_handler ..short jvm.short))
- (///bundle.install (reflection.reflection reflection.int) (write_primitive_array_handler ..int jvm.int))
- (///bundle.install (reflection.reflection reflection.long) (write_primitive_array_handler ..long jvm.long))
- (///bundle.install (reflection.reflection reflection.float) (write_primitive_array_handler ..float jvm.float))
- (///bundle.install (reflection.reflection reflection.double) (write_primitive_array_handler ..double jvm.double))
- (///bundle.install (reflection.reflection reflection.char) (write_primitive_array_handler ..char jvm.char))
- (///bundle.install "object" array::write::object))))
+ (dictionary.composite (<| (///bundle.prefix "length")
+ (|> ///bundle.empty
+ (///bundle.install (reflection.reflection reflection.boolean) (primitive_array_length_handler jvm.boolean))
+ (///bundle.install (reflection.reflection reflection.byte) (primitive_array_length_handler jvm.byte))
+ (///bundle.install (reflection.reflection reflection.short) (primitive_array_length_handler jvm.short))
+ (///bundle.install (reflection.reflection reflection.int) (primitive_array_length_handler jvm.int))
+ (///bundle.install (reflection.reflection reflection.long) (primitive_array_length_handler jvm.long))
+ (///bundle.install (reflection.reflection reflection.float) (primitive_array_length_handler jvm.float))
+ (///bundle.install (reflection.reflection reflection.double) (primitive_array_length_handler jvm.double))
+ (///bundle.install (reflection.reflection reflection.char) (primitive_array_length_handler jvm.char))
+ (///bundle.install "object" array::length::object))))
+ (dictionary.composite (<| (///bundle.prefix "new")
+ (|> ///bundle.empty
+ (///bundle.install (reflection.reflection reflection.boolean) (new_primitive_array_handler jvm.boolean))
+ (///bundle.install (reflection.reflection reflection.byte) (new_primitive_array_handler jvm.byte))
+ (///bundle.install (reflection.reflection reflection.short) (new_primitive_array_handler jvm.short))
+ (///bundle.install (reflection.reflection reflection.int) (new_primitive_array_handler jvm.int))
+ (///bundle.install (reflection.reflection reflection.long) (new_primitive_array_handler jvm.long))
+ (///bundle.install (reflection.reflection reflection.float) (new_primitive_array_handler jvm.float))
+ (///bundle.install (reflection.reflection reflection.double) (new_primitive_array_handler jvm.double))
+ (///bundle.install (reflection.reflection reflection.char) (new_primitive_array_handler jvm.char))
+ (///bundle.install "object" array::new::object))))
+ (dictionary.composite (<| (///bundle.prefix "read")
+ (|> ///bundle.empty
+ (///bundle.install (reflection.reflection reflection.boolean) (read_primitive_array_handler ..boolean jvm.boolean))
+ (///bundle.install (reflection.reflection reflection.byte) (read_primitive_array_handler ..byte jvm.byte))
+ (///bundle.install (reflection.reflection reflection.short) (read_primitive_array_handler ..short jvm.short))
+ (///bundle.install (reflection.reflection reflection.int) (read_primitive_array_handler ..int jvm.int))
+ (///bundle.install (reflection.reflection reflection.long) (read_primitive_array_handler ..long jvm.long))
+ (///bundle.install (reflection.reflection reflection.float) (read_primitive_array_handler ..float jvm.float))
+ (///bundle.install (reflection.reflection reflection.double) (read_primitive_array_handler ..double jvm.double))
+ (///bundle.install (reflection.reflection reflection.char) (read_primitive_array_handler ..char jvm.char))
+ (///bundle.install "object" array::read::object))))
+ (dictionary.composite (<| (///bundle.prefix "write")
+ (|> ///bundle.empty
+ (///bundle.install (reflection.reflection reflection.boolean) (write_primitive_array_handler ..boolean jvm.boolean))
+ (///bundle.install (reflection.reflection reflection.byte) (write_primitive_array_handler ..byte jvm.byte))
+ (///bundle.install (reflection.reflection reflection.short) (write_primitive_array_handler ..short jvm.short))
+ (///bundle.install (reflection.reflection reflection.int) (write_primitive_array_handler ..int jvm.int))
+ (///bundle.install (reflection.reflection reflection.long) (write_primitive_array_handler ..long jvm.long))
+ (///bundle.install (reflection.reflection reflection.float) (write_primitive_array_handler ..float jvm.float))
+ (///bundle.install (reflection.reflection reflection.double) (write_primitive_array_handler ..double jvm.double))
+ (///bundle.install (reflection.reflection reflection.char) (write_primitive_array_handler ..char jvm.char))
+ (///bundle.install "object" array::write::object))))
)))
(def: object::null
@@ -1437,8 +1437,8 @@
(function (_ method)
(do !
[.let [expected_method_tvars (method_type_variables method)
- aliasing (dictionary.merged (..aliasing expected_class_tvars actual_class_tvars)
- (..aliasing expected_method_tvars actual_method_tvars))]
+ aliasing (dictionary.composite (..aliasing expected_class_tvars actual_class_tvars)
+ (..aliasing expected_method_tvars actual_method_tvars))]
passes? (check_method aliasing class method_name method_style inputsJT method)]
(# ! each (if passes?
(|>> {#Pass})
@@ -1470,8 +1470,8 @@
(monad.each ! (function (_ constructor)
(do !
[.let [expected_method_tvars (constructor_type_variables constructor)
- aliasing (dictionary.merged (..aliasing expected_class_tvars actual_class_tvars)
- (..aliasing expected_method_tvars actual_method_tvars))]
+ aliasing (dictionary.composite (..aliasing expected_class_tvars actual_class_tvars)
+ (..aliasing expected_method_tvars actual_method_tvars))]
passes? (check_constructor aliasing class inputsJT constructor)]
(# ! each
(if passes?
@@ -1629,22 +1629,22 @@
(-> java/lang/ClassLoader Bundle)
(<| (///bundle.prefix "member")
(|> ///bundle.empty
- (dictionary.merged (<| (///bundle.prefix "get")
- (|> ///bundle.empty
- (///bundle.install "static" (get::static class_loader))
- (///bundle.install "virtual" (get::virtual class_loader)))))
- (dictionary.merged (<| (///bundle.prefix "put")
- (|> ///bundle.empty
- (///bundle.install "static" (put::static class_loader))
- (///bundle.install "virtual" (put::virtual class_loader)))))
- (dictionary.merged (<| (///bundle.prefix "invoke")
- (|> ///bundle.empty
- (///bundle.install "static" (invoke::static class_loader))
- (///bundle.install "virtual" (invoke::virtual class_loader))
- (///bundle.install "special" (invoke::special class_loader))
- (///bundle.install "interface" (invoke::interface class_loader))
- (///bundle.install "constructor" (invoke::constructor class_loader))
- )))
+ (dictionary.composite (<| (///bundle.prefix "get")
+ (|> ///bundle.empty
+ (///bundle.install "static" (get::static class_loader))
+ (///bundle.install "virtual" (get::virtual class_loader)))))
+ (dictionary.composite (<| (///bundle.prefix "put")
+ (|> ///bundle.empty
+ (///bundle.install "static" (put::static class_loader))
+ (///bundle.install "virtual" (put::virtual class_loader)))))
+ (dictionary.composite (<| (///bundle.prefix "invoke")
+ (|> ///bundle.empty
+ (///bundle.install "static" (invoke::static class_loader))
+ (///bundle.install "virtual" (invoke::virtual class_loader))
+ (///bundle.install "special" (invoke::special class_loader))
+ (///bundle.install "interface" (invoke::interface class_loader))
+ (///bundle.install "constructor" (invoke::constructor class_loader))
+ )))
)))
(type: .public (Annotation_Parameter a)
@@ -2657,14 +2657,14 @@
(-> java/lang/ClassLoader runtime.Host Bundle)
(<| (///bundle.prefix "jvm")
(|> ///bundle.empty
- (dictionary.merged bundle::conversion)
- (dictionary.merged bundle::int)
- (dictionary.merged bundle::long)
- (dictionary.merged bundle::float)
- (dictionary.merged bundle::double)
- (dictionary.merged bundle::char)
- (dictionary.merged bundle::array)
- (dictionary.merged (bundle::object class_loader))
- (dictionary.merged (bundle::member class_loader))
- (dictionary.merged (bundle::class class_loader host))
+ (dictionary.composite bundle::conversion)
+ (dictionary.composite bundle::int)
+ (dictionary.composite bundle::long)
+ (dictionary.composite bundle::float)
+ (dictionary.composite bundle::double)
+ (dictionary.composite bundle::char)
+ (dictionary.composite bundle::array)
+ (dictionary.composite (bundle::object class_loader))
+ (dictionary.composite (bundle::member class_loader))
+ (dictionary.composite (bundle::class class_loader host))
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux
index ca7dfe9bb..4949783fe 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux
@@ -9,7 +9,7 @@
["<[0]>" code {"+" Parser}]]]
[data
[collection
- ["[0]" array {"+" Array}]
+ ["[0]" array]
["[0]" dictionary]
["[0]" list]]]
["[0]" type
@@ -44,11 +44,13 @@
[<code>.any
(function (_ extension phase archive lengthC)
(<| analysis/type.with_var
- (function (_ [@var :var:]))
+ (function (_ [@read :read:]))
+ analysis/type.with_var
+ (function (_ [@write :write:]))
(do phase.monad
[lengthA (analysis/type.expecting Nat
(phase archive lengthC))
- _ (analysis/type.inference (type (Array :var:)))]
+ _ (analysis/type.inference (type (array.Array' :read: :write:)))]
(in {analysis.#Extension extension (list lengthA)}))))]))
(def: array::length
@@ -57,9 +59,11 @@
[<code>.any
(function (_ extension phase archive arrayC)
(<| analysis/type.with_var
- (function (_ [@var :var:]))
+ (function (_ [@read :read:]))
+ analysis/type.with_var
+ (function (_ [@write :write:]))
(do phase.monad
- [arrayA (analysis/type.expecting (type (Array :var:))
+ [arrayA (analysis/type.expecting (type (array.Array' :read: :write:))
(phase archive arrayC))
_ (analysis/type.inference Nat)]
(in {analysis.#Extension extension (list arrayA)}))))]))
@@ -70,13 +74,15 @@
[(<>.and <code>.any <code>.any)
(function (_ extension phase archive [indexC arrayC])
(<| analysis/type.with_var
- (function (_ [@var :var:]))
+ (function (_ [@read :read:]))
+ analysis/type.with_var
+ (function (_ [@write :write:]))
(do phase.monad
[indexA (analysis/type.expecting Nat
(phase archive indexC))
- arrayA (analysis/type.expecting (type (Array :var:))
+ arrayA (analysis/type.expecting (type (array.Array' :read: :write:))
(phase archive arrayC))
- _ (analysis/type.inference :var:)]
+ _ (analysis/type.inference :read:)]
(in {analysis.#Extension extension (list indexA arrayA)}))))]))
(def: array::write
@@ -85,15 +91,17 @@
[($_ <>.and <code>.any <code>.any <code>.any)
(function (_ extension phase archive [indexC valueC arrayC])
(<| analysis/type.with_var
- (function (_ [@var :var:]))
+ (function (_ [@read :read:]))
+ analysis/type.with_var
+ (function (_ [@write :write:]))
(do phase.monad
[indexA (analysis/type.expecting Nat
(phase archive indexC))
- valueA (analysis/type.expecting :var:
+ valueA (analysis/type.expecting :write:
(phase archive valueC))
- arrayA (analysis/type.expecting (type (Array :var:))
+ arrayA (analysis/type.expecting (type (array.Array' :read: :write:))
(phase archive arrayC))
- _ (analysis/type.inference (type (Array :var:)))]
+ _ (analysis/type.inference (type (array.Array' :read: :write:)))]
(in {analysis.#Extension extension (list indexA valueA arrayA)}))))]))
(def: array::delete
@@ -102,13 +110,15 @@
[($_ <>.and <code>.any <code>.any)
(function (_ extension phase archive [indexC arrayC])
(<| analysis/type.with_var
- (function (_ [@var :var:]))
+ (function (_ [@read :read:]))
+ analysis/type.with_var
+ (function (_ [@write :write:]))
(do phase.monad
[indexA (analysis/type.expecting Nat
(phase archive indexC))
- arrayA (analysis/type.expecting (type (Array :var:))
+ arrayA (analysis/type.expecting (type (array.Array' :read: :write:))
(phase archive arrayC))
- _ (analysis/type.inference (type (Array :var:)))]
+ _ (analysis/type.inference (type (array.Array' :read: :write:)))]
(in {analysis.#Extension extension (list indexA arrayA)}))))]))
(def: bundle::array
@@ -242,9 +252,9 @@
Bundle
(<| (bundle.prefix "lua")
(|> bundle.empty
- (dictionary.merged bundle::array)
- (dictionary.merged bundle::object)
- (dictionary.merged bundle::utf8)
+ (dictionary.composite bundle::array)
+ (dictionary.composite bundle::object)
+ (dictionary.composite bundle::utf8)
(bundle.install "constant" lua::constant)
(bundle.install "apply" lua::apply)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index d2f911155..ba71661c9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -304,9 +304,9 @@
(-> Eval Bundle)
(<| (///bundle.prefix "lux")
(|> ///bundle.empty
- (dictionary.merged (bundle::lux eval))
- (dictionary.merged bundle::i64)
- (dictionary.merged bundle::f64)
- (dictionary.merged bundle::text)
- (dictionary.merged bundle::io)
+ (dictionary.composite (bundle::lux eval))
+ (dictionary.composite bundle::i64)
+ (dictionary.composite bundle::f64)
+ (dictionary.composite bundle::text)
+ (dictionary.composite bundle::io)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux
index a90a68096..dae6adef6 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux
@@ -209,8 +209,8 @@
Bundle
(<| (bundle.prefix "php")
(|> bundle.empty
- (dictionary.merged bundle::array)
- (dictionary.merged bundle::object)
+ (dictionary.composite bundle::array)
+ (dictionary.composite bundle::object)
(bundle.install "constant" php::constant)
(bundle.install "apply" php::apply)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux
index fa87792da..f35ad7128 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux
@@ -232,8 +232,8 @@
Bundle
(<| (bundle.prefix "python")
(|> bundle.empty
- (dictionary.merged bundle::array)
- (dictionary.merged bundle::object)
+ (dictionary.composite bundle::array)
+ (dictionary.composite bundle::object)
(bundle.install "constant" python::constant)
(bundle.install "import" python::import)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
index ab9ed4837..a102f6b29 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
@@ -202,8 +202,8 @@
Bundle
(<| (bundle.prefix "ruby")
(|> bundle.empty
- (dictionary.merged bundle::array)
- (dictionary.merged bundle::object)
+ (dictionary.composite bundle::array)
+ (dictionary.composite bundle::object)
(bundle.install "constant" ruby::constant)
(bundle.install "apply" ruby::apply)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux
index 488b39e2c..c1c425142 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux
@@ -153,8 +153,8 @@
Bundle
(<| (bundle.prefix "scheme")
(|> bundle.empty
- (dictionary.merged bundle::array)
- (dictionary.merged bundle::object)
+ (dictionary.composite bundle::array)
+ (dictionary.composite bundle::object)
(bundle.install "constant" scheme::constant)
(bundle.install "apply" scheme::apply)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
index 8a7f95cee..a25d02ed7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
@@ -233,7 +233,7 @@
(is (-> /////analysis.State+ /////analysis.State+)
(|>> product.right
[(|> previous_analysis_extensions
- (dictionary.merged (///analysis.bundle eval host_analysis)))]))
+ (dictionary.composite (///analysis.bundle eval host_analysis)))]))
state)])))
(def: (announce_definition! short type)
@@ -568,4 +568,4 @@
(<| (///bundle.prefix "lux")
(|> ///bundle.empty
(dictionary.has "def" (lux::def expander host_analysis))
- (dictionary.merged (..bundle::def expander host_analysis program anchorT,expressionT,directiveT extender)))))
+ (dictionary.composite (..bundle::def expander host_analysis program anchorT,expressionT,directiveT extender)))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux
index a446c5cbe..bb22d2126 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux
@@ -1,18 +1,18 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- ["[0]" / "_"
- ["[1][0]" common]
- ["[1][0]" host]
- [////
- [generation
- [common_lisp
- [runtime {"+" Bundle}]]]]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ ["[0]" / "_"
+ ["[1][0]" common]
+ ["[1][0]" host]
+ [////
+ [generation
+ [common_lisp
+ [runtime {"+" Bundle}]]]]])
(def: .public bundle
Bundle
- (dictionary.merged /common.bundle
- /host.bundle))
+ (dictionary.composite /common.bundle
+ /host.bundle))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux
index 987ae0104..9e68d5992 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux
@@ -172,9 +172,9 @@
Bundle
(<| (/.prefix "lux")
(|> /.empty
- (dictionary.merged lux_procs)
- (dictionary.merged i64_procs)
- (dictionary.merged f64_procs)
- (dictionary.merged text_procs)
- (dictionary.merged io_procs)
+ (dictionary.composite lux_procs)
+ (dictionary.composite i64_procs)
+ (dictionary.composite f64_procs)
+ (dictionary.composite text_procs)
+ (dictionary.composite io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux
index 0b7a64802..2530af7ec 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux
@@ -1,18 +1,18 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- ["[0]" / "_"
- ["[1][0]" common]
- ["[1][0]" host]
- [////
- [generation
- [js
- [runtime {"+" Bundle}]]]]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ ["[0]" / "_"
+ ["[1][0]" common]
+ ["[1][0]" host]
+ [////
+ [generation
+ [js
+ [runtime {"+" Bundle}]]]]])
(def: .public bundle
Bundle
- (dictionary.merged /common.bundle
- /host.bundle))
+ (dictionary.composite /common.bundle
+ /host.bundle))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
index c8c48451e..3d2fd35f3 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
@@ -245,8 +245,8 @@
Bundle
(<| (/.prefix "lux")
(|> lux_procs
- (dictionary.merged i64_procs)
- (dictionary.merged f64_procs)
- (dictionary.merged text_procs)
- (dictionary.merged io_procs)
+ (dictionary.composite i64_procs)
+ (dictionary.composite f64_procs)
+ (dictionary.composite text_procs)
+ (dictionary.composite io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
index f3305a2d5..5037742a3 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
@@ -150,8 +150,8 @@
Bundle
(<| (/.prefix "js")
(|> /.empty
- (dictionary.merged ..array)
- (dictionary.merged ..object)
+ (dictionary.composite ..array)
+ (dictionary.composite ..object)
(/.install "constant" js::constant)
(/.install "apply" js::apply)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux
index a7ed22841..87684f26d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux
@@ -1,20 +1,20 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- ["[0]" / "_"
- ["[1][0]" common]
- ["[1][0]" host]
- [////
- [generation
- [jvm
- [runtime {"+" Bundle}]]]]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ ["[0]" / "_"
+ ["[1][0]" common]
+ ["[1][0]" host]
+ [////
+ [generation
+ [jvm
+ [runtime {"+" Bundle}]]]]])
(def: .public bundle
Bundle
- ($_ dictionary.merged
+ ($_ dictionary.composite
/common.bundle
/host.bundle
))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
index becc799b6..eb7cb76d4 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
@@ -408,7 +408,7 @@
Bundle
(<| (/////bundle.prefix "lux")
(|> bundle::lux
- (dictionary.merged ..bundle::i64)
- (dictionary.merged ..bundle::f64)
- (dictionary.merged ..bundle::text)
- (dictionary.merged ..bundle::io))))
+ (dictionary.composite ..bundle::i64)
+ (dictionary.composite ..bundle::f64)
+ (dictionary.composite ..bundle::text)
+ (dictionary.composite ..bundle::io))))
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 1ccc58417..45c374faa 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
@@ -494,50 +494,50 @@
Bundle
(<| (/////bundle.prefix "array")
(|> /////bundle.empty
- (dictionary.merged (<| (/////bundle.prefix "length")
- (|> /////bundle.empty
- (/////bundle.install (reflection.reflection reflection.boolean) (primitive_array_length_handler type.boolean))
- (/////bundle.install (reflection.reflection reflection.byte) (primitive_array_length_handler type.byte))
- (/////bundle.install (reflection.reflection reflection.short) (primitive_array_length_handler type.short))
- (/////bundle.install (reflection.reflection reflection.int) (primitive_array_length_handler type.int))
- (/////bundle.install (reflection.reflection reflection.long) (primitive_array_length_handler type.long))
- (/////bundle.install (reflection.reflection reflection.float) (primitive_array_length_handler type.float))
- (/////bundle.install (reflection.reflection reflection.double) (primitive_array_length_handler type.double))
- (/////bundle.install (reflection.reflection reflection.char) (primitive_array_length_handler type.char))
- (/////bundle.install "object" array::length::object))))
- (dictionary.merged (<| (/////bundle.prefix "new")
- (|> /////bundle.empty
- (/////bundle.install (reflection.reflection reflection.boolean) (new_primitive_array_handler __.t_boolean))
- (/////bundle.install (reflection.reflection reflection.byte) (new_primitive_array_handler __.t_byte))
- (/////bundle.install (reflection.reflection reflection.short) (new_primitive_array_handler __.t_short))
- (/////bundle.install (reflection.reflection reflection.int) (new_primitive_array_handler __.t_int))
- (/////bundle.install (reflection.reflection reflection.long) (new_primitive_array_handler __.t_long))
- (/////bundle.install (reflection.reflection reflection.float) (new_primitive_array_handler __.t_float))
- (/////bundle.install (reflection.reflection reflection.double) (new_primitive_array_handler __.t_double))
- (/////bundle.install (reflection.reflection reflection.char) (new_primitive_array_handler __.t_char))
- (/////bundle.install "object" array::new::object))))
- (dictionary.merged (<| (/////bundle.prefix "read")
- (|> /////bundle.empty
- (/////bundle.install (reflection.reflection reflection.boolean) (read_primitive_array_handler type.boolean _.baload))
- (/////bundle.install (reflection.reflection reflection.byte) (read_primitive_array_handler type.byte _.baload))
- (/////bundle.install (reflection.reflection reflection.short) (read_primitive_array_handler type.short _.saload))
- (/////bundle.install (reflection.reflection reflection.int) (read_primitive_array_handler type.int _.iaload))
- (/////bundle.install (reflection.reflection reflection.long) (read_primitive_array_handler type.long _.laload))
- (/////bundle.install (reflection.reflection reflection.float) (read_primitive_array_handler type.float _.faload))
- (/////bundle.install (reflection.reflection reflection.double) (read_primitive_array_handler type.double _.daload))
- (/////bundle.install (reflection.reflection reflection.char) (read_primitive_array_handler type.char _.caload))
- (/////bundle.install "object" array::read::object))))
- (dictionary.merged (<| (/////bundle.prefix "write")
- (|> /////bundle.empty
- (/////bundle.install (reflection.reflection reflection.boolean) (write_primitive_array_handler type.boolean _.bastore))
- (/////bundle.install (reflection.reflection reflection.byte) (write_primitive_array_handler type.byte _.bastore))
- (/////bundle.install (reflection.reflection reflection.short) (write_primitive_array_handler type.short _.sastore))
- (/////bundle.install (reflection.reflection reflection.int) (write_primitive_array_handler type.int _.iastore))
- (/////bundle.install (reflection.reflection reflection.long) (write_primitive_array_handler type.long _.lastore))
- (/////bundle.install (reflection.reflection reflection.float) (write_primitive_array_handler type.float _.fastore))
- (/////bundle.install (reflection.reflection reflection.double) (write_primitive_array_handler type.double _.dastore))
- (/////bundle.install (reflection.reflection reflection.char) (write_primitive_array_handler type.char _.castore))
- (/////bundle.install "object" array::write::object))))
+ (dictionary.composite (<| (/////bundle.prefix "length")
+ (|> /////bundle.empty
+ (/////bundle.install (reflection.reflection reflection.boolean) (primitive_array_length_handler type.boolean))
+ (/////bundle.install (reflection.reflection reflection.byte) (primitive_array_length_handler type.byte))
+ (/////bundle.install (reflection.reflection reflection.short) (primitive_array_length_handler type.short))
+ (/////bundle.install (reflection.reflection reflection.int) (primitive_array_length_handler type.int))
+ (/////bundle.install (reflection.reflection reflection.long) (primitive_array_length_handler type.long))
+ (/////bundle.install (reflection.reflection reflection.float) (primitive_array_length_handler type.float))
+ (/////bundle.install (reflection.reflection reflection.double) (primitive_array_length_handler type.double))
+ (/////bundle.install (reflection.reflection reflection.char) (primitive_array_length_handler type.char))
+ (/////bundle.install "object" array::length::object))))
+ (dictionary.composite (<| (/////bundle.prefix "new")
+ (|> /////bundle.empty
+ (/////bundle.install (reflection.reflection reflection.boolean) (new_primitive_array_handler __.t_boolean))
+ (/////bundle.install (reflection.reflection reflection.byte) (new_primitive_array_handler __.t_byte))
+ (/////bundle.install (reflection.reflection reflection.short) (new_primitive_array_handler __.t_short))
+ (/////bundle.install (reflection.reflection reflection.int) (new_primitive_array_handler __.t_int))
+ (/////bundle.install (reflection.reflection reflection.long) (new_primitive_array_handler __.t_long))
+ (/////bundle.install (reflection.reflection reflection.float) (new_primitive_array_handler __.t_float))
+ (/////bundle.install (reflection.reflection reflection.double) (new_primitive_array_handler __.t_double))
+ (/////bundle.install (reflection.reflection reflection.char) (new_primitive_array_handler __.t_char))
+ (/////bundle.install "object" array::new::object))))
+ (dictionary.composite (<| (/////bundle.prefix "read")
+ (|> /////bundle.empty
+ (/////bundle.install (reflection.reflection reflection.boolean) (read_primitive_array_handler type.boolean _.baload))
+ (/////bundle.install (reflection.reflection reflection.byte) (read_primitive_array_handler type.byte _.baload))
+ (/////bundle.install (reflection.reflection reflection.short) (read_primitive_array_handler type.short _.saload))
+ (/////bundle.install (reflection.reflection reflection.int) (read_primitive_array_handler type.int _.iaload))
+ (/////bundle.install (reflection.reflection reflection.long) (read_primitive_array_handler type.long _.laload))
+ (/////bundle.install (reflection.reflection reflection.float) (read_primitive_array_handler type.float _.faload))
+ (/////bundle.install (reflection.reflection reflection.double) (read_primitive_array_handler type.double _.daload))
+ (/////bundle.install (reflection.reflection reflection.char) (read_primitive_array_handler type.char _.caload))
+ (/////bundle.install "object" array::read::object))))
+ (dictionary.composite (<| (/////bundle.prefix "write")
+ (|> /////bundle.empty
+ (/////bundle.install (reflection.reflection reflection.boolean) (write_primitive_array_handler type.boolean _.bastore))
+ (/////bundle.install (reflection.reflection reflection.byte) (write_primitive_array_handler type.byte _.bastore))
+ (/////bundle.install (reflection.reflection reflection.short) (write_primitive_array_handler type.short _.sastore))
+ (/////bundle.install (reflection.reflection reflection.int) (write_primitive_array_handler type.int _.iastore))
+ (/////bundle.install (reflection.reflection reflection.long) (write_primitive_array_handler type.long _.lastore))
+ (/////bundle.install (reflection.reflection reflection.float) (write_primitive_array_handler type.float _.fastore))
+ (/////bundle.install (reflection.reflection reflection.double) (write_primitive_array_handler type.double _.dastore))
+ (/////bundle.install (reflection.reflection reflection.char) (write_primitive_array_handler type.char _.castore))
+ (/////bundle.install "object" array::write::object))))
)))
(def: (object::null _)
@@ -791,21 +791,21 @@
Bundle
(<| (/////bundle.prefix "member")
(|> (is Bundle /////bundle.empty)
- (dictionary.merged (<| (/////bundle.prefix "get")
- (|> (is Bundle /////bundle.empty)
- (/////bundle.install "static" get::static)
- (/////bundle.install "virtual" get::virtual))))
- (dictionary.merged (<| (/////bundle.prefix "put")
- (|> (is Bundle /////bundle.empty)
- (/////bundle.install "static" put::static)
- (/////bundle.install "virtual" put::virtual))))
- (dictionary.merged (<| (/////bundle.prefix "invoke")
- (|> (is Bundle /////bundle.empty)
- (/////bundle.install "static" invoke::static)
- (/////bundle.install "virtual" invoke::virtual)
- (/////bundle.install "special" invoke::special)
- (/////bundle.install "interface" invoke::interface)
- (/////bundle.install "constructor" invoke::constructor))))
+ (dictionary.composite (<| (/////bundle.prefix "get")
+ (|> (is Bundle /////bundle.empty)
+ (/////bundle.install "static" get::static)
+ (/////bundle.install "virtual" get::virtual))))
+ (dictionary.composite (<| (/////bundle.prefix "put")
+ (|> (is Bundle /////bundle.empty)
+ (/////bundle.install "static" put::static)
+ (/////bundle.install "virtual" put::virtual))))
+ (dictionary.composite (<| (/////bundle.prefix "invoke")
+ (|> (is Bundle /////bundle.empty)
+ (/////bundle.install "static" invoke::static)
+ (/////bundle.install "virtual" invoke::virtual)
+ (/////bundle.install "special" invoke::special)
+ (/////bundle.install "interface" invoke::interface)
+ (/////bundle.install "constructor" invoke::constructor))))
)))
(def: annotation_parameter
@@ -1249,13 +1249,13 @@
Bundle
(<| (/////bundle.prefix "jvm")
(|> ..bundle::conversion
- (dictionary.merged ..bundle::int)
- (dictionary.merged ..bundle::long)
- (dictionary.merged ..bundle::float)
- (dictionary.merged ..bundle::double)
- (dictionary.merged ..bundle::char)
- (dictionary.merged ..bundle::array)
- (dictionary.merged ..bundle::object)
- (dictionary.merged ..bundle::member)
- (dictionary.merged ..bundle::class)
+ (dictionary.composite ..bundle::int)
+ (dictionary.composite ..bundle::long)
+ (dictionary.composite ..bundle::float)
+ (dictionary.composite ..bundle::double)
+ (dictionary.composite ..bundle::char)
+ (dictionary.composite ..bundle::array)
+ (dictionary.composite ..bundle::object)
+ (dictionary.composite ..bundle::member)
+ (dictionary.composite ..bundle::class)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux
index 7ed62f342..8335ce18d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux
@@ -1,18 +1,18 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- ["[0]" / "_"
- ["[1][0]" common]
- ["[1][0]" host]
- [////
- [generation
- [lua
- [runtime {"+" Bundle}]]]]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ ["[0]" / "_"
+ ["[1][0]" common]
+ ["[1][0]" host]
+ [////
+ [generation
+ [lua
+ [runtime {"+" Bundle}]]]]])
(def: .public bundle
Bundle
- (dictionary.merged /common.bundle
- /host.bundle))
+ (dictionary.composite /common.bundle
+ /host.bundle))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
index bb9c71927..ea9f1b1c9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
@@ -230,8 +230,8 @@
Bundle
(<| (/.prefix "lux")
(|> lux_procs
- (dictionary.merged i64_procs)
- (dictionary.merged f64_procs)
- (dictionary.merged text_procs)
- (dictionary.merged io_procs)
+ (dictionary.composite i64_procs)
+ (dictionary.composite f64_procs)
+ (dictionary.composite text_procs)
+ (dictionary.composite io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux
index 74540b895..d854e210d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux
@@ -187,9 +187,9 @@
Bundle
(<| (/.prefix "lua")
(|> /.empty
- (dictionary.merged ..array)
- (dictionary.merged ..object)
- (dictionary.merged ..utf8)
+ (dictionary.composite ..array)
+ (dictionary.composite ..object)
+ (dictionary.composite ..utf8)
(/.install "constant" lua::constant)
(/.install "apply" lua::apply)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux
index 6ee279cf5..3bf186a60 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux
@@ -1,18 +1,18 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- ["[0]" / "_"
- ["[1][0]" common]
- ["[1][0]" host]
- [////
- [generation
- [php
- [runtime {"+" Bundle}]]]]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ ["[0]" / "_"
+ ["[1][0]" common]
+ ["[1][0]" host]
+ [////
+ [generation
+ [php
+ [runtime {"+" Bundle}]]]]])
(def: .public bundle
Bundle
- (dictionary.merged /common.bundle
- /host.bundle))
+ (dictionary.composite /common.bundle
+ /host.bundle))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux
index 2e6338e37..dc7b0f38b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux
@@ -185,8 +185,8 @@
Bundle
(<| (/.prefix "lux")
(|> /.empty
- (dictionary.merged lux_procs)
- (dictionary.merged i64_procs)
- (dictionary.merged f64_procs)
- (dictionary.merged text_procs)
- (dictionary.merged io_procs))))
+ (dictionary.composite lux_procs)
+ (dictionary.composite i64_procs)
+ (dictionary.composite f64_procs)
+ (dictionary.composite text_procs)
+ (dictionary.composite io_procs))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux
index 04399cc8d..4f4f010da 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux
@@ -1,37 +1,37 @@
(.using
- [library
- [lux "*"
- [abstract
- ["[0]" monad {"+" do}]]
- [control
- ["[0]" function]
- ["<>" parser
- ["<s>" synthesis {"+" Parser}]]]
- [data
- [collection
- ["[0]" dictionary]
- ["[0]" list]]
- [text
- ["%" format {"+" format}]]]
- [target
- ["_" php {"+" Var Expression}]]]]
- ["[0]" // "_"
- ["[1][0]" common {"+" custom}]
- ["//[1]" /// "_"
- ["/" bundle]
+ [library
+ [lux "*"
+ [abstract
+ ["[0]" monad {"+" do}]]
+ [control
+ ["[0]" function]
+ ["<>" parser
+ ["<s>" synthesis {"+" Parser}]]]
+ [data
+ [collection
+ ["[0]" dictionary]
+ ["[0]" list]]
+ [text
+ ["%" format {"+" format}]]]
+ [target
+ ["_" php {"+" Var Expression}]]]]
+ ["[0]" // "_"
+ ["[1][0]" common {"+" custom}]
+ ["//[1]" /// "_"
+ ["/" bundle]
+ ["/[1]" // "_"
+ ["[0]" extension]
+ [generation
+ [extension {"+" Nullary Unary Binary Trinary
+ nullary unary binary trinary}]
+ ["[0]" reference]
+ ["//" php "_"
+ ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+ with_vars}]]]
["/[1]" // "_"
- ["[0]" extension]
- [generation
- [extension {"+" Nullary Unary Binary Trinary
- nullary unary binary trinary}]
- ["[0]" reference]
- ["//" php "_"
- ["[1][0]" runtime {"+" Operation Phase Handler Bundle
- with_vars}]]]
- ["/[1]" // "_"
- ["[0]" generation]
- ["//[1]" /// "_"
- ["[1][0]" phase]]]]]])
+ ["[0]" generation]
+ ["//[1]" /// "_"
+ ["[1][0]" phase]]]]]])
(def: (array::new size)
(Unary Expression)
@@ -133,8 +133,8 @@
Bundle
(<| (/.prefix "php")
(|> /.empty
- (dictionary.merged ..array)
- (dictionary.merged ..object)
+ (dictionary.composite ..array)
+ (dictionary.composite ..object)
(/.install "constant" php::constant)
(/.install "apply" php::apply)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux
index 750ff51ef..4124be69d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux
@@ -1,18 +1,18 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- ["[0]" / "_"
- ["[1][0]" common]
- ["[1][0]" host]
- [////
- [generation
- [python
- [runtime {"+" Bundle}]]]]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ ["[0]" / "_"
+ ["[1][0]" common]
+ ["[1][0]" host]
+ [////
+ [generation
+ [python
+ [runtime {"+" Bundle}]]]]])
(def: .public bundle
Bundle
- (dictionary.merged /common.bundle
- /host.bundle))
+ (dictionary.composite /common.bundle
+ /host.bundle))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
index dc6845bc8..12260ae49 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
@@ -238,8 +238,8 @@
Bundle
(<| (/.prefix "lux")
(|> lux_procs
- (dictionary.merged i64_procs)
- (dictionary.merged f64_procs)
- (dictionary.merged text_procs)
- (dictionary.merged io_procs)
+ (dictionary.composite i64_procs)
+ (dictionary.composite f64_procs)
+ (dictionary.composite text_procs)
+ (dictionary.composite io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux
index 72ade0f7d..1522dc667 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux
@@ -156,8 +156,8 @@
Bundle
(<| (/.prefix "python")
(|> /.empty
- (dictionary.merged ..array)
- (dictionary.merged ..object)
+ (dictionary.composite ..array)
+ (dictionary.composite ..object)
(/.install "constant" python::constant)
(/.install "import" python::import)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux
index cb2814a3e..338342aba 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux
@@ -1,18 +1,18 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- ["[0]" / "_"
- ["[1][0]" common]
- ["[1][0]" host]
- [////
- [generation
- [r
- [runtime {"+" Bundle}]]]]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ ["[0]" / "_"
+ ["[1][0]" common]
+ ["[1][0]" host]
+ [////
+ [generation
+ [r
+ [runtime {"+" Bundle}]]]]])
(def: .public bundle
Bundle
- (dictionary.merged /common.bundle
- /host.bundle))
+ (dictionary.composite /common.bundle
+ /host.bundle))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux
index e3beeba75..e48ccb29c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux
@@ -171,9 +171,9 @@
Bundle
(<| (/.prefix "lux")
(|> /.empty
- ... (dictionary.merged lux_procs)
- (dictionary.merged i64_procs)
- ... (dictionary.merged f64_procs)
- (dictionary.merged text_procs)
- ... (dictionary.merged io_procs)
+ ... (dictionary.composite lux_procs)
+ (dictionary.composite i64_procs)
+ ... (dictionary.composite f64_procs)
+ (dictionary.composite text_procs)
+ ... (dictionary.composite io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux
index bf475eb70..fe36de1b2 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux
@@ -1,18 +1,18 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- ["[0]" / "_"
- ["[1][0]" common]
- ["[1][0]" host]
- [////
- [generation
- [ruby
- [runtime {"+" Bundle}]]]]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ ["[0]" / "_"
+ ["[1][0]" common]
+ ["[1][0]" host]
+ [////
+ [generation
+ [ruby
+ [runtime {"+" Bundle}]]]]])
(def: .public bundle
Bundle
- (dictionary.merged /common.bundle
- /host.bundle))
+ (dictionary.composite /common.bundle
+ /host.bundle))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
index 37a202c9f..0221c118b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
@@ -235,8 +235,8 @@
Bundle
(<| (/.prefix "lux")
(|> lux_procs
- (dictionary.merged ..i64_procs)
- (dictionary.merged ..f64_procs)
- (dictionary.merged ..text_procs)
- (dictionary.merged ..io_procs)
+ (dictionary.composite ..i64_procs)
+ (dictionary.composite ..f64_procs)
+ (dictionary.composite ..text_procs)
+ (dictionary.composite ..io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux
index 53b71239f..bb512a883 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux
@@ -126,8 +126,8 @@
Bundle
(<| (/.prefix "ruby")
(|> /.empty
- (dictionary.merged ..array)
- (dictionary.merged ..object)
+ (dictionary.composite ..array)
+ (dictionary.composite ..object)
(/.install "constant" ruby::constant)
(/.install "apply" ruby::apply)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux
index 3fc377538..5419daa5e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux
@@ -1,18 +1,18 @@
(.using
- [library
- [lux "*"
- [data
- [collection
- ["[0]" dictionary]]]]]
- ["[0]" / "_"
- ["[1][0]" common]
- ["[1][0]" host]
- [////
- [generation
- [scheme
- [runtime {"+" Bundle}]]]]])
+ [library
+ [lux "*"
+ [data
+ [collection
+ ["[0]" dictionary]]]]]
+ ["[0]" / "_"
+ ["[1][0]" common]
+ ["[1][0]" host]
+ [////
+ [generation
+ [scheme
+ [runtime {"+" Bundle}]]]]])
(def: .public bundle
Bundle
- (dictionary.merged /common.bundle
- /host.bundle))
+ (dictionary.composite /common.bundle
+ /host.bundle))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux
index 6aa4e52b1..c73614b6d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux
@@ -167,9 +167,9 @@
Bundle
(<| (/.prefix "lux")
(|> /.empty
- (dictionary.merged lux_procs)
- (dictionary.merged i64_procs)
- (dictionary.merged f64_procs)
- (dictionary.merged text_procs)
- (dictionary.merged io_procs)
+ (dictionary.composite lux_procs)
+ (dictionary.composite i64_procs)
+ (dictionary.composite f64_procs)
+ (dictionary.composite text_procs)
+ (dictionary.composite io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux
index 38742ff13..2b4e5cd45 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux
@@ -1,37 +1,37 @@
(.using
- [library
- [lux "*"
- [abstract
- ["[0]" monad {"+" do}]]
- [control
- ["[0]" function]
- ["<>" parser
- ["<s>" synthesis {"+" Parser}]]]
- [data
- [collection
- ["[0]" dictionary]
- ["[0]" list]]
- [text
- ["%" format {"+" format}]]]
- [target
- ["_" scheme {"+" Var Expression}]]]]
- ["[0]" // "_"
- ["[1][0]" common {"+" custom}]
- ["//[1]" /// "_"
- ["/" bundle]
+ [library
+ [lux "*"
+ [abstract
+ ["[0]" monad {"+" do}]]
+ [control
+ ["[0]" function]
+ ["<>" parser
+ ["<s>" synthesis {"+" Parser}]]]
+ [data
+ [collection
+ ["[0]" dictionary]
+ ["[0]" list]]
+ [text
+ ["%" format {"+" format}]]]
+ [target
+ ["_" scheme {"+" Var Expression}]]]]
+ ["[0]" // "_"
+ ["[1][0]" common {"+" custom}]
+ ["//[1]" /// "_"
+ ["/" bundle]
+ ["/[1]" // "_"
+ ["[0]" extension]
+ [generation
+ [extension {"+" Nullary Unary Binary Trinary
+ nullary unary binary trinary}]
+ ["[0]" reference]
+ ["//" scheme "_"
+ ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+ with_vars}]]]
["/[1]" // "_"
- ["[0]" extension]
- [generation
- [extension {"+" Nullary Unary Binary Trinary
- nullary unary binary trinary}]
- ["[0]" reference]
- ["//" scheme "_"
- ["[1][0]" runtime {"+" Operation Phase Handler Bundle
- with_vars}]]]
- ["/[1]" // "_"
- ["[0]" generation]
- ["//[1]" /// "_"
- ["[1][0]" phase]]]]]])
+ ["[0]" generation]
+ ["//[1]" /// "_"
+ ["[1][0]" phase]]]]]])
(def: (array::new size)
(Unary Expression)
@@ -100,8 +100,8 @@
Bundle
(<| (/.prefix "scheme")
(|> /.empty
- (dictionary.merged ..array)
- (dictionary.merged ..object)
+ (dictionary.composite ..array)
+ (dictionary.composite ..object)
(/.install "constant" scheme::constant)
(/.install "apply" scheme::apply)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux
index ee0e8f2b8..fe6ef4179 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux
@@ -1,27 +1,27 @@
(.using
- [library
- [lux "*"
- [abstract
- ["[0]" monad {"+" do}]]
- [control
- ["[0]" function]]
- [data
- ["[0]" product]
- [number
- ["f" frac]]
- [collection
- ["[0]" dictionary]]]
- [target
- ["_" common_lisp {"+" Expression}]]]]
- ["[0]" /// "_"
- ["[1][0]" runtime {"+" Operation Phase Handler Bundle}]
- ["[1][0]" primitive]
+ [library
+ [lux "*"
+ [abstract
+ ["[0]" monad {"+" do}]]
+ [control
+ ["[0]" function]]
+ [data
+ ["[0]" product]
+ [number
+ ["f" frac]]
+ [collection
+ ["[0]" dictionary]]]
+ [target
+ ["_" common_lisp {"+" Expression}]]]]
+ ["[0]" /// "_"
+ ["[1][0]" runtime {"+" Operation Phase Handler Bundle}]
+ ["[1][0]" primitive]
+ [//
+ [extension {"+" Nullary Unary Binary Trinary
+ nullary unary binary trinary}]
[//
- [extension {"+" Nullary Unary Binary Trinary
- nullary unary binary trinary}]
- [//
- [extension
- ["[0]" bundle]]]]])
+ [extension
+ ["[0]" bundle]]]]])
(def: lux_procs
Bundle
@@ -130,8 +130,8 @@
Bundle
(<| (bundle.prefix "lux")
(|> lux_procs
- (dictionary.merged i64_procs)
- (dictionary.merged f64_procs)
- (dictionary.merged text_procs)
- (dictionary.merged io_procs)
+ (dictionary.composite i64_procs)
+ (dictionary.composite f64_procs)
+ (dictionary.composite text_procs)
+ (dictionary.composite io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
index bc3e2210d..c4fa6bb64 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
@@ -3,8 +3,6 @@
[lux {"-" Label function}
[abstract
["[0]" monad {"+" do}]]
- [control
- pipe]
[data
["[0]" product]
[text
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
index 5be01062d..c52d69b22 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
@@ -1,28 +1,28 @@
(.using
- [library
- [lux "*"
- [abstract
- ["[0]" monad {"+" do}]]
- [control
- ["[0]" function]]
- [data
- ["[0]" product]
- ["[0]" text]
- [number
- ["f" frac]]
- [collection
- ["[0]" dictionary]]]
- [target
- ["_" php {"+" Expression}]]]]
- ["[0]" /// "_"
- ["[1][0]" runtime {"+" Operation Phase Handler Bundle}]
- ["[1][0]" primitive]
+ [library
+ [lux "*"
+ [abstract
+ ["[0]" monad {"+" do}]]
+ [control
+ ["[0]" function]]
+ [data
+ ["[0]" product]
+ ["[0]" text]
+ [number
+ ["f" frac]]
+ [collection
+ ["[0]" dictionary]]]
+ [target
+ ["_" php {"+" Expression}]]]]
+ ["[0]" /// "_"
+ ["[1][0]" runtime {"+" Operation Phase Handler Bundle}]
+ ["[1][0]" primitive]
+ [//
+ [extension {"+" Nullary Unary Binary Trinary
+ nullary unary binary trinary}]
[//
- [extension {"+" Nullary Unary Binary Trinary
- nullary unary binary trinary}]
- [//
- [extension
- ["[0]" bundle]]]]])
+ [extension
+ ["[0]" bundle]]]]])
(def: lux_procs
Bundle
@@ -104,9 +104,9 @@
Bundle
(<| (bundle.prefix "lux")
(|> lux_procs
- (dictionary.merged i64_procs)
- (dictionary.merged int_procs)
- (dictionary.merged frac_procs)
- (dictionary.merged text_procs)
- (dictionary.merged io_procs)
+ (dictionary.composite i64_procs)
+ (dictionary.composite int_procs)
+ (dictionary.composite frac_procs)
+ (dictionary.composite text_procs)
+ (dictionary.composite io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
index 5869ff984..ecde6abbd 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
@@ -334,9 +334,9 @@
Bundle
(<| (prefix "lux")
(|> lux_procs
- (dict.merged bit_procs)
- (dict.merged int_procs)
- (dict.merged frac_procs)
- (dict.merged text_procs)
- (dict.merged io_procs)
+ (dict.composite bit_procs)
+ (dict.composite int_procs)
+ (dict.composite frac_procs)
+ (dict.composite text_procs)
+ (dict.composite io_procs)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux
index f459b2d31..5a1b6479f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux
@@ -86,5 +86,5 @@
(<| (@.prefix "lua")
(dict.empty text.Hash<Text>)
... (|> lua_procs
- ... (dict.merged table_procs))
+ ... (dict.composite table_procs))
))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
index 062aa6c59..d40d0c4df 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
@@ -218,8 +218,8 @@
Bundle
(<| (bundle.prefix "lux")
(|> bundle::lux
- (dict.merged bundle::i64)
- (dict.merged bundle::f64)
- (dict.merged bundle::text)
- (dict.merged bundle::io)
+ (dict.composite bundle::i64)
+ (dict.composite bundle::f64)
+ (dict.composite bundle::text)
+ (dict.composite bundle::io)
)))
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
index b1397ef8c..a2fa63404 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
@@ -196,7 +196,7 @@
(list#each (function (_ [module [id _]])
[module id]))))
- (def: .public (merged additions archive)
+ (def: .public (composite additions archive)
(-> Archive Archive Archive)
(let [[+next +resolver] (representation additions)]
(|> archive
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 bd1c6aa1e..8b0d5e6f7 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
@@ -367,10 +367,10 @@
analysis_state
(list#mix (function (_ [_ [+analysers +synthesizers +generators +directives]]
[analysers synthesizers generators directives])
- [(dictionary.merged +analysers analysers)
- (dictionary.merged +synthesizers synthesizers)
- (dictionary.merged +generators generators)
- (dictionary.merged +directives directives)])
+ [(dictionary.composite +analysers analysers)
+ (dictionary.composite +synthesizers synthesizers)
+ (dictionary.composite +generators generators)
+ (dictionary.composite +directives directives)])
..empty_bundles
loaded_caches)])))))