From de021789c1cc5e010ca7ef79451eea3ca5132d61 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Tue, 23 Sep 2025 10:19:28 -0500
Subject: [PATCH] Refactor production build fn.

---
 .../src/build_fn/production_build_fn.rs       | 20 ++++++-------------
 ast-generator/src/spec/production_spec.rs     |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ast-generator/src/build_fn/production_build_fn.rs b/ast-generator/src/build_fn/production_build_fn.rs
index a9472af..4bd4b78 100644
--- a/ast-generator/src/build_fn/production_build_fn.rs
+++ b/ast-generator/src/build_fn/production_build_fn.rs
@@ -1,19 +1,18 @@
-use crate::spec::{ProductionBuildSpec, ProductionKind, ProductionStringFrom};
-use crate::util::{make_build_fn_name, make_build_pair};
+use crate::deserialize::util::{make_build_fn_name, make_build_pair};
+use crate::spec::production_spec::{ProductionBuildSpec, ProductionKind, ProductionStringFrom};
 use proc_macro2::TokenStream;
 use quote::{format_ident, quote};
 
 pub fn make_production_build_fn(production_build_spec: &ProductionBuildSpec) -> TokenStream {
-    let build_fn_ident = format_ident!("{}", make_build_fn_name(production_build_spec.rule()));
+    let build_fn_ident = format_ident!("{}", make_build_fn_name(production_build_spec.name()));
     let return_type_ident = match production_build_spec.kind() {
         ProductionKind::Int => format_ident!("i32"),
         ProductionKind::Long => format_ident!("i64"),
         ProductionKind::Double => format_ident!("f64"),
         ProductionKind::String(_) => format_ident!("String"),
-        ProductionKind::Boolean => format_ident!("bool"),
-        ProductionKind::Node(node_type) => format_ident!("{}", node_type.kind()),
+        ProductionKind::Boolean(_) => format_ident!("bool"),
     };
-    let pair_ident = format_ident!("{}", make_build_pair(production_build_spec.rule()));
+    let pair_ident = format_ident!("{}", make_build_pair(production_build_spec.name()));
 
     let pair_mapper = match production_build_spec.kind() {
         ProductionKind::Int => quote! {
@@ -75,16 +74,9 @@ pub fn make_production_build_fn(production_build_spec: &ProductionBuildSpec) ->
                 }
             }
         },
-        ProductionKind::Boolean => quote! {
+        ProductionKind::Boolean(_) => quote! {
             #pair_ident.as_str().parse::<bool>().unwrap()
         },
-        ProductionKind::Node(node_kind) => {
-            let build_fn_ident = format_ident!("{}", make_build_fn_name(node_kind.with()));
-            quote! {
-                let inner_pair = #pair_ident.into_inner().next().unwrap();
-                #build_fn_ident(inner_pair)
-            }
-        }
     };
 
     quote! {
diff --git a/ast-generator/src/spec/production_spec.rs b/ast-generator/src/spec/production_spec.rs
index 31714be..c2afecf 100644
--- a/ast-generator/src/spec/production_spec.rs
+++ b/ast-generator/src/spec/production_spec.rs
@@ -11,7 +11,7 @@ impl ProductionBuildSpec {
         }
     }
 
-    pub fn rule(&self) -> &str {
+    pub fn name(&self) -> &str {
         &self.name
     }