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

Restructure branching slighty. Fix error message.

Browse source
This commit is contained in:
Oscar Campbell 2015-06-01 23:49:04 +02:00
commit dd30bab480
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/lexer.nim
View file

@ -140,7 +140,8 @@ proc isKeyword*(kind: TTokType): bool =
proc isNimIdentifier*(s: string): bool = proc isNimIdentifier*(s: string): bool =
if s[0] in SymStartChars: if s[0] in SymStartChars:
var i = 1 var i = 1
while i < s.len: var sLen = s.len
while i < sLen:
if s[i] == '_': if s[i] == '_':
inc(i) inc(i)
elif isMagicIdentSeparatorRune(cstring s, i): elif isMagicIdentSeparatorRune(cstring s, i):
@ -637,7 +638,7 @@ proc getSymbol(L: var TLexer, tok: var TToken) =
buf[pos+1] == '\128' and buf[pos+1] == '\128' and
buf[pos+2] == '\147': # It's a 'magic separator' en-dash Unicode buf[pos+2] == '\147': # It's a 'magic separator' en-dash Unicode
if buf[pos + magicIdentSeparatorRuneByteWidth] notin SymChars: if buf[pos + magicIdentSeparatorRuneByteWidth] notin SymChars:
lexMessage(L, errInvalidToken, "·") lexMessage(L, errInvalidToken, "–")
break break
inc(pos, magicIdentSeparatorRuneByteWidth) inc(pos, magicIdentSeparatorRuneByteWidth)
else: else:

13
lib/pure/hashes.nim
View file

@ -130,14 +130,13 @@ proc hashIgnoreStyle*(x: string): THash =
var c = x[i] var c = x[i]
if c == '_': if c == '_':
inc(i) inc(i)
continue # skip _ elif isMagicIdentSeparatorRune(cstring(x), i):
if isMagicIdentSeparatorRune(cstring(x), i):
inc(i, magicIdentSeparatorRuneByteWidth) inc(i, magicIdentSeparatorRuneByteWidth)
continue # skip '·' (unicode middle dot) else:
if c in {'A'..'Z'}: if c in {'A'..'Z'}:
c = chr(ord(c) + (ord('a') - ord('A'))) # toLower() c = chr(ord(c) + (ord('a') - ord('A'))) # toLower()
h = h !& ord(c) h = h !& ord(c)
inc(i) inc(i)
result = !$h result = !$h