Re-arrange TemplateAstExpr

Signed-off-by: Marcel Müller <neikos@neikos.email>
This commit is contained in:
Marcel Müller 2026-03-11 10:36:40 +01:00
parent 018ba3cd2c
commit a099c74b1b

View file

@ -217,15 +217,20 @@ pub fn parse(input: &[TemplateToken]) -> Result<TemplateAst<'_>, AstFailure> {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum TemplateAstExpr<'input> { pub enum TemplateAstExpr<'input> {
StaticContent(TemplateToken), StaticContent(TemplateToken),
Block {
prev_whitespace_content: Option<TemplateToken>,
expression: Box<TemplateAstExpr<'input>>,
post_whitespace_content: Option<TemplateToken>,
},
Interpolation { Interpolation {
prev_whitespace_content: Option<TemplateToken>, prev_whitespace_content: Option<TemplateToken>,
expression: Box<TemplateAstExpr<'input>>, expression: Box<TemplateAstExpr<'input>>,
post_whitespace_content: Option<TemplateToken>, post_whitespace_content: Option<TemplateToken>,
}, },
VariableAccess(TemplateToken),
ConditionalChain { ConditionalChain {
chain: Vec<TemplateAstExpr<'input>>, chain: Vec<TemplateAstExpr<'input>>,
}, },
VariableAccess(TemplateToken),
IfConditional { IfConditional {
expression: Box<TemplateAstExpr<'input>>, expression: Box<TemplateAstExpr<'input>>,
}, },
@ -237,11 +242,6 @@ pub enum TemplateAstExpr<'input> {
}, },
Invalid(&'input [TemplateToken]), Invalid(&'input [TemplateToken]),
EndBlock, EndBlock,
Block {
prev_whitespace_content: Option<TemplateToken>,
expression: Box<TemplateAstExpr<'input>>,
post_whitespace_content: Option<TemplateToken>,
},
} }
fn parse_asts<'input>(input: &mut Input<'input>) -> Result<Vec<TemplateAstExpr<'input>>, AstError> { fn parse_asts<'input>(input: &mut Input<'input>) -> Result<Vec<TemplateAstExpr<'input>>, AstError> {