Changeset 16066

Timestamp:

2008-06-19T13:09:56+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added splitword() function and other dependent functions.

Location:

gsdl/trunk/src/lib

Files:

• text_t.cpp (modified) (3 diffs)
• text_t.h (modified) (3 diffs)

gsdl/trunk/src/lib/text_t.cpp

@@ -374 +374 @@
 }
 
+text_t::const_iterator findword (text_t::const_iterator first, 
+                 text_t::const_iterator last, 
+                 const text_t& word)
+{
+  text_t::const_iterator word_begin = word.begin();
+  text_t::const_iterator word_end = word.end();
+
+  while (first != last)
+    {
+      text_t::const_iterator char_match = first;
+      text_t::const_iterator word_here = word_begin;
+      while (word_here!=word_end)
+    {
+      if (*char_match != *word_here)
+        {
+          break;
+        }
+      ++char_match;
+      ++word_here;
+    }
+      if (word_here==word_end)
+    {
+      return first;
+    }
+      ++first;
+    }
+  return last; // get to here only if there is no match
+}
+
 text_t::iterator findword (text_t::iterator first, 
                text_t::iterator last, 
@@ -427 +456 @@
 }
 
+text_t::const_iterator getdelimitstr (text_t::const_iterator first, text_t::const_iterator last,
+                      text_t w, text_t &outstr)
+{
+  text_t::const_iterator here = first;
+  here = findword (first, last, w);
+  outstr.clear();
+  outstr.appendrange (first, here);
+  if (here != last) here += w.size(); // skip w
+  return here;
+}
+
 // split a string with a character
 void splitchar (text_t::const_iterator first, text_t::const_iterator last,
@@ -466 +506 @@
     {
       first = getdelimitstr (first, last, c, t);
+      outlist.push_back (t);
+    }
+}
+
+void splitword (text_t::const_iterator first, text_t::const_iterator last,
+        text_t w, text_tlist &outlist)
+{
+  outlist.erase(outlist.begin(), outlist.end());
+
+  text_t t;
+
+  while (first != last)
+    {
+      first = getdelimitstr (first, last, w, t);
       outlist.push_back (t);
     }

gsdl/trunk/src/lib/text_t.h

@@ -229 +229 @@
 text_t::iterator findword (text_t::iterator first, text_t::iterator last,
                const text_t &word);
+text_t::const_iterator findword (text_t::const_iterator first, text_t::const_iterator last, 
+                 const text_t& word);
 
 // get a string up to the next delimiter (which is skipped)
@@ -236 +238 @@
 text_t::iterator getdelimitstr (text_t::iterator first, text_t::iterator last,
                 unsigned short c, text_t &outstr);
+
+text_t::const_iterator getdelimitstr (text_t::const_iterator first, text_t::const_iterator last,
+                      text_t w, text_t &outstr);
 
 // split a string with a character
@@ -244 +249 @@
 void splitchar (text_t::const_iterator first, text_t::const_iterator last,
         unsigned short c, text_tarray &outlist);
+
+void splitword (text_t::const_iterator first, text_t::const_iterator last,
+        text_t w, text_tlist &outlist);
 
 // join a string using a character