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

Switch get_function to default to not doing object lookup. Correct method eval to maintain method lambda syntax. Add unit test for method lambda

Browse Source
This commit is contained in:
Jonathan Turner
2009-08-21 20:05:05 +00:00
parent c539e0b458
commit 7e5b7cbd7a
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/chaiscript/dispatchkit/dispatchkit.hpp
View File

@@ -324,7 +324,7 @@ namespace chaiscript
std::vector<std::pair<std::string, std::multimap<std::string, Proxy_Function >::mapped_type> >
get_function(const std::string &t_name) const
{
return get_function_impl(t_name, true);
return get_function_impl(t_name, false);
}
/**

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

@@ -471,23 +471,32 @@ namespace chaiscript
}
}
std::string fun_name;
if (node->children[i]->identifier == Token_Type::Fun_Call) {
fun_name = node->children[i]->children[0]->text;
}
else {
fun_name = node->children[i]->text;
}
//std::string fun_name;
Boxed_Value fn;
try {
fn = ss.get_function(fun_name);
if (node->children[i]->identifier == Token_Type::Fun_Call) {
//fun_name = node->children[i]->children[0]->text;
fn = eval_token(ss, node->children[i]->children[0]);
}
else {
//fun_name = node->children[i]->text;
fn = eval_token(ss, node->children[i]);
}
}
catch(Eval_Error &ee) {
ss.set_stack(prev_stack);
throw Eval_Error(ee.reason, node->children[i]);
}
try {
//fn = ss.get_function(fun_name);
ss.set_stack(new_stack);
retval = dispatch(fn, plb);
//retval = dispatch(fn, plb);
retval = (*boxed_cast<Proxy_Function >(fn))(plb);
ss.set_stack(prev_stack);
}
catch(const dispatch_error &e){
ss.set_stack(prev_stack);
throw Eval_Error(std::string(e.what()) + " with function '" + fun_name + "'", node->children[i]);
throw Eval_Error(std::string(e.what()), node->children[i]);
}
catch(Return_Value &rv) {
ss.set_stack(prev_stack);

3
unittests/method_lambda.chai Normal file
View File

@@ -0,0 +1,3 @@
var addit = fun(x, y) { return x+y }
print(3.addit(4))

1
unittests/method_lambda.txt Normal file
View File

@@ -0,0 +1 @@
7