diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2014-07-15 01:42:19 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2014-07-15 01:42:19 +0200 |
| commit | 18ded6c23d72cd21fa0aa10ff61dc6f9af40832c (patch) | |
| tree | 5d681c9835f01019e8ae83e14c0cd49d1a6c0d38 /compiler/semtempl.nim | |
| parent | 687a1b7de4c006750274fb046a10f08d38c22f5a (diff) | |
| parent | 41bb0bf9dcccdfcebdb0f823fea8b2853b89ea4e (diff) | |
| download | Nim-18ded6c23d72cd21fa0aa10ff61dc6f9af40832c.tar.gz | |
Merge pull request #1363 from Araq/devel
Merge devel into master
Diffstat (limited to 'compiler/semtempl.nim')
| -rw-r--r-- | compiler/semtempl.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/semtempl.nim b/compiler/semtempl.nim index ad34eea65..ee8b1ccb8 100644 --- a/compiler/semtempl.nim +++ b/compiler/semtempl.nim @@ -59,7 +59,7 @@ proc symChoice(c: PContext, n: PNode, s: PSym, r: TSymChoiceRule): PNode = # (s.kind notin routineKinds or s.magic != mNone): # for instance 'nextTry' is both in tables.nim and astalgo.nim ... result = newSymNode(s, n.info) - markUsed(n, s) + markUsed(n.info, s) else: # semantic checking requires a type; ``fitNode`` deals with it # appropriately @@ -93,7 +93,7 @@ proc semBindStmt(c: PContext, n: PNode, toBind: var TIntSet): PNode = proc semMixinStmt(c: PContext, n: PNode, toMixin: var TIntSet): PNode = for i in 0 .. < n.len: - toMixin.incl(considerAcc(n.sons[i]).id) + toMixin.incl(considerQuotedIdent(n.sons[i]).id) result = newNodeI(nkEmpty, n.info) proc replaceIdentBySym(n: var PNode, s: PNode) = @@ -151,7 +151,7 @@ proc onlyReplaceParams(c: var TemplCtx, n: PNode): PNode = result.sons[i] = onlyReplaceParams(c, n.sons[i]) proc newGenSym(kind: TSymKind, n: PNode, c: var TemplCtx): PSym = - result = newSym(kind, considerAcc(n), c.owner, n.info) + result = newSym(kind, considerQuotedIdent(n), c.owner, n.info) incl(result.flags, sfGenSym) incl(result.flags, sfShadowed) |