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

fixes #16119 [backport:1.4] (#16149)

Browse source
This commit is contained in:
Andreas Rumpf 2020-11-26 23:16:43 +01:00 • committed by GitHub
commit 9f1c5f64c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/semstmts.nim
View file

@ -477,7 +477,7 @@ proc semLowerLetVarCustomPragma(c: PContext, a: PNode, n: PNode): PNode =
proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode = proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
if n.len == 1: if n.len == 1:
result = semLowerLetVarCustomPragma(c, n[0], n) result = semLowerLetVarCustomPragma(c, n[0], n)
if result!=nil: return result if result != nil: return result
var b: PNode var b: PNode
result = copyNode(n) result = copyNode(n)
@ -513,7 +513,7 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode =
def = fitNode(c, typ, def, def.info) def = fitNode(c, typ, def, def.info)
#changeType(def.skipConv, typ, check=true) #changeType(def.skipConv, typ, check=true)
else: else:
typ = def.typ.skipTypes({tyStatic}).skipIntLit(c.idgen) typ = def.typ.skipTypes({tyStatic, tySink}).skipIntLit(c.idgen)
if typ.kind in tyUserTypeClasses and typ.isResolvedUserTypeClass: if typ.kind in tyUserTypeClasses and typ.isResolvedUserTypeClass:
typ = typ.lastSon typ = typ.lastSon
if hasEmpty(typ): if hasEmpty(typ):
@ -1282,7 +1282,7 @@ proc typeSectionRightSidePass(c: PContext, n: PNode) =
obj.ast = a.shallowCopy obj.ast = a.shallowCopy
case a[0].kind case a[0].kind
of nkSym: obj.ast[0] = symNode of nkSym: obj.ast[0] = symNode
of nkPragmaExpr: of nkPragmaExpr:
obj.ast[0] = a[0].shallowCopy obj.ast[0] = a[0].shallowCopy
obj.ast[0][0] = symNode obj.ast[0][0] = symNode
obj.ast[0][1] = a[0][1] obj.ast[0][1] = a[0][1]