Simplify use of enum helper

This commit is contained in:
Jason Turner
2016-01-02 19:59:54 -07:00
parent e32714c456
commit 888d897a3e
2 changed files with 10 additions and 8 deletions

View File

@@ -69,8 +69,7 @@ namespace chaiscript
typename std::enable_if<std::is_enum<Enum>::value, void>::type
add_class(ModuleType &t_module,
const std::string &t_class_name,
const std::vector<chaiscript::Proxy_Function> &t_constructors,
const std::vector<std::pair<chaiscript::Boxed_Value, std::string>> &t_constants)
const std::vector<std::pair<typename std::underlying_type<Enum>::type, std::string>> &t_constants)
{
t_module.add(chaiscript::user_type<Enum>(), t_class_name);
@@ -83,9 +82,12 @@ namespace chaiscript
return assign<Enum>(not_equal<Enum>(equal<Enum>()));
}());
t_module.add(chaiscript::fun([](const Enum &e, const typename std::underlying_type<Enum>::type &i) { return e == i; }), "==");
t_module.add(chaiscript::fun([](const typename std::underlying_type<Enum>::type &i, const Enum &e) { return i == e; }), "==");
for (const auto &constant : t_constants)
{
t_module.add_global_const(constant.first, constant.second);
t_module.add_global_const(chaiscript::const_var(Enum(constant.first)), constant.second);
}
}
}