From d7b01377d7e7e32b65864824c9b1ef14d03c8452 Mon Sep 17 00:00:00 2001 From: Jesse Brault Date: Tue, 23 Sep 2025 10:25:52 -0500 Subject: [PATCH] Refactor polymorphic type build fn. --- ast-generator/src/build_fn/mod.rs | 2 +- ...lymorphic_build_fn.rs => polymorphic_type_build_fn.rs} | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename ast-generator/src/build_fn/{polymorphic_build_fn.rs => polymorphic_type_build_fn.rs} (69%) diff --git a/ast-generator/src/build_fn/mod.rs b/ast-generator/src/build_fn/mod.rs index 2566732..afbff1f 100644 --- a/ast-generator/src/build_fn/mod.rs +++ b/ast-generator/src/build_fn/mod.rs @@ -2,8 +2,8 @@ pub mod leaf_enum_build_fn; pub mod leaf_struct_build_fn; mod node_production_build_fn; pub mod polymorphic_build_build_fn; -pub mod polymorphic_build_fn; pub mod polymorphic_enum_build_fn; +pub mod polymorphic_type_build_fn; pub mod production_build_fn; pub mod struct_build_fn; pub mod tree_enum_build_fn; diff --git a/ast-generator/src/build_fn/polymorphic_build_fn.rs b/ast-generator/src/build_fn/polymorphic_type_build_fn.rs similarity index 69% rename from ast-generator/src/build_fn/polymorphic_build_fn.rs rename to ast-generator/src/build_fn/polymorphic_type_build_fn.rs index ebe326d..1702fac 100644 --- a/ast-generator/src/build_fn/polymorphic_build_fn.rs +++ b/ast-generator/src/build_fn/polymorphic_type_build_fn.rs @@ -1,13 +1,13 @@ -use crate::spec::PolymorphicTypeBuildSpec; -use crate::util::{make_build_fn_name, make_build_pair}; +use crate::deserialize::util::{make_build_fn_name, make_build_pair}; +use crate::spec::polymorphic_type_spec::PolymorphicTypeBuildSpec; use proc_macro2::TokenStream; use quote::{format_ident, quote}; -pub fn make_polymorphic_build_fn(build_spec: &PolymorphicTypeBuildSpec) -> TokenStream { +pub fn make_polymorphic_type_build_fn(build_spec: &PolymorphicTypeBuildSpec) -> TokenStream { let build_fn_ident = format_ident!("{}", make_build_fn_name(build_spec.name())); let pair_ident = format_ident!("{}", make_build_pair(&build_spec.name())); let return_type_ident = format_ident!("{}", build_spec.name()); - let inner_build_fn_ident = format_ident!("{}", make_build_fn_name(build_spec.build_kind())); + let inner_build_fn_ident = format_ident!("{}", make_build_fn_name(build_spec.kind())); quote! { fn #build_fn_ident(#pair_ident: Pair) -> #return_type_ident {