diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-06-25 15:06:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-25 15:06:07 +0200 |
| commit | 7d437a3a744a465123f872cba215faf00d15c42b (patch) | |
| tree | 4121f026841b9374dd6eb8c7f95a8cdf2a4b41c0 | |
| parent | 890086baec8c23d65db20893c9ec5b50cee92335 (diff) | |
| parent | 7f0d7871eda6ec54a941b6a52f00ceb217bfe425 (diff) | |
| download | Nim-7d437a3a744a465123f872cba215faf00d15c42b.tar.gz | |
Merge pull request #7964 from LemonBoy/fix-7936
Fixes #7936
| -rw-r--r-- | compiler/semstmts.nim | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim index 292238dc9..f1ff38b01 100644 --- a/compiler/semstmts.nim +++ b/compiler/semstmts.nim @@ -519,7 +519,9 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode = localError(c.config, a.info, errWrongNumberOfVariables) b = newNodeI(nkVarTuple, a.info) newSons(b, length) - b.sons[length-2] = a.sons[length-2] # keep type desc for doc generator + # keep type desc for doc generator + # NOTE: at the moment this is always ast.emptyNode, see parser.nim + b.sons[length-2] = a.sons[length-2] b.sons[length-1] = def addToVarSection(c, result, n, b) elif tup.kind == tyTuple and def.kind in {nkPar, nkTupleConstr} and @@ -558,7 +560,12 @@ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode = # keep documentation information: b.comment = a.comment addSon(b, newSymNode(v)) - addSon(b, a.sons[length-2]) # keep type desc for doc generator + # keep type desc for doc generator, but only if the user explicitly + # added it + if a.sons[length-2].kind != nkEmpty: + addSon(b, newNodeIT(nkType, a.info, typ)) + else: + addSon(b, a.sons[length-2]) addSon(b, copyTree(def)) addToVarSection(c, result, n, b) else: |