Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Throw when parsing a string as enum if the string parses as integer but does not exist in enum

Browse source
This commit is contained in:
theoreticalbts 2016-08-26 15:29:15 -04:00
parent 8d99ea94e6
commit 80b2341e77
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/fc/reflect/reflect.hpp
View file

@ -120,7 +120,8 @@ void fc::reflector<TYPE>::visit( const Visitor& v ) { \
#define FC_REFLECT_ENUM_FROM_STRING( r, enum_type, elem ) \ #define FC_REFLECT_ENUM_FROM_STRING( r, enum_type, elem ) \
if( strcmp( s, BOOST_PP_STRINGIZE(elem) ) == 0 ) return enum_type::elem; if( strcmp( s, BOOST_PP_STRINGIZE(elem) ) == 0 ) return enum_type::elem;
#define FC_REFLECT_ENUM_FROM_STRING_CASE( r, enum_type, elem ) \
case enum_type::elem:
#define FC_REFLECT_ENUM( ENUM, FIELDS ) \ #define FC_REFLECT_ENUM( ENUM, FIELDS ) \
namespace fc { \ namespace fc { \
@ -158,7 +159,15 @@ template<> struct reflector<ENUM> { \
{ \ { \
fc::throw_bad_enum_cast( s, BOOST_PP_STRINGIZE(ENUM) ); \ fc::throw_bad_enum_cast( s, BOOST_PP_STRINGIZE(ENUM) ); \
} \ } \
return ENUM(i);\ ENUM e = ENUM(i); \
switch( e ) \
{ \
BOOST_PP_SEQ_FOR_EACH( FC_REFLECT_ENUM_FROM_STRING_CASE, ENUM, FIELDS ) \
break; \
default: \
fc::throw_bad_enum_cast( s, BOOST_PP_STRINGIZE(ENUM) ); \
} \
return e;\
} \ } \
}; \ }; \
} }