Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 09:48:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

tr: add truncate flag

Browse source
This commit is contained in:
shutefan 2017-10-06 00:20:41 +02:00
parent 618531b366
commit ddbfafa684
2 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/tr/tr.rs
View file

@ -116,13 +116,18 @@ struct TranslateOperation {
}
impl TranslateOperation {
fn new(set1: ExpandSet, set2: &mut ExpandSet) -> TranslateOperation {
fn new(set1: ExpandSet, set2: &mut ExpandSet, truncate: bool) -> TranslateOperation {
let mut map = FnvHashMap::default();
let mut s2_prev = '_';
for i in set1 {
s2_prev = set2.next().unwrap_or(s2_prev);
let s2_next = set2.next();
map.insert(i as usize, s2_prev);
if s2_next.is_none() && truncate {
map.insert(i as usize, i);
} else {
s2_prev = s2_next.unwrap_or(s2_prev);
map.insert(i as usize, s2_prev);
}
}
TranslateOperation {
translate_map: map,
@ -177,6 +182,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
opts.optflag("d", "delete", "delete characters in SET1");
opts.optflag("h", "help", "display this help and exit");
opts.optflag("s", "squeeze", "replace each sequence of a repeated character that is listed in the last specified SET, with a single occurrence of that character");
opts.optflag("t", "truncate-set1", "first truncate SET1 to length of SET2");
opts.optflag("V", "version", "output version information and exit");
let matches = match opts.parse(&args[1..]) {
@ -205,6 +211,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
let dflag = matches.opt_present("d");
let cflag = matches.opts_present(&["c".to_owned(), "C".to_owned()]);
let sflag = matches.opt_present("s");
let tflag = matches.opt_present("t");
let sets = matches.free;
if cflag && !dflag && !sflag {
@ -233,7 +240,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
translate_input(&mut locked_stdin, &mut buffered_stdout, op);
} else {
let mut set2 = ExpandSet::new(sets[1].as_ref());
let op = TranslateOperation::new(set1, &mut set2);
let op = TranslateOperation::new(set1, &mut set2, tflag);
translate_input(&mut locked_stdin, &mut buffered_stdout, op)
}

24
tests/test_tr.rs
View file

@ -57,3 +57,27 @@ fn test_delete_and_squeeze_complement() {
new_ucmd!()
.args(&["-dsc", "a-z", "A-Z"]).pipe_in("abBcB").run().stdout_is("abc");
}
#[test]
fn test_set1_longer_than_set2() {
new_ucmd!()
.args(&["abc", "xy"]).pipe_in("abcde").run().stdout_is("xyyde");
}
#[test]
fn test_set1_shorter_than_set2() {
new_ucmd!()
.args(&["ab", "xyz"]).pipe_in("abcde").run().stdout_is("xycde");
}
#[test]
fn test_truncate() {
new_ucmd!()
.args(&["-t", "abc", "xy"]).pipe_in("abcde").run().stdout_is("xycde");
}
#[test]
fn test_truncate_with_set1_shorter_than_set2() {
new_ucmd!()
.args(&["-t", "ab", "xyz"]).pipe_in("abcde").run().stdout_is("xycde");
}