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

Tracking down the 'to_string in repl clobbers vars' issue, not done yet

Browse Source
This commit is contained in:
Jonathan Turner
2009-07-02 21:23:49 +00:00
parent 47052f710c
commit af4b1a2bfb
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
chaiscript/chaiscript_eval.hpp
View File

@@ -307,6 +307,10 @@ namespace chaiscript
ss.set_stack(prev_stack); ss.set_stack(prev_stack);
retval = rv.retval; retval = rv.retval;
} }
catch (const std::runtime_error &e) {
ss.set_stack(prev_stack);
throw;
}
} }
break; break;
@@ -356,6 +360,10 @@ namespace chaiscript
ss.set_stack(prev_stack); ss.set_stack(prev_stack);
retval = rv.retval; retval = rv.retval;
} }
catch (const std::runtime_error &e) {
ss.set_stack(prev_stack);
throw;
}
} }
} }
} }

27
chaiscript/main.cpp
View File

@@ -2,6 +2,24 @@
#include "chaiscript.hpp" #include "chaiscript.hpp"
dispatchkit::Boxed_Value evoke_fn(chaiscript::ChaiScript_Engine &chai, std::string name, dispatchkit::Param_List_Builder &plb) {
dispatchkit::Dispatch_Engine ss = chai.get_eval_engine();
dispatchkit::Dispatch_Engine::Stack prev_stack = ss.get_stack();
dispatchkit::Dispatch_Engine::Stack new_stack;
new_stack.push_back(dispatchkit::Dispatch_Engine::Scope());
ss.set_stack(new_stack);
try {
dispatchkit::Boxed_Value retval = dispatchkit::dispatch(ss.get_function(name), plb);
ss.set_stack(prev_stack);
return retval;
}
catch(...) {
ss.set_stack(prev_stack);
std::cout << "Exception caught" << std::endl;
throw;
}
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
std::string input; std::string input;
@@ -19,14 +37,11 @@ int main(int argc, char *argv[]) {
if (val.get_type_info().m_bare_type_info && *(val.get_type_info().m_bare_type_info) != typeid(void)) { if (val.get_type_info().m_bare_type_info && *(val.get_type_info().m_bare_type_info) != typeid(void)) {
try { try {
dispatchkit::Boxed_Value printeval dispatchkit::Boxed_Value printeval = evoke_fn(chai, "to_string", dispatchkit::Param_List_Builder() << val);
= dispatchkit::dispatch(chai.get_eval_engine().get_function("to_string"),
dispatchkit::Param_List_Builder() << val);
std::cout << "result: "; std::cout << "result: ";
dispatchkit::dispatch(chai.get_eval_engine().get_function("print"), evoke_fn(chai, "print", dispatchkit::Param_List_Builder() << printeval);
dispatchkit::Param_List_Builder() << printeval);
} catch (const std::runtime_error &e) { } catch (const std::runtime_error &e) {
//std::cout << "result: object #" << &val << " Error: " << e.what() << std::endl; std::cout << "result: object #" << &val << " Error: " << e.what() << std::endl;
} }
} }
std::cout << "eval> "; std::cout << "eval> ";