newLit emty seq fix (#6091)
* the type of the empty seq is still the correct type * updated test
This commit is contained in:
parent
03e0aa37e3
commit
52cab78ae5
2 changed files with 19 additions and 3 deletions
|
|
@ -527,10 +527,17 @@ proc newLit*[N,T](arg: array[N,T]): NimNode {.compileTime.} =
|
||||||
result.add newLit(x)
|
result.add newLit(x)
|
||||||
|
|
||||||
proc newLit*[T](arg: seq[T]): NimNode {.compileTime.} =
|
proc newLit*[T](arg: seq[T]): NimNode {.compileTime.} =
|
||||||
result = nnkBracket.newTree
|
var bracket = nnkBracket.newTree
|
||||||
for x in arg:
|
for x in arg:
|
||||||
result.add newLit(x)
|
bracket.add newLit(x)
|
||||||
result = nnkPrefix.newTree(bindSym"@", result)
|
|
||||||
|
result = nnkCall.newTree(
|
||||||
|
nnkBracketExpr.newTree(
|
||||||
|
nnkAccQuoted.newTree( bindSym"@" ),
|
||||||
|
getTypeInst( bindSym"T" )
|
||||||
|
),
|
||||||
|
bracket
|
||||||
|
)
|
||||||
|
|
||||||
proc newLit*(arg: tuple): NimNode {.compileTime.} =
|
proc newLit*(arg: tuple): NimNode {.compileTime.} =
|
||||||
result = nnkPar.newTree
|
result = nnkPar.newTree
|
||||||
|
|
|
||||||
|
|
@ -138,3 +138,12 @@ macro test_newLit_ComposedType: untyped =
|
||||||
result = newLit(ct)
|
result = newLit(ct)
|
||||||
|
|
||||||
doAssert test_newLit_ComposedType == ComposedType(mt: MyType(a: 123, b:"abc"), arr: [1,2,3,4], data: @[1.byte, 3, 7, 127])
|
doAssert test_newLit_ComposedType == ComposedType(mt: MyType(a: 123, b:"abc"), arr: [1,2,3,4], data: @[1.byte, 3, 7, 127])
|
||||||
|
|
||||||
|
macro test_newLit_empty_seq_string: untyped =
|
||||||
|
var strSeq = newSeq[string](0)
|
||||||
|
result = newLit(strSeq)
|
||||||
|
|
||||||
|
block:
|
||||||
|
# x needs to be of type seq[string]
|
||||||
|
var x = test_newLit_empty_seq_string
|
||||||
|
x.add("xyz")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue