summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--doc/manual/types.txt4
-rw-r--r--lib/system.nim8
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/manual/types.txt b/doc/manual/types.txt
index e9d33045b..bdf51941d 100644
--- a/doc/manual/types.txt
+++ b/doc/manual/types.txt
@@ -864,7 +864,9 @@ Future directions:
 * Builtin regions like ``private``, ``global`` and ``local`` will
   prove very useful for the upcoming OpenCL target.
 * Builtin "regions" can model ``lent`` and ``unique`` pointers.
-
+* An assignment operator can be attached to a region so that proper write
+  barriers can be generated. This would imply that the GC can be implemented
+  completely in user-space.
 
 
 Procedural type
diff --git a/lib/system.nim b/lib/system.nim
index da74604c4..52c29f757 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -3034,8 +3034,8 @@ proc instantiationInfo*(index = -1, fullPaths = false): tuple[
   ##     result = a[pos]
   ##
   ##   when isMainModule:
-  ##     testException(EInvalidIndex, tester(30))
-  ##     testException(EInvalidIndex, tester(1))
+  ##     testException(IndexError, tester(30))
+  ##     testException(IndexError, tester(1))
   ##     # --> Test failure at example.nim:20 with 'tester(1)'
 
 template currentSourcePath*: string = instantiationInfo(-1, true).filename
@@ -3120,7 +3120,7 @@ template onFailedAssert*(msg: expr, code: stmt): stmt {.dirty, immediate.} =
   ##
   ## .. code-block:: nim
   ##
-  ##   proc example(x: int): TErrorCode =
+  ##   proc example(x: int): ErrorCode =
   ##     onFailedAssert(msg):
   ##       log msg
   ##       return E_FAIL
@@ -3128,7 +3128,7 @@ template onFailedAssert*(msg: expr, code: stmt): stmt {.dirty, immediate.} =
   ##     assert(...)
   ##
   ##     onFailedAssert(msg):
-  ##       raise newException(EMyException, msg)
+  ##       raise newException(MyError, msg)
   ##
   ##     assert(...)
   ##