update IOStrings and SplicedStrings for Julia 1.0

Author: samoconnor

src/AbstractArray.jl

@@ -18,7 +18,8 @@ Base.size(a::JSON.Array) = (length(a), )
 
 # Iterate
 
-function Base.iterate(j::JSON.Array, (i, c) = (j.i, 0x00))
+Base.iterate(j::JSON.Array, i = (j.i, 0x00)) = _iterate(j, i)
+function _iterate(j::JSON.Array, (i, c))
     i, c = nextindex(j, i, c)
     if c == ']'
         return nothing
@@ -35,9 +36,5 @@ Base.length(j::JSON.Array{IOString{T}}) where T =
 Base.getindex(j::JSON.Array{IOString{T}}, i::Integer) where T =
     pump(() -> getvalue(x, getindex_ic(j, i)...), j.s)
 
-# FIXME
-#Base.done(j::JSON.Array{IOString{T}}, i) where T =
-#    pump(() -> _done(j, i), j.s)
-
-#Base.next(j::JSON.Array{IOString{T}}, i) where T =
-#    pump(() -> _next(j, i), j.s)
+Base.iterate(j::JSON.Array{IOString{T}}, i = (j.i, 0x00)) where T =
+    pump(() -> _iterate(j, i), j.s)

src/AbstractDict.jl

@@ -31,7 +31,8 @@ Base.length(a::JSON.Object) = div(collection_length(a), 2)
 
 # Iterate
 
-function Base.iterate(j::JSON.Object, (i, c) = (j.i, 0x00))
+Base.iterate(j::JSON.Object, i = (j.i, 0x00)) = _iterate(j, i)
+function _iterate(j::JSON.Object, (i, c))
 
     i, c = nextindex(j, i, c)
 
@@ -107,15 +108,11 @@ end
 
 # IOString Wrappers
 
-#FIXME
-#Base.length(j::JSON.Object{IOString{T}}) where T =
-#    pump(() -> div(collection_length(j), 2), j.s)
+Base.length(j::JSON.Object{IOString{T}}) where T =
+    pump(() -> div(collection_length(j), 2), j.s)
 
-#Base.get(j::JSON.Object{IOString{T}}, key, default) where T =
-#    pump(() -> _get(j, key, default), j.s)
+Base.get(j::JSON.Object{IOString{T}}, key, default) where T =
+    pump(() -> _get(j, key, default), j.s)
 
-#Base.done(j::JSON.Object{IOString{T}}, i) where T =
-#    pump(() -> _done(j, i), j.s)
-
-#Base.next(j::JSON.Object{IOString{T}}, i) where T =
-#    pump(() -> _next(j, i), j.s)
+Base.iterate(j::JSON.Object{IOString{T}}, i = (j.i, 0x00)) where T =
+    pump(() -> _iterate(j, i), j.s)

src/AbstractString.jl

