Changeset 9844

Timestamp:

Nov 3, 2006, 7:24:42 AM (20 years ago)

Author:

eugene

Message:

fixed while evaluation

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/run_while.c (modified) (2 diffs)
• lib.shell/expand_vars.c (modified) (1 diff)

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

@@ -6 +6 @@
 
   int ThisList, depth, i, done, status, NLINES, j;
-  char *input, *val;
+  char *input, *val, *logic_line;
   int logic, size;
   Macro loop;
@@ -83 +83 @@
     if (loop_continue) continue;
 
-    val = dvomath (1, &argv[1], &size, 0);
+    logic_line = strcreate (argv[1]);
+    logic_line = expand_vars (logic_line);
+    val = dvomath (1, &logic_line, &size, 0);
+    free (logic_line);
+
     if (val == NULL) return (FALSE);
     logic = atof (val); /* warning: round-off error is a danger */

trunk/Ohana/src/opihi/lib.shell/expand_vars.c

@@ -11 +11 @@
   found = FALSE;
   ALLOCATE (newline, char, 1024);  /* WARNING: this limits the length of the input line */
+
+  V0 = thiscomm (line);
+  if (V0 && !strncmp ("while", V0, strlen(V0))) {
+      // special case: don't expand variables in while () statement
+      strcpy (newline, line);
+      free (line);
+      return (newline);
+  }
 
   /* look for form $a$b..$n and expand only the last ones */