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

Fix use of custom pragmas in generic procs (#8165)

Browse source 
Fixes #7626
This commit is contained in:
LemonBoy 2018-07-01 08:06:58 +02:00 • committed by Andreas Rumpf
commit 584d778318
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/semgnrc.nim
View file

@ -54,7 +54,8 @@ template macroToExpand(s): untyped =
s.kind in {skMacro, skTemplate} and (s.typ.len == 1 or sfAllUntyped in s.flags) s.kind in {skMacro, skTemplate} and (s.typ.len == 1 or sfAllUntyped in s.flags)
template macroToExpandSym(s): untyped = template macroToExpandSym(s): untyped =
s.kind in {skMacro, skTemplate} and (s.typ.len == 1) and not fromDotExpr sfCustomPragma notin s.flags and s.kind in {skMacro, skTemplate} and
(s.typ.len == 1) and not fromDotExpr
template isMixedIn(sym): bool = template isMixedIn(sym): bool =
let s = sym let s = sym

8
tests/pragmas/tcustom_pragma.nim
View file

@ -138,3 +138,11 @@ block:
assert hasIntSerKey assert hasIntSerKey
assert strSerKey == "string" assert strSerKey == "string"
assert nestedItemDefVal == "Nimmers of the world, unite!" assert nestedItemDefVal == "Nimmers of the world, unite!"
block:
template simpleAttr {.pragma.}
type Annotated {.simpleAttr.} = object
proc generic_proc[T]() =
assert Annotated.hasCustomPragma(simpleAttr)