[Base] Stop pirating Base.seek

tkemmer · Oct 20, 2022 · 1ce37aa · 1ce37aa
1 parent f7c15a3
commit 1ce37aa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/docs/src/intern/base.md b/docs/src/intern/base.md
@@ -17,6 +17,7 @@
     _cos
     _dot
     _norm
+    _seek
     _sign
     cathetus
     ddot
@@ -26,7 +27,6 @@
     pluseye!
     props
     reverseindex
-    seek
     unpack
     vertexnormals
 ```
diff --git a/src/NESSie.jl b/src/NESSie.jl
@@ -2,7 +2,6 @@ __precompile__()
 
 module NESSie
 
-import Base: seek
 import LinearAlgebra.BLAS: gemv!, gemv, axpy!, gemm
 
 using Distances: euclidean

diff --git a/src/base/util.jl b/src/base/util.jl
@@ -227,7 +227,7 @@ end
 
 # =========================================================================================
 """
-    seek(
+    _seek(
         fh         ::IOStream,
         prefix     ::String,
         skiptheline::Bool = true
@@ -242,7 +242,7 @@ is no such line, the stream handle will be set to EOF.
 # Return type
 `Void`
 """
-function seek(fh::IOStream, prefix::String, skiptheline::Bool=true)
+function _seek(fh::IOStream, prefix::String, skiptheline::Bool=true)
     m = -1
     found = false
     while !eof(fh)

diff --git a/test/base/util.jl b/test/base/util.jl
@@ -1,4 +1,4 @@
-using NESSie: _cos, _dot, _norm, eye!, pluseye!, isdegenerate, seek, reverseindex, unpack,
+using NESSie: _cos, _dot, _norm, _seek, eye!, pluseye!, isdegenerate, reverseindex, unpack,
     vertexnormals, distance
 using LinearAlgebra: ⋅, norm
 
@@ -46,6 +46,25 @@ end
     end
 end
 
+@testset "_seek" begin
+    fname, fh = mktemp()
+    write(fh, "Lorem\nipsum\ndolor\nsit\namet.\n")
+    seekstart(fh)
+    _seek(fh, "Foo")
+    @test eof(fh)
+    seekstart(fh)
+    _seek(fh, "Foo", false)
+    @test eof(fh)
+    seekstart(fh)
+    _seek(fh, "dolor")
+    @test readline(fh) == "sit"
+    seekstart(fh)
+    _seek(fh, "dolor", false)
+    @test readline(fh) == "dolor"
+    close(fh)
+    rm(fname)
+end
+
 @testset "distance" begin
     for T in testtypes
         elem = Triangle(T[0, 0, 0], T[0, 1, 0], T[0, 0, 1])
@@ -141,25 +160,6 @@ end
     end
 end
 
-@testset "seek" begin
-    fname, fh = mktemp()
-    write(fh, "Lorem\nipsum\ndolor\nsit\namet.\n")
-    seekstart(fh)
-    seek(fh, "Foo")
-    @test eof(fh)
-    seekstart(fh)
-    seek(fh, "Foo", false)
-    @test eof(fh)
-    seekstart(fh)
-    seek(fh, "dolor")
-    @test readline(fh) == "sit"
-    seekstart(fh)
-    seek(fh, "dolor", false)
-    @test readline(fh) == "dolor"
-    close(fh)
-    rm(fname)
-end
-
 @testset "reverseindex" begin
     for T in testtypes
         v1 = T[1, 2, 3]