Some fixes to Python integration.

[simantics/python.git] / org.simantics.pythonlink / scl / Simantics / Python.scl

diff --git a/org.simantics.pythonlink/scl/Simantics/Python.scl b/org.simantics.pythonlink/scl/Simantics/Python.scl
index 899f577eb2a3c921b8c4f1d9963f43e6dc08b320..375c5498d9312308547f52e0da21f80c382009b0 100644 (file)
--- a/org.simantics.pythonlink/scl/Simantics/Python.scl
+++ b/org.simantics.pythonlink/scl/Simantics/Python.scl
@@ -45,7 +45,7 @@ importJava "org.simantics.pythonlink.PythonContext" where
     @JavaName close\r
     closePythonContext :: PythonContext -> <Proc> ()\r
     \r
-    executePythonStatement :: String -> <Python, Proc> Integer\r
+    executePythonStatement :: String -> <Python, Proc> ()\r
     \r
     setPythonIntegerVariable :: String -> Integer -> <Python, Proc> ()\r
     setPythonIntegerArrayVariable :: String -> Vector Integer -> <Python, Proc> ()\r
@@ -63,12 +63,12 @@ importJava "org.simantics.pythonlink.PythonContext" where
     getPythonStringArrayVariable  :: String -> <Python, Proc> Vector String\r
     getPythonNDArrayVariable :: String -> <Python, Proc> NDArray\r
     \r
-    runPythonF :: (() -> <Python, Proc> a) -> <Proc> a\r
-    runWithPythonContextF :: PythonContext -> (() -> <Python, Proc> a) -> <Proc> a\r
-\r
 importJava "org.simantics.pythonlink.Python" where\r
     openPythonContext :: () -> <Proc> PythonContext\r
     \r
+    runPythonF :: (() -> <Python, Proc> a) -> <Proc> a\r
+    runWithPythonContextF :: PythonContext -> (() -> <Python, Proc> a) -> <Proc> a\r
+\r
 runPython :: (<Python, Proc> a) -> <Proc> a\r
 runPython v = runPythonF (\_ -> v)\r
 \r