Move AST files into a package

Author: thewilsonator

compiler/src/.dscanner.ini

@@ -119,7 +119,7 @@ unused_result="disabled"
 trust_too_much="-dmd.root.longdouble"
 builtin_property_names_check="-dmd.backend.obj,-dmd.backend.code,-dmd.backend.cc"
 object_const_check="-dmd.dtemplate"
-enum_array_literal_check="-dmd.astbase,-dmd.backend.oper,-dmd.backend.oper,-dmd.backend.var,-dmd.tokens,-dmd.expression"
+enum_array_literal_check="-dmd.ast.base,-dmd.backend.oper,-dmd.backend.oper,-dmd.backend.var,-dmd.tokens,-dmd.ast.expression"
 unused_variable_check="-dmd.backend.aarray,\
 -dmd.backend.blockopt,\
 -dmd.backend.cg,\

compiler/src/build.d

@@ -962,7 +962,7 @@ alias html = makeRule!((htmlBuilder, htmlRule) {
     }
     const stddocs = env.get("STDDOC", "").split();
     auto docSources = .sources.common ~ .sources.root ~ .sources.lexer ~ .sources.dmd.all
-        ~ env["D"].buildPath("astbase.d")
+        ~ env["D"].buildPath("ast/base.d")
         ~ env["D"].buildPath("cxxfrontend.d")
         ~ env["D"].buildPath("frontend.d");
     htmlBuilder.deps(docSources.chunks(1).map!(sourceArray =>
@@ -1574,24 +1574,29 @@ auto sourceFiles()
             link.d mars.d main.d sarif.d lib/scanelf.d lib/scanmach.d lib/scanmscoff.d timetrace.d vsoptions.d
         "),
         frontend: fileArray(env["D"], "
-            access.d aggregate.d aliasthis.d argtypes_x86.d argtypes_sysv_x64.d argtypes_aarch64.d arrayop.d
-            arraytypes.d astenums.d ast_node.d astcodegen.d asttypename.d attrib.d attribsem.d blockexit.d builtin.d canthrow.d chkformat.d
-            cli.d clone.d compiler.d cond.d constfold.d  cpreprocess.d ctfeexpr.d
-            ctorflow.d dcast.d dclass.d declaration.d delegatize.d denum.d deps.d dimport.d
-            dinterpret.d dmacro.d dmodule.d doc.d dscope.d dstruct.d dsymbol.d dsymbolsem.d
-            dtemplate.d dtoh.d dversion.d enumsem.d escape.d expression.d expressionsem.d func.d funcsem.d hdrgen.d
-            impcnvtab.d imphint.d importc.d init.d initsem.d inline.d inlinecost.d intrange.d json.d lambdacomp.d
-            mtype.d mustuse.d nogc.d nspace.d ob.d objc.d opover.d optimize.d
-            parse.d pragmasem.d printast.d rootobject.d safe.d
-            semantic2.d semantic3.d sideeffect.d statement.d
-            statementsem.d staticassert.d staticcond.d stmtstate.d target.d targetcompiler.d templatesem.d templateparamsem.d traits.d
+            access.d argtypes_x86.d argtypes_sysv_x64.d argtypes_aarch64.d arrayop.d
+            arraytypes.d attribsem.d blockexit.d builtin.d canthrow.d chkformat.d
+            cli.d clone.d compiler.d constfold.d cpreprocess.d ctfeexpr.d
+            ctorflow.d dcast.d delegatize.d deps.d
+            dinterpret.d dmacro.d doc.d dscope.d dsymbolsem.d
+            dtoh.d enumsem.d escape.d expressionsem.d funcsem.d hdrgen.d
+            impcnvtab.d imphint.d importc.d initsem.d inline.d inlinecost.d intrange.d json.d lambdacomp.d
+            mustuse.d nogc.d ob.d objc.d opover.d optimize.d
+            parse.d pragmasem.d rootobject.d safe.d
+            semantic2.d semantic3.d sideeffect.d
+            statementsem.d stmtstate.d target.d targetcompiler.d templatesem.d templateparamsem.d traits.d
             typesem.d typinf.d utils.d
+            ast/aggregate.d ast/aliasthis.d ast/codegen.d ast/attrib.d ast/cond.d ast/dclass.d ast/declaration.d
+            ast/denum.d ast/dimport.d ast/dmodule.d ast/dstruct.d ast/dsymbol.d ast/dtemplate.d ast/dversion.d ast/enums.d
+            ast/expression.d ast/func.d ast/init.d ast/mtype.d ast/node.d ast/nspace.d ast/print.d ast/statement.d
+            ast/staticassert.d ast/staticcond.d ast/typename.d
+            dfa/entry.d dfa/utils.d dfa/fast/structure.d dfa/fast/analysis.d dfa/fast/report.d dfa/fast/expression.d dfa/fast/statement.d
             iasm/package.d iasm/gcc.d
             mangle/package.d mangle/basic.d mangle/cpp.d mangle/cppwin.d
             visitor/package.d visitor/foreachvar.d visitor/parsetime.d visitor/permissive.d visitor/postorder.d visitor/statement_rewrite_walker.d
             visitor/strict.d visitor/transitive.d
             cparse.d
-            dfa/entry.d dfa/utils.d dfa/fast/structure.d dfa/fast/analysis.d dfa/fast/report.d dfa/fast/expression.d dfa/fast/statement.d
+
         "),
         backendHeaders: fileArray(env["C"], "
             cc.d cdef.d cgcv.d code.d dt.d el.d global.d

compiler/src/dmd/access.d

@@ -13,16 +13,17 @@
 
 module dmd.access;
 
-import dmd.aggregate;
-import dmd.astenums;
-import dmd.dclass;
-import dmd.dmodule;
+import dmd.ast.aggregate;
+import dmd.ast.enums;
+import dmd.ast.dclass;
+import dmd.ast.dmodule;
+import dmd.ast.dstruct;
+import dmd.ast.dsymbol;
+import dmd.ast.expression;
+
 import dmd.dscope;
-import dmd.dstruct;
-import dmd.dsymbol;
 import dmd.dsymbolsem : toAlias;
 import dmd.errors;
-import dmd.expression;
 import dmd.funcsem : overloadApply;
 import dmd.location;
 import dmd.tokens;

compiler/src/dmd/argtypes_aarch64.d

@@ -11,10 +11,11 @@
 
 module dmd.argtypes_aarch64;
 
+import dmd.ast.enums;
+import dmd.ast.mtype;
+
 import core.stdc.stdio;
-import dmd.astenums;
 import dmd.dsymbolsem : isPOD;
-import dmd.mtype;
 import dmd.typesem;
 import dmd.expressionsem : toUInteger;
 

compiler/src/dmd/argtypes_sysv_x64.d

@@ -12,10 +12,12 @@
 module dmd.argtypes_sysv_x64;
 
 import core.stdc.stdio;
-import dmd.astenums;
-import dmd.declaration;
+
+import dmd.ast.enums;
+import dmd.ast.declaration;
+import dmd.ast.mtype;
+
 import dmd.dsymbolsem : isPOD;
-import dmd.mtype;
 import dmd.typesem;
 import dmd.expressionsem : toInteger;
 import dmd.target;

compiler/src/dmd/argtypes_x86.d

@@ -14,12 +14,13 @@ module dmd.argtypes_x86;
 import core.stdc.stdio;
 import core.checkedint;
 
-import dmd.astenums;
-import dmd.declaration;
+import dmd.ast.enums;
+import dmd.ast.declaration;
+import dmd.ast.mtype;
+
 import dmd.dsymbolsem : isPOD;
 import dmd.expressionsem : toInteger;
 import dmd.location;
-import dmd.mtype;
 import dmd.typesem;
 import dmd.target;
 import dmd.visitor;

compiler/src/dmd/arrayop.d

@@ -14,20 +14,22 @@
 module dmd.arrayop;
 
 import core.stdc.stdio;
+
+import dmd.ast.enums;
+import dmd.ast.declaration;
+import dmd.ast.expression;
+import dmd.ast.mtype;
+
 import dmd.arraytypes;
-import dmd.astenums;
 import dmd.dcast : implicitConvTo;
-import dmd.declaration;
 import dmd.dscope;
 import dmd.errors;
-import dmd.expression;
 import dmd.expressionsem;
 import dmd.funcsem;
 import dmd.hdrgen;
 import dmd.id;
 import dmd.identifier;
 import dmd.location;
-import dmd.mtype;
 import dmd.common.outbuffer;
 import dmd.tokens;
 import dmd.typesem : isAssignable, nextOf, toBasetype;
@@ -132,7 +134,7 @@ Expression arrayOp(BinExp e, Scope* sc)
     auto tiargs = new Objects();
     auto args = buildArrayOp(sc, e, tiargs);
 
-    import dmd.dtemplate : TemplateDeclaration;
+    import dmd.ast.dtemplate : TemplateDeclaration;
     __gshared TemplateDeclaration arrayOp;
     if (arrayOp is null)
     {

compiler/src/dmd/arraytypes.d

@@ -11,19 +11,20 @@
 
 module dmd.arraytypes;
 
-import dmd.dclass;
-import dmd.declaration;
-import dmd.dmodule;
-import dmd.dsymbol;
-import dmd.dtemplate;
-import dmd.expression;
-import dmd.func;
+import dmd.ast.dclass;
+import dmd.ast.declaration;
+import dmd.ast.dmodule;
+import dmd.ast.dsymbol;
+import dmd.ast.dtemplate;
+import dmd.ast.expression;
+import dmd.ast.func;
+import dmd.ast.init;
+import dmd.ast.mtype;
+import dmd.ast.statement;
+
 import dmd.identifier;
-import dmd.init;
-import dmd.mtype;
 import dmd.root.array;
 import dmd.rootobject;
-import dmd.statement;
 
 alias Strings = Array!(const(char)*);
 alias Identifiers = Array!(Identifier);

compiler/src/dmd/aggregate.d compiler/src/dmd/ast/aggregate.dcompiler/src/dmd/aggregate.d renamed to compiler/src/dmd/ast/aggregate.d

@@ -7,28 +7,29 @@
  * Copyright:   Copyright (C) 1999-2026 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
- * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/compiler/src/dmd/aggregate.d, _aggregate.d)
- * Documentation:  https://dlang.org/phobos/dmd_aggregate.html
- * Coverage:    https://codecov.io/gh/dlang/dmd/src/master/compiler/src/dmd/aggregate.d
+ * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/compiler/src/dmd/ast/aggregate.d, _aggregate.d)
+ * Documentation:  https://dlang.org/phobos/dmd_ast_aggregate.html
+ * Coverage:    https://codecov.io/gh/dlang/dmd/src/master/compiler/src/dmd/ast/aggregate.d
  */
 
-module dmd.aggregate;
+module dmd.ast.aggregate;
 
 import core.stdc.stdio;
 import core.checkedint;
 
-import dmd.aliasthis;
+import dmd.ast.aliasthis;
+import dmd.ast.enums;
+import dmd.ast.declaration;
+import dmd.ast.dsymbol;
+import dmd.ast.expression;
+import dmd.ast.func;
+import dmd.ast.mtype;
+
 import dmd.arraytypes;
-import dmd.astenums;
-import dmd.declaration;
 import dmd.dscope;
-import dmd.dsymbol;
 import dmd.errors;
-import dmd.expression;
-import dmd.func;
 import dmd.identifier;
 import dmd.location;
-import dmd.mtype;
 import dmd.visitor;
 
 /**

compiler/src/dmd/aliasthis.d compiler/src/dmd/ast/aliasthis.dcompiler/src/dmd/aliasthis.d renamed to compiler/src/dmd/ast/aliasthis.d

@@ -6,16 +6,16 @@
  * Copyright:   Copyright (C) 1999-2026 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
- * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/compiler/src/dmd/aliasthis.d, _aliasthis.d)
- * Documentation:  https://dlang.org/phobos/dmd_aliasthis.html
- * Coverage:    https://codecov.io/gh/dlang/dmd/src/master/compiler/src/dmd/aliasthis.d
+ * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/compiler/src/dmd/ast/aliasthis.d, _aliasthis.d)
+ * Documentation:  https://dlang.org/phobos/dmd_ast_aliasthis.html
+ * Coverage:    https://codecov.io/gh/dlang/dmd/src/master/compiler/src/dmd/ast/aliasthis.d
  */
 
-module dmd.aliasthis;
+module dmd.ast.aliasthis;
 
 import core.stdc.stdio;
 
-import dmd.dsymbol;
+import dmd.ast.dsymbol;
 import dmd.identifier;
 import dmd.location;
 import dmd.visitor;