type-stability for lstrip, rstrip, strip

JuliaLang · Aug 21, 2015 · 7676a6a · ScottPJones · Aug 22, 2015 · StefanKarpinski
1 parent ff1b30b
commit 7676a6a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/base/strings/util.jl b/base/strings/util.jl
@@ -70,7 +70,7 @@ function lstrip(s::AbstractString, chars::Chars=_default_delims)
         end
         i = j
     end
-    ""
+    s[end+1:end]
 end
 
 function rstrip(s::AbstractString, chars::Chars=_default_delims)
@@ -83,7 +83,7 @@ function rstrip(s::AbstractString, chars::Chars=_default_delims)
         end
         i = j
     end
-    ""
+    s[1:0]
 end
 
 strip(s::AbstractString) = lstrip(rstrip(s))

diff --git a/test/strings/util.jl b/test/strings/util.jl
@@ -11,9 +11,30 @@
 @test rpad("foo", 6, "  ") == "foo   "
 
 # string manipulation
+@test strip("") == ""
+@test strip(" ") == ""
+@test strip("  ") == ""
+@test strip("   ") == ""
 @test strip("\t  hi   \n") == "hi"
 @test strip("foobarfoo", ['f', 'o']) == "bar"
 
+for s in ("", " ", " abc", "abc ", "  abc  "), f in (lstrip, rstrip, strip)
+	fs = f(s)
+	for T = (ASCIIString, UTF8String, UTF16String, UTF32String)
+		t = convert(T,s)
+		ft = f(t)
+		@test s == t
+		@test fs == ft
+		@test typeof(ft) == typeof(t[1:end])
+
+		b = convert(SubString{T}, t)
+		fb = f(b)
+		@test s == b
+		@test fs == fb
+		@test typeof(fb) == SubString{T}
+	end
+end
+
 # split
 @test isequal(split("foo,bar,baz", 'x'), ["foo,bar,baz"])
 @test isequal(split("foo,bar,baz", ','), ["foo","bar","baz"])