wow-mods/libdogtag-3-0
1
0
Fork 0
mirror of https://github.com/parnic/LibDogTag-3.0.git synced 2025-06-16 20:20:14 -05:00
Code Issues Projects Releases Wiki Activity

Replaced convoluted xpcall implementations with much simple pcall implementations.

Browse Source
This commit is contained in:
cybeloras
2012-04-02 22:33:55 +00:00
parent d545f021f3
commit a9a04a218f
2 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Compiler.lua
View File

@ -1885,24 +1885,6 @@ local function readjustKwargs(ast, nsList, kwargTypes)
return ast
end
local safeCompile__code
local safeCompile__ast
local safeCompile__nsList
local safeCompile__u
local safeCompile__cachedTags
local safeCompile__events
local safeCompile__functions
local safeCompile__extraKwargs
local function safeCompile()
return compile(safeCompile__ast, safeCompile__nsList, safeCompile__u, safeCompile__cachedTags, safeCompile__events, safeCompile__functions, safeCompile__extraKwargs, 'nil;number;string', 'result')
end
local function errorhandler(err)
local _, minor = LibStub(MAJOR_VERSION)
geterrorhandler()(("%s.%d: Error with code %q (%s). %s"):format(MAJOR_VERSION, minor, safeCompile__code, safeCompile__nsList, err))
return err
end
--[[
Notes:
This is mostly used for debugging purposes
@ -2008,9 +1990,14 @@ function DogTag:CreateFunctionFromCode(code, nsList, kwargs, notDebug)
local w = newList()
local events = newList()
local functions = newList()
safeCompile__code, safeCompile__ast, safeCompile__nsList, safeCompile__u, safeCompile__cachedTags, safeCompile__events, safeCompile__functions, safeCompile__extraKwargs = code, ast, nsList, w, cachedTags, events, functions, extraKwargs
local good, ret, types, static = xpcall(safeCompile, errorhandler)
safeCompile__code, safeCompile__ast, safeCompile__nsList, safeCompile__u, safeCompile__cachedTags, safeCompile__events, safeCompile__functions, safeCompile__extraKwargs = nil
local good, ret, types, static = pcall(compile, ast, nsList, w, cachedTags, events, functions, extraKwargs, 'nil;number;string', 'result')
if not good then
local err = ret
local _, minor = LibStub(MAJOR_VERSION)
geterrorhandler()(("%s.%d: Error with code %q (%s). %s"):format(MAJOR_VERSION, minor, code, nsList, err))
end
for i, v in ipairs(w) do
u[#u+1] = v
end
@ -2150,16 +2137,6 @@ function DogTag:CreateFunctionFromCode(code, nsList, kwargs, notDebug)
end
end
local call__func, call__kwargs, call__code, call__nsList
local function call()
return call__func(call__kwargs)
end
local function errorhandler(err)
local _, minor = LibStub(MAJOR_VERSION)
return geterrorhandler()(("%s.%d: Error with code %q (%s). %s"):format(MAJOR_VERSION, minor, call__code, call__nsList, err))
end
local codeEvaluationTime_mt = {__index = function(self, kwargTypes)
local t = newList()
self[kwargTypes] = t
@ -2184,9 +2161,14 @@ local function evaluate(code, nsList, kwargs)
if madeKwargs then
kwargs = newList()
end
call__func, call__kwargs, call__code, call__nsList = func, kwargs, code, nsList
local success, text, opacity, outline = xpcall(call, errorhandler)
call__func, call__kwargs, call__code, call__nsList = nil, nil, nil, nil
local success, text, opacity, outline = pcall(func, kwargs)
if not success then
local err = text
local _, minor = LibStub(MAJOR_VERSION)
return geterrorhandler()(("%s.%d: Error with code %q (%s). %s"):format(MAJOR_VERSION, minor, code, nsList, err))
end
if madeKwargs then
kwargs = del(kwargs)
end

17
LibDogTag-3.0.lua
View File

@ -297,13 +297,18 @@ local function updateFontString(fs)
local kwargTypes = kwargsToKwargTypes[kwargs]
local func = codeToFunction[nsList][kwargTypes][code]
DogTag.__isMouseOver = DogTag.__lastMouseover == fsToFrame[fs]
call__func, call__kwargs, call__code, call__nsList = func, kwargs, code, nsList
local success, ret, alpha, outline = xpcall(call, errorhandler)
call__func, call__kwargs, call__code, call__nsList = nil, nil, nil, nil
local success, text, opacity, outline = pcall(func, kwargs)
if not success then
local err = text
local _, minor = LibStub(MAJOR_VERSION)
return geterrorhandler()(("%s.%d: Error with code %q (%s). %s"):format(MAJOR_VERSION, minor, code, nsList, err))
end
if success then
fs:SetText(ret)
if alpha then
fs:SetAlpha(alpha)
fs:SetText(text)
if opacity then
fs:SetAlpha(opacity)
end
local a, b = fs:GetFont()
fs:SetFont(a, b, outline or '')