mirror of
https://github.com/nim-lang/Nim.git
synced 2026-07-20 07:51:32 +00:00
getTypeImpl now returns pragmas for object types (#9538)
This commit is contained in:
@@ -82,12 +82,9 @@ proc mapTypeToAstX(cache: IdentCache; t: PType; info: TLineInfo;
|
||||
id
|
||||
template newIdentDefs(s): untyped = newIdentDefs(s, s.typ)
|
||||
|
||||
if inst:
|
||||
if t.sym != nil: # if this node has a symbol
|
||||
if not allowRecursion: # getTypeInst behavior: return symbol
|
||||
return atomicType(t.sym)
|
||||
#else: # getTypeImpl behavior: turn off recursion
|
||||
# allowRecursion = false
|
||||
if inst and not allowRecursion and t.sym != nil:
|
||||
# getTypeInst behavior: return symbol
|
||||
return atomicType(t.sym)
|
||||
|
||||
case t.kind
|
||||
of tyNone: result = atomicType("none", mNone)
|
||||
@@ -160,9 +157,10 @@ proc mapTypeToAstX(cache: IdentCache; t: PType; info: TLineInfo;
|
||||
of tyObject:
|
||||
if inst:
|
||||
result = newNodeX(nkObjectTy)
|
||||
result.add newNodeI(nkEmpty, info) # pragmas not reconstructed yet
|
||||
if t.sons[0] == nil: result.add newNodeI(nkEmpty, info) # handle parent object
|
||||
else:
|
||||
result.add t.sym.ast[2][0].copyTree # copy object pragmas
|
||||
if t.sons[0] == nil:
|
||||
result.add newNodeI(nkEmpty, info)
|
||||
else: # handle parent object
|
||||
var nn = newNodeX(nkOfInherit)
|
||||
nn.add mapTypeToAst(t.sons[0], info)
|
||||
result.add nn
|
||||
|
||||
@@ -183,3 +183,21 @@ test(Vec4[float32]):
|
||||
# bug #4862
|
||||
static:
|
||||
discard typedesc[(int, int)].getTypeImpl
|
||||
|
||||
# custom pragmas
|
||||
template myAttr() {.pragma.}
|
||||
template myAttr2() {.pragma.}
|
||||
template myAttr3() {.pragma.}
|
||||
template serializationKey(key: string) {.pragma.}
|
||||
|
||||
type
|
||||
MyObj = object {.packed,myAttr,serializationKey: "one".}
|
||||
myField {.myAttr2,serializationKey: "two".}: int
|
||||
myField2 {.myAttr3,serializationKey: "three".}: float
|
||||
|
||||
# field pragmas not currently supported
|
||||
test(MyObj):
|
||||
type
|
||||
_ = object {.packed,myAttr,serializationKey: "one".}
|
||||
myField: int
|
||||
myField2: float
|
||||
|
||||
Reference in New Issue
Block a user