len0rd/Concord
1
0
Fork 0
mirror of https://github.com/Keyslam-Group/Concord.git synced 2025-08-31 17:38:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix utils.loadNamespace when passed a table

Browse source
This commit is contained in:
Pablo Ariel Mayobre 2023-02-14 18:14:23 -03:00
parent c4594da19d
commit 07bd5d0f28
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
concord/utils.lua
View file

@ -21,13 +21,13 @@ end
-- @param namespace A table that will hold the required files
-- @treturn table The namespace table
function Utils.loadNamespace(pathOrFiles, namespace)
if (type(pathOrFiles) ~= "string" and type(pathOrFiles) ~= "table") then
if type(pathOrFiles) ~= "string" and type(pathOrFiles) ~= "table" then
error("bad argument #1 to 'loadNamespace' (string/table of strings expected, got "..type(pathOrFiles)..")", 2)
end
if (type(pathOrFiles) == "string") then
if type(pathOrFiles) == "string" then
local info = love.filesystem.getInfo(pathOrFiles) -- luacheck: ignore
if (info == nil or info.type ~= "directory") then
if info == nil or info.type ~= "directory" then
error("bad argument #1 to 'loadNamespace' (path '"..pathOrFiles.."' not found)", 2)
end
@ -47,16 +47,16 @@ function Utils.loadNamespace(pathOrFiles, namespace)
if namespace then namespace[file] = value end
end
end
elseif (type(pathOrFiles == "table")) then
elseif type(pathOrFiles) == "table" then
for _, path in ipairs(pathOrFiles) do
if (type(path) ~= "string") then
if type(path) ~= "string" then
error("bad argument #2 to 'loadNamespace' (string/table of strings expected, got table containing "..type(path)..")", 2) -- luacheck: ignore
end
local name = path
local dotIndex, slashIndex = path:match("^.*()%."), path:match("^.*()%/")
if (dotIndex or slashIndex) then
if dotIndex or slashIndex then
name = path:sub((dotIndex or slashIndex) + 1)
end