- Re-named path "lux/lang/*" to "lux/language/*".

15 files changed, 84 insertions, 84 deletions

diff --git a/stdlib/test/test/lux/lang/compiler/analysis/case.lux b/stdlib/test/test/lux/language/compiler/analysis/case.lux
index 5baf47fc0..ef54a66c1 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/case.lux
@@ -14,12 +14,12 @@
        ["r" math/random "r/" Monad<Random>]
        [macro #+ Monad<Meta>]
        (macro [code])
-       (lang [type "type/" Equivalence<Type>]
-             (type ["tc" check])
-             [".L" module]
-             (compiler [analysis]
-                       (analysis [".A" type]
-                                 ["/" case])))
+       (language [type "type/" Equivalence<Type>]
+                 (type ["tc" check])
+                 [".L" module]
+                 (compiler [analysis]
+                           (analysis [".A" type]
+                                     ["/" case])))
        test)
   (// ["_." primitive]
       ["_." structure]))
diff --git a/stdlib/test/test/lux/lang/compiler/analysis/function.lux b/stdlib/test/test/lux/language/compiler/analysis/function.lux
index 315972d28..e751f5e27 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/function.lux
@@ -12,19 +12,19 @@
        ["r" math/random "r/" Monad<Random>]
        [macro]
        (macro [code])
-       [lang]
-       (lang [type "type/" Equivalence<Type>]
-             [".L" reference]
-             (compiler [".L" init]
-                       [".L" analysis #+ Analysis]
-                       (analysis [".A" type]
-                                 [".A" expression]
-                                 ["/" function])))
+       [language]
+       (language [type "type/" Equivalence<Type>]
+                 [".L" reference]
+                 (compiler [".L" init]
+                           [".L" analysis #+ Analysis]
+                           (analysis [".A" type]
+                                     [".A" expression]
+                                     ["/" function])))
        test)
   (// ["_." primitive]
       ["_." structure]))
 
