# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1366137707 -10800
# Node ID 235be7aaa383085cf45cdf6fd71826250ce7a446
# Parent  e8224750f5767b65c2f7c3ba6910f2cd20a15615
More fixes in reordering.

diff -r e8224750f576 -r 235be7aaa383 dmeval.c
--- 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)