jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes a lexer regression for 'nimble check'

Browse source
This commit is contained in:
Araq 2019-02-05 15:39:55 +01:00
commit 2e880c726b
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/lexer.nim
View file

@ -618,7 +618,7 @@ proc getNumber(L: var TLexer, result: var TToken) =
tokenEnd(result, postPos-1) tokenEnd(result, postPos-1)
L.bufpos = postPos L.bufpos = postPos
proc handleHexChar(L: var TLexer, xi: var int; position: range[1..4]) = proc handleHexChar(L: var TLexer, xi: var int; position: range[0..4]) =
template invalid() = template invalid() =
lexMessage(L, errGenerated, lexMessage(L, errGenerated,
"expected a hex digit, but found: " & L.buf[L.bufpos] & "expected a hex digit, but found: " & L.buf[L.bufpos] &
@ -635,8 +635,9 @@ proc handleHexChar(L: var TLexer, xi: var int; position: range[1..4]) =
xi = (xi shl 4) or (ord(L.buf[L.bufpos]) - ord('A') + 10) xi = (xi shl 4) or (ord(L.buf[L.bufpos]) - ord('A') + 10)
inc(L.bufpos) inc(L.bufpos)
of '"', '\'': of '"', '\'':
if position == 1: invalid() if position <= 1: invalid()
# do not progress the bufpos here. # do not progress the bufpos here.
if position == 0: inc(L.bufpos)
else: else:
invalid() invalid()
# Need to progress for `nim check` # Need to progress for `nim check`
@ -745,7 +746,7 @@ proc getEscapedChar(L: var TLexer, tok: var TToken) =
inc(L.bufpos) inc(L.bufpos)
var start = L.bufpos var start = L.bufpos
while L.buf[L.bufpos] != '}': while L.buf[L.bufpos] != '}':
handleHexChar(L, xi, 1) handleHexChar(L, xi, 0)
if start == L.bufpos: if start == L.bufpos:
lexMessage(L, errGenerated, lexMessage(L, errGenerated,
"Unicode codepoint cannot be empty") "Unicode codepoint cannot be empty")