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

Make most love.filesystem functions return nil, err instead of erroring (when used correctly)

Browse Source 
Note that argument exceptions, for instance, are still thrown as errors.
Also fixes a potential uncaught exception with getSize being called for the optional
size arg in read, now it just uses the ALL constant instead.
File:read no longer opens and closes a file automagically (this was undocumented, and weird)

NOTE: the love.filesystem.lines iterator can still error, but this should only happen in
case there's something really, really wrong (otherwise love.filesystem.lines would've failed
already)
NOTE: love.filesystem.lines still errors, because otherwise you'd get weird errors from the for
loop (namely 'attempt to call nil value') instead of seeing anything useful
This commit is contained in:
Bart van Strien
2013-05-10 16:39:02 +02:00
parent 00060af4c1
commit 721d50c2ef
3 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/physfs/wrap_Filesystem.cpp
+20 -8
View File
@@ -21,6 +21,18 @@
// LOVE
#include "wrap_Filesystem.h"
static int ioError(lua_State *L, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
lua_pushnil(L);
lua_pushvfstring(L, fmt, args);
va_end(args);
return 2;
}
namespace love
{
namespace filesystem
@@ -113,7 +125,7 @@ int w_newFile(lua_State *L)
catch (love::Exception &e)
{
t->release();
return luaL_error(L, "%s", e.what());
return ioError(L, "%s", e.what());
}
}
@@ -141,7 +153,7 @@ int w_newFileData(lua_State *L)
}
catch (love::Exception &e)
{
return luaL_error(L, "%s", e.what());
return ioError(L, "%s", e.what());
}
luax_newtype(L, "FileData", FILESYSTEM_FILE_DATA_T, (void *) data);
return 1;
@@ -249,11 +261,11 @@ int w_read(lua_State *L)
}
catch (love::Exception &e)
{
return luaL_error(L, "%s", e.what());
return ioError(L, "%s", e.what());
}
if (data == 0)
return luaL_error(L, "File could not be read.");
return ioError(L, "File could not be read.");
// Push the string.
lua_pushlstring(L, (const char *) data->getData(), data->getSize());
@@ -297,7 +309,7 @@ static int w_write_or_append(lua_State *L, File::Mode mode)
}
catch (love::Exception &e)
{
return luaL_error(L, "%s", e.what());
return ioError(L, "%s", e.what());
}
luax_pushboolean(L, true);
@@ -356,7 +368,7 @@ int w_load(lua_State *L)
}
catch (love::Exception &e)
{
return luaL_error(L, "%s", e.what());
return ioError(L, "%s", e.what());
}
int status = luaL_loadbuffer(L, (const char *)data->getData(), data->getSize(), ("@" + filename).c_str());
@@ -407,12 +419,12 @@ int w_getSize(lua_State *L)
}
catch (love::Exception &e)
{
return luaL_error(L, "%s", e.what());
return ioError(L, "%s", e.what());
}
// Error on failure or if size does not fit into a double precision floating-point number.
if (size == -1)
return luaL_error(L, "Could not determine file size.");
return ioError(L, "Could not determine file size.");
else if (size >= 0x20000000000000LL)
return luaL_error(L, "Size too large to fit into a Lua number!");