From 64f5c966851bbff3f7bf822d2143233797a98ae6 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Wed, 17 Oct 2018 12:52:25 +0200
Subject: [PATCH] nimpretty: fixes #9384

(cherry picked from commit bd9d5787f06a1f3e259055268824a852cd160798)
---
 compiler/syntaxes.nim | 16 ++++++++++------
 nimpretty/tester.nim  |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/compiler/syntaxes.nim b/compiler/syntaxes.nim
index b5fcee7b12..decdf17157 100644
--- a/compiler/syntaxes.nim
+++ b/compiler/syntaxes.nim
@@ -72,12 +72,16 @@ proc parsePipe(filename: AbsoluteFile, inputStream: PLLStream; cache: IdentCache
       i = 0
       inc linenumber
     if i+1 < line.len and line[i] == '#' and line[i+1] == '?':
-      inc(i, 2)
-      while i < line.len and line[i] in Whitespace: inc(i)
-      var q: TParser
-      parser.openParser(q, filename, llStreamOpen(substr(line, i)), cache, config)
-      result = parser.parseAll(q)
-      parser.closeParser(q)
+      when defined(nimpretty2):
+        # XXX this is a bit hacky, but oh well...
+        quit "can't nimpretty a source code filter"
+      else:
+        inc(i, 2)
+        while i < line.len and line[i] in Whitespace: inc(i)
+        var q: TParser
+        parser.openParser(q, filename, llStreamOpen(substr(line, i)), cache, config)
+        result = parser.parseAll(q)
+        parser.closeParser(q)
     llStreamClose(s)
 
 proc getFilter(ident: PIdent): TFilterKind =
diff --git a/nimpretty/tester.nim b/nimpretty/tester.nim
index 2f184b7fc6..c4e3647526 100644
--- a/nimpretty/tester.nim
+++ b/nimpretty/tester.nim
@@ -9,7 +9,7 @@ var
   failures = 0
 
 when defined(develop):
-  const nimp = "bin/nimpretty".addFileExt(ExeExt)
+  const nimp = "bin" / "nimpretty".addFileExt(ExeExt)
   if execShellCmd("nim c -o:$# nimpretty/nimpretty.nim" % [nimp]) != 0:
     quit("FAILURE: compilation of nimpretty failed")
 else: