- Heavy refactoring.

13 files changed, 34 insertions, 34 deletions

diff --git a/new-luxc/source/luxc/lang/analysis/case.lux b/new-luxc/source/luxc/lang/analysis/case.lux
index ee4d4fcfa..ff328b9de 100644
--- a/new-luxc/source/luxc/lang/analysis/case.lux
+++ b/new-luxc/source/luxc/lang/analysis/case.lux
@@ -15,12 +15,12 @@
        (meta [code]
              [type]
              (type ["tc" check])))
-  (luxc ["&" base]
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang ["&;" scope]
+              ["la" analysis]
               (analysis [";A" common]
                         [";A" structure]
-                        (case [";A" coverage])))
-        ["&;" scope]))
+                        (case [";A" coverage])))))
 
 (exception: #export Cannot-Match-Type-With-Pattern)
 (exception: #export Sum-Type-Has-No-Case)
diff --git a/new-luxc/source/luxc/lang/analysis/case/coverage.lux b/new-luxc/source/luxc/lang/analysis/case/coverage.lux
index 554aea1a8..c41cfb2a4 100644
--- a/new-luxc/source/luxc/lang/analysis/case/coverage.lux
+++ b/new-luxc/source/luxc/lang/analysis/case/coverage.lux
@@ -10,7 +10,7 @@
              (coll [list "list/" Fold<List>]
                    [dict #+ Dict]))
        [meta "meta/" Monad<Meta>])
-  (luxc ["&" base]
+  (luxc ["&" lang]
         (lang ["la" analysis])))
 
 ## The coverage of a pattern-matching expression summarizes how well
diff --git a/new-luxc/source/luxc/lang/analysis/common.lux b/new-luxc/source/luxc/lang/analysis/common.lux
index 968ebd2ea..5e618d64c 100644
--- a/new-luxc/source/luxc/lang/analysis/common.lux
+++ b/new-luxc/source/luxc/lang/analysis/common.lux
@@ -7,7 +7,7 @@
        [meta]
        (meta [type]
              (type ["tc" check])))
-  (luxc ["&" base]
+  (luxc ["&" lang]
         (lang analysis)))
 
 (def: #export (with-unknown-type action)
diff --git a/new-luxc/source/luxc/lang/analysis/expression.lux b/new-luxc/source/luxc/lang/analysis/expression.lux
index 248248010..afc347248 100644
--- a/new-luxc/source/luxc/lang/analysis/expression.lux
+++ b/new-luxc/source/luxc/lang/analysis/expression.lux
@@ -9,12 +9,12 @@
        (meta [type]
              (type ["tc" check]))
        [host])
-  (luxc ["&" base]
-        [";L" host]
-        (host [";H" macro])
-        (lang ["la" analysis]
-              (translation [";T" common]))
-        ["&;" module])
+  (luxc ["&" lang]
+        (lang ["&;" module]
+              [";L" host]
+              (host [";H" macro])
+              ["la" analysis]
+              (translation [";T" common])))
   (.. [";A" common]
       [";A" function]
       [";A" primitive]
diff --git a/new-luxc/source/luxc/lang/analysis/function.lux b/new-luxc/source/luxc/lang/analysis/function.lux
index 6a4a33e48..5403026cb 100644
--- a/new-luxc/source/luxc/lang/analysis/function.lux
+++ b/new-luxc/source/luxc/lang/analysis/function.lux
@@ -10,12 +10,12 @@
        (meta [code]
              [type]
              (type ["tc" check])))
-  (luxc ["&" base]
-        (lang ["la" analysis #+ Analysis]
+  (luxc ["&" lang]
+        (lang ["&;" scope]
+              ["la" analysis #+ Analysis]
               (analysis ["&;" common]
                         ["&;" inference])
-              [";L" variable #+ Variable])
-        ["&;" scope]))
+              [";L" variable #+ Variable])))
 
 (exception: #export Invalid-Function-Type)
 (exception: #export Cannot-Apply-Function)
diff --git a/new-luxc/source/luxc/lang/analysis/inference.lux b/new-luxc/source/luxc/lang/analysis/inference.lux
index 8b04ac2b7..080a6c620 100644
--- a/new-luxc/source/luxc/lang/analysis/inference.lux
+++ b/new-luxc/source/luxc/lang/analysis/inference.lux
@@ -9,7 +9,7 @@
        [meta "meta/" Monad<Meta>]
        (meta [type]
              (type ["tc" check])))
-  (luxc ["&" base]
+  (luxc ["&" lang]
         (lang ["la" analysis #+ Analysis]
               (analysis ["&;" common]))))
 
diff --git a/new-luxc/source/luxc/lang/analysis/primitive.lux b/new-luxc/source/luxc/lang/analysis/primitive.lux
index bb1762f46..792d607c3 100644
--- a/new-luxc/source/luxc/lang/analysis/primitive.lux
+++ b/new-luxc/source/luxc/lang/analysis/primitive.lux
@@ -4,7 +4,7 @@
        [meta]
        (meta [code]
              (type ["tc" check])))
-  (luxc ["&" base]
+  (luxc ["&" lang]
         (lang ["la" analysis #+ Analysis])))
 
 ## [Analysers]
diff --git a/new-luxc/source/luxc/lang/analysis/procedure.lux b/new-luxc/source/luxc/lang/analysis/procedure.lux
index 8ab868036..23e1a102d 100644
--- a/new-luxc/source/luxc/lang/analysis/procedure.lux
+++ b/new-luxc/source/luxc/lang/analysis/procedure.lux
@@ -6,7 +6,7 @@
              [text]
              text/format
              (coll [dict])))
-  (luxc ["&" base]
+  (luxc ["&" lang]
         (lang ["la" analysis]))
   (. ["./;" common]
      ["./;" host]))
diff --git a/new-luxc/source/luxc/lang/analysis/procedure/common.lux b/new-luxc/source/luxc/lang/analysis/procedure/common.lux
index f5756f35b..be77e643c 100644
--- a/new-luxc/source/luxc/lang/analysis/procedure/common.lux
+++ b/new-luxc/source/luxc/lang/analysis/procedure/common.lux
@@ -12,7 +12,7 @@
        (meta [code]
              (type ["tc" check]))
        [io])
-  (luxc ["&" base]
+  (luxc ["&" lang]
         (lang ["la" analysis]
               (analysis ["&;" common]
                         [";A" function]
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 cd5fdc7bb..c6a456441 100644
--- a/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux
@@ -20,9 +20,9 @@
              [type]
              (type ["tc" check]))
        [host])
-  (luxc ["&" base]
-        ["&;" host]
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang ["&;" host]
+              ["la" analysis]
               (analysis ["&;" common]
                         [";A" inference])))
   ["@" ../common]
diff --git a/new-luxc/source/luxc/lang/analysis/reference.lux b/new-luxc/source/luxc/lang/analysis/reference.lux
index ef02919f4..6ba0325df 100644
--- a/new-luxc/source/luxc/lang/analysis/reference.lux
+++ b/new-luxc/source/luxc/lang/analysis/reference.lux
@@ -4,10 +4,10 @@
        [meta]
        (meta [code]
              (type ["tc" check])))
-  (luxc ["&" base]
-        (lang ["la" analysis #+ Analysis]
-              [";L" variable #+ Variable])
-        ["&;" scope]))
+  (luxc ["&" lang]
+        (lang ["&;" scope]
+              ["la" analysis #+ Analysis]
+              [";L" variable #+ Variable])))
 
 ## [Analysers]
 (def: (analyse-definition def-name)
diff --git a/new-luxc/source/luxc/lang/analysis/structure.lux b/new-luxc/source/luxc/lang/analysis/structure.lux
index d2107c640..3048d4a4e 100644
--- a/new-luxc/source/luxc/lang/analysis/structure.lux
+++ b/new-luxc/source/luxc/lang/analysis/structure.lux
@@ -13,12 +13,12 @@
        (meta [code]
              [type]
              (type ["tc" check])))
-  (luxc ["&" base]
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang ["&;" scope]
+              ["&;" module]
+              ["la" analysis]
               (analysis ["&;" common]
-                        ["&;" inference]))
-        ["&;" module]
-        ["&;" scope]))
+                        ["&;" inference]))))
 
 (exception: #export Not-Variant-Type)
 (exception: #export Not-Tuple-Type)
@@ -156,7 +156,7 @@
         (do @
           [g!tail (meta;gensym "tail")]
           (&;with-expected-type tailT
-            (analyse (` ((~' _lux_case) [(~@ tailC)]
+            (analyse (` ("lux case" [(~@ tailC)]
                          (~ g!tail)
                          (~ g!tail))))))
         ))))
diff --git a/new-luxc/source/luxc/lang/analysis/type.lux b/new-luxc/source/luxc/lang/analysis/type.lux
index 89b25334f..4184dd0c0 100644
--- a/new-luxc/source/luxc/lang/analysis/type.lux
+++ b/new-luxc/source/luxc/lang/analysis/type.lux
@@ -3,7 +3,7 @@
   (lux (control monad)
        [meta]
        (meta (type ["tc" check])))
-  (luxc ["&" base]
+  (luxc ["&" lang]
         (lang ["la" analysis #+ Analysis])))
 
 ## These 2 analysers are somewhat special, since they require the