Skip to content

Enhance pattern tokenizer with multi-charset support #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreiverse merged 1 commit into from
Apr 2, 2025
Merged

Enhance pattern tokenizer with multi-charset support #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions src/patterns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ pub fn tokenize_format_string(input: &str) -> Vec<Token> {
for character in input.chars() {
if character == '{' && !inside_repeat {
inside_repeat = !inside_repeat;
result.push(Token::String(cur.clone()));
cur.clear();
if !cur.is_empty() {
result.push(Token::String(cur.clone()));
cur.clear();
}
} else if character == '}' {
inside_repeat = !inside_repeat;
let inside_len = cur.chars().collect::<Vec<char>>().len();
Expand All @@ -46,31 +48,43 @@ pub fn tokenize_format_string(input: &str) -> Vec<Token> {
end_num.parse::<u32>().unwrap(),
0,
))
} else if inside_len > 2 {
} else if inside_len > 2 && cur.contains('-') {
let ch_start = cur.chars().next().unwrap();
let ch_end = cur.chars().nth(2).unwrap();
result.push(Token::Repeat(
ch_start as u32,
ch_end as u32,
ch_start as u32,
));
} else if inside_len == 1 {
result.push(match cur.chars().next().unwrap() {
'l' => Token::CharSet(char_sets::L_CH.to_owned(), 0),
'u' => Token::CharSet(char_sets::U_CH.to_owned(), 0),
'd' => Token::CharSet(char_sets::D_CH.to_owned(), 0),
's' => Token::CharSet(char_sets::S_CH.to_owned(), 0),
_ => Token::String(String::from("")),
})
} else {
// Combine character sets for multi-charset tokens
let mut combined_charset = String::new();
for ch in cur.chars() {
match ch {
'l' => combined_charset.push_str(char_sets::L_CH),
'u' => combined_charset.push_str(char_sets::U_CH),
'd' => combined_charset.push_str(char_sets::D_CH),
's' => combined_charset.push_str(char_sets::S_CH),
_ => {} // Ignore unsupported characters
}
}

if !combined_charset.is_empty() {
result.push(Token::CharSet(combined_charset, 0));
} else if !cur.is_empty() {
// Fallback if no valid charsets found
result.push(Token::String(cur.clone()));
}
}
cur.clear();
} else {
cur.push(character)
};
}

result.push(Token::String(cur.clone()));
cur.clear();
if !cur.is_empty() {
result.push(Token::String(cur));
}

// for token in &result{ println!("(debug) tokenized: {}", token) }

Expand Down