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

fixes quoted variables with typedesc types (#21493)

Browse source
This commit is contained in:
ringabout 2023-03-09 15:09:08 +08:00 • committed by GitHub
commit 72e262666b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/semexprs.nim
View file

@ -2206,7 +2206,7 @@ proc semQuoteAst(c: PContext, n: PNode): PNode =
dummyTemplate[paramsPos].add newTreeI(nkIdentDefs, n.info, ids[0], getSysSym(c.graph, n.info, "typed").newSymNode, c.graph.emptyNode) dummyTemplate[paramsPos].add newTreeI(nkIdentDefs, n.info, ids[0], getSysSym(c.graph, n.info, "typed").newSymNode, c.graph.emptyNode)
for i in 1..<ids.len: for i in 1..<ids.len:
let typ = semExprWithType(c, quotes[i+1], {}).typ let typ = semExprWithType(c, quotes[i+1], {}).typ
if tfTriggersCompileTime notin typ.flags: if tfTriggersCompileTime notin typ.flags and typ.kind != tyTypeDesc:
dummyTemplate[paramsPos].add newTreeI(nkIdentDefs, n.info, ids[i], newNodeIT(nkType, n.info, typ), c.graph.emptyNode) dummyTemplate[paramsPos].add newTreeI(nkIdentDefs, n.info, ids[i], newNodeIT(nkType, n.info, typ), c.graph.emptyNode)
else: else:
dummyTemplate[paramsPos].add newTreeI(nkIdentDefs, n.info, ids[i], getSysSym(c.graph, n.info, "typed").newSymNode, c.graph.emptyNode) dummyTemplate[paramsPos].add newTreeI(nkIdentDefs, n.info, ids[i], getSysSym(c.graph, n.info, "typed").newSymNode, c.graph.emptyNode)

8
tests/stdlib/tmacros.nim
View file

@ -311,3 +311,11 @@ block: # bug #9607
doAssert echoL() == "bar" doAssert echoL() == "bar"
doAssert echoM() == "bar" doAssert echoM() == "bar"
block:
macro hello[T](x: T): untyped =
result = quote do:
let m: `T` = `x`
discard m
hello(12)