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-python/source/program.lux | 96 ++++++++++++++++++++++++------------------- 1 file changed, 53 insertions(+), 43 deletions(-) (limited to 'lux-python/source/program.lux') diff --git a/lux-python/source/program.lux b/lux-python/source/program.lux index e784a834e..d2b3c65af 100644 --- a/lux-python/source/program.lux +++ b/lux-python/source/program.lux @@ -71,67 +71,76 @@ [program ["/" compositor]]) -(with_expansions [ (as_is (import: java/lang/String) +(with_expansions [ (as_is (import: java/lang/String + "[1]::[0]") (import: (java/lang/Class a) - ["[1]::[0]" - ("static" forName [java/lang/String] (java/lang/Class java/lang/Object)) - (getName [] java/lang/String)]) + "[1]::[0]" + ("static" forName [java/lang/String] (java/lang/Class java/lang/Object)) + (getName [] java/lang/String)) (import: java/lang/Object - ["[1]::[0]" - (new []) - (toString [] java/lang/String) - (getClass [] (java/lang/Class java/lang/Object))]) - - (import: org/python/core/PyNone) - (import: org/python/core/PyInteger) - (import: org/python/core/PyTuple) - (import: org/python/core/PyList) + "[1]::[0]" + (new []) + (toString [] java/lang/String) + (getClass [] (java/lang/Class java/lang/Object))) + + (import: org/python/core/PyNone + "[1]::[0]") + + (import: org/python/core/PyInteger + "[1]::[0]") + + (import: org/python/core/PyTuple + "[1]::[0]") + + (import: org/python/core/PyList + "[1]::[0]") (import: org/python/core/PyBoolean - ["[1]::[0]" - (new [boolean])]) + "[1]::[0]" + (new [boolean])) (import: org/python/core/PyLong - ["[1]::[0]" - (new [long])]) + "[1]::[0]" + (new [long])) (import: org/python/core/PyFloat - ["[1]::[0]" - (new [double])]) + "[1]::[0]" + (new [double])) (import: org/python/core/PyString - ["[1]::[0]" - (new [java/lang/String])]) + "[1]::[0]" + (new [java/lang/String])) (import: org/python/core/PyObject - ["[1]::[0]" - (asInt [] java/lang/Integer) - (asLong [] long) - (asDouble [] double) - (asString [] java/lang/String) - (__nonzero__ [] boolean) - (__getitem__ [int] "try" org/python/core/PyObject) - (__getitem__ "as" __getitem__dict [org/python/core/PyObject] "try" org/python/core/PyObject) - (__len__ [] int)]) + "[1]::[0]" + (asInt [] java/lang/Integer) + (asLong [] long) + (asDouble [] double) + (asString [] java/lang/String) + (__nonzero__ [] boolean) + (__getitem__ [int] "try" org/python/core/PyObject) + (__getitem__ "as" __getitem__dict [org/python/core/PyObject] "try" org/python/core/PyObject) + (__len__ [] int)) (import: org/python/core/PyFunction - ["[1]::[0]" - (__call__ [[org/python/core/PyObject]] "try" org/python/core/PyObject)]) + "[1]::[0]" + (__call__ [[org/python/core/PyObject]] "try" org/python/core/PyObject)) - (import: org/python/core/ThreadState) + (import: org/python/core/ThreadState + "[1]::[0]") (import: org/python/core/PyArray - ["[1]::[0]" - (new [(java/lang/Class [? < java/lang/Object]) java/lang/Object]) - (getArray [] java/lang/Object)]) + "[1]::[0]" + (new [(java/lang/Class [? < java/lang/Object]) java/lang/Object]) + (getArray [] java/lang/Object)) (import: org/python/util/PythonInterpreter - ["[1]::[0]" - (new []) - (exec [java/lang/String] "try" void) - (eval [java/lang/String] "try" PyObject)]) + "[1]::[0]" + (new []) + (exec [java/lang/String] "try" void) + (eval [java/lang/String] "try" PyObject)) (type: Translator (-> org/python/core/PyObject (Try Any))) @@ -193,8 +202,8 @@ (value [] java/lang/Object)) (import: LuxValue - ["[1]::[0]" - (value [] java/lang/Object)]) + "[1]::[0]" + (value [] java/lang/Object)) (def: (read host_object) Translator @@ -287,7 +296,8 @@ (java/lang/Class java/lang/Object) (java/lang/Object::getClass (java/lang/Object::new))) - (import: library/lux/Function) + (import: library/lux/Function + "[1]::[0]") (def: (to_host|array to_host it) (-> (-> Any org/python/core/PyObject) Any org/python/core/PyObject) -- cgit v1.2.3