actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

By default, don't return Invalid values from Enum::Check. It's the exception

Browse Source 
that Invalid has a meaning for an API call; most do not.  As it was, every
function that used Enum::Check should have been checking for invalid
return values; this way, the check can be omitted.

(This applies to FromString, Pop and FromStack, too; I havn't decided
whether I want to propagate this into those.)
This commit is contained in:
Glenn Maynard
2006-10-11 05:18:12 +00:00
parent 2201d813b2
commit ed6141c48f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/EnumHelper.cpp
+7 -1
View File
@@ -3,11 +3,17 @@
#include "LuaManager.h" #include "LuaManager.h"
#include "RageUtil.h" #include "RageUtil.h"
int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const char *szType ) int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const char *szType, bool bAllowInvalid )
{ {
if( lua_isnil(L, iPos) ) if( lua_isnil(L, iPos) )
{
if( bAllowInvalid )
return iInvalid; return iInvalid;
LuaHelpers::Push( L, ssprintf("Expected %s; got nil", szType) );
lua_error( L );
}
iPos = LuaHelpers::AbsIndex( L, iPos ); iPos = LuaHelpers::AbsIndex( L, iPos );
table.PushSelf( L ); table.PushSelf( L );
stepmania/src/EnumHelper.h
+3 -3
View File
@@ -12,7 +12,7 @@ extern "C"
#define FOREACH_ENUM_N( e, max, var ) for( e var=(e)0; var<max; enum_add<e>( var, +1 ) ) #define FOREACH_ENUM_N( e, max, var ) for( e var=(e)0; var<max; enum_add<e>( var, +1 ) )
#define FOREACH_ENUM( e, var ) for( e var=(e)0; var<NUM_##e; enum_add<e>( var, +1 ) ) #define FOREACH_ENUM( e, var ) for( e var=(e)0; var<NUM_##e; enum_add<e>( var, +1 ) )
int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const char *szType ); int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const char *szType, bool bAllowInvalid );
template<typename T> template<typename T>
struct EnumTraits struct EnumTraits
@@ -28,9 +28,9 @@ template<typename T> LuaReference EnumTraits<T>::EnumToString;
namespace Enum namespace Enum
{ {
template<typename T> template<typename T>
static T Check( lua_State *L, int iPos ) static T Check( lua_State *L, int iPos, bool bAllowInvalid = false )
{ {
return (T) CheckEnum( L, EnumTraits<T>::StringToEnum, iPos, EnumTraits<T>::Invalid, EnumTraits<T>::szName ); return (T) CheckEnum( L, EnumTraits<T>::StringToEnum, iPos, EnumTraits<T>::Invalid, EnumTraits<T>::szName, bAllowInvalid );
} }
template<typename T> template<typename T>
static void Push( lua_State *L, T iVal ) static void Push( lua_State *L, T iVal )