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

Fixed compound equations to have the correct ordering

Browse Source
This commit is contained in:
Jonathan Turner 2009-06-06 16:03:47 +00:00
parent b8eb887ac9
commit a27af663fe
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wesley/main.cpp
View File

@ -154,15 +154,14 @@ Boxed_Value eval_token(BoxedCPP_System &ss, TokenPtr node) {
} }
else { else {
Param_List_Builder plb; Param_List_Builder plb;
plb << retval;
plb << eval_token(ss, node->children[i]); plb << eval_token(ss, node->children[i]);
plb << retval;
try { try {
retval = dispatch(ss.get_function(node->children[i+1]->text), plb); retval = dispatch(ss.get_function(node->children[i+1]->text), plb);
} }
catch(std::exception &e){ catch(std::exception &e){
throw EvalError("Can not find appropriate '" + node->children[i+1]->text + "'", node->children[i+1]); throw EvalError("Can not find appropriate '" + node->children[i+1]->text + "'", node->children[i+1]);
} }
ss.add_object(node->children[i]->text, retval);
} }
} }
} }
@ -441,7 +440,7 @@ TokenPtr parse(Rule &rule, std::vector<TokenPtr> &tokens, const char *filename)
std::pair<Token_Iterator, bool> results = rule(iter, end, parent); std::pair<Token_Iterator, bool> results = rule(iter, end, parent);
if (results.second) { if (results.second) {
debug_print(parent, ""); //debug_print(parent, "");
return parent; return parent;
} }
else { else {