LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-18 03:34:23 +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/data/wrap_DataModule.cpp
+5 -5
View File
@@ -107,7 +107,7 @@ int w_compress(lua_State *L)
Compressor::Format format = Compressor::FORMAT_LZ4;
if (!Compressor::getConstant(fstr, format))
return luaL_error(L, "Invalid compressed data format: %s", fstr);
return luax_enumerror(L, "compressed data format", Compressor::getConstants(format), fstr);
int level = (int) luaL_optinteger(L, 3, -1);
@@ -146,7 +146,7 @@ int w_decompress(lua_State *L)
const char *fstr = luaL_checkstring(L, 1);
if (!Compressor::getConstant(fstr, format))
return luaL_error(L, "Invalid compressed data format: %s", fstr);
return luax_enumerror(L, "compressed data format", Compressor::getConstants(format), fstr);
size_t compressedsize = 0;
const char *cbytes = nullptr;
@@ -174,7 +174,7 @@ int w_encode(lua_State *L)
const char *formatstr = luaL_checkstring(L, 1);
EncodeFormat format;
if (!getConstant(formatstr, format))
return luaL_error(L, "Invalid encode format: %s", formatstr);
return luax_enumerror(L, "encode format", getConstants(format), formatstr);
size_t srclen = 0;
const char *src = nullptr;
@@ -208,7 +208,7 @@ int w_decode(lua_State *L)
const char *formatstr = luaL_checkstring(L, 1);
EncodeFormat format;
if (!getConstant(formatstr, format))
return luaL_error(L, "Invalid decode format: %s", formatstr);
return luax_enumerror(L, "decode format", getConstants(format), formatstr);
size_t srclen = 0;
const char *src = nullptr;
@@ -240,7 +240,7 @@ int w_hash(lua_State *L)
const char *fstr = luaL_checkstring(L, 1);
HashFunction::Function function;
if (!HashFunction::getConstant(fstr, function))
return luaL_error(L, "Invalid hash function: %s", fstr);
return luax_enumerror(L, "hash function", HashFunction::getConstants(function), fstr);
HashFunction::Value hashvalue;
if (lua_isstring(L, 2))