From 53ccae1625d46cf57247b9fb1cb9f4c28b0a0ad4 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 15 Nov 2017 22:04:44 -0400
Subject: - Moved "/type" and "/type/check" from "lux/meta" to "lux/lang".

---
 new-luxc/source/luxc/lang.lux                                | 4 ++--
 new-luxc/source/luxc/lang/analysis/case.lux                  | 4 ++--
 new-luxc/source/luxc/lang/analysis/common.lux                | 2 +-
 new-luxc/source/luxc/lang/analysis/expression.lux            | 2 +-
 new-luxc/source/luxc/lang/analysis/function.lux              | 4 ++--
 new-luxc/source/luxc/lang/analysis/inference.lux             | 2 +-
 new-luxc/source/luxc/lang/analysis/primitive.lux             | 4 ++--
 new-luxc/source/luxc/lang/analysis/procedure/common.lux      | 4 ++--
 new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux    | 4 ++--
 new-luxc/source/luxc/lang/analysis/reference.lux             | 4 ++--
 new-luxc/source/luxc/lang/analysis/structure.lux             | 4 ++--
 new-luxc/source/luxc/lang/analysis/type.lux                  | 2 +-
 new-luxc/source/luxc/lang/translation.lux                    | 4 ++--
 new-luxc/source/luxc/module/descriptor/type.lux              | 2 +-
 new-luxc/test/test/luxc/lang/analysis/case.lux               | 4 ++--
 new-luxc/test/test/luxc/lang/analysis/function.lux           | 4 ++--
 new-luxc/test/test/luxc/lang/analysis/primitive.lux          | 4 ++--
 new-luxc/test/test/luxc/lang/analysis/procedure/common.lux   | 4 ++--
 new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux | 4 ++--
 new-luxc/test/test/luxc/lang/analysis/reference.lux          | 2 +-
 new-luxc/test/test/luxc/lang/analysis/structure.lux          | 4 ++--
 new-luxc/test/test/luxc/lang/analysis/type.lux               | 4 ++--
 22 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'new-luxc')

diff --git a/new-luxc/source/luxc/lang.lux b/new-luxc/source/luxc/lang.lux
index 844cc6755..45a8b1860 100644
--- a/new-luxc/source/luxc/lang.lux
+++ b/new-luxc/source/luxc/lang.lux
@@ -9,8 +9,8 @@
              text/format
              (coll [list]))
        [meta]
