use $nim-relative imports

config.nims

@@ -2,6 +2,3 @@
 when withDir(thisDir(), system.fileExists("nimble.paths")):
   include "nimble.paths"
 # end Nimble config
-
-switch("p", "$projectDir/nimbledeps/pkgs2/nim-2.0.0-35b9d926d314ce8c3326902c138f5c2247cfd390/compiler")
-switch("p", "$projectDir/../nimbledeps/pkgs2/nim-2.0.0-35b9d926d314ce8c3326902c138f5c2247cfd390/compiler")

src/astcmp.nim

@@ -3,7 +3,8 @@
 ## Compare two AST's for semantic equivalence - aka undo whitespace bugs in the
 ## Nim parser / grammar
 
-import ast, parser, idents, options, sequtils
+import
+  "$nim"/compiler/[ast, parser, idents, options], std/sequtils
 
 type
   Equivalence* = enum

src/nph.nim

@@ -4,11 +4,13 @@
 
 import
   "."/[astcmp, phast, phastalgo, phmsgs, phlineinfos, phoptions, phparser, phrenderer]
-import idents
+import
+  "$nim"/compiler/idents
 
-from astalgo import nil
+from "$nim"/compiler/astalgo import nil
 
-import parseopt, strutils, os, sequtils
+import
+  std/[parseopt, strutils, os, sequtils]
 
 const
   Version = "0.1"

src/phast.nim

@@ -12,9 +12,12 @@
 # nph version:
 # * enhanced concrete syntax information
 
-import hashes, options, ropes, idents, int128, tables
+import
+  std/[hashes, tables]
+import
+  "$nim"/compiler/[idents, options, int128, ropes]
 
-from strutils import toLowerAscii
+from std/strutils import toLowerAscii
 
 import
   "."/phlineinfos

src/phastalgo.nim

@@ -14,7 +14,10 @@
 # nph version:
 # * yaml formatting for the nph-specific fields
 
-import phast, hashes, intsets, phoptions, phlineinfos, ropes, idents, rodutils, phmsgs
+import
+  "."/[phast, phoptions, phlineinfos, phmsgs],
+  std/[hashes, intsets],
+  "$nim"/compiler/[ropes, idents, rodutils]
 
 import strutils except addf
 when defined(nimPreviewSlimSystem):

src/phlexer.nim

@@ -26,8 +26,9 @@
 # end-of-comment marker.
 
 import
-  hashes, phoptions, phmsgs, strutils, platform, idents, nimlexbase, llstream, wordrecg,
-  phlineinfos, pathutils, parseutils
+  "$nim"/compiler/[idents, platform, nimlexbase, llstream, pathutils, wordrecg],
+  "."/[phoptions, phmsgs, phlineinfos],
+  std/[hashes, strutils, parseutils]
 when defined(nimPreviewSlimSystem):
   import
     std/[assertions, formatfloat]

src/phlineinfos.nim

@@ -11,7 +11,8 @@
 ## This module contains the ``TMsgKind`` enum as well as the
 ## ``TLineInfo`` object.
 
-import ropes, tables, pathutils, hashes
+import
+  "$nim"/compiler/[ropes, pathutils], std/[hashes, tables]
 
 const
   explanationsBaseUrl* = "https://nim-lang.github.io/Nim"

src/phmsgs.nim

@@ -12,11 +12,10 @@
 import
   std/[strutils, os, tables, terminal, macros, times],
   std/private/miscdollars,
-  pathutils
-import
-  ./phlineinfos, ./phoptions
+  "$nim"/compiler/pathutils,
+  "."/[phlineinfos, phoptions]
 
-import ropes except `%`
+import "$nim"/compiler/ropes except `%`
 when defined(nimPreviewSlimSystem):
   import
     std/[syncio, assertions]

src/phoptions.nim

@@ -9,11 +9,14 @@
 #    distribution, for details about the copyright.
 #
 
-import os, strutils, strtabs, sets, platform, prefixmatches, pathutils, nimpaths, tables
-import phlineinfos
-
-from terminal import isatty
-from times import utc, fromUnix, local, getTime, format, DateTime
+import
+  std/[os, strutils, strtabs, sets, tables],
+  "$nim"/compiler/[platform, prefixmatches, pathutils, nimpaths]
+import
+  ./phlineinfos
+
+from std/terminal import isatty
+from std/times import utc, fromUnix, local, getTime, format, DateTime
 from std/private/globs import nativeToUnixPath
 when defined(nimPreviewSlimSystem):
   import
@@ -901,7 +904,7 @@ proc clearNimblePath*(conf: ConfigRef) =
   conf.nimblePaths.setLen(0)
 
 include
-  packagehandling
+  "$nim"/compiler/packagehandling
 
 proc getOsCacheDir(): string =
   when defined(posix):

src/phparser.nim

@@ -32,7 +32,8 @@
 # that the lexer is trying to do comment layout / reflow / analysis in the
 # middle of lexing..
 
-import llstream, idents, strutils, pathutils
+import
+  "$nim"/compiler/[llstream, idents, pathutils], std/[strutils]
 import
   "."/[phast, phlexer, phlineinfos, phmsgs, phoptions]
 when defined(nimPreviewSlimSystem):

src/phrenderer.nim

@@ -18,8 +18,10 @@
 
 {.used.}
 
-import idents, strutils, sequtils
-import phlexer, phoptions, phast, phmsgs, phlineinfos
+import
+  "$nim"/compiler/[idents], std/[strutils, sequtils]
+import
+  "."/[phlexer, phoptions, phast, phmsgs, phlineinfos]
 when defined(nimPreviewSlimSystem):
   import
     std/[syncio, assertions, formatfloat]