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

got rid of some arcane module names

Browse source
This commit is contained in:
Araq 2011-04-21 00:54:44 +02:00
commit 36c67455d4
34 changed files with 327 additions and 1258 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/highlite.nim
View file

@ -12,7 +12,7 @@
# The interface supports one language nested in another.
import
nhashes, options, msgs, strutils, platform, idents, lexbase, wordrecg, scanner
nhashes, options, msgs, strutils, platform, idents, lexbase, wordrecg, lexer
type
TTokenClass* = enum
@ -154,7 +154,7 @@ proc nimNextToken(g: var TGeneralTokenizer) =
while not (g.buf[pos] in {'\0', '\x0A', '\x0D'}): inc(pos)
of 'a'..'z', 'A'..'Z', '_', '\x80'..'\xFF':
var id = ""
while g.buf[pos] in scanner.SymChars + {'_'}:
while g.buf[pos] in lexer.SymChars + {'_'}:
add(id, g.buf[pos])
inc(pos)
if (g.buf[pos] == '\"'):
@ -247,9 +247,9 @@ proc nimNextToken(g: var TGeneralTokenizer) =
of '\0':
g.kind = gtEof
else:
if g.buf[pos] in scanner.OpChars:
if g.buf[pos] in lexer.OpChars:
g.kind = gtOperator
while g.buf[pos] in scanner.OpChars: inc(pos)
while g.buf[pos] in lexer.OpChars: inc(pos)
else:
inc(pos)
g.kind = gtNone
@ -462,10 +462,10 @@ proc clikeNextToken(g: var TGeneralTokenizer, keywords: openarray[string],
of '\0':
g.kind = gtEof
else:
if g.buf[pos] in scanner.OpChars:
if g.buf[pos] in lexer.OpChars:
g.kind = gtOperator
while g.buf[pos] in scanner.OpChars: inc(pos)
else:
while g.buf[pos] in lexer.OpChars: inc(pos)
else:
inc(pos)
g.kind = gtNone
g.length = pos - g.pos