diff options
| author | Zahary Karadjov <zahary@gmail.com> | 2013-09-03 03:14:56 +0300 |
|---|---|---|
| committer | Zahary Karadjov <zahary@gmail.com> | 2013-09-03 03:14:56 +0300 |
| commit | 6082595e968f000b5089b1db7e72ad55bbf3fac3 (patch) | |
| tree | 06a76e725c59524b5e7ab23e8c5f1a7c1bef5e54 /compiler/lexer.nim | |
| parent | 39da6979add895cf58e9c6f883ef8df465975cd6 (diff) | |
| parent | c8c8d2035af189bdf63b39d4e47266a6e67c38b9 (diff) | |
| download | Nim-6082595e968f000b5089b1db7e72ad55bbf3fac3.tar.gz | |
Merge branch 'type-classes' into upstream
Diffstat (limited to 'compiler/lexer.nim')
| -rw-r--r-- | compiler/lexer.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/lexer.nim b/compiler/lexer.nim index 6a104d139..82bfa0ad4 100644 --- a/compiler/lexer.nim +++ b/compiler/lexer.nim @@ -41,7 +41,7 @@ type tkGeneric, tkIf, tkImport, tkIn, tkInclude, tkInterface, tkIs, tkIsnot, tkIterator, tkLambda, tkLet, - tkMacro, tkMethod, tkMixin, tkMod, tkNil, tkNot, tkNotin, + tkMacro, tkMethod, tkMixin, tkUsing, tkMod, tkNil, tkNot, tkNotin, tkObject, tkOf, tkOr, tkOut, tkProc, tkPtr, tkRaise, tkRef, tkReturn, tkShared, tkShl, tkShr, tkStatic, tkTemplate, @@ -75,7 +75,7 @@ const "finally", "for", "from", "generic", "if", "import", "in", "include", "interface", "is", "isnot", "iterator", "lambda", "let", - "macro", "method", "mixin", "mod", + "macro", "method", "mixin", "using", "mod", "nil", "not", "notin", "object", "of", "or", "out", "proc", "ptr", "raise", "ref", "return", "shared", "shl", "shr", "static", |