Mercurial > hg > dmlib

changeset 678:4a08ce0997bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 16 Apr 2013 15:06:43 +0300
parents 4b7cccaa62c0
children 1dc7bd5f99f7
files dmeval.c
diffstat 1 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/dmeval.c	Tue Apr 16 15:05:43 2013 +0300
+++ b/dmeval.c	Tue Apr 16 15:06:43 2013 +0300
@@ -829,9 +829,6 @@
 
 static int dm_eval_get(DMEvalContext *ev, DMEvalNode *node, DMValue *result)
 {
-    DMValue tmp[DM_MAX_ARGS];
-    int i;
-
     if (node == NULL)
         return -32;
     
@@ -849,18 +846,20 @@
             break;
 
         case OP_SUBEXPR:
-            if (dm_eval_exec(ev, node->subexpr, result) != 0)
-                return -1;
-            break;
+            return dm_eval_exec(ev, node->subexpr, result);
         
         case OP_FUNC:
-            for (i = 0; i < node->id->nargs; i++)
             {
-                if (dm_eval_exec(ev, node->args[i], &tmp[i]) != 0)
-                    return -1;
+                DMValue tmp[DM_MAX_ARGS];
+                int i;
+                for (i = 0; i < node->id->nargs; i++)
+                {
+                    if (dm_eval_exec(ev, node->args[i], &tmp[i]) != 0)
+                        return -1;
+                }
+                
+                *result = node->id->func(tmp);
             }
-            
-            *result = node->id->func(tmp);
             break;
 
         default:
@@ -949,7 +948,6 @@
                     return -4;
                 }
         }
-        
         node = node->next;
     }