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_Text.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ int w_Text_setf(lua_State *L)
Font::AlignMode align;
const char *alignstr = luaL_checkstring(L, 4);
if (!Font::getConstant(alignstr, align))
return luaL_error(L, "Invalid align mode: %s", alignstr);
return luax_enumerror(L, "align mode", Font::getConstants(align), alignstr);
std::vector<Font::ColoredString> newtext;
luax_checkcoloredstring(L, 2, newtext);
@@ -111,7 +111,7 @@ int w_Text_addf(lua_State *L)
const char *alignstr = luaL_checkstring(L, 4);
if (!Font::getConstant(alignstr, align))
return luaL_error(L, "Invalid align mode: %s", alignstr);
return luax_enumerror(L, "align mode", Font::getConstants(align), alignstr);
if (luax_istype(L, 5, math::Transform::type))
{