Changeset 25965

Timestamp:

Oct 29, 2009, 10:16:52 AM (17 years ago)

Author:

eugene

Message:

adding an inthash function which accepts non-numeric words (and treats them as zero)

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/Makefile (modified) (1 diff)
• cmd.basic/init.c (modified) (2 diffs)
• cmd.basic/inthash.c (added)
• cmd.basic/list.c (modified) (1 diff)
• cmd.basic/strhash.c (modified) (1 diff)
• lib.shell/ListOps.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.basic/Makefile

@@ -30 +30 @@
 $(SRC)/help.$(ARCH).o        \
 $(SRC)/input.$(ARCH).o       \
+$(SRC)/inthash.$(ARCH).o     \
 $(SRC)/list.$(ARCH).o        \
 $(SRC)/list_help.$(ARCH).o  \

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

@@ -16 +16 @@
 int help            PROTO((int, char **));
 int input           PROTO((int, char **));
+int inthash         PROTO((int, char **));
 int list            PROTO((int, char **));
 int list_help       PROTO((int, char **));
@@ -61 +62 @@
   {1, "help",          help,               "get help on a function *"},
   {1, "input",         input,              "read command lines from a file *"},
+  {1, "inthash",       inthash,            "generate a hash for a word treated as an integer"},
   {1, "list",          list,               "get variable list"},
   {1, "?",             list_help,          "list commands *"},

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

@@ -34 +34 @@
     sprintf (line, "%s:n", argv[1]);
     set_int_variable (line, i);
+
+    return (TRUE);
+  }
+
+  // return an error if -add is given with no other args
+  if ((argc > 2) && (!strcmp (argv[2], "-splitbychar"))) {
+    if (argc < 4) {
+      gprint (GP_ERR, "USAGE: list (root) -splitbychar (char) (word) [(word)...]\n");
+      return (FALSE);
+    }
+    
+    int j, nWords;
+    char splitter;
+    char *new, *word, *ptr;
+
+    nWords = 0;
+    splitter = argv[3][0];
+
+    for (i = 0; i < argc - 3; i++) {
+      new = strcreate (argv[i+3]);
+      for (j = 0; new[j]; j++) {
+        if (new[j] == splitter) new[j] = ' ';
+      }
+
+      ptr = new;
+      while (ptr) {
+        word = thisword (ptr);
+        if (!word) break;
+        
+        sprintf (line, "%s:%d", argv[1], nWords);
+        set_str_variable (line, word);
+        FREE (word);
+        ptr = nextword (ptr);
+        nWords ++;
+      }
+      FREE (new);
+    }
+    sprintf (line, "%s:n", argv[1]);
+    set_int_variable (line, nWords);
 
     return (TRUE);

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

@@ -14 +14 @@
 
   if (argc != 3) {
-    gprint (GP_ERR, "USAGE: strhash (string) (modulus)\n");
+    gprint (GP_ERR, "USAGE: strhash (string) (modulus) [-var value]\n");
     return (FALSE);
   }

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

@@ -187 +187 @@
       if (!strcmp (temp, "-x")) goto escape;
       if (!strcmp (temp, "-split")) goto escape;
+      if (!strcmp (temp, "-splitbychar")) goto escape;
       if (!strcmp (temp, "-add")) goto escape;
       if (!strcmp (temp, "-del")) goto escape;