1 files changed, 65 insertions, 60 deletions
diff --git a/lux-php/source/program.lux b/lux-php/source/program.lux
index 383e89e5d..6436b2177 100644
--- a/lux-php/source/program.lux
+++ b/lux-php/source/program.lux
@@ -64,110 +64,115 @@
    ["[1][0]" cli]
    ["[1][0]" static]]])
 
-(ffi.import: java/lang/String)
+(ffi.import: java/lang/String
+  "[1]::[0]")
 
 (ffi.import: java/lang/reflect/Field
-  ["[1]::[0]"
-   (get [java/lang/Object] java/lang/Object)])
+  "[1]::[0]"
+  (get [java/lang/Object] java/lang/Object))
 
 (ffi.import: java/lang/reflect/AccessibleObject
-  ["[1]::[0]"
-   (setAccessible [boolean] void)])
+  "[1]::[0]"
+  (setAccessible [boolean] void))
 
 (ffi.import: (java/lang/Class a)
-  ["[1]::[0]"
-   (getDeclaredField [java/lang/String] java/lang/reflect/Field)])
+  "[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))])
+  "[1]::[0]"
+  (toString [] java/lang/String)
+  (getClass [] (java/lang/Class java/lang/Object)))
 
-(ffi.import: java/lang/Integer)
+(ffi.import: java/lang/Integer
+  "[1]::[0]")
 
 (ffi.import: java/lang/Long
-  ["[1]::[0]"
-   (intValue [] java/lang/Integer)])
+  "[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)])
+  "[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)])
+  "[1]::[0]"
+  ("enum" ARRAY))
 
 (ffi.import: php/runtime/memory/NullMemory
-  ["[1]::[0]"
-   ("static" INSTANCE 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)])
+  "[1]::[0]"
+  ("static" INSTANCE php/runtime/memory/FalseMemory))
 
 (ffi.import: php/runtime/memory/TrueMemory
-  ["[1]::[0]"
-   ("static" INSTANCE 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)])
+  "[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)])
+  "[1]::[0]"
+  (new [double])
+  (toDouble [] double))
 
 (ffi.import: php/runtime/memory/StringMemory
-  ["[1]::[0]"
-   (new [java/lang/String])
-   (toString [] java/lang/String)])
+  "[1]::[0]"
+  (new [java/lang/String])
+  (toString [] java/lang/String))
 
 (ffi.import: php/runtime/memory/ReferenceMemory
-  ["[1]::[0]"
-   (getValue [] php/runtime/Memory)])
+  "[1]::[0]"
+  (getValue [] php/runtime/Memory))
 
 (ffi.import: php/runtime/memory/ArrayMemory
-  ["[1]::[0]"
-   (new [[java/lang/Object]])
-   (size [] int)
-   (isMap [] boolean)
-   (get [php/runtime/Memory] "?" php/runtime/Memory)])
+  "[1]::[0]"
+  (new [[java/lang/Object]])
+  (size [] int)
+  (isMap [] boolean)
+  (get [php/runtime/Memory] "?" php/runtime/Memory))
 
-(ffi.import: php/runtime/lang/IObject)
+(ffi.import: php/runtime/lang/IObject
+  "[1]::[0]")
 
 (ffi.import: php/runtime/memory/ObjectMemory
-  ["[1]::[0]"
-   (value php/runtime/lang/IObject)])
+  "[1]::[0]"
+  (value php/runtime/lang/IObject))
 
-(ffi.import: php/runtime/env/Environment)
+(ffi.import: php/runtime/env/Environment
+  "[1]::[0]")
 
 (ffi.import: php/runtime/env/TraceInfo
-  ["[1]::[0]"
-   (new [java/lang/String int int])])
+  "[1]::[0]"
+  (new [java/lang/String int int]))
 
-(ffi.import: php/runtime/reflection/FunctionEntity)
+(ffi.import: php/runtime/reflection/FunctionEntity
+  "[1]::[0]")
 
 (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)])
+  "[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)])
+  "[1]::[0]"
+  (call [php/runtime/env/Environment [php/runtime/Memory]] "try" php/runtime/Memory))
 
 (template [<name>]
   [(ffi.interface: <name>
      (getValue [] java/lang/Object))
 
    (`` (ffi.import: (~~ (template.symbol ["program/" <name>]))
-         ["[1]::[0]"
-          (getValue [] java/lang/Object)]))]
+         "[1]::[0]"
+         (getValue [] java/lang/Object)))]
 
   [StructureValue]
   )
@@ -416,12 +421,12 @@
    ["Non-function" (java/lang/Object::toString object)]))
 
 (ffi.import: javax/script/ScriptEngine
-  ["[1]::[0]"
-   (eval [java/lang/String] "try" Object)])
+  "[1]::[0]"
+  (eval [java/lang/String] "try" Object))
 
 (ffi.import: org/develnext/jphp/scripting/JPHPScriptEngine
-  ["[1]::[0]"
-   (new [])])
+  "[1]::[0]"
+  (new []))
 
 (def: (ensure_macro macro)
   (-> Macro (Maybe php/runtime/memory/ObjectMemory))