bugfix and test

Author: stevengj

README.md

@@ -13,3 +13,26 @@ have otherwise used `String`.
 (In particular, as much as possible we try to implement efficient copy-free
 `String`-like operations on `StringView`, such as iteration and regular-expression
 searching, as long as the underlying `UInt8` array is a contiguous dense array.)
+
+For example:
+
+```jl
+julia> b = [0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72];
+
+julia> s = StringView(b) # does not make a copy
+"foobar"
+
+julia> collect(eachmatch(r"[aeiou]+", s))
+2-element Array{RegexMatch,1}:
+ RegexMatch("oo")
+ RegexMatch("a")
+
+julia> StringView(@view b[1:3]) # also works for subarrays, with no copy
+"foo"
+
+julia> abc = StringView(0x61:0x63) # and for other array types
+"abc"
+```
+
+Other optimized (copy-free) operations include I/O, hashing, iteration/indexing,
+comparisons, and validation.

src/StringViews.jl

@@ -80,7 +80,7 @@ write(io::IO, s::StringView) = write(io, s.data)
 print(io::IO, s::StringView) = (write(io, s); nothing)
 
 Base.@propagate_inbounds Base.thisind(s::StringView, i::Int) = Base._thisind_str(s, i)
-Base.@propagate_inbounds Base.nextind(s::String, i::Int) = Base._nextind_str(s, i)
+Base.@propagate_inbounds Base.nextind(s::StringView, i::Int) = Base._nextind_str(s, i)
 Base.isvalid(s::StringView, i::Int) = checkbounds(Bool, s, i) && thisind(s, i) == i
 
 function Base.hash(s::DenseStringView, h::UInt)

src/regex.jl

@@ -69,10 +69,9 @@ struct RegexMatchIterator{T<:DenseStringView}
     string::T
     overlap::Bool
 end
-RegexMatchIterator(regex::Regex, string::T, ovr::Bool=false) where {T<:DenseStringView} = RegexMatchIterator{T}(regex, string, ovr)
 Base.compile(itr::RegexMatchIterator) = (compile(itr.regex); itr)
-Base.eltype(::Type{RegexMatchIterator}) = RegexMatch
-Base.IteratorSize(::Type{RegexMatchIterator}) = Base.SizeUnknown()
+Base.eltype(::Type{<:RegexMatchIterator}) = RegexMatch
+Base.IteratorSize(::Type{<:RegexMatchIterator}) = Base.SizeUnknown()
 
 function Base.iterate(itr::RegexMatchIterator, (offset,prevempty)=(1,false))
     opts_nonempty = UInt32(PCRE.ANCHORED | PCRE.NOTEMPTY_ATSTART)
@@ -109,9 +108,9 @@ Base.eachmatch(re::Regex, str::DenseStringView; overlap = false) =
 
 # copied from julia/base/pcre.jl:
 function PCRE.exec(re, subject::DenseStringView, offset, options, match_data)
-    rc = ccall((:pcre2_match_8, PCRE_LIB), Cint,
+    rc = ccall((:pcre2_match_8, PCRE.PCRE_LIB), Cint,
                 (Ptr{Cvoid}, Ptr{UInt8}, Csize_t, Csize_t, UInt32, Ptr{Cvoid}, Ptr{Cvoid}),
-                re, subject, ncodeunits(subject), offset, options, match_data, get_local_match_context())
+                re, subject, ncodeunits(subject), offset, options, match_data, PCRE.get_local_match_context())
     # rc == -1 means no match, -2 means partial match.
     rc < -2 && error("PCRE.exec error: $(err_message(rc))")
     return rc >= 0

test/runtests.jl

@@ -41,4 +41,8 @@ abc = StringView(0x61:0x63)
 
     @test Base.print_to_string(s) == "foobar"
     @test Base.print_to_string(abc) == "abc"
-end
+end
+
+@testset "regular expressions" begin
+    @test [m.match for m in collect(eachmatch(r"[aeiou]+", s))] == ["oo", "a"]
+end