No longer giving default aliases to un-prefixed imports.

1 files changed, 68 insertions, 64 deletions

diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index baa1c6f54..c79b17073 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -1,41 +1,49 @@
 (.module:
-  [lux #*
+  [lux
    [cli (#+ program:)]
-   [test]
+   ["." test]
    ## TODO: Test these modules
    [control
-    [contract]
-    [concatenative]
-    [predicate]
-    [monad/free]]
+    ["._" contract]
+    ["._" concatenative]
+    ["._" predicate]
+    [monad
+     ["._" free]]]
    [data
-    [env]
-    [trace]
-    [store]
-    [tainted]
+    ["._" env]
+    ["._" trace]
+    ["._" store]
+    ["._" tainted]
     [format
-     [context]
-     [html]
-     [css]
-     [binary]]
+     ["._" context]
+     ["._" html]
+     ["._" css]
+     ["._" binary]]
     [collection
-     [tree ["_." rose/parser]]
-     [dictionary [plist]]
-     [set [multi]]]
-    [text [buffer]]]
-   [macro (#+)
-    [poly [json]]]
+     [tree
+      [rose
+       ["._" parser]]]
+     [dictionary
+      ["._" plist]]
+     [set
+      ["._" multi]]]
+    [text
+     ["._" buffer]]]
+   ["._" macro
+    [poly
+     ["._" json]]]
    [type
-    [unit]
-    [refinement]
-    [quotient]]
+    ["._" unit]
+    ["._" refinement]
+    ["._" quotient]]
    [world
-    [environment]
-    [console]]
+    ["._" environment]
+    ["._" console]]
    [language
-    [host [".H" scheme]]
+    [host
+     [".H" scheme]]
     [compiler
-     [translation (#+)
+     ["._" translation
       [scheme
        ["._scheme" primitive]
        ["._scheme" structure]
@@ -46,14 +54,17 @@
        ["._scheme" extension]
        ["._scheme" extension/common]
        ["._scheme" expression]]]
-     [default [repl [type]]]
+     [default
+      [repl
+       ["._" type]]]
      [meta
-      [io]
-      [io/context]
-      [io/archive]
-      [archive]
+      ["._meta" io
+       ["._meta_io" context]
+       ["._meta_io" archive]]
+      ["._meta" archive]
       ["._meta" cache]]
-     [default ["._default" cache]]]]]
+     [default
+      ["._default" cache]]]]]
   [test
    ["_." lux]
    [lux
@@ -84,7 +95,6 @@
      ["_." region]]
     [data
      ["_." bit]
-     ["_." bool]
      ["_." color]
      ["_." error]
      ["_." ident]
@@ -93,12 +103,12 @@
      ["_." maybe]
      ["_." product]
      ["_." sum]
-     ## ["_." number] ## Specially troublesome...
      [number
+      ## "_." number ## TODO: Specially troublesome...
+      ["_." i64]
       ["_." ratio]
       ["_." complex]]
-     ["_." text]
-     [text
+     ["_." text
       ["_." format]
       ["_." lexer]
       ["_." regex]]
@@ -112,17 +122,16 @@
       ["_." stack]
       ["_." row]
       ["_." sequence]
-      ["_." dictionary]
-      [dictionary ["_.D" ordered]]
-      ["_." set]
-      [set ["_.S" ordered]]
-      ["_." queue]
-      [queue ["_." priority]]
+      ["_." dictionary
+       ["dictionary_." ordered]]
+      ["_." set
+       ["set_." ordered]]
+      ["_." queue
+       ["_." priority]]
       [tree
-       ["_." rose]
-       [rose ["_." zipper]]]]]
-    ["_." math]
-    [math
+       ["_." rose
+        ["_." zipper]]]]]
+    ["_." math
      ["_." random]
      ["_." modular]
      [logic
@@ -135,15 +144,15 @@
       ["poly_." equivalence]
       ["poly_." functor]]]
     [type
-     ## ["_." implicit] ## Specially troublesome...
+     ## ["_." implicit] ## TODO: Specially troublesome...
      ["_." resource]
      [object
       ["_." interface]
       ["_." protocol]]]
     [language
      ["_language/." syntax]
-     ["_." type]
-     [type ["_." check]]
+     ["_." type
+      ["_." check]]
      [compiler
       [analysis
        ["_.A" primitive]
@@ -151,24 +160,19 @@
        ["_.A" reference]
        ["_.A" case]
        ["_.A" function]
-       ## [procedure
-       ##  ["_.A" common]
-       ##  ["_.A" host]]
-       ]
-      ## [synthesis
-      ##  ["_.S" primitive]
-      ##  ["_.S" structure]
-      ##  ["_.S" case]
-      ##  ["_.S" function]]
-      ]
-     ]
+       [procedure
+        ["_.A" common]]]
+      [synthesis
+       ["_.S" primitive]
+       ["_.S" structure]
+       ["_.S" case]
+       ["_.S" function]]]]
     [world
      ["_." blob]
-     ## ["_." file] ## Specially troublesome...
+     ## ["_." file] ## TODO: Specially troublesome...
      [net
       ["_." tcp]
-      ["_." udp]]]
-    ]]
+      ["_." udp]]]]]
   )
 
 (program: args