diff options
author | LemonBoy <thatlemon@gmail.com> | 2018-08-23 15:17:38 +0200 |
---|---|---|
committer | LemonBoy <thatlemon@gmail.com> | 2018-10-19 22:17:38 +0200 |
commit | 5afcd09cb3d75d4f01427082563966e3f435c9a2 (patch) | |
tree | d1fba8bc6de54aace6bdc5ce44514713c85535b2 /compiler/semtypinst.nim | |
parent | 7532b37405c9365f3f2935633111f309234297b2 (diff) | |
download | Nim-5afcd09cb3d75d4f01427082563966e3f435c9a2.tar.gz |
Pervasive replacement of nkRecWhen in generic types
Long story short, even if the type contains no reference at all to its generic parameters we still have to walk its AST and evaluate any nkRecWhen nodes that semRecordNodeAux skipped due to the type being a generic one. We also must be careful to modify the type `n` node in place since it may be referenced by the caller as seen in the tillegaltyperecursion test. Moreover we also can't have the nkSym drift away from their original values in order not to break the JS nkObjConstr codegen.
Diffstat (limited to 'compiler/semtypinst.nim')
-rw-r--r-- | compiler/semtypinst.nim | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim index c315cbebb..1a9fa5589 100644 --- a/compiler/semtypinst.nim +++ b/compiler/semtypinst.nim @@ -166,6 +166,36 @@ proc reResolveCallsWithTypedescParams(cl: var TReplTypeVars, n: PNode): PNode = return n +proc replaceObjBranches(cl: TReplTypeVars, n: PNode): PNode = + result = n + case n.kind + of nkNone..nkNilLit: + discard + of nkRecWhen: + var branch: PNode = nil # the branch to take + for i in countup(0, sonsLen(n) - 1): + var it = n.sons[i] + if it == nil: illFormedAst(n, cl.c.config) + case it.kind + of nkElifBranch: + checkSonsLen(it, 2, cl.c.config) + var cond = it.sons[0] + var e = cl.c.semConstExpr(cl.c, cond) + if e.kind != nkIntLit: + internalError(cl.c.config, e.info, "ReplaceTypeVarsN: when condition not a bool") + if e.intVal != 0 and branch == nil: branch = it.sons[1] + of nkElse: + checkSonsLen(it, 1, cl.c.config) + if branch == nil: branch = it.sons[0] + else: illFormedAst(n, cl.c.config) + if branch != nil: + result = replaceObjBranches(cl, branch) + else: + result = newNodeI(nkRecList, n.info) + else: + for i in 0..<n.sonsLen: + n.sons[i] = replaceObjBranches(cl, n.sons[i]) + proc replaceTypeVarsN(cl: var TReplTypeVars, n: PNode; start=0): PNode = if n == nil: return result = copyNode(n) @@ -541,6 +571,16 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType = skipIntLiteralParams(result) else: discard + else: + # If this type doesn't refer to a generic type we may still want to run it + # trough replaceObjBranches in order to resolve any pending nkRecWhen nodes + result = t + + # Slow path, we have some work to do + if result.n != nil and t.kind == tyObject: + # Invalidate the type size as we may alter its structure + result.size = -1 + result.n = replaceObjBranches(cl, result.n) proc instAllTypeBoundOp*(c: PContext, info: TLineInfo) = var i = 0 |