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

11 files changed, 41 insertions, 37 deletions

diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux
index d3fcc968a..c43caf3a4 100644
--- a/stdlib/source/test/lux/data/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
@@ -31,8 +31,6 @@
      ["[0]" set]
      [array
       [\\unsafe (.only)]]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random)]
     [number
@@ -42,9 +40,11 @@
      ["[0]" rev]
      ["[0]" frac]]]
    [meta
-    ["[0]" code]
     ["[0]" symbol]
-    ["[0]" type]]]]
+    ["[0]" type]
+    ["[0]" code]
+    [macro
+     ["^" pattern]]]]]
  [\\library
   ["[0]" / (.only) (.use "[1]#[0]" equivalence)
    ["!" \\unsafe]
diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux
index aec7a93e5..3f560f85d 100644
--- a/stdlib/source/test/lux/data/collection/tree.lux
+++ b/stdlib/source/test/lux/data/collection/tree.lux
@@ -16,12 +16,13 @@
     ["[0]" product]
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  ["[0]" \\parser]
  [\\library
   ["[0]" / (.only Tree)
diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux
index d98340a31..5bb0ca32b 100644
--- a/stdlib/source/test/lux/data/color/named.lux
+++ b/stdlib/source/test/lux/data/color/named.lux
@@ -8,12 +8,13 @@
     [collection
      ["[0]" list]
      ["[0]" set]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" / (.only)
    ["/[1]" //]]])
diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux
index bfc2b7d89..0e7ec6b44 100644
--- a/stdlib/source/test/lux/data/format/json.lux
+++ b/stdlib/source/test/lux/data/format/json.lux
@@ -27,9 +27,6 @@
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" set]
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   ["[0]" macro (.only)
-    ["^" pattern]
-    ["[0]" syntax (.only syntax)]]
    [math
     ["[0]" random (.only Random)]
     [number
@@ -43,6 +40,9 @@
      ["[0]/[1]" \\test]]]
    ["[0]" meta (.only)
     ["[0]" code]
+    ["[0]" macro (.only)
+     ["^" pattern]
+     ["[0]" syntax (.only syntax)]]
     [type
      ["[0]" unit]]]]]
  ["[0]" \\polytypic]
diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux
index 4a4426fd9..817c38c5a 100644
--- a/stdlib/source/test/lux/data/format/tar.lux
+++ b/stdlib/source/test/lux/data/format/tar.lux
@@ -24,14 +24,14 @@
     [collection
      ["[0]" sequence]
      ["[0]" list (.use "[1]#[0]" mix)]]]
-   [time
-    ["[0]" instant (.only Instant)]
-    ["[0]" duration]]
    [math
     ["[0]" random (.only Random)]
     [number
      ["n" nat]
-     ["i" int]]]]]
+     ["i" int]]]
+   [time
+    ["[0]" instant (.only Instant)]
+    ["[0]" duration]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux
index dfdc7ac0e..72a4a5665 100644
--- a/stdlib/source/test/lux/data/format/xml.lux
+++ b/stdlib/source/test/lux/data/format/xml.lux
@@ -18,16 +18,16 @@
     [collection
      ["[0]" dictionary]
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
      ["n" nat]]]
    [meta
     ["[0]" symbol (.use "[1]#[0]" equivalence)]
-    ["[0]" type (.use "[1]#[0]" equivalence)]]]]
+    ["[0]" type (.use "[1]#[0]" equivalence)]
+    [macro
+     ["^" pattern]
+     ["[0]" template]]]]]
  ["[0]" \\parser]
  [\\library
   ["[0]" / (.use "[1]#[0]" equivalence)]])
diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux
index ef8bf11ec..82d998311 100644
--- a/stdlib/source/test/lux/data/text.lux
+++ b/stdlib/source/test/lux/data/text.lux
@@ -33,8 +33,6 @@
      ["[0]" unicode
       ["[1]" set]
       ["[1]/[0]" block]]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     ["[0]" modulus]
@@ -50,7 +48,9 @@
     ["[0]" symbol]
     ["[0]" type]
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    [macro
+     ["^" pattern]]]
    ["[0]" time (.only)
     ["[0]" day]
     ["[0]" month]
diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux
index 47a1ddbb7..7464a5934 100644
--- a/stdlib/source/test/lux/data/text/encoding.lux
+++ b/stdlib/source/test/lux/data/text/encoding.lux
@@ -14,12 +14,13 @@
     [collection
      ["[0]" list (.use "[1]#[0]" mix)]
      ["[0]" set]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]]
  ["[0]" /
diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux
index da90e8f24..7509dcf58 100644
--- a/stdlib/source/test/lux/data/text/escape.lux
+++ b/stdlib/source/test/lux/data/text/escape.lux
@@ -14,16 +14,16 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" set (.only Set)]]]
-   [macro
-    [syntax (.only syntax)]
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number (.only hex)
      ["n" nat]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    [macro
+     [syntax (.only syntax)]
+     ["[0]" template]]]]]
  [\\library
   ["[0]" / (.only)
    [//
diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux
index 5dabc0a9b..faadefa50 100644
--- a/stdlib/source/test/lux/data/text/regex.lux
+++ b/stdlib/source/test/lux/data/text/regex.lux
@@ -11,14 +11,14 @@
     ["[0]" text (.use "[1]#[0]" equivalence)
      ["%" \\format (.only format)]
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)]
     ["[0]" random]]
    [meta
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/data/text/unicode/block.lux b/stdlib/source/test/lux/data/text/unicode/block.lux
index 7149a441c..34f1ab7cd 100644
--- a/stdlib/source/test/lux/data/text/unicode/block.lux
+++ b/stdlib/source/test/lux/data/text/unicode/block.lux
@@ -13,12 +13,13 @@
     [collection
      ["[0]" set]
      ["[0]" list]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number (.only hex)
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])