From a27af663fe758cce938dcb475f621095d345b44c Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Sat, 6 Jun 2009 16:03:47 +0000 Subject: [PATCH] Fixed compound equations to have the correct ordering --- wesley/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wesley/main.cpp b/wesley/main.cpp index 543b339..516ab04 100644 --- a/wesley/main.cpp +++ b/wesley/main.cpp @@ -154,15 +154,14 @@ Boxed_Value eval_token(BoxedCPP_System &ss, TokenPtr node) { } else { Param_List_Builder plb; - plb << retval; plb << eval_token(ss, node->children[i]); + plb << retval; try { retval = dispatch(ss.get_function(node->children[i+1]->text), plb); } catch(std::exception &e){ 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 &tokens, const char *filename) std::pair results = rule(iter, end, parent); if (results.second) { - debug_print(parent, ""); + //debug_print(parent, ""); return parent; } else {