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

Fixed repl scope leak after an exception

Browse Source
This commit is contained in:
Jonathan Turner
2009-07-03 03:13:05 +00:00
parent db9442d5a8
commit 78be32927c
3 changed files with 22 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
chaiscript/chaiscript_eval.hpp
View File

@@ -20,11 +20,16 @@ namespace chaiscript
try {
retval = eval_token(ss, node);
ss.pop_scope();
} catch (const ReturnValue &rv) {
retval = rv.retval;
ss.pop_scope();
} catch (...) {
ss.pop_scope();
throw;
}
ss.pop_scope();
return retval;
}
@@ -189,7 +194,7 @@ namespace chaiscript
throw EvalError("Out of bounds exception", node);
}
catch(const dispatchkit::dispatch_error &e){
throw EvalError("Can not find appropriate array lookup '[]'", node->children[i]);
throw EvalError("Can not find appropriate array lookup '[]' " + node->children[i]->text, node->children[i]);
}
}
}
@@ -541,7 +546,17 @@ namespace chaiscript
case (Token_Type::Block) : {
ss.new_scope();
for (i = 0; i < node->children.size(); ++i) {
retval = eval_token(ss, node->children[i]);
try {
retval = eval_token(ss, node->children[i]);
}
catch (const chaiscript::ReturnValue &rv) {
retval = rv.retval;
break;
}
catch (...) {
ss.pop_scope();
throw;
}
}
ss.pop_scope();
}