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

fixes #1166

Browse source
This commit is contained in:
Araq 2014-07-01 22:10:43 +02:00
commit daf9dd701e
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
compiler/lexer.nim
View file

@ -347,7 +347,7 @@ proc getNumber(L: var TLexer): TToken =
result.base = base2 result.base = base2
while true: while true:
case L.buf[pos] case L.buf[pos]
of 'A'..'Z', 'a'..'z', '2'..'9', '.': of '2'..'9', '.':
lexMessage(L, errInvalidNumber, result.literal) lexMessage(L, errInvalidNumber, result.literal)
inc(pos) inc(pos)
of '_': of '_':
@ -363,7 +363,7 @@ proc getNumber(L: var TLexer): TToken =
result.base = base8 result.base = base8
while true: while true:
case L.buf[pos] case L.buf[pos]
of 'A'..'Z', 'a'..'z', '8'..'9', '.': of '8'..'9', '.':
lexMessage(L, errInvalidNumber, result.literal) lexMessage(L, errInvalidNumber, result.literal)
inc(pos) inc(pos)
of '_': of '_':
@ -377,25 +377,22 @@ proc getNumber(L: var TLexer): TToken =
else: break else: break
of 'O': of 'O':
lexMessage(L, errInvalidNumber, result.literal) lexMessage(L, errInvalidNumber, result.literal)
of 'x', 'X': of 'x', 'X':
result.base = base16 result.base = base16
while true: while true:
case L.buf[pos] case L.buf[pos]
of 'G'..'Z', 'g'..'z': of '_':
lexMessage(L, errInvalidNumber, result.literal) if L.buf[pos+1] notin {'0'..'9', 'a'..'f', 'A'..'F'}:
inc(pos)
of '_':
if L.buf[pos+1] notin {'0'..'9', 'a'..'f', 'A'..'F'}:
lexMessage(L, errInvalidToken, "_") lexMessage(L, errInvalidToken, "_")
break break
inc(pos) inc(pos)
of '0'..'9': of '0'..'9':
xi = `shl`(xi, 4) or (ord(L.buf[pos]) - ord('0')) xi = `shl`(xi, 4) or (ord(L.buf[pos]) - ord('0'))
inc(pos) inc(pos)
of 'a'..'f': of 'a'..'f':
xi = `shl`(xi, 4) or (ord(L.buf[pos]) - ord('a') + 10) xi = `shl`(xi, 4) or (ord(L.buf[pos]) - ord('a') + 10)
inc(pos) inc(pos)
of 'A'..'F': of 'A'..'F':
xi = `shl`(xi, 4) or (ord(L.buf[pos]) - ord('A') + 10) xi = `shl`(xi, 4) or (ord(L.buf[pos]) - ord('A') + 10)
inc(pos) inc(pos)
else: break else: break