From a2e9e8647daa2622cf55a047c329027fcfc49bf8 Mon Sep 17 00:00:00 2001 From: Jonas Maier Date: Sat, 6 Jun 2026 12:34:22 +0200 Subject: some small opt --- src/regex/bc.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/regex/bc.rs') diff --git a/src/regex/bc.rs b/src/regex/bc.rs index 4a79485..6e55c7d 100644 --- a/src/regex/bc.rs +++ b/src/regex/bc.rs @@ -1,7 +1,7 @@ use std::collections::{HashMap, VecDeque}; use super::{ - CharacterClass, GreedyBehavior, LookDirection, LookPolarity, Match, Pattern, RegexEngine, + Class, GreedyBehavior, LookDirection, LookPolarity, Match, Pattern, RegexEngine, byte_range::ByteRange, }; use crate::bitset::BitSet; @@ -93,7 +93,7 @@ struct Assertion { #[derive(Copy, Clone, Debug)] enum Instr { - Class(CharacterClass), + Class(Class), Consume(ByteRange), Jump(JumpTarget), Fork(JumpTarget, JumpTarget), @@ -528,7 +528,7 @@ impl<'a, F: Flavor> Compiler<'a, F> { let begin = self.instrs.len() as JumpTarget; self.compile(pat.clone())?; let end = self.instrs.len() as JumpTarget; - self.instrs.push(Instr::Class(CharacterClass::Nothing)); + self.instrs.push(Instr::Class(Class::Nothing)); let bounds = CompiledSnippet { begin, end }; self.map.insert(pat, bounds); Ok(bounds) @@ -539,7 +539,7 @@ impl<'a, F: Flavor> Compiler<'a, F> { let fork_begin = self.instrs.len() as JumpTarget; match fork_targets.len() { 0 => { - self.instrs[self.assertion_fork_base] = Instr::Class(CharacterClass::Nothing); + self.instrs[self.assertion_fork_base] = Instr::Class(Class::Nothing); } 1 => { self.instrs[self.assertion_fork_base] = Instr::Jump(fork_targets[0]); @@ -566,7 +566,7 @@ impl<'a, F: Flavor> Compiler<'a, F> { fn assertion_compiler() -> Compiler<'static, AssertionFlavor> { let mut c = Compiler::new(|_, _, _| Err(RegexCompilationError::NestedLookaroundNotSupported)); c.rep_any_amt( - Pattern::CharacterClass(CharacterClass::Everything), + Pattern::CharacterClass(Class::Everything), GreedyBehavior::NonGreedy, ) .expect("characterclass should always compile"); @@ -604,7 +604,7 @@ impl TryFrom for BytecodeCompiledRegex { }); main.compile(value)?; let end = main.instrs.len(); - main.instrs.push(Instr::Class(CharacterClass::Nothing)); + main.instrs.push(Instr::Class(Class::Nothing)); (end, main.instrs, main.submatch_count) }; neg.finalize_assertion_forks(); -- cgit v1.2.3