Changeset 7015

Timestamp:

Apr 30, 2006, 2:57:07 PM (20 years ago)

Author:

magnier

Message:

fixed psStringSplit to use strpbrk, added boolean for significance of multiple sequential splitters

Location:

trunk/psLib/src/sys

Files:

• psString.c (modified) (3 diffs)
• psString.h (modified) (2 diffs)

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-26 02:19:23 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-01 00:57:07 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -173 +173 @@
 }
 
+# if 0
 // XXX: This should probably be implemented using strpbrk
+// XXX : add a boolean "repeats significant"
+// XXX : NULL input string returns empty (not NULL) list
+// XXX : NULL splitters is an error
 psList *psStringSplit(const char *string,
                       const char *splitters)
 {
+    PS_ASSERT_PTR_NON_NULL(splitters, NULL);
+
     psList *values = psListAlloc(NULL); // The list of values to return
     PS_ASSERT_PTR_NON_NULL(string, values);
-    PS_ASSERT_PTR_NON_NULL(splitters, values);
-    //    if (string == NULL)
-    //        return values;
 
     unsigned int length = strlen(string); // The length of the string
@@ -215 +218 @@
     return values;
 }
+# endif
+
+// split the string by the given splitters
+// NULL input string returns empty (not NULL) list
+// NULL splitters is an error
+psList *psStringSplit(const char *string,
+                      const char *splitters,
+                      bool multipleAreSignificant)
+{
+    PS_ASSERT_PTR_NON_NULL(splitters, NULL);
+
+    psList *values = psListAlloc(NULL); // The list of values to return
+    PS_ASSERT_PTR_NON_NULL(string, values);
+
+    char *next = NULL;
+    char *current = (char *) string;
+    while ((next = strpbrk (current, splitters)) != NULL) {
+
+        // are multiple splitters in-a-row significant?
+        if ((next == current) && !multipleAreSignificant) {
+            current ++;
+            continue;
+        }
+
+        // Copy the current word
+        psString word = psStringNCopy(current, next - current);
+        psListAdd(values, PS_LIST_TAIL, word);
+        psFree(word);
+
+        current = next + 1;
+    }
+
+    if (strlen(current) > 0) {
+        // Copy the last word
+        psString word = psStringCopy(current);
+        (void)psListAdd(values, PS_LIST_TAIL, word);
+        psFree(word);
+    }
+
+    return values;
+}
 
 // given the input string, search for all copies of the key, and replace with the replacement value

trunk/psLib/src/sys/psString.h

@@ -14 +14 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 22:00:03 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-01 00:57:07 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -100 +100 @@
 psList *psStringSplit(
     const char *string,
-    const char *splitters
+    const char *splitters,
+    bool multipleAreSignificant
 );