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/semcall.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/semcall.nim')
| -rw-r--r-- | compiler/semcall.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/semcall.nim b/compiler/semcall.nim index 04d280ce2..65a2d7ab8 100644 --- a/compiler/semcall.nim +++ b/compiler/semcall.nim @@ -168,7 +168,7 @@ proc resolveOverloads(c: PContext, n, orig: PNode, pickBest(callOp) if overloadsState == csEmpty and result.state == csEmpty: - localError(n.info, errUndeclaredIdentifier, considerAcc(f).s) + localError(n.info, errUndeclaredIdentifier, considerQuotedIdent(f).s) return elif result.state != csMatch: if nfExprCall in n.flags: @@ -251,7 +251,7 @@ proc inferWithMetatype(c: PContext, formal: PType, proc semResolvedCall(c: PContext, n: PNode, x: TCandidate): PNode = assert x.state == csMatch var finalCallee = x.calleeSym - markUsed(n.sons[0], finalCallee) + markUsed(n.sons[0].info, finalCallee) if finalCallee.ast == nil: internalError(n.info, "calleeSym.ast is nil") # XXX: remove this check! if finalCallee.ast.sons[genericParamsPos].kind != nkEmpty: @@ -283,7 +283,7 @@ proc explicitGenericSym(c: PContext, n: PNode, s: PSym): PNode = var m: TCandidate initCandidate(c, m, s, n) var newInst = generateInstance(c, s, m.bindings, n.info) - markUsed(n, s) + markUsed(n.info, s) result = newSymNode(newInst, n.info) proc explicitGenericInstantiation(c: PContext, n: PNode, s: PSym): PNode = |