1 files changed, 53 insertions, 53 deletions

diff --git a/lux-php/source/program.lux b/lux-php/source/program.lux
index 6a80b1eae..6c233ab4f 100644
--- a/lux-php/source/program.lux
+++ b/lux-php/source/program.lux
@@ -1,34 +1,34 @@
 (.module:
   [lux "*"
    [program {"+" [program:]}]
-   ["." ffi]
-   ["." debug]
+   ["[0]" ffi]
+   ["[0]" debug]
    [abstract
-    ["." monad {"+" [do]}]]
+    ["[0]" monad {"+" [do]}]]
    [control
     [pipe {"+" [exec> case>]}]
-    ["." 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
-      ["." utf8]]]
+      ["[0]" utf8]]]
     [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
     ["_" php]]
    [tool
@@ -40,99 +40,99 @@
       [lux
        [program {"+" [Program]}]
        [generation {"+" [Context Host]}]
-       ["." synthesis]
+       ["[0]" synthesis]
        [analysis
         [macro {"+" [Expander]}]]
        [phase
-        ["." extension {"+" [Extender Handler]}
-         ["#/." bundle]
-         ["." analysis "_"
-          ["#" php]]
-         ["." generation "_"
-          ["#" php]]]
+        ["[0]" extension {"+" [Extender Handler]}
+         ["[1]/[0]" bundle]
+         ["[0]" analysis "_"
+          ["[1]" php]]
+         ["[0]" generation "_"
+          ["[1]" php]]]
         [generation
-         ["." reference]
-         ["." php
-          ["." runtime]]]]]]
+         ["[0]" reference]
+         ["[0]" php
+          ["[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/reflect/Field
-  ["#::."
+  ["[1]::[0]"
    (get [java/lang/Object] java/lang/Object)])
 
 (ffi.import: java/lang/reflect/AccessibleObject
-  ["#::."
+  ["[1]::[0]"
    (setAccessible [boolean] void)])
 
 (ffi.import: (java/lang/Class a)
-  ["#::."
+  ["[1]::[0]"
    (getDeclaredField [java/lang/String] java/lang/reflect/Field)])
 
 (ffi.import: java/lang/Object
-  ["#::."
+  ["[1]::[0]"
    (toString [] java/lang/String)
    (getClass [] (java/lang/Class java/lang/Object))])
 
 (ffi.import: java/lang/Integer)
 
 (ffi.import: java/lang/Long
-  ["#::."
+  ["[1]::[0]"
    (intValue [] java/lang/Integer)])
 
 (ffi.import: php/runtime/Memory
-  ["#::."
+  ["[1]::[0]"
    (valueOfIndex "as" generic_valueOfIndex [php/runtime/env/TraceInfo php/runtime/Memory] php/runtime/Memory)
    (valueOfIndex "as" long_valueOfIndex [php/runtime/env/TraceInfo long] php/runtime/Memory)
    (valueOfIndex "as" string_valueOfIndex [php/runtime/env/TraceInfo java/lang/String] php/runtime/Memory)])
 
 (ffi.import: php/runtime/Memory$Type
-  ["#::."
+  ["[1]::[0]"
    ("enum" ARRAY)])
 
 (ffi.import: php/runtime/memory/NullMemory
-  ["#::."
+  ["[1]::[0]"
    ("static" INSTANCE php/runtime/memory/NullMemory)])
 
 (ffi.import: php/runtime/memory/FalseMemory
-  ["#::."
+  ["[1]::[0]"
    ("static" INSTANCE php/runtime/memory/FalseMemory)])
 
 (ffi.import: php/runtime/memory/TrueMemory
-  ["#::."
+  ["[1]::[0]"
    ("static" INSTANCE php/runtime/memory/TrueMemory)])
 
 (ffi.import: php/runtime/memory/LongMemory
-  ["#::."
+  ["[1]::[0]"
    (new [long])
    (toLong [] long)
    ("static" valueOf "manual" [int] php/runtime/Memory)])
 
 (ffi.import: php/runtime/memory/DoubleMemory
-  ["#::."
+  ["[1]::[0]"
    (new [double])
    (toDouble [] double)])
 
 (ffi.import: php/runtime/memory/StringMemory
-  ["#::."
+  ["[1]::[0]"
    (new [java/lang/String])
    (toString [] java/lang/String)])
 
 (ffi.import: php/runtime/memory/ReferenceMemory
-  ["#::."
+  ["[1]::[0]"
    (getValue [] php/runtime/Memory)])
 
 (ffi.import: php/runtime/memory/ArrayMemory
-  ["#::."
+  ["[1]::[0]"
    (new [[java/lang/Object]])
    (size [] int)
    (isMap [] boolean)
@@ -141,24 +141,24 @@
 (ffi.import: php/runtime/lang/IObject)
 
 (ffi.import: php/runtime/memory/ObjectMemory
-  ["#::."
+  ["[1]::[0]"
    (value php/runtime/lang/IObject)])
 
 (ffi.import: php/runtime/env/Environment)
 
 (ffi.import: php/runtime/env/TraceInfo
-  ["#::."
+  ["[1]::[0]"
    (new [java/lang/String int int])])
 
 (ffi.import: php/runtime/reflection/FunctionEntity)
 
 (ffi.import: php/runtime/invoke/InvokeHelper
-  ["#::."
+  ["[1]::[0]"
    ("static" callAny [php/runtime/Memory [php/runtime/Memory] php/runtime/env/Environment php/runtime/env/TraceInfo]
     "try" php/runtime/Memory)])
 
 (ffi.import: php/runtime/lang/Closure
-  ["#::."
+  ["[1]::[0]"
    (call [php/runtime/env/Environment [php/runtime/Memory]] "try" php/runtime/Memory)])
 
 (template [<name>]
@@ -166,7 +166,7 @@
      (getValue [] java/lang/Object))
 
    (`` (ffi.import: (~~ (template.identifier ["program/" <name>]))
-         ["#::."
+         ["[1]::[0]"
           (getValue [] java/lang/Object)]))]
 
   [StructureValue]
@@ -419,11 +419,11 @@
    ["Non-function" (java/lang/Object::toString object)]))
 
 (ffi.import: javax/script/ScriptEngine
-  ["#::."
+  ["[1]::[0]"
    (eval [java/lang/String] "try" Object)])
 
 (ffi.import: org/develnext/jphp/scripting/JPHPScriptEngine
-  ["#::."
+  ["[1]::[0]"
    (new [])])
 
 (def: (ensure_macro macro)