From 705c6a8818f493edd20b46a406e382bc662e98ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Sun, 15 Mar 2026 11:33:40 +0100 Subject: [PATCH] Rename ast to parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Müller --- benches/asting.rs | 4 ++-- fuzz/fuzz_targets/fuzz_target_1.rs | 2 +- src/emit/mod.rs | 10 +++++----- src/eval/mod.rs | 4 ++-- src/lib.rs | 6 +++--- src/{ast => parser}/mod.rs | 14 +++++++------- .../nomo__parser__tests__check_for_loop.snap} | 2 +- .../nomo__parser__tests__check_function_call.snap} | 2 +- .../nomo__parser__tests__check_if_else.snap} | 2 +- .../nomo__parser__tests__check_if_else_if.snap} | 2 +- ...nomo__parser__tests__check_invalid_action.snap} | 2 +- ...__parser__tests__check_logical_expression.snap} | 2 +- ...omo__parser__tests__check_math_expression.snap} | 2 +- ...omo__parser__tests__check_trim_whitespace.snap} | 2 +- .../nomo__parser__tests__simple_if_ast.snap} | 2 +- .../nomo__parser__tests__simple_if_tokens.snap} | 2 +- tests/checks.rs | 2 +- tests/file_tests.rs | 2 +- 18 files changed, 32 insertions(+), 32 deletions(-) rename src/{ast => parser}/mod.rs (99%) rename src/{ast/snapshots/nomo__ast__tests__check_for_loop.snap => parser/snapshots/nomo__parser__tests__check_for_loop.snap} (98%) rename src/{ast/snapshots/nomo__ast__tests__check_function_call.snap => parser/snapshots/nomo__parser__tests__check_function_call.snap} (98%) rename src/{ast/snapshots/nomo__ast__tests__check_if_else.snap => parser/snapshots/nomo__parser__tests__check_if_else.snap} (98%) rename src/{ast/snapshots/nomo__ast__tests__check_if_else_if.snap => parser/snapshots/nomo__parser__tests__check_if_else_if.snap} (98%) rename src/{ast/snapshots/nomo__ast__tests__check_invalid_action.snap => parser/snapshots/nomo__parser__tests__check_invalid_action.snap} (98%) rename src/{ast/snapshots/nomo__ast__tests__check_logical_expression.snap => parser/snapshots/nomo__parser__tests__check_logical_expression.snap} (98%) rename src/{ast/snapshots/nomo__ast__tests__check_math_expression.snap => parser/snapshots/nomo__parser__tests__check_math_expression.snap} (98%) rename src/{ast/snapshots/nomo__ast__tests__check_trim_whitespace.snap => parser/snapshots/nomo__parser__tests__check_trim_whitespace.snap} (98%) rename src/{ast/snapshots/nomo__ast__tests__simple_if_ast.snap => parser/snapshots/nomo__parser__tests__simple_if_ast.snap} (99%) rename src/{ast/snapshots/nomo__ast__tests__simple_if_tokens.snap => parser/snapshots/nomo__parser__tests__simple_if_tokens.snap} (98%) diff --git a/benches/asting.rs b/benches/asting.rs index 800942b..3e8d755 100644 --- a/benches/asting.rs +++ b/benches/asting.rs @@ -20,7 +20,7 @@ fn asting_benchmark(c: &mut Criterion) { parsing.bench_with_input(BenchmarkId::from_parameter(size), &input, |b, input| { b.iter(|| { let tokens = nomo::lexer::parse(input.clone()).unwrap(); - let _ast = nomo::ast::parse(tokens.tokens()).unwrap(); + let _ast = nomo::parser::parse(tokens.tokens()).unwrap(); }); }); } @@ -44,7 +44,7 @@ fn asting_nested(c: &mut Criterion) { parsing.bench_with_input(BenchmarkId::from_parameter(size), &input, |b, input| { b.iter(|| { let tokens = nomo::lexer::parse(input.clone()).unwrap(); - let _ast = nomo::ast::parse(tokens.tokens()).unwrap(); + let _ast = nomo::parser::parse(tokens.tokens()).unwrap(); }); }); } diff --git a/fuzz/fuzz_targets/fuzz_target_1.rs b/fuzz/fuzz_targets/fuzz_target_1.rs index ebef862..da1e6e2 100644 --- a/fuzz/fuzz_targets/fuzz_target_1.rs +++ b/fuzz/fuzz_targets/fuzz_target_1.rs @@ -8,7 +8,7 @@ fuzz_target!(|data: String| -> Corpus { return Corpus::Reject; }; - let Ok(ast) = nomo::ast::parse(parsed.tokens()) else { + let Ok(ast) = nomo::parser::parse(parsed.tokens()) else { return Corpus::Keep; }; diff --git a/src/emit/mod.rs b/src/emit/mod.rs index 9d1fdd9..cf33cfa 100644 --- a/src/emit/mod.rs +++ b/src/emit/mod.rs @@ -1,6 +1,6 @@ use std::collections::BTreeMap; -use crate::ast::TemplateAstExpr; +use crate::parser::TemplateAstExpr; use crate::input::NomoInput; use crate::lexer::TemplateToken; use crate::lexer::TokenOperator; @@ -115,7 +115,7 @@ pub struct VMInstructions { pub instructions: Vec, } -pub fn emit_machine(input: crate::ast::TemplateAst<'_>) -> VMInstructions { +pub fn emit_machine(input: crate::parser::TemplateAst<'_>) -> VMInstructions { let mut eval = vec![]; let mut machine = EmitMachine { @@ -502,7 +502,7 @@ mod tests { let parsed = crate::lexer::parse(input.into()).unwrap(); - let ast = crate::ast::parse(parsed.tokens()).unwrap(); + let ast = crate::parser::parse(parsed.tokens()).unwrap(); let emit = emit_machine(ast); @@ -538,7 +538,7 @@ mod tests { let parsed = crate::lexer::parse(input.into()).unwrap(); - let ast = crate::ast::parse(parsed.tokens()).unwrap(); + let ast = crate::parser::parse(parsed.tokens()).unwrap(); let emit = emit_machine(ast); @@ -551,7 +551,7 @@ mod tests { let parsed = crate::lexer::parse(input.into()).unwrap(); - let ast = crate::ast::parse(parsed.tokens()).unwrap(); + let ast = crate::parser::parse(parsed.tokens()).unwrap(); let emit = emit_machine(ast); diff --git a/src/eval/mod.rs b/src/eval/mod.rs index ee8bfc7..e0d864b 100644 --- a/src/eval/mod.rs +++ b/src/eval/mod.rs @@ -245,7 +245,7 @@ mod tests { let parsed = crate::lexer::parse(input.into()).unwrap(); - let ast = crate::ast::parse(parsed.tokens()).unwrap(); + let ast = crate::parser::parse(parsed.tokens()).unwrap(); let emit = crate::emit::emit_machine(ast); @@ -266,7 +266,7 @@ mod tests { let parsed = crate::lexer::parse(input.into()).unwrap(); - let ast = crate::ast::parse(parsed.tokens()).unwrap(); + let ast = crate::parser::parse(parsed.tokens()).unwrap(); let emit = crate::emit::emit_machine(ast); diff --git a/src/lib.rs b/src/lib.rs index 7c7ad86..fbe8ecf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,7 +9,7 @@ use crate::input::NomoInput; use crate::value::NomoValue; use crate::value::NomoValueError; -pub mod ast; +pub mod parser; pub mod emit; pub mod eval; pub mod functions; @@ -27,7 +27,7 @@ pub enum NomoError { /// Invalid Template AstError { #[from] - source: ast::AstFailure, + source: parser::AstFailure, }, /// An error occurred while evaluating @@ -66,7 +66,7 @@ impl Nomo { ) -> Result<(), NomoError> { let source = value.into(); let parse = lexer::parse(source.clone())?; - let ast = ast::parse(parse.tokens())?; + let ast = parser::parse(parse.tokens())?; let instructions = emit::emit_machine(ast); diff --git a/src/ast/mod.rs b/src/parser/mod.rs similarity index 99% rename from src/ast/mod.rs rename to src/parser/mod.rs index bdf3044..ed4456f 100644 --- a/src/ast/mod.rs +++ b/src/parser/mod.rs @@ -737,13 +737,13 @@ mod tests { use winnow::combinator::fail; use winnow::stream::TokenSlice; - use crate::ast::AstError; - use crate::ast::AstFailure; - use crate::ast::TemplateAst; - use crate::ast::TemplateAstExpr; - use crate::ast::parse; - use crate::ast::parse_block; - use crate::ast::parse_end; + use crate::parser::AstError; + use crate::parser::AstFailure; + use crate::parser::TemplateAst; + use crate::parser::TemplateAstExpr; + use crate::parser::parse; + use crate::parser::parse_block; + use crate::parser::parse_end; use crate::lexer::TokenKind; fn panic_pretty<'a>( diff --git a/src/ast/snapshots/nomo__ast__tests__check_for_loop.snap b/src/parser/snapshots/nomo__parser__tests__check_for_loop.snap similarity index 98% rename from src/ast/snapshots/nomo__ast__tests__check_for_loop.snap rename to src/parser/snapshots/nomo__parser__tests__check_for_loop.snap index 737e2c0..521c5fb 100644 --- a/src/ast/snapshots/nomo__ast__tests__check_for_loop.snap +++ b/src/parser/snapshots/nomo__parser__tests__check_for_loop.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: ast --- TemplateAst { diff --git a/src/ast/snapshots/nomo__ast__tests__check_function_call.snap b/src/parser/snapshots/nomo__parser__tests__check_function_call.snap similarity index 98% rename from src/ast/snapshots/nomo__ast__tests__check_function_call.snap rename to src/parser/snapshots/nomo__parser__tests__check_function_call.snap index de41088..40e920c 100644 --- a/src/ast/snapshots/nomo__ast__tests__check_function_call.snap +++ b/src/parser/snapshots/nomo__parser__tests__check_function_call.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: ast --- TemplateAst { diff --git a/src/ast/snapshots/nomo__ast__tests__check_if_else.snap b/src/parser/snapshots/nomo__parser__tests__check_if_else.snap similarity index 98% rename from src/ast/snapshots/nomo__ast__tests__check_if_else.snap rename to src/parser/snapshots/nomo__parser__tests__check_if_else.snap index 0a3b739..b989ca3 100644 --- a/src/ast/snapshots/nomo__ast__tests__check_if_else.snap +++ b/src/parser/snapshots/nomo__parser__tests__check_if_else.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: ast --- TemplateAst { diff --git a/src/ast/snapshots/nomo__ast__tests__check_if_else_if.snap b/src/parser/snapshots/nomo__parser__tests__check_if_else_if.snap similarity index 98% rename from src/ast/snapshots/nomo__ast__tests__check_if_else_if.snap rename to src/parser/snapshots/nomo__parser__tests__check_if_else_if.snap index 3912e60..0c2eef2 100644 --- a/src/ast/snapshots/nomo__ast__tests__check_if_else_if.snap +++ b/src/parser/snapshots/nomo__parser__tests__check_if_else_if.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: ast --- TemplateAst { diff --git a/src/ast/snapshots/nomo__ast__tests__check_invalid_action.snap b/src/parser/snapshots/nomo__parser__tests__check_invalid_action.snap similarity index 98% rename from src/ast/snapshots/nomo__ast__tests__check_invalid_action.snap rename to src/parser/snapshots/nomo__parser__tests__check_invalid_action.snap index c8f8f50..0587130 100644 --- a/src/ast/snapshots/nomo__ast__tests__check_invalid_action.snap +++ b/src/parser/snapshots/nomo__parser__tests__check_invalid_action.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: ast.to_report(input) --- error: Standlone action block diff --git a/src/ast/snapshots/nomo__ast__tests__check_logical_expression.snap b/src/parser/snapshots/nomo__parser__tests__check_logical_expression.snap similarity index 98% rename from src/ast/snapshots/nomo__ast__tests__check_logical_expression.snap rename to src/parser/snapshots/nomo__parser__tests__check_logical_expression.snap index e9caca2..aca365a 100644 --- a/src/ast/snapshots/nomo__ast__tests__check_logical_expression.snap +++ b/src/parser/snapshots/nomo__parser__tests__check_logical_expression.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: ast --- TemplateAst { diff --git a/src/ast/snapshots/nomo__ast__tests__check_math_expression.snap b/src/parser/snapshots/nomo__parser__tests__check_math_expression.snap similarity index 98% rename from src/ast/snapshots/nomo__ast__tests__check_math_expression.snap rename to src/parser/snapshots/nomo__parser__tests__check_math_expression.snap index 7265e0a..7ba6415 100644 --- a/src/ast/snapshots/nomo__ast__tests__check_math_expression.snap +++ b/src/parser/snapshots/nomo__parser__tests__check_math_expression.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: ast --- TemplateAst { diff --git a/src/ast/snapshots/nomo__ast__tests__check_trim_whitespace.snap b/src/parser/snapshots/nomo__parser__tests__check_trim_whitespace.snap similarity index 98% rename from src/ast/snapshots/nomo__ast__tests__check_trim_whitespace.snap rename to src/parser/snapshots/nomo__parser__tests__check_trim_whitespace.snap index bce8aa2..7308528 100644 --- a/src/ast/snapshots/nomo__ast__tests__check_trim_whitespace.snap +++ b/src/parser/snapshots/nomo__parser__tests__check_trim_whitespace.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: ast --- TemplateAst { diff --git a/src/ast/snapshots/nomo__ast__tests__simple_if_ast.snap b/src/parser/snapshots/nomo__parser__tests__simple_if_ast.snap similarity index 99% rename from src/ast/snapshots/nomo__ast__tests__simple_if_ast.snap rename to src/parser/snapshots/nomo__parser__tests__simple_if_ast.snap index 3701cc2..ef4803b 100644 --- a/src/ast/snapshots/nomo__ast__tests__simple_if_ast.snap +++ b/src/parser/snapshots/nomo__parser__tests__simple_if_ast.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: ast --- TemplateAst { diff --git a/src/ast/snapshots/nomo__ast__tests__simple_if_tokens.snap b/src/parser/snapshots/nomo__parser__tests__simple_if_tokens.snap similarity index 98% rename from src/ast/snapshots/nomo__ast__tests__simple_if_tokens.snap rename to src/parser/snapshots/nomo__parser__tests__simple_if_tokens.snap index ffc7d97..e485e6b 100644 --- a/src/ast/snapshots/nomo__ast__tests__simple_if_tokens.snap +++ b/src/parser/snapshots/nomo__parser__tests__simple_if_tokens.snap @@ -1,5 +1,5 @@ --- -source: src/ast/mod.rs +source: src/parser/mod.rs expression: parsed --- ParsedTemplate { diff --git a/tests/checks.rs b/tests/checks.rs index 893b022..98480d8 100644 --- a/tests/checks.rs +++ b/tests/checks.rs @@ -9,7 +9,7 @@ fn check_files() { continue; }; - let Ok(ast) = nomo::ast::parse(parsed.tokens()) else { + let Ok(ast) = nomo::parser::parse(parsed.tokens()) else { continue; }; diff --git a/tests/file_tests.rs b/tests/file_tests.rs index e01a8e8..6163922 100644 --- a/tests/file_tests.rs +++ b/tests/file_tests.rs @@ -45,7 +45,7 @@ fn check_for_input([path]: [&Path; 1]) { insta::assert_debug_snapshot!(format!("{basename}.1-parsed"), parsed); - let ast = match nomo::ast::parse(parsed.tokens()) { + let ast = match nomo::parser::parse(parsed.tokens()) { Ok(ast) => ast, Err(err) => { eprintln!("{}", err.to_report(input));