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

Handle the ReturnVal exception at the eval_function level so that functions passed back to C++ land have their return values handled properly

Browse Source
This commit is contained in:
Jason Turner
2009-06-21 19:45:36 +00:00
parent dc11237af9
commit 786d194689
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chaiscript/callbacktest.cpp
View File

@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
boost::function<std::string (const std::string&, const std::string &)> f = boost::function<std::string (const std::string&, const std::string &)> f =
dispatchkit::build_functor<std::string (const std::string &, const std::string &)> dispatchkit::build_functor<std::string (const std::string &, const std::string &)>
(chai, "function(x, y) { x + y }"); (chai, "function(x, y) { return x + y }");
std::cout << "Functor call: " << f("Hello", " World") << std::endl; std::cout << "Functor call: " << f("Hello", " World") << std::endl;
} }

9
chaiscript/chaiscript_eval.hpp
View File

@@ -43,7 +43,14 @@ namespace chaiscript
ss.add_object(param_names[i], vals[i]); ss.add_object(param_names[i], vals[i]);
} }
dispatchkit::Boxed_Value retval = eval_token(ss, node); dispatchkit::Boxed_Value retval;
try {
retval = eval_token(ss, node);
} catch (const ReturnValue &rv) {
retval = rv.retval;
}
ss.pop_scope(); ss.pop_scope();
return retval; return retval;
} }

2
samples/callbacks.chai
View File

@@ -1,5 +1,5 @@
cb_handler.add_callbacks( function() { "First"; }, function (x) { x * 1.1; } ); cb_handler.add_callbacks( function() { "First"; }, function (x) { x * 1.1; } );
cb_handler.add_callbacks( function() { "TimesThree"; }, function(x) { x * 3.0} ); cb_handler.add_callbacks( function() { "TimesThree"; }, function(x) { return x * 3.0} );
cb_handler.add_callbacks( function() { "DivOnePtTwo"; }, function (x) { x / 1.2; } ); cb_handler.add_callbacks( function() { "DivOnePtTwo"; }, function (x) { x / 1.2; } );