Small type system fixes. (#3265)

2 files changed, 28 insertions, 0 deletions

diff --git a/source/core/slang-string-util.cpp b/source/core/slang-string-util.cpp
index fb062de76..a6a18d4a0 100644
--- a/source/core/slang-string-util.cpp
+++ b/source/core/slang-string-util.cpp
@@ -392,6 +392,31 @@ ComPtr<ISlangBlob> StringUtil::createStringBlob(const String& string)
     return (fromChar == toChar || string.indexOf(fromChar) == Index(-1)) ? string : calcCharReplaced(string.getUnownedSlice(), fromChar, toChar);
 }
 
+String StringUtil::replaceAll(UnownedStringSlice text, UnownedStringSlice subStr, UnownedStringSlice replacement)
+{
+    StringBuilder builder;
+    for (Index i = 0; i < text.getLength();)
+    {
+        if (i + subStr.getLength() >= text.getLength())
+        {
+            builder.append(text.subString(i, text.getLength() - i));
+            break;
+        }
+        if (text.subString(i, subStr.getLength()) == subStr)
+        {
+            builder.append(replacement);
+            i += subStr.getLength();
+        }
+        else
+        {
+            builder.append(text[i]);
+            i++;
+        }
+    }
+    return builder.produceString();
+}
+
+
 /* static */void StringUtil::appendStandardLines(const UnownedStringSlice& text, StringBuilder& out)
 {
     const char* cur = text.begin();
diff --git a/source/core/slang-string-util.h b/source/core/slang-string-util.h
index 4b9a4d5d1..7e5733cbb 100644
--- a/source/core/slang-string-util.h
+++ b/source/core/slang-string-util.h
@@ -87,6 +87,9 @@ struct StringUtil
     static String calcCharReplaced(const UnownedStringSlice& slice, char fromChar, char toChar);
     static String calcCharReplaced(const String& string, char fromChar, char toChar);
     
+        /// Replaces all occurrances of subStr with replacement.
+    static String replaceAll(UnownedStringSlice text, UnownedStringSlice subStr, UnownedStringSlice replacement);
+
         /// Create a blob from a string
     static ComPtr<ISlangBlob> createStringBlob(const String& string);