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

util.format: Tweak how nil values are handled

Browse source 
Because [<nil>] seems exsessive
This commit is contained in:
Kim Alvefur 2018-11-28 20:36:53 +01:00
parent d84d0a52ce
commit d007771f8d
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/util_format_spec.lua
View file

@ -5,6 +5,8 @@ describe("util.format", function()
it("should work", function()
assert.equal("hello", format("%s", "hello"));
assert.equal("<nil>", format("%s"));
assert.equal("<nil>", format("%d"));
assert.equal("<nil>", format("%q"));
assert.equal(" [<nil>]", format("", nil));
assert.equal("true", format("%s", true));
assert.equal("[true]", format("%d", true));

9
util/format.lua
View file

@ -28,13 +28,12 @@ local function format(formatstring, ...)
if spec ~= "%%" then
i = i + 1;
local arg = args[i];
if arg == nil then -- special handling for nil
arg = "<nil>"
args[i] = "<nil>";
end
local option = spec:sub(-1);
if option == "q" or option == "s" then -- arg should be string
if arg == nil then
args[i] = "nil";
spec = "<%s>";
elseif option == "q" or option == "s" then -- arg should be string
args[i] = tostring(arg);
elseif type(arg) ~= "number" then -- arg isn't number as expected?
args[i] = tostring(arg);