Changeset 40522

Timestamp:

Aug 29, 2018, 9:42:25 AM (8 years ago)

Author:

eugene

Message:

add strstr function to opihi; add triangular masking function

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/Makefile (modified) (1 diff)
• cmd.basic/init.c (modified) (2 diffs)
• cmd.basic/strstr.c (added)
• cmd.basic/substr.c (modified) (2 diffs)
• cmd.data/Makefile (modified) (1 diff)
• cmd.data/init.c (modified) (2 diffs)
• cmd.data/triangle.c (added)

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

@@ -54 +54 @@
 $(SRC)/strlen.$(ARCH).o     \
 $(SRC)/substr.$(ARCH).o     \
+$(SRC)/strstr.$(ARCH).o     \
 $(SRC)/strhash.$(ARCH).o     \
 $(SRC)/strmatch.$(ARCH).o     \

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

@@ -42 +42 @@
 int strmatch        PROTO((int, char **));
 int substr_func     PROTO((int, char **));
+int strstr_func     PROTO((int, char **));
 int strpop          PROTO((int, char **));
 int strhash         PROTO((int, char **));
@@ -94 +95 @@
   {1, "fprintf",       fprintf_opihi,      "formatted print to standard output"},
   {1, "strlen",        strlen_func,        "string length"},
-  {1, "substr",        substr_func,        "substring"},
+  {1, "substr",        substr_func,        "extract a substring"},
+  {1, "strstr",        strstr_func,        "find a substring"},
   {1, "strhash",       strhash,            "generate a hash for a string"},
   {1, "strpop",        strpop,             "pop a string"},

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

@@ -7 +7 @@
 
   if ((argc != 4) && (argc != 5)) {
-    gprint (GP_ERR, "USAGE: substr (string) N1 N2 [var]\n");
+    gprint (GP_ERR, "USAGE: substr (string) Nstart Nlength [var]\n");
     return (FALSE);
   }
@@ -20 +20 @@
   }
   if ((N2 < 0) || ((N2+N1) >  strlen(argv[1]))) {
-      gprint (GP_ERR, "ERROR: end value out of range in substr command\n");
+      gprint (GP_ERR, "ERROR: length out of range in substr command\n");
       return (FALSE);
   }

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

@@ -153 +153 @@
 $(SRC)/textline.$(ARCH).o          \
 $(SRC)/threshold.$(ARCH).o              \
+$(SRC)/triangle.$(ARCH).o                  \
 $(SRC)/tv.$(ARCH).o                \
 $(SRC)/tvchannel.$(ARCH).o         \

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

@@ -138 +138 @@
 int textline         PROTO((int, char **));
 int threshold        PROTO((int, char **));
+int triangle         PROTO((int, char **));
 int tv               PROTO((int, char **));
 int tvchannel        PROTO((int, char **));
@@ -323 +324 @@
   {1, "textline",     textline,         "write text line on graph"},
   {1, "threshold",    threshold,        "find (interpolate) location of transition"},
+  {1, "triangle",     triangle,         "fill a triangular region with a value"},
   {1, "tv",           tv,               "display an image on the Kii window"},
   {1, "tvchannel",    tvchannel,        "set the current tv channel"},