From 320cd0020319149fb6291c48cdedb8fffcf4ef9f Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Mon, 22 Mar 2021 16:46:45 +0800
Subject: [PATCH] string: fix replace_each() (#9415)

---
 vlib/builtin/string.v      | 9 ++++++++-
 vlib/builtin/string_test.v | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/vlib/builtin/string.v b/vlib/builtin/string.v
index 5f50546261..6be84d6d01 100644
--- a/vlib/builtin/string.v
+++ b/vlib/builtin/string.v
@@ -329,15 +329,22 @@ pub fn (s string) replace_each(vals []string) string {
 	mut new_len := s.len
 	mut idxs := []RepIndex{}
 	mut idx := 0
+	s_ := s.clone()
 	for rep_i := 0; rep_i < vals.len; rep_i += 2 {
 		// vals: ['rep1, 'with1', 'rep2', 'with2']
 		rep := vals[rep_i]
 		with := vals[rep_i + 1]
 		for {
-			idx = s.index_after(rep, idx)
+			idx = s_.index_after(rep, idx)
 			if idx == -1 {
 				break
 			}
+			// The string already found is set to `/del`, to avoid duplicate searches.
+			for i in 0 .. rep.len {
+				unsafe {
+					s_.str[idx + i] = 127
+				}
+			}
 			// We need to remember both the position in the string,
 			// and which rep/with pair it refers to.
 			idxs << RepIndex{
diff --git a/vlib/builtin/string_test.v b/vlib/builtin/string_test.v
index a23047c5b9..1389408d01 100644
--- a/vlib/builtin/string_test.v
+++ b/vlib/builtin/string_test.v
@@ -329,6 +329,8 @@ fn test_replace_each() {
 		'b',
 	])
 	assert y == 'bbbb'
+	s2 := 'hello_world hello'
+	assert s2.replace_each(['hello_world', 'aaa', 'hello', 'bbb']) == 'aaa bbb'
 }
 
 fn test_itoa() {