- Moved "luxc/lang/syntax" to "lux/lang/syntax".

- Minor refactoring.

7 files changed, 32 insertions, 33 deletions

diff --git a/new-luxc/test/test/luxc/lang/analysis/case.lux b/new-luxc/test/test/luxc/lang/analysis/case.lux
index ee8b9b74d..6d34ef4c5 100644
--- a/new-luxc/test/test/luxc/lang/analysis/case.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/case.lux
@@ -169,7 +169,7 @@
         ($_ seq
             (test "Will reject empty pattern-matching (no branches)."
                   (|> (&;with-scope
-                        (&;with-expected-type outputT
+                        (&;with-type outputT
                           (@;analyse-case analyse inputC (list))))
                       check-failure))
             (test "Can analyse exhaustive pattern-matching."
@@ -182,7 +182,7 @@
                                                    (#;Named [module-name record-name]
                                                             (type;tuple primitivesT)))]
                           (&;with-scope
-                            (&;with-expected-type outputT
+                            (&;with-type outputT
                               (@;analyse-case analyse inputC exhaustive-branchesC)))))
                       check-success))
             (test "Will reject non-exhaustive pattern-matching."
@@ -195,7 +195,7 @@
                                                    (#;Named [module-name record-name]
                                                             (type;tuple primitivesT)))]
                           (&;with-scope
-                            (&;with-expected-type outputT
+                            (&;with-type outputT
                               (@;analyse-case analyse inputC non-exhaustive-branchesC)))))
                       check-failure))
             (test "Will reject redundant pattern-matching."
@@ -208,7 +208,7 @@
                                                    (#;Named [module-name record-name]
                                                             (type;tuple primitivesT)))]
                           (&;with-scope
-                            (&;with-expected-type outputT
+                            (&;with-type outputT
                               (@;analyse-case analyse inputC redundant-branchesC)))))
                       check-failure))
             (test "Will reject pattern-matching if the bodies of the branches do not all have the same type."
@@ -221,7 +221,7 @@
                                                    (#;Named [module-name record-name]
                                                             (type;tuple primitivesT)))]
                           (&;with-scope
-                            (&;with-expected-type outputT
+                            (&;with-type outputT
                               (@;analyse-case analyse inputC heterogeneous-branchesC)))))
                       check-failure))
             ))))