-(def: analyse (expressionA.analyser (:coerce lang.Eval [])))
+(def: analyse (expressionA.analyser (:coerce language.Eval [])))
 
 (def: (check-apply expectedT num-args analysis)
   (-> Type Nat (Meta Analysis) Bool)
diff --git a/stdlib/test/test/lux/lang/compiler/analysis/primitive.lux b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
index cf98a71ff..5e19dd4e8 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
@@ -9,15 +9,15 @@
        ["r" math/random "r/" Monad<Random>]
        [macro]
        (macro [code])
-       [lang]
-       (lang [".L" type "type/" Equivalence<Type>]
-             (compiler [".L" init]
-                       [analysis #+ Analysis]
-                       (analysis [".A" type]
-                                 [".A" expression])))
+       [language]
+       (language [".L" type "type/" Equivalence<Type>]
+                 (compiler [".L" init]
+                           [analysis #+ Analysis]
+                           (analysis [".A" type]
+                                     [".A" expression])))
        test))
 
-(def: #export analyse (expressionA.analyser (:coerce lang.Eval [])))
+(def: #export analyse (expressionA.analyser (:coerce language.Eval [])))
 
 (def: unit
   (r.Random Code)
diff --git a/stdlib/test/test/lux/lang/compiler/analysis/procedure/common.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
index 377a48478..743c4194c 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/procedure/common.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
@@ -11,11 +11,11 @@
        ["r" math/random "r/" Monad<Random>]
        [macro #+ Monad<Meta>]
        (macro [code])
-       [lang]
-       (lang [type "type/" Equivalence<Type>]
-             [".L" scope]
-             (compiler [".L" init]
-                       (analysis [".A" type])))
+       [language]
+       (language [type "type/" Equivalence<Type>]
+                 [".L" scope]
+                 (compiler [".L" init]
+                           (analysis [".A" type])))
        test)
   (/// ["_." primitive]))
 
diff --git a/stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
index 3d3dc41d5..bbe4c0170 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
@@ -15,11 +15,11 @@
        ["r" math/random "r/" Monad<Random>]
        [macro #+ Monad<Meta>]
        (macro [code])
-       [lang]
-       (lang [type]
-             (compiler [".L" init]
-                       (analysis [".A" type])
-                       (extension (analysis [".AE" host]))))
+       [language]
+       (language [type]
+                 (compiler [".L" init]
+                           (analysis [".A" type])
+                           (extension (analysis [".AE" host]))))
        test)
   (/// ["_." primitive]))
 
@@ -29,10 +29,10 @@
      (|> (do Monad<Meta>
            [## runtime-bytecode @runtime.translate
             ]
-           (lang.with-scope
+           (language.with-scope
              (typeA.with-type output-type
                (_primitive.analyse (` ((~ (code.text procedure)) (~+ params)))))))
-         (lang.with-current-module "")
+         (language.with-current-module "")
          (macro.run (initL.compiler []))
          (case> (#e.Success _)
                 <success>
@@ -50,10 +50,10 @@
      (|> (do Monad<Meta>
            [## runtime-bytecode @runtime.translate
             ]
-           (lang.with-scope
+           (language.with-scope
              (typeA.with-type output-type
                (_primitive.analyse syntax))))
-         (lang.with-current-module "")
+         (language.with-current-module "")
          (macro.run (initL.compiler []))
          (case> (#e.Success _)
                 <success>
diff --git a/stdlib/test/test/lux/lang/compiler/analysis/reference.lux b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
index d1874bfee..7016c3181 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/reference.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
@@ -9,19 +9,19 @@
        ["r" math/random]
        [macro #+ Monad<Meta>]
        (macro [code])
-       [lang]
-       (lang [type "type/" Equivalence<Type>]
-             [".L" scope]
-             [".L" module]
-             [".L" reference]
-             (compiler [".L" init]
-                       [".L" analysis]
-                       (analysis [".A" type]
-                                 [".A" expression])))
+       [language]
+       (language [type "type/" Equivalence<Type>]
+                 [".L" scope]
+                 [".L" module]
+                 [".L" reference]
+                 (compiler [".L" init]
+                           [".L" analysis]
+                           (analysis [".A" type]
+                                     [".A" expression])))
        test)
   (// ["_." primitive]))
 
-(def: analyse (expressionA.analyser (:coerce lang.Eval [])))
+(def: analyse (expressionA.analyser (:coerce language.Eval [])))
 
 (type: Check (-> (e.Error Any) Bool))
 
diff --git a/stdlib/test/test/lux/lang/compiler/analysis/structure.lux b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
index 4b43d150f..177e84e52 100644
--- a/stdlib/test/test/lux/lang/compiler/analysis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
@@ -14,19 +14,19 @@
        ["r" math/random "r/" Monad<Random>]
        [macro]
        (macro [code])
-       [lang]
-       (lang [type "type/" Equivalence<Type>]
-             (type ["tc" check])
-             [".L" module]
-             (compiler [".L" init]
-                       [".L" analysis #+ Analysis Variant Tag]
-                       (analysis [".A" type]
-                                 ["/" structure]
-                                 [".A" expression])))
+       [language]
+       (language [type "type/" Equivalence<Type>]
+                 (type ["tc" check])
+                 [".L" module]
+                 (compiler [".L" init]
+                           [".L" analysis #+ Analysis Variant Tag]
+                           (analysis [".A" type]
+                                     ["/" structure]
+                                     [".A" expression])))
        test)
   (// ["_." primitive]))
 
-(def: analyse (expressionA.analyser (:coerce lang.Eval [])))
+(def: analyse (expressionA.analyser (:coerce language.Eval [])))
 
 (do-template [<name> <on-success> <on-error>]
   [(def: #export <name>
diff --git a/stdlib/test/test/lux/lang/compiler/synthesis/case.lux b/stdlib/test/test/lux/language/compiler/synthesis/case.lux
index 228ed2920..92051fcb4 100644
--- a/stdlib/test/test/lux/lang/compiler/synthesis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/case.lux
@@ -3,12 +3,12 @@
   (lux (control [monad #+ do]
                 pipe)
        (data [error "error/" Functor<Error>])
-       (lang ["///." reference]
-             ["///." compiler]
-             [".L" analysis #+ Branch Analysis]
-             ["//" synthesis #+ Synthesis]
-             (synthesis [".S" expression])
-             [".L" extension])
+       (language ["///." reference]
+                 ["///." compiler]
+                 [".L" analysis #+ Branch Analysis]
+                 ["//" synthesis #+ Synthesis]
+                 (synthesis [".S" expression])
+                 [".L" extension])
        ["r" math/random "r/" Monad<Random>]
        test)
   [//primitive])
diff --git a/stdlib/test/test/lux/lang/compiler/synthesis/function.lux b/stdlib/test/test/lux/language/compiler/synthesis/function.lux
index 008062e5e..bd6c4c7a9 100644
--- a/stdlib/test/test/lux/lang/compiler/synthesis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/function.lux
@@ -11,12 +11,12 @@
              (collection [list "list/" Functor<List> Fold<List>]
                          ["dict" dictionary #+ Dictionary]
                          [set]))
-       (lang ["///." reference #+ Variable "variable/" Equivalence<Variable>]
-             ["///." compiler]
-             [".L" analysis #+ Arity Analysis]
-             ["//" synthesis #+ Synthesis]
-             (synthesis [".S" expression])
-             [".L" extension])
+       (language ["///." reference #+ Variable "variable/" Equivalence<Variable>]
+                 ["///." compiler]
+                 [".L" analysis #+ Arity Analysis]
+                 ["//" synthesis #+ Synthesis]
+                 (synthesis [".S" expression])
+                 [".L" extension])
        ["r" math/random]
        test)
   [//primitive])
diff --git a/stdlib/test/test/lux/lang/compiler/synthesis/primitive.lux b/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
index 0fd4d58c1..04e8b4dec 100644
--- a/stdlib/test/test/lux/lang/compiler/synthesis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
@@ -5,12 +5,12 @@
                 pipe)
        (data [error]
              text/format)
-       [lang]
-       (lang [".L" extension]
-             ["///." compiler]
-             [".L" analysis #+ Analysis]
-             ["//" synthesis #+ Synthesis]
-             (synthesis [".S" expression]))
+       [language]
+       (language [".L" extension]
+                 ["///." compiler]
+                 [".L" analysis #+ Analysis]
+                 ["//" synthesis #+ Synthesis]
+                 (synthesis [".S" expression]))
        ["r" math/random]
        test))
 
diff --git a/stdlib/test/test/lux/lang/compiler/synthesis/structure.lux b/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
index b3e4d6b67..e3351158e 100644
--- a/stdlib/test/test/lux/lang/compiler/synthesis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
@@ -7,11 +7,11 @@
              [product]
              [error]
              (collection [list]))
-       (lang ["///." compiler]
-             [".L" analysis]
-             ["//" synthesis #+ Synthesis]
-             (synthesis [".S" expression])
-             [".L" extension])
+       (language ["///." compiler]
+                 [".L" analysis]
+                 ["//" synthesis #+ Synthesis]
+                 (synthesis [".S" expression])
+                 [".L" extension])
        ["r" math/random "r/" Monad<Random>]
        test)
   [//primitive])
diff --git a/stdlib/test/test/lux/lang/syntax.lux b/stdlib/test/test/lux/language/syntax.lux
index 9c2be5dd2..9df62a608 100644
--- a/stdlib/test/test/lux/lang/syntax.lux
+++ b/stdlib/test/test/lux/language/syntax.lux
@@ -11,7 +11,7 @@
                          ["dict" dictionary #+ Dictionary]))
        ["r" math/random "r/" Monad<Random>]
        (macro [code])
-       (lang ["&" syntax])
+       (language ["&" syntax])
        test))
 
 (def: default-cursor
diff --git a/stdlib/test/test/lux/lang/type.lux b/stdlib/test/test/lux/language/type.lux
index 0a5b42461..ee53dd542 100644
--- a/stdlib/test/test/lux/lang/type.lux
+++ b/stdlib/test/test/lux/language/type.lux
@@ -9,7 +9,7 @@
              [maybe]
              (collection [list]))
        ["r" math/random]
-       (lang ["&" type]))
+       (language ["&" type]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/lang/type/check.lux b/stdlib/test/test/lux/language/type/check.lux
index 889f05bd8..7b24d0f91 100644
--- a/stdlib/test/test/lux/lang/type/check.lux
+++ b/stdlib/test/test/lux/language/type/check.lux
@@ -11,8 +11,8 @@
              (collection [list "list/" Functor<List>]
                          [set]))
        ["r" math/random]
-       (lang [type "type/" Equivalence<Type>]
-             ["@" type/check]))
+       (language [type "type/" Equivalence<Type>]
+                 (type ["@" check])))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/math/modular.lux b/stdlib/test/test/lux/math/modular.lux
index dcfdb4e11..dc0d89c40 100644
--- a/stdlib/test/test/lux/math/modular.lux
+++ b/stdlib/test/test/lux/math/modular.lux
@@ -7,7 +7,7 @@
              text/format)
        (math ["r" random]
              ["/" modular])
-       (lang [type "type/" Equivalence<Type>]))
+       (language [type "type/" Equivalence<Type>]))
   lux/test)
 
 (def: %3 (/.modulus 3))