Skip to content

Commit

Permalink
Clonkk fix2 11923 (#19451)
Browse files Browse the repository at this point in the history
* fix nnkBracketExpr not compiling for getImpl on customPragmaNode

* fix test import

* fix alias not working with hasCustomPragmas

(cherry picked from commit 486cb09)
  • Loading branch information
Clonkk authored and narimiran committed Apr 24, 2023
1 parent da325b0 commit a336039
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 5 deletions.
27 changes: 22 additions & 5 deletions lib/core/macros.nim
Original file line number Diff line number Diff line change
Expand Up @@ -1521,6 +1521,22 @@ macro expandMacros*(body: typed): untyped =
echo body.toStrLit
result = body

proc extractTypeImpl(n: NimNode): NimNode =
## attempts to extract the type definition of the given symbol
case n.kind
of nnkSym: # can extract an impl
result = n.getImpl.extractTypeImpl()
of nnkObjectTy, nnkRefTy, nnkPtrTy: result = n
of nnkBracketExpr:
if n.typeKind == ntyTypeDesc:
result = n[1].extractTypeImpl()
else:
doAssert n.typeKind == ntyGenericInst
result = n[0].getImpl()
of nnkTypeDef:
result = n[2]
else: error("Invalid node to retrieve type implementation of: " & $n.kind)

proc customPragmaNode(n: NimNode): NimNode =
expectKind(n, {nnkSym, nnkDotExpr, nnkBracketExpr, nnkTypeOfExpr, nnkCheckedFieldExpr})
let
Expand All @@ -1529,7 +1545,10 @@ proc customPragmaNode(n: NimNode): NimNode =
if typ.kind == nnkBracketExpr and typ.len > 1 and typ[1].kind == nnkProcTy:
return typ[1][1]
elif typ.typeKind == ntyTypeDesc:
let impl = typ[1].getImpl()
let impl = getImpl(
if kind(typ[1]) == nnkBracketExpr: typ[1][0]
else: typ[1]
)
if impl[0].kind == nnkPragmaExpr:
return impl[0][1]
else:
Expand All @@ -1552,14 +1571,12 @@ proc customPragmaNode(n: NimNode): NimNode =
let name = $(if n.kind == nnkCheckedFieldExpr: n[0][1] else: n[1])
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 or
typInst.kind == nnkBracketExpr:
typInst[0]
if typInst.kind in {nnkVarTy, nnkBracketExpr}: typInst[0]
else: typInst
)
while typDef != nil:
typDef.expectKind(nnkTypeDef)
let typ = typDef[2]
let typ = typDef[2].extractTypeImpl()
typ.expectKind({nnkRefTy, nnkPtrTy, nnkObjectTy})
let isRef = typ.kind in {nnkRefTy, nnkPtrTy}
if isRef and typ[0].kind in {nnkSym, nnkBracketExpr}: # defines ref type for another object(e.g. X = ref X)
Expand Down
6 changes: 6 additions & 0 deletions tests/pragmas/tcustom_pragma.nim
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,22 @@ block:
MyGenericObj[T] = object
myField1, myField2 {.myAttr: "hi".}: int

MyOtherObj = MyObj


var o: MyObj
static:
doAssert o.myField2.hasCustomPragma(myAttr)
doAssert(not o.myField1.hasCustomPragma(myAttr))
doAssert(not o.myField1.hasCustomPragma(MyObj))
doAssert(not o.myField1.hasCustomPragma(MyOtherObj))

var ogen: MyGenericObj[int]
static:
doAssert ogen.myField2.hasCustomPragma(myAttr)
doAssert(not ogen.myField1.hasCustomPragma(myAttr))
doAssert(not ogen.myField1.hasCustomPragma(MyGenericObj))
doAssert(not ogen.myField1.hasCustomPragma(MyGenericObj))


import custom_pragma
Expand Down

0 comments on commit a336039

Please sign in to comment.