diff --git a/src/main.rs b/src/main.rs index 80143b4..00b26aa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -83,29 +83,39 @@ fn main() { } if let Some(pattern) = args.generate { - for _ in 0..args.count { + let mut generated_count = 0; + + while generated_count < args.count { let generated = generate_from_pattern(&pattern); if args.no_doll { println!("{}", generated); - } else { - let as_num = if args.text { - None - } else { - BigUint::parse_bytes(generated.as_bytes(), args.base) - }; + generated_count += 1; + continue; + } - match as_num { - Some(num) => { - println!("{} :: {}", generated, to_dollcode(num).unwrap()); - } - None => { - let doll: Vec = generated - .chars() - .map(|c| to_dollcode(BigUint::from(c as u64)).unwrap()) - .collect(); - println!("{} :: {}", generated, doll.join(" ")); + let num = if args.text { + None + } else { + BigUint::parse_bytes(generated.as_bytes(), args.base) + }; + + match num { + Some(num) => match to_dollcode(num) { + Ok(code) => { + println!("{} :: {}", generated, code); + generated_count += 1; } + Err(_) => continue, + }, + None => { + let doll: Vec = generated + .chars() + .map(|c| to_dollcode(BigUint::from(c as u64)).unwrap()) + .collect(); + + println!("{} :: {}", generated, doll.join(" ")); + generated_count += 1; } } }