diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2019-07-06 23:59:23 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2019-07-06 23:59:23 +0200 |
| commit | 465815e8945ec7619ba7c8ec494a8f8064a0aae2 (patch) | |
| tree | 9f99c794446b75dd4070b4bc64e2e84f9467da03 | |
| parent | 6ce6bce12ecef07595f04f76ab5c33e393535d8b (diff) | |
| download | Nim-465815e8945ec7619ba7c8ec494a8f8064a0aae2.tar.gz | |
improved the error message for #11494; closes #11494
| -rw-r--r-- | compiler/semstmts.nim | 4 | ||||
| -rw-r--r-- | tests/template/ttempl3.nim | 21 |
2 files changed, 23 insertions, 2 deletions
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim index 9718331d0..430380944 100644 --- a/compiler/semstmts.nim +++ b/compiler/semstmts.nim @@ -427,8 +427,8 @@ proc fillPartialObject(c: PContext; n: PNode; typ: PType) = proc setVarType(c: PContext; v: PSym, typ: PType) = if v.typ != nil and not sameTypeOrNil(v.typ, typ): localError(c.config, v.info, "inconsistent typing for reintroduced symbol '" & - v.name.s & "': previous type was: " & typeToString(v.typ) & - "; new type is: " & typeToString(typ)) + v.name.s & "': previous type was: " & typeToString(v.typ, preferDesc) & + "; new type is: " & typeToString(typ, preferDesc)) v.typ = typ proc semVarOrLet(c: PContext, n: PNode, symkind: TSymKind): PNode = diff --git a/tests/template/ttempl3.nim b/tests/template/ttempl3.nim index 9feaa0b7b..17421cd87 100644 --- a/tests/template/ttempl3.nim +++ b/tests/template/ttempl3.nim @@ -60,3 +60,24 @@ template create(typ: typeDesc, arg: untyped): untyped = `init typ`(arg) var ff = Foo.create(12) echo ff.arg + + +import macros + +# bug #11494 +macro staticForEach(arr: untyped, body: untyped): untyped = + result = newNimNode(nnkStmtList) + arr.expectKind(nnkBracket) + for n in arr: + let b = copyNimTree(body) + result.add quote do: + block: + type it {.inject.} = `n` + `b` + +template forEveryMatchingEntity*() = + staticForEach([int, string, float]): + var a {.inject.}: it + echo a + +forEveryMatchingEntity() |