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

Only allow class in top level scope

Browse Source 
* Throw error if class is in unexpected place
 * Allow catching of `eval_error` from inside of script

closes #297
This commit is contained in:
Jason Turner
2016-10-28 10:56:12 -06:00
parent 77231461ca
commit a38b254a98
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/chaiscript/language/chaiscript_eval.hpp
View File

@@ -1313,11 +1313,8 @@ namespace chaiscript
try {
retval = this->children[0]->eval(t_ss);
}
catch (exception::eval_error &) {
if (this->children.back()->identifier == AST_Node_Type::Finally) {
this->children.back()->children[0]->eval(t_ss);
}
throw;
catch (const exception::eval_error &e) {
retval = handle_exception(t_ss, Boxed_Value(std::ref(e)));
}
catch (const std::runtime_error &e) {
retval = handle_exception(t_ss, Boxed_Value(std::ref(e)));