make type vs proc ambiguous handling more consistent; fixes #6726; fixes #6693

This commit is contained in:
Araq 2017-12-15 12:16:03 +01:00
commit 8db5b32ff7
5 changed files with 16 additions and 3 deletions

View file

@ -27,7 +27,7 @@ proc rawImportSymbol(c: PContext, s: PSym) =
# check if we have already a symbol of the same name:
var check = strTableGet(c.importTable.symbols, s.name)
if check != nil and check.id != s.id:
if s.kind notin OverloadableSyms:
if s.kind notin OverloadableSyms or check.kind notin OverloadableSyms:
# s and check need to be qualified:
incl(c.ambiguousSymbols, s.id)
incl(c.ambiguousSymbols, check.id)