Skip to content

Commit

Permalink
Only show deprecation notice of using slash in require if the file is…
Browse files Browse the repository at this point in the history
… found.
  • Loading branch information
MikuAuahDark committed Nov 22, 2022
1 parent 8cda22e commit b738668
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/modules/filesystem/wrap_Filesystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -866,9 +866,7 @@ static void replaceAll(std::string &str, const std::string &substr, const std::s
int loader(lua_State *L)
{
std::string modulename = luax_checkstring(L, 1);

if (modulename.find('/') != std::string::npos)
luax_markdeprecated(L, 2, "character in require string (forward slashes), use dots instead.", API_CUSTOM);
bool hasSlash = modulename.find('/') != std::string::npos;

for (char &c : modulename)
{
Expand All @@ -884,6 +882,9 @@ int loader(lua_State *L)
Filesystem::Info info = {};
if (inst->getInfo(element.c_str(), info) && info.type != Filesystem::FILETYPE_DIRECTORY)
{
if (hasSlash)
luax_markdeprecated(L, 2, "character in require string (forward slashes), use dots instead.", API_CUSTOM);

lua_pop(L, 1);
lua_pushstring(L, element.c_str());
return w_load(L);
Expand Down

0 comments on commit b738668

Please sign in to comment.