From 3f549690c12f47e2bfbe2788376f1294a31662a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Mon, 9 Mar 2026 16:21:23 +0100
Subject: [PATCH] Fix combinatorial explosion on backtracking broken if chains
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
---
 src/ast/mod.rs         |   4 ++--
 tests/checks/long.nomo | Bin 0 -> 423 bytes
 tests/file_tests.rs    |   8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 tests/checks/long.nomo

diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index c39dd0e..04a7e5d 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -346,7 +346,7 @@ fn parse_conditional_chain<'input>(
         chain.push(if_block);
 
         let content = resume_after_cut(
-            inner_conditional_chain,
+            cut_err(inner_conditional_chain),
             repeat_till(0.., any, parse_end).map(|((), _)| ()),
         )
         .parse_next(input)?;
@@ -387,7 +387,7 @@ fn inner_conditional_chain<'input>(
         };
 
         if !is_end && needs_end {
-            return Err(AstError::from_input(input).cut());
+            return Err(AstError::from_input(input));
         }
 
         if let TemplateAstExpr::Block { expression, .. } = &end_block
diff --git a/tests/checks/long.nomo b/tests/checks/long.nomo
new file mode 100644
index 0000000000000000000000000000000000000000..b2b5c2c048c76206a8bcc661d48d33e194f8ba52
GIT binary patch
literal 423
zcmb=f<<iyF<*HWTQczGTQ7u*~QHZxvNJ~`6Oj9UHEiQ?z<x;4w2Jy;LYinzDb#>(+
z+>+E1GYpW5s-n20wl<ZuxTIEB*UZcew<O%mT#$~$oZ=F&9ksREx=0pcljH&`RDc)_
z<&;2pV0VJN0C9s7*k4=<5O0=1xI}pq$v8-ufD8oNTU)CQ_8eaKLtO<i1<FBjB9wz9
Q#Q+9e3XEWyflHwl0JV374*&oF

literal 0
HcmV?d00001

diff --git a/tests/file_tests.rs b/tests/file_tests.rs
index 85049e8..3acb9ab 100644
--- a/tests/file_tests.rs
+++ b/tests/file_tests.rs
@@ -31,7 +31,13 @@ fn check_cases() {
 
         insta::assert_debug_snapshot!("1-parsed", parsed);
 
-        let ast = nomo::ast::parse(parsed.tokens()).unwrap();
+        let ast = match nomo::ast::parse(parsed.tokens()) {
+            Ok(ast) => ast,
+            Err(err) => {
+                eprintln!("{}", err.to_report(input));
+                panic!("Could not evaluate ast");
+            }
+        };
 
         insta::assert_debug_snapshot!("2-ast", ast);