improving pezy#84 format.

ChaoMu · Oct 16, 2016 · e6e0436 · e6e0436
1 parent c60d555
commit e6e0436
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/ch09/ex9_43.cpp b/ch09/ex9_43.cpp
@@ -19,19 +19,18 @@ using std::string;
 
 void Replace(string& s, const string& oldVal, const string& newVal)
 {
-	for (auto beg = s.begin(); beg != s.end(); ) {
-		if (std::distance(beg, s.end()) <
-			std::distance(oldVal.begin(), oldVal.end()))
-			break;
-		if (*beg == oldVal.front() && string{ beg, beg + oldVal.size() } == oldVal) {
-			beg = s.erase(beg, beg + oldVal.size());
-			beg = s.insert(beg, newVal.cbegin(), newVal.cend()) + newVal.size();
-		}
-		else {
-			++beg;
-		}
-	}
+    for (auto beg = s.begin(); std::distance(beg, s.end()) >=
+                               std::distance(oldVal.begin(), oldVal.end());) {
+        if (string{beg, beg + oldVal.size()} == oldVal) {
+            beg = s.erase(beg, beg + oldVal.size());
+            beg = s.insert(beg, newVal.cbegin(), newVal.cend());
+            std::advance(beg, newVal.size());
+        }
+        else
+            ++beg;
+    }
 }
+
 int main()
 {
     {