@@ -40,7 +40,9 @@ Base.codeunit(s::JSON.String) = codeunit(s.s)
 Base.codeunit(s::JSON.String, i::Integer) = codeunit(s.s, s.i + i))
 
 @propagate_inbounds(
-function Base.iterate(s::JSON.String, i::Integer=1)
+Base.iterate(s::JSON.String, i::Integer=1) = _iterate(s, i))
+@propagate_inbounds(
+function _iterate(s::JSON.String, i)
     i, c = json_char(s.s, s.i + i)
     if c == nothing
         return nothing
@@ -293,7 +295,7 @@ end
 
 #FIXME
 #https://github.com/JuliaLang/julia/commit/1f0c6fa35ab64ad66a5bb413fad474e2c722c290#r27686527
-Base.@propagate_inbounds function Base.iterate(s::IOString, i::Int)
+@propagate_inbounds function Base.iterate(s::IOString, i::Int = 1)
     b = codeunit(s, i)
     i > ncodeunits(s) && return nothing
     u = UInt32(b) << 24
@@ -333,3 +335,6 @@ Base.convert(::Type{SubString}, j::JSON.String{IOString{T}}) where T =
 
 Base.ncodeunits(j::JSON.String{IOString{T}}) where T =
     pump(() -> scan_string(j.s, j.i)[1] - j.i - 1, j.s)
+
+Base.iterate(j::JSON.String{IOString{T}}, i::Integer=1) where T =
+    pump(() -> _iterate(j, i), j.s)

src/IOStrings.jl

@@ -58,24 +58,19 @@ Base.String(s::IOString) = convert(Base.String, s)
 
 Base.IteratorSize(::Type{IOString}) = Base.SizeUnknown()
 Base.ncodeunits(s::IOString) = s.buf.size
-# FIXME   pump here ??
 Base.codeunit(s::IOString) = UInt8
+@propagate_inbounds Base.codeunit(s::IOString, i::Integer) = s.buf.data[i]
+
+Base.checkbounds(s::IOString, I::Union{Integer,AbstractArray}) =
+    checkbounds(Bool, s, I) ? nothing :
+              incomplete(s) ? throw(IncompleteError()) :
+                              throw(BoundsError(s, I))
 
-#FIXME
-#@propagate_inbounds Base.codeunit(s::IOString, i::Integer) = s.buf.data[i]
-@propagate_inbounds function Base.codeunit(s::IOString, i::Integer)
-    c = s.buf.data[i]
-    while c == IOStrings.ASCII_ETB && bytesavailable(s.io) > 0
-        pump(s)
-        c = s.buf.data[i]
-    end
-    return c
-end
 
 Base.pointer(s::IOString) = pointer(s.buf.data)
 Base.pointer(s::IOString, i) = pointer(s.buf.data, i)
 
-incomplete(s::IOString) = s.buf.data[ncodeunits(s) + 1] == ASCII_ETB
+incomplete(s::IOString) = codeunit(s, ncodeunits(s) + 1) == ASCII_ETB
 
 recoverable(e) = false
 recoverable(::IncompleteError) = true

src/LazyJSON.jl

@@ -9,7 +9,6 @@ using Base: @propagate_inbounds
 
 const JSON = LazyJSON
 
-const enable_iostrings = false
 const enable_getproperty = true
 
 include("SplicedStrings.jl")            ; using .SplicedStrings: SplicedString
@@ -138,14 +137,10 @@ value(ss::SubString{<:SupportedString}, path=nothing; kw...) =
 
 value(bytes, path=nothing; kw...) = value(Base.String(bytes), path; kw...)
 
-@static if enable_iostrings
 function value(io::IO, path=nothing; kw...)
     s = IOString(io)
     return pump(() -> value(s, path; kw...), s)
 end
-else
-value(io::IO, path=nothing; kw...) = value(read(io, String), path, kw...)
-end
 
 IOStrings.recoverable(e::JSON.ParseError) = e.c == IOStrings.ASCII_ETB
 

src/SplicedStrings.jl

@@ -360,24 +360,25 @@ function Base.isvalid(s::SplicedString, i::Int)
     return isvalid(fragment_si(s, i)...)
 end)
 
-
-#FIXME 
-#=
 @propagate_inbounds(
-function Base.next(s::SplicedString, i::Integer)
+function Base.iterate(s::SplicedString, i::Integer=1)
+    if i == index_offset || isempty(s.v)
+        return nothing
+    end
     fs, fi = fragment_si(s, i)
-    c, fi = @inbounds next(fs, fi)
+    c, fi = @inbounds iterate(fs, fi)
     l = ncodeunits(fs)
     i = i & fragment_mask | fi + index_offset
     if fi > l
         n = i >> fragment_bits + 1
         if n < length(s.v)
             i = n << fragment_bits | 1 + index_offset
+        else
+            i = index_offset
         end
     end
     return c, i
 end)
-=#
 
 @propagate_inbounds(
 function Base.nextind(s::SplicedString, i::Int)::Int