Actually test callAndWait(), then fix it.

2 files changed, 14 insertions, 4 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
 
 -- Stuff called from the wire protocol has to be global, but I think this means just global to this file.
 function stop()         paused = true           end
-function result(...)    return {...}            end
 function quit()         running = false         end
 
 
@@ -112,10 +111,10 @@ function mt.callAndWait(name, ...)
 
   mt.callAndReturn(name, ...);
   -- Eventually a sendForth() is called, which should end up passing through SendToChannel().
-  -- Wait for the result, which should be something like - result({x=0.45, y=0.6, z=1.8})
+  -- Wait for the result, which should be a Lua value as a string.
   local message = luaproc.receive(SID)
   if message then
-    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
+    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
     if nil == result then
       msg("Not a valid result: " .. message .. "  ERROR MESSAGE: " .. errorMsg)
     else
diff --git a/LuaSL/src/LuaSL_test.c b/LuaSL/src/LuaSL_test.c
index 0f07704..55196cb 100644
--- a/LuaSL/src/LuaSL_test.c
+++ b/LuaSL/src/LuaSL_test.c
@@ -224,7 +224,18 @@ static Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Con_Event_Server_D
                 sendForth(game, SID, "run()");
             }
             else
-                PI("Command %s from script %s", command, SID);
+            {
+                if (0 == strcmp(command, "llGetKey()"))                 // Send back a random UUID for testing.
+                    sendForth(game, SID, "\"%08lx-%04lx-%04lx-%04lx-%012lx\"", random(), random() % 0xFFFF, random() % 0xFFFF, random() % 0xFFFF, random());
+                else if (0 == strcmp(command, "llGetPos()"))            // Send back a fixed position for testing.
+                    sendForth(game, SID, "{x=128.0, y=128.0, z=128.0}");
+                else if (0 == strcmp(command, "llGetRot()"))            // Send back a fixed rotation for testing.
+                    sendForth(game, SID, "{x=0.0, y=0.0, z=0.0, s=1.0}");
+                else if (0 == strcmp(command, "llGetObjectDesc()"))     // Send back a blank description for testing.
+                    sendForth(game, SID, "\"\"");
+                else
+                    PI("Command %s from script %s", command, SID);
+            }
         }
 
         // Get the next blob to check it.