Fix ctl::string_view const iteration issue

jart · Oct 29, 2024 · a120bc7 · a120bc7
1 parent baad1df
commit a120bc7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ctl/string_view.h b/ctl/string_view.h
@@ -109,12 +109,12 @@ struct string_view
         return p[n - 1];
     }
 
-    constexpr const_iterator begin() noexcept
+    constexpr const_iterator begin() const noexcept
     {
         return p;
     }
 
-    constexpr const_iterator end() noexcept
+    constexpr const_iterator end() const noexcept
     {
         return p + n;
     }

diff --git a/test/ctl/string_view_test.cc b/test/ctl/string_view_test.cc
@@ -16,6 +16,7 @@
 // TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include "ctl/string.h"
 #include "ctl/string_view.h"
 #include "libc/mem/leaks.h"
 #include "libc/str/str.h"
@@ -172,5 +173,14 @@ main(int argc, char* argv[])
             return 32;
     }
 
+    {
+        ctl::string b;
+        const ctl::string_view s = "hi";
+        for (char c : s)
+            b += c;
+        if (b != "hi")
+            return 2;
+    }
+
     CheckForMemoryLeaks();
 }