changeset 702:235be7aaa383

More fixes in reordering.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 16 Apr 2013 21:41:47 +0300
parents e8224750f576
children fae0900fc9e9
files dmeval.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/dmeval.c	Tue Apr 16 21:34:41 2013 +0300
+++ b/dmeval.c	Tue Apr 16 21:41:47 2013 +0300
@@ -786,9 +786,11 @@
             break;
 
         case OP_FUNC:
-            if ((tmp = dm_eval_push_node(result, node)) == NULL)
+            if ((tmp = dm_eval_add_node(result, OP_FUNC)) == NULL)
                 return -1;
 
+            tmp->id = node->id;
+
             for (i = 0; i < node->id->nargs; i++)
             {
                 if ((res = dm_eval_reorder(ev, node->args[i], &(tmp->args[i]))) != 0)
@@ -797,7 +799,7 @@
             break;
         
         case OP_SUBEXPR:
-            if ((tmp = dm_eval_push_node(result, node)) == NULL)
+            if ((tmp = dm_eval_add_node(result, OP_SUBEXPR)) == NULL)
                 return -1;
 
             if ((res = dm_eval_reorder(ev, node->subexpr, &(tmp->subexpr))) != 0)