debugger.lua

@@ -1,19 +1,11 @@
-local function copyObject(o)
+local function execDebug()
-  local obj = {}
-  for k,v in pairs(o) do
-    obj[k] = v
-  end
-  return obj
-end
-
-local function execDebug(env)
   local input = io.input()
   local result = { pcall(input.read, input, "*l") }
   if not result[1] then
     return false, result[2]
   end
 
-  local func = load(result[2], "debug", "bt", env)
+  local func = load("return " .. result[2])
   if type(func) ~= "function" then
     return false, func
   end
@@ -21,12 +13,10 @@ local function execDebug(env)
   return pcall(func)
 end
 
-local function debugREPL(onResult, debugArgs)
+local function debugREPL(onResult)
-  local globalEnv = copyObject(_ENV)
-  globalEnv._debug = debugArgs
   local result, retval
   repeat
-    result, retval = execDebug(globalEnv)
+    result, retval = execDebug()
     if result and type(onResult) == "function" then
       onResult(retval)
     end

storage/itemstack.lua

@@ -7,10 +7,10 @@ local Debugger = require("debugger")
 local ItemStack = Sentinel:tag({}, Sentinel.ITEMSTACK)
 ItemStack.__index = ItemStack
 
-local function hookDebugger(context)
+local function hookDebugger()
   local errorCond = Debugger.debugREPL(function(retval)
     Logger:error("->", retval)
-  end, context)
+  end)
   Logger:error("x>", errorCond)
 end
 
@@ -202,7 +202,7 @@ end
 function ItemStack:transferTo(target, count)
   if target:getMaxCount() == nil then
     Logger:error("Max count is nil?", target, "\n", self, "\n", count)
-    hookDebugger({ target = target, count = count, self = self })
+    hookDebugger()
   end
   local cap = math.min(count or self:getCount(), target:getMaxCount() - target:getCount(), self:getCount())
 
@@ -233,7 +233,7 @@ function ItemStack:transferTo(target, count)
       target:getInventory().getItemLimit(target:getSlot()), "\n",
       result
     )
-    hookDebugger({ target = target, count = count, self = self, result = result, errC = errC, cap = cap })
+    hookDebugger()
   end
 
   target:_modify(result[2], self)