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

Fix getCustomPragmaVal on var fields

Browse source
This commit is contained in:
LemonBoy 2019-02-05 15:24:19 +01:00 • committed by Andreas Rumpf
commit 26255c72fd
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/core/macros.nim
View file

@ -1415,7 +1415,8 @@ proc customPragmaNode(n: NimNode): NimNode =
if n.kind in {nnkDotExpr, nnkCheckedFieldExpr}: if n.kind in {nnkDotExpr, nnkCheckedFieldExpr}:
let name = $(if n.kind == nnkCheckedFieldExpr: n[0][1] else: n[1]) let name = $(if n.kind == nnkCheckedFieldExpr: n[0][1] else: n[1])
var typDef = getImpl(getTypeInst(if n.kind == nnkCheckedFieldExpr or n[0].kind == nnkHiddenDeref: n[0][0] else: n[0])) let typInst = getTypeInst(if n.kind == nnkCheckedFieldExpr or n[0].kind == nnkHiddenDeref: n[0][0] else: n[0])
var typDef = getImpl(if typInst.kind == nnkVarTy: typInst[0] else: typInst)
while typDef != nil: while typDef != nil:
typDef.expectKind(nnkTypeDef) typDef.expectKind(nnkTypeDef)
let typ = typDef[2] let typ = typDef[2]

5
tests/pragmas/tcustom_pragma.nim
View file

@ -61,6 +61,11 @@ block: # A bit more advanced case
assert hasCustomPragma(type(s.field), defaultValue) assert hasCustomPragma(type(s.field), defaultValue)
proc foo(s: var MySerializable) =
static: assert(s.a.getCustomPragmaVal(defaultValue) == 5)
foo(s)
block: # ref types block: # ref types
type type
Node = object of RootObj Node = object of RootObj