Reuh/candran
1
0
Fork 0
mirror of https://github.com/Reuh/candran.git synced 2025-10-27 09:59:29 +00:00
Code Releases Activity

Fix string.format errors on Lua 5.1 when using booleans or nil

Browse source
This commit is contained in:
Étienne Fildadut 2021-06-09 13:43:52 +02:00
parent 66f1a5a3c2
commit 3c84d1fbdd
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/can
View file

@ -15,7 +15,7 @@ if args.help or args.h then
print("Default options:")
for opt, val in pairs(candran.default) do
if type(val) == "string" then val = val:gsub("\n", "\\n") end
print((" %s=%q"):format(opt, val))
print((" %s=%q"):format(opt, tostring(val)))
end
return
end

2
bin/canc
View file

@ -23,7 +23,7 @@ if #arg < 1 or args.help or args.h then
print("Default options:")
for opt, val in pairs(candran.default) do
if type(val) == "string" then val = val:gsub("\n", "\\n") end
print((" %s=%q"):format(opt, val))
print((" %s=%q"):format(opt, tostring(val)))
end
return
end

4
candran.can
View file

@ -203,7 +203,7 @@ local codeCache = {}
function candran.loadfile(filepath, env, options)
local f, err = io.open(filepath)
if not f then
return nil, "cannot open %s":format(err)
return nil, "cannot open %s":format(tostring(err))
end
local content = f:read("*a")
f:close()
@ -321,7 +321,7 @@ function candran.searcher(modpath)
if r then
return r(modpath, filepath)
else
error("error loading candran module '%s' from file '%s':\n\t%s":format(modpath, filepath, s), 0)
error("error loading candran module '%s' from file '%s':\n\t%s":format(modpath, filepath, tostring(s)), 0)
end
end, filepath
end

4
candran.lua
View file

@ -6541,7 +6541,7 @@ local codeCache = {} -- candran.can:200
candran["loadfile"] = function(filepath, env, options) -- candran.can:203
local f, err = io["open"](filepath) -- candran.can:204
if not f then -- candran.can:205
return nil, ("cannot open %s"):format(err) -- candran.can:206
return nil, ("cannot open %s"):format(tostring(err)) -- candran.can:206
end -- candran.can:206
local content = f:read("*a") -- candran.can:208
f:close() -- candran.can:209
@ -6651,7 +6651,7 @@ if r then -- candran.can:321
return r(modpath, filepath) -- candran.can:322
else -- candran.can:322
error(("error loading candran module '%s' from file '%s':\
%s"):format(modpath, filepath, s), 0) -- candran.can:324
%s"):format(modpath, filepath, tostring(s)), 0) -- candran.can:324
end -- candran.can:324
end, filepath -- candran.can:326
end -- candran.can:326