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

Show (short) list of possible enum values when an invalid value is encountered (resolves #1318)

Browse Source 
All enum errors have (hopefully) been changed to a luax_enumerror, which has a
fixed error message. If additionally a list of valid options is passed, it
lists that in the error message. For every enum error with few options I've
implemented this using a getConstants call.

This solution has been designed specifically to reduce the number of template
instantiations (as I've been told that was a concern). All new template code
happens in places where there already was an instantiation of the relevant
StringMap. Of course there is still std::vector<std::string>...

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2017-10-02 17:11:53 +02:00
parent ac84589c57
commit 9e4374935d
72 changed files with 366 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Texture.cpp
+8 -8
View File
@@ -35,7 +35,7 @@ int w_Texture_getTextureType(lua_State *L)
Texture *t = luax_checktexture(L, 1);
const char *tstr;
if (!Texture::getConstant(t->getTextureType(), tstr))
return luaL_error(L, "unknown texture type");
return luax_enumerror(L, "texture type", Texture::getConstants(TEXTURE_MAX_ENUM), tstr);
lua_pushstring(L, tstr);
return 1;
}
@@ -138,9 +138,9 @@ int w_Texture_setFilter(lua_State *L)
const char *magstr = luaL_optstring(L, 3, minstr);
if (!Texture::getConstant(minstr, f.min))
return luaL_error(L, "Invalid filter mode: %s", minstr);
return luax_enumerror(L, "filter mode", Texture::getConstants(f.min), minstr);
if (!Texture::getConstant(magstr, f.mag))
return luaL_error(L, "Invalid filter mode: %s", magstr);
return luax_enumerror(L, "filter mode", Texture::getConstants(f.mag), magstr);
f.anisotropy = (float) luaL_optnumber(L, 4, 1.0);
@@ -178,7 +178,7 @@ int w_Texture_setMipmapFilter(lua_State *L)
{
const char *mipmapstr = luaL_checkstring(L, 2);
if (!Texture::getConstant(mipmapstr, f.mipmap))
return luaL_error(L, "Invalid filter mode: %s", mipmapstr);
return luax_enumerror(L, "filter mode", Texture::getConstants(f.mipmap), mipmapstr);
}
luax_catchexcept(L, [&](){ t->setFilter(f); });
@@ -213,11 +213,11 @@ int w_Texture_setWrap(lua_State *L)
const char *rstr = luaL_optstring(L, 4, sstr);
if (!Texture::getConstant(sstr, w.s))
return luaL_error(L, "Invalid wrap mode: %s", sstr);
return luax_enumerror(L, "wrap mode", Texture::getConstants(w.s), sstr);
if (!Texture::getConstant(tstr, w.t))
return luaL_error(L, "Invalid wrap mode, %s", tstr);
return luax_enumerror(L, "wrap mode", Texture::getConstants(w.t), tstr);
if (!Texture::getConstant(rstr, w.r))
return luaL_error(L, "Invalid wrap mode, %s", rstr);
return luax_enumerror(L, "wrap mode", Texture::getConstants(w.r), rstr);
luax_pushboolean(L, t->setWrap(w));
return 1;
@@ -275,7 +275,7 @@ int w_Texture_setDepthSampleMode(lua_State *L)
mode.hasValue = true;
if (!getConstant(str, mode.value))
return luaL_error(L, "Invalid compare mode: %s", str);
return luax_enumerror(L, "compare mode", getConstants(mode.value), str);
}
luax_catchexcept(L, [&]() { t->setDepthSampleMode(mode); });