- Improvements to import syntax [part 0].

1 files changed, 65 insertions, 30 deletions

diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index ce4113317..8d644b68e 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux [cli #+ program:]
+  (lux [cli (#+ program:)]
        [test])
   (test ["_." lux]
         (lux ["_." cli]
@@ -35,7 +35,7 @@
                    ["_." maybe]
                    ["_." product]
                    ["_." sum]
-                   ["_." number]
+                   ## ["_." number] ## Specially troublesome...
                    (number ["_." ratio]
                            ["_." complex])
                    ["_." text]
@@ -44,40 +44,53 @@
                          ["_." regex])
                    (format ["_." json]
                            ["_." xml])
-                   (coll ["_." array]
-                         ["_." bits]
-                         ["_." list]
-                         ["_." stack]
-                         ["_." sequence]
-                         ["_." stream]
-                         ["_." dictionary/unordered]
-                         ["_." dictionary/ordered]
-                         ["_." set/unordered]
-                         ["_." set/ordered]
-                         ["_." queue]
-                         (queue ["_." priority])
-                         (tree ["_." rose]
-                               (rose ["_." zipper]))))
+                   (collection ["_." array]
+                               ["_." bits]
+                               ["_." list]
+                               ["_." stack]
+                               ["_." row]
+                               ["_." sequence]
+                               ["_." dictionary]
+                               (dictionary ["_.D" ordered])
+                               ["_." set]
+                               (set ["_.S" ordered])
+                               ["_." queue]
+                               (queue ["_." priority])
+                               (tree ["_." rose]
+                                     (rose ["_." zipper]))))
              ["_." math]
              (math ["_." random]
                    ["_." modular]
-                   ["_." constructive]
                    (logic ["_." continuous]
                           ["_." fuzzy]))
              (macro ["_." code]
                     ["_." syntax]
-                    (poly ["poly_." equality]
+                    (poly ["poly_." equivalence]
                           ["poly_." functor]))
-             (type ["_." implicit]
+             (type ## ["_." implicit] ## Specially troublesome...
                    ["_." resource]
-                   (object
-                     ["_." interface]
-                     ["_." protocol]))
-             (lang ["_lang/." syntax]
-                   ["_." type]
-                   (type ["_." check]))
+              (object
+                ["_." interface]
+                ["_." protocol]))
+             (language ["_language/." syntax]
+                       ["_." type]
+                       (type ["_." check])
+                       (compiler (analysis ["_.A" primitive]
+                                           ["_.A" structure]
+                                           ["_.A" reference]
+                                           ["_.A" case]
+                                           ["_.A" function]
+                                           ## (procedure ["_.A" common]
+                                           ##            ["_.A" host])
+                                           )
+                                 ## (synthesis ["_.S" primitive]
+                                 ##            ["_.S" structure]
+                                 ##            ["_.S" case]
+                                 ##            ["_.S" function])
+                                 )
+                       )
              (world ["_." blob]
-                    ["_." file]
+                    ## ["_." file] ## Specially troublesome...
                     (net ["_." tcp]
                          ["_." udp]))
              ))
@@ -91,15 +104,37 @@
              [tainted]
              (format [context]
                      [html]
-                     [css])
-             (coll (tree ["_." rose/parser])))
+                     [css]
+                     [binary])
+             (collection (tree ["_." rose/parser])
+                         (dictionary [plist])
+                         (set [multi]))
+             (text [buffer]))
        [macro]
        (macro (poly [json]))
        (type [unit]
              [refinement]
              [quotient])
-       [world/env]
-       [world/console])
+       (world [environment]
+              [console])
+       (language (host [".H" scheme])
+                 (compiler [translation]
+                           (translation (scheme ["._scheme" primitive]
+                                                ["._scheme" structure]
+                                                ["._scheme" reference]
+                                                ["._scheme" function]
+                                                ["._scheme" loop]
+                                                ["._scheme" case]
+                                                ["._scheme" extension]
+                                                ["._scheme" extension/common]
+                                                ["._scheme" expression]))
+                           (default (repl [type]))
+                           (meta [io]
+                                 [io/context]
+                                 [io/archive]
+                                 [archive]
+                                 ["._meta" cache])
+                           (default ["._default" cache]))))
   )
 
 (program: args