summary refs log tree commit diff stats
path: root/compiler/highlite.nim
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2011-04-21 00:54:44 +0200
committerAraq <rumpf_a@web.de>2011-04-21 00:54:44 +0200
commit36c67455d4d3e5fa5222937b800f90ef811d8e86 (patch)
tree3ba25061d5b422ea9c241e98e39a43a352f139bc /compiler/highlite.nim
parentc3b16311dd7f547c19253af757ae53d58c715ad1 (diff)
downloadNim-36c67455d4d3e5fa5222937b800f90ef811d8e86.tar.gz
got rid of some arcane module names
Diffstat (limited to 'compiler/highlite.nim')
-rwxr-xr-xcompiler/highlite.nim14
1 files changed, 7 insertions, 7 deletions
diff --git a/compiler/highlite.nim b/compiler/highlite.nim
index c2fc95da8..c343074e7 100755
--- a/compiler/highlite.nim
+++ b/compiler/highlite.nim
@@ -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