Some fixes

Author: Patitotective

.gitignore

@@ -8,3 +8,4 @@ trial.*
 *.sublime-*
 *.out
 tests/a.nim
+*.orig

src/kdl/lexer.nim

@@ -246,6 +246,8 @@ proc skipWhile(lexer: var Lexer, x: set[char]): int {.discardable.} =
     inc lexer
 
 proc disallowedRunes() {.lexing: tkEmpty.} =
+  if lexer.eof():
+    return
   let r = lexer.peekRune.int32
   if r == 0xFEFFi32:
     if lexer.getPos() == 0:
@@ -463,6 +465,7 @@ proc tokenIdent*() {.lexing: tkIdent.} =
       lexer.eof() or lexer.tokenWhitespace(addToStack = false) or
       lexer.tokenNewLine(addToStack = false) or lexer.peek() in nonIdenChars
     ):
+      lexer.setPos before
       return
 
   block outer:
@@ -522,9 +525,9 @@ proc validToken*(
 
 proc scanKdl*(lexer: var Lexer) =
   const choices = [
-    tokenWhitespace, tokenNewLine, tokenLineCont, tokenSingleLineComment, tokenEqual,
-    tokenRawString, tokenString, tokenIdent, tokenNumHex, tokenNumBin, tokenNumOct,
-    tokenNumFloat, tokenNumInt, tokenLitMatches,
+    disallowedRunes, tokenWhitespace, tokenNewLine, tokenLineCont,
+    tokenSingleLineComment, tokenEqual, tokenRawString, tokenString, tokenIdent,
+    tokenNumHex, tokenNumBin, tokenNumOct, tokenNumFloat, tokenNumInt, tokenLitMatches,
   ]
 
   while not lexer.eof():

src/kdl/utils.nim

@@ -223,7 +223,7 @@ proc errorAt*(s: Stream or string, coord: Coord): string =
 
   let lineNum = &"{coord.line + 1} | "
   result.add &"{lineNum}{line}\n"
-  result.add align("^", lineNum.len + coord.col + extraLen + coord.colNonAscii)
+  result.add unicode.align("^", lineNum.len + coord.col + extraLen + coord.colNonAscii)
 
 # ----- Object variants -----