aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/library/lux/tool/compiler
diff options
context:
space:
mode:
authorEduardo Julian2022-07-01 18:53:58 -0400
committerEduardo Julian2022-07-01 18:53:58 -0400
commit104130efba46a875eba566384578f8aa8593ad37 (patch)
treeb538fabc8b8a44a37b1806092b3f17a764fc73f2 /stdlib/source/library/lux/tool/compiler
parenta8d76e48df01d0f5326faa8456797f91cb2cbeba (diff)
Moved "lux/macro/code" to "lux/meta/code".
Diffstat (limited to 'stdlib/source/library/lux/tool/compiler')
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux3
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux7
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux14
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux5
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux6
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux5
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux5
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux5
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux5
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux5
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux7
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux3
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux6
32 files changed, 87 insertions, 93 deletions
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
index c3ccd43e9..2d149643e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
@@ -18,9 +18,7 @@
[collection
["[0]" list (.use "[1]#[0]" functor mix)]]]
[macro
- [syntax (.only syntax)]
- ["[0]" code
- ["<[1]>" \\parser]]]
+ [syntax (.only syntax)]]
[math
[number
["n" nat]
@@ -29,7 +27,9 @@
["f" frac]]]
[meta
["[0]" location]
- ["[0]" configuration (.only Configuration)]]]]
+ ["[0]" configuration (.only Configuration)]
+ ["[0]" code
+ ["<[1]>" \\parser]]]]]
["[0]" /
["[1][0]" simple (.only Simple)]
["[1][0]" complex (.only Tuple Variant Complex)]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
index 804b99019..adabb8621 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
@@ -11,12 +11,12 @@
[collection
["[0]" list]]]
[macro
- ["^" pattern]
- ["[0]" code]]
+ ["^" pattern]]
[math
[number
["n" nat]]]
["[0]" meta (.only)
+ ["[0]" code]
["[0]" location]]]]
["[0]" /
["[1][0]" simple]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
index 6f3c13d65..db181d050 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -17,9 +17,9 @@
[number
["n" nat]]]
[macro
- ["^" pattern]
- ["[0]" code]]
+ ["^" pattern]]
["[0]" meta (.only)
+ ["[0]" code]
["[0]" type (.only)
["[0]" check (.only Check)]]]]]
["[0]" /
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux
index c355ad0d1..4328de2b2 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux
@@ -15,13 +15,12 @@
[collection
["[0]" list (.use "[1]#[0]" monad)]
["[0]" dictionary (.only Dictionary)]]]
- [macro
- ["[0]" code]]
[math
[number
["n" nat]]]
["[0]" meta (.only)
["[0]" symbol]
+ ["[0]" code]
["[0]" type (.only)
["[0]" check]]]]]
["[0]" //
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 580faf086..028f9ea0e 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
@@ -11,12 +11,11 @@
["[0]" array]
["[0]" dictionary]
["[0]" list]]]
- [macro
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
[meta
["[0]" type (.only)
- ["[0]" check]]]
+ ["[0]" check]]
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]]
["@" target (.only)
["_" js]]]]
[//
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 cad6fe27b..42e4d3e3c 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
@@ -26,13 +26,16 @@
["[0]" sequence]]]
[macro
["^" pattern]
- ["[0]" template]
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
+ ["[0]" template]]
[math
[number
["n" nat]
["[0]" i32]]]
+ ["[0]" meta (.only)
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]
+ ["[0]" type (.only)
+ ["[0]" check (.only Check) (.use "[1]#[0]" monad)]]]
[target
["[0]" jvm
["[0]!" reflection]
@@ -55,10 +58,7 @@
["[0]" signature]
["[0]" parser]
["[0]" alias (.only Aliasing)]
- ["[0]T" lux (.only Mapping)]]]]
- ["[0]" meta (.only)
- ["[0]" type (.only)
- ["[0]" check (.only Check) (.use "[1]#[0]" monad)]]]]]
+ ["[0]T" lux (.only Mapping)]]]]]]
["[0]" //
["[1][0]" lux (.only custom)]
["/[1]" // (.only)
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 d62efd51f..914d3de39 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
@@ -11,10 +11,9 @@
["[0]" array]
["[0]" dictionary]
["[0]" list]]]
- [macro
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
[meta
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]
["[0]" type (.only)
["[0]" check]]]
["@" target (.only)
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 37ba8abe9..a9932f619 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
@@ -15,13 +15,13 @@
["[0]" list (.use "[1]#[0]" functor)]
["[0]" dictionary (.only Dictionary)]]]
[macro
- ["^" pattern]
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
+ ["^" pattern]]
[math
[number
["n" nat]]]
[meta
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]
[type
["[0]" check]]]
["[0]" meta]]]
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 3417bf78a..972bd8b90 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
@@ -11,10 +11,9 @@
["[0]" array (.only Array)]
["[0]" dictionary]
["[0]" list]]]
- [macro
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
[meta
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]
["[0]" type (.only)
["[0]" check]]]
["@" target (.only)
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 0712fe644..29b8d1015 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
@@ -11,10 +11,9 @@
["[0]" array]
["[0]" dictionary]
["[0]" list]]]
- [macro
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
[meta
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]
["[0]" type (.only)
["[0]" check]]]
["@" target (.only)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux
index 67f44e35a..a1e27d28e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux
@@ -11,10 +11,9 @@
["[0]" array (.only Array)]
["[0]" dictionary]
["[0]" list]]]
- [macro
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
[meta
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]
["[0]" type (.only)
["[0]" check]]]
["@" target
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 965f580b1..0bd416eed 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
@@ -11,10 +11,9 @@
["[0]" array]
["[0]" dictionary]
["[0]" list]]]
- [macro
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
[meta
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]
["[0]" type (.only)
["[0]" check]]]
["@" target (.only)
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 5768379ce..0ea42268f 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
@@ -11,10 +11,9 @@
["[0]" array (.only Array)]
["[0]" dictionary]
["[0]" list]]]
- [macro
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
[meta
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]
["[0]" type (.only)
["[0]" check]]]
["@" target (.only)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux
index f43c26adf..556a622be 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/jvm.lux
@@ -23,13 +23,14 @@
["[0]" set (.only Set)]]]
[macro
["^" pattern]
- ["[0]" template]
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
+ ["[0]" template]]
[math
[number
["n" nat]
["[0]" i32]]]
+ [meta
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]]
[target
[jvm
["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux
index d2d4592e6..8b50853ac 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/declaration/lux.lux
@@ -2,7 +2,6 @@
[library
[lux (.except)
["@" target]
- ["[0]" meta]
[abstract
["[0]" monad (.only do)]]
[control
@@ -22,12 +21,13 @@
["[0]" list (.use "[1]#[0]" functor mix)]
["[0]" set (.only Set)]]]
[macro
- ["^" pattern]
- ["[0]" code
- ["<[1]>" \\parser (.only Parser)]]]
+ ["^" pattern]]
[math
[number
["n" nat]]]
+ ["[0]" meta (.only)
+ ["[0]" code
+ ["<[1]>" \\parser (.only Parser)]]]
["[0]" type (.only sharing) (.use "[1]#[0]" equivalence)
["[0]" check]]]]
["[0]" /// (.only Extender)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
index 42c75531d..5667e47db 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
@@ -1,7 +1,6 @@
(.require
[library
[lux (.except Location)
- ["[0]" meta]
[abstract
["[0]" monad (.only do)]]
[control
@@ -16,12 +15,13 @@
["[0]" list (.use "[1]#[0]" functor monoid)]
["[0]" sequence]]]
["[0]" macro (.only)
- [syntax (.only syntax)]
- ["[0]" code (.only)
- ["<[1]>" \\parser]]]
+ [syntax (.only syntax)]]
[math
[number (.only hex)
["[0]" i64]]]
+ ["[0]" meta (.only)
+ ["[0]" code (.only)
+ ["<[1]>" \\parser]]]
["@" target
["_" common_lisp (.only Expression Computation Literal)]]]]
["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
index 501587da2..0f8d68aea 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
@@ -6,9 +6,9 @@
[data
[collection
["[0]" list (.use "[1]#[0]" functor)]]]
- ["[0]" meta]
["[0]" macro (.only with_symbols)
- [syntax (.only syntax)]
+ [syntax (.only syntax)]]
+ ["[0]" meta (.only)
["[0]" code (.only)
["<[1]>" \\parser]]]]]
["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
index 3eaadc3f5..cc2e746e4 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
@@ -1,7 +1,6 @@
(.require
[library
[lux (.except i64 left right)
- ["[0]" meta]
[abstract
["[0]" monad (.only do)]]
[control
@@ -17,12 +16,13 @@
["[0]" list (.use "[1]#[0]" functor)]
["[0]" sequence]]]
["[0]" macro (.only)
- [syntax (.only syntax)]
- ["[0]" code (.only)
- ["<[1]>" \\parser]]]
+ [syntax (.only syntax)]]
[math
[number (.only hex)
["[0]" i64]]]
+ ["[0]" meta (.only)
+ ["[0]" code (.only)
+ ["<[1]>" \\parser]]]
[target
["_" js (.only Expression Var Computation Statement)]]]]
["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux
index 16a7e67a3..08a3c9df8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux
@@ -7,9 +7,9 @@
["[0]" sequence]]]
[target
[jvm
+ ["_" bytecode (.only Bytecode)]
["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)]
["[0]" field (.only Field)]
- ["_" bytecode (.only Bytecode)]
[type (.only Type)
[category (.only Value Class)]]
[constant
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux
index 95b3fb619..4f0e6c222 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux
@@ -11,8 +11,8 @@
["n" nat]]]
[target
[jvm
- ["[0]" field (.only Field)]
["_" bytecode (.only Bytecode) (.use "[1]#[0]" monad)]
+ ["[0]" field (.only Field)]
[type (.only Type)
[category (.only Class)]]
[constant
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux
index 86965220b..438f9f68d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux
@@ -9,9 +9,9 @@
["n" nat]]]
[target
[jvm
+ ["_" bytecode (.only Label Bytecode)]
["[0]" modifier (.only Modifier) (.use "[1]#[0]" monoid)]
["[0]" method (.only Method)]
- ["_" bytecode (.only Label Bytecode)]
[constant
[pool (.only Resource)]]
["[0]" type (.only Type)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux
index 1daa92777..f61d67d93 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux
@@ -11,9 +11,9 @@
["n" nat]]]
[target
[jvm
+ ["_" bytecode (.only Bytecode)]
["[0]" field (.only Field)]
["[0]" method (.only Method)]
- ["_" bytecode (.only Bytecode)]
["[0]" constant (.only)
[pool (.only Resource)]]
[type (.only Type)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux
index faff66f47..f38edc961 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux
@@ -6,8 +6,8 @@
["[0]" list (.use "[1]#[0]" functor)]]]
[target
[jvm
- ["[0]" method (.only Method)]
["_" bytecode (.only Bytecode)]
+ ["[0]" method (.only Method)]
[constant
[pool (.only Resource)]]
["[0]" type (.only Type)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
index c8d769e87..493b47a6e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
@@ -12,9 +12,9 @@
[concurrency
["[0]" atom (.only Atom atom)]]]
[data
+ ["[0]" product]
[binary (.only Binary)
["[0]" \\format]]
- ["[0]" product]
["[0]" text (.use "[1]#[0]" hash)
["%" \\format (.only format)]]
[collection
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
index f7fb63f10..1c22af9cc 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
@@ -1,7 +1,6 @@
(.require
[library
[lux (.except Label Location left right)
- ["[0]" meta]
[abstract
["[0]" monad (.only do)]]
[control
@@ -17,12 +16,13 @@
["[0]" list (.use "[1]#[0]" functor)]
["[0]" sequence]]]
["[0]" macro (.only)
- [syntax (.only syntax)]
- ["[0]" code (.only)
- ["<[1]>" \\parser]]]
+ [syntax (.only syntax)]]
[math
[number (.only hex)
["[0]" i64]]]
+ ["[0]" meta (.only)
+ ["[0]" code (.only)
+ ["<[1]>" \\parser]]]
["@" target (.only)
["_" lua (.only Expression Location Var Computation Literal Label Statement)]]]]
["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
index 1254f50bc..fa45c35b0 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
@@ -1,7 +1,6 @@
(.require
[library
[lux (.except Location)
- ["[0]" meta]
[abstract
["[0]" monad (.only do)]]
[control
@@ -17,12 +16,13 @@
["[0]" list (.use "[1]#[0]" functor)]
["[0]" sequence]]]
["[0]" macro (.only)
- [syntax (.only syntax)]
- ["[0]" code (.only)
- ["<[1]>" \\parser]]]
+ [syntax (.only syntax)]]
[math
[number (.only hex)
["[0]" i64]]]
+ ["[0]" meta (.only)
+ ["[0]" code (.only)
+ ["<[1]>" \\parser]]]
["@" target (.only)
["_" php (.only Expression Label Constant Var Computation Literal Statement)]]]]
["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
index dfef07d7c..93f0477c7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
@@ -16,15 +16,15 @@
["[0]" list (.use "[1]#[0]" functor)]
["[0]" sequence]]]
["[0]" macro (.only)
- [syntax (.only syntax)]
- ["[0]" code (.only)
- ["<[1]>" \\parser]]]
+ [syntax (.only syntax)]]
[math
[number (.only hex)
["f" frac]
["[0]" i64]]]
["[0]" meta (.only)
- ["[0]" version]]
+ ["[0]" version]
+ ["[0]" code (.only)
+ ["<[1]>" \\parser]]]
["@" target (.only)
["_" python (.only Expression SVar Computation Literal Statement)]]]]
["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
index 089bdf2b9..b0d02c095 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
@@ -1,7 +1,6 @@
(.require
[library
[lux (.except Location ++ i64)
- ["[0]" meta]
[abstract
["[0]" monad (.only do)]]
[control
@@ -17,14 +16,15 @@
["[0]" list (.use "[1]#[0]" functor)]
["[0]" sequence]]]
["[0]" macro (.only)
- [syntax (.only syntax)]
- ["[0]" code (.only)
- ["<[1]>" \\parser]]]
+ [syntax (.only syntax)]]
[math
[number (.only hex)
["n" nat]
["i" int (.use "[1]#[0]" interval)]
["[0]" i64]]]
+ ["[0]" meta (.only)
+ ["[0]" code (.only)
+ ["<[1]>" \\parser]]]
["@" target (.only)
["_" r (.only SVar Expression)]]]]
["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
index 74261ccc3..a3d1fe4ab 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
@@ -1,7 +1,6 @@
(.require
[library
[lux (.except i64 left right)
- ["[0]" meta]
[abstract
["[0]" monad (.only do)]]
[control
@@ -17,13 +16,14 @@
["[0]" list (.use "[1]#[0]" functor mix)]
["[0]" sequence]]]
["[0]" macro (.only)
- [syntax (.only syntax)]
- ["[0]" code (.only)
- ["<[1]>" \\parser]]]
+ [syntax (.only syntax)]]
[math
[number (.only hex)
["[0]" i64]
["[0]" int (.use "[1]#[0]" interval)]]]
+ ["[0]" meta (.only)
+ ["[0]" code (.only)
+ ["<[1]>" \\parser]]]
["@" target (.only)
["_" ruby (.only Expression LVar Computation Literal Statement)]]]]
["[0]" ///
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 a99e83f84..cbf99339c 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
@@ -12,7 +12,8 @@
["[0]" list (.use "[1]#[0]" functor)]
["dict" dictionary (.only Dictionary)]]]
["[0]" macro (.only with_symbols)
- [syntax (.only syntax)]
+ [syntax (.only syntax)]]
+ [meta
["[0]" code (.only)
["<[1]>" \\parser]]]
[target
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
index 0b287568a..215e6af9a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
@@ -1,7 +1,6 @@
(.require
[library
[lux (.except Location)
- ["[0]" meta]
[abstract
["[0]" monad (.only do)]]
[control
@@ -17,12 +16,13 @@
["[0]" list (.use "[1]#[0]" functor)]
["[0]" sequence]]]
["[0]" macro (.only)
- [syntax (.only syntax)]
- ["[0]" code (.only)
- ["<[1]>" \\parser]]]
+ [syntax (.only syntax)]]
[math
[number (.only hex)
["[0]" i64]]]
+ ["[0]" meta (.only)
+ ["[0]" code (.only)
+ ["<[1]>" \\parser]]]
["@" target (.only)
["_" scheme (.only Expression Computation Var)]]]]
["[0]" ///
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
index 7b31c9a0a..a3872dfa5 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
@@ -43,11 +43,11 @@
["[0]" dictionary (.only Dictionary)]]]
[macro
[syntax (.only syntax)]
- ["[0]" template]
+ ["[0]" template]]
+ [meta
+ ["[0]" symbol]
["[0]" code
["<[1]>" \\parser]]]
- [meta
- ["[0]" symbol]]
[math
[number
["n" nat]