diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-10-02 08:31:38 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-10-02 08:31:38 +0200 |
| commit | e9243a16167b24899d4fcf051f3252b3a5804811 (patch) | |
| tree | dc4733a6f178d4f04ee4da33c50ca807eb7e9dd0 /compiler/lexer.nim | |
| parent | fc7961d4ccd31ab6e7eabbeb7aa22b5488924b4f (diff) | |
| parent | 02ff5f596c330b68927f843814ecb9b86c2eee67 (diff) | |
| download | Nim-e9243a16167b24899d4fcf051f3252b3a5804811.tar.gz | |
Merge branch 'devel' into araq
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 09bcb4ce0..45d090b16 100644 --- a/compiler/lexer.nim +++ b/compiler/lexer.nim @@ -48,7 +48,7 @@ type tkShl, tkShr, tkStatic, tkTemplate, tkTry, tkTuple, tkType, tkUsing, - tkVar, tkWhen, tkWhile, tkWith, tkWithout, tkXor, + tkVar, tkWhen, tkWhile, tkXor, tkYield, # end of keywords tkIntLit, tkInt8Lit, tkInt16Lit, tkInt32Lit, tkInt64Lit, tkUIntLit, tkUInt8Lit, tkUInt16Lit, tkUInt32Lit, tkUInt64Lit, @@ -89,7 +89,7 @@ const "shl", "shr", "static", "template", "try", "tuple", "type", "using", - "var", "when", "while", "with", "without", "xor", + "var", "when", "while", "xor", "yield", "tkIntLit", "tkInt8Lit", "tkInt16Lit", "tkInt32Lit", "tkInt64Lit", "tkUIntLit", "tkUInt8Lit", "tkUInt16Lit", "tkUInt32Lit", "tkUInt64Lit", |