Skip to content

tr: lazily generate the character mapping as necessary #6092

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
merged 2 commits into from
Mar 18, 2024
Merged

tr: lazily generate the character mapping as necessary #6092

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4712015
tr: lazily generate the character mapping as necessary
Krysztal112233 Mar 18, 2024
05731d1
tr: remove fixed todo
cakebaker Mar 18, 2024
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
3 changes: 1 addition & 2 deletions src/uu/tr/src/operation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,17 @@ impl Sequence {
}

// Hide all the nasty sh*t in here
// TODO: Make the 2 set lazily generate the character mapping as necessary.
pub fn solve_set_characters(
set1_str: &[u8],
set2_str: &[u8],
truncate_set1_flag: bool,
) -> Result<(Vec<u8>, Vec<u8>), BadSequence> {
let set1 = Self::from_str(set1_str)?;
let set2 = Self::from_str(set2_str)?;

let is_char_star = |s: &&Self| -> bool { matches!(s, Self::CharStar(_)) };
let set1_star_count = set1.iter().filter(is_char_star).count();
if set1_star_count == 0 {
let set2 = Self::from_str(set2_str)?;
let set2_star_count = set2.iter().filter(is_char_star).count();
if set2_star_count < 2 {
let char_star = set2.iter().find_map(|s| match s {
Expand Down