diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2018-12-15 14:30:07 +0100 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2018-12-15 14:30:21 +0100 |
commit | b53327c92a1c685ab71917cabedbf441f7f5fd2d (patch) | |
tree | f66f1bc9882bccfdb3939987d9a51602bf233665 | |
parent | 50193b95eaa48e87b7f20f6d2803699cb73821d6 (diff) | |
download | Nim-b53327c92a1c685ab71917cabedbf441f7f5fd2d.tar.gz |
fixes #9994
-rw-r--r-- | compiler/passes.nim | 4 | ||||
-rw-r--r-- | tests/modules/mimport_in_config.nim | 2 | ||||
-rw-r--r-- | tests/modules/timport_in_config.nim | 3 | ||||
-rw-r--r-- | tests/modules/timport_in_config.nim.cfg | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/compiler/passes.nim b/compiler/passes.nim index 6863576cd..d9a8fb1a7 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 000000000..555b6074d --- /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 1ea02407d..847b063bd 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 50b6679f8..2633e1012 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" |