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

Finished documenting chaiscript side

Browse Source
This commit is contained in:
Jonathan Turner
2009-07-09 12:26:19 +00:00
parent b8dec6c187
commit bf8d58163a
4 changed files with 344 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
chaiscript/chaiscript_engine.hpp
View File

@@ -48,11 +48,11 @@ namespace chaiscript
try {
val = dispatchkit::boxed_cast<std::string &>(vals[0]);
}
catch (EvalError &ee) {
throw EvalError("Can not evaluate string: " + val + " reason: " + ee.reason, TokenPtr());
catch (Eval_Error &ee) {
throw Eval_Error("Can not evaluate string: " + val + " reason: " + ee.reason, TokenPtr());
}
catch (std::exception &e) {
throw EvalError("Can not evaluate string: " + val, TokenPtr());
throw Eval_Error("Can not evaluate string: " + val, TokenPtr());
}
return evaluate_string(val);
}
@@ -109,13 +109,13 @@ namespace chaiscript
value = eval_token<Eval_Engine>(engine, parser.ast());
}
}
catch (const ReturnValue &rv) {
catch (const Return_Value &rv) {
value = rv.retval;
}
catch (Parse_Error &pe) {
std::cout << pe.reason << " in " << pe.filename << " at " << pe.position.line << ", " << pe.position.column << std::endl;
}
catch (EvalError &ee) {
catch (Eval_Error &ee) {
if (filename != std::string("__EVAL__")) {
std::cout << "Eval error: \"" << ee.reason << "\" in '" << ee.location->filename << "' line: " << ee.location->start.line << std::endl;
}