Remove WeakRefString dependency

Author: andreasnoack

REQUIRE

@@ -2,5 +2,4 @@ julia 0.6
 Compat 0.17
 DataValues
 PooledArrays 0.0.2
-WeakRefStrings
 DataStructures

src/csv.jl

@@ -75,12 +75,12 @@ end
 
 function csvread(file::IOStream, delim=','; kwargs...)
     mmap_data = Mmap.mmap(file)
-    _csvread(WeakRefString(pointer(mmap_data), length(mmap_data)), delim; kwargs...)
+    _csvread(String(mmap_data), delim; kwargs...)
 end
 
 function csvread(buffer::IO, delim=','; kwargs...)
     mmap_data = read(buffer)
-    _csvread(WeakRefString(pointer(mmap_data), length(mmap_data)), delim; kwargs...)
+    _csvread(String(mmap_data), delim; kwargs...)
 end
 
 function _csvread(str::AbstractString, delim=','; kwargs...)
@@ -90,7 +90,7 @@ end
 function _csvread_f(file::AbstractString, delim=','; kwargs...)
     open(file, "r") do io
         mmap_data = Mmap.mmap(io)
-        _csvread_internal(WeakRefString(pointer(mmap_data), length(mmap_data)), delim; filename=file, kwargs...)
+        _csvread_internal(String(mmap_data), delim; filename=file, kwargs...)
     end
 end
 

src/field.jl

@@ -286,10 +286,6 @@ end
     StrRange(i-1, j-i+1)
 end
 
-@inline function _substring(::Type{WeakRefString}, str, i, j)
-    WeakRefString(_pointer(str, i), j-i+1)
-end
-
 export Quoted
 
 immutable Quoted{T, S<:AbstractToken} <: AbstractToken{T}
@@ -497,7 +493,7 @@ function tryparsenext{T}(na::NAToken{T}, str, i, len, opts)
     @label maybe_null
     naopts = LocalOpts(endchar(na,opts), opts.quotechar,
                        opts.escapechar, false, opts.includenewlines)
-    @chk2 nastr, ii = tryparsenext(StringToken(WeakRefString), str, i, len, naopts)
+    @chk2 nastr, ii = tryparsenext(StringToken(String), str, i, len, naopts)
     if !isempty(searchsorted(na.nastrings, nastr))
         i=ii
         i = eatwhitespaces(str, i)

src/util.jl

@@ -157,14 +157,13 @@ end
 
 
 # PooledArrays for string data
-using WeakRefStrings
 using PooledArrays
 
-_pointer(x::WeakRefString, n) = x.ptr + n - 1
 _pointer(x::String, n) = pointer(x, n)
 
 @inline function nonallocating_setindex!{T}(pa::PooledArray{T}, i, rng::StrRange, str::AbstractString)
-    wstr = WeakRefString(_pointer(str, 1+rng.offset), rng.length)
+    # wstr = WeakRefString(_pointer(str, 1+rng.offset), rng.length)
+    wstr = str[(1:rng.length) + rng.offset] # so now it is allocating
     pool_idx = searchsortedfirst(pa.pool, wstr)
     if pool_idx > length(pa.pool) || pa.pool[pool_idx] != wstr
         # allocate only here.

test/runtests.jl

@@ -40,13 +40,11 @@ end
 
 
 import TextParse: StringToken
-using WeakRefStrings
 @testset "String parsing" begin
 
     # default options
     @test tryparsenext(StringToken(String), "") |> unwrap == ("", 1)
     x = "x"
-    @test tryparsenext(StringToken(WeakRefString), WeakRefString(pointer(x), 1)) |> unwrap == ("x", 2)
     @test tryparsenext(StringToken(String), "x") |> unwrap == ("x", 2)
     @test tryparsenext(StringToken(String), "x ") |> unwrap == ("x ", 3)
     @test tryparsenext(StringToken(String), " x") |> unwrap == (" x", 3)