From d39ed8fc77981f937c35fa84a7ff5d288d0c7181 Mon Sep 17 00:00:00 2001 From: Jonas Maier Date: Sat, 6 Jun 2026 13:45:54 +0200 Subject: clean up --- src/regex/simple.rs | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'src/regex/simple.rs') diff --git a/src/regex/simple.rs b/src/regex/simple.rs index e75ff14..4286322 100644 --- a/src/regex/simple.rs +++ b/src/regex/simple.rs @@ -8,6 +8,7 @@ fn empty_match() -> Option { }) } +#[derive(Debug)] pub struct Anything; #[derive(Debug, Clone)] @@ -17,12 +18,19 @@ impl RegexEngine for Anything { type CompileError = NotASimpleWildcard; fn compile(pat: Pattern) -> Result { - if let Pattern::Rep(pat, 0, None, _) = pat - && let Pattern::CharacterClass(Class::Everything) = *pat - { - Ok(Anything) - } else { - Err(NotASimpleWildcard) + match pat { + Pattern::Rep(pat, 0, None, _) => match *pat { + Pattern::CharacterClass(Class::Everything) => Ok(Anything), + _ => Err(NotASimpleWildcard), + }, + Pattern::Concat(pats) | Pattern::Alt(pats) => { + if !pats.is_empty() && pats.into_iter().all(|p| Anything::compile(p).is_ok()) { + Ok(Anything) + } else { + Err(NotASimpleWildcard) + } + } + _ => Err(NotASimpleWildcard), } } @@ -31,6 +39,7 @@ impl RegexEngine for Anything { } } +#[derive(Debug)] pub struct Nothing; #[derive(Debug, Clone)] pub struct NotASimpleNothing; @@ -70,8 +79,9 @@ impl RegexEngine for Nothing { } } +#[derive(Debug)] pub struct Exact { - bytes: Vec, + pub bytes: Vec, } const MEM_LIMIT: usize = 25_000; -- cgit v1.2.3