diff options
| author | Araq <rumpf_a@web.de> | 2016-10-31 19:47:20 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2016-10-31 19:47:20 +0100 |
| commit | 29db0d8585a0b2d3297a1e7745bfb92bf0c943b7 (patch) | |
| tree | 99ba53779741e018f1f28c62e7e527b304ea8d8d /compiler/semexprs.nim | |
| parent | 773d17cd14c6f4457245bb3039f644bc3cef64bb (diff) | |
| download | Nim-29db0d8585a0b2d3297a1e7745bfb92bf0c943b7.tar.gz | |
refactoring complete: explicit ident cache
Diffstat (limited to 'compiler/semexprs.nim')
| -rw-r--r-- | compiler/semexprs.nim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index a93f6eab9..d3431de70 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -620,7 +620,7 @@ proc evalAtCompileTime(c: PContext, n: PNode): PNode = proc semStaticExpr(c: PContext, n: PNode): PNode = let a = semExpr(c, n.sons[0]) - result = evalStaticExpr(c.module, a, c.p.owner) + result = evalStaticExpr(c.module, c.cache, a, c.p.owner) if result.isNil: localError(n.info, errCannotInterpretNodeX, renderTree(n)) result = emptyNode @@ -861,7 +861,7 @@ proc lookupInRecordAndBuildCheck(c: PContext, n, r: PNode, field: PIdent, s = newNodeIT(nkCurly, n.info, setType) for j in countup(0, sonsLen(it) - 2): addSon(s, copyTree(it.sons[j])) var inExpr = newNodeIT(nkCall, n.info, getSysType(tyBool)) - addSon(inExpr, newSymNode(ast.opContains, n.info)) + addSon(inExpr, newSymNode(opContains, n.info)) addSon(inExpr, s) addSon(inExpr, copyTree(r.sons[0])) addSon(check, inExpr) @@ -874,11 +874,11 @@ proc lookupInRecordAndBuildCheck(c: PContext, n, r: PNode, field: PIdent, check = newNodeI(nkCheckedFieldExpr, n.info) addSon(check, ast.emptyNode) # make space for access node var inExpr = newNodeIT(nkCall, n.info, getSysType(tyBool)) - addSon(inExpr, newSymNode(ast.opContains, n.info)) + addSon(inExpr, newSymNode(opContains, n.info)) addSon(inExpr, s) addSon(inExpr, copyTree(r.sons[0])) var notExpr = newNodeIT(nkCall, n.info, getSysType(tyBool)) - addSon(notExpr, newSymNode(ast.opNot, n.info)) + addSon(notExpr, newSymNode(opNot, n.info)) addSon(notExpr, inExpr) addSon(check, notExpr) return |