diff options
Diffstat (limited to 'lib/pure')
-rw-r--r-- | lib/pure/actors.nim | 2 | ||||
-rw-r--r-- | lib/pure/algorithm.nim | 4 | ||||
-rw-r--r-- | lib/pure/asyncnet.nim | 2 | ||||
-rw-r--r-- | lib/pure/collections/LockFreeHash.nim | 2 | ||||
-rw-r--r-- | lib/pure/future.nim | 4 | ||||
-rw-r--r-- | lib/pure/httpclient.nim | 6 | ||||
-rw-r--r-- | lib/pure/httpserver.nim | 2 | ||||
-rw-r--r-- | lib/pure/json.nim | 4 | ||||
-rw-r--r-- | lib/pure/os.nim | 30 | ||||
-rw-r--r-- | lib/pure/osproc.nim | 2 | ||||
-rw-r--r-- | lib/pure/parseopt.nim | 2 | ||||
-rw-r--r-- | lib/pure/parseutils.nim | 4 | ||||
-rw-r--r-- | lib/pure/parsexml.nim | 4 | ||||
-rw-r--r-- | lib/pure/times.nim | 2 | ||||
-rw-r--r-- | lib/pure/xmltree.nim | 10 |
15 files changed, 40 insertions, 40 deletions
diff --git a/lib/pure/actors.nim b/lib/pure/actors.nim index 18299d687..f2c50ce4c 100644 --- a/lib/pure/actors.nim +++ b/lib/pure/actors.nim @@ -13,7 +13,7 @@ ## ## Example: ## -## .. code-block:: nimrod +## .. code-block:: nim ## ## var ## a: TActorPool[int, void] diff --git a/lib/pure/algorithm.nim b/lib/pure/algorithm.nim index 3993a4172..0358a9a81 100644 --- a/lib/pure/algorithm.nim +++ b/lib/pure/algorithm.nim @@ -159,7 +159,7 @@ proc sort*[T](a: var openArray[T], ## sensible default argument for ``cmp``, so you have to provide one ## of your own. However, the ``system.cmp`` procs can be used: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## ## sort(myIntArray, system.cmp[int]) ## @@ -170,7 +170,7 @@ proc sort*[T](a: var openArray[T], ## You can inline adhoc comparison procs with the `do notation ## <manual.html#do-notation>`_. Example: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## ## people.sort do (x, y: Person) -> int: ## result = cmp(x.surname, y.surname) diff --git a/lib/pure/asyncnet.nim b/lib/pure/asyncnet.nim index ecaf0b9f9..695d8c07b 100644 --- a/lib/pure/asyncnet.nim +++ b/lib/pure/asyncnet.nim @@ -15,7 +15,7 @@ ## ## The following example demonstrates a simple chat server. ## -## .. code-block::nimrod +## .. code-block::nim ## ## import asyncnet, asyncdispatch ## diff --git a/lib/pure/collections/LockFreeHash.nim b/lib/pure/collections/LockFreeHash.nim index 57beb83c9..5640838b1 100644 --- a/lib/pure/collections/LockFreeHash.nim +++ b/lib/pure/collections/LockFreeHash.nim @@ -1,4 +1,4 @@ -#nimrod c -t:-march=i686 --cpu:amd64 --threads:on -d:release lockfreehash.nim +#nim c -t:-march=i686 --cpu:amd64 --threads:on -d:release lockfreehash.nim import unsigned, math, hashes diff --git a/lib/pure/future.nim b/lib/pure/future.nim index c467d2c73..7d791e16c 100644 --- a/lib/pure/future.nim +++ b/lib/pure/future.nim @@ -53,7 +53,7 @@ proc createProcType(p, b: PNimrodNode): PNimrodNode {.compileTime.} = macro `=>`*(p, b: expr): expr {.immediate.} = ## Syntax sugar for anonymous procedures. ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## ## proc passTwoAndTwo(f: (int, int) -> int): int = ## f(2, 2) @@ -104,7 +104,7 @@ macro `=>`*(p, b: expr): expr {.immediate.} = macro `->`*(p, b: expr): expr {.immediate.} = ## Syntax sugar for procedure types. ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## ## proc pass2(f: (float, float) -> float): float = ## f(2, 2) diff --git a/lib/pure/httpclient.nim b/lib/pure/httpclient.nim index 3fbb04fc8..a0e8c6b05 100644 --- a/lib/pure/httpclient.nim +++ b/lib/pure/httpclient.nim @@ -656,17 +656,17 @@ when isMainModule: resp = await client.request("http://picheta.me/aboutme.html") echo("Got response: ", resp.status) - resp = await client.request("http://nimrod-lang.org/") + resp = await client.request("http://nim-lang.org/") echo("Got response: ", resp.status) - resp = await client.request("http://nimrod-lang.org/download.html") + resp = await client.request("http://nim-lang.org/download.html") echo("Got response: ", resp.status) asyncCheck main() runForever() else: - #downloadFile("http://force7.de/nimrod/index.html", "nimrodindex.html") + #downloadFile("http://force7.de/nim/index.html", "nimindex.html") #downloadFile("http://www.httpwatch.com/", "ChunkTest.html") #downloadFile("http://validator.w3.org/check?uri=http%3A%2F%2Fgoogle.com", # "validator.html") diff --git a/lib/pure/httpserver.nim b/lib/pure/httpserver.nim index 4bbdbb5a1..b850815c9 100644 --- a/lib/pure/httpserver.nim +++ b/lib/pure/httpserver.nim @@ -11,7 +11,7 @@ ## ## Example: ## -## .. code-block:: nimrod +## .. code-block:: nim ## import strutils, sockets, httpserver ## ## var counter = 0 diff --git a/lib/pure/json.nim b/lib/pure/json.nim index d90ddebf1..8bd05ad55 100644 --- a/lib/pure/json.nim +++ b/lib/pure/json.nim @@ -16,7 +16,7 @@ ## ## Usage example: ## -## .. code-block:: nimrod +## .. code-block:: nim ## let ## small_json = """{"test": 1.3, "key2": true}""" ## jobj = parseJson(small_json) @@ -26,7 +26,7 @@ ## ## Results in: ## -## .. code-block:: nimrod +## .. code-block:: nim ## ## 1.3000000000000000e+00 ## true diff --git a/lib/pure/os.nim b/lib/pure/os.nim index ae352c26f..c4b694406 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -514,12 +514,12 @@ proc joinPath*(head, tail: string): string {. ## ## For example on Unix: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## joinPath("usr", "lib") ## ## results in: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## "usr/lib" ## ## If head is the empty string, tail is returned. If tail is the empty @@ -528,7 +528,7 @@ proc joinPath*(head, tail: string): string {. ## path separators not located on boundaries won't be modified. More ## examples on Unix: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## assert joinPath("usr", "") == "usr/" ## assert joinPath("", "lib") == "lib" ## assert joinPath("", "/lib") == "/lib" @@ -560,7 +560,7 @@ proc `/` * (head, tail: string): string {.noSideEffect.} = ## ## Here are some examples for Unix: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## assert "usr" / "" == "usr/" ## assert "" / "lib" == "lib" ## assert "" / "/lib" == "/lib" @@ -574,7 +574,7 @@ proc splitPath*(path: string): tuple[head, tail: string] {. ## ## Examples: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## splitPath("usr/local/bin") -> ("usr/local", "bin") ## splitPath("usr/local/bin/") -> ("usr/local/bin", "") ## splitPath("bin") -> ("", "bin") @@ -674,10 +674,10 @@ proc splitFile*(path: string): tuple[dir, name, ext: string] {. ## ## Example: ## - ## .. code-block:: nimrod - ## var (dir, name, ext) = splitFile("usr/local/nimrodc.html") + ## .. code-block:: nim + ## var (dir, name, ext) = splitFile("usr/local/nimc.html") ## assert dir == "usr/local" - ## assert name == "nimrodc" + ## assert name == "nimc" ## assert ext == ".html" ## ## If `path` has no extension, `ext` is the empty string. @@ -1579,7 +1579,7 @@ proc inclFilePermissions*(filename: string, rtl, extern: "nos$1", tags: [ReadDirEffect, WriteDirEffect].} = ## a convenience procedure for: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## setFilePermissions(filename, getFilePermissions(filename)+permissions) setFilePermissions(filename, getFilePermissions(filename)+permissions) @@ -1588,7 +1588,7 @@ proc exclFilePermissions*(filename: string, rtl, extern: "nos$1", tags: [ReadDirEffect, WriteDirEffect].} = ## a convenience procedure for: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## setFilePermissions(filename, getFilePermissions(filename)-permissions) setFilePermissions(filename, getFilePermissions(filename)-permissions) @@ -1627,7 +1627,7 @@ when defined(nimdoc): ## can test for its availability with `declared() <system.html#declared>`_. ## Example: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## when declared(paramCount): ## # Use paramCount() here ## else: @@ -1650,7 +1650,7 @@ when defined(nimdoc): ## can test for its availability with `declared() <system.html#declared>`_. ## Example: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## when declared(paramStr): ## # Use paramStr() here ## else: @@ -1703,7 +1703,7 @@ when declared(paramCount) or defined(nimdoc): ## can test for its availability with `declared() <system.html#declared>`_. ## Example: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## when declared(commandLineParams): ## # Use commandLineParams() here ## else: @@ -1858,7 +1858,7 @@ proc expandTilde*(path: string): string = ## The behaviour of this proc is the same on the Windows platform despite not ## having this convention. Example: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## let configFile = expandTilde("~" / "appname.cfg") ## echo configFile ## # --> C:\Users\amber\appname.cfg @@ -1889,7 +1889,7 @@ type creationTime*: Time # Time file was created. Not supported on all systems! template rawToFormalFileInfo(rawInfo, formalInfo): expr = - ## Transforms the native file info structure into the one nimrod uses. + ## Transforms the native file info structure into the one nim uses. ## 'rawInfo' is either a 'TBY_HANDLE_FILE_INFORMATION' structure on Windows, ## or a 'TStat' structure on posix when defined(Windows): diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim index 884774f1f..5c9cf182f 100644 --- a/lib/pure/osproc.nim +++ b/lib/pure/osproc.nim @@ -771,7 +771,7 @@ elif not defined(useNimRtl): proc startProcessAfterFork(data: ptr TStartProcessData) = # Warning: no GC here! - # Or anything that touches global structures - all called nimrod procs + # Or anything that touches global structures - all called nim procs # must be marked with stackTrace:off. Inspect C code after making changes. if not data.optionPoParentStreams: discard close(data.pStdin[writeIdx]) diff --git a/lib/pure/parseopt.nim b/lib/pure/parseopt.nim index de00bc76d..786744600 100644 --- a/lib/pure/parseopt.nim +++ b/lib/pure/parseopt.nim @@ -132,7 +132,7 @@ when declared(initOptParser): ## This is an convenience iterator for iterating over the command line. ## This uses the TOptParser object. Example: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## var ## filename = "" ## for kind, key, val in getopt(): diff --git a/lib/pure/parseutils.nim b/lib/pure/parseutils.nim index 38a3cbc5e..8f8ca6ab3 100644 --- a/lib/pure/parseutils.nim +++ b/lib/pure/parseutils.nim @@ -348,13 +348,13 @@ iterator interpolatedFragments*(s: string): tuple[kind: InterpolatedKind, ## ## Example: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## for k, v in interpolatedFragments(" $this is ${an example} $$"): ## echo "(", k, ", \"", v, "\")" ## ## Results in: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## (ikString, " ") ## (ikExpr, "this") ## (ikString, " is ") diff --git a/lib/pure/parsexml.nim b/lib/pure/parsexml.nim index f4f46e4f4..9b2814b84 100644 --- a/lib/pure/parsexml.nim +++ b/lib/pure/parsexml.nim @@ -33,7 +33,7 @@ ## XML parser to accomplish a simple task: To determine the title of an HTML ## document. ## -## .. code-block:: nimrod +## .. code-block:: nim ## :file: examples/htmltitle.nim ## ## @@ -44,7 +44,7 @@ ## XML parser to accomplish another simple task: To determine all the links ## an HTML document contains. ## -## .. code-block:: nimrod +## .. code-block:: nim ## :file: examples/htmlrefs.nim ## diff --git a/lib/pure/times.nim b/lib/pure/times.nim index 5d92218b3..dcc5617fd 100644 --- a/lib/pure/times.nim +++ b/lib/pure/times.nim @@ -298,7 +298,7 @@ when not defined(JS): ## To generate useful timing values, take the difference between ## the results of two ``cpuTime`` calls: ## - ## .. code-block:: nimrod + ## .. code-block:: nim ## var t0 = cpuTime() ## doWork() ## echo "CPU time [s] ", cpuTime() - t0 diff --git a/lib/pure/xmltree.nim b/lib/pure/xmltree.nim index 2caa65023..37f591f1e 100644 --- a/lib/pure/xmltree.nim +++ b/lib/pure/xmltree.nim @@ -275,12 +275,12 @@ proc xmlConstructor(e: PNimrodNode): PNimrodNode {.compileTime.} = macro `<>`*(x: expr): expr {.immediate.} = ## Constructor macro for XML. Example usage: ## - ## .. code-block:: nimrod - ## <>a(href="http://nimrod-code.org", newText("Nim rules.")) + ## .. code-block:: nim + ## <>a(href="http://nim-code.org", newText("Nim rules.")) ## ## Produces an XML tree for:: ## - ## <a href="http://nimrod-code.org">Nim rules.</a> + ## <a href="http://nim-code.org">Nim rules.</a> ## let x = callsite() result = xmlConstructor(x) @@ -339,5 +339,5 @@ proc findAll*(n: XmlNode, tag: string): seq[XmlNode] = findAll(n, tag, result) when isMainModule: - assert """<a href="http://nimrod-code.org">Nim rules.</a>""" == - $(<>a(href="http://nimrod-code.org", newText("Nim rules."))) + assert """<a href="http://nim-code.org">Nim rules.</a>""" == + $(<>a(href="http://nim-code.org", newText("Nim rules."))) |