diff options
Diffstat (limited to 'LuaSL/src/LSL.lua')
-rw-r--r-- | LuaSL/src/LSL.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/LuaSL/src/LSL.lua b/LuaSL/src/LSL.lua index 676f4ad..ea16285 100644 --- a/LuaSL/src/LSL.lua +++ b/LuaSL/src/LSL.lua | |||
@@ -32,7 +32,6 @@ local paused = false | |||
32 | 32 | ||
33 | -- Stuff called from the wire protocol has to be global, but I think this means just global to this file. | 33 | -- Stuff called from the wire protocol has to be global, but I think this means just global to this file. |
34 | function stop() paused = true end | 34 | function stop() paused = true end |
35 | function result(...) return {...} end | ||
36 | function quit() running = false end | 35 | function quit() running = false end |
37 | 36 | ||
38 | 37 | ||
@@ -112,10 +111,10 @@ function mt.callAndWait(name, ...) | |||
112 | 111 | ||
113 | mt.callAndReturn(name, ...); | 112 | mt.callAndReturn(name, ...); |
114 | -- Eventually a sendForth() is called, which should end up passing through SendToChannel(). | 113 | -- Eventually a sendForth() is called, which should end up passing through SendToChannel(). |
115 | -- Wait for the result, which should be something like - result({x=0.45, y=0.6, z=1.8}) | 114 | -- Wait for the result, which should be a Lua value as a string. |
116 | local message = luaproc.receive(SID) | 115 | local message = luaproc.receive(SID) |
117 | if message then | 116 | if message then |
118 | result, errorMsg = loadstring(message) -- "The environment of the returned function is the global environment." Though normally, a function inherits it's environment from the function creating it. Which is what we want. lol | 117 | result, errorMsg = loadstring("return " .. message) -- "The environment of the returned function is the global environment." Though normally, a function inherits it's environment from the function creating it. Which is what we want. lol |
119 | if nil == result then | 118 | if nil == result then |
120 | msg("Not a valid result: " .. message .. " ERROR MESSAGE: " .. errorMsg) | 119 | msg("Not a valid result: " .. message .. " ERROR MESSAGE: " .. errorMsg) |
121 | else | 120 | else |