From 21f216af8cc055f3640ef23ea14cb400672de24b Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Thu, 28 May 2026 15:17:26 +0200
Subject: [PATCH] yeast-macros: omit empty fields produced by .. splice

When a {..expr} splice in an output template is empty (e.g. from an
optional capture that did not match), drop the field entirely rather
than emitting an empty named field. This lets a single rule with
optional captures replace what used to be two near-identical rules.

Also re-renders the corpus to drop the now-suppressed empty fields.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 shared/yeast-macros/src/parse.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/shared/yeast-macros/src/parse.rs b/shared/yeast-macros/src/parse.rs
index e623c708726..eb3b161b295 100644
--- a/shared/yeast-macros/src/parse.rs
+++ b/shared/yeast-macros/src/parse.rs
@@ -437,7 +437,11 @@ fn parse_direct_node_inner(tokens: &mut Tokens, ctx: &Ident) -> Result<TokenStre
                             .map(::std::convert::Into::<usize>::into)
                             .collect();
                     });
-                    field_args.push(quote! { (#field_str, #temp) });
+                    // An empty splice means the field is absent — skip it
+                    // entirely rather than emitting an empty named field.
+                    field_args.push(quote! {
+                        if !#temp.is_empty() { __fields.push((#field_str, #temp)); }
+                    });
                     continue;
                 }
             }
@@ -445,7 +449,7 @@ fn parse_direct_node_inner(tokens: &mut Tokens, ctx: &Ident) -> Result<TokenStre
 
         let value = parse_direct_node(tokens, ctx)?;
         stmts.push(quote! { let #temp: usize = #value; });
-        field_args.push(quote! { (#field_str, vec![#temp]) });
+        field_args.push(quote! { __fields.push((#field_str, vec![#temp])); });
     }
 
     // After all named fields, no other tokens are allowed.
@@ -461,7 +465,9 @@ fn parse_direct_node_inner(tokens: &mut Tokens, ctx: &Ident) -> Result<TokenStre
     Ok(quote! {
         {
             #(#stmts)*
-            #ctx.node(#kind_str, vec![#(#field_args),*])
+            let mut __fields: Vec<(&str, Vec<usize>)> = Vec::new();
+            #(#field_args)*
+            #ctx.node(#kind_str, __fields)
         }
     })
 }