Turned I64 and variant creation functions into constructors for JS.

1 files changed, 62 insertions, 55 deletions

diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index 2fb01ad72..f1200381a 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -1,42 +1,46 @@
-(.module:
-  ["/" lux #*
-   [program (#+ program:)]
-   ["_" test (#+ Test)]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]
-    [predicate (#+ Predicate)]]
-   [control
-    ["." io (#+ io)]]
-   [data
-    ["." name]
-    [text
-     ["%" format (#+ format)]]]
-   ["." math
-    ["." random (#+ Random) ("#\." functor)]
-    [number
-     ["n" nat]
-     ["i" int]
-     ["r" rev]
-     ["f" frac]
-     ["." i64]]]]
-  ## TODO: Must have 100% coverage on tests.
-  ["." / #_
-   ["#." abstract]
-   ["#." control]
-   ["#." data]
-   ["#." locale]
-   ["#." macro]
-   ["#." math]
-   ["#." meta]
-   ["#." time]
-   ## ["#." tool]
-   ["#." type]
-   ["#." world]
-   ["#." host]
-   ["#." extension]
-   ["#." target #_
-    ["#/." jvm]]])
+(.with_expansions [<target>' (.for {"{old}" (.as_is ["#/." jvm])
+                                    "JVM" (.as_is ["#/." jvm])}
+                                   (.as_is))
+                   <target> <target>']
+  (.module:
+    ["/" lux #*
+     [program (#+ program:)]
+     ["_" test (#+ Test)]
+     ["@" target]
+     [abstract
+      [monad (#+ do)]
+      [predicate (#+ Predicate)]]
+     [control
+      ["." io (#+ io)]]
+     [data
+      ["." name]
+      [text
+       ["%" format (#+ format)]]]
+     ["." math
+      ["." random (#+ Random) ("#\." functor)]
+      [number
+       ["n" nat]
+       ["i" int]
+       ["r" rev]
+       ["f" frac]
+       ["." i64]]]]
+    ## TODO: Must have 100% coverage on tests.
+    ["." / #_
+     ["#." abstract]
+     ["#." control]
+     ["#." data]
+     ["#." locale]
+     ["#." macro]
+     ["#." math]
+     ["#." meta]
+     ["#." time]
+     ## ["#." tool]
+     ["#." type]
+     ["#." world]
+     ["#." host]
+     ["#." extension]
+     ["#." target #_
+      <target>]]))
 
 ## TODO: Get rid of this ASAP
 (template: (!bundle body)
@@ -211,22 +215,25 @@
 
 (def: sub_tests
   Test
-  (_.in_parallel (list& /abstract.test
-                        /control.test
-                        /data.test
-                        /locale.test
-                        /macro.test
-                        /math.test
-                        /meta.test
-                        /time.test
-                        ## /tool.test
-                        /type.test
-                        /world.test
-                        /host.test
-                        /target/jvm.test
-                        (for {@.old (list)}
-                             (list /extension.test))
-                        )))
+  (let [tail (: (List Test)
+                (for {@.old (list)}
+                     (list /extension.test)))]
+    (_.in_parallel (list& /abstract.test
+                          /control.test
+                          /data.test
+                          /locale.test
+                          /macro.test
+                          /math.test
+                          /meta.test
+                          /time.test
+                          ## /tool.test
+                          /type.test
+                          /world.test
+                          /host.test
+                          (for {@.jvm (#.Cons /target/jvm.test tail)
+                                @.old (#.Cons /target/jvm.test tail)}
+                               tail)
+                          ))))
 
 (def: test
   (<| (_.context (name.module (name_of /._)))