From b53327c92a1c685ab71917cabedbf441f7f5fd2d Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Sat, 15 Dec 2018 14:30:07 +0100 Subject: [PATCH] fixes #9994 --- compiler/passes.nim | 4 ++-- tests/modules/mimport_in_config.nim | 2 ++ tests/modules/timport_in_config.nim | 3 ++- tests/modules/timport_in_config.nim.cfg | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 tests/modules/mimport_in_config.nim diff --git a/compiler/passes.nim b/compiler/passes.nim index 6863576cd0..d9a8fb1a77 100644 --- a/compiler/passes.nim +++ b/compiler/passes.nim @@ -102,9 +102,9 @@ proc processImplicits(graph: ModuleGraph; implicits: seq[string], nodeKind: TNod for module in items(implicits): # implicit imports should not lead to a module importing itself if m.position != resolveMod(graph.config, module, relativeTo).int32: - var importStmt = newNodeI(nodeKind, gCmdLineInfo) + var importStmt = newNodeI(nodeKind, m.info) var str = newStrNode(nkStrLit, module) - str.info = gCmdLineInfo + str.info = m.info importStmt.addSon str if not processTopLevelStmt(graph, importStmt, a): break diff --git a/tests/modules/mimport_in_config.nim b/tests/modules/mimport_in_config.nim new file mode 100644 index 0000000000..555b6074d5 --- /dev/null +++ b/tests/modules/mimport_in_config.nim @@ -0,0 +1,2 @@ +type + DefinedInB* = int diff --git a/tests/modules/timport_in_config.nim b/tests/modules/timport_in_config.nim index 1ea02407d0..847b063bd3 100644 --- a/tests/modules/timport_in_config.nim +++ b/tests/modules/timport_in_config.nim @@ -3,6 +3,7 @@ output: '''hallo''' joinable: false """ -# bug #9978 +# bug #9978, #9994 +var x: DefinedInB echo "hi".replace("i", "allo") diff --git a/tests/modules/timport_in_config.nim.cfg b/tests/modules/timport_in_config.nim.cfg index 50b6679f8a..2633e10124 100644 --- a/tests/modules/timport_in_config.nim.cfg +++ b/tests/modules/timport_in_config.nim.cfg @@ -1 +1,2 @@ --import: "strutils" +--import: "mimport_in_config"