fixex merge conflicts

2018-06-08 19:50:36 +02:00 · 2018-06-08 19:50:36 +02:00 · 8e9551b1c7
commit 8e9551b1c7
parent 8ba7e7d807 f99acdb075
53 changed files with 2648 additions and 355 deletions
--- a/compiler/lexer.nim
+++ b/compiler/lexer.nim
@ -25,7 +25,7 @@ const
  SymChars*: set[char] = {'a'..'z', 'A'..'Z', '0'..'9', '\x80'..'\xFF'}
  SymStartChars*: set[char] = {'a'..'z', 'A'..'Z', '\x80'..'\xFF'}
  OpChars*: set[char] = {'+', '-', '*', '/', '\\', '<', '>', '!', '?', '^', '.',
-    '|', '=', '%', '&', '$', '@', '~', ':', '\x80'..'\xFF'}
+    '|', '=', '%', '&', '$', '@', '~', ':'}

 # don't forget to update the 'highlite' module if these charsets should change