Changeset 3093 for branches/0.10-stable

Timestamp:

Oct 21, 2013, 6:07:37 AM (9 years ago)

Author:

Peter

Message:

implement replace(3), which fixes #768

Location:

branches/0.10-stable

Files:

• NEWS (modified) (1 diff)
• test/utility.cc (modified) (3 diffs)
• yat/utility/utility.cc (modified) (2 diffs)

branches/0.10-stable/NEWS

@@ -6 +6 @@
 
 version 0.10.3 (released NOT YET)
+  - utility::replace(string&, string, string) is now implemented (bug #768)
 
   A complete list of closed tickets can be found here [[br]]

branches/0.10-stable/test/utility.cc

@@ -59 +59 @@
 void test_fnmatch(test::Suite& suite);
 bool test_fnmatch(bool, std::string, std::string);
+void test_replace(test::Suite& suite);
 
 template<typename InputIterator, typename Key>
@@ -216 +217 @@
   test_dirname(suite);
   test_fnmatch(suite);
+  test_replace(suite);
 
   return suite.return_value();
@@ -638 +640 @@
   return false;
 }
+
+
+void test_replace(test::Suite& suite)
+{
+  std::string s = "Some magic string!!!";
+  utility::replace(s, "magic", "arbitrary");
+  if (!suite.add(s=="Some arbitrary string!!!"))
+    suite.err() << "error: " << s << "\n";
+}

branches/0.10-stable/yat/utility/utility.cc

@@ -6 +6 @@
   Copyright (C) 2010 Peter Johansson
   Copyright (C) 2012 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2013 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -187 +188 @@
 
 
+  void replace(std::string& str, std::string old_value, std::string new_value)
+  {
+    assert(old_value.size());
+    std::string result;
+    std::back_insert_iterator<std::string> out(result);
+    std::string::iterator c = str.begin();
+    while (c!=str.end()) {
+      if (str.end() - c >= static_cast<int>(old_value.size()) &&
+          std::equal(old_value.begin(), old_value.end(), c)) {
+        std::copy(new_value.begin(), new_value.end(), out);
+        c += old_value.size();
+      }
+      else {
+        *out = *c;
+        ++c;
+      }
+    }
+    str.swap(result);
+  }
+
+
 }}} // end of namespace utility, yat and thep