aboutsummaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/source/lux/data/text/buffer.lux2
-rw-r--r--stdlib/source/lux/data/text/encoding.lux2
-rw-r--r--stdlib/source/lux/data/text/format.lux2
-rw-r--r--stdlib/source/lux/host.jvm.lux2
-rw-r--r--stdlib/source/lux/language.lux (renamed from stdlib/source/lux/lang.lux)0
-rw-r--r--stdlib/source/lux/language/compiler.lux (renamed from stdlib/source/lux/lang/compiler.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/analysis.lux (renamed from stdlib/source/lux/lang/compiler/analysis.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/analysis/case.lux (renamed from stdlib/source/lux/lang/compiler/analysis/case.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/analysis/case/coverage.lux (renamed from stdlib/source/lux/lang/compiler/analysis/case/coverage.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/analysis/expression.lux (renamed from stdlib/source/lux/lang/compiler/analysis/expression.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/analysis/function.lux (renamed from stdlib/source/lux/lang/compiler/analysis/function.lux)6
-rw-r--r--stdlib/source/lux/language/compiler/analysis/inference.lux (renamed from stdlib/source/lux/lang/compiler/analysis/inference.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/analysis/primitive.lux (renamed from stdlib/source/lux/lang/compiler/analysis/primitive.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/analysis/reference.lux (renamed from stdlib/source/lux/lang/compiler/analysis/reference.lux)2
-rw-r--r--stdlib/source/lux/language/compiler/analysis/structure.lux (renamed from stdlib/source/lux/lang/compiler/analysis/structure.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/analysis/type.lux (renamed from stdlib/source/lux/lang/compiler/analysis/type.lux)2
-rw-r--r--stdlib/source/lux/language/compiler/default/cache.lux (renamed from stdlib/source/lux/lang/compiler/default/cache.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/default/repl/type.lux (renamed from stdlib/source/lux/lang/compiler/default/repl/type.lux)2
-rw-r--r--stdlib/source/lux/language/compiler/extension.lux (renamed from stdlib/source/lux/lang/compiler/extension.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/extension/analysis.lux (renamed from stdlib/source/lux/lang/compiler/extension/analysis.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/extension/analysis/common.lux (renamed from stdlib/source/lux/lang/compiler/extension/analysis/common.lux)20
-rw-r--r--stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux (renamed from stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux)200
-rw-r--r--stdlib/source/lux/language/compiler/extension/bundle.lux (renamed from stdlib/source/lux/lang/compiler/extension/bundle.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/extension/synthesis.lux (renamed from stdlib/source/lux/lang/compiler/extension/synthesis.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/extension/translation.lux (renamed from stdlib/source/lux/lang/compiler/extension/translation.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/init.lux (renamed from stdlib/source/lux/lang/compiler/init.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/meta/archive.lux (renamed from stdlib/source/lux/lang/compiler/meta/archive.lux)2
-rw-r--r--stdlib/source/lux/language/compiler/meta/cache.lux (renamed from stdlib/source/lux/lang/compiler/meta/cache.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/meta/cache/dependency.lux (renamed from stdlib/source/lux/lang/compiler/meta/cache/dependency.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/meta/io.lux (renamed from stdlib/source/lux/lang/compiler/meta/io.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/meta/io/archive.lux (renamed from stdlib/source/lux/lang/compiler/meta/io/archive.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/meta/io/context.lux (renamed from stdlib/source/lux/lang/compiler/meta/io/context.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/synthesis.lux (renamed from stdlib/source/lux/lang/compiler/synthesis.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/synthesis/case.lux (renamed from stdlib/source/lux/lang/compiler/synthesis/case.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/synthesis/expression.lux (renamed from stdlib/source/lux/lang/compiler/synthesis/expression.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/synthesis/function.lux (renamed from stdlib/source/lux/lang/compiler/synthesis/function.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/synthesis/loop.lux (renamed from stdlib/source/lux/lang/compiler/synthesis/loop.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation.lux (renamed from stdlib/source/lux/lang/compiler/translation.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/expression.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/extension.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/extension/common.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/function.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/loop.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/primitive.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/reference.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/runtime.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux (renamed from stdlib/source/lux/lang/compiler/translation/scheme/structure.jvm.lux)0
-rw-r--r--stdlib/source/lux/language/host.lux (renamed from stdlib/source/lux/lang/host.lux)0
-rw-r--r--stdlib/source/lux/language/host/scheme.lux (renamed from stdlib/source/lux/lang/host/scheme.lux)0
-rw-r--r--stdlib/source/lux/language/module.lux (renamed from stdlib/source/lux/lang/module.lux)0
-rw-r--r--stdlib/source/lux/language/name.lux (renamed from stdlib/source/lux/lang/name.lux)0
-rw-r--r--stdlib/source/lux/language/reference.lux (renamed from stdlib/source/lux/lang/reference.lux)0
-rw-r--r--stdlib/source/lux/language/scope.lux (renamed from stdlib/source/lux/lang/scope.lux)0
-rw-r--r--stdlib/source/lux/language/syntax.lux (renamed from stdlib/source/lux/lang/syntax.lux)0
-rw-r--r--stdlib/source/lux/language/type.lux (renamed from stdlib/source/lux/lang/type.lux)0
-rw-r--r--stdlib/source/lux/language/type/check.lux (renamed from stdlib/source/lux/lang/type/check.lux)2
-rw-r--r--stdlib/source/lux/macro/poly.lux4
-rw-r--r--stdlib/source/lux/macro/poly/equivalence.lux2
-rw-r--r--stdlib/source/lux/macro/poly/functor.lux2
-rw-r--r--stdlib/source/lux/macro/poly/json.lux2
-rw-r--r--stdlib/source/lux/type/abstract.lux2
-rw-r--r--stdlib/source/lux/type/implicit.lux4
-rw-r--r--stdlib/source/lux/type/object/interface.lux2
-rw-r--r--stdlib/source/lux/type/quotient.lux2
-rw-r--r--stdlib/source/lux/type/refinement.lux2
-rw-r--r--stdlib/source/lux/world/file.lux4
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/case.lux (renamed from stdlib/test/test/lux/lang/compiler/analysis/case.lux)12
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/function.lux (renamed from stdlib/test/test/lux/lang/compiler/analysis/function.lux)18
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/primitive.lux (renamed from stdlib/test/test/lux/lang/compiler/analysis/primitive.lux)14
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux (renamed from stdlib/test/test/lux/lang/compiler/analysis/procedure/common.lux)10
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux (renamed from stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux)18
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/reference.lux (renamed from stdlib/test/test/lux/lang/compiler/analysis/reference.lux)20
-rw-r--r--stdlib/test/test/lux/language/compiler/analysis/structure.lux (renamed from stdlib/test/test/lux/lang/compiler/analysis/structure.lux)20
-rw-r--r--stdlib/test/test/lux/language/compiler/synthesis/case.lux (renamed from stdlib/test/test/lux/lang/compiler/synthesis/case.lux)12
-rw-r--r--stdlib/test/test/lux/language/compiler/synthesis/function.lux (renamed from stdlib/test/test/lux/lang/compiler/synthesis/function.lux)12
-rw-r--r--stdlib/test/test/lux/language/compiler/synthesis/primitive.lux (renamed from stdlib/test/test/lux/lang/compiler/synthesis/primitive.lux)12
-rw-r--r--stdlib/test/test/lux/language/compiler/synthesis/structure.lux (renamed from stdlib/test/test/lux/lang/compiler/synthesis/structure.lux)10
-rw-r--r--stdlib/test/test/lux/language/syntax.lux (renamed from stdlib/test/test/lux/lang/syntax.lux)2
-rw-r--r--stdlib/test/test/lux/language/type.lux (renamed from stdlib/test/test/lux/lang/type.lux)2
-rw-r--r--stdlib/test/test/lux/language/type/check.lux (renamed from stdlib/test/test/lux/lang/type/check.lux)4
-rw-r--r--stdlib/test/test/lux/math/modular.lux2
82 files changed, 219 insertions, 219 deletions
diff --git a/stdlib/source/lux/data/text/buffer.lux b/stdlib/source/lux/data/text/buffer.lux
index 0641ba215..8721b957d 100644
--- a/stdlib/source/lux/data/text/buffer.lux
+++ b/stdlib/source/lux/data/text/buffer.lux
@@ -3,7 +3,7 @@
(lux (data [product]
text/format
(collection [row #+ Row "row/" Fold<Row>]))
- (lang ["_" host])
+ (language ["_" host])
(type abstract)
[host #+ import:])
[//])
diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/lux/data/text/encoding.lux
index eb3b618c4..b4e6fe113 100644
--- a/stdlib/source/lux/data/text/encoding.lux
+++ b/stdlib/source/lux/data/text/encoding.lux
@@ -2,7 +2,7 @@
lux
(lux (data [error #+ Error])
(world [blob #+ Blob])
- (lang ["_" host])
+ (language ["_" host])
[host #+ import:]))
(`` (for {(~~ (static _.jvm))
diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux
index 26fca323d..16651957e 100644
--- a/stdlib/source/lux/data/text/format.lux
+++ b/stdlib/source/lux/data/text/format.lux
@@ -16,7 +16,7 @@
[macro]
(macro [code]
["s" syntax #+ syntax: Syntax])
- (lang [type])
+ (language [type])
))
## [Syntax]
diff --git a/stdlib/source/lux/host.jvm.lux b/stdlib/source/lux/host.jvm.lux
index 43a78472b..4a680a5a8 100644
--- a/stdlib/source/lux/host.jvm.lux
+++ b/stdlib/source/lux/host.jvm.lux
@@ -15,7 +15,7 @@
[macro #+ with-gensyms Functor<Meta> Monad<Meta>]
(macro [code]
["s" syntax #+ syntax: Syntax])
- (lang [type "type/" Equivalence<Type>])
+ (language [type "type/" Equivalence<Type>])
))
(do-template [<name> <op> <from> <to>]
diff --git a/stdlib/source/lux/lang.lux b/stdlib/source/lux/language.lux
index bc6e2c9ec..bc6e2c9ec 100644
--- a/stdlib/source/lux/lang.lux
+++ b/stdlib/source/lux/language.lux
diff --git a/stdlib/source/lux/lang/compiler.lux b/stdlib/source/lux/language/compiler.lux
index 2e88938de..2e88938de 100644
--- a/stdlib/source/lux/lang/compiler.lux
+++ b/stdlib/source/lux/language/compiler.lux
diff --git a/stdlib/source/lux/lang/compiler/analysis.lux b/stdlib/source/lux/language/compiler/analysis.lux
index 87a4cbe4f..87a4cbe4f 100644
--- a/stdlib/source/lux/lang/compiler/analysis.lux
+++ b/stdlib/source/lux/language/compiler/analysis.lux
diff --git a/stdlib/source/lux/lang/compiler/analysis/case.lux b/stdlib/source/lux/language/compiler/analysis/case.lux
index fc1e83d4a..fc1e83d4a 100644
--- a/stdlib/source/lux/lang/compiler/analysis/case.lux
+++ b/stdlib/source/lux/language/compiler/analysis/case.lux
diff --git a/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux b/stdlib/source/lux/language/compiler/analysis/case/coverage.lux
index 70c9fa80f..70c9fa80f 100644
--- a/stdlib/source/lux/lang/compiler/analysis/case/coverage.lux
+++ b/stdlib/source/lux/language/compiler/analysis/case/coverage.lux
diff --git a/stdlib/source/lux/lang/compiler/analysis/expression.lux b/stdlib/source/lux/language/compiler/analysis/expression.lux
index 2ef2cae5b..2ef2cae5b 100644
--- a/stdlib/source/lux/lang/compiler/analysis/expression.lux
+++ b/stdlib/source/lux/language/compiler/analysis/expression.lux
diff --git a/stdlib/source/lux/lang/compiler/analysis/function.lux b/stdlib/source/lux/language/compiler/analysis/function.lux
index f8d8b826b..fc925b68b 100644
--- a/stdlib/source/lux/lang/compiler/analysis/function.lux
+++ b/stdlib/source/lux/language/compiler/analysis/function.lux
@@ -8,9 +8,9 @@
(collection [list "list/" Fold<List> Monoid<List> Monad<List>]))
[macro]
(macro [code])
- (lang [type]
- (type ["tc" check])
- [".L" scope]))
+ (language [type]
+ (type ["tc" check])
+ [".L" scope]))
[///]
[// #+ Analysis Compiler]
[//type]
diff --git a/stdlib/source/lux/lang/compiler/analysis/inference.lux b/stdlib/source/lux/language/compiler/analysis/inference.lux
index a89ed40f8..a89ed40f8 100644
--- a/stdlib/source/lux/lang/compiler/analysis/inference.lux
+++ b/stdlib/source/lux/language/compiler/analysis/inference.lux
diff --git a/stdlib/source/lux/lang/compiler/analysis/primitive.lux b/stdlib/source/lux/language/compiler/analysis/primitive.lux
index 5f6604926..5f6604926 100644
--- a/stdlib/source/lux/lang/compiler/analysis/primitive.lux
+++ b/stdlib/source/lux/language/compiler/analysis/primitive.lux
diff --git a/stdlib/source/lux/lang/compiler/analysis/reference.lux b/stdlib/source/lux/language/compiler/analysis/reference.lux
index a3436d15b..bfc4e9faa 100644
--- a/stdlib/source/lux/lang/compiler/analysis/reference.lux
+++ b/stdlib/source/lux/language/compiler/analysis/reference.lux
@@ -4,7 +4,7 @@
["ex" exception #+ exception:])
[macro]
(macro [code])
- (lang (type ["tc" check]))
+ (language (type ["tc" check]))
(data [text "text/" Equivalence<Text>]
text/format))
[///]
diff --git a/stdlib/source/lux/lang/compiler/analysis/structure.lux b/stdlib/source/lux/language/compiler/analysis/structure.lux
index 087ffa8c5..087ffa8c5 100644
--- a/stdlib/source/lux/lang/compiler/analysis/structure.lux
+++ b/stdlib/source/lux/language/compiler/analysis/structure.lux
diff --git a/stdlib/source/lux/lang/compiler/analysis/type.lux b/stdlib/source/lux/language/compiler/analysis/type.lux
index 9fcfb2743..bc2ccccfe 100644
--- a/stdlib/source/lux/lang/compiler/analysis/type.lux
+++ b/stdlib/source/lux/language/compiler/analysis/type.lux
@@ -3,7 +3,7 @@
(lux (control [monad #+ do])
(data [error])
[macro]
- (lang (type ["tc" check])))
+ (language (type ["tc" check])))
[///]
[// #+ Operation])
diff --git a/stdlib/source/lux/lang/compiler/default/cache.lux b/stdlib/source/lux/language/compiler/default/cache.lux
index a878e1615..a878e1615 100644
--- a/stdlib/source/lux/lang/compiler/default/cache.lux
+++ b/stdlib/source/lux/language/compiler/default/cache.lux
diff --git a/stdlib/source/lux/lang/compiler/default/repl/type.lux b/stdlib/source/lux/language/compiler/default/repl/type.lux
index b78d1785c..bb210bf7f 100644
--- a/stdlib/source/lux/lang/compiler/default/repl/type.lux
+++ b/stdlib/source/lux/language/compiler/default/repl/type.lux
@@ -16,7 +16,7 @@
[macro]
(macro [code]
[poly #+ Poly])
- (lang [type])))
+ (language [type])))
(exception: #export (cannot-represent-value {type Type})
(ex.report ["Type" (%type type)]))
diff --git a/stdlib/source/lux/lang/compiler/extension.lux b/stdlib/source/lux/language/compiler/extension.lux
index e23e9b511..e23e9b511 100644
--- a/stdlib/source/lux/lang/compiler/extension.lux
+++ b/stdlib/source/lux/language/compiler/extension.lux
diff --git a/stdlib/source/lux/lang/compiler/extension/analysis.lux b/stdlib/source/lux/language/compiler/extension/analysis.lux
index 9f48c79b4..9f48c79b4 100644
--- a/stdlib/source/lux/lang/compiler/extension/analysis.lux
+++ b/stdlib/source/lux/language/compiler/extension/analysis.lux
diff --git a/stdlib/source/lux/lang/compiler/extension/analysis/common.lux b/stdlib/source/lux/language/compiler/extension/analysis/common.lux
index 62a01cee7..a0525cf12 100644
--- a/stdlib/source/lux/lang/compiler/extension/analysis/common.lux
+++ b/stdlib/source/lux/language/compiler/extension/analysis/common.lux
@@ -9,8 +9,8 @@
(collection [list "list/" Functor<List>]
[array]
["dict" dictionary #+ Dictionary]))
- [lang]
- (lang (type ["tc" check]))
+ [language]
+ (language (type ["tc" check]))
[io #+ IO])
[////]
(//// [analysis #+ Analysis]
@@ -38,7 +38,7 @@
(analyse argC)))
(list.zip2 inputsT+ args))]
(wrap (#///.Extension extension argsA)))
- (lang.throw ///bundle.incorrect-arity [extension num-expected num-actual]))))))
+ (language.throw ///bundle.incorrect-arity [extension num-expected num-actual]))))))
(def: #export (nullary valueT extension)
(-> Type Text ..Handler)
@@ -81,18 +81,18 @@
(wrap (#///.Extension extension (list opA))))
_
- (lang.throw ///bundle.incorrect-arity [extension +1 (list.size args)]))))
+ (language.throw ///bundle.incorrect-arity [extension +1 (list.size args)]))))
(def: (lux//in-module extension)
(-> Text ..Handler)
(function (_ analyse argsC+)
(case argsC+
(^ (list [_ (#.Text module-name)] exprC))
- (lang.with-current-module module-name
+ (language.with-current-module module-name
(analyse exprC))
_
- (lang.throw ///bundle.invalid-syntax [extension]))))
+ (language.throw ///bundle.invalid-syntax [extension]))))
## (do-template [<name> <type>]
## [(def: (<name> extension)
@@ -107,7 +107,7 @@
## (analyse valueC)))
## _
-## (lang.throw ///bundle.incorrect-arity [extension +2 (list.size args)]))))]
+## (language.throw ///bundle.incorrect-arity [extension +2 (list.size args)]))))]
## [lux//check (:coerce Type actualT)]
## [lux//coerce Any]
@@ -125,7 +125,7 @@
(wrap valueA))
_
- (lang.throw ///bundle.incorrect-arity [extension +1 (list.size args)]))))
+ (language.throw ///bundle.incorrect-arity [extension +1 (list.size args)]))))
(def: bundle/lux
///.Bundle
@@ -280,7 +280,7 @@
(wrap (#///.Extension extension (list initA))))
_
- (lang.throw ///bundle.incorrect-arity [extension +1 (list.size args)]))))
+ (language.throw ///bundle.incorrect-arity [extension +1 (list.size args)]))))
(def: (atom-read extension)
(-> Text ..Handler)
@@ -320,7 +320,7 @@
(wrap (#///.Extension extension (list initA))))
_
- (lang.throw ///bundle.incorrect-arity [extension +1 (list.size args)]))))
+ (language.throw ///bundle.incorrect-arity [extension +1 (list.size args)]))))
(def: (box//read extension)
(-> Text ..Handler)
diff --git a/stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux b/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux
index 265836e66..c11a6d5f4 100644
--- a/stdlib/source/lux/lang/compiler/extension/analysis/host.jvm.lux
+++ b/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux
@@ -16,9 +16,9 @@
[macro "macro/" Monad<Meta>]
(macro [code]
["s" syntax])
- [lang]
- (lang [type]
- (type ["tc" check]))
+ [language]
+ (language [type]
+ (type ["tc" check]))
[host])
["/" //common]
(//// [".L" analysis #+ Analysis]
@@ -222,7 +222,7 @@
(wrap (#analysisL.Extension proc (list arrayA))))
_
- (lang.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
(def: (array//new proc)
(-> Text ///.Analysis)
@@ -243,7 +243,7 @@
(recur outputT level)
#.None
- (lang.throw non-array expectedT))
+ (language.throw non-array expectedT))
(^ (#.Primitive "#Array" (list elemT)))
(recur elemT (inc level))
@@ -252,16 +252,16 @@
(wrap [level class])
_
- (lang.throw non-array expectedT))))
+ (language.throw non-array expectedT))))
_ (if (n/> +0 level)
(wrap [])
- (lang.throw non-array expectedT))]
+ (language.throw non-array expectedT))]
(wrap (#analysisL.Extension proc (list (analysisL.nat (dec level))
(analysisL.text elem-class)
lengthA))))
_
- (lang.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
(def: (check-jvm objectT)
(-> Type (Meta Text))
@@ -287,17 +287,17 @@
(check-jvm outputT)
#.None
- (lang.throw non-object objectT))
+ (language.throw non-object objectT))
_
- (lang.throw non-object objectT)))
+ (language.throw non-object objectT)))
(def: (check-object objectT)
(-> Type (Meta Text))
(do macro.Monad<Meta>
[name (check-jvm objectT)]
(if (dict.contains? name boxes)
- (lang.throw primitives-are-not-objects name)
+ (language.throw primitives-are-not-objects name)
(macro/wrap name))))
(def: (box-array-element-type elemT)
@@ -311,11 +311,11 @@
(#.Primitive name _)
(if (dict.contains? name boxes)
- (lang.throw primitives-cannot-have-type-parameters name)
+ (language.throw primitives-cannot-have-type-parameters name)
(macro/wrap [elemT name]))
_
- (lang.throw invalid-type-for-array-element (%type elemT))))
+ (language.throw invalid-type-for-array-element (%type elemT))))
(def: (array//read proc)
(-> Text ///.Analysis)
@@ -335,7 +335,7 @@
(wrap (#analysisL.Extension proc (list (analysisL.text elem-class) idxA arrayA))))
_
- (lang.throw /.incorrect-extension-arity [proc +2 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +2 (list.size args)]))))
(def: (array//write proc)
(-> Text ///.Analysis)
@@ -357,7 +357,7 @@
(wrap (#analysisL.Extension proc (list (analysisL.text elem-class) idxA valueA arrayA))))
_
- (lang.throw /.incorrect-extension-arity [proc +3 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +3 (list.size args)]))))
(def: array-procs
/.Bundle
@@ -380,7 +380,7 @@
(wrap (#analysisL.Extension proc (list))))
_
- (lang.throw /.incorrect-extension-arity [proc +0 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +0 (list.size args)]))))
(def: (object//null? proc)
(-> Text ///.Analysis)
@@ -395,7 +395,7 @@
(wrap (#analysisL.Extension proc (list objectA))))
_
- (lang.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
(def: (object//synchronized proc)
(-> Text ///.Analysis)
@@ -410,7 +410,7 @@
(wrap (#analysisL.Extension proc (list monitorA exprA))))
_
- (lang.throw /.incorrect-extension-arity [proc +2 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +2 (list.size args)]))))
(host.import: java/lang/Object
(equals [Object] boolean))
@@ -480,7 +480,7 @@
(wrap class)
(#e.Error error)
- (lang.throw unknown-class name))))
+ (language.throw unknown-class name))))
(def: (sub-class? super sub)
(-> Text Text (Meta Bool))
@@ -503,11 +503,11 @@
_ (: (Meta Any)
(if ?
(wrap [])
- (lang.throw non-throwable exception-class)))]
+ (language.throw non-throwable exception-class)))]
(wrap (#analysisL.Extension proc (list exceptionA))))
_
- (lang.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
(def: (object//class proc)
(-> Text ///.Analysis)
@@ -522,10 +522,10 @@
(wrap (#analysisL.Extension proc (list (analysisL.text class)))))
_
- (lang.throw /.invalid-syntax [proc args]))
+ (language.throw /.invalid-syntax [proc args]))
_
- (lang.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +1 (list.size args)]))))
(def: (object//instance? proc)
(-> Text ///.Analysis)
@@ -542,13 +542,13 @@
? (sub-class? class object-class)]
(if ?
(wrap (#analysisL.Extension proc (list (analysisL.text class))))
- (lang.throw cannot-possibly-be-an-instance (format object-class " !<= " class))))
+ (language.throw cannot-possibly-be-an-instance (format object-class " !<= " class))))
_
- (lang.throw /.invalid-syntax [proc args]))
+ (language.throw /.invalid-syntax [proc args]))
_
- (lang.throw /.incorrect-extension-arity [proc +2 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +2 (list.size args)]))))
(def: (java-type-to-class type)
(-> java/lang/reflect/Type (Meta Text))
@@ -559,7 +559,7 @@
(java-type-to-class (ParameterizedType::getRawType [] (:coerce ParameterizedType type)))
## else
- (lang.throw cannot-convert-to-a-class (jvm-type-name type))))
+ (language.throw cannot-convert-to-a-class (jvm-type-name type))))
(type: Mappings
(Dictionary Text Type))
@@ -575,7 +575,7 @@
(macro/wrap var-type)
#.None
- (lang.throw unknown-type-var var-name)))
+ (language.throw unknown-type-var var-name)))
(host.instance? WildcardType java-type)
(let [java-type (:coerce WildcardType java-type)]
@@ -612,7 +612,7 @@
(monad.map @ (java-type-to-lux-type mappings)))]
(macro/wrap (#.Primitive (Class::getName [] (:coerce (Class Object) raw))
paramsT)))
- (lang.throw jvm-type-is-not-a-class raw)))
+ (language.throw jvm-type-is-not-a-class raw)))
(host.instance? GenericArrayType java-type)
(do macro.Monad<Meta>
@@ -622,7 +622,7 @@
(wrap (#.Primitive "#Array" (list innerT))))
## else
- (lang.throw cannot-convert-to-a-lux-type (jvm-type-name java-type))))
+ (language.throw cannot-convert-to-a-lux-type (jvm-type-name java-type))))
(def: (correspond-type-params class type)
(-> (Class Object) Type (Meta Mappings))
@@ -633,16 +633,16 @@
num-class-params (list.size class-params)
num-type-params (list.size params)]
(cond (not (text/= class-name name))
- (lang.throw cannot-correspond-type-with-a-class
- (format "Class = " class-name "\n"
- "Type = " (%type type)))
+ (language.throw cannot-correspond-type-with-a-class
+ (format "Class = " class-name "\n"
+ "Type = " (%type type)))
(not (n/= num-class-params num-type-params))
- (lang.throw type-parameter-mismatch
- (format "Expected: " (%i (.int num-class-params)) "\n"
- " Actual: " (%i (.int num-type-params)) "\n"
- " Class: " class-name "\n"
- " Type: " (%type type)))
+ (language.throw type-parameter-mismatch
+ (format "Expected: " (%i (.int num-class-params)) "\n"
+ " Actual: " (%i (.int num-type-params)) "\n"
+ " Class: " class-name "\n"
+ " Type: " (%type type)))
## else
(macro/wrap (|> params
@@ -651,7 +651,7 @@
))
_
- (lang.throw non-jvm-type type)))
+ (language.throw non-jvm-type type)))
(def: (object//cast proc)
(-> Text ///.Analysis)
@@ -683,10 +683,10 @@
_
(do @
- [_ (lang.assert primitives-are-not-objects from-name
- (not (dict.contains? from-name boxes)))
- _ (lang.assert primitives-are-not-objects to-name
- (not (dict.contains? to-name boxes)))
+ [_ (language.assert primitives-are-not-objects from-name
+ (not (dict.contains? from-name boxes)))
+ _ (language.assert primitives-are-not-objects to-name
+ (not (dict.contains? to-name boxes)))
to-class (load-class to-name)]
(loop [[current-name currentT] [from-name valueT]]
(if (text/= to-name current-name)
@@ -695,10 +695,10 @@
(wrap true))
(do @
[current-class (load-class current-name)
- _ (lang.assert cannot-cast (format "From class/primitive: " current-name "\n"
- " To class/primitive: " to-name "\n"
- " For value: " (%code valueC) "\n")
- (Class::isAssignableFrom [current-class] to-class))
+ _ (language.assert cannot-cast (format "From class/primitive: " current-name "\n"
+ " To class/primitive: " to-name "\n"
+ " For value: " (%code valueC) "\n")
+ (Class::isAssignableFrom [current-class] to-class))
candiate-parents (monad.map @
(function (_ java-type)
(do @
@@ -717,20 +717,20 @@
(recur [next-name nextT]))
#.Nil
- (lang.throw cannot-cast (format "From class/primitive: " from-name "\n"
- " To class/primitive: " to-name "\n"
- " For value: " (%code valueC) "\n")))
+ (language.throw cannot-cast (format "From class/primitive: " from-name "\n"
+ " To class/primitive: " to-name "\n"
+ " For value: " (%code valueC) "\n")))
))))))]
(if can-cast?
(wrap (#analysisL.Extension proc (list (analysisL.text from-name)
(analysisL.text to-name)
valueA)))
- (lang.throw cannot-cast (format "From class/primitive: " from-name "\n"
- " To class/primitive: " to-name "\n"
- " For value: " (%code valueC) "\n"))))
+ (language.throw cannot-cast (format "From class/primitive: " from-name "\n"
+ " To class/primitive: " to-name "\n"
+ " For value: " (%code valueC) "\n"))))
_
- (lang.throw /.invalid-syntax [proc args]))))
+ (language.throw /.invalid-syntax [proc args]))))
(def: object-procs
/.Bundle
@@ -754,13 +754,13 @@
(let [owner (Field::getDeclaringClass [] field)]
(if (is? owner class)
(wrap [class field])
- (lang.throw mistaken-field-owner
- (format " Field: " field-name "\n"
- " Owner Class: " (Class::getName [] owner) "\n"
- "Target Class: " class-name "\n"))))
+ (language.throw mistaken-field-owner
+ (format " Field: " field-name "\n"
+ " Owner Class: " (Class::getName [] owner) "\n"
+ "Target Class: " class-name "\n"))))
(#e.Error _)
- (lang.throw unknown-field (format class-name "#" field-name)))))
+ (language.throw unknown-field (format class-name "#" field-name)))))
(def: (static-field class-name field-name)
(-> Text Text (Meta [Type Bool]))
@@ -772,7 +772,7 @@
(do @
[fieldT (java-type-to-lux-type fresh-mappings fieldJT)]
(wrap [fieldT (Modifier::isFinal [modifiers])])))
- (lang.throw not-a-static-field (format class-name "#" field-name)))))
+ (language.throw not-a-static-field (format class-name "#" field-name)))))
(def: (virtual-field class-name field-name objectT)
(-> Text Text Type (Meta [Type Bool]))
@@ -792,20 +792,20 @@
(do @
[#let [num-params (list.size _class-params)
num-vars (list.size var-names)]
- _ (lang.assert type-parameter-mismatch
- (format "Expected: " (%i (.int num-params)) "\n"
- " Actual: " (%i (.int num-vars)) "\n"
- " Class: " _class-name "\n"
- " Type: " (%type objectT))
- (n/= num-params num-vars))]
+ _ (language.assert type-parameter-mismatch
+ (format "Expected: " (%i (.int num-params)) "\n"
+ " Actual: " (%i (.int num-vars)) "\n"
+ " Class: " _class-name "\n"
+ " Type: " (%type objectT))
+ (n/= num-params num-vars))]
(wrap (|> (list.zip2 var-names _class-params)
(dict.from-list text.Hash<Text>))))
_
- (lang.throw non-object objectT)))
+ (language.throw non-object objectT)))
fieldT (java-type-to-lux-type mappings fieldJT)]
(wrap [fieldT (Modifier::isFinal [modifiers])]))
- (lang.throw not-a-virtual-field (format class-name "#" field-name)))))
+ (language.throw not-a-virtual-field (format class-name "#" field-name)))))
(def: (static//get proc)
(-> Text ///.Analysis)
@@ -819,10 +819,10 @@
(wrap (#analysisL.Extension proc (list (analysisL.text class) (analysisL.text field)))))
_
- (lang.throw /.invalid-syntax [proc args]))
+ (language.throw /.invalid-syntax [proc args]))
_
- (lang.throw /.incorrect-extension-arity [proc +2 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +2 (list.size args)]))))
(def: (static//put proc)
(-> Text ///.Analysis)
@@ -834,17 +834,17 @@
(do macro.Monad<Meta>
[_ (typeA.infer Any)
[fieldT final?] (static-field class field)
- _ (lang.assert cannot-set-a-final-field (format class "#" field)
- (not final?))
+ _ (language.assert cannot-set-a-final-field (format class "#" field)
+ (not final?))
valueA (typeA.with-type fieldT
(analyse valueC))]
(wrap (#analysisL.Extension proc (list (analysisL.text class) (analysisL.text field) valueA))))
_
- (lang.throw /.invalid-syntax [proc args]))
+ (language.throw /.invalid-syntax [proc args]))
_
- (lang.throw /.incorrect-extension-arity [proc +3 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +3 (list.size args)]))))
(def: (virtual//get proc)
(-> Text ///.Analysis)
@@ -860,10 +860,10 @@
(wrap (#analysisL.Extension proc (list (analysisL.text class) (analysisL.text field) objectA))))
_
- (lang.throw /.invalid-syntax [proc args]))
+ (language.throw /.invalid-syntax [proc args]))
_
- (lang.throw /.incorrect-extension-arity [proc +3 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +3 (list.size args)]))))
(def: (virtual//put proc)
(-> Text ///.Analysis)
@@ -877,17 +877,17 @@
(analyse objectC))
_ (typeA.infer objectT)
[fieldT final?] (virtual-field class field objectT)
- _ (lang.assert cannot-set-a-final-field (format class "#" field)
- (not final?))
+ _ (language.assert cannot-set-a-final-field (format class "#" field)
+ (not final?))
valueA (typeA.with-type fieldT
(analyse valueC))]
(wrap (#analysisL.Extension proc (list (analysisL.text class) (analysisL.text field) valueA objectA))))
_
- (lang.throw /.invalid-syntax [proc args]))
+ (language.throw /.invalid-syntax [proc args]))
_
- (lang.throw /.incorrect-extension-arity [proc +4 (list.size args)]))))
+ (language.throw /.incorrect-extension-arity [proc +4 (list.size args)]))))
(def: (java-type-to-parameter type)
(-> java/lang/reflect/Type (Meta Text))
@@ -907,7 +907,7 @@
(wrap (format componentP "[]")))
## else
- (lang.throw cannot-convert-to-a-parameter (jvm-type-name type))))
+ (language.throw cannot-convert-to-a-parameter (jvm-type-name type))))
(type: Method-style
#Static
@@ -1056,17 +1056,17 @@
#Fail)))))))]
(case (list.search-all pass! candidates)
#.Nil
- (lang.throw no-candidates [class-name method-name
- (|> candidates
- (list.search-all hint!)
- (list/map (method-to-type method-style)))])
+ (language.throw no-candidates [class-name method-name
+ (|> candidates
+ (list.search-all hint!)
+ (list/map (method-to-type method-style)))])
(#.Cons method #.Nil)
(method-to-type method-style method)
candidates
- (lang.throw too-many-candidates [class-name method-name
- (list/map (method-to-type method-style) candidates)]))))
+ (language.throw too-many-candidates [class-name method-name
+ (list/map (method-to-type method-style) candidates)]))))
(def: (constructor-to-type constructor)
(-> (Constructor Object) (Meta [Type (List Type)]))
@@ -1118,17 +1118,17 @@
(wrap [passes? constructor])))))]
(case (list.search-all pass! candidates)
#.Nil
- (lang.throw no-candidates [class-name ..constructor-method
- (|> candidates
- (list.search-all hint!)
- (list/map constructor-to-type))])
+ (language.throw no-candidates [class-name ..constructor-method
+ (|> candidates
+ (list.search-all hint!)
+ (list/map constructor-to-type))])
(#.Cons constructor #.Nil)
(constructor-to-type constructor)
candidates
- (lang.throw too-many-candidates [class-name ..constructor-method
- (list/map constructor-to-type candidates)]))))
+ (language.throw too-many-candidates [class-name ..constructor-method
+ (list/map constructor-to-type candidates)]))))
(def: (decorate-inputs typesT inputsA)
(-> (List Text) (List Analysis) (List Analysis))
@@ -1152,7 +1152,7 @@
(analysisL.text outputJC) (decorate-inputs argsT argsA)))))
_
- (lang.throw /.invalid-syntax [proc args]))))
+ (language.throw /.invalid-syntax [proc args]))))
(def: (invoke//virtual proc)
(-> Text ///.Analysis)
@@ -1175,7 +1175,7 @@
(analysisL.text outputJC) objectA (decorate-inputs argsT argsA)))))
_
- (lang.throw /.invalid-syntax [proc args]))))
+ (language.throw /.invalid-syntax [proc args]))))
(def: (invoke//special proc)
(-> Text ///.Analysis)
@@ -1192,7 +1192,7 @@
(analysisL.text outputJC) (decorate-inputs argsT argsA)))))
_
- (lang.throw /.invalid-syntax [proc args]))))
+ (language.throw /.invalid-syntax [proc args]))))
(def: (invoke//interface proc)
(-> Text ///.Analysis)
@@ -1203,8 +1203,8 @@
(do macro.Monad<Meta>
[#let [argsT (list/map product.left argsTC)]
class (load-class class-name)
- _ (lang.assert non-interface class-name
- (Modifier::isInterface [(Class::getModifiers [] class)]))
+ _ (language.assert non-interface class-name
+ (Modifier::isInterface [(Class::getModifiers [] class)]))
[methodT exceptionsT] (method-candidate class-name method #Interface argsT)
[outputT argsA] (inferenceA.general analyse methodT (list& objectC (list/map product.right argsTC)))
outputJC (check-jvm outputT)]
@@ -1213,7 +1213,7 @@
(decorate-inputs argsT argsA)))))
_
- (lang.throw /.invalid-syntax [proc args]))))
+ (language.throw /.invalid-syntax [proc args]))))
(def: (invoke//constructor proc)
(-> Text ///.Analysis)
@@ -1228,7 +1228,7 @@
(wrap (#analysisL.Extension proc (list& (analysisL.text class) (decorate-inputs argsT argsA)))))
_
- (lang.throw /.invalid-syntax [proc args]))))
+ (language.throw /.invalid-syntax [proc args]))))
(def: member-procs
/.Bundle
diff --git a/stdlib/source/lux/lang/compiler/extension/bundle.lux b/stdlib/source/lux/language/compiler/extension/bundle.lux
index 4e011d2ca..4e011d2ca 100644
--- a/stdlib/source/lux/lang/compiler/extension/bundle.lux
+++ b/stdlib/source/lux/language/compiler/extension/bundle.lux
diff --git a/stdlib/source/lux/lang/compiler/extension/synthesis.lux b/stdlib/source/lux/language/compiler/extension/synthesis.lux
index 48073d012..48073d012 100644
--- a/stdlib/source/lux/lang/compiler/extension/synthesis.lux
+++ b/stdlib/source/lux/language/compiler/extension/synthesis.lux
diff --git a/stdlib/source/lux/lang/compiler/extension/translation.lux b/stdlib/source/lux/language/compiler/extension/translation.lux
index ae05fd61c..ae05fd61c 100644
--- a/stdlib/source/lux/lang/compiler/extension/translation.lux
+++ b/stdlib/source/lux/language/compiler/extension/translation.lux
diff --git a/stdlib/source/lux/lang/compiler/init.lux b/stdlib/source/lux/language/compiler/init.lux
index 92a066b7e..92a066b7e 100644
--- a/stdlib/source/lux/lang/compiler/init.lux
+++ b/stdlib/source/lux/language/compiler/init.lux
diff --git a/stdlib/source/lux/lang/compiler/meta/archive.lux b/stdlib/source/lux/language/compiler/meta/archive.lux
index 53c3baa65..b8c38928c 100644
--- a/stdlib/source/lux/lang/compiler/meta/archive.lux
+++ b/stdlib/source/lux/language/compiler/meta/archive.lux
@@ -8,7 +8,7 @@
[text]
text/format
(collection ["dict" dictionary #+ Dictionary]))
- (lang [type #+ :share])
+ (language [type #+ :share])
(type abstract)
(world [file #+ File]))
[//// #+ Version])
diff --git a/stdlib/source/lux/lang/compiler/meta/cache.lux b/stdlib/source/lux/language/compiler/meta/cache.lux
index 7c6b558db..7c6b558db 100644
--- a/stdlib/source/lux/lang/compiler/meta/cache.lux
+++ b/stdlib/source/lux/language/compiler/meta/cache.lux
diff --git a/stdlib/source/lux/lang/compiler/meta/cache/dependency.lux b/stdlib/source/lux/language/compiler/meta/cache/dependency.lux
index f489f04ed..f489f04ed 100644
--- a/stdlib/source/lux/lang/compiler/meta/cache/dependency.lux
+++ b/stdlib/source/lux/language/compiler/meta/cache/dependency.lux
diff --git a/stdlib/source/lux/lang/compiler/meta/io.lux b/stdlib/source/lux/language/compiler/meta/io.lux
index e440c16f9..e440c16f9 100644
--- a/stdlib/source/lux/lang/compiler/meta/io.lux
+++ b/stdlib/source/lux/language/compiler/meta/io.lux
diff --git a/stdlib/source/lux/lang/compiler/meta/io/archive.lux b/stdlib/source/lux/language/compiler/meta/io/archive.lux
index 534c9e20c..534c9e20c 100644
--- a/stdlib/source/lux/lang/compiler/meta/io/archive.lux
+++ b/stdlib/source/lux/language/compiler/meta/io/archive.lux
diff --git a/stdlib/source/lux/lang/compiler/meta/io/context.lux b/stdlib/source/lux/language/compiler/meta/io/context.lux
index 327f52cf5..327f52cf5 100644
--- a/stdlib/source/lux/lang/compiler/meta/io/context.lux
+++ b/stdlib/source/lux/language/compiler/meta/io/context.lux
diff --git a/stdlib/source/lux/lang/compiler/synthesis.lux b/stdlib/source/lux/language/compiler/synthesis.lux
index 36db1fe5e..36db1fe5e 100644
--- a/stdlib/source/lux/lang/compiler/synthesis.lux
+++ b/stdlib/source/lux/language/compiler/synthesis.lux
diff --git a/stdlib/source/lux/lang/compiler/synthesis/case.lux b/stdlib/source/lux/language/compiler/synthesis/case.lux
index 5fca60a99..5fca60a99 100644
--- a/stdlib/source/lux/lang/compiler/synthesis/case.lux
+++ b/stdlib/source/lux/language/compiler/synthesis/case.lux
diff --git a/stdlib/source/lux/lang/compiler/synthesis/expression.lux b/stdlib/source/lux/language/compiler/synthesis/expression.lux
index 6db9a8fd5..6db9a8fd5 100644
--- a/stdlib/source/lux/lang/compiler/synthesis/expression.lux
+++ b/stdlib/source/lux/language/compiler/synthesis/expression.lux
diff --git a/stdlib/source/lux/lang/compiler/synthesis/function.lux b/stdlib/source/lux/language/compiler/synthesis/function.lux
index ae7b5c3b3..ae7b5c3b3 100644
--- a/stdlib/source/lux/lang/compiler/synthesis/function.lux
+++ b/stdlib/source/lux/language/compiler/synthesis/function.lux
diff --git a/stdlib/source/lux/lang/compiler/synthesis/loop.lux b/stdlib/source/lux/language/compiler/synthesis/loop.lux
index e4722ee1f..e4722ee1f 100644
--- a/stdlib/source/lux/lang/compiler/synthesis/loop.lux
+++ b/stdlib/source/lux/language/compiler/synthesis/loop.lux
diff --git a/stdlib/source/lux/lang/compiler/translation.lux b/stdlib/source/lux/language/compiler/translation.lux
index 8791c8d5e..8791c8d5e 100644
--- a/stdlib/source/lux/lang/compiler/translation.lux
+++ b/stdlib/source/lux/language/compiler/translation.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux
index 39b5bdae1..39b5bdae1 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/case.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/expression.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux
index a654fe4d0..a654fe4d0 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/expression.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/extension.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux
index 9fa0abc55..9fa0abc55 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/extension.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/extension/common.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux
index 11743b076..11743b076 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/extension/common.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/function.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux
index 1ac433ec4..1ac433ec4 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/function.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/loop.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux
index f77f7cf10..f77f7cf10 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/loop.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/primitive.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux
index e78df5b74..e78df5b74 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/primitive.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/reference.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux
index e1cb6a642..e1cb6a642 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/reference.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/runtime.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux
index 89707cdc4..89707cdc4 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/runtime.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux
diff --git a/stdlib/source/lux/lang/compiler/translation/scheme/structure.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux
index c3b93e7a1..c3b93e7a1 100644
--- a/stdlib/source/lux/lang/compiler/translation/scheme/structure.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux
diff --git a/stdlib/source/lux/lang/host.lux b/stdlib/source/lux/language/host.lux
index 218de67a4..218de67a4 100644
--- a/stdlib/source/lux/lang/host.lux
+++ b/stdlib/source/lux/language/host.lux
diff --git a/stdlib/source/lux/lang/host/scheme.lux b/stdlib/source/lux/language/host/scheme.lux
index 93d1b2017..93d1b2017 100644
--- a/stdlib/source/lux/lang/host/scheme.lux
+++ b/stdlib/source/lux/language/host/scheme.lux
diff --git a/stdlib/source/lux/lang/module.lux b/stdlib/source/lux/language/module.lux
index dbb1cc0ea..dbb1cc0ea 100644
--- a/stdlib/source/lux/lang/module.lux
+++ b/stdlib/source/lux/language/module.lux
diff --git a/stdlib/source/lux/lang/name.lux b/stdlib/source/lux/language/name.lux
index 1053eb76f..1053eb76f 100644
--- a/stdlib/source/lux/lang/name.lux
+++ b/stdlib/source/lux/language/name.lux
diff --git a/stdlib/source/lux/lang/reference.lux b/stdlib/source/lux/language/reference.lux
index 43c8f0d48..43c8f0d48 100644
--- a/stdlib/source/lux/lang/reference.lux
+++ b/stdlib/source/lux/language/reference.lux
diff --git a/stdlib/source/lux/lang/scope.lux b/stdlib/source/lux/language/scope.lux
index 9cb1de1c2..9cb1de1c2 100644
--- a/stdlib/source/lux/lang/scope.lux
+++ b/stdlib/source/lux/language/scope.lux
diff --git a/stdlib/source/lux/lang/syntax.lux b/stdlib/source/lux/language/syntax.lux
index b9214ca11..b9214ca11 100644
--- a/stdlib/source/lux/lang/syntax.lux
+++ b/stdlib/source/lux/language/syntax.lux
diff --git a/stdlib/source/lux/lang/type.lux b/stdlib/source/lux/language/type.lux
index b7e04afa4..b7e04afa4 100644
--- a/stdlib/source/lux/lang/type.lux
+++ b/stdlib/source/lux/language/type.lux
diff --git a/stdlib/source/lux/lang/type/check.lux b/stdlib/source/lux/language/type/check.lux
index 84b9f808d..5fb8da617 100644
--- a/stdlib/source/lux/lang/type/check.lux
+++ b/stdlib/source/lux/language/type/check.lux
@@ -11,7 +11,7 @@
(collection [list]
[set #+ Set])
["e" error])
- (lang [type "type/" Equivalence<Type>])
+ (language [type "type/" Equivalence<Type>])
))
(exception: #export (unknown-type-var {id Nat})
diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/lux/macro/poly.lux
index 05f800653..45e2aa900 100644
--- a/stdlib/source/lux/macro/poly.lux
+++ b/stdlib/source/lux/macro/poly.lux
@@ -20,8 +20,8 @@
(syntax ["cs" common]
(common ["csr" reader]
["csw" writer])))
- (lang [type "type/" Equivalence<Type>]
- (type [check]))
+ (language [type "type/" Equivalence<Type>]
+ (type [check]))
))
(type: #export Env (Dictionary Nat [Type Code]))
diff --git a/stdlib/source/lux/macro/poly/equivalence.lux b/stdlib/source/lux/macro/poly/equivalence.lux
index a01f70c74..00ffa3257 100644
--- a/stdlib/source/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/lux/macro/poly/equivalence.lux
@@ -25,7 +25,7 @@
(syntax [common])
[poly #+ poly:])
(type [unit])
- (lang [type])
+ (language [type])
))
## [Derivers]
diff --git a/stdlib/source/lux/macro/poly/functor.lux b/stdlib/source/lux/macro/poly/functor.lux
index c7a000e61..ae1611c55 100644
--- a/stdlib/source/lux/macro/poly/functor.lux
+++ b/stdlib/source/lux/macro/poly/functor.lux
@@ -12,7 +12,7 @@
[syntax #+ syntax: Syntax]
(syntax [common])
[poly #+ poly:])
- (lang [type])
+ (language [type])
))
(poly: #export Functor<?>
diff --git a/stdlib/source/lux/macro/poly/json.lux b/stdlib/source/lux/macro/poly/json.lux
index 1414bb38c..4ac28a2a5 100644
--- a/stdlib/source/lux/macro/poly/json.lux
+++ b/stdlib/source/lux/macro/poly/json.lux
@@ -26,7 +26,7 @@
[code]
[poly #+ poly:])
(type [unit])
- (lang [type])
+ (language [type])
))
(def: tag
diff --git a/stdlib/source/lux/type/abstract.lux b/stdlib/source/lux/type/abstract.lux
index 28c90bbc8..10095805f 100644
--- a/stdlib/source/lux/type/abstract.lux
+++ b/stdlib/source/lux/type/abstract.lux
@@ -11,7 +11,7 @@
(syntax ["cs" common]
(common ["csr" reader]
["csw" writer])))
- (lang [type #+ :cast])))
+ (language [type #+ :cast])))
(def: (get k plist)
(All [a]
diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux
index ea82200df..12dee41b4 100644
--- a/stdlib/source/lux/type/implicit.lux
+++ b/stdlib/source/lux/type/implicit.lux
@@ -14,8 +14,8 @@
[macro #+ Monad<Meta>]
(macro [code]
["s" syntax #+ syntax: Syntax])
- (lang [type]
- (type ["tc" check #+ Check]))
+ (language [type]
+ (type ["tc" check #+ Check]))
))
(def: (find-type-var id env)
diff --git a/stdlib/source/lux/type/object/interface.lux b/stdlib/source/lux/type/object/interface.lux
index f48ccab0a..d6a31d1f8 100644
--- a/stdlib/source/lux/type/object/interface.lux
+++ b/stdlib/source/lux/type/object/interface.lux
@@ -15,7 +15,7 @@
(syntax ["cs" common]
(common ["csr" reader]
["csw" writer])))
- (lang [type])))
+ (language [type])))
## [Common]
(type: Declaration
diff --git a/stdlib/source/lux/type/quotient.lux b/stdlib/source/lux/type/quotient.lux
index 35e681159..958e5eda9 100644
--- a/stdlib/source/lux/type/quotient.lux
+++ b/stdlib/source/lux/type/quotient.lux
@@ -3,7 +3,7 @@
(lux (control [monad #+ do]
["p" parser])
(data ["e" error #+ Error])
- (lang [type])
+ (language [type])
(type abstract)
[macro]
(macro ["s" syntax #+ syntax:]
diff --git a/stdlib/source/lux/type/refinement.lux b/stdlib/source/lux/type/refinement.lux
index 7833e3db0..d7de1a67a 100644
--- a/stdlib/source/lux/type/refinement.lux
+++ b/stdlib/source/lux/type/refinement.lux
@@ -4,7 +4,7 @@
[monad #+ do]
["p" parser])
(data ["e" error #+ Error])
- (lang [type "type/" Equivalence<Type>])
+ (language [type "type/" Equivalence<Type>])
(type abstract)
[macro]
(macro ["s" syntax #+ syntax:]
diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/lux/world/file.lux
index de93d940a..3ff1fc4a8 100644
--- a/stdlib/source/lux/world/file.lux
+++ b/stdlib/source/lux/world/file.lux
@@ -11,7 +11,7 @@
(world [blob #+ Blob])
[io #+ Process]
[host #+ import:]
- [lang/host]))
+ [language/host]))
(type: #export File Text)
@@ -95,7 +95,7 @@
(ex.report ["Instant" (%instant instant)]
["File" file]))
-(`` (for {(~~ (static lang/host.jvm))
+(`` (for {(~~ (static language/host.jvm))
(as-is (import: #long java/io/File
(new [String])
(exists [] #io #try boolean)
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))