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

'mixin' and 'interface' are now keywords

Browse source
This commit is contained in:
Araq 2012-09-22 10:04:31 +02:00
commit 3ef146b0ea
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/lexer.nim
View file

@ -38,10 +38,12 @@ type
tkConst, tkContinue, tkConverter, tkDiscard, tkDistinct, tkDiv, tkDo, tkConst, tkContinue, tkConverter, tkDiscard, tkDistinct, tkDiv, tkDo,
tkElif, tkElse, tkEnd, tkEnum, tkExcept, tkExport, tkElif, tkElse, tkEnd, tkEnum, tkExcept, tkExport,
tkFinally, tkFor, tkFrom, tkFinally, tkFor, tkFrom,
tkGeneric, tkIf, tkImport, tkIn, tkInclude, tkIs, tkIsnot, tkIterator, tkGeneric, tkIf, tkImport, tkIn, tkInclude, tkInterface,
tkIs, tkIsnot, tkIterator,
tkLambda, tkLet, tkLambda, tkLet,
tkMacro, tkMethod, tkMod, tkNil, tkNot, tkNotin, tkObject, tkOf, tkOr, tkMacro, tkMethod, tkMixin, tkMod, tkNil, tkNot, tkNotin,
tkOut, tkProc, tkPtr, tkRaise, tkRef, tkReturn, tkShl, tkShr, tkStatic, tkObject, tkOf, tkOr, tkOut,
tkProc, tkPtr, tkRaise, tkRef, tkReturn, tkShl, tkShr, tkStatic,
tkTemplate, tkTemplate,
tkTry, tkTuple, tkType, tkVar, tkWhen, tkWhile, tkWith, tkWithout, tkXor, tkTry, tkTuple, tkType, tkVar, tkWhen, tkWhile, tkWith, tkWithout, tkXor,
tkYield, # end of keywords tkYield, # end of keywords
@ -72,9 +74,10 @@ const
"const", "continue", "converter", "discard", "distinct", "div", "do", "const", "continue", "converter", "discard", "distinct", "div", "do",
"elif", "else", "end", "enum", "except", "export", "elif", "else", "end", "enum", "except", "export",
"finally", "for", "from", "generic", "if", "finally", "for", "from", "generic", "if",
"import", "in", "include", "is", "isnot", "iterator", "import", "in", "include", "interface", "is", "isnot", "iterator",
"lambda", "let", "lambda", "let",
"macro", "method", "mod", "nil", "not", "notin", "object", "of", "or", "macro", "method", "mixin", "mod",
"nil", "not", "notin", "object", "of", "or",
"out", "proc", "ptr", "raise", "ref", "return", "shl", "shr", "static", "out", "proc", "ptr", "raise", "ref", "return", "shl", "shr", "static",
"template", "template",
"try", "tuple", "type", "var", "when", "while", "with", "without", "xor", "try", "tuple", "type", "var", "when", "while", "with", "without", "xor",

9
compiler/wordrecg.nim
View file

@ -27,8 +27,8 @@ type
wContinue, wConverter, wDiscard, wDistinct, wDiv, wDo, wContinue, wConverter, wDiscard, wDistinct, wDiv, wDo,
wElif, wElse, wEnd, wEnum, wExcept, wExport, wElif, wElse, wEnd, wEnum, wExcept, wExport,
wFinally, wFor, wFrom, wGeneric, wIf, wImport, wIn, wFinally, wFor, wFrom, wGeneric, wIf, wImport, wIn,
wInclude, wIs, wIsnot, wIterator, wLambda, wLet, wInclude, wInterface, wIs, wIsnot, wIterator, wLambda, wLet,
wMacro, wMethod, wMod, wNil, wMacro, wMethod, wMixin, wMod, wNil,
wNot, wNotin, wObject, wOf, wOr, wOut, wProc, wPtr, wRaise, wRef, wReturn, wNot, wNotin, wObject, wOf, wOr, wOut, wProc, wPtr, wRaise, wRef, wReturn,
wShl, wShr, wStatic, wTemplate, wTry, wTuple, wType, wVar, wShl, wShr, wStatic, wTemplate, wTry, wTuple, wType, wVar,
wWhen, wWhile, wWith, wWithout, wXor, wYield, wWhen, wWhile, wWith, wWithout, wXor, wYield,
@ -104,9 +104,10 @@ const
"discard", "distinct", "div", "do", "discard", "distinct", "div", "do",
"elif", "else", "end", "enum", "except", "export", "elif", "else", "end", "enum", "except", "export",
"finally", "for", "from", "generic", "if", "finally", "for", "from", "generic", "if",
"import", "in", "include", "is", "isnot", "iterator", "import", "in", "include", "interface", "is", "isnot", "iterator",
"lambda", "let", "lambda", "let",
"macro", "method", "mod", "nil", "not", "notin", "object", "of", "or", "macro", "method", "mixin", "mod", "nil", "not", "notin",
"object", "of", "or",
"out", "proc", "ptr", "raise", "ref", "return", "shl", "shr", "static", "out", "proc", "ptr", "raise", "ref", "return", "shl", "shr", "static",
"template", "try", "tuple", "type", "var", "template", "try", "tuple", "type", "var",
"when", "while", "with", "without", "xor", "when", "while", "with", "without", "xor",

4
doc/keywords.txt
View file

@ -5,9 +5,9 @@ discard distinct div do
elif else end enum except export elif else end enum except export
finally for from finally for from
generic generic
if import in include is isnot iterator if import in include interface is isnot iterator
lambda let lambda let
macro method mod macro method mixin mod
nil not notin nil not notin
object of or out object of or out
proc ptr proc ptr

2
web/news.txt
View file

@ -74,7 +74,7 @@ Changes affecting backwards compatibility
The ``system``, ``os``, ``osproc`` and ``memfiles`` modules use the wide The ``system``, ``os``, ``osproc`` and ``memfiles`` modules use the wide
string versions of the WinAPI. Use the ``-d:useWinAnsi`` switch to revert string versions of the WinAPI. Use the ``-d:useWinAnsi`` switch to revert
back to the old behaviour which uses the Ansi string versions. back to the old behaviour which uses the Ansi string versions.
- ``static`` and ``do`` are now keywords. - ``static``, ``do``, ``interface`` and ``mixin`` are now keywords.
- Templates now participate in overloading resolution which can break code that - Templates now participate in overloading resolution which can break code that
uses templates in subtle ways. Use the new ``immediate`` pragma for templates uses templates in subtle ways. Use the new ``immediate`` pragma for templates
to get a template of old behaviour. to get a template of old behaviour.