Support 5.2 style load() as well as 5.1's loadstring()/setfenv() combo

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/supple/request.lua b/lib/supple/request.lua
index ab8388a..1a4cdce 100644
--- a/lib/supple/request.lua
+++ b/lib/supple/request.lua
@@ -17,6 +17,7 @@ local tconcat = table.concat
 local ipairs = ipairs
 local select = select
 local loadstring = loadstring
+local load = load
 local setfenv = setfenv
 
 local function serialise_error(errstr, traceback)
@@ -98,8 +99,12 @@ end
 
 local function deserialise_entity(entity)
    local str = ("return {%s}"):format(entity)
-   local fn = assert(loadstring(str))
-   setfenv(fn, {})
+   local fn
+   if setfenv ~= nil then
+      fn = setfenv(assert(loadstring(str, "@supple-transfer")), {})
+   else
+      fn = load(str, "@supple-transfer", "t", {})
+   end
    local res = fn()
    local walk = res.args or res.results
    if walk then