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

- Replaced intentional divide-by-zeroes with math.huge

Browse Source 
- Added Monk to raid class color list
This commit is contained in:
Parnic
2012-07-01 03:07:02 +00:00
parent aa995f13a5
commit fdf529ae6e
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Categories/Misc.lua
View File

@ -307,7 +307,7 @@ DogTag:AddTag("Base", "FormatDuration", {
end
format = format:sub(1, 1):lower()
if format == "e" then
if number == 1/0 then
if number == math.huge then
return negative .. "***"
end
@ -369,7 +369,7 @@ DogTag:AddTag("Base", "FormatDuration", {
end
return s
elseif format == "f" then
if number == 1/0 then
if number == math.huge then
return negative .. "***"
elseif number >= 60*60*24 then
return ("%s%.0f%s %02d%s %02d%s %02d%s"):format(negative, math.floor(number/86400), L_DAY_ONELETTER_ABBR, number/3600 % 24, L_HOUR_ONELETTER_ABBR, number/60 % 60, L_MINUTE_ONELETTER_ABBR, number % 60, L_SECOND_ONELETTER_ABBR)
@ -381,7 +381,7 @@ DogTag:AddTag("Base", "FormatDuration", {
return ("%s%d%s"):format(negative, number, L_SECOND_ONELETTER_ABBR)
end
elseif format == "s" then
if number == 1/0 then
if number == math.huge then
return negative .. "***"
elseif number >= 2*60*60*24 then
return ("%s%.1f %s"):format(negative, number/86400, L_DAYS_ABBR)
@ -395,7 +395,7 @@ DogTag:AddTag("Base", "FormatDuration", {
return ("%s%.1f %s"):format(negative, number, L_SECONDS_ABBR)
end
else
if number == 1/0 then
if number == math.huge then
return ("%s**%d **:**:**"):format(negative, L_DAY_ONELETTER_ABBR)
elseif number >= 60*60*24 then
return ("%s%.0f%s %d:%02d:%02d"):format(negative, math.floor(number/86400), L_DAY_ONELETTER_ABBR, number/3600 % 24, number/60 % 60, number % 60)

8
Compiler.lua
View File

@ -322,10 +322,10 @@ end
local function numberToString(num)
if type(num) ~= "number" then
return tostring(num)
elseif num == 1/0 then
return "1/0"
elseif num == -1/0 then
return "-1/0"
elseif num == math.huge then
return "NaN"
elseif num == -math.huge then
return "-NaN"
elseif math.floor(num) == num then
return tostring(num)
else

15
test.lua
View File

@ -32,7 +32,7 @@ local function key_sort(alpha, bravo)
if type_alpha ~= type_bravo then
return type_alpha < type_bravo
end
if type_alpha == "string" then
return alpha:lower() < bravo:lower()
elseif type_alpha == "number" then
@ -103,13 +103,13 @@ local function is_equal(alpha, bravo)
if type(alpha) ~= type(bravo) then
return false
end
if type(alpha) == "number" then
return alpha == bravo or tostring(alpha) == tostring(bravo) or math.abs(alpha - bravo) < 1e-15
elseif type(alpha) ~= "table" then
return alpha == bravo
end
local num = 0
for k,v in pairs(alpha) do
num = num + 1
@ -117,7 +117,7 @@ local function is_equal(alpha, bravo)
return false
end
end
for k,v in pairs(bravo) do
num = num - 1
end
@ -287,6 +287,7 @@ RAID_CLASS_COLORS = {
SHAMAN = { r = 0.14, g = 0.35, b = 1 },
WARLOCK = { r = 0.58, g = 0.51, b = 0.79 },
WARRIOR = { r = 0.78, g = 0.61, b = 0.43 },
MONK = { r = 0.0, g = 1.00 , b = 0.59 },
}
local GetMouseFocus_data = nil
@ -1524,7 +1525,7 @@ assert_equal(DogTag:Evaluate("[CheckNilDefault('Test')]"), nil)
assert_equal(DogTag:Evaluate("[CheckNilDefault(One)]"), 1)
assert_equal(DogTag:Evaluate(("x"):rep(10000)), ("x"):rep(10000))
assert_equal(DogTag:Evaluate("[" .. ("x"):rep(10000) .. "]"), "Unknown tag " .. ("x"):rep(10000))
assert_equal(DogTag:Evaluate("[" .. ("1"):rep(10000) .. "]"), 1/0)
assert_equal(DogTag:Evaluate("[" .. ("1"):rep(10000) .. "]"), math.huge)
assert_equal(DogTag:Evaluate("[1 + 2]"), 3)
assert_equal(DogTag:Evaluate("[1 - 2]"), -1)
@ -1533,10 +1534,12 @@ assert_equal(DogTag:Evaluate("[1 / 2]"), 1/2)
assert_equal(DogTag:Evaluate("[0 / 0]"), 0) -- odd case, good for WoW
assert_equal(standardize(parse("[1 / 0]")), { "/", 1, 0 })
assert_equal(standardize(parse("[(1 / 0)]")), { "/", 1, 0 })
--[[ Parnic: 1/0 and -1/0 is not usually supported on PTRs, could go live that way
assert_equal(DogTag:Evaluate("[1 / 0]"), 1/0)
assert_equal(DogTag:Evaluate("[(1 / 0)]"), 1/0)
assert_equal(DogTag:Evaluate("[-1 / 0]"), -1/0)
assert_equal(DogTag:Evaluate("[-(1 / 0)]"), -1/0)
--]]
assert_equal(parse("[(1 / 0)]"), { "(", { "/", 1, 0 } })
assert_equal(DogTag:Evaluate("[5 % 3]"), 2)
assert_equal(DogTag:Evaluate("[5 ^ 3]"), 125)
@ -3053,7 +3056,7 @@ local function func(event, ...)
assert_equal(event, "MY_EVENT")
assert_equal(..., expectedArg)
assert_equal(select('#', ...), expectedNumArgs)
fired = true
end
DogTag:AddEventHandler("Base", "MY_EVENT", func)