LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +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/keyboard/wrap_Keyboard.cpp
+6 -6
View File
@@ -61,7 +61,7 @@ int w_isDown(lua_State *L)
const char *name = luaL_checkstring(L, -1);
if (!Keyboard::getConstant(name, k))
return luaL_error(L, "Invalid key constant: %s", name);
return luax_enumerror(L, "key constant", name);
keylist.push_back(k);
lua_pop(L, 1);
@@ -73,7 +73,7 @@ int w_isDown(lua_State *L)
{
const char *name = luaL_checkstring(L, i + 1);
if (!Keyboard::getConstant(name, k))
return luaL_error(L, "Invalid key constant: %s", name);
return luax_enumerror(L, "key constant", name);
keylist.push_back(k);
}
@@ -101,7 +101,7 @@ int w_isScancodeDown(lua_State *L)
const char *name = luaL_checkstring(L, -1);
if (!Keyboard::getConstant(name, scancode))
return luaL_error(L, "Invalid scancode: %s", name);
return luax_enumerror(L, "scancode", name);
scancodelist.push_back(scancode);
lua_pop(L, 1);
@@ -113,7 +113,7 @@ int w_isScancodeDown(lua_State *L)
{
const char *name = luaL_checkstring(L, i + 1);
if (!Keyboard::getConstant(name, scancode))
return luaL_error(L, "Invalid scancode: %s", name);
return luax_enumerror(L, "scancode", name);
scancodelist.push_back(scancode);
}
@@ -128,7 +128,7 @@ int w_getScancodeFromKey(lua_State *L)
const char *keystr = luaL_checkstring(L, 1);
Keyboard::Key key;
if (!Keyboard::getConstant(keystr, key))
return luaL_error(L, "Invalid key constant: %s", keystr);
return luax_enumerror(L, "key constant", keystr);
Keyboard::Scancode scancode = instance()->getScancodeFromKey(key);
@@ -145,7 +145,7 @@ int w_getKeyFromScancode(lua_State *L)
const char *scancodestr = luaL_checkstring(L, 1);
Keyboard::Scancode scancode;
if (!Keyboard::getConstant(scancodestr, scancode))
return luaL_error(L, "Invalid scancode: %s", scancodestr);
return luax_enumerror(L, "scancode", scancodestr);
Keyboard::Key key = instance()->getKeyFromScancode(scancode);