From c2397620a92c0d73cdedeff1912cbd9f13ff090a Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Thu, 14 Mar 2019 17:57:30 -0700 Subject: Fix for luajit error handling (old Lua 5.1 API uses getfenv) --- error_handling.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'error_handling.lua') diff --git a/error_handling.lua b/error_handling.lua index 4799ce2..6774e55 100644 --- a/error_handling.lua +++ b/error_handling.lua @@ -96,10 +96,16 @@ enhance_error = function(error_message) local action_name = fn_name:from_lua_id() error_message = "The action '" .. tostring(action_name) .. "' is not defined." local func = debug.getinfo(2, 'f').func - local ename, env = debug.getupvalue(func, 1) - if not (ename == "_ENV" or ename == "_G") then - func = debug.getinfo(3, 'f').func + local env + if _VERSION == "Lua 5.1" then + env = getfenv(func) + else + local ename ename, env = debug.getupvalue(func, 1) + if not (ename == "_ENV" or ename == "_G") then + func = debug.getinfo(3, 'f').func + ename, env = debug.getupvalue(func, 1) + end end local THRESHOLD = math.min(4.5, .9 * #action_name) local candidates = { } -- cgit v1.2.3