Use YAML version traits in the parser

src/YAML.jl

@@ -30,6 +30,8 @@ using StringEncodings
 include("versions.jl")
 include("queue.jl")
 include("buffered_input.jl")
+include("mark.jl")
+include("span.jl")
 include("tokens.jl")
 include("scanner.jl")
 include("events.jl")

src/buffered_input.jl

@@ -15,41 +15,35 @@ mutable struct BufferedInput
     end
 end
 
-
-# Read and buffer n more characters
-function __fill(bi::BufferedInput, bi_input::IO, n::Integer)
-    for _ in 1:n
-        c = eof(bi_input) ? '\0' : read(bi_input, Char)
-        i = bi.offset + bi.avail + 1
+# Read and buffer `n` more characters
+function buffer!(bi::BufferedInput, n::Integer)::Nothing
+    for i in (bi.offset + bi.avail) .+ (1:n)
+        c = eof(bi.input) ? '\0' : read(bi.input, Char)
         if i ≤ length(bi.buffer)
             bi.buffer[i] = c
         else
             push!(bi.buffer, c)
         end
-        bi.avail += 1
     end
+    bi.avail += n
+    nothing
 end
 
-_fill(bi::BufferedInput, n::Integer) = __fill(bi, bi.input, n)
-
 # Peek the character in the i-th position relative to the current position.
 # (0-based)
 function peek(bi::BufferedInput, i::Integer=0)
     i1 = i + 1
     if bi.avail < i1
-        _fill(bi, i1 - bi.avail)
+        buffer!(bi, i1 - bi.avail)
     end
     bi.buffer[bi.offset + i1]
 end
 
 
 # Return the string formed from the first n characters from the current position
 # of the stream.
-function prefix(bi::BufferedInput, n::Integer=1)
-    n1 = n + 1
-    if bi.avail < n1
-        _fill(bi, n1 - bi.avail)
-    end
+function prefix(bi::BufferedInput, n::Integer=1)::String
+    bi.avail < n && buffer!(bi, n - bi.avail)
     String(bi.buffer[bi.offset .+ (1:n)])
 end
 
@@ -70,6 +64,7 @@ function forward!(bi::BufferedInput, n::Integer=1)
             n -= 1
         end
     end
+    nothing
 end
 
 # Ugly hack to allow peeking of `StringDecoder`s

src/mark.jl

@@ -0,0 +1,10 @@
+# Position within the document being parsed
+struct Mark
+    index::UInt64
+    line::UInt64
+    column::UInt64
+end
+
+function show(io::IO, mark::Mark)
+    @printf(io, "line %d, column %d", mark.line, mark.column)
+end