From 2c11db2d285eccecba3ed7a3cc8a864249e698f1 Mon Sep 17 00:00:00 2001 From: ika4422 Date: Mon, 13 Apr 2026 08:46:12 +0100 Subject: [PATCH] implemented count for pattern generation tokens --- src/pattern_gen.rs | 51 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/src/pattern_gen.rs b/src/pattern_gen.rs index efe42d3..b8e6dd4 100644 --- a/src/pattern_gen.rs +++ b/src/pattern_gen.rs @@ -29,15 +29,12 @@ Pattern Tokens: X hex mixed (0-9, a-f, A-F) * any other character is used literally"; -fn pick(rng: &mut impl rand::Rng, pool: &[u8]) -> char { - pool[rng.random_range(0..pool.len())] as char -} - pub fn generate_from_pattern(pattern: &str) -> String { let mut rng = rand::rng(); - let mut output = String::with_capacity(pattern.len()); + let tokens = parse_pattern(pattern); + let mut output = String::with_capacity(tokens.iter().map(|(_, n)| n).sum()); - for c in pattern.chars() { + for (c, count) in tokens { let pool = match c { 'n' => Some(DIGITS), 'l' => Some(LETTERS_LOWER), @@ -54,10 +51,44 @@ pub fn generate_from_pattern(pattern: &str) -> String { _ => None, }; - output.push(match pool { - Some(p) => pick(&mut rng, p), - None => c, - }); + for _ in 0..count { + output.push(match pool { + Some(p) => pick(&mut rng, p), + None => c, + }); + } } output } + +fn pick(rng: &mut impl rand::Rng, pool: &[u8]) -> char { + pool[rng.random_range(0..pool.len())] as char +} + +fn parse_pattern(pattern: &str) -> Vec<(char, usize)> { + let mut tokens = Vec::new(); + let mut chars = pattern.chars().peekable(); + + while let Some(c) = chars.next() { + if chars.peek() == Some(&'{') { + chars.next(); + + let digits: String = chars.by_ref().take_while(|&x| x != '}').collect(); + + match digits.parse::() { + Ok(n) if n > 0 => tokens.push((c, n)), + _ => { + tokens.push((c, 1)); + + for d in digits.chars() { + tokens.push((d, 1)); + } + } + } + } else { + tokens.push((c, 1)); + } + } + + tokens +}