From 62299ecdc93b39f6a22b1f89779f55dfa735fb3c Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Mon, 14 Mar 2022 17:03:38 -0400 Subject: Made JVM "import:" syntax consistent with the other "import:"s. --- lux-lua/source/program.lux | 117 +++++++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 52 deletions(-) (limited to 'lux-lua/source') diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index 631b55d9a..56437b026 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -67,92 +67,104 @@ [program ["/" compositor]]) -(with_expansions [ (as_is (ffi.import: java/lang/String) +(with_expansions [ (as_is (ffi.import: java/lang/String + "[1]::[0]") - (ffi.import: (java/lang/Class a)) + (ffi.import: (java/lang/Class a) + "[1]::[0]") (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 [] int)]) + "[1]::[0]" + (intValue [] int)) - (ffi.import: net/sandius/rembulan/StateContext) + (ffi.import: net/sandius/rembulan/StateContext + "[1]::[0]") (ffi.import: net/sandius/rembulan/impl/StateContexts - ["[1]::[0]" - ("static" newDefaultInstance [] net/sandius/rembulan/StateContext)]) + "[1]::[0]" + ("static" newDefaultInstance [] net/sandius/rembulan/StateContext)) - (ffi.import: net/sandius/rembulan/env/RuntimeEnvironment) + (ffi.import: net/sandius/rembulan/env/RuntimeEnvironment + "[1]::[0]") (ffi.import: net/sandius/rembulan/env/RuntimeEnvironments - ["[1]::[0]" - ("static" system [] net/sandius/rembulan/env/RuntimeEnvironment)]) + "[1]::[0]" + ("static" system [] net/sandius/rembulan/env/RuntimeEnvironment)) (ffi.import: net/sandius/rembulan/Table - ["[1]::[0]" - (rawget "as" get_idx [long] "?" java/lang/Object) - (rawget "as" get_key [java/lang/Object] "?" java/lang/Object) - (rawlen [] long)]) + "[1]::[0]" + (rawget "as" get_idx [long] "?" java/lang/Object) + (rawget "as" get_key [java/lang/Object] "?" java/lang/Object) + (rawlen [] long)) (ffi.import: net/sandius/rembulan/ByteString - ["[1]::[0]" - (decode [] java/lang/String)]) + "[1]::[0]" + (decode [] java/lang/String)) - (ffi.import: net/sandius/rembulan/impl/DefaultTable) + (ffi.import: net/sandius/rembulan/impl/DefaultTable + "[1]::[0]") - (ffi.import: net/sandius/rembulan/impl/ImmutableTable) + (ffi.import: net/sandius/rembulan/impl/ImmutableTable + "[1]::[0]") (ffi.import: net/sandius/rembulan/impl/ImmutableTable$Builder - ["[1]::[0]" - (new []) - (build [] net/sandius/rembulan/impl/ImmutableTable)]) + "[1]::[0]" + (new []) + (build [] net/sandius/rembulan/impl/ImmutableTable)) (ffi.import: net/sandius/rembulan/lib/StandardLibrary - ["[1]::[0]" - ("static" in [net/sandius/rembulan/env/RuntimeEnvironment] net/sandius/rembulan/lib/StandardLibrary) - (installInto [net/sandius/rembulan/StateContext] net/sandius/rembulan/Table)]) + "[1]::[0]" + ("static" in [net/sandius/rembulan/env/RuntimeEnvironment] net/sandius/rembulan/lib/StandardLibrary) + (installInto [net/sandius/rembulan/StateContext] net/sandius/rembulan/Table)) (ffi.import: net/sandius/rembulan/Variable - ["[1]::[0]" - (new [java/lang/Object])]) + "[1]::[0]" + (new [java/lang/Object])) (ffi.import: net/sandius/rembulan/runtime/ReturnBuffer - ["[1]::[0]" - (setTo [java/lang/Object] void)]) + "[1]::[0]" + (setTo [java/lang/Object] void)) (ffi.import: net/sandius/rembulan/runtime/ExecutionContext - ["[1]::[0]" - (getReturnBuffer [] net/sandius/rembulan/runtime/ReturnBuffer)]) + "[1]::[0]" + (getReturnBuffer [] net/sandius/rembulan/runtime/ReturnBuffer)) - (ffi.import: net/sandius/rembulan/runtime/ResolvedControlThrowable) - (ffi.import: net/sandius/rembulan/runtime/LuaFunction) + (ffi.import: net/sandius/rembulan/runtime/ResolvedControlThrowable + "[1]::[0]") + + (ffi.import: net/sandius/rembulan/runtime/LuaFunction + "[1]::[0]") (ffi.import: net/sandius/rembulan/load/ChunkLoader - ["[1]::[0]" - (loadTextChunk [net/sandius/rembulan/Variable - java/lang/String - java/lang/String] - "try" net/sandius/rembulan/runtime/LuaFunction)]) + "[1]::[0]" + (loadTextChunk [net/sandius/rembulan/Variable + java/lang/String + java/lang/String] + "try" net/sandius/rembulan/runtime/LuaFunction)) (ffi.import: net/sandius/rembulan/compiler/CompilerChunkLoader - ["[1]::[0]" - ("static" of [java/lang/String] net/sandius/rembulan/compiler/CompilerChunkLoader)]) + "[1]::[0]" + ("static" of [java/lang/String] net/sandius/rembulan/compiler/CompilerChunkLoader)) - (ffi.import: net/sandius/rembulan/runtime/SchedulingContext) + (ffi.import: net/sandius/rembulan/runtime/SchedulingContext + "[1]::[0]") - (ffi.import: net/sandius/rembulan/runtime/SchedulingContextFactory) + (ffi.import: net/sandius/rembulan/runtime/SchedulingContextFactory + "[1]::[0]") (ffi.import: net/sandius/rembulan/exec/DirectCallExecutor - ["[1]::[0]" - ("static" newExecutor [] net/sandius/rembulan/exec/DirectCallExecutor) - (schedulingContextFactory [] net/sandius/rembulan/runtime/SchedulingContextFactory) - (call [net/sandius/rembulan/StateContext java/lang/Object [java/lang/Object]] "try" [java/lang/Object])]) + "[1]::[0]" + ("static" newExecutor [] net/sandius/rembulan/exec/DirectCallExecutor) + (schedulingContextFactory [] net/sandius/rembulan/runtime/SchedulingContextFactory) + (call [net/sandius/rembulan/StateContext java/lang/Object [java/lang/Object]] "try" [java/lang/Object])) (exception: (unknown_kind_of_object [object java/lang/Object]) (exception.report @@ -163,8 +175,8 @@ (getValue [] java/lang/Object)) (ffi.import: LuxValue - ["[1]::[0]" - (getValue [] java/lang/Object)]) + "[1]::[0]" + (getValue [] java/lang/Object)) (type: Translator (-> java/lang/Object (Try Any))) @@ -354,7 +366,8 @@ lux_function))) ))))) - (ffi.import: library/lux/Function) + (ffi.import: library/lux/Function + "[1]::[0]") (def: (lux_structure to_host value) (-> (-> Any java/lang/Object) (Array java/lang/Object) LuxValue) -- cgit v1.2.3