Changeset 41978 for branches/eam_branches/ipp-20211108

Timestamp:

Jan 5, 2022, 6:34:32 AM (5 years ago)

Author:

eugene

Message:

adding getargs command (argument parsing for macros)

Location:

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.basic

Files:

• Makefile (modified) (1 diff)
• getargs.c (modified) (2 diffs)
• init.c (modified) (2 diffs)
• test/getargs.ch (added)

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.basic/Makefile

@@ -28 +28 @@
 $(SRC)/file.$(ARCH).o        \
 $(SRC)/getchr.$(ARCH).o     \
+$(SRC)/getargs.$(ARCH).o     \
 $(SRC)/help.$(ARCH).o        \
 $(SRC)/input.$(ARCH).o       \

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.basic/getargs.c

@@ -1 +1 @@
 # include "basic.h"
+# define NLINE 1024
+
+enum {MODE_NONE, MODE_BOOL, MODE_VALUE};
 
 int getargs (int argc, char **argv) {
 
-  int N, Nkey, Noutput;
-  char *p, *q, *input, *output, *key, *value;
+  int N;
+  char templine[NLINE];
 
-  // clear all sections
+  // variable name to save the value
   char *varName = NULL;
   if ((N = get_argument (argc, argv, "-var"))) {
@@ -14 +17 @@
   }
 
-  if (argc != 4) {
-    gprint (GP_ERR, "USAGE: getargs (option) (key) (mode) [-var out]\n");
-    gprint (GP_ERR, "  find argument key and remove the arglist, optionally saving value on variable\n");
+  if (argc != 3) {
+    gprint (GP_ERR, "USAGE: getargs (key) (mode) [-var out]\n");
+    gprint (GP_ERR, "  find argument key and remove from the arglist, optionally saving value on variable\n");
     return (FALSE);
   }
 
-  // 
-  char *MacroName  = GetMacroName ();
+  int mode = MODE_NONE;
+  if (!strcasecmp (argv[2], "bool"))    mode = MODE_BOOL;
+  if (!strcasecmp (argv[2], "boolean")) mode = MODE_BOOL;
+  if (!strcasecmp (argv[2], "val"))     mode = MODE_VALUE;
+  if (!strcasecmp (argv[2], "value"))   mode = MODE_VALUE;
+  if (mode == MODE_NONE) { gprint (GP_ERR, "ERROR: invalid mode %s\n", argv[2]); return (FALSE); }
+  
+  // get macro name and depth
   int   MacroDepth = GetMacroDepth ();
 
-  sprintf (tmp, "%d.%d", MacroDepth, 0);
-  params[0] = strcreate (tmp);
-  sprintf (tmp, "%d", argc);
-  set_str_variable (params[0], tmp);
+  // real name of $0 (number of arguments)
+  snprintf (templine, NLINE, "%d.%d", MacroDepth, 0);
+  char *p = get_variable_ptr (templine);
+  myAssert (p, "coding error");
 
+  int argnum = atoi (p);
 
-  // input string 
-  input = argv[1];
-  
-  // find this in the string
-  key = argv[2];
-  Nkey = strlen(key);
-
-  // replace with this
-  value = argv[3];
-
-  Noutput = MAX (16, strlen(input));
-  ALLOCATE (output, char, Noutput);
-  memset (output, 0, Noutput);
-
-  // 0123456789
-  // wordKEYnew
-  // p = 0, q = 4, q-p = 4 -> p = 7
-
-  p = input;
-  while (*p && ((q = strstr (p, key)) != NULL)) {
-    output = opihi_append (output, &Noutput, p, q);
-    output = opihi_append (output, &Noutput, value, value + strlen(value));
-    p = q + Nkey;
-  }
-  if (*p) {
-    output = opihi_append (output, &Noutput, p, p + strlen(p));
+  // look for the requested key (only selects the first example)
+  int argmatch = 0;
+  for (int i = 1; (i < argnum) && !argmatch; i++) {
+    // real name of $i (number of arguments)
+    snprintf (templine, NLINE, "%d.%d", MacroDepth, i);
+    char *p = get_variable_ptr (templine);
+    myAssert (p, "coding error");
+    if (strcmp (argv[1], p)) continue;
+    argmatch = i;
   }
   
-  if (varName) {
-    set_str_variable (varName, output);
-  } else {
-    gprint (GP_LOG, "%s\n", output);
+  if (!argmatch) {
+    if (varName) {
+      if (mode == MODE_BOOL) {
+        set_str_variable (varName, "0"); // NOTE: if a local variable with the same name exists, that will be used
+      } else {
+        set_str_variable (varName, ""); // NOTE: if a local variable with the same name exists, that will be used
+      }
+    }
+    return TRUE;
   }
 
-  free (output);
+  if (mode == MODE_VALUE) {
+    if (argnum < argmatch + 2) { gprint (GP_ERR, "ERROR: missing value for argument %s\n", argv[1]); return (FALSE); }
+    snprintf (templine, NLINE, "%d.%d", MacroDepth, argmatch + 1);
+    char *p = get_variable_ptr (templine);
+    myAssert (p, "coding error");
+
+    if (varName) set_str_variable (varName, p); // NOTE: if a local variable with the same name exists, that will be used
+
+    for (int i = argmatch + 2; i < argnum; i++) {
+      // move $i+2 to $i
+      snprintf (templine, NLINE, "%d.%d", MacroDepth, i);
+      char *p = get_variable_ptr (templine);
+      myAssert (p, "coding error");
+
+      snprintf (templine, NLINE, "%d.%d", MacroDepth, i - 2);
+      set_str_variable (templine, p);
+    }
+    // reduce $0 by 2
+    snprintf (templine, NLINE, "%d.%d", MacroDepth, 0);
+    set_int_variable (templine, argnum - 2);
+  } 
+  if (mode == MODE_BOOL) {
+    if (varName) set_str_variable (varName, "1"); // NOTE: if a local variable with the same name exists, that will be used
+
+    for (int i = argmatch + 1; i < argnum; i++) {
+      // move $i+1 to $i
+      snprintf (templine, NLINE, "%d.%d", MacroDepth, i);
+      char *p = get_variable_ptr (templine);
+      myAssert (p, "coding error");
+
+      snprintf (templine, NLINE, "%d.%d", MacroDepth, i - 1);
+      set_str_variable (templine, p);
+    }
+    // reduce $0 by 1
+    snprintf (templine, NLINE, "%d.%d", MacroDepth, 0);
+    set_int_variable (templine, argnum - 1);
+  }
   return (TRUE);
 }

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.basic/init.c

@@ -14 +14 @@
 int file            PROTO((int, char **));
 int getchr_func     PROTO((int, char **));
+int getargs         PROTO((int, char **));
 int help            PROTO((int, char **));
 int input           PROTO((int, char **));
@@ -66 +67 @@
   {1, "file",          file,               "test file existence"},
   {1, "getchr",        getchr_func,        "find character in string"},
+  {1, "getargs",       getargs,            "find and remove arguments from the macro argument list"},
   {1, "help",          help,               "get help on a function *"},
   {1, "input",         input,              "read command lines from a file *"},