Changeset 16884

Timestamp:

Mar 8, 2008, 11:24:02 AM (18 years ago)

Author:

eugene

Message:

remove bogus test at start of code, fix loop order to be like while not do

File:

• trunk/Ohana/src/opihi/cmd.basic/run_while.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.basic/run_while.c

@@ -15 +15 @@
   }
 
-  val = dvomath (1, &argv[1], &size, 0);
-  if (val == NULL) return (FALSE);
-  logic = atof (val); /* warning: round-off error is a danger */
-  free (val);
-  
   NLINES = D_NLINES;
   ALLOCATE (loop.line, char *, NLINES);
@@ -76 +71 @@
   REALLOCATE (loop.line, char *, MAX (loop.Nlines, 1));
 
+  // test the logic once before running the loop
+  logic_line = strcreate (argv[1]);
+  logic_line = expand_vars (logic_line);
+  val = dvomath (1, &logic_line, &size, 0);
+  free (logic_line);
+
+  // if we have a parse failure, return FALSE
+  if (val == NULL) return (FALSE);
+  logic = atof (val); /* warning: round-off error is a danger */
+  free (val);
+
   /* execute for loop */
-  do { 
+  while (logic) { 
     status = exec_loop (&loop);
     if (loop_next) continue;
@@ -88 +94 @@
     free (logic_line);
 
-    if (val == NULL) return (FALSE);
-    logic = atof (val); /* warning: round-off error is a danger */
-    free (val);
-  } while (logic && !interrupt);
+    logic = FALSE;
+    if (val) {
+      logic = atof (val); /* warning: round-off error is a danger */
+      free (val);
+    }
+  }
   /* 'last' and 'next' should only affect one loop */
   loop_last = loop_next = FALSE;