1 files changed, 45 insertions, 45 deletions

diff --git a/lux-cl/source/program.lux b/lux-cl/source/program.lux
index c07681483..be64f1cf3 100644
--- a/lux-cl/source/program.lux
+++ b/lux-cl/source/program.lux
@@ -1,33 +1,33 @@
 (.module:
   [lux "*"
    [program {"+" [program:]}]
-   ["." ffi]
-   ["." debug]
+   ["[0]" ffi]
+   ["[0]" debug]
    [abstract
-    ["." monad {"+" [do]}]]
+    ["[0]" monad {"+" [do]}]]
    [control
     [pipe {"+" [exec> case> new>]}]
-    ["." maybe]
-    ["." try {"+" [Try]}]
-    ["." exception {"+" [exception:]}]
-    ["." io {"+" [IO io]}]
+    ["[0]" maybe]
+    ["[0]" try {"+" [Try]}]
+    ["[0]" exception {"+" [exception:]}]
+    ["[0]" io {"+" [IO io]}]
     [concurrency
-     ["." promise {"+" [Promise]}]]]
+     ["[0]" promise {"+" [Promise]}]]]
    [data
-    ["." text ("#\." hash)
+    ["[0]" text ("[1]\[0]" hash)
      ["%" format {"+" [format]}]
-     ["." encoding]]
+     ["[0]" encoding]]
     [collection
-     ["." array {"+" [Array]}]]]
+     ["[0]" array {"+" [Array]}]]]
    [macro
-    ["." template]]
+    ["[0]" template]]
    [math
     [number {"+" [hex]}
      ["n" nat]
-     ["." i64]]]
-   ["." world "_"
-    ["." file]
-    ["#/." program]]
+     ["[0]" i64]]]
+   ["[0]" world "_"
+    ["[0]" file]
+    ["[1]/[0]" program]]
    ["@" target
     ["_" common_lisp]]
    [tool
@@ -39,57 +39,57 @@
       [lux
        [program {"+" [Program]}]
        [generation {"+" [Context Host]}]
-       ["." synthesis]
+       ["[0]" synthesis]
        [analysis
         [macro {"+" [Expander]}]]
        [phase
-        ["." extension {"+" [Extender Handler]}
-         ["#/." bundle]
-         ["." analysis "_"
-          ["#" common_lisp]]
-         ["." generation "_"
-          ["#" common_lisp]]]
+        ["[0]" extension {"+" [Extender Handler]}
+         ["[1]/[0]" bundle]
+         ["[0]" analysis "_"
+          ["[1]" common_lisp]]
+         ["[0]" generation "_"
+          ["[1]" common_lisp]]]
         [generation
-         ["." reference]
-         ["." common_lisp
-          ["." runtime]]]]]]
+         ["[0]" reference]
+         ["[0]" common_lisp
+          ["[0]" runtime]]]]]]
      [default
-      ["." platform {"+" [Platform]}]]
+      ["[0]" platform {"+" [Platform]}]]
      [meta
-      ["." packager "_"
-       ["#" script]]]]]]
+      ["[0]" packager "_"
+       ["[1]" script]]]]]]
   [program
    ["/" compositor
-    ["#." cli]
-    ["#." static]]])
+    ["[1][0]" cli]
+    ["[1][0]" static]]])
 
 (ffi.import: java/lang/String)
 
 (ffi.import: (java/lang/Class a)
-  ["#::."
+  ["[1]::[0]"
    ("static" forName [java/lang/String] "try" (java/lang/Class java/lang/Object))])
 
 (ffi.import: java/lang/Object
-  ["#::."
+  ["[1]::[0]"
    (toString [] java/lang/String)
    (getClass [] (java/lang/Class java/lang/Object))])
 
 (ffi.import: java/lang/Long
-  ["#::."
+  ["[1]::[0]"
    (intValue [] java/lang/Integer)])
 
 (ffi.import: java/lang/Integer
-  ["#::."
+  ["[1]::[0]"
    (longValue [] long)])
 
 (ffi.import: java/lang/Number
-  ["#::."
+  ["[1]::[0]"
    (intValue [] java/lang/Integer)
    (longValue [] long)
    (doubleValue [] double)])
 
 (ffi.import: org/armedbear/lisp/LispObject
-  ["#::."
+  ["[1]::[0]"
    (length [] int)
    (NTH [int] org/armedbear/lisp/LispObject)
    (SVREF [int] org/armedbear/lisp/LispObject)
@@ -99,39 +99,39 @@
 ... The org/armedbear/lisp/Interpreter must be imported before the
 ... other ones, because there is an order dependency in their static initialization.
 (ffi.import: org/armedbear/lisp/Interpreter
-  ["#::."
+  ["[1]::[0]"
    ("static" getInstance [] org/armedbear/lisp/Interpreter)
    ("static" createInstance [] "?" org/armedbear/lisp/Interpreter)
    (eval [java/lang/String] "try" org/armedbear/lisp/LispObject)])
 
 (ffi.import: org/armedbear/lisp/Symbol
-  ["#::."
+  ["[1]::[0]"
    ("static" T org/armedbear/lisp/Symbol)])
 
 (ffi.import: org/armedbear/lisp/DoubleFloat
-  ["#::."
+  ["[1]::[0]"
    (new [double])
    (doubleValue [] double)])
 
 (ffi.import: org/armedbear/lisp/SimpleString
-  ["#::."
+  ["[1]::[0]"
    (new [java/lang/String])
    (getStringValue [] java/lang/String)])
 
 (ffi.import: org/armedbear/lisp/LispInteger)
 
 (ffi.import: org/armedbear/lisp/Bignum
-  ["#::."
+  ["[1]::[0]"
    (longValue [] long)
    ("static" getInstance [long] org/armedbear/lisp/LispInteger)])
 
 (ffi.import: org/armedbear/lisp/Fixnum
-  ["#::."
+  ["[1]::[0]"
    (longValue [] long)
    ("static" getInstance [int] org/armedbear/lisp/Fixnum)])
 
 (ffi.import: org/armedbear/lisp/Nil
-  ["#::."
+  ["[1]::[0]"
    ("static" NIL org/armedbear/lisp/Symbol)])
 
 (ffi.import: org/armedbear/lisp/SimpleVector)
@@ -144,7 +144,7 @@
   (getValue [] java/lang/Object))
 
 (ffi.import: program/LuxADT
-  ["#::."
+  ["[1]::[0]"
    (getValue [] java/lang/Object)])
 
 (template [<name>]