Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Allow regex captures of substrings of stringviews #27

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Bugfix: Allow regex captures of substrings of stringviews #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "StringViews"
uuid = "354b36f9-a18e-4713-926e-db85100087ba"
authors = ["Steven G. Johnson <[email protected]>"]
version = "1.3.3"
version = "1.3.4"

[compat]
julia = "1.6"
Expand Down
7 changes: 4 additions & 3 deletions src/regex.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ function Base.match(re::Regex, str::T, idx::Integer, add_opts::UInt32=UInt32(0))
end
n = div(PCRE.ovec_length(data), 2) - 1
p = PCRE.ovec_ptr(data)
mat = SubString(str, unsafe_load(p, 1)+1, prevind(str, unsafe_load(p, 2)+1))
cap = Union{Nothing,SubString{T}}[unsafe_load(p,2i+1) == PCRE.UNSET ? nothing :
SS = T <: SubString ? T : SubString{T}
mat = SubString(str, unsafe_load(p, 1)+1, prevind(str, unsafe_load(p, 2)+1))::SS
cap = Union{Nothing,SS}[unsafe_load(p,2i+1) == PCRE.UNSET ? nothing :
SubString(str, unsafe_load(p,2i+1)+1,
prevind(str, unsafe_load(p,2i+2)+1)) for i=1:n]
off = Int[ unsafe_load(p,2i+1)+1 for i=1:n ]
Expand Down Expand Up @@ -192,4 +193,4 @@ end

Base.iterate(m::SVRegexMatch, args...) = iterate(m.captures, args...)
Base.length(m::SVRegexMatch) = length(m.captures)
Base.eltype(m::SVRegexMatch) = eltype(m.captures)
Base.eltype(m::SVRegexMatch) = eltype(m.captures)
4 changes: 4 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ end
sv = StringView(codeunits("foo 1234 bar"))
@test match(r"[0-9]+", sv).match.string === sv
@test eltype(eachmatch(r"[0-9]+", sv)) == SVRegexMatch{typeof(sv)}

# Regex match of substring of stringview
strv = only(match(r"^([a-z]+)$", SubString(StringView((b"abc")))))
@test typeof(strv) == SubString{StringView{typeof(b"abc")}}
end

@testset "named subpatterns" begin
Expand Down
Loading