coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-02-05 17:30:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor noexcept adjustments

Browse Source
This commit is contained in:
Jason Turner 2017-11-12 04:09:37 -07:00
parent df21840feb
commit 91bcf1187e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/chaiscript/dispatchkit/dispatchkit.hpp
View File

@ -199,13 +199,13 @@ namespace chaiscript
bool has_function(const Proxy_Function &new_f, const std::string_view &name) noexcept bool has_function(const Proxy_Function &new_f, const std::string_view &name) noexcept
{ {
return std::any_of(m_funcs.begin(), m_funcs.end(), return std::any_of(m_funcs.begin(), m_funcs.end(),
[&](const std::pair<Proxy_Function, std::string> &existing_f) { [&](const std::pair<Proxy_Function, std::string> &existing_f) {
return existing_f.second == name && *(existing_f.first) == *(new_f); return existing_f.second == name && *(existing_f.first) == *(new_f);
} }
); );
} }
private: private:
std::vector<std::pair<Type_Info, std::string>> m_typeinfos; std::vector<std::pair<Type_Info, std::string>> m_typeinfos;
@ -215,14 +215,14 @@ namespace chaiscript
std::vector<Type_Conversion> m_conversions; std::vector<Type_Conversion> m_conversions;
template<typename T, typename InItr> template<typename T, typename InItr>
static void apply(InItr begin, const InItr end, T &t) static void apply(InItr begin, const InItr end, T &t)
{ {
for_each(begin, end, for_each(begin, end,
[&t](const auto &obj) { [&t](const auto &obj) {
try { try {
t.add(obj.first, obj.second); t.add(obj.first, obj.second);
} catch (const chaiscript::exception::name_conflict_error &) { } catch (const chaiscript::exception::name_conflict_error &) {
/// \todo Should we throw an error if there's a name conflict /// \todo Should we throw an error if there's a name conflict
/// while applying a module? /// while applying a module?
} }
} }
@ -266,7 +266,7 @@ namespace chaiscript
namespace detail namespace detail
{ {
/// A Proxy_Function implementation that is able to take /// A Proxy_Function implementation that is able to take
/// a vector of Proxy_Functions and perform a dispatch on them. It is /// a vector of Proxy_Functions and perform a dispatch on them. It is
/// used specifically in the case of dealing with Function object variables /// used specifically in the case of dealing with Function object variables
class Dispatch_Function final : public dispatch::Proxy_Function_Base class Dispatch_Function final : public dispatch::Proxy_Function_Base
{ {
@ -386,7 +386,7 @@ namespace chaiscript
template <class T> template <class T>
using SmallVector = std::vector<T>; using SmallVector = std::vector<T>;
typedef SmallVector<std::pair<std::string, Boxed_Value>> Scope; typedef SmallVector<std::pair<std::string, Boxed_Value>> Scope;
typedef SmallVector<Scope> StackData; typedef SmallVector<Scope> StackData;

4
include/chaiscript/dispatchkit/type_info.hpp
View File

@ -34,7 +34,7 @@ namespace chaiscript
{ {
public: public:
constexpr Type_Info(const bool t_is_const, const bool t_is_reference, const bool t_is_pointer, const bool t_is_void, constexpr Type_Info(const bool t_is_const, const bool t_is_reference, const bool t_is_pointer, const bool t_is_void,
const bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bare_ti) const bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bare_ti) noexcept
: m_type_info(t_ti), m_bare_type_info(t_bare_ti), : m_type_info(t_ti), m_bare_type_info(t_bare_ti),
m_flags((static_cast<unsigned int>(t_is_const) << is_const_flag) m_flags((static_cast<unsigned int>(t_is_const) << is_const_flag)
+ (static_cast<unsigned int>(t_is_reference) << is_reference_flag) + (static_cast<unsigned int>(t_is_reference) << is_reference_flag)
@ -44,7 +44,7 @@ namespace chaiscript
{ {
} }
constexpr Type_Info() = default; constexpr Type_Info() noexcept = default;
constexpr bool operator<(const Type_Info &ti) const noexcept constexpr bool operator<(const Type_Info &ti) const noexcept
{ {