Revert "refactor(ast_codegen): declutter the main file."

This reverts commit c92252f.

tasks/ast_codegen/src/generators/assert_layouts.rs

@@ -3,10 +3,9 @@ use quote::{format_ident, quote};
 use syn::Type;
 
 use crate::{
-    codegen::LateCtx,
     output,
     schema::{FieldDef, ToType, TypeDef},
-    Generator, GeneratorOutput,
+    Generator, GeneratorOutput, LateCtx,
 };
 
 use super::{define_generator, generated_header};
@@ -22,8 +21,9 @@ impl Generator for AssertLayouts {
 
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let (assertions_64, assertions_32) = ctx
-            .schema()
-            .into_iter()
+            .schema
+            .definitions
+            .iter()
             .map(|def| {
                 let typ = def.to_type_elide();
                 assert_type(&typ, def)

tasks/ast_codegen/src/generators/ast_builder.rs

@@ -9,14 +9,13 @@ use quote::{format_ident, quote, ToTokens};
 use syn::{parse_quote, Ident, Type};
 
 use crate::{
-    codegen::LateCtx,
     generators::generated_header,
     output,
     schema::{
         EnumDef, FieldDef, GetIdent, InheritDef, StructDef, ToType, TypeDef, TypeName, VariantDef,
     },
     util::{TypeAnalysis, TypeWrapper},
-    Generator, GeneratorOutput,
+    Generator, GeneratorOutput, LateCtx,
 };
 
 use super::define_generator;
@@ -32,8 +31,9 @@ impl Generator for AstBuilderGenerator {
 
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let fns = ctx
-            .schema()
-            .into_iter()
+            .schema
+            .definitions
+            .iter()
             .filter(|it| it.visitable())
             .map(|it| generate_builder_fn(it, ctx))
             .collect_vec();

tasks/ast_codegen/src/generators/ast_kind.rs

@@ -3,11 +3,10 @@ use quote::quote;
 use syn::{parse_quote, Arm, Ident, Type, Variant};
 
 use crate::{
-    codegen::LateCtx,
     output,
     schema::{GetIdent, ToType, TypeDef},
     util::ToIdent,
-    Generator, GeneratorOutput,
+    Generator, GeneratorOutput, LateCtx,
 };
 
 use super::{define_generator, generated_header};
@@ -142,8 +141,8 @@ impl Generator for AstKindGenerator {
 
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let have_kinds: Vec<(Ident, Type)> = ctx
-            .schema()
-            .into_iter()
+            .schema.definitions
+            .iter()
             .filter(|it| it.visitable())
             .filter(
                 |maybe_kind| matches!(maybe_kind, kind @ (TypeDef::Enum(_) | TypeDef::Struct(_)) if kind.visitable())

tasks/ast_codegen/src/generators/derive_clone_in.rs

@@ -4,10 +4,9 @@ use quote::{format_ident, quote};
 use syn::Ident;
 
 use crate::{
-    codegen::LateCtx,
     output,
     schema::{EnumDef, GetIdent, StructDef, TypeDef},
-    GeneratorOutput,
+    GeneratorOutput, LateCtx,
 };
 
 use super::{define_generator, generated_header, Generator};
@@ -23,8 +22,9 @@ impl Generator for DeriveCloneIn {
 
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput {
         let impls: Vec<TokenStream> = ctx
-            .schema()
-            .into_iter()
+            .schema
+            .definitions
+            .iter()
             .filter(|def| def.generates_derive("CloneIn"))
             .map(|def| match &def {
                 TypeDef::Enum(it) => derive_enum(it),

tasks/ast_codegen/src/generators/derive_get_span.rs

@@ -3,11 +3,10 @@ use quote::{format_ident, quote};
 use syn::{Generics, Ident, Type};
 
 use crate::{
-    codegen::LateCtx,
     output,
     schema::{EnumDef, GetGenerics, StructDef, ToType, TypeDef},
     util::ToIdent,
-    Generator, GeneratorOutput,
+    Generator, GeneratorOutput, LateCtx,
 };
 
 use super::{define_generator, generated_header};
@@ -89,8 +88,9 @@ fn derive<const MUT: bool>(ctx: &LateCtx) -> TokenStream {
         )
     };
     let impls: Vec<TokenStream> = ctx
-        .schema()
-        .into_iter()
+        .schema
+        .definitions
+        .iter()
         .filter(|def| def.visitable())
         .map(|def| match &def {
             TypeDef::Enum(it) => derive_enum(it),

tasks/ast_codegen/src/generators/mod.rs

@@ -38,8 +38,6 @@ macro_rules! generated_header {
     }};
 }
 
-use std::path::PathBuf;
-
 pub(crate) use generated_header;
 pub(crate) use insert;
 
@@ -48,101 +46,27 @@ pub use ast_builder::AstBuilderGenerator;
 pub use ast_kind::AstKindGenerator;
 pub use derive_clone_in::DeriveCloneIn;
 pub use derive_get_span::{DeriveGetSpan, DeriveGetSpanMut};
-use proc_macro2::TokenStream;
 pub use visit::{VisitGenerator, VisitMutGenerator};
 
-use crate::codegen::LateCtx;
+use crate::{GeneratorOutput, LateCtx};
 
 pub trait Generator {
     fn name(&self) -> &'static str;
     fn generate(&mut self, ctx: &LateCtx) -> GeneratorOutput;
 }
 
-pub type GeneratedTokenStream = (/* output path */ PathBuf, TokenStream);
-pub type GeneratedDataStream = (/* output path */ PathBuf, Vec<u8>);
-
-// TODO: remove me
-#[allow(dead_code)]
-#[derive(Debug, Clone)]
-pub enum GeneratorOutput {
-    None,
-    Info(Vec<u8>),
-    Data(GeneratedDataStream),
-    Stream(GeneratedTokenStream),
-}
-
-// TODO: remove me
-#[allow(dead_code)]
-impl GeneratorOutput {
-    pub fn is_none(&self) -> bool {
-        matches!(self, Self::None)
-    }
-
-    pub fn expect_none(&self) {
-        assert!(self.is_none());
-    }
-
-    pub fn to_info(&self) -> &[u8] {
-        if let Self::Info(it) = self {
-            it
-        } else {
-            panic!();
-        }
-    }
-
-    pub fn to_data(&self) -> &GeneratedDataStream {
-        if let Self::Data(it) = self {
-            it
-        } else {
-            panic!();
-        }
-    }
-
-    pub fn to_stream(&self) -> &GeneratedTokenStream {
-        if let Self::Stream(it) = self {
-            it
-        } else {
-            panic!();
-        }
-    }
-
-    pub fn into_info(self) -> Vec<u8> {
-        if let Self::Info(it) = self {
-            it
-        } else {
-            panic!();
-        }
-    }
-
-    pub fn into_data(self) -> GeneratedDataStream {
-        if let Self::Data(it) = self {
-            it
-        } else {
-            panic!();
-        }
-    }
-
-    pub fn into_stream(self) -> GeneratedTokenStream {
-        if let Self::Stream(it) = self {
-            it
-        } else {
-            panic!();
-        }
-    }
-}
-
 macro_rules! define_generator {
     ($vis:vis struct $ident:ident $($lifetime:lifetime)? $($rest:tt)*) => {
         $vis struct $ident $($lifetime)? $($rest)*
-        impl $($lifetime)? $crate::codegen::Runner for $ident $($lifetime)? {
-            type Context = $crate::codegen::LateCtx;
+        impl $($lifetime)? $crate::Runner for $ident $($lifetime)? {
+            type Context = $crate::LateCtx;
             type Output = $crate::GeneratorOutput;
 
             fn name(&self) -> &'static str {
                 $crate::Generator::name(self)
             }
 
-            fn run(&mut self, ctx: &$crate::codegen::LateCtx) -> $crate::Result<Self::Output> {
+            fn run(&mut self, ctx: &$crate::LateCtx) -> $crate::Result<Self::Output> {
                 Ok(self.generate(ctx))
             }
         }