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

Move type registration into module code, and fix problems with unloading of modules and type conversions registered inside of a module.

Browse Source 
We have to allow the same type registration more than once now, just in case several different modules register the same conversion.
This commit is contained in:
Jason Turner
2010-08-03 01:17:38 +00:00
parent 4358564065
commit f4e4f92dae
4 changed files with 98 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,12 @@ namespace chaiscript
return *this;
}
Module &add(const Dynamic_Cast_Conversion &d)
{
m_conversions.push_back(d);
return *this;
}
Module &add(const Proxy_Function &f, const std::string &name)
{
m_funcs.push_back(std::make_pair(f, name));
@@ -63,12 +69,14 @@ namespace chaiscript
apply(m_typeinfos.begin(), m_typeinfos.end(), t_engine);
apply(m_funcs.begin(), m_funcs.end(), t_engine);
apply_eval(m_evals.begin(), m_evals.end(), t_eval);
apply_single(m_conversions.begin(), m_conversions.end(), t_engine);
}
private:
std::vector<std::pair<Type_Info, std::string> > m_typeinfos;
std::vector<std::pair<Proxy_Function, std::string> > m_funcs;
std::vector<std::string> m_evals;
std::vector<Dynamic_Cast_Conversion> m_conversions;
template<typename T, typename InItr>
void apply(InItr begin, InItr end, T &t) const
@@ -80,6 +88,16 @@ namespace chaiscript
}
}
template<typename T, typename InItr>
void apply_single(InItr begin, InItr end, T &t) const
{
while (begin != end)
{
t.add(*begin);
++begin;
}
}
template<typename T, typename InItr>
void apply_eval(InItr begin, InItr end, T &t) const
{
@@ -89,8 +107,6 @@ namespace chaiscript
++begin;
}
}
};
typedef boost::shared_ptr<Module> ModulePtr;
@@ -213,9 +229,19 @@ namespace chaiscript
~Dispatch_Engine()
{
detail::Dynamic_Conversions::get().cleanup(m_conversions.begin(), m_conversions.end());
Boxed_Value::clear_cache();
}
/**
* Add a new conversion for upcasting to a base class
*/
void add(const Dynamic_Cast_Conversion &d)
{
m_conversions.push_back(d);
return detail::Dynamic_Conversions::get().add_conversion(d);
}
/**
* Add a new named Proxy_Function to the system
*/
@@ -755,6 +781,7 @@ namespace chaiscript
std::multimap<std::string, Proxy_Function> function_cache;
};
std::vector<Dynamic_Cast_Conversion> m_conversions;
chaiscript::threading::Thread_Storage<Stack_Holder> m_stack_holder;