From 5c0ffa661347300c333096d22e056df4e07b08ca Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Fri, 4 Dec 2015 23:42:57 +0100 Subject: [PATCH] fixes #3622 --- compiler/plugins/itersgen.nim | 6 ++++-- compiler/plugins/locals/locals.nim | 4 ++-- compiler/{plugins.nim => pluginsupport.nim} | 0 compiler/sem.nim | 3 +-- 4 files changed, 7 insertions(+), 6 deletions(-) rename compiler/{plugins.nim => pluginsupport.nim} (100%) diff --git a/compiler/plugins/itersgen.nim b/compiler/plugins/itersgen.nim index 91e1d2783b..f44735b776 100644 --- a/compiler/plugins/itersgen.nim +++ b/compiler/plugins/itersgen.nim @@ -9,8 +9,10 @@ ## Plugin to transform an inline iterator into a data structure. -import plugins, ast, astalgo, magicsys, lookups, semdata, - lambdalifting, msgs, rodread +import compiler/pluginsupport, compiler/ast, compiler/astalgo, + compiler/magicsys, compiler/lookups, compiler/semdata, + compiler/lambdalifting, compiler/rodread, compiler/msgs + proc iterToProcImpl(c: PContext, n: PNode): PNode = result = newNodeI(nkStmtList, n.info) diff --git a/compiler/plugins/locals/locals.nim b/compiler/plugins/locals/locals.nim index 59e3d677d4..8a3f67dd48 100644 --- a/compiler/plugins/locals/locals.nim +++ b/compiler/plugins/locals/locals.nim @@ -9,8 +9,8 @@ ## The builtin 'system.locals' implemented as a plugin. -import compiler/plugins, compiler/ast, compiler/astalgo, compiler/magicsys, - compiler/lookups, compiler/semdata, compiler/lowerings +import compiler/pluginsupport, compiler/ast, compiler/astalgo, + compiler/magicsys, compiler/lookups, compiler/semdata, compiler/lowerings proc semLocals(c: PContext, n: PNode): PNode = var counter = 0 diff --git a/compiler/plugins.nim b/compiler/pluginsupport.nim similarity index 100% rename from compiler/plugins.nim rename to compiler/pluginsupport.nim diff --git a/compiler/sem.nim b/compiler/sem.nim index c6db6fbd38..f6078830bb 100644 --- a/compiler/sem.nim +++ b/compiler/sem.nim @@ -16,7 +16,7 @@ import procfind, lookups, rodread, pragmas, passes, semdata, semtypinst, sigmatch, intsets, transf, vmdef, vm, idgen, aliases, cgmeth, lambdalifting, evaltempl, patterns, parampatterns, sempass2, nimfix.pretty, semmacrosanity, - semparallel, lowerings, plugins, plugins.active + semparallel, lowerings, pluginsupport, plugins.active when defined(nimfix): import nimfix.prettybase @@ -485,4 +485,3 @@ proc myClose(context: PPassContext, n: PNode): PNode = popProcCon(c) const semPass* = makePass(myOpen, myOpenCached, myProcess, myClose) -