diff options
author | Dominik Picheta <dominikpicheta@googlemail.com> | 2015-05-25 10:57:00 +0100 |
---|---|---|
committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2015-05-25 10:57:00 +0100 |
commit | 71561bef5846fbbfea1f77ecba1f9d6d7426ca43 (patch) | |
tree | 86307810079a1db79e3776c092c9dea5f218b912 | |
parent | 4702b5f5c3f0ac4d02ee531ac3cc264f3ca33d1a (diff) | |
parent | 513423a08dcc6f2011f9af394c2a66c54445d5eb (diff) | |
download | Nim-71561bef5846fbbfea1f77ecba1f9d6d7426ca43.tar.gz |
Merge pull request #2792 from apense/patch-1
Corrected various links within documentation
-rw-r--r-- | doc/manual/stmts.txt | 6 | ||||
-rw-r--r-- | doc/manual/types.txt | 2 | ||||
-rw-r--r-- | lib/system.nim | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/manual/stmts.txt b/doc/manual/stmts.txt index 5e47110e9..210ca7064 100644 --- a/doc/manual/stmts.txt +++ b/doc/manual/stmts.txt @@ -176,9 +176,9 @@ The rules for compile-time computability are: 1. Literals are compile-time computable. 2. Type conversions are compile-time computable. 3. Procedure calls of the form ``p(X)`` are compile-time computable if - ``p`` is a proc without side-effects (see the `noSideEffect pragma`_ - for details) and if ``X`` is a (possibly empty) list of compile-time - computable arguments. + ``p`` is a proc without side-effects (see the `noSideEffect pragma + <#pragmas-nosideeffect-pragma>`_ for details) and if ``X`` is a + (possibly empty) list of compile-time computable arguments. Constants cannot be of type ``ptr``, ``ref``, ``var`` or ``object``, nor can diff --git a/doc/manual/types.txt b/doc/manual/types.txt index bdf51941d..689605f08 100644 --- a/doc/manual/types.txt +++ b/doc/manual/types.txt @@ -963,7 +963,7 @@ Most calling conventions exist only for the Windows 32-bit platform. Assigning/passing a procedure to a procedural variable is only allowed if one of the following conditions hold: 1) The procedure that is accessed resides in the current module. -2) The procedure is marked with the ``procvar`` pragma (see `procvar pragma`_). +2) The procedure is marked with the ``procvar`` pragma (see `procvar pragma <#pragmas-procvar-pragma>`_). 3) The procedure has a calling convention that differs from ``nimcall``. 4) The procedure is anonymous. diff --git a/lib/system.nim b/lib/system.nim index c02ae4bb3..a4b053ca7 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -2248,14 +2248,14 @@ proc echo*(x: varargs[expr, `$`]) {.magic: "Echo", tags: [WriteIOEffect], ## Unlike other IO operations this is guaranteed to be thread-safe as ## ``echo`` is very often used for debugging convenience. If you want to use ## ``echo`` inside a `proc without side effects - ## <manual.html#nosideeffect-pragma>`_ you can use `debugEcho <#debugEcho>`_ + ## <manual.html#pragmas-nosideeffect-pragma>`_ you can use `debugEcho <#debugEcho>`_ ## instead. proc debugEcho*(x: varargs[expr, `$`]) {.magic: "Echo", noSideEffect, tags: [], raises: [].} ## Same as `echo <#echo>`_, but as a special semantic rule, ``debugEcho`` ## pretends to be free of side effects, so that it can be used for debugging - ## routines marked as `noSideEffect <manual.html#nosideeffect-pragma>`_. + ## routines marked as `noSideEffect <manual.html#pragmas-nosideeffect-pragma>`_. template newException*(exceptn: typedesc, message: string): expr = ## creates an exception object of type ``exceptn`` and sets its ``msg`` field |