Alternative names for (un)quoting macros.

20 files changed, 61 insertions, 48 deletions

diff --git a/stdlib/source/library/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux
index 492644edc..af29859b7 100644
--- a/stdlib/source/library/lux/tool/compiler/default/platform.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux
@@ -27,9 +27,9 @@
      ["[0]" set (.only Set)]
      ["[0]" list (.use "[1]#[0]" monoid functor mix)]]]
    ["[0]" meta (.only)
-    ["[0]" configuration (.only Configuration)]]
-   [type (.only sharing)
-    ["[0]" check]]
+    ["[0]" configuration (.only Configuration)]
+    [type (.only sharing)
+     ["[0]" check]]]
    [world
     ["[0]" file (.only Path)]
     ["[0]" console]]]]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux
index d25341b39..402cf563a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux
@@ -1,8 +1,6 @@
 (.require
  [library
   [lux (.except)
-   [type (.only sharing)]
-   ["[0]" meta]
    [abstract
     [monad (.only do)]]
    [control
@@ -16,7 +14,9 @@
      ["[0]" dictionary (.only Dictionary)]]]
    [math
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   ["[0]" meta (.only)
+    [type (.only sharing)]]]]
  ["[0]" // (.only Operation)
   [macro (.only Expander)]
   ["[1][0]" type]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux
index da4761411..e13058163 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux
@@ -20,8 +20,9 @@
    [math
     [number
      ["n" nat]]]
-   ["[0]" type (.only)
-    ["[0]" check]]]]
+   [meta
+    ["[0]" type (.only)
+     ["[0]" check]]]]]
  ["/" // (.only Analysis Operation Phase)
   ["[1][0]" type]
   [//
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux
index 182199934..6cfad0d9f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux
@@ -17,8 +17,9 @@
    [math
     [number
      ["n" nat]]]
-   [type
-    ["[0]" check (.only Check)]]]]
+   [meta
+    [type
+     ["[0]" check (.only Check)]]]]]
  ["/" // (.only Operation)
   [//
    [phase
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 ba5d13ca3..6f3c13d65 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
@@ -1,7 +1,6 @@
 (.require
  [library
   [lux (.except case)
-   ["[0]" meta]
    [abstract
     ["[0]" monad (.only do)]]
    [control
@@ -20,8 +19,9 @@
    [macro
     ["^" pattern]
     ["[0]" code]]
-   ["[0]" type (.only)
-    ["[0]" check (.only Check)]]]]
+   ["[0]" meta (.only)
+    ["[0]" type (.only)
+     ["[0]" check (.only Check)]]]]]
  ["[0]" /
   ["/[1]" //
    ["[1][0]" complex]
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 3293fb170..c355ad0d1 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
@@ -1,7 +1,6 @@
 (.require
  [library
   [lux (.except)
-   ["[0]" meta]
    [abstract
     ["[0]" monad (.only do)]]
    [control
@@ -21,10 +20,10 @@
    [math
     [number
      ["n" nat]]]
-   [meta
-    ["[0]" symbol]]
-   ["[0]" type (.only)
-    ["[0]" check]]]]
+   ["[0]" meta (.only)
+    ["[0]" symbol]
+    ["[0]" type (.only)
+     ["[0]" check]]]]]
  ["[0]" //
   ["[1][0]" simple]
   ["/[1]" //
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux
index 4354f10a1..68d8ed9e4 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux
@@ -1,7 +1,6 @@
 (.require
  [library
   [lux (.except function)
-   ["[0]" meta]
    [abstract
     [monad (.only do)]]
    [control
@@ -17,8 +16,9 @@
    [math
     [number
      ["n" nat]]]
-   ["[0]" type (.only)
-    ["[0]" check]]]]
+   ["[0]" meta (.only)
+    ["[0]" type (.only)
+     ["[0]" check]]]]]
  ["[0]" ///
   ["[1][0]" extension]
   [//
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 102e5adcf..580faf086 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
@@ -14,8 +14,9 @@
    [macro
     ["[0]" code
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" type (.only)
-    ["[0]" check]]
+   [meta
+    ["[0]" type (.only)
+     ["[0]" check]]]
    ["@" 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 d22d74aaf..cad6fe27b 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
@@ -2,7 +2,6 @@
  [library
   [lux (.except Type Module Primitive char int type)
    ["[0]" ffi (.only import)]
-   ["[0]" meta]
    [abstract
     ["[0]" monad (.only do)]]
    [control
@@ -57,8 +56,9 @@
       ["[0]" parser]
       ["[0]" alias (.only Aliasing)]
       ["[0]T" lux (.only Mapping)]]]]
-   ["[0]" type (.only)
-    ["[0]" check (.only Check) (.use "[1]#[0]" monad)]]]]
+   ["[0]" meta (.only)
+    ["[0]" type (.only)
+     ["[0]" check (.only Check) (.use "[1]#[0]" monad)]]]]]
  ["[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 3c0e4cc86..d62efd51f 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
@@ -14,8 +14,9 @@
    [macro
     ["[0]" code
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" type (.only)
-    ["[0]" check]]
+   [meta
+    ["[0]" type (.only)
+     ["[0]" check]]]
    ["@" target (.only)
     ["_" lua]]]]
  [//
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 75e4e8516..37ba8abe9 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
@@ -21,8 +21,9 @@
    [math
     [number
      ["n" nat]]]
-   [type
-    ["[0]" check]]
+   [meta
+    [type
+     ["[0]" check]]]
    ["[0]" meta]]]
  ["[0]" /// (.only)
   ["[1][0]" bundle]
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 3852d2b24..3417bf78a 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
@@ -14,8 +14,9 @@
    [macro
     ["[0]" code
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" type (.only)
-    ["[0]" check]]
+   [meta
+    ["[0]" type (.only)
+     ["[0]" check]]]
    ["@" target (.only)
     ["_" php]]]]
  [//
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 3c6e4b452..0712fe644 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
@@ -14,8 +14,9 @@
    [macro
     ["[0]" code
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" type (.only)
-    ["[0]" check]]
+   [meta
+    ["[0]" type (.only)
+     ["[0]" check]]]
    ["@" target (.only)
     ["_" python]]]]
  [//
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 a53133555..67f44e35a 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
@@ -14,8 +14,9 @@
    [macro
     ["[0]" code
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" type (.only)
-    ["[0]" check]]
+   [meta
+    ["[0]" type (.only)
+     ["[0]" check]]]
    ["@" target
     ["_" r]]]]
  [//
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 3029aec9d..965f580b1 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
@@ -14,8 +14,9 @@
    [macro
     ["[0]" code
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" type (.only)
-    ["[0]" check]]
+   [meta
+    ["[0]" type (.only)
+     ["[0]" check]]]
    ["@" target (.only)
     ["_" ruby]]]]
  [//
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 bf1493940..5768379ce 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
@@ -14,8 +14,9 @@
    [macro
     ["[0]" code
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" type (.only)
-    ["[0]" check]]
+   [meta
+    ["[0]" type (.only)
+     ["[0]" check]]]
    ["@" target (.only)
     ["_" scheme]]]]
  [//
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
index fd8a0c817..75612d11a 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
@@ -25,8 +25,9 @@
    [math
     [number
      ["n" nat (.use "[1]#[0]" equivalence)]]]
-   [type
-    [primitive (.except)]]]]
+   [meta
+    [type
+     [primitive (.except)]]]]]
  [/
   ["[0]" artifact]
   ["[0]" registry (.only Registry)]
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux
index 0e26e7718..24db1094f 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux
@@ -1,8 +1,9 @@
 (.require
  [library
   [lux (.except)
-   [type
-    [primitive (.except)]]]]
+   [meta
+    [type
+     [primitive (.except)]]]]]
  [//
   [signature (.only Signature)]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux
index 64fae1ab4..46f7e2d5e 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux
@@ -13,8 +13,9 @@
     ["[0]" binary
      [\\parser (.only Parser)]
      ["[1]" \\format (.only Format)]]]
-   [type (.only sharing)
-    [primitive (.except)]]]]
+   [meta
+    [type (.only sharing)
+     [primitive (.except)]]]]]
  [///
   ["[0]" signature (.only Signature) (.use "[1]#[0]" equivalence)]
   ["[0]" key (.only Key)]])
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
index ec61e4b79..b7c1e2e35 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
@@ -22,8 +22,9 @@
      ["[0]" dictionary (.only Dictionary)]]]
    [macro
     ["^" pattern]]
-   [type
-    [primitive (.except)]]]]
+   [meta
+    [type
+     [primitive (.except)]]]]]
  ["[0]" //
   ["[0]" unit]
   ["[1]" artifact (.only Artifact ID)