From 19ed4a8e3e40ae01e96ac5884fedfcce41aaf4b1 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 6 Apr 2018 13:56:15 +0200
Subject: [PATCH] fixes #7522

---
 compiler/nimeval.nim               | 1 +
 compiler/nimfix/pretty.nim         | 4 ++--
 compiler/nimfix/prettybase.nim     | 2 +-
 compiler/plugins/active.nim        | 2 +-
 compiler/plugins/itersgen.nim      | 7 +++----
 compiler/plugins/locals/locals.nim | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/compiler/nimeval.nim b/compiler/nimeval.nim
index aca03fc16d..ff91861d08 100644
--- a/compiler/nimeval.nim
+++ b/compiler/nimeval.nim
@@ -20,6 +20,7 @@ proc execute*(program: string) =
 
   initDefines()
   defineSymbol("nimrodvm")
+  defineSymbol("nimscript")
   when hasFFI: defineSymbol("nimffi")
   registerPass(verbosePass)
   registerPass(semPass)
diff --git a/compiler/nimfix/pretty.nim b/compiler/nimfix/pretty.nim
index 8ba9229271..55603f4cd7 100644
--- a/compiler/nimfix/pretty.nim
+++ b/compiler/nimfix/pretty.nim
@@ -13,8 +13,8 @@
 import
   strutils, os, intsets, strtabs
 
-import compiler/options, compiler/ast, compiler/astalgo, compiler/msgs,
-  compiler/semdata, compiler/nimfix/prettybase, compiler/ropes, compiler/idents
+import "../compiler" / [options, ast, astalgo, msgs, semdata, ropes, idents]
+import prettybase
 
 type
   StyleCheck* {.pure.} = enum None, Warn, Auto
diff --git a/compiler/nimfix/prettybase.nim b/compiler/nimfix/prettybase.nim
index 0f17cbcb19..f1d24183b0 100644
--- a/compiler/nimfix/prettybase.nim
+++ b/compiler/nimfix/prettybase.nim
@@ -8,7 +8,7 @@
 #
 
 import strutils, lexbase, streams
-import compiler/ast, compiler/msgs, compiler/idents
+import "../compiler" / [ast, msgs, idents]
 from os import splitFile
 
 type
diff --git a/compiler/plugins/active.nim b/compiler/plugins/active.nim
index 7b6411178c..5da623e49c 100644
--- a/compiler/plugins/active.nim
+++ b/compiler/plugins/active.nim
@@ -10,4 +10,4 @@
 ## Include file that imports all plugins that are active.
 
 import
-  locals.locals, itersgen
+  locals / locals, itersgen
diff --git a/compiler/plugins/itersgen.nim b/compiler/plugins/itersgen.nim
index f44735b776..dbc47e11eb 100644
--- a/compiler/plugins/itersgen.nim
+++ b/compiler/plugins/itersgen.nim
@@ -9,10 +9,9 @@
 
 ## Plugin to transform an inline iterator into a data structure.
 
-import compiler/pluginsupport, compiler/ast, compiler/astalgo,
-  compiler/magicsys, compiler/lookups, compiler/semdata,
-  compiler/lambdalifting, compiler/rodread, compiler/msgs
-
+import ".." / [pluginsupport, ast, astalgo,
+  magicsys, lookups, semdata,
+  lambdalifting, rodread, 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 338e7bcac3..9cbb611866 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/pluginsupport, compiler/ast, compiler/astalgo,
-  compiler/magicsys, compiler/lookups, compiler/semdata, compiler/lowerings
+import "../../"  / [pluginsupport, ast, astalgo,
+  magicsys, lookups, semdata, lowerings]
 
 proc semLocals(c: PContext, n: PNode): PNode =
   var counter = 0