jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

intsets are now a proper module and part of the stdlib

Browse source
This commit is contained in:
Araq 2011-06-14 01:36:49 +02:00
commit ade67f1abc
25 changed files with 297 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/lookups.nim
View file

@ -10,7 +10,8 @@
# This module implements lookup helpers.
import
ast, astalgo, idents, semdata, types, msgs, options, rodread, renderer
intsets, ast, astalgo, idents, semdata, types, msgs, options, rodread,
renderer
proc considerAcc*(n: PNode): PIdent =
case n.kind
@ -115,7 +116,7 @@ proc lookUp*(c: PContext, n: PNode): PSym =
result = SymtabGet(c.Tab, ident)
if result == nil: GlobalError(n.info, errUndeclaredIdentifier, ident.s)
else: InternalError(n.info, "lookUp")
if IntSetContains(c.AmbiguousSymbols, result.id):
if Contains(c.AmbiguousSymbols, result.id):
LocalError(n.info, errUseQualifier, result.name.s)
if result.kind == skStub: loadStub(result)
@ -131,12 +132,11 @@ proc QualifiedLookUp*(c: PContext, n: PNode, flags = {checkUndeclared}): PSym =
if result == nil and checkUndeclared in flags:
GlobalError(n.info, errUndeclaredIdentifier, ident.s)
elif checkAmbiguity in flags and result != nil and
IntSetContains(c.AmbiguousSymbols, result.id):
Contains(c.AmbiguousSymbols, result.id):
LocalError(n.info, errUseQualifier, ident.s)
of nkSym:
result = n.sym
if checkAmbiguity in flags and IntSetContains(c.AmbiguousSymbols,
result.id):
if checkAmbiguity in flags and Contains(c.AmbiguousSymbols, result.id):
LocalError(n.info, errUseQualifier, n.sym.name.s)
of nkDotExpr:
result = nil
@ -197,8 +197,8 @@ proc InitOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym =
o.mode = oimSymChoice
result = n.sons[0].sym
o.stackPtr = 1
IntSetInit(o.inSymChoice)
IntSetIncl(o.inSymChoice, result.id)
o.inSymChoice = initIntSet()
Incl(o.inSymChoice, result.id)
else: nil
if result != nil and result.kind == skStub: loadStub(result)
@ -223,7 +223,7 @@ proc nextOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym =
of oimSymChoice:
if o.stackPtr < sonsLen(n):
result = n.sons[o.stackPtr].sym
IntSetIncl(o.inSymChoice, result.id)
Incl(o.inSymChoice, result.id)
inc(o.stackPtr)
else:
# try 'local' symbols too for Koenig's lookup: