Merge pull request #16 from JuliaString/spj/eachsplit

Update for change removing _split from Base/util.jl in 1.8

Author: ScottPJones

.drone.yml

@@ -1,27 +1,27 @@
 ---
 kind: pipeline
-name: linux - arm64 - Julia 1.5
+name: linux - arm64 - Julia 1.6
 
 platform:
   os: linux
   arch: arm64
 
 steps:
 - name: build
-  image: julia:1.5
+  image: julia:1.6
   commands:
   - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
 
 ---
 kind: pipeline
-name: linux - arm64 - Julia 1.6
+name: linux - arm64 - Julia 1.7
 
 platform:
   os: linux
   arch: arm64
 
 steps:
 - name: build
-  image: julia:1.6
+  image: julia:1.7
   commands:
   - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"

.github/workflows/ci.yml

@@ -10,8 +10,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.5'
           - '1.6'
+          - '1.7'
           - 'nightly'
         os:
           - ubuntu-latest

Project.toml

@@ -4,7 +4,7 @@ authors  = ["ScottPJones <scottjones@alum.mit.edu>"]
 keywords = ["Strings"]
 license  = "MIT"
 uuid     = "e79e7a6a-7bb1-5a4d-9d64-da657b06f53a"
-version = "1.0.6"
+version = "1.1.0"
 
 [deps]
 Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
@@ -24,7 +24,7 @@ Random  = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 test = ["Test", "Random"]
 
 [compat]
-julia = "1"
+julia = "^1.6"
 ModuleInterfaceTools = "1"
 MurmurHash3 = "^1.2"
 StrAPI = "^1.1"

src/StrBase.jl

@@ -34,7 +34,11 @@ using ModuleInterfaceTools
              MS_UTF8, MS_UTF16, MS_UTF32, MS_SubUTF32, MS_Latin, MS_ByteStr, MS_RawUTF8,
              _wrap_substr, _empty_sub,
              AccessType, UInt16_U, UInt32_U, UInt16_S, UInt32_S, UInt16_US, UInt32_US,
-             alignedtype, swappedtype, checkkeep, splitarr, __split, __rsplit, __replace
+             alignedtype, swappedtype, checkkeep, splitarr, __rsplit, __replace
+
+@static if !isdefined(Base, :eachsplit)
+    @api develop __split
+end
 
 using Base: @_inline_meta, @propagate_inbounds, @_propagate_inbounds_meta, RefValue
 

src/search.jl

@@ -121,20 +121,14 @@ found(::Type{<:AbstractString}, v) = v != 0
 find_result(::Type{<:AbstractString}, v) = v
 
 nothing_sentinel(i) = first(i) == 0 ? nothing : i
-Base.findfirst(a, b::Str)   = nothing_sentinel(find(First, a, b))
-Base.findlast(a, b::Str)    = nothing_sentinel(find(Last, a, b))
-Base.findnext(a, b::Str, i) = nothing_sentinel(find(Fwd, a, b, i))
-Base.findprev(a, b::Str, i) = nothing_sentinel(find(Rev, a, b, i))
-Base.findfirst(a::Str, b::AbstractString)   = nothing_sentinel(find(First, a, b))
-Base.findlast(a::Str, b::AbstractString)    = nothing_sentinel(find(Last, a, b))
-Base.findnext(a::Str, b::AbstractString, i) = nothing_sentinel(find(Fwd, a, b, i))
-Base.findprev(a::Str, b::AbstractString, i) = nothing_sentinel(find(Rev, a, b, i))
-
 # Fix ambiguities caused by addition of new findfirst definition to base
-Base.findfirst(a::AbstractChar, b::Str)   = nothing_sentinel(find(First, a, b))
-Base.findlast(a::AbstractChar, b::Str)    = nothing_sentinel(find(Last, a, b))
-Base.findnext(a::AbstractChar, b::Str, i) = nothing_sentinel(find(Fwd, a, b, i))
-Base.findprev(a::AbstractChar, b::Str, i) = nothing_sentinel(find(Rev, a, b, i))
+for (S,T) in ((:AbstractString, :Str), (:Str, :AbstractString), (:Str, :Str),
+              (:Function, :Str), (:AbstractChar, :Str))
+    @eval Base.findfirst(a::$S, b::$T) = nothing_sentinel(find(First, a, b))
+    @eval Base.findlast(a::$S, b::$T)    = nothing_sentinel(find(Last, a, b))
+    @eval Base.findnext(a::$S, b::$T, i::Integer) = nothing_sentinel(find(Fwd, a, b, i))
+    @eval Base.findprev(a::$S, b::$T, i::Integer) = nothing_sentinel(find(Rev, a, b, i))
+end
 
 function find(::Type{D}, fun::Function, str::AbstractString, pos::Integer) where {D<:Direction}
     pos < Int(D===Fwd) && (@boundscheck boundserr(str, pos); return 0)

src/util.jl

@@ -1,7 +1,7 @@
 #=
 Utility functions for Str strings
 
-Copyright 2018-2020 Gandalf Software, Inc., Scott P. Jones,
+Copyright 2018-2021 Gandalf Software, Inc., Scott P. Jones,
 and other contributors to the Julia language
 Licensed under MIT License, see LICENSE.md
 Based initially on julia/test/strings/util.jl
@@ -65,6 +65,7 @@ rpad(ch::Chr, cnt::Integer, pad::AbstractChar=' ') =
 const SetOfChars =
     Union{Tuple{Vararg{<:AbstractChar}},AbstractVector{<:AbstractChar},Set{<:AbstractChar}}
 
+@static if !isdefined(Base, :eachsplit)
 function __split(str, splitter, limit::Integer, keep_empty::Bool, strs::Vector)
     pos = 1
     lst = lastindex(str)
@@ -85,6 +86,7 @@ function __split(str, splitter, limit::Integer, keep_empty::Bool, strs::Vector)
     end
     (keep_empty || pos <= lst) ? push!(strs, SubString(str, pos)) : strs
 end
+end
 
 function __rsplit(str, splitter, limit::Integer, keep_empty::Bool, strs::Vector)
     res = find(Last, splitter, str)
@@ -111,10 +113,9 @@ splitarr(::MaybeSub{String}) = SubString{String}[]
 splitarr(::MaybeSub{T}) where {T<:Str} =
     SubString{Str{basecse(T),Nothing,Nothing,Nothing}}[]
 
+@static if !isdefined(Base, :eachsplit)
 Base._split(str::MaybeSub{<:Str}, splitter, limit, keepempty, vec) =
     __split(str, splitter, limit, keepempty, vec)
-Base._rsplit(str::MaybeSub{<:Str}, splitter, limit, keepempty, vec) =
-    __rsplit(str, splitter, limit, keepempty, vec)
 
 split(str::MaybeSub{<:Str}, splitter;
       limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) =
@@ -127,6 +128,10 @@ split(str::MaybeSub{<:Str}, splitter::AbstractChar;
 split(str::MaybeSub{<:Str}, splitter::SetOfChars;
       limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) =
     __split(str, in(splitter), limit, checkkeep(keepempty, keep, :split), splitarr(str))
+end
+
+Base._rsplit(str::MaybeSub{<:Str}, splitter, limit, keepempty, vec) =
+    __rsplit(str, splitter, limit, keepempty, vec)
 
 rsplit(str::MaybeSub{<:Str}, splitter;
        limit::Integer=0, keepempty::Bool=true, keep::Union{Nothing,Bool}=nothing) =