mirror of
https://github.com/nim-lang/Nim.git
synced 2026-04-22 23:35:22 +00:00
Fix getting custom pragma from generic object (#20481)
* Merge devel Add another test case * Fix test Use getCustomPragmaVal instead of hasCustomPragma Co-authored-by: Clay Sweetser <Varriount@users.noreply.github.com>
This commit is contained in:
@@ -1591,7 +1591,7 @@ proc customPragmaNode(n: NimNode): NimNode =
|
||||
elif impl.kind in {nnkIdentDefs, nnkConstDef} and impl[0].kind == nnkPragmaExpr:
|
||||
return impl[0][1]
|
||||
else:
|
||||
let timpl = typ.getImpl()
|
||||
let timpl = getImpl(if typ.kind == nnkBracketExpr: typ[0] else: typ)
|
||||
if timpl.len>0 and timpl[0].len>1:
|
||||
return timpl[0][1]
|
||||
else:
|
||||
|
||||
@@ -157,3 +157,21 @@ block: # bug #19020
|
||||
static:
|
||||
doAssert $bar.getCustomPragmaVal(typ) == "foo"
|
||||
doAssert $bar.getCustomPragmaVal(typ) == "foo"
|
||||
|
||||
block hasCustomPragmaGeneric:
|
||||
template examplePragma() {.pragma.}
|
||||
type
|
||||
Foo[T] {.examplePragma.} = object
|
||||
x {.examplePragma.}: T
|
||||
var f: Foo[string]
|
||||
doAssert f.hasCustomPragma(examplePragma)
|
||||
doAssert f.x.hasCustomPragma(examplePragma)
|
||||
|
||||
block getCustomPragmaValGeneric:
|
||||
template examplePragma(x: int) {.pragma.}
|
||||
type
|
||||
Foo[T] {.examplePragma(42).} = object
|
||||
x {.examplePragma(25).}: T
|
||||
var f: Foo[string]
|
||||
doAssert f.getCustomPragmaVal(examplePragma) == 42
|
||||
doAssert f.x.getCustomPragmaVal(examplePragma) == 25
|
||||
|
||||
Reference in New Issue
Block a user