summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rwxr-xr-xcompiler/lexer.nim7
-rwxr-xr-xcompiler/wordrecg.nim5
-rwxr-xr-xdoc/keywords.txt2
-rwxr-xr-xweb/news.txt1
4 files changed, 9 insertions, 6 deletions
diff --git a/compiler/lexer.nim b/compiler/lexer.nim
index 496712237..653644f8f 100755
--- a/compiler/lexer.nim
+++ b/compiler/lexer.nim
@@ -34,8 +34,8 @@ type
     tkAddr, tkAnd, tkAs, tkAsm, tkAtomic, 
     tkBind, tkBlock, tkBreak, tkCase, tkCast, 
     tkConst, tkContinue, tkConverter, tkDiscard, tkDistinct, tkDiv, tkElif, 
-    tkElse, tkEnd, tkEnum, tkExcept, tkFinally, tkFor, tkFrom, tkGeneric, tkIf, 
-    tkImport, tkIn, tkInclude, tkIs, tkIsnot, tkIterator,
+    tkElse, tkEnd, tkEnum, tkExcept, tkExport, tkFinally, tkFor, tkFrom,
+    tkGeneric, tkIf, tkImport, tkIn, tkInclude, tkIs, tkIsnot, tkIterator,
     tkLambda, tkLet,
     tkMacro, tkMethod, tkMod, tkNil, tkNot, tkNotin, tkObject, tkOf, tkOr, 
     tkOut, tkProc, tkPtr, tkRaise, tkRef, tkReturn, tkShl, tkShr, tkTemplate, 
@@ -62,7 +62,8 @@ const
     "addr", "and", "as", "asm", "atomic", 
     "bind", "block", "break", "case", "cast", 
     "const", "continue", "converter", "discard", "distinct", "div", "elif", 
-    "else", "end", "enum", "except", "finally", "for", "from", "generic", "if", 
+    "else", "end", "enum", "except", "export",
+    "finally", "for", "from", "generic", "if", 
     "import", "in", "include", "is", "isnot", "iterator",
     "lambda", "let", 
     "macro", "method", "mod", "nil", "not", "notin", "object", "of", "or", 
diff --git a/compiler/wordrecg.nim b/compiler/wordrecg.nim
index 9e4e13797..5f8a2b3fd 100755
--- a/compiler/wordrecg.nim
+++ b/compiler/wordrecg.nim
@@ -25,7 +25,7 @@ type
     wAddr, wAnd, wAs, wAsm, wAtomic, 
     wBind, wBlock, wBreak, wCase, wCast, wConst, 
     wContinue, wConverter, wDiscard, wDistinct, wDiv, wElif, wElse, wEnd, wEnum, 
-    wExcept, wFinally, wFor, wFrom, wGeneric, wIf, wImport, wIn, 
+    wExcept, wExport, wFinally, wFor, wFrom, wGeneric, wIf, wImport, wIn, 
     wInclude, wIs, wIsnot, wIterator, wLambda, wLet,
     wMacro, wMethod, wMod, wNil, 
     wNot, wNotin, wObject, wOf, wOr, wOut, wProc, wPtr, wRaise, wRef, wReturn, 
@@ -67,7 +67,8 @@ const
     "addr", "and", "as", "asm", "atomic", 
     "bind", "block", "break", "case", "cast", 
     "const", "continue", "converter", "discard", "distinct", "div", "elif", 
-    "else", "end", "enum", "except", "finally", "for", "from", "generic", "if", 
+    "else", "end", "enum", "except", "export", 
+    "finally", "for", "from", "generic", "if", 
     "import", "in", "include", "is", "isnot", "iterator",
     "lambda", "let",
     "macro", "method", "mod", "nil", "not", "notin", "object", "of", "or", 
diff --git a/doc/keywords.txt b/doc/keywords.txt
index 75014da42..c5834e3a7 100755
--- a/doc/keywords.txt
+++ b/doc/keywords.txt
@@ -2,7 +2,7 @@ addr and as asm atomic
 bind block break
 case cast const continue converter
 discard distinct div
-elif else end enum except
+elif else end enum except export
 finally for from generic
 if import in include is isnot iterator
 lambda let
diff --git a/web/news.txt b/web/news.txt
index d2bfe54af..b9442d098 100755
--- a/web/news.txt
+++ b/web/news.txt
@@ -51,6 +51,7 @@ Changes affecting backwards compatibility
 - The fields in ``TStream`` have been renamed to have an ``Impl`` suffix 
   because they should not be used directly anymore. 
   Wrapper procs have been created that should be used instead.
+- ``export`` is now a keyword.
 
 
 Language Additions