diff options
| author | Araq <rumpf_a@web.de> | 2015-09-18 11:29:43 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2015-09-18 11:29:43 +0200 |
| commit | c921f30b1d575b3e457cc98cb95198d1513e69ab (patch) | |
| tree | 5fa5f43343e19ddc95b2c48853527311bc495c22 /compiler/semexprs.nim | |
| parent | 5b2f54ffa14439df696ea7f8c254c5ebd2c10042 (diff) | |
| download | Nim-c921f30b1d575b3e457cc98cb95198d1513e69ab.tar.gz | |
renamed inCompilesContext to compilesContextId; added test case for #3313
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 9b0e02976..4792702dc 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -818,7 +818,7 @@ proc semIndirectOp(c: PContext, n: PNode, flags: TExprFlags): PNode = # This is a proc variable, apply normal overload resolution let m = resolveIndirectCall(c, n, nOrig, t) if m.state != csMatch: - if c.inCompilesContext > 0: + if c.compilesContextId > 0: # speed up error generation: globalError(n.info, errTypeMismatch, "") return emptyNode @@ -1636,9 +1636,9 @@ proc tryExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode = # watch out, hacks ahead: let oldErrorCount = msgs.gErrorCounter let oldErrorMax = msgs.gErrorMax - let oldCompilesId = c.inCompilesContext + let oldCompilesId = c.compilesContextId inc c.compilesContextIdGenerator - c.inCompilesContext = c.compilesContextIdGenerator + c.compilesContextId = c.compilesContextIdGenerator # do not halt after first error: msgs.gErrorMax = high(int) @@ -1662,7 +1662,7 @@ proc tryExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode = except ERecoverableError: discard # undo symbol table changes (as far as it's possible): - c.inCompilesContext = oldCompilesId + c.compilesContextId = oldCompilesId c.generics = oldGenerics c.inGenericContext = oldInGenericContext c.inUnrolledContext = oldInUnrolledContext |