Merge pull request #43 from iamed2/ed/fix-equality

Fix equality for same-length comparisons with String
JuliaString · Feb 11, 2021 · f55c3ae · f55c3ae · oxinabox · Feb 11, 2021
2 parents 319ee78 + 8010bf9
commit f55c3ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -2,7 +2,7 @@ name = "ShortStrings"
 uuid = "63221d1c-8677-4ff0-9126-0ff0817b4975"
 authors = ["Dai ZJ <[email protected]>", "ScottPJones <[email protected]>",
            "Lyndon White <[email protected]>"]
-version = "0.3.4"
+version = "0.3.5"
 
 [deps]
 BitIntegers = "c3b6d118-76ef-56ca-8cc7-ebb389d030a1"

diff --git a/src/base.jl b/src/base.jl
@@ -213,7 +213,7 @@ end
 function ==(a::ShortString, b::String)
     sz = sizeof(a)
     sizeof(b) == sz || return false
-    sz == 0 || return true
+    sz == 0 && return true
     val = _swapped_str(a)
     @preserve b begin
         pnt = reinterpret(Ptr{UInt}, pointer(b))
@@ -232,7 +232,7 @@ end
 function ==(s::ShortString, b::SubString{String})
     sz = sizeof(s)
     sizeof(b) == sz || return false
-    sz == 0 || return true
+    sz == 0 && return true
     val = _swapped_str(s)
     @preserve s begin
         pnt = pointer(b)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -34,6 +34,7 @@ function basic_test(string_type, constructor, max_len)
     @test str_maxlen == short_maxlen
     @test short_maxlen == short_maxlen
     @test short_maxlen != constructor("d"^max_len)
+    @test short_maxlen != string_type("d"^max_len)
     @test short_maxlen != short_maxlen_m_1
     @test short_maxlen_m_1 != short_maxlen
     @test short_maxlen != str_maxlen_m_1