Skip to content

Commit 2b53fde

Browse files
committed
Change to avoid ambiguity in StrRegex
1 parent fa45b82 commit 2b53fde

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ keywords = ["Strings"]
44
license = "MIT"
55
desc = "Basic functionality for Str types"
66
authors = ["ScottPJones <scottjones@alum.mit.edu>"]
7-
version = "0.1.4"
7+
version = "0.1.5"
88

99
[deps]
1010
CharSetEncodings = "cb9422de-a9d8-5b68-86db-ff05833ab307"

src/util.jl

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -116,27 +116,27 @@ Base._split(str::MaybeSub{<:Str}, splitter, limit, keepempty, vec) =
116116
Base._rsplit(str::MaybeSub{<:Str}, splitter, limit, keepempty, vec) =
117117
__rsplit(str, splitter, limit, keepempty, vec)
118118

119-
split(str::MaybeSub{<:Str{C}}, splitter;
120-
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) where {C<:CSE} =
121-
__split(str, splitter, limit, checkkeep(keepempty, keep, :split), splitarr(C))
122-
123-
split(str::MaybeSub{<:Str{C}}, splitter::AbstractChar;
124-
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) where {C<:CSE} =
125-
__split(str, isequal(splitter), limit, checkkeep(keepempty, keep, :split), splitarr(C))
126-
127-
split(str::MaybeSub{<:Str{C}}, splitter::SetOfChars;
128-
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) where {C<:CSE} =
129-
__split(str, in(splitter), limit, checkkeep(keepempty, keep, :split), splitarr(C))
130-
131-
rsplit(str::MaybeSub{<:Str{C}}, splitter;
132-
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) where {C<:CSE} =
133-
__rsplit(str, splitter, limit, checkkeep(keepempty, keep, :rsplit), splitarr(C))
134-
rsplit(str::MaybeSub{<:Str{C}}, splitter::AbstractChar;
135-
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) where {C<:CSE} =
136-
__rsplit(str, isequal(splitter), limit, checkkeep(keepempty, keep, :rsplit), splitarr(C))
137-
rsplit(str::MaybeSub{<:Str{C}}, splitter::SetOfChars;
138-
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) where {C<:CSE} =
139-
__rsplit(str, in(splitter), limit, checkkeep(keepempty, keep, :rsplit), splitarr(C))
119+
split(str::MaybeSub{<:Str}, splitter;
120+
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) =
121+
__split(str, splitter, limit, checkkeep(keepempty, keep, :split), splitarr(str))
122+
123+
split(str::MaybeSub{<:Str}, splitter::AbstractChar;
124+
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) =
125+
__split(str, isequal(splitter), limit, checkkeep(keepempty, keep, :split), splitarr(str))
126+
127+
split(str::MaybeSub{<:Str}, splitter::SetOfChars;
128+
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) =
129+
__split(str, in(splitter), limit, checkkeep(keepempty, keep, :split), splitarr(str))
130+
131+
rsplit(str::MaybeSub{<:Str}, splitter;
132+
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) =
133+
__rsplit(str, splitter, limit, checkkeep(keepempty, keep, :rsplit), splitarr(str))
134+
rsplit(str::MaybeSub{<:Str}, splitter::AbstractChar;
135+
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) =
136+
__rsplit(str, isequal(splitter), limit, checkkeep(keepempty, keep, :rsplit), splitarr(str))
137+
rsplit(str::MaybeSub{<:Str}, splitter::SetOfChars;
138+
limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) =
139+
__rsplit(str, in(splitter), limit, checkkeep(keepempty, keep, :rsplit), splitarr(str))
140140

141141
# Todo: this is using print, but it should be changed to make sure that everything is done via
142142
# writes (i.e. no translation to UTF-8)

0 commit comments

Comments
 (0)