mirror of
https://github.com/Bluewhale1337/ElvUIModernized.git
synced 2026-07-27 16:34:45 +00:00
fix error message for boolean argument
This commit is contained in:
@@ -31,8 +31,8 @@ local function toInt(x)
|
|||||||
return x
|
return x
|
||||||
end
|
end
|
||||||
function select(n, ...)
|
function select(n, ...)
|
||||||
if not (type(n) == "number" or (type(n) == "string" and n == "#")) then
|
if n ~= "#" and type(n) ~= "number" then
|
||||||
error(format("bad argument #1 to 'select' (number expected, got %s)", n and type(n) or "no value"), 2)
|
error(format("bad argument #1 to 'select' (number expected, got %s)", n ~= nil and type(n) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if n == "#" then
|
if n == "#" then
|
||||||
@@ -60,7 +60,7 @@ function math.modf(i)
|
|||||||
i = type(i) ~= "number" and tonumber(i) or i
|
i = type(i) ~= "number" and tonumber(i) or i
|
||||||
|
|
||||||
if type(i) ~= "number" then
|
if type(i) ~= "number" then
|
||||||
error(format("bad argument #1 to 'modf' (number expected, got %s)", i and type(i) or "no value"), 2)
|
error(format("bad argument #1 to 'modf' (number expected, got %s)", i ~= nil and type(i) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if i == 0 then
|
if i == 0 then
|
||||||
@@ -78,7 +78,7 @@ function math.cosh(i)
|
|||||||
i = type(i) ~= "number" and tonumber(i) or i
|
i = type(i) ~= "number" and tonumber(i) or i
|
||||||
|
|
||||||
if type(i) ~= "number" then
|
if type(i) ~= "number" then
|
||||||
error(format("bad argument #1 to 'cosh' (number expected, got %s)", i and type(i) or "no value"), 2)
|
error(format("bad argument #1 to 'cosh' (number expected, got %s)", i ~= nil and type(i) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if i < 0 then
|
if i < 0 then
|
||||||
@@ -105,7 +105,7 @@ function math.sinh(i)
|
|||||||
i = type(i) ~= "number" and tonumber(i) or i
|
i = type(i) ~= "number" and tonumber(i) or i
|
||||||
|
|
||||||
if type(i) ~= "number" then
|
if type(i) ~= "number" then
|
||||||
error(format("bad argument #1 to 'sinh' (number expected, got %s)", i and type(i) or "no value"), 2)
|
error(format("bad argument #1 to 'sinh' (number expected, got %s)", i ~= nil and type(i) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
local neg, x
|
local neg, x
|
||||||
@@ -147,7 +147,7 @@ function math.tanh(i)
|
|||||||
i = type(i) ~= "number" and tonumber(i) or i
|
i = type(i) ~= "number" and tonumber(i) or i
|
||||||
|
|
||||||
if type(i) ~= "number" then
|
if type(i) ~= "number" then
|
||||||
error(format("bad argument #1 to 'tanh' (number expected, got %s)", i and type(i) or "no value"), 2)
|
error(format("bad argument #1 to 'tanh' (number expected, got %s)", i ~= nil and type(i) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if i == 0 then
|
if i == 0 then
|
||||||
@@ -175,7 +175,7 @@ end
|
|||||||
|
|
||||||
function string.join(delimiter, ...)
|
function string.join(delimiter, ...)
|
||||||
if type(delimiter) ~= "string" and type(delimiter) ~= "number" then
|
if type(delimiter) ~= "string" and type(delimiter) ~= "number" then
|
||||||
error(format("bad argument #1 to 'join' (string expected, got %s)", delimiter and type(delimiter) or "no value"), 2)
|
error(format("bad argument #1 to 'join' (string expected, got %s)", delimiter ~= nil and type(delimiter) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if arg.n == 0 then
|
if arg.n == 0 then
|
||||||
@@ -188,11 +188,11 @@ strjoin = string.join
|
|||||||
|
|
||||||
function string.match(str, pattern, index)
|
function string.match(str, pattern, index)
|
||||||
if type(str) ~= "string" and type(str) ~= "number" then
|
if type(str) ~= "string" and type(str) ~= "number" then
|
||||||
error(format("bad argument #1 to 'match' (string expected, got %s)", str and type(str) or "no value"), 2)
|
error(format("bad argument #1 to 'match' (string expected, got %s)", str ~= nil and type(str) or "no value"), 2)
|
||||||
elseif type(pattern) ~= "string" and type(pattern) ~= "number" then
|
elseif type(pattern) ~= "string" and type(pattern) ~= "number" then
|
||||||
error(format("bad argument #2 to 'match' (string expected, got %s)", pattern and type(pattern) or "no value"), 2)
|
error(format("bad argument #2 to 'match' (string expected, got %s)", pattern ~= nil and type(pattern) or "no value"), 2)
|
||||||
elseif index and type(index) ~= "number" and (type(index) ~= "string" or index == "") then
|
elseif index and type(tonumber(index)) ~= "number" then
|
||||||
error(format("bad argument #3 to 'match' (number expected, got %s)", index and type(index) or "no value"), 2)
|
error(format("bad argument #3 to 'match' (number expected, got %s)", index ~= nil and type(index) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
local i1, i2, match, match2 = find(str, pattern, index)
|
local i1, i2, match, match2 = find(str, pattern, index)
|
||||||
@@ -212,7 +212,7 @@ strmatch = string.match
|
|||||||
|
|
||||||
function string.reverse(str)
|
function string.reverse(str)
|
||||||
if type(str) ~= "string" and type(str) ~= "number" then
|
if type(str) ~= "string" and type(str) ~= "number" then
|
||||||
error(format("bad argument #1 to 'reverse' (string expected, got %s)", str and type(str) or "no value"), 2)
|
error(format("bad argument #1 to 'reverse' (string expected, got %s)", str ~= nil and type(str) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
local size = len(str)
|
local size = len(str)
|
||||||
@@ -231,9 +231,9 @@ strrev = string.reverse
|
|||||||
|
|
||||||
function string.split(delimiter, str)
|
function string.split(delimiter, str)
|
||||||
if type(delimiter) ~= "string" and type(delimiter) ~= "number" then
|
if type(delimiter) ~= "string" and type(delimiter) ~= "number" then
|
||||||
error(format("bad argument #1 to 'split' (string expected, got %s)", delimiter and type(delimiter) or "no value"), 2)
|
error(format("bad argument #1 to 'split' (string expected, got %s)", delimiter ~= nil and type(delimiter) or "no value"), 2)
|
||||||
elseif type(str) ~= "string" and type(str) ~= "number" then
|
elseif type(str) ~= "string" and type(str) ~= "number" then
|
||||||
error(format("bad argument #2 to 'split' (string expected, got %s)", str and type(str) or "no value"), 2)
|
error(format("bad argument #2 to 'split' (string expected, got %s)", str ~= nil and type(str) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
local fields = {}
|
local fields = {}
|
||||||
@@ -273,9 +273,9 @@ local escapeSequences = {
|
|||||||
}
|
}
|
||||||
function string.trim(str, chars)
|
function string.trim(str, chars)
|
||||||
if type(str) ~= "string" and type(str) ~= "number" then
|
if type(str) ~= "string" and type(str) ~= "number" then
|
||||||
error(format("bad argument #1 to 'trim' (string expected, got %s)", str and type(str) or "no value"), 2)
|
error(format("bad argument #1 to 'trim' (string expected, got %s)", str ~= nil and type(str) or "no value"), 2)
|
||||||
elseif chars and (type(chars) ~= "string" and type(chars) ~= "number") then
|
elseif chars and (type(chars) ~= "string" and type(chars) ~= "number") then
|
||||||
error(format("bad argument #2 to 'trim' (string expected, got %s)", chars and type(chars) or "no value"), 2)
|
error(format("bad argument #2 to 'trim' (string expected, got %s)", chars ~= nil and type(chars) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if chars then
|
if chars then
|
||||||
@@ -340,7 +340,7 @@ end
|
|||||||
|
|
||||||
function table.maxn(t)
|
function table.maxn(t)
|
||||||
if type(t) ~= "table" then
|
if type(t) ~= "table" then
|
||||||
error(format("bad argument #1 to 'maxn' (table expected, got %s)", t and type(t) or "no value"), 2)
|
error(format("bad argument #1 to 'maxn' (table expected, got %s)", t ~= nil and type(t) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
local maxn = 0
|
local maxn = 0
|
||||||
@@ -358,7 +358,7 @@ end
|
|||||||
|
|
||||||
function table.wipe(t)
|
function table.wipe(t)
|
||||||
if type(t) ~= "table" then
|
if type(t) ~= "table" then
|
||||||
error(format("bad argument #1 to 'wipe' (table expected, got %s)", t and type(t) or "no value"), 2)
|
error(format("bad argument #1 to 'wipe' (table expected, got %s)", t ~= nil and type(t) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
for k in pairs(t) do
|
for k in pairs(t) do
|
||||||
|
|||||||
@@ -209,9 +209,9 @@ end
|
|||||||
|
|
||||||
function difftime(time2, time1)
|
function difftime(time2, time1)
|
||||||
if type(time2) ~= "number" then
|
if type(time2) ~= "number" then
|
||||||
error(format("bad argument #1 to 'difftime' (number expected, got %s)", time2 and type(time2) or "no value"), 2)
|
error(format("bad argument #1 to 'difftime' (number expected, got %s)", time2 ~= nil and type(time2) or "no value"), 2)
|
||||||
elseif time1 and type(time1) ~= "number" then
|
elseif time1 and type(time1) ~= "number" then
|
||||||
error(format("bad argument #2 to 'difftime' (number expected, got %s)", time1 and type(time1) or "no value"), 2)
|
error(format("bad argument #2 to 'difftime' (number expected, got %s)", time1 ~= nil and type(time1) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
return time1 and time2 - time1 or time2
|
return time1 and time2 - time1 or time2
|
||||||
@@ -321,7 +321,7 @@ end
|
|||||||
|
|
||||||
function GetMapNameByID(id)
|
function GetMapNameByID(id)
|
||||||
if not (type(id) == "string" or type(id) == "number") then
|
if not (type(id) == "string" or type(id) == "number") then
|
||||||
error(format("Bad argument #1 to \"GetMapNameByID\" (number expected, got %s)", id and type(id) or "no value"), 2)
|
error(format("Bad argument #1 to \"GetMapNameByID\" (number expected, got %s)", id ~= nil and type(id) or "no value"), 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
return mapByID[tonumber(id)]
|
return mapByID[tonumber(id)]
|
||||||
@@ -382,7 +382,7 @@ end
|
|||||||
|
|
||||||
function CreateStatusBarTexturePointer(statusbar)
|
function CreateStatusBarTexturePointer(statusbar)
|
||||||
if type(statusbar) ~= "table" then
|
if type(statusbar) ~= "table" then
|
||||||
error(format("Bad argument #1 to \"CreateStatusBarTexturePointer\" (table expected, got %s)", statusbar and type(statusbar) or "no value"), 2)
|
error(format("Bad argument #1 to \"CreateStatusBarTexturePointer\" (table expected, got %s)", statusbar ~= nil and type(statusbar) or "no value"), 2)
|
||||||
elseif not (statusbar.GetObjectType and statusbar:GetObjectType() == "StatusBar") then
|
elseif not (statusbar.GetObjectType and statusbar:GetObjectType() == "StatusBar") then
|
||||||
error("Bad argument #1 to \"CreateStatusBarTexturePointer\" (statusbar object expected)", 2)
|
error("Bad argument #1 to \"CreateStatusBarTexturePointer\" (statusbar object expected)", 2)
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user