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

big rename

Browse source
This commit is contained in:
Araq 2014-08-28 00:37:15 +02:00
commit fc5153e9b0
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/pure/collections/sets.nim
View file

@ -188,7 +188,7 @@ proc incl*[A](s: var HashSet[A], key: A) =
assert s.isValid, "The set needs to be initialized." assert s.isValid, "The set needs to be initialized."
inclImpl() inclImpl()
proc incl*[A](s: var HashSet[A], other: TSet[A]) = proc incl*[A](s: var HashSet[A], other: HashSet[A]) =
## Includes all elements from `other` into `s`. ## Includes all elements from `other` into `s`.
## ##
## Example: ## Example:
@ -219,7 +219,7 @@ proc excl*[A](s: var HashSet[A], key: A) =
s.data[index].slot = seDeleted s.data[index].slot = seDeleted
dec(s.counter) dec(s.counter)
proc excl*[A](s: var HashSet[A], other: TSet[A]) = proc excl*[A](s: var HashSet[A], other: HashSet[A]) =
## Excludes everything in `other` from `s`. ## Excludes everything in `other` from `s`.
## ##
## Example: ## Example:
@ -320,7 +320,7 @@ proc `$`*[A](s: HashSet[A]): string =
assert s.isValid, "The set needs to be initialized." assert s.isValid, "The set needs to be initialized."
dollarImpl() dollarImpl()
proc union*[A](s1, s2: HashSet[A]): TSet[A] = proc union*[A](s1, s2: HashSet[A]): HashSet[A] =
## Returns the union of the sets `s1` and `s2`. ## Returns the union of the sets `s1` and `s2`.
## ##
## The union of two sets is represented mathematically as *A ∪ B* and is the ## The union of two sets is represented mathematically as *A ∪ B* and is the
@ -337,7 +337,7 @@ proc union*[A](s1, s2: HashSet[A]): TSet[A] =
result = s1 result = s1
incl(result, s2) incl(result, s2)
proc intersection*[A](s1, s2: HashSet[A]): TSet[A] = proc intersection*[A](s1, s2: HashSet[A]): HashSet[A] =
## Returns the intersection of the sets `s1` and `s2`. ## Returns the intersection of the sets `s1` and `s2`.
## ##
## The intersection of two sets is represented mathematically as *A ∩ B* and ## The intersection of two sets is represented mathematically as *A ∩ B* and
@ -356,7 +356,7 @@ proc intersection*[A](s1, s2: HashSet[A]): TSet[A] =
for item in s1: for item in s1:
if item in s2: incl(result, item) if item in s2: incl(result, item)
proc difference*[A](s1, s2: HashSet[A]): TSet[A] = proc difference*[A](s1, s2: HashSet[A]): HashSet[A] =
## Returns the difference of the sets `s1` and `s2`. ## Returns the difference of the sets `s1` and `s2`.
## ##
## The difference of two sets is represented mathematically as *A \ B* and is ## The difference of two sets is represented mathematically as *A \ B* and is
@ -376,7 +376,7 @@ proc difference*[A](s1, s2: HashSet[A]): TSet[A] =
if not contains(s2, item): if not contains(s2, item):
incl(result, item) incl(result, item)
proc symmetricDifference*[A](s1, s2: HashSet[A]): TSet[A] = proc symmetricDifference*[A](s1, s2: HashSet[A]): HashSet[A] =
## Returns the symmetric difference of the sets `s1` and `s2`. ## Returns the symmetric difference of the sets `s1` and `s2`.
## ##
## The symmetric difference of two sets is represented mathematically as *A △ ## The symmetric difference of two sets is represented mathematically as *A △
@ -395,19 +395,19 @@ proc symmetricDifference*[A](s1, s2: HashSet[A]): TSet[A] =
for item in s2: for item in s2:
if containsOrIncl(result, item): excl(result, item) if containsOrIncl(result, item): excl(result, item)
proc `+`*[A](s1, s2: HashSet[A]): TSet[A] {.inline.} = proc `+`*[A](s1, s2: HashSet[A]): HashSet[A] {.inline.} =
## Alias for `union(s1, s2) <#union>`_. ## Alias for `union(s1, s2) <#union>`_.
result = union(s1, s2) result = union(s1, s2)
proc `*`*[A](s1, s2: HashSet[A]): TSet[A] {.inline.} = proc `*`*[A](s1, s2: HashSet[A]): HashSet[A] {.inline.} =
## Alias for `intersection(s1, s2) <#intersection>`_. ## Alias for `intersection(s1, s2) <#intersection>`_.
result = intersection(s1, s2) result = intersection(s1, s2)
proc `-`*[A](s1, s2: HashSet[A]): TSet[A] {.inline.} = proc `-`*[A](s1, s2: HashSet[A]): HashSet[A] {.inline.} =
## Alias for `difference(s1, s2) <#difference>`_. ## Alias for `difference(s1, s2) <#difference>`_.
result = difference(s1, s2) result = difference(s1, s2)
proc `-+-`*[A](s1, s2: HashSet[A]): TSet[A] {.inline.} = proc `-+-`*[A](s1, s2: HashSet[A]): HashSet[A] {.inline.} =
## Alias for `symmetricDifference(s1, s2) <#symmetricDifference>`_. ## Alias for `symmetricDifference(s1, s2) <#symmetricDifference>`_.
result = symmetricDifference(s1, s2) result = symmetricDifference(s1, s2)
@ -477,7 +477,7 @@ proc `==`*[A](s, t: HashSet[A]): bool =
## assert a == b ## assert a == b
s.counter == t.counter and s <= t s.counter == t.counter and s <= t
proc map*[A, B](data: HashSet[A], op: proc (x: A): B {.closure.}): TSet[B] = proc map*[A, B](data: HashSet[A], op: proc (x: A): B {.closure.}): HashSet[B] =
## Returns a new set after applying `op` on each of the elements of `data`. ## Returns a new set after applying `op` on each of the elements of `data`.
## ##
## You can use this proc to transform the elements from a set. Example: ## You can use this proc to transform the elements from a set. Example:
@ -621,7 +621,7 @@ proc incl*[A](s: var OrderedSet[A], key: A) =
assert s.isValid, "The set needs to be initialized." assert s.isValid, "The set needs to be initialized."
inclImpl() inclImpl()
proc incl*[A](s: var HashSet[A], other: TOrderedSet[A]) = proc incl*[A](s: var HashSet[A], other: OrderedSet[A]) =
## Includes all elements from `other` into `s`. ## Includes all elements from `other` into `s`.
## ##
## Example: ## Example:

