mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.format: Handle formats expecting an integer in Lua 5.3+ (fixes #1371)

Browse source
This commit is contained in:
Kim Alvefur 2019-05-30 13:41:05 +02:00
parent 2a65eae651
commit 236abc4afe
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spec/util_format_spec.lua
View file

@ -12,6 +12,7 @@ describe("util.format", function()
assert.equal("[true]", format("%d", true));
assert.equal("% [true]", format("%%", true));
assert.equal("{ }", format("%q", { }));
assert.equal("[1.5]", format("%d", 1.5));
end);
end);
end);

6
util/format.lua
View file

@ -7,6 +7,9 @@ local unpack = table.unpack or unpack; -- luacheck: ignore 113/unpack
local pack = require "util.table".pack; -- TODO table.pack in 5.2+
local type = type;
local dump = require "util.serialization".new("debug");
local num_type = math.type;
local expects_integer = num_type and { c = true, d = true, i = true, o = true, u = true, X = true, x = true, } or {};
local function format(formatstring, ...)
local args = pack(...);
@ -43,6 +46,9 @@ local function format(formatstring, ...)
elseif type(arg) ~= "number" then -- arg isn't number as expected?
args[i] = tostring(arg);
spec = "[%s]";
elseif expects_integer[option] and num_type(arg) ~= "integer" then
args[i] = tostring(arg);
spec = "[%s]";
end
end
return spec;