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

Moving asArray to future module

Browse source 
As per [suggestion](https://github.com/nim-lang/Nim/pull/6640#issuecomment-341565453) made by @Araq
This commit is contained in:
Fredrik Høisæther Rasch 2017-11-02 22:54:03 +01:00 • committed by Andreas Rumpf
commit 7744c6ce31
2 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lib/pure/collections/sequtils.nim
View file

@ -704,31 +704,6 @@ template newSeqWith*(len: int, init: untyped): untyped =
result[i] = init result[i] = init
result result
when not defined(nimscript):
import macros
macro asArray*(targetType: typedesc, values: typed): untyped =
## applies a type conversion to each of the elements in the specified
## array literal. Each element is converted to the ``targetType`` type..
##
## Example:
##
## .. code-block::
## let x = asArray(int, [0.1, 1.2, 2.3, 3.4])
## doAssert x is array[4, int]
##
## Short notation for:
##
## .. code-block::
## let x = [(0.1).int, (1.2).int, (2.3).int, (3.4).int]
let tNode = getType(targetType)[1]
values.expectKind(nnkBracket)
result = newNimNode(nnkBracket, lineInfoFrom=values)
for i in 0 ..< len(values):
var dot = newNimNode(nnkDotExpr, lineInfoFrom=values[i])
dot.add newPar(values[i])
dot.add tNode
result.add dot
when isMainModule: when isMainModule:
import strutils import strutils
block: # concat test block: # concat test
@ -1017,9 +992,5 @@ when isMainModule:
seq2D[0][1] = true seq2D[0][1] = true
doAssert seq2D == @[@[true, true], @[true, false], @[false, false], @[false, false]] doAssert seq2D == @[@[true, true], @[true, false], @[false, false], @[false, false]]
when not defined(nimscript): # asArray tests
let x = asArray(int, [1.2, 2.3, 3.4, 4.5])
doAssert x is array[4, int]
when not defined(testing): when not defined(testing):
echo "Finished doc tests" echo "Finished doc tests"

28
lib/pure/future.nim
View file

@ -198,3 +198,31 @@ macro dump*(x: typed): untyped =
let r = quote do: let r = quote do:
debugEcho `s`, " = ", `x` debugEcho `s`, " = ", `x`
return r return r
macro asArray*(targetType: typedesc, values: typed): untyped =
## applies a type conversion to each of the elements in the specified
## array literal. Each element is converted to the ``targetType`` type..
##
## Example:
##
## .. code-block::
## let x = asArray(int, [0.1, 1.2, 2.3, 3.4])
## doAssert x is array[4, int]
##
## Short notation for:
##
## .. code-block::
## let x = [(0.1).int, (1.2).int, (2.3).int, (3.4).int]
let tNode = getType(targetType)[1]
values.expectKind(nnkBracket)
result = newNimNode(nnkBracket, lineInfoFrom=values)
for i in 0 ..< len(values):
var dot = newNimNode(nnkDotExpr, lineInfoFrom=values[i])
dot.add newPar(values[i])
dot.add tNode
result.add dot
when isMainModule:
block: # asArray tests
let x = asArray(int, [1.2, 2.3, 3.4, 4.5])
doAssert x is array[4, int]