Move newSeqWith to sequtils

This commit is contained in:
def
2014-08-11 21:05:21 +02:00
parent 5e2614a7d6
commit 61a6ecfd94
2 changed files with 24 additions and 17 deletions

View File

@@ -409,6 +409,23 @@ template mapIt*(varSeq, pred: expr) =
let it {.inject.} = varSeq[i]
varSeq[i] = pred
template newSeqWith*(len: int, init: expr): expr =
## creates a new sequence, calling `init` to initialize each value. Example:
##
## .. code-block:: nimrod
## var seq2D = newSeqWith(20, newSeq[bool](10))
## seq2D[0][0] = true
## seq2D[1][0] = true
## seq2D[0][1] = true
##
## import math
## var seqRand = newSeqWith(20, random(10))
## echo seqRand
var result {.gensym.} = newSeq[type(init)](len)
for i in 0 .. <len:
result[i] = init
result
when isMainModule:
import strutils
block: # concat test
@@ -557,4 +574,11 @@ when isMainModule:
doAssert b.distribute(5, true)[4].len == 5
doAssert b.distribute(5, false)[4].len == 2
block: # newSeqWith tests
var seq2D = newSeqWith(4, newSeq[bool](2))
seq2D[0][0] = true
seq2D[1][0] = true
seq2D[0][1] = true
doAssert seq2D == @[@[true, true], @[true, false], @[false, false], @[false, false]]
echo "Finished doc tests"

View File

@@ -476,23 +476,6 @@ proc newSeq*[T](len = 0): seq[T] =
## #inputStrings[3] = "out of bounds"
newSeq(result, len)
template newSeqWith*(len: int, init: expr): expr =
## creates a new sequence, calling `init` to initialize each value. Example:
##
## .. code-block:: nimrod
## var seq2D = newSeqWith(20, newSeq[bool](10))
## seq2D[0][0] = true
## seq2D[1][0] = true
## seq2D[0][1] = true
##
## import math
## var seqRand = newSeqWith(20, random(10))
## echo seqRand
var result {.gensym.} = newSeq[type(init)](len)
for i in 0 .. <len:
result[i] = init
result
proc len*[TOpenArray: openArray|varargs](x: TOpenArray): int {.
magic: "LengthOpenArray", noSideEffect.}
proc len*(x: string): int {.magic: "LengthStr", noSideEffect.}