From 7c1d9b5c1d4cf0c8e8a57543456055eab264fa6f Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Sat, 11 Jan 2025 22:18:47 +0100
Subject: [PATCH] Add trim method to string_rt

---
 media/test-project/test.spice                 | 13 +++-------
 src-bootstrap/util/common-util.spice          |  5 +---
 src/util/CommonUtil.cpp                       |  5 ++--
 std/runtime/string_rt.spice                   | 26 +++++++++++++++++++
 .../source.spice                              |  3 +++
 5 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/media/test-project/test.spice b/media/test-project/test.spice
index c00ae09fd..19abcd670 100644
--- a/media/test-project/test.spice
+++ b/media/test-project/test.spice
@@ -1,11 +1,6 @@
-type T dyn;
-
-f<int> print<T>(T g) {
-    printf("%d", g);
-    return 0;
-}
-
 f<int> main() {
-    print(1);
-    print("string");
+    String test = String("String to be trimmed ");
+    printf("'%s'\n", test);
+    String trimmed = test.trim();
+    printf("'%s'\n", trimmed);
 }
\ No newline at end of file
diff --git a/src-bootstrap/util/common-util.spice b/src-bootstrap/util/common-util.spice
index 6c2261b97..a2756ef04 100644
--- a/src-bootstrap/util/common-util.spice
+++ b/src-bootstrap/util/common-util.spice
@@ -13,10 +13,7 @@ import "bootstrap/source-file-intf";
  */
 public f<String> getLastFragment(const String &haystack, const string needle) {
     const unsigned long index = haystack.rfind(needle);
-    if index == -1l {
-        return haystack;
-    }
-    return haystack.getSubstring(index + getRawLength(needle));
+    return index != -1l ? haystack.getSubstring(index + getRawLength(needle)) : haystack;
 }
 
 /**
diff --git a/src/util/CommonUtil.cpp b/src/util/CommonUtil.cpp
index 4e3296acc..464681a81 100644
--- a/src/util/CommonUtil.cpp
+++ b/src/util/CommonUtil.cpp
@@ -51,10 +51,11 @@ std::string CommonUtil::getLastFragment(const std::string &haystack, const std::
  */
 std::string CommonUtil::trim(const std::string &input) {
   const size_t first = input.find_first_not_of(' ');
-  if (std::string::npos == first)
+  if (first == std::string::npos)
     return input;
   const size_t last = input.find_last_not_of(' ');
-  return input.substr(first, (last - first + 1));
+  const size_t newLength = last - first + 1;
+  return input.substr(first, newLength);
 }
 
 /**
diff --git a/std/runtime/string_rt.spice b/std/runtime/string_rt.spice
index 7c9ce13c9..1f8df23ad 100644
--- a/std/runtime/string_rt.spice
+++ b/std/runtime/string_rt.spice
@@ -1,5 +1,8 @@
 #![core.compiler.alwaysKeepOnNameCollision = true]
 
+// Std imports
+import "std/text/analysis";
+
 // Link external functions
 // We intentionally do not use the memory_rt here to avoid dependency circles
 ext f<heap char*> malloc(unsigned long);
@@ -604,6 +607,29 @@ public f<String> String.getSubstring<IntLongShort>(unsigned IntLongShort startId
     return substring;
 }
 
+/**
+ * Returns a new string without leading or trailing whitespaces.
+ *
+ * @return Trimmed string
+ */
+public f<String> String.trim() {
+    if this.length == 0l {
+        return String();
+    }
+    unsigned long startIdx = 0l;
+    unsigned long endIdx = this.length - 1l;
+
+    unsafe {
+        // Find first char that is not a whitespace
+        while isWhitespace(this.contents[startIdx]) { startIdx++; }
+        // Find last char that is not a whitespace
+        while isWhitespace(this.contents[endIdx]) { endIdx--; }
+    }
+
+    const unsigned long newLength = endIdx - startIdx + 1;
+    return this.getSubstring(startIdx, newLength);
+}
+
 /**
  * Reserves `charCount` items
  *
diff --git a/test/test-files/std/runtime/string-basic-methods-non-modifying/source.spice b/test/test-files/std/runtime/string-basic-methods-non-modifying/source.spice
index a94aa75ea..869536c90 100644
--- a/test/test-files/std/runtime/string-basic-methods-non-modifying/source.spice
+++ b/test/test-files/std/runtime/string-basic-methods-non-modifying/source.spice
@@ -4,6 +4,7 @@ f<int> main() {
     dyn s2 = String("Hello");
     dyn s3 = String("Hello!");
     dyn s4 = String("Hello World!");
+    dyn s5 = String(" \n\tString to be trimmed \r ");
 
     assert s1.isEmpty();
     assert !s2.isEmpty();
@@ -40,6 +41,8 @@ f<int> main() {
     assert !s4.startsWith("World");
     assert s4.endsWith("!");
     assert !s2.endsWith("!");
+    assert s5.trim() == "String to be trimmed";
+    assert s1.trim() == "";
 
     printf("All assertions passed!");
 }
\ No newline at end of file