love.filesystem.mkdir -> love.filesystem.createDirectory, love.filesystem.enumerate -> love.filesystem.getDirectoryItems. Resolves issue #609.

src/modules/filesystem/physfs/Filesystem.cpp

@@ -179,7 +179,7 @@ bool Filesystem::setupWriteDirectory()
 		return false;
 
 	// Create the save folder. (We're now "at" %APPDATA%).
-	if (!mkdir(skipDriveRoot(save_path_full).c_str()))
+	if (!createDirectory(skipDriveRoot(save_path_full).c_str()))
 	{
 		// Clear the write directory in case of error.
 		PHYSFS_setWriteDir(0);
@@ -416,12 +416,12 @@ bool Filesystem::isFile(const char *file) const
 	return exists(file) && !isDirectory(file);
 }
 
-bool Filesystem::mkdir(const char *file)
+bool Filesystem::createDirectory(const char *dir)
 {
 	if (PHYSFS_getWriteDir() == 0 && !setupWriteDirectory())
 		return false;
 
-	if (!PHYSFS_mkdir(file))
+	if (!PHYSFS_mkdir(dir))
 		return false;
 	return true;
 }
@@ -468,7 +468,7 @@ void Filesystem::append(const char *filename, const void *data, int64 size) cons
 		throw love::Exception("Data could not be written.");
 }
 
-int Filesystem::enumerate(lua_State *L)
+int Filesystem::getDirectoryItems(lua_State *L)
 {
 	const char *dir = luaL_checkstring(L, 1);
 

src/modules/filesystem/physfs/Filesystem.h

@@ -197,9 +197,9 @@ public:
 
 	/**
 	 * Creates a directory. Write dir must be set.
-	 * @param file The directory to create.
+	 * @param dir The directory to create.
 	 **/
-	bool mkdir(const char *file);
+	bool createDirectory(const char *dir);
 
 	/**
 	 * Removes a file (or directory).
@@ -266,7 +266,7 @@ public:
 	 * This "native" method returns a table of all
 	 * files in a given directory.
 	 **/
-	int enumerate(lua_State *L);
+	int getDirectoryItems(lua_State *L);
 
 	/**
 	 * Gets the last modification time of a file, in seconds

src/modules/filesystem/physfs/wrap_Filesystem.cpp

@@ -246,35 +246,35 @@ int w_getSourceBaseDirectory(lua_State *L)
 int w_exists(lua_State *L)
 {
 	const char *arg = luaL_checkstring(L, 1);
-	lua_pushboolean(L, instance->exists(arg) ? 1 : 0);
+	luax_pushboolean(L, instance->exists(arg));
 	return 1;
 }
 
 int w_isDirectory(lua_State *L)
 {
 	const char *arg = luaL_checkstring(L, 1);
-	lua_pushboolean(L, instance->isDirectory(arg) ? 1 : 0);
+	luax_pushboolean(L, instance->isDirectory(arg));
 	return 1;
 }
 
 int w_isFile(lua_State *L)
 {
 	const char *arg = luaL_checkstring(L, 1);
-	lua_pushboolean(L, instance->isFile(arg) ? 1 : 0);
+	luax_pushboolean(L, instance->isFile(arg));
 	return 1;
 }
 
-int w_mkdir(lua_State *L)
+int w_createDirectory(lua_State *L)
 {
 	const char *arg = luaL_checkstring(L, 1);
-	lua_pushboolean(L, instance->mkdir(arg) ? 1 : 0);
+	luax_pushboolean(L, instance->createDirectory(arg));
 	return 1;
 }
 
 int w_remove(lua_State *L)
 {
 	const char *arg = luaL_checkstring(L, 1);
-	lua_pushboolean(L, instance->remove(arg) ? 1 : 0);
+	luax_pushboolean(L, instance->remove(arg));
 	return 1;
 }
 
@@ -355,9 +355,9 @@ int w_append(lua_State *L)
 	return w_write_or_append(L, File::APPEND);
 }
 
-int w_enumerate(lua_State *L)
+int w_getDirectoryItems(lua_State *L)
 {
-	return instance->enumerate(L);
+	return instance->getDirectoryItems(L);
 }
 
 int w_lines(lua_State *L)
@@ -579,12 +579,12 @@ static const luaL_Reg functions[] =
 	{ "exists",  w_exists },
 	{ "isDirectory",  w_isDirectory },
 	{ "isFile",  w_isFile },
-	{ "mkdir",  w_mkdir },
+	{ "createDirectory",  w_createDirectory },
 	{ "remove",  w_remove },
 	{ "read",  w_read },
 	{ "write",  w_write },
 	{ "append", w_append },
-	{ "enumerate",  w_enumerate },
+	{ "getDirectoryItems",  w_getDirectoryItems },
 	{ "lines",  w_lines },
 	{ "load",  w_load },
 	{ "getLastModified", w_getLastModified },

src/modules/filesystem/physfs/wrap_Filesystem.h

@@ -53,14 +53,14 @@ int w_getSourceBaseDirectory(lua_State *L);
 int w_exists(lua_State *L);
 int w_isDirectory(lua_State *L);
 int w_isFile(lua_State *L);
-int w_mkdir(lua_State *L);
+int w_createDirectory(lua_State *L);
 int w_remove(lua_State *L);
 int w_open(lua_State *L);
 int w_close(lua_State *L);
 int w_read(lua_State *L);
 int w_write(lua_State *L);
 int w_append(lua_State *L);
-int w_enumerate(lua_State *L);
+int w_getDirectoryItems(lua_State *L);
 int w_lines(lua_State *L);
 int w_load(lua_State *L);
 int w_getLastModified(lua_State *L);