6
lib/pure/net.nim
View file

@ -625,7 +625,7 @@ proc waitFor(socket: Socket, waited: var float, timeout, size: int,
waited += (epochTime() - startTime) waited += (epochTime() - startTime)
proc recv*(socket: Socket, data: pointer, size: int, timeout: int): int {. proc recv*(socket: Socket, data: pointer, size: int, timeout: int): int {.
tags: [ReadIOEffect, FTime].} = tags: [ReadIOEffect, TimeEffect].} =
## overload with a ``timeout`` parameter in miliseconds. ## overload with a ``timeout`` parameter in miliseconds.
var waited = 0.0 # number of seconds already waited var waited = 0.0 # number of seconds already waited
@ -688,7 +688,7 @@ proc peekChar(socket: Socket, c: var char): int {.tags: [ReadIOEffect].} =
proc readLine*(socket: Socket, line: var TaintedString, timeout = -1, proc readLine*(socket: Socket, line: var TaintedString, timeout = -1,
flags = {SocketFlag.SafeDisconn}) {. flags = {SocketFlag.SafeDisconn}) {.
tags: [ReadIOEffect, FTime].} = tags: [ReadIOEffect, TimeEffect].} =
## Reads a line of data from ``socket``. ## Reads a line of data from ``socket``.
## ##
## If a full line is read ``\r\L`` is not ## If a full line is read ``\r\L`` is not
@ -886,7 +886,7 @@ proc connectAsync(socket: Socket, name: string, port = Port(0),
if not success: raiseOSError(lastError) if not success: raiseOSError(lastError)
proc connect*(socket: Socket, address: string, port = Port(0), timeout: int, proc connect*(socket: Socket, address: string, port = Port(0), timeout: int,
af: Domain = AF_INET) {.tags: [ReadIOEffect, FWriteIO].} = af: Domain = AF_INET) {.tags: [ReadIOEffect, WriteIOEffect].} =
## Connects to server as specified by ``address`` on port specified by ``port``. ## Connects to server as specified by ``address`` on port specified by ``port``.
## ##
## The ``timeout`` paremeter specifies the time in miliseconds to allow for ## The ``timeout`` paremeter specifies the time in miliseconds to allow for