Changeset 4097

Timestamp:

Sep 17, 2021, 2:06:55 AM (2 years ago)

Author:

Peter

Message:

use boost when functionality is available; prefer passing const& rather than passing by value, very unlikely to break any code, but obviously code that has been compiled against 0.19 headers need to be recompiled before linked against 0.20 lib.

Location:

trunk

Files:

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

trunk/NEWS

@@ -4 +4 @@
 
 version 0.20 (released NOT YET)
+  - utility::replace(3) now takes const string& rather than string
 
   A complete list of closed tickets can be found here [[br]]

trunk/yat/utility/utility.cc

@@ -29 +29 @@
 #include "FileUtil.h"
 #include "stl_utility.h"
+
+#include <boost/algorithm/string/replace.hpp>
 
 #include <cassert>
@@ -248 +250 @@
 
 
-  void replace(std::string& str, std::string old_value, std::string new_value)
+  void replace(std::string& str, const std::string& old_value,
+               const 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);
+    boost::algorithm::replace_all(str, old_value, new_value);
   }
 

trunk/yat/utility/utility.h

@@ -442 +442 @@
 
      \since New in yat 0.10
-   */
-  void replace(std::string& full_str, std::string old_str, std::string new_str);
+
+     \see <a href=https://www.boost.org/doc/libs/1_77_0/doc/html/boost/algorithm/replace_all.html>
+     boost::algorithm::replace_all(string&, const string&, const string&)
+     </a>
+   */
+  void replace(std::string& full_str, const std::string& old_str,
+               const std::string& new_str);