generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some initialization and destructor cleanups

Browse Source
This commit is contained in:
Jason Turner
2016-04-09 22:10:06 -06:00
parent 08a68f310a
commit 4bf619c80f
5 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,11 +418,9 @@ namespace chaiscript
std::vector<std::pair<std::string, Boxed_Value>> m_boxed_functions;
std::map<std::string, Boxed_Value> m_global_objects;
Type_Name_Map m_types;
std::set<std::string> m_reserved_words;
State &operator=(const State &) = default;
State() = default;
State(const State &) = default;
std::set<std::string> m_reserved_words
= {"def", "fun", "while", "for", "if", "else", "&&", "||", ",", "auto",
"return", "break", "true", "false", "class", "attr", "var", "global", "GLOBAL", "_"};
};
Dispatch_Engine()
@@ -430,10 +428,6 @@ namespace chaiscript
{
}
~Dispatch_Engine()
{
}
/// \brief casts an object while applying any Dynamic_Conversion available
template<typename Type>
typename detail::Cast_Helper<Type>::Result_Type boxed_cast(const Boxed_Value &bv) const
@@ -892,12 +886,6 @@ namespace chaiscript
return rets;
}
void add_reserved_word(const std::string &name)
{
chaiscript::detail::threading::unique_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
m_state.m_reserved_words.insert(name);
}
const Type_Conversions &conversions() const
{