diff options
Diffstat (limited to 'compiler/semtypinst.nim')
| -rw-r--r-- | compiler/semtypinst.nim | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim index 7e4587658..ccabce155 100644 --- a/compiler/semtypinst.nim +++ b/compiler/semtypinst.nim @@ -169,7 +169,7 @@ proc replaceObjBranches(cl: TReplTypeVars, n: PNode): PNode = discard of nkRecWhen: var branch: PNode = nil # the branch to take - for i in 0 ..< sonsLen(n): + for i in 0 ..< len(n): var it = n.sons[i] if it == nil: illFormedAst(n, cl.c.config) case it.kind @@ -189,7 +189,7 @@ proc replaceObjBranches(cl: TReplTypeVars, n: PNode): PNode = else: result = newNodeI(nkRecList, n.info) else: - for i in 0..<n.sonsLen: + for i in 0..<n.len: n.sons[i] = replaceObjBranches(cl, n.sons[i]) proc replaceTypeVarsN(cl: var TReplTypeVars, n: PNode; start=0): PNode = @@ -209,7 +209,7 @@ proc replaceTypeVarsN(cl: var TReplTypeVars, n: PNode; start=0): PNode = result = newNode(nkRecList, n.info) of nkRecWhen: var branch: PNode = nil # the branch to take - for i in 0 ..< sonsLen(n): + for i in 0 ..< len(n): var it = n.sons[i] if it == nil: illFormedAst(n, cl.c.config) case it.kind @@ -234,7 +234,7 @@ proc replaceTypeVarsN(cl: var TReplTypeVars, n: PNode; start=0): PNode = result = if cl.allowMetaTypes: n else: cl.c.semExpr(cl.c, n) else: - var length = sonsLen(n) + var length = len(n) if length > 0: newSons(result, length) if start > 0: @@ -331,7 +331,7 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType = when defined(reportCacheHits): echo "Generic instantiation cached ", typeToString(result), " for ", typeToString(t) return - for i in 1 ..< sonsLen(t): + for i in 1 ..< len(t): var x = t.sons[i] if x.kind in {tyGenericParam}: x = lookupTypeVar(cl, x) @@ -371,14 +371,14 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType = var typeMapLayer = newTypeMapLayer(cl) cl.typeMap = addr(typeMapLayer) - for i in 1 ..< sonsLen(t): + for i in 1 ..< len(t): var x = replaceTypeVarsT(cl, t.sons[i]) assert x.kind != tyGenericInvocation header.sons[i] = x propagateToOwner(header, x) cl.typeMap.put(body.sons[i-1], x) - for i in 1 ..< sonsLen(t): + for i in 1 ..< len(t): # if one of the params is not concrete, we cannot do anything # but we already raised an error! rawAddSon(result, header.sons[i]) @@ -446,11 +446,11 @@ proc eraseVoidParams*(t: PType) = if t.sons[0] != nil and t.sons[0].kind == tyVoid: t.sons[0] = nil - for i in 1 ..< t.sonsLen: + for i in 1 ..< t.len: # don't touch any memory unless necessary if t.sons[i].kind == tyVoid: var pos = i - for j in i+1 ..< t.sonsLen: + for j in i+1 ..< t.len: if t.sons[j].kind != tyVoid: t.sons[pos] = t.sons[j] t.n.sons[pos] = t.n.sons[j] @@ -460,7 +460,7 @@ proc eraseVoidParams*(t: PType) = break proc skipIntLiteralParams*(t: PType) = - for i in 0 ..< t.sonsLen: + for i in 0 ..< t.len: let p = t.sons[i] if p == nil: continue let skipped = p.skipIntLit @@ -573,7 +573,7 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType = bailout() result = instCopyType(cl, t) idTablePut(cl.localCache, t, result) - for i in 1 ..< result.sonsLen: + for i in 1 ..< result.len: result.sons[i] = replaceTypeVarsT(cl, result.sons[i]) propagateToOwner(result, result.lastSon) @@ -586,7 +586,7 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType = #if not cl.allowMetaTypes: idTablePut(cl.localCache, t, result) - for i in 0 ..< sonsLen(result): + for i in 0 ..< len(result): if result.sons[i] != nil: if result.sons[i].kind == tyGenericBody: localError(cl.c.config, t.sym.info, @@ -693,10 +693,10 @@ proc recomputeFieldPositions*(t: PType; obj: PNode; currPosition: var int) = recomputeFieldPositions(b, b.n, currPosition) case obj.kind of nkRecList: - for i in 0 ..< sonsLen(obj): recomputeFieldPositions(nil, obj.sons[i], currPosition) + for i in 0 ..< len(obj): recomputeFieldPositions(nil, obj.sons[i], currPosition) of nkRecCase: recomputeFieldPositions(nil, obj.sons[0], currPosition) - for i in 1 ..< sonsLen(obj): + for i in 1 ..< len(obj): recomputeFieldPositions(nil, lastSon(obj.sons[i]), currPosition) of nkSym: obj.sym.position = currPosition |