Got the JS compiler code to build again.

1 files changed, 136 insertions, 150 deletions

diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index e2d9fb258..8ce6b58b5 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -1,153 +1,139 @@
-(.with-expansions [<host-modules> (.as-is [runtime (#+)]
-                                          [primitive (#+)]
-                                          [structure (#+)]
-                                          [reference (#+)]
-                                          [case (#+)]
-                                          [loop (#+)]
-                                          [function (#+)]
-                                          [extension (#+)])]
-  (.module:
-    ["/" lux #*
-     [abstract
-      [monad (#+ do)]
-      [predicate (#+ Predicate)]]
-     [control
-      ["." io (#+ io)]
-      [function
-       [mixin (#+)]]
-      [parser
-       [cli (#+ program:)]]]
-     [data
-      ["." name]
-      [number
-       ["." i64]
-       ["n" nat]
-       ["i" int]
-       ["r" rev]
-       ["f" frac]]]
-     ["." math]
-     ["_" test (#+ Test)]
-     ## These modules do not need to be tested.
-     [type
-      [variance (#+)]]
-     [locale (#+)
-      [language (#+)]
-      [territory (#+)]]
-     ["%" data/text/format (#+ format)]
-     [math
-      ["." random (#+ Random) ("#@." functor)]]
-     ## TODO: Test these modules
-     [data
-      [format
-       [css (#+)]
-       [markdown (#+)]]]
-     ["@" target
-      [js (#+)]
-      [python (#+)]
-      [lua (#+)]
-      [ruby (#+)]
-      [php (#+)]
-      [common-lisp (#+)]
-      [scheme (#+)]]
-     ## [tool
-     ##  [compiler
-     ##   [language
-     ##    [lux
-     ##     [phase
-     ##      [generation
-     ##       [jvm (#+)
-     ##        <host-modules>]
-     ##       [js (#+)
-     ##        <host-modules>]
-     ##       [python (#+)
-     ##        <host-modules>]
-     ##       [lua (#+)
-     ##        <host-modules>]
-     ##       [ruby (#+)
-     ##        <host-modules>]
-     ##       ## [php (#+)
-     ##       ##  <host-modules>]
-     ##       ## [common-lisp (#+)
-     ##       ##  <host-modules>]
-     ##       ## [scheme (#+)
-     ##       ##  <host-modules>]
-     ##       ]
-     ##      [extension
-     ##       [generation
-     ##        [jvm (#+)]
-     ##        [js (#+)]
-     ##        [python (#+)]
-     ##        [lua (#+)]
-     ##        [ruby (#+)]]]]]]]]
-     ## [control
-     ##  ["._" predicate]
-     ##  [function
-     ##   ["._" contract]]
-     ##  [monad
-     ##   ["._" free]]
-     ##  [parser
-     ##   [type (#+)]]]
-     ## [data
-     ##  ["._" env]
-     ##  ["._" trace]
-     ##  ["._" store]
-     ##  [format
-     ##   ["._" context]
-     ##   ["._" html]
-     ##   ["._" css]
-     ##   ["._" binary]]
-     ##  [collection
-     ##   [tree
-     ##    [rose
-     ##     ["._" parser]]]
-     ##   [dictionary
-     ##    ["._" plist]]
-     ##   [set
-     ##    ["._" multi]]]
-     ##  [text
-     ##   ["._" buffer]]]
-     ## ["._" macro]
-     ## [type
-     ##  ["._" unit]
-     ##  ["._" refinement]
-     ##  ["._" quotient]]
-     ## [world
-     ##  ["._" environment]
-     ##  ["._" console]]
-     ## [compiler
-     ##  ["._" cli]
-     ##  ["._" default
-     ##   ["._" evaluation]
-     ##   [phase
-     ##    ["._" generation]
-     ##    [extension
-     ##     ["._" directive]]]
-     ##   ["._default" cache]]
-     ##  [meta
-     ##   ["._meta" io
-     ##    ["._meta_io" context]
-     ##    ["._meta_io" archive]]
-     ##   ["._meta" archive]
-     ##   ["._meta" cache]]]
-     ## ["._" interpreter
-     ##  ["._interpreter" type]]
-     ]
-    ## TODO: Must have 100% coverage on tests.
-    ["." / #_
-     ["#." abstract]
-     ["#." control]
-     ["#." data]
-     ["#." macro]
-     ["#." math]
-     ["#." time]
-     ## ["#." tool]
-     ["#." type]
-     ["#." world]
-     ["#." host]
-     ["#." extension]
-     ["#." target #_
-      ["#/." jvm]]]
-    ))
+(.module:
+  ["/" lux #*
+   [abstract
+    [monad (#+ do)]
+    [predicate (#+ Predicate)]]
+   [control
+    ["." io (#+ io)]
+    [function
+     [mixin (#+)]]
+    [parser
+     [cli (#+ program:)]]]
+   [data
+    ["." name]
+    [number
+     ["." i64]
+     ["n" nat]
+     ["i" int]
+     ["r" rev]
+     ["f" frac]]]
+   ["." math]
+   ["_" test (#+ Test)]
+   ## These modules do not need to be tested.
+   [type
+    [variance (#+)]]
+   [locale (#+)
+    [language (#+)]
+    [territory (#+)]]
+   ["%" data/text/format (#+ format)]
+   [math
+    ["." random (#+ Random) ("#@." functor)]]
+   ## TODO: Test these modules
+   [data
+    [format
+     [css (#+)]
+     [markdown (#+)]]]
+   ["@" target
+    [js (#+)]
+    [python (#+)]
+    [lua (#+)]
+    [ruby (#+)]
+    [php (#+)]
+    [common-lisp (#+)]
+    [scheme (#+)]]
+   [tool
+    [compiler
+     [language
+      [lux
+       [phase
+        [generation
+         [jvm (#+)]
+         [js (#+)]
+         ## [python (#+)]
+         ## [lua (#+)]
+         ## [ruby (#+)]
+         ## [php (#+)]
+         ## [common-lisp (#+)]
+         ## [scheme (#+)]
+         ]
+        [extension
+         [generation
+          [jvm (#+)]
+          [js (#+)]
+          ## [python (#+)]
+          ## [lua (#+)]
+          ## [ruby (#+)]
+          ]]
+        ]]]]]
+   ## [control
+   ##  ["._" predicate]
+   ##  [function
+   ##   ["._" contract]]
+   ##  [monad
+   ##   ["._" free]]
+   ##  [parser
+   ##   [type (#+)]]]
+   ## [data
+   ##  ["._" env]
+   ##  ["._" trace]
+   ##  ["._" store]
+   ##  [format
+   ##   ["._" context]
+   ##   ["._" html]
+   ##   ["._" css]
+   ##   ["._" binary]]
+   ##  [collection
+   ##   [tree
+   ##    [rose
+   ##     ["._" parser]]]
+   ##   [dictionary
+   ##    ["._" plist]]
+   ##   [set
+   ##    ["._" multi]]]
+   ##  [text
+   ##   ["._" buffer]]]
+   ## ["._" macro]
+   ## [type
+   ##  ["._" unit]
+   ##  ["._" refinement]
+   ##  ["._" quotient]]
+   ## [world
+   ##  ["._" environment]
+   ##  ["._" console]]
+   ## [compiler
+   ##  ["._" cli]
+   ##  ["._" default
+   ##   ["._" evaluation]
+   ##   [phase
+   ##    ["._" generation]
+   ##    [extension
+   ##     ["._" directive]]]
+   ##   ["._default" cache]]
+   ##  [meta
+   ##   ["._meta" io
+   ##    ["._meta_io" context]
+   ##    ["._meta_io" archive]]
+   ##   ["._meta" archive]
+   ##   ["._meta" cache]]]
+   ## ["._" interpreter
+   ##  ["._interpreter" type]]
+   ]
+  ## TODO: Must have 100% coverage on tests.
+  ["." / #_
+   ["#." abstract]
+   ["#." control]
+   ["#." data]
+   ["#." macro]
+   ["#." math]
+   ["#." time]
+   ## ["#." tool]
+   ["#." type]
+   ["#." world]
+   ["#." host]
+   ["#." extension]
+   ["#." target #_
+    ["#/." jvm]]]
+  )
 
 ## TODO: Get rid of this ASAP
 (template: (!bundle body)