diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2019-02-08 17:18:17 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2019-02-08 17:18:17 +0100 |
| commit | 0841c64a3217594d0d260a0f24616b469447c1b9 (patch) | |
| tree | d16995b64b4cd42b7e3d9adf94dd7f7ff57b600c /compiler/lookups.nim | |
| parent | cb9110c43d4ae9c29a0a1e0d54f7735712d4ba62 (diff) | |
| parent | 444f2231c9b48c34f9bec2ce6cfa3de5ae2560b1 (diff) | |
| download | Nim-0841c64a3217594d0d260a0f24616b469447c1b9.tar.gz | |
Merge branch 'devel' into araq-quirky-exceptions
Diffstat (limited to 'compiler/lookups.nim')
| -rw-r--r-- | compiler/lookups.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/lookups.nim b/compiler/lookups.nim index 11a741505..8bc263485 100644 --- a/compiler/lookups.nim +++ b/compiler/lookups.nim @@ -89,7 +89,7 @@ proc skipAlias*(s: PSym; n: PNode; conf: ConfigRef): PSym = prettybase.replaceDeprecated(conf, n.info, s, result) else: message(conf, n.info, warnDeprecated, "use " & result.name.s & " instead; " & - s.name.s) + s.name.s & " is deprecated") proc localSearchInScope*(c: PContext, s: PIdent): PSym = result = strTableGet(c.currentScope.symbols, s) @@ -150,7 +150,7 @@ type proc getSymRepr*(conf: ConfigRef; s: PSym): string = case s.kind - of skProc, skFunc, skMethod, skConverter, skIterator: + of routineKinds, skType: result = getProcHeader(conf, s) else: result = s.name.s @@ -190,7 +190,7 @@ proc addDecl*(c: PContext, sym: PSym, info: TLineInfo) = wrongRedefinition(c, info, sym.name.s, conflict.info) proc addDecl*(c: PContext, sym: PSym) = - let conflict = c.currentScope.addUniqueSym(sym) + let conflict = strTableInclReportConflict(c.currentScope.symbols, sym, true) if conflict != nil: wrongRedefinition(c, sym.info, sym.name.s, conflict.info) |