Changeset 15077

Timestamp:

2008-03-10T15:18:07+13:00 (16 years ago)

Author:

mdewsnip

Message:

Oh dear... there were two pretty big problems with the replace() function: it wouldn't work correctly replacing strings longer than one character, and it wouldn't replace a match at the start of the string.

File:

• gsdl/trunk/lib/text_t.cpp (modified) (1 diff)

gsdl/trunk/lib/text_t.cpp

@@ -311 +311 @@
     text_t::iterator next_toreplace = findword(text_begin, text_end, toreplace);
 
-    // Grab the string up to it
-    temp_text = substr(text_begin, next_toreplace);
-
-    // Add the new string onto the end
-    if (new_text.empty())
-    {
-      new_text.append(temp_text);
-    }
+    // We've found a match
+    if (next_toreplace != text_end)
+    {
+      new_text.append(substr(text_begin, next_toreplace));
+      new_text.append(replacement);
+      count++;
+      text_begin = next_toreplace + toreplace.size();
+    }
+    // We haven't found a match
     else
     {
-      new_text.append(replacement + temp_text);
-    }
-
-    // Finally, we need to move the current pointer up to the new position
-    text_begin = next_toreplace + 1;
-    count++;
+      new_text.append(substr(text_begin, text_end));
+      text_begin = text_end;
+    }
   }