Moved "lux/macro" to "lux/meta/macro".

8 files changed, 27 insertions, 21 deletions

diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux
index 08fb2d4b7..42bbc6a4f 100644
--- a/stdlib/source/program/aedifex/artifact/extension.lux
+++ b/stdlib/source/program/aedifex/artifact/extension.lux
@@ -4,8 +4,9 @@
    [data
     ["[0]" text (.only)
      ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" template]]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  ["[0]" //
   ["[1]" type]])
 
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 69b5f9e40..38738e400 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -19,14 +19,14 @@
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]]
    [math
     [number (.only hex)
      ["n" nat]
      ["i" int]]]
    [meta
-    ["[0]" configuration]]
+    ["[0]" configuration]
+    [macro
+     ["^" pattern]]]
    [tool
     [compiler
      [meta
diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux
index 21155222d..7acc3e8c9 100644
--- a/stdlib/source/program/aedifex/command/test.lux
+++ b/stdlib/source/program/aedifex/command/test.lux
@@ -10,11 +10,12 @@
    [data
     [collection
      ["[0]" dictionary]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["i" int]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [world
     ["[0]" program (.only Program)]
     ["[0]" file]
diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux
index 5ba5ab385..da65aa330 100644
--- a/stdlib/source/program/aedifex/format.lux
+++ b/stdlib/source/program/aedifex/format.lux
@@ -7,9 +7,10 @@
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" list (.use "[1]#[0]" monad)]
      ["[0]" set (.only Set)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]
+   [meta
+    [macro
+     ["[0]" code]
+     ["[0]" template]]]
    [tool
     [compiler
      [meta
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index 3f7376286..1c853512c 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -14,14 +14,15 @@
     ["[0]" text
      ["%" \\format (.only Format format)]
      ["[0]" encoding]]]
-   [macro
-    ["^" pattern]]
    [math
     [number
      ["n" nat]
      ["[0]" i64]]]
-   [type
-    [primitive (.except)]]]])
+   [meta
+    [macro
+     ["^" pattern]]
+    [type
+     [primitive (.except)]]]]])
 
 ... TODO: Replace with pure-Lux implementations of these algorithms
 ... https://en.wikipedia.org/wiki/SHA-1#SHA-1_pseudocode
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index 5f9435dd5..060bc0f18 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -15,11 +15,11 @@
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" list (.use "[1]#[0]" monoid)
       ["[0]" property (.use "[1]#[0]" monoid)]]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [meta
-    ["[0]" symbol]]
+    ["[0]" symbol]
+    [macro
+     ["^" pattern]
+     ["[0]" template]]]
    [world
     [net (.only URL)]
     [file (.only Path)]]
diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux
index 981ca9b12..20d270008 100644
--- a/stdlib/source/program/aedifex/runtime.lux
+++ b/stdlib/source/program/aedifex/runtime.lux
@@ -10,8 +10,9 @@
     [collection
      ["[0]" list (.use "[1]#[0]" monoid)]
      ["[0]" dictionary (.only Dictionary)]]]
-   [macro
-    ["[0]" template]]
+   [meta
+    [macro
+     ["[0]" template]]]
    [world
     ["[0]" file]]]])
 
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index 0a29b79b7..354a1198f 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -1,7 +1,6 @@
 (.require
  [library
   [lux (.except Module)
-   [type (.only sharing)]
    ["@" target]
    ["[0]" debug]
    [abstract
@@ -19,6 +18,8 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" dictionary (.only Dictionary)]]]
+   [meta
+    [type (.only sharing)]]
    [time
     ["[0]" instant]]
    ["[0]" world