diff --git a/new-luxc/test/test/luxc/lang/analysis/function.lux b/new-luxc/test/test/luxc/lang/analysis/function.lux
index e08e7a9bd..6cddfebd2 100644
--- a/new-luxc/test/test/luxc/lang/analysis/function.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/function.lux
@@ -72,16 +72,16 @@
          [inputT _] gen-primitive]
         ($_ seq
             (test "Can analyse function."
-                  (|> (&;with-expected-type (type (All [a] (-> a outputT)))
+                  (|> (&;with-type (type (All [a] (-> a outputT)))
                         (@;analyse-function analyse func-name arg-name outputC))
                       (meta;run (init-compiler []))
                       succeeds?))
             (test "Generic functions can always be specialized."
-                  (and (|> (&;with-expected-type (-> inputT outputT)
+                  (and (|> (&;with-type (-> inputT outputT)
                              (@;analyse-function analyse func-name arg-name outputC))
                            (meta;run (init-compiler []))
                            succeeds?)
-                       (|> (&;with-expected-type (-> inputT inputT)
+                       (|> (&;with-type (-> inputT inputT)
                              (@;analyse-function analyse func-name arg-name (code;symbol ["" arg-name])))
                            (meta;run (init-compiler []))
                            succeeds?)))
@@ -96,7 +96,7 @@
                       (meta;run (init-compiler []))
                       (check-type (type (All [a] (-> a a))))))
             (test "The function's name is bound to the function's type."
-                  (|> (&;with-expected-type (type (Rec self (-> inputT self)))
+                  (|> (&;with-type (type (Rec self (-> inputT self)))
                         (@;analyse-function analyse func-name arg-name (code;symbol ["" func-name])))
                       (meta;run (init-compiler []))
                       succeeds?))
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 dae39228f..3420ebb4d 100644
--- a/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
@@ -28,7 +28,7 @@
   [(def: (<name> procedure params output-type)
      (-> Text (List Code) Type Bool)
      (|> (&;with-scope
-           (&;with-expected-type output-type
+           (&;with-type output-type
              (@;analyse-procedure analyse evalL;eval procedure params)))
          (meta;run (init-compiler []))
          (case> (#e;Success _)
@@ -262,7 +262,7 @@
             (test "Can get a value inside an array."
                   (|> (&scope;with-scope ""
                         (&scope;with-local [var-name arrayT]
-                          (&;with-expected-type elemT
+                          (&;with-type elemT
                             (@;analyse-procedure analyse evalL;eval "lux array get"
                                                  (list idxC
                                                        (code;symbol ["" var-name]))))))
@@ -275,7 +275,7 @@
             (test "Can put a value inside an array."
                   (|> (&scope;with-scope ""
                         (&scope;with-local [var-name arrayT]
-                          (&;with-expected-type arrayT
+                          (&;with-type arrayT
                             (@;analyse-procedure analyse evalL;eval "lux array put"
                                                  (list idxC
                                                        elemC
@@ -289,7 +289,7 @@
             (test "Can remove a value from an array."
                   (|> (&scope;with-scope ""
                         (&scope;with-local [var-name arrayT]
-                          (&;with-expected-type arrayT
+                          (&;with-type arrayT
                             (@;analyse-procedure analyse evalL;eval "lux array remove"
                                                  (list idxC
                                                        (code;symbol ["" var-name]))))))
@@ -302,7 +302,7 @@
             (test "Can query the size of an array."
                   (|> (&scope;with-scope ""
                         (&scope;with-local [var-name arrayT]
-                          (&;with-expected-type Nat
+                          (&;with-type Nat
                             (@;analyse-procedure analyse evalL;eval "lux array size"
                                                  (list (code;symbol ["" var-name]))))))
                       (meta;run (init-compiler []))
@@ -362,7 +362,7 @@
             (test "Can read the value of an atomic reference."
                   (|> (&scope;with-scope ""
                         (&scope;with-local [var-name atomT]
-                          (&;with-expected-type elemT
+                          (&;with-type elemT
                             (@;analyse-procedure analyse evalL;eval "lux atom read"
                                                  (list (code;symbol ["" var-name]))))))
                       (meta;run (init-compiler []))
@@ -374,7 +374,7 @@
             (test "Can swap the value of an atomic reference."
                   (|> (&scope;with-scope ""
                         (&scope;with-local [var-name atomT]
-                          (&;with-expected-type Bool
+                          (&;with-type Bool
                             (@;analyse-procedure analyse evalL;eval "lux atom compare-and-swap"
                                                  (list elemC
                                                        elemC
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 3d5da350a..783174777 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
@@ -36,7 +36,7 @@
      (|> (do Monad<Meta>
            [runtime-bytecode @runtime;translate]
            (&;with-scope
-             (&;with-expected-type output-type
+             (&;with-type output-type
                (@;analyse-procedure analyse evalL;eval procedure params))))
          (meta;run (init-compiler []))
          (case> (#e;Success _)
diff --git a/new-luxc/test/test/luxc/lang/analysis/structure.lux b/new-luxc/test/test/luxc/lang/analysis/structure.lux
index b299872ca..8cc95fd88 100644
--- a/new-luxc/test/test/luxc/lang/analysis/structure.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/structure.lux
@@ -45,7 +45,7 @@
         ($_ seq
             (test "Can analyse sum."
                   (|> (&;with-scope
-                        (&;with-expected-type variantT
+                        (&;with-type variantT
                           (@;analyse-sum analyse choice valueC)))
                       (meta;run (init-compiler []))
                       (case> (^multi (#e;Success [_ sumA])
@@ -62,7 +62,7 @@
                           [[_ varT] (&;with-type-env tc;var)
                            _ (&;with-type-env
                                (tc;check varT variantT))]
-                          (&;with-expected-type varT
+                          (&;with-type varT
                             (@;analyse-sum analyse choice valueC))))
                       (meta;run (init-compiler []))
                       (case> (^multi (#e;Success [_ sumA])
@@ -77,7 +77,7 @@
                   (|> (&;with-scope
                         (do meta;Monad<Meta>
                           [[_ varT] (&;with-type-env tc;var)]
-                          (&;with-expected-type varT
+                          (&;with-type varT
                             (@;analyse-sum analyse choice valueC))))
                       (meta;run (init-compiler []))
                       (case> (#e;Success _)
@@ -87,7 +87,7 @@
                              true)))
             (test "Can analyse sum through existential quantification."
                   (|> (&;with-scope
-                        (&;with-expected-type (type;ex-q +1 +variantT)
+                        (&;with-type (type;ex-q +1 +variantT)
                           (@;analyse-sum analyse +choice +valueC)))
                       (meta;run (init-compiler []))
                       (case> (#e;Success _)
@@ -97,7 +97,7 @@
                              false)))
             (test "Can analyse sum through universal quantification."
                   (|> (&;with-scope
-                        (&;with-expected-type (type;univ-q +1 +variantT)
+                        (&;with-type (type;univ-q +1 +variantT)
                           (@;analyse-sum analyse +choice +valueC)))
                       (meta;run (init-compiler []))
                       (case> (#e;Success _)
@@ -121,7 +121,7 @@
                +tupleT (type;tuple (list/map product;left +primitives))]]
         ($_ seq
             (test "Can analyse product."
-                  (|> (&;with-expected-type (type;tuple (list/map product;left primitives))
+                  (|> (&;with-type (type;tuple (list/map product;left primitives))
                         (@;analyse-product analyse (list/map product;right primitives)))
                       (meta;run (init-compiler []))
                       (case> (#e;Success tupleA)
@@ -141,7 +141,7 @@
                              _
                              false)))
             (test "Can analyse pseudo-product (singleton tuple)"
-                  (|> (&;with-expected-type singletonT
+                  (|> (&;with-type singletonT
                         (analyse (` [(~ singletonC)])))
                       (meta;run (init-compiler []))
                       (case> (#e;Success singletonA)
@@ -155,7 +155,7 @@
                           [[_ varT] (&;with-type-env tc;var)
                            _ (&;with-type-env
                                (tc;check varT (type;tuple (list/map product;left primitives))))]
-                          (&;with-expected-type varT
+                          (&;with-type varT
                             (@;analyse-product analyse (list/map product;right primitives)))))
                       (meta;run (init-compiler []))
                       (case> (#e;Success [_ tupleA])
@@ -165,7 +165,7 @@
                              false)))
             (test "Can analyse product through existential quantification."
                   (|> (&;with-scope
-                        (&;with-expected-type (type;ex-q +1 +tupleT)
+                        (&;with-type (type;ex-q +1 +tupleT)
                           (@;analyse-product analyse (list/map product;right +primitives))))
                       (meta;run (init-compiler []))
                       (case> (#e;Success _)
@@ -175,7 +175,7 @@
                              false)))
             (test "Cannot analyse product through universal quantification."
                   (|> (&;with-scope
-                        (&;with-expected-type (type;univ-q +1 +tupleT)
+                        (&;with-type (type;univ-q +1 +tupleT)
                           (@;analyse-product analyse (list/map product;right +primitives))))
                       (meta;run (init-compiler []))
                       (case> (#e;Success _)
@@ -265,7 +265,7 @@
                         (do meta;Monad<Meta>
                           [_ (@module;declare-tags tags false named-polyT)]
                           (&;with-scope
-                            (&;with-expected-type variantT
+                            (&;with-type variantT
                               (@;analyse-tagged-sum analyse [module-name other-choice-tag] other-choiceC)))))
                       (meta;run (init-compiler []))
                       (case> (^multi (#e;Success [_ _ sumA])
@@ -321,7 +321,7 @@
                         (do meta;Monad<Meta>
                           [_ (@module;declare-tags tags false named-polyT)]
                           (&;with-scope
-                            (&;with-expected-type tupleT
+                            (&;with-type tupleT
                               (@;analyse-record analyse recordC)))))
                       (meta;run (init-compiler []))
                       (case> (^multi (#e;Success [_ _ productA])
diff --git a/new-luxc/test/tests.lux b/new-luxc/test/tests.lux
index 88d89ad90..b36782517 100644
--- a/new-luxc/test/tests.lux
+++ b/new-luxc/test/tests.lux
@@ -5,8 +5,7 @@
        (concurrency [promise])
        [cli #+ program:]
        [test])
-  (test (luxc (lang ["_;L" syntax]
-                    (analysis ["_;A" primitive]
+  (test (luxc (lang (analysis ["_;A" primitive]
                               ["_;A" structure]
                               ["_;A" reference]
                               ["_;A" case]
diff --git a/new-luxc/test/test/luxc/lang/syntax.lux b/stdlib/test/test/lux/lang/syntax.lux
index 0f2306eb1..4db181cae 100644
--- a/new-luxc/test/test/luxc/lang/syntax.lux
+++ b/stdlib/test/test/lux/lang/syntax.lux
@@ -10,8 +10,8 @@
              (coll [list]))
        ["r" math/random "r/" Monad<Random>]
        (meta [code])
-       test)
-  (luxc (lang ["&" syntax])))
+       (lang ["&" syntax])
+       test))
 
 (def: default-cursor
   Cursor