LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 04:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only show deprecation notice of using slash in require if the file is found.

Browse Source
This commit is contained in:
Miku AuahDark
2022-11-22 11:58:30 +08:00
parent 8cda22ef7d
commit b738668e9c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/wrap_Filesystem.cpp
+4 -3
View File
@@ -866,9 +866,7 @@ static void replaceAll(std::string &str, const std::string &substr, const std::s
int loader(lua_State *L) int loader(lua_State *L)
{ {
std::string modulename = luax_checkstring(L, 1); std::string modulename = luax_checkstring(L, 1);
bool hasSlash = modulename.find('/') != std::string::npos;
if (modulename.find('/') != std::string::npos)
luax_markdeprecated(L, 2, "character in require string (forward slashes), use dots instead.", API_CUSTOM);
for (char &c : modulename) for (char &c : modulename)
{ {
@@ -884,6 +882,9 @@ int loader(lua_State *L)
Filesystem::Info info = {}; Filesystem::Info info = {};
if (inst->getInfo(element.c_str(), info) && info.type != Filesystem::FILETYPE_DIRECTORY) 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_pop(L, 1);
lua_pushstring(L, element.c_str()); lua_pushstring(L, element.c_str());
return w_load(L); return w_load(L);