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

Fixes #17433; gensym callDef return in templ body (#17445)

Browse source
This commit is contained in:
Saem Ghani 2021-03-21 16:33:37 -07:00 • committed by GitHub
commit 23fd098428
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/semtempl.nim
View file

@ -435,8 +435,8 @@ proc semTemplBody(c: var TemplCtx, n: PNode): PNode =
of nkLetSection: semTemplSomeDecl(c, n, skLet) of nkLetSection: semTemplSomeDecl(c, n, skLet)
of nkFormalParams: of nkFormalParams:
checkMinSonsLen(n, 1, c.c.config) checkMinSonsLen(n, 1, c.c.config)
n[0] = semTemplBody(c, n[0])
semTemplSomeDecl(c, n, skParam, 1) semTemplSomeDecl(c, n, skParam, 1)
n[0] = semTemplBody(c, n[0])
of nkConstSection: of nkConstSection:
for i in 0..<n.len: for i in 0..<n.len:
var a = n[i] var a = n[i]

16
tests/template/t17433.nim Normal file
View file

@ -0,0 +1,16 @@
# Inside template bodies, ensure return types referencing a param are replaced.
# This helps guarantee that return parameter analysis happens after argument
# analysis.
# bug #17433
from std/macros import expandMacros
proc bar(a: typedesc): a = default(a)
assert bar(float) == 0.0
assert bar(string) == ""
template main =
proc baz(a: typedesc): a = default(a)
assert baz(float) == 0.0
main()