- Re-named "Lux" type to "Meta".

- Moved lux/type/* under lux/meta/*.

13 files changed, 46 insertions, 46 deletions

diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index 5ff53793c..88f8c6f79 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -8,8 +8,8 @@
        (data [maybe]
              [text "T/" Eq<Text>]
              text/format)
-       [macro]
-       (macro ["s" syntax #+ syntax:])))
+       [meta]
+       (meta ["s" syntax #+ syntax:])))
 
 (context: "Value identity."
   [size (|> r;nat (:: @ map (|>. (n.% +100) (n.max +10))))
@@ -163,10 +163,10 @@
 
       (test "Can have defaults for Maybe values."
             (and (is "yolo" (maybe;default "yolo"
-                              #;None))
+                                           #;None))
                  
                  (is "lol" (maybe;default "yolo"
-                             (#;Some "lol")))))
+                                          (#;Some "lol")))))
       ))
 
 (template: (hypotenuse x y)
diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/test/test/lux/control/parser.lux
index 0f6b4a4b1..3a2483f6b 100644
--- a/stdlib/test/test/lux/control/parser.lux
+++ b/stdlib/test/test/lux/control/parser.lux
@@ -12,9 +12,9 @@
              [ident]
              ["E" error])
        ["r" math/random]
-       [macro]
-       (macro [code]
-              ["s" syntax #+ syntax:]))
+       [meta]
+       (meta [code]
+             ["s" syntax #+ syntax:]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index 67e636d36..7ab580684 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -16,17 +16,17 @@
              (coll [sequence #+ sequence]
                    ["d" dict]
                    [list]))
-       [macro #+ with-gensyms]
-       (macro [code]
-              [syntax #+ syntax:]
-              [poly #+ derived:]
-              [poly/eq]
-              [poly/json])
+       [meta #+ with-gensyms]
+       (meta [code]
+             [syntax #+ syntax:]
+             [poly #+ derived:]
+             [poly/eq]
+             [poly/json]
+             (type [unit]))
        ["r" math/random]
        (time ["ti" instant]
              ["tda" date]
              ["tdu" duration])
-       (type [unit])
        test)
   (test (lux (time ["_;" instant]
                    ["_;" duration]
diff --git a/stdlib/test/test/lux/data/text/regex.lux b/stdlib/test/test/lux/data/text/regex.lux
index f0b5bd3c2..29ec9a896 100644
--- a/stdlib/test/test/lux/data/text/regex.lux
+++ b/stdlib/test/test/lux/data/text/regex.lux
@@ -9,9 +9,9 @@
              text/format
              (text [lexer]
                    ["&" regex]))
-       [macro]
-       (macro [code]
-              ["s" syntax #+ syntax:])
+       [meta]
+       (meta [code]
+             ["s" syntax #+ syntax:])
        ["r" math/random])
   lux/test)
 
diff --git a/stdlib/test/test/lux/macro/code.lux b/stdlib/test/test/lux/meta/code.lux
index 64bdf5f1c..7c3706f13 100644
--- a/stdlib/test/test/lux/macro/code.lux
+++ b/stdlib/test/test/lux/meta/code.lux
@@ -6,7 +6,7 @@
              text/format
              [number])
        ["r" math/random]
-       (macro ["&" code]))
+       (meta ["&" code]))
   lux/test)
 
 (context: "Code"
diff --git a/stdlib/test/test/lux/macro/poly/eq.lux b/stdlib/test/test/lux/meta/poly/eq.lux
index 525b668a8..28cc1167a 100644
--- a/stdlib/test/test/lux/macro/poly/eq.lux
+++ b/stdlib/test/test/lux/meta/poly/eq.lux
@@ -10,9 +10,9 @@
              [maybe]
              (coll [list]))
        ["r" math/random]
-       [macro]
-       (macro [poly #+ derived:]
-              ["&" poly/eq]))
+       [meta]
+       (meta [poly #+ derived:]
+             ["&" poly/eq]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/meta/poly/functor.lux
index 45e54bae7..8ece07447 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/test/test/lux/meta/poly/functor.lux
@@ -11,9 +11,9 @@
              [text]
              [identity])
        ["r" math/random]
-       [macro]
-       (macro [poly #+ derived:]
-              ["&" poly/functor]))
+       [meta]
+       (meta [poly #+ derived:]
+             ["&" poly/functor]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/meta/syntax.lux
index b159bf999..511c56e68 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/meta/syntax.lux
@@ -11,9 +11,9 @@
              [ident]
              ["E" error])
        ["r" math/random]
-       [macro]
-       (macro [code]
-              ["s" syntax #+ syntax: Syntax]))
+       [meta]
+       (meta [code]
+             ["s" syntax #+ syntax: Syntax]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/type.lux b/stdlib/test/test/lux/meta/type.lux
index 3953fcb5b..062021a3c 100644
--- a/stdlib/test/test/lux/type.lux
+++ b/stdlib/test/test/lux/meta/type.lux
@@ -9,7 +9,7 @@
              [maybe]
              (coll [list]))
        ["r" math/random]
-       ["&" type])
+       (meta ["&" type]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/type/auto.lux b/stdlib/test/test/lux/meta/type/auto.lux
index 55e374c50..6e506e9f8 100644
--- a/stdlib/test/test/lux/type/auto.lux
+++ b/stdlib/test/test/lux/meta/type/auto.lux
@@ -11,8 +11,8 @@
              maybe
              (coll [list]))
        ["r" math/random]
-       [type]
-       type/auto)
+       (meta [type]
+             type/auto))
   lux/test)
 
 (context: "Automatic structure selection"
@@ -29,11 +29,11 @@
       
       (test "Can automatically select second-order structures."
             (::: =
-                 (list;n.range +1 +10)
-                 (list;n.range +1 +10)))
+              (list;n.range +1 +10)
+              (list;n.range +1 +10)))
 
       (test "Can automatically select third-order structures."
             (let [lln (::: map (list;n.range +1)
-                           (list;n.range +1 +10))]
+                        (list;n.range +1 +10))]
               (::: = lln lln)))
       ))
diff --git a/stdlib/test/test/lux/type/check.lux b/stdlib/test/test/lux/meta/type/check.lux
index 67000157d..c6ac6c9b1 100644
--- a/stdlib/test/test/lux/type/check.lux
+++ b/stdlib/test/test/lux/meta/type/check.lux
@@ -8,8 +8,8 @@
              maybe
              (coll [list]))
        ["r" math/random]
-       [type]
-       ["@" type/check])
+       (meta [type]
+             ["@" type/check]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/type/object.lux b/stdlib/test/test/lux/meta/type/object.lux
index c85ff5770..c6b7d0f80 100644
--- a/stdlib/test/test/lux/type/object.lux
+++ b/stdlib/test/test/lux/meta/type/object.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux (data (coll [list]))
-       (type object)))
+       (meta (type object))))
 
 ## No parameters
 (interface: Counter
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 8d20ef379..aa816c4d3 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -62,14 +62,14 @@
              (math ["_;" random]
                    (logic ["_;" continuous]
                           ["_;" fuzzy]))
-             (macro ["_;" code]
-                    ["_;" syntax]
-                    (poly ["poly_;" eq]
-                          ["poly_;" functor]))
-             ["_;" type]
-             (type ["_;" check]
-                   ["_;" auto]
-                   ["_;" object])
+             (meta ["_;" code]
+                   ["_;" syntax]
+                   (poly ["poly_;" eq]
+                         ["poly_;" functor])
+                   ["_;" type]
+                   (type ["_;" check]
+                         ["_;" auto]
+                         ["_;" object]))
              (world ["_;" blob]
                     ["_;" file]
                     (net ["_;" tcp]
@@ -86,9 +86,9 @@
                      [html]
                      [css])
              (coll (tree ["tree_;" parser])))
-       [macro]
        (math [random])
-       (type [unit])
+       [meta]
+       (meta (type [unit]))
        [world/env])
   )