diff options
-rw-r--r-- | compiler/cursor_inference.nim | 2 | ||||
-rw-r--r-- | compiler/importer.nim | 3 | ||||
-rw-r--r-- | compiler/isolation_check.nim | 2 | ||||
-rw-r--r-- | compiler/suggest.nim | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/compiler/cursor_inference.nim b/compiler/cursor_inference.nim index b26a29d4c..0402febec 100644 --- a/compiler/cursor_inference.nim +++ b/compiler/cursor_inference.nim @@ -23,7 +23,7 @@ ## do a compile-time copy-on-write analysis. import - ast, types, renderer, idents, intsets, options, msgs + ast, types, renderer, idents, intsets, options type Cursor = object diff --git a/compiler/importer.nim b/compiler/importer.nim index 844cb1ad0..34e76d7d9 100644 --- a/compiler/importer.nim +++ b/compiler/importer.nim @@ -187,10 +187,9 @@ proc impMod(c: PContext; it: PNode; importStmtResult: PNode) = let it = transformImportAs(c, it) let m = myImportModule(c, it, importStmtResult) if m != nil: - var emptySet: IntSet # ``addDecl`` needs to be done before ``importAllSymbols``! addDecl(c, m, it.info) # add symbol to symbol table of module - importAllSymbolsExcept(c, m, emptySet) + importAllSymbols(c, m) #importForwarded(c, m.ast, emptySet, m) proc evalImport*(c: PContext, n: PNode): PNode = diff --git a/compiler/isolation_check.nim b/compiler/isolation_check.nim index 2b53bce92..f3b0c4919 100644 --- a/compiler/isolation_check.nim +++ b/compiler/isolation_check.nim @@ -11,7 +11,7 @@ ## https://github.com/nim-lang/RFCs/issues/244 for more details. import - ast, types, renderer, idents, intsets, options, msgs + ast, types, renderer, idents, intsets proc canAlias(arg, ret: PType; marker: var IntSet): bool diff --git a/compiler/suggest.nim b/compiler/suggest.nim index 6e9844759..03c65cd42 100644 --- a/compiler/suggest.nim +++ b/compiler/suggest.nim @@ -558,7 +558,7 @@ proc markUsed(c: PContext; info: TLineInfo; s: PSym) = warnAboutDeprecated(conf, info, s) if {sfDeprecated, sfError} * s.flags != {}: if sfDeprecated in s.flags: - if not (c.lastTLineInfo.line == info.line and + if not (c.lastTLineInfo.line == info.line and c.lastTLineInfo.col == info.col): warnAboutDeprecated(conf, info, s) c.lastTLineInfo = info |