debugger.lua

@@ -28,19 +28,14 @@ end
 local function debugREPL(onResult, debugArgs)
   local globalEnv = copyObject(_ENV)
   globalEnv._debug = debugArgs
-  local shouldExit = false
-  globalEnv.exit = function()
-    shouldExit = true
-  end
   local result, retval
   repeat
     result, retval = execDebug(globalEnv)
     if result and type(onResult) == "function" then
       onResult(retval)
     end
-  until shouldExit or not result
-  local success = result and shouldExit
-  return success, (not success and retval) or nil
+  until not result
+  return retval
 end
 
 return { debugREPL = debugREPL, execDebug = execDebug }

storage/itemstack.lua

@@ -8,15 +8,12 @@ local ItemStack = Sentinel:tag({}, Sentinel.ITEMSTACK)
 ItemStack.__index = ItemStack
 
 local function hookDebugger(context)
-  local result, retval
-  repeat
-    result, retval = Debugger.debugREPL(function(r)
-      Logger:error("->", r)
+  while true do
+    local errorCond = Debugger.debugREPL(function(retval)
+      Logger:error("->", retval)
     end, context)
-    if not result then
-      Logger:error("x>", retval)
-    end
-  until result
+    Logger:error("x>", errorCond)
+  end
 end
 
 function ItemStack:fromDetail(inv, detail, slot)