diff options
author | Clyybber <darkmine956@gmail.com> | 2019-11-28 17:13:04 +0100 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2019-11-28 17:13:04 +0100 |
commit | 7e747d11c66405f08cc7c69e5afc18348663275e (patch) | |
tree | d6277a88b503ddd503d8b769bdae6c72fcf3d27b /compiler/lookups.nim | |
parent | b662842bd04852a751993ed506f9e38155a4e4aa (diff) | |
download | Nim-7e747d11c66405f08cc7c69e5afc18348663275e.tar.gz |
Cosmetic compiler cleanup (#12718)
* Cleanup compiler code base * Unify add calls * Unify len invocations * Unify range operators * Fix oversight * Remove {.procvar.} pragma * initCandidate -> newCandidate where reasonable * Unify safeLen calls
Diffstat (limited to 'compiler/lookups.nim')
-rw-r--r-- | compiler/lookups.nim | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/compiler/lookups.nim b/compiler/lookups.nim index 57d86c775..8c231212d 100644 --- a/compiler/lookups.nim +++ b/compiler/lookups.nim @@ -36,11 +36,11 @@ proc considerQuotedIdent*(c: PContext; n: PNode, origin: PNode = nil): PIdent = of nkAccQuoted: case n.len of 0: handleError(n, origin) - of 1: result = considerQuotedIdent(c, n.sons[0], origin) + of 1: result = considerQuotedIdent(c, n[0], origin) else: var id = "" for i in 0..<n.len: - let x = n.sons[i] + let x = n[i] case x.kind of nkIdent: id.add(x.ident.s) of nkSym: id.add(x.sym.name.s) @@ -49,7 +49,7 @@ proc considerQuotedIdent*(c: PContext; n: PNode, origin: PNode = nil): PIdent = result = getIdent(c.cache, id) of nkOpenSymChoice, nkClosedSymChoice: if n[0].kind == nkSym: - result = n.sons[0].sym.name + result = n[0].sym.name else: handleError(n, origin) else: @@ -105,7 +105,7 @@ when declared(echo): var i = 0 for scope in walkScopes(c.currentScope): echo "scope ", i - for h in 0 .. high(scope.symbols.data): + for h in 0..high(scope.symbols.data): if scope.symbols.data[h] != nil: echo scope.symbols.data[h].name.s if i == limit: break @@ -124,7 +124,7 @@ proc errorSym*(c: PContext, n: PNode): PSym = ## creates an error symbol to avoid cascading errors (for IDE support) var m = n # ensure that 'considerQuotedIdent' can't fail: - if m.kind == nkDotExpr: m = m.sons[1] + if m.kind == nkDotExpr: m = m[1] let ident = if m.kind in {nkIdent, nkSym, nkAccQuoted}: considerQuotedIdent(c, m) else: @@ -326,29 +326,29 @@ proc qualifiedLookUp*(c: PContext, n: PNode, flags: set[TLookupFlag]): PSym = errorUseQualifier(c, n.info, n.sym) of nkDotExpr: result = nil - var m = qualifiedLookUp(c, n.sons[0], (flags*{checkUndeclared})+{checkModule}) + var m = qualifiedLookUp(c, n[0], (flags*{checkUndeclared})+{checkModule}) if m != nil and m.kind == skModule: var ident: PIdent = nil - if n.sons[1].kind == nkIdent: - ident = n.sons[1].ident - elif n.sons[1].kind == nkAccQuoted: - ident = considerQuotedIdent(c, n.sons[1]) + if n[1].kind == nkIdent: + ident = n[1].ident + elif n[1].kind == nkAccQuoted: + ident = considerQuotedIdent(c, n[1]) if ident != nil: if m == c.module: result = strTableGet(c.topLevelScope.symbols, ident).skipAlias(n, c.config) else: result = strTableGet(m.tab, ident).skipAlias(n, c.config) if result == nil and checkUndeclared in flags: - fixSpelling(n.sons[1], ident, searchInScopes) - errorUndeclaredIdentifier(c, n.sons[1].info, ident.s) - result = errorSym(c, n.sons[1]) - elif n.sons[1].kind == nkSym: - result = n.sons[1].sym + fixSpelling(n[1], ident, searchInScopes) + errorUndeclaredIdentifier(c, n[1].info, ident.s) + result = errorSym(c, n[1]) + elif n[1].kind == nkSym: + result = n[1].sym elif checkUndeclared in flags and - n.sons[1].kind notin {nkOpenSymChoice, nkClosedSymChoice}: - localError(c.config, n.sons[1].info, "identifier expected, but got: " & - renderTree(n.sons[1])) - result = errorSym(c, n.sons[1]) + n[1].kind notin {nkOpenSymChoice, nkClosedSymChoice}: + localError(c.config, n[1].info, "identifier expected, but got: " & + renderTree(n[1])) + result = errorSym(c, n[1]) else: result = nil when false: @@ -372,13 +372,13 @@ proc initOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym = o.mode = oimDone of nkDotExpr: o.mode = oimOtherModule - o.m = qualifiedLookUp(c, n.sons[0], {checkUndeclared, checkModule}) + o.m = qualifiedLookUp(c, n[0], {checkUndeclared, checkModule}) if o.m != nil and o.m.kind == skModule: var ident: PIdent = nil - if n.sons[1].kind == nkIdent: - ident = n.sons[1].ident - elif n.sons[1].kind == nkAccQuoted: - ident = considerQuotedIdent(c, n.sons[1], n) + if n[1].kind == nkIdent: + ident = n[1].ident + elif n[1].kind == nkAccQuoted: + ident = considerQuotedIdent(c, n[1], n) if ident != nil: if o.m == c.module: # a module may access its private members: @@ -388,12 +388,12 @@ proc initOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym = else: result = initIdentIter(o.it, o.m.tab, ident).skipAlias(n, c.config) else: - noidentError(c.config, n.sons[1], n) - result = errorSym(c, n.sons[1]) + noidentError(c.config, n[1], n) + result = errorSym(c, n[1]) of nkClosedSymChoice, nkOpenSymChoice: o.mode = oimSymChoice if n[0].kind == nkSym: - result = n.sons[0].sym + result = n[0].sym else: o.mode = oimDone return nil @@ -430,8 +430,8 @@ proc nextOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym = of oimOtherModule: result = nextIdentIter(o.it, o.m.tab).skipAlias(n, c.config) of oimSymChoice: - if o.symChoiceIndex < len(n): - result = n.sons[o.symChoiceIndex].sym + if o.symChoiceIndex < n.len: + result = n[o.symChoiceIndex].sym incl(o.inSymChoice, result.id) inc o.symChoiceIndex elif n.kind == nkOpenSymChoice: @@ -439,19 +439,19 @@ proc nextOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym = o.mode = oimSymChoiceLocalLookup o.scope = c.currentScope result = firstIdentExcluding(o.it, o.scope.symbols, - n.sons[0].sym.name, o.inSymChoice).skipAlias(n, c.config) + n[0].sym.name, o.inSymChoice).skipAlias(n, c.config) while result == nil: o.scope = o.scope.parent if o.scope == nil: break result = firstIdentExcluding(o.it, o.scope.symbols, - n.sons[0].sym.name, o.inSymChoice).skipAlias(n, c.config) + n[0].sym.name, o.inSymChoice).skipAlias(n, c.config) of oimSymChoiceLocalLookup: result = nextIdentExcluding(o.it, o.scope.symbols, o.inSymChoice).skipAlias(n, c.config) while result == nil: o.scope = o.scope.parent if o.scope == nil: break result = firstIdentExcluding(o.it, o.scope.symbols, - n.sons[0].sym.name, o.inSymChoice).skipAlias(n, c.config) + n[0].sym.name, o.inSymChoice).skipAlias(n, c.config) when false: if result != nil and result.kind == skStub: loadStub(result) |