mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-06 04:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid asArray macros import when using nimscript

Browse Source
This commit is contained in:
Fredrik Høisæther Rasch
2017-10-31 12:33:35 +01:00
committed by Andreas Rumpf
parent 5dfbeab65f
commit 70f3226836
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/pure/collections/sequtils.nim
View File

@@ -20,8 +20,6 @@
include "system/inclrtl"
import macros
when not defined(nimhygiene):
{.pragma: dirty.}
@@ -706,28 +704,30 @@ template newSeqWith*(len: int, init: untyped): untyped =
result[i] = init
result
macro asArray*(values: typed, targetType: typedesc): untyped =
## converts a static array to an array of type ``targetType`` by converting
## each value in the array to the specified type.
##
## Example:
##
## .. code-block::
## let x = asArray([0.1, 1.2, 2.3, 3.4], int)
## 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 not defined(nimscript):
import macros
macro asArray*(values: typed, targetType: typedesc): untyped =
## converts a static array to an array of type ``targetType`` by converting
## each value in the array to the specified type.
##
## Example:
##
## .. code-block::
## let x = asArray([0.1, 1.2, 2.3, 3.4], int)
## 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:
import strutils
@@ -1017,7 +1017,7 @@ when isMainModule:
seq2D[0][1] = true
doAssert seq2D == @[@[true, true], @[true, false], @[false, false], @[false, false]]
block: # asArray tests
when not defined(nimscript): # asArray tests
let x = asArray([1.2, 2.3, 3.4, 4.5], int)
doAssert x is array[4, int]