-       (meta (type ["tc" check])
-             ["s" syntax #+ syntax:]))
+       (meta ["s" syntax #+ syntax:])
+       (lang (type ["tc" check])))
   (luxc (lang ["la" analysis])))
 
 (type: #export Eval
diff --git a/new-luxc/source/luxc/lang/analysis/case.lux b/new-luxc/source/luxc/lang/analysis/case.lux
index ff328b9de..69a975b52 100644
--- a/new-luxc/source/luxc/lang/analysis/case.lux
+++ b/new-luxc/source/luxc/lang/analysis/case.lux
@@ -12,8 +12,8 @@
              text/format
              (coll [list "list/" Fold<List> Monoid<List> Functor<List>]))
        [meta]
-       (meta [code]
-             [type]
+       (meta [code])
+       (lang [type]
              (type ["tc" check])))
   (luxc ["&" lang]
         (lang ["&;" scope]
diff --git a/new-luxc/source/luxc/lang/analysis/common.lux b/new-luxc/source/luxc/lang/analysis/common.lux
index 95355d62f..b67e8e268 100644
--- a/new-luxc/source/luxc/lang/analysis/common.lux
+++ b/new-luxc/source/luxc/lang/analysis/common.lux
@@ -5,7 +5,7 @@
        (data text/format
              [product])
        [meta]
-       (meta [type]
+       (lang [type]
              (type ["tc" check])))
   (luxc ["&" lang]
         (lang analysis)))
diff --git a/new-luxc/source/luxc/lang/analysis/expression.lux b/new-luxc/source/luxc/lang/analysis/expression.lux
index afc347248..98addd197 100644
--- a/new-luxc/source/luxc/lang/analysis/expression.lux
+++ b/new-luxc/source/luxc/lang/analysis/expression.lux
@@ -6,7 +6,7 @@
              [product]
              text/format)
        [meta]
-       (meta [type]
+       (lang [type]
              (type ["tc" check]))
        [host])
   (luxc ["&" lang]
diff --git a/new-luxc/source/luxc/lang/analysis/function.lux b/new-luxc/source/luxc/lang/analysis/function.lux
index 611e5c8a4..7f2787e6f 100644
--- a/new-luxc/source/luxc/lang/analysis/function.lux
+++ b/new-luxc/source/luxc/lang/analysis/function.lux
@@ -7,8 +7,8 @@
              text/format
              (coll [list "list/" Fold<List> Monoid<List> Monad<List>]))
        [meta]
-       (meta [code]
-             [type]
+       (meta [code])
+       (lang [type]
              (type ["tc" check])))
   (luxc ["&" lang]
         (lang ["&;" scope]
diff --git a/new-luxc/source/luxc/lang/analysis/inference.lux b/new-luxc/source/luxc/lang/analysis/inference.lux
index cccaa774a..910d5093a 100644
--- a/new-luxc/source/luxc/lang/analysis/inference.lux
+++ b/new-luxc/source/luxc/lang/analysis/inference.lux
@@ -7,7 +7,7 @@
              text/format
              (coll [list "list/" Functor<List>]))
        [meta "meta/" Monad<Meta>]
-       (meta [type]
+       (lang [type]
              (type ["tc" check])))
   (luxc ["&" lang]
         (lang ["la" analysis #+ Analysis]
diff --git a/new-luxc/source/luxc/lang/analysis/primitive.lux b/new-luxc/source/luxc/lang/analysis/primitive.lux
index 792d607c3..2a0fbfbe5 100644
--- a/new-luxc/source/luxc/lang/analysis/primitive.lux
+++ b/new-luxc/source/luxc/lang/analysis/primitive.lux
@@ -2,8 +2,8 @@
   lux
   (lux (control monad)
        [meta]
-       (meta [code]
-             (type ["tc" check])))
+       (meta [code])
+       (lang (type ["tc" check])))
   (luxc ["&" lang]
         (lang ["la" analysis #+ Analysis])))
 
diff --git a/new-luxc/source/luxc/lang/analysis/procedure/common.lux b/new-luxc/source/luxc/lang/analysis/procedure/common.lux
index a643cb76a..a394c554c 100644
--- a/new-luxc/source/luxc/lang/analysis/procedure/common.lux
+++ b/new-luxc/source/luxc/lang/analysis/procedure/common.lux
@@ -9,8 +9,8 @@
                    [array]
                    [dict #+ Dict]))
        [meta]
-       (meta [code]
-             (type ["tc" check]))
+       (meta [code])
+       (lang (type ["tc" check]))
        [io])
   (luxc ["&" lang]
         (lang ["la" analysis]
diff --git a/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux
index 8f5382d2b..827f3213d 100644
--- a/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux
@@ -16,8 +16,8 @@
                    [dict #+ Dict]))
        [meta "meta/" Monad<Meta>]
        (meta [code]
-             ["s" syntax]
-             [type]
+             ["s" syntax])
+       (lang [type]
              (type ["tc" check]))
        [host])
   (luxc ["&" lang]
diff --git a/new-luxc/source/luxc/lang/analysis/reference.lux b/new-luxc/source/luxc/lang/analysis/reference.lux
index 6ba0325df..c3ff3456b 100644
--- a/new-luxc/source/luxc/lang/analysis/reference.lux
+++ b/new-luxc/source/luxc/lang/analysis/reference.lux
@@ -2,8 +2,8 @@
   lux
   (lux (control monad)
        [meta]
-       (meta [code]
-             (type ["tc" check])))
+       (meta [code])
+       (lang (type ["tc" check])))
   (luxc ["&" lang]
         (lang ["&;" scope]
               ["la" analysis #+ Analysis]
diff --git a/new-luxc/source/luxc/lang/analysis/structure.lux b/new-luxc/source/luxc/lang/analysis/structure.lux
index 76b5a3a42..70744ba5b 100644
--- a/new-luxc/source/luxc/lang/analysis/structure.lux
+++ b/new-luxc/source/luxc/lang/analysis/structure.lux
@@ -10,8 +10,8 @@
                    [dict #+ Dict])
              text/format)
        [meta]
-       (meta [code]
-             [type]
+       (meta [code])
+       (lang [type]
              (type ["tc" check])))
   (luxc ["&" lang]
         (lang ["&;" scope]
diff --git a/new-luxc/source/luxc/lang/analysis/type.lux b/new-luxc/source/luxc/lang/analysis/type.lux
index eb3de08de..c91fdab38 100644
--- a/new-luxc/source/luxc/lang/analysis/type.lux
+++ b/new-luxc/source/luxc/lang/analysis/type.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control monad)
        [meta]
-       (meta (type ["tc" check])))
+       (lang (type ["tc" check])))
   (luxc ["&" lang]
         (lang ["la" analysis #+ Analysis])))
 
diff --git a/new-luxc/source/luxc/lang/translation.lux b/new-luxc/source/luxc/lang/translation.lux
index 88fc25d3a..1e631205d 100644
--- a/new-luxc/source/luxc/lang/translation.lux
+++ b/new-luxc/source/luxc/lang/translation.lux
@@ -8,8 +8,8 @@
              text/format
              (coll [dict]))
        [meta]
-       (meta (type ["tc" check]))
-       (lang [syntax])
+       (lang [syntax]
+             (type ["tc" check]))
        [host]
        [io]
        (world [file #+ File]))
diff --git a/new-luxc/source/luxc/module/descriptor/type.lux b/new-luxc/source/luxc/module/descriptor/type.lux
index 2f5b8667b..58e29c39e 100644
--- a/new-luxc/source/luxc/module/descriptor/type.lux
+++ b/new-luxc/source/luxc/module/descriptor/type.lux
@@ -8,7 +8,7 @@
              [number]
              ["e" error]
              (coll [list "L/" Functor<List>]))
-       (meta [type "type/" Eq<Type>]))
+       (lang [type "type/" Eq<Type>]))
   ["&" ../common])
 
 (do-template [<name> <code>]
diff --git a/new-luxc/test/test/luxc/lang/analysis/case.lux b/new-luxc/test/test/luxc/lang/analysis/case.lux
index 6d34ef4c5..bffa99bce 100644
--- a/new-luxc/test/test/luxc/lang/analysis/case.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/case.lux
@@ -13,8 +13,8 @@
                    ["S" set]))
        ["r" math/random "r/" Monad<Random>]
        [meta #+ Monad<Meta>]
-       (meta [code]
-             [type "type/" Eq<Type>]
+       (meta [code])
+       (lang [type "type/" Eq<Type>]
              (type ["tc" check]))
        test)
   (luxc ["&" lang]
diff --git a/new-luxc/test/test/luxc/lang/analysis/function.lux b/new-luxc/test/test/luxc/lang/analysis/function.lux
index 6cddfebd2..5b84d3dd0 100644
--- a/new-luxc/test/test/luxc/lang/analysis/function.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/function.lux
@@ -11,8 +11,8 @@
              (coll [list "list/" Functor<List>]))
        ["r" math/random "r/" Monad<Random>]
        [meta]
-       (meta [code]
-             [type "type/" Eq<Type>])
+       (meta [code])
+       (lang [type "type/" Eq<Type>])
        test)
   (luxc ["&" lang]
         (lang ["@;" module]
diff --git a/new-luxc/test/test/luxc/lang/analysis/primitive.lux b/new-luxc/test/test/luxc/lang/analysis/primitive.lux
index 8e1329eb6..b4dc1a63d 100644
--- a/new-luxc/test/test/luxc/lang/analysis/primitive.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/primitive.lux
@@ -13,8 +13,8 @@
              (coll [list "L/" Functor<List> Fold<List>]))
        ["r" math/random]
        [meta #+ Monad<Meta>]
-       (meta [code]
-             [type "type/" Eq<Type>])
+       (meta [code])
+       (lang [type "type/" Eq<Type>])
        test)
   (luxc ["&" lang]
         (lang ["&;" module]
diff --git a/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux b/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
index 3420ebb4d..f5b1feb71 100644
--- a/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
@@ -10,8 +10,8 @@
              (coll [array]))
        ["r" math/random "r/" Monad<Random>]
        [meta #+ Monad<Meta>]
-       (meta [code]
-             [type "type/" Eq<Type>])
+       (meta [code])
+       (lang [type "type/" Eq<Type>])
        test)
   (luxc ["&" lang]
         (lang ["&;" scope]
diff --git a/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux b/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux
index 783174777..b82eb8206 100644
--- a/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/procedure/host.jvm.lux
@@ -14,8 +14,8 @@
                    [dict]))
        ["r" math/random "r/" Monad<Random>]
        [meta #+ Monad<Meta>]
-       (meta [code]
-             [type])
+       (meta [code])
+       (lang [type])
        test)
   (luxc ["&" lang]
         (lang ["&;" scope]
diff --git a/new-luxc/test/test/luxc/lang/analysis/reference.lux b/new-luxc/test/test/luxc/lang/analysis/reference.lux
index 15e5af44f..16cfb9a38 100644
--- a/new-luxc/test/test/luxc/lang/analysis/reference.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/reference.lux
@@ -6,7 +6,7 @@
        (data ["e" error])
        ["r" math/random]
        [meta #+ Monad<Meta>]
-       (meta [type "type/" Eq<Type>])
+       (lang [type "type/" Eq<Type>])
        test)
   (luxc (lang ["&;" scope]
               ["&;" module]
diff --git a/new-luxc/test/test/luxc/lang/analysis/structure.lux b/new-luxc/test/test/luxc/lang/analysis/structure.lux
index 8cc95fd88..cc31622a1 100644
--- a/new-luxc/test/test/luxc/lang/analysis/structure.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/structure.lux
@@ -13,8 +13,8 @@
                    ["S" set]))
        ["r" math/random "r/" Monad<Random>]
        [meta]
-       (meta [code]
-             [type "type/" Eq<Type>]
+       (meta [code])
+       (lang [type "type/" Eq<Type>]
              (type ["tc" check]))
        test)
   (luxc ["&" lang]
diff --git a/new-luxc/test/test/luxc/lang/analysis/type.lux b/new-luxc/test/test/luxc/lang/analysis/type.lux
index 6d89582e8..ed75f4d6c 100644
--- a/new-luxc/test/test/luxc/lang/analysis/type.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/type.lux
@@ -13,8 +13,8 @@
              (coll [list "list/" Functor<List> Fold<List>]))
        ["r" math/random "r/" Monad<Random>]
        [meta #+ Monad<Meta>]
-       (meta [code]
-             [type "type/" Eq<Type>])
+       (meta [code])
+       (lang [type "type/" Eq<Type>])
        test)
   (luxc ["&" lang]
         (lang ["&;" module]
-- 
cgit v1.2.3