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

util.format: Fix Lua 5.1 quirks thanks to ALL THE TESTS

Browse source
This commit is contained in:
Kim Alvefur 2021-12-11 20:40:23 +01:00
parent 3d0844a4f5
commit db41cd8e4d
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/format.lua
View file

@ -29,7 +29,8 @@ local control_symbols = {
["\027"] = "\226\144\155", ["\028"] = "\226\144\156", ["\029"] = "\226\144\157",
["\030"] = "\226\144\158", ["\031"] = "\226\144\159", ["\127"] = "\226\144\161",
};
local supports_p = pcall(string.format, "%p", "");
local supports_p = pcall(string.format, "%p", ""); -- >= Lua 5.4
local supports_a = pcall(string.format, "%a", 0.0); -- > Lua 5.1
local function format(formatstring, ...)
local args = pack(...);
@ -66,6 +67,8 @@ local function format(formatstring, ...)
if option == "s" and t == "string" and not arg:find("[%z\1-\31\128-\255]") then
-- No UTF-8 or control characters, assumed to be the common case.
return
elseif option == "s" and t ~= "string" then
args[i] = tostring(arg);
end
if option ~= "s" and option ~= "q" and option ~= "p" then
@ -79,6 +82,8 @@ local function format(formatstring, ...)
elseif expects_integer[option] and num_type(arg) ~= "integer" then
args[i] = tostring(arg);
return "[%s]";
elseif (option == "a" or option == "A") and not supports_a then
return "%x";
else
return -- acceptable number
end