Changeset 11119

Timestamp:

Jan 17, 2007, 3:39:12 PM (19 years ago)

Author:

eugene

Message:

fixed problem with list in macro

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/list.c (modified) (2 diffs)
• lib.shell/ListOps.c (modified) (2 diffs)

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

@@ -5 +5 @@
 int list (int argc, char **argv) {
 
-  int ThisList, depth, i, done;
+  int ThisList, depth, i, done, found;
   char *input, line[1024];
   int N, Nbytes, NBYTES, Nread, status;
@@ -37 +37 @@
   }
 
+  if ((argc > 2) && (!strcmp (argv[2], "-add"))) {
+    if (argc == 3) {
+      gprint (GP_ERR, "USAGE: list (root) -add (word) (word) ...\n");
+      return (FALSE);
+    }
+    
+    sprintf (line, "%s:n", argv[1]);
+    N = get_int_variable (line, &found);
+    for (i = 0; i < argc - 3; i++) {
+      sprintf (line, "%s:%d", argv[1], N + i);
+      set_str_variable (line, argv[i+3]);
+    }
+    sprintf (line, "%s:n", argv[1]);
+    set_int_variable (line, N + i);
+
+    return (TRUE);
+  }
+
   if (argc != 2) {
-    gprint (GP_ERR, "USAGE: list (root) -- terminate with 'END'\n");
+    gprint (GP_ERR, "USAGE: list (root)                : supply list data, terminate with 'END'\n");
+    gprint (GP_ERR, "USAGE: list (root) -x (command)   : create list from shell output\n");
+    gprint (GP_ERR, "USAGE: list (root) -split (words) : create list from words\n");
+    gprint (GP_ERR, "USAGE: list (root) -add (words)   : extend a list\n");
     return (FALSE);
   }

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

@@ -157 +157 @@
 }
 
+// list (word) : nested list
+// list (word) -x : not nested list
+// list (word) -split : not nested list
+int is_list_data (char *line) {
+
+  char *comm, *temp;
+
+  temp = thisword (nextword (nextword (line)));
+  comm = thisword (line);
+
+  if (comm == NULL) goto escape;
+
+  if (strcmp (comm, "list")) goto escape;
+
+  /* if (cond) (command) does not define a complete block */
+  if (temp != NULL) {
+      if (!strcmp (temp, "-x")) goto escape;
+      if (!strcmp (temp, "-split")) goto escape;
+      if (!strcmp (temp, "-add")) goto escape;
+  }
+
+  if (temp != NULL) free (temp);
+  if (comm != NULL) free (comm);
+  return (TRUE);
+
+escape: 
+  if (comm != NULL) free (comm);
+  if (temp != NULL) free (temp);
+  return (FALSE);
+}
+
 int is_loop (char *line) {
 
@@ -216 +247 @@
   status |= is_macro_create (line);
   status |= is_for_loop (line);
+  status |= is_list_data (line);
   status |= is_loop (line);
   status |= is_task (line);