.

compiler/ast.nim → compiler/ast/ast.nim

@@ -10,14 +10,25 @@
 ## abstract syntax tree + symbol table
 
 import
-  lineinfos, hashes, options, ropes, idents, int128, tables
-
-from strutils import toLowerAscii
-
-import ./ast_types
-export ast_types
-
-export int128
+  compiler/ast/[
+    lineinfos, # Positional information
+    idents, # Ast identifiers
+    ast_types # Main ast type definitions
+  ],
+  compiler/front/[
+    options
+  ],
+  compiler/utils/[
+    ropes,
+    int128 # Values for integer nodes
+  ],
+  std/[
+    hashes,
+    strutils,
+    tables # For symbol table mapping
+  ]
+
+export ast_types, int128
 
 template nodeId(n: PNode): int = cast[int](n)
 

compiler/ast_types.nim → compiler/ast/ast_types.nim

@@ -1,4 +1,4 @@
-import ropes
+import compiler/utils/ropes
 import std/[hashes]
 
 const

compiler/astalgo.nim → compiler/ast/astalgo.nim

@@ -12,8 +12,26 @@
 # the data structures here are used in various places of the compiler.
 
 import
-  ast, hashes, intsets, strutils, options, lineinfos, ropes, idents, rodutils,
-  msgs
+  compiler/ast/[
+    ast,
+    idents,
+    lineinfos,
+  ],
+  std/[
+    hashes,
+    intsets,
+    strutils,
+  ],
+  compiler/utils/[
+    ropes,
+  ],
+  compiler/sem/[
+    rodutils,
+  ],
+  compiler/front/[
+    options,
+    msgs
+  ]
 
 proc hashNode*(p: RootRef): Hash
 proc treeToYaml*(conf: ConfigRef; n: PNode, indent: int = 0, maxRecDepth: int = - 1): Rope

compiler/astmsgs.nim → compiler/ast/astmsgs.nim

@@ -1,6 +1,13 @@
 # this module avoids ast depending on msgs or vice versa
 import std/strutils
-import options, ast, msgs
+import
+  compiler/ast/[
+    ast,
+  ],
+  compiler/front/[
+    options,
+    msgs
+  ]
 
 proc typSym*(t: PType): PSym =
   result = t.sym

compiler/enumtostr.nim → compiler/ast/enumtostr.nim

@@ -1,5 +1,14 @@
+import
+  compiler/ast/[
+    ast,
+    idents,
+    lineinfos
+  ],
+  compiler/modules/[
+    modulegraphs,
+    magicsys
+  ]
 
-import ast, idents, lineinfos, modulegraphs, magicsys
 
 proc genEnumToStrProc*(t: PType; info: TLineInfo; g: ModuleGraph; idgen: IdGenerator): PSym =
   result = newSym(skProc, getIdent(g.cache, "$"), nextSymId idgen, t.owner, info)

compiler/errorhandling.nim → compiler/ast/errorhandling.nim

@@ -31,9 +31,19 @@
 ## * rework internals to store actual error information in a lookup data
 ##   structure on the side instead of directly in the node
 
-import ast, msgs, options
-from lineinfos import unknownLineInfo
-import reports, debugutils
+import
+  compiler/ast/[
+    ast,
+    reports,
+    lineinfos
+  ],
+  compiler/utils/[
+    debugutils,
+  ],
+  compiler/front/[
+    msgs,
+    options
+  ]
 
 proc errorSubNode*(n: PNode): PNode =
   ## find the first error node, or nil, under `n` using a depth first traversal

compiler/errorreporting.nim → compiler/ast/errorreporting.nim

@@ -14,8 +14,8 @@
 ##   determines which error handling strategy to use doNothing, raise, etc.
 
 import ast, errorhandling, renderer, reports
-from options import ConfigRef
-from msgs import TErrorHandling
+from compiler/front/options import ConfigRef
+from compiler/front/msgs import TErrorHandling
 
 export compilerInstInfo, walkErrors, errorKind
 # export because keeping the declaration in `errorhandling` acts as a reminder

compiler/filter_tmpl.nim → compiler/ast/filter_tmpl.nim

@@ -10,8 +10,23 @@
 ## This module implements Nim's standard template filter.
 
 import
-  llstream, strutils, ast, msgs, options,
-  filters, lineinfos, pathutils, reports
+  compiler/front/[
+    msgs,
+    options,
+  ],
+  std/[
+    strutils,
+  ],
+  compiler/utils/[
+    pathutils,
+  ],
+  compiler/ast/[
+    llstream,
+    ast,
+    filters,
+    lineinfos,
+    reports
+  ]
 
 type
   TParseState = enum

compiler/filters.nim → compiler/ast/filters.nim

@@ -10,8 +10,23 @@
 ## This module implements Nim's simple filters and helpers for filters.
 
 import
-  llstream, strutils, ast, msgs, options,
-  renderer, pathutils, reports
+  compiler/ast/[
+    llstream,
+    ast,
+    renderer,
+    reports
+  ],
+  std/[
+    strutils,
+  ],
+  compiler/utils/[
+    pathutils,
+  ],
+  compiler/front/[
+    msgs,
+    options,
+  ]
+
 
 proc invalidPragma(conf: ConfigRef; n: PNode) =
   conf.localReport(n.info, reportAst(rsemNodeNotAllowed, n))

compiler/lexer.nim → compiler/ast/lexer.nim

@@ -17,8 +17,27 @@
 ## format.
 
 import
-  hashes, options, msgs, strutils, platform, idents, nimlexbase, llstream,
-  wordrecg, lineinfos, pathutils, parseutils, reports
+  compiler/utils/[
+    platform,
+    pathutils,
+  ],
+  compiler/ast/[
+    wordrecg,
+    nimlexbase,
+    llstream,
+    lineinfos,
+    reports,
+    idents
+  ],
+  std/[
+    parseutils,
+    hashes,
+    strutils
+  ],
+  compiler/front/[
+    options,
+    msgs
+  ]
 
 const
   MaxLineLength* = 80         # lines longer than this lead to a warning

compiler/lineinfos.nim → compiler/ast/lineinfos.nim

@@ -10,7 +10,9 @@
 ## This module contains the ``TMsgKind`` enum as well as the
 ## ``TLineInfo`` object.
 
-import ropes, tables, pathutils, hashes
+import
+  std/[tables, hashes],
+  compiler/utils/[ropes, pathutils]
 
 from ast_types import
   PSym,     # Contextual details of the instantnation stack optionally refer to

compiler/linter.nim → compiler/ast/linter.nim

@@ -8,9 +8,21 @@
 #
 
 ## This module implements the style checker.
+import
+  std/[
+    strutils
+  ],
+  compiler/ast/[
+    ast,
+    lineinfos,
+    wordrecg,
+    reports
+  ],
+  compiler/front/[
+    options,
+    msgs
+  ]
 
-import std/strutils
-import options, ast, msgs, lineinfos, wordrecg, reports
 
 const
   Letters* = {'a'..'z', 'A'..'Z', '0'..'9', '\x80'..'\xFF', '_'}

compiler/llstream.nim → compiler/ast/llstream.nim

@@ -10,7 +10,7 @@
 ## Low-level streams for high performance.
 
 import
-  pathutils
+  compiler/utils/pathutils
 
 # support `useGnuReadline`, `useLinenoise` for backwards compatibility
 const hasRstdin = (defined(nimUseLinenoise) or defined(useLinenoise) or defined(useGnuReadline)) and

compiler/ndi.nim → compiler/ast/ndi.nim

@@ -10,7 +10,18 @@
 ## This module implements the generation of ``.ndi`` files for better debugging
 ## support of Nim code. "ndi" stands for "Nim debug info".
 
-import ast, msgs, ropes, options, pathutils
+import
+  compiler/ast/[
+    ast
+  ],
+  compiler/front/[
+    msgs,
+    options
+  ],
+  compiler/utils/[
+    ropes,
+    pathutils
+  ]
 
 type
   NdiFile* = object

compiler/nimsets.nim → compiler/ast/nimsets.nim

@@ -10,7 +10,13 @@
 # this unit handles Nim sets; it implements symbolic sets
 
 import
-  ast, astalgo, lineinfos, bitsets, types, options
+  compiler/ast/[ast, astalgo, lineinfos, types],
+  compiler/front/[
+    options
+  ],
+  compiler/utils/[
+    bitsets
+  ]
 
 proc inSet*(s: PNode, elem: PNode): bool =
   assert s.kind == nkCurly

compiler/parser.nim → compiler/ast/parser.nim

@@ -30,8 +30,24 @@ when isMainModule:
   checkGrammarFile()
 
 import
-  llstream, lexer, idents, strutils, ast, msgs, options, lineinfos,
-  pathutils, reports
+  compiler/ast/[
+    llstream,
+    lexer,
+    idents,
+    ast,
+    lineinfos,
+    reports
+  ],
+  std/[
+    strutils,
+  ],
+  compiler/front/[
+    msgs,
+    options,
+  ],
+  compiler/utils/[
+    pathutils
+  ]
 
 when defined(nimpretty):
   import layouter

compiler/renderer.nim → compiler/ast/renderer.nim

@@ -15,7 +15,21 @@ when defined(nimHasUsed):
   {.used.}
 
 import
-  lexer, options, idents, strutils, ast, msgs, lineinfos, reports
+  compiler/ast/[
+    lexer,
+    idents,
+    ast,
+    lineinfos,
+    reports
+  ],
+  std/[
+    strutils,
+  ],
+  compiler/front/[
+    options,
+    msgs,
+  ]
+
 
 type
   TRenderFlag* = enum

compiler/reports.nim → compiler/ast/reports.nim

@@ -17,10 +17,10 @@
 import std/[options, packedsets]
 
 import
-  ast_types,
-  vm_enums,
-  nilcheck_enums,
-  int128
+  compiler/vm/vm_enums,
+  compiler/ast/ast_types,
+  compiler/utils/int128,
+  compiler/sem/nilcheck_enums
 
 export
   ast_types,

compiler/syntaxes.nim → compiler/ast/syntaxes.nim

@@ -10,8 +10,26 @@
 ## Implements the dispatcher for the different parsers.
 
 import
-  strutils, llstream, ast, idents, lexer, options, msgs, parser,
-  filters, filter_tmpl, renderer, lineinfos, pathutils, reports
+  strutils,
+  compiler/ast/[
+    llstream,
+    ast,
+    idents,
+    lexer,
+    parser,
+    filters,
+    filter_tmpl,
+    renderer,
+    lineinfos,
+    reports
+  ],
+  compiler/front/[
+    options,
+    msgs,
+  ],
+  compiler/utils/[
+    pathutils,
+  ]
 
 export Parser, parseAll, parseTopLevelStmt, closeParser