Skip to content

Commit

Permalink
Revert "break long rsplit lines"
Browse files Browse the repository at this point in the history
This reverts commit b164848.

Inexplicably, this whitespace-only commit caused a doctest failure

```
Documenter: running document checks.
 > running doctests.
=====[Test Error]==============================

> File: strings/util.jl

> Code block:

```jldoctest
julia> ascii("abcdeγfgh")
ERROR: ArgumentError: invalid ASCII at index 6 in "abcdeγfgh"
Stacktrace:
 [1] ascii(::String) at ./strings/util.jl:475

julia> ascii("abcdefgh")
"abcdefgh"
```

> Subexpression:

    ascii("abcdeγfgh")

> Output Diff:

ERROR: ArgumentError: invalid ASCII at index 6 in "abcdeγfgh"
Stacktrace:
 [1] ascii(::String) at ./strings/util.jl:47

=====[End Error]===============================
 > checking footnote links.
Documenter: populating indices.
ERROR: LoadError: `makedocs` encountered an error. Terminating build
Stacktrace:
 [1] runner(::Type{Documenter.Builder.RenderDocument}, ::Documenter.Documents.Document) at /home/tkelman2/Julia/julia-0.6/doc/deps/v0.6/Documenter/src/Builder.jl:202
 [2] dispatch(::Type{Documenter.Builder.DocumentPipeline}, ::Documenter.Documents.Document) at /home/tkelman2/Julia/julia-0.6/doc/deps/v0.6/Documenter/src/Selectors.jl:164
 [3] cd(::Documenter.##2#3{Documenter.Documents.Document}, ::String) at ./file.jl:70
 [4] #makedocs#1(::Bool, ::Array{Any,1}, ::Function) at /home/tkelman2/Julia/julia-0.6/doc/deps/v0.6/Documenter/src/Documenter.jl:198
 [5] (::Documenter.#kw##makedocs)(::Array{Any,1}, ::Documenter.#makedocs) at ./<missing>:0
 [6] include_from_node1(::String) at ./loading.jl:539
 [7] include(::String) at ./sysimg.jl:14
 [8] process_options(::Base.JLOptions) at ./client.jl:305
 [9] _start() at ./client.jl:371
```

I suspect there's a bug in the parser and/or Documenter
  • Loading branch information
tkelman committed Apr 29, 2017
1 parent a0c1429 commit 1db19a3
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions base/strings/util.jl
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,7 @@ cpad(s, n::Integer, p=" ") = rpad(lpad(s,div(n+strwidth(s),2),p),n,p)

# splitter can be a Char, Vector{Char}, AbstractString, Regex, ...
# any splitter that provides search(s::AbstractString, splitter)
split(str::T, splitter; limit::Integer=0, keep::Bool=true) where {T<:SubString} =
_split(str, splitter, limit, keep, T[])
split(str::T, splitter; limit::Integer=0, keep::Bool=true) where {T<:SubString} = _split(str, splitter, limit, keep, T[])

"""
split(s::AbstractString, [chars]; limit::Integer=0, keep::Bool=true)
Expand All @@ -274,8 +273,7 @@ julia> split(a,".")
"rch"
```
"""
split(str::T, splitter; limit::Integer=0, keep::Bool=true) where {T<:AbstractString} =
_split(str, splitter, limit, keep, SubString{T}[])
split(str::T, splitter; limit::Integer=0, keep::Bool=true) where {T<:AbstractString} = _split(str, splitter, limit, keep, SubString{T}[])
function _split(str::AbstractString, splitter, limit::Integer, keep_empty::Bool, strs::Array)
i = start(str)
n = endof(str)
Expand All @@ -301,8 +299,7 @@ end
# a bit oddball, but standard behavior in Perl, Ruby & Python:
split(str::AbstractString) = split(str, _default_delims; limit=0, keep=false)

rsplit(str::T, splitter; limit::Integer=0, keep::Bool=true) where {T<:SubString} =
_rsplit(str, splitter, limit, keep, T[])
rsplit(str::T, splitter; limit::Integer=0, keep::Bool=true) where {T<:SubString} = _rsplit(str, splitter, limit, keep, T[])

"""
rsplit(s::AbstractString, [chars]; limit::Integer=0, keep::Bool=true)
Expand Down Expand Up @@ -331,8 +328,7 @@ julia> rsplit(a,".";limit=2)
"h"
```
"""
rsplit(str::T, splitter; limit::Integer=0, keep::Bool=true) where {T<:AbstractString} =
_rsplit(str, splitter, limit, keep, SubString{T}[])
rsplit(str::T, splitter ; limit::Integer=0, keep::Bool=true) where {T<:AbstractString} = _rsplit(str, splitter, limit, keep, SubString{T}[])
function _rsplit(str::AbstractString, splitter, limit::Integer, keep_empty::Bool, strs::Array)
i = start(str)
n = endof(str)
Expand Down

0 comments on commit 1db19a3

Please sign in to comment.