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

Properly handle error reporting with method_missing

Browse Source
This commit is contained in:
Jason Turner 2016-10-26 10:08:53 -06:00
parent ab07872857
commit 508729ec77
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -963,6 +963,7 @@ namespace chaiscript
This_Foist fi(*this, l_params.front()); This_Foist fi(*this, l_params.front());
try {
auto func = boxed_cast<std::shared_ptr<const dispatch::Proxy_Function_Base>>(bv); auto func = boxed_cast<std::shared_ptr<const dispatch::Proxy_Function_Base>>(bv);
try { try {
return (*func)({l_params.begin() + l_num_params, l_params.end()}, l_conversions); return (*func)({l_params.begin() + l_num_params, l_params.end()}, l_conversions);
@ -971,6 +972,11 @@ namespace chaiscript
} catch (const chaiscript::exception::guard_error &) { } catch (const chaiscript::exception::guard_error &) {
} }
throw chaiscript::exception::dispatch_error({l_params.begin() + l_num_params, l_params.end()}, std::vector<Const_Proxy_Function>{func}); throw chaiscript::exception::dispatch_error({l_params.begin() + l_num_params, l_params.end()}, std::vector<Const_Proxy_Function>{func});
} catch (const chaiscript::exception::bad_boxed_cast &) {
// unable to convert bv into a Proxy_Function_Base
throw chaiscript::exception::dispatch_error({l_params.begin() + l_num_params, l_params.end()},
std::vector<Const_Proxy_Function>(l_funs.begin(), l_funs.end()));
}
} else { } else {
return bv; return bv;
} }