MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lua listdir_recursive: allow nil to be used for default arguments 

https://github.com/DFHack/dfhack/pull/1609#issuecomment-663803777
develop
lethosor 2020-07-25 13:02:35 -04:00
parent fcb14623a7
commit 7c921d8c91
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/LuaApi.cpp
Unescape Escape View File

@ -2404,10 +2404,10 @@ static int filesystem_listdir_recursive(lua_State *L)
luaL_checktype(L,1,LUA_TSTRING); luaL_checktype(L,1,LUA_TSTRING);
std::string dir=lua_tostring(L,1); std::string dir=lua_tostring(L,1);
int depth = 10; int depth = 10;
if (lua_gettop(L) >= 2) if (lua_gettop(L) >= 2 && !lua_isnil(L, 2))
depth = luaL_checkint(L, 2); depth = luaL_checkint(L, 2);
bool include_prefix = true; bool include_prefix = true;
if (lua_gettop(L) >= 3) if (lua_gettop(L) >= 3 && !lua_isnil(L, 3))
include_prefix = lua_toboolean(L, 3); include_prefix = lua_toboolean(L, 3);
std::map<std::string, bool> files; std::map<std::string, bool> files;
int err = DFHack::Filesystem::listdir_recursive(dir, files, depth, include_prefix); int err = DFHack::Filesystem::listdir_recursive(dir, files, depth, include_prefix);