RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

Update traits name

Browse source 
Signed-off-by: Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com>
This commit is contained in:
Hanif Bin Ariffin 2021-07-20 15:51:33 +08:00
parent 4b45a2287c
commit 7424754725
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/uu/tr/src/operation.rs
View file

@ -45,6 +45,7 @@ impl Sequence {
Sequence::parse_upper, Sequence::parse_upper,
Sequence::parse_xdigit, Sequence::parse_xdigit,
Sequence::parse_char_equal, Sequence::parse_char_equal,
// NOTE: This must be the last one
Sequence::parse_char, Sequence::parse_char,
)), )),
)))(input) )))(input)
@ -110,6 +111,7 @@ impl Sequence {
tag("["), tag("["),
anychar, anychar,
tag("*"), tag("*"),
// TODO: Extend this to support octal as well. Octal starts with 0.
take_while1(|c: char| c.is_digit(10)), take_while1(|c: char| c.is_digit(10)),
tag("]"), tag("]"),
))(input) ))(input)
@ -440,7 +442,7 @@ impl SymbolTranslator for SqueezeOperation {
} }
} }
pub fn translate_input_new<T, R, W>(input: &mut R, output: &mut W, mut translator: T) pub fn translate_input<T, R, W>(input: &mut R, output: &mut W, mut translator: T)
where where
T: SymbolTranslator, T: SymbolTranslator,
R: BufRead, R: BufRead,

16
src/uu/tr/src/tr.rs
View file

@ -19,7 +19,7 @@ mod unicode_table;
use clap::{crate_version, App, Arg}; use clap::{crate_version, App, Arg};
use nom::AsBytes; use nom::AsBytes;
use operation::{translate_input_new, Sequence, SqueezeOperation, TranslateOperation}; use operation::{translate_input, Sequence, SqueezeOperation, TranslateOperation};
use std::io::{stdin, stdout, BufReader, BufWriter}; use std::io::{stdin, stdout, BufReader, BufWriter};
use crate::operation::DeleteOperation; use crate::operation::DeleteOperation;
@ -98,22 +98,22 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
let mut delete_writer = BufWriter::new(&mut delete_buffer); let mut delete_writer = BufWriter::new(&mut delete_buffer);
let delete_op = let delete_op =
DeleteOperation::new(Sequence::parse_set_string(&sets[0]), complement_flag); DeleteOperation::new(Sequence::parse_set_string(&sets[0]), complement_flag);
translate_input_new(&mut locked_stdin, &mut delete_writer, delete_op); translate_input(&mut locked_stdin, &mut delete_writer, delete_op);
} }
{ {
let mut squeeze_reader = BufReader::new(delete_buffer.as_bytes()); let mut squeeze_reader = BufReader::new(delete_buffer.as_bytes());
let squeeze_op = let squeeze_op =
SqueezeOperation::new(Sequence::parse_set_string(&sets[1]), complement_flag); SqueezeOperation::new(Sequence::parse_set_string(&sets[1]), complement_flag);
translate_input_new(&mut squeeze_reader, &mut buffered_stdout, squeeze_op); translate_input(&mut squeeze_reader, &mut buffered_stdout, squeeze_op);
} }
} else { } else {
let op = DeleteOperation::new(Sequence::parse_set_string(&sets[0]), complement_flag); let op = DeleteOperation::new(Sequence::parse_set_string(&sets[0]), complement_flag);
translate_input_new(&mut locked_stdin, &mut buffered_stdout, op); translate_input(&mut locked_stdin, &mut buffered_stdout, op);
} }
} else if squeeze_flag { } else if squeeze_flag {
if sets.len() < 2 { if sets.len() < 2 {
let op = SqueezeOperation::new(Sequence::parse_set_string(&sets[0]), complement_flag); let op = SqueezeOperation::new(Sequence::parse_set_string(&sets[0]), complement_flag);
translate_input_new(&mut locked_stdin, &mut buffered_stdout, op); translate_input(&mut locked_stdin, &mut buffered_stdout, op);
} else { } else {
let mut translate_buffer = vec![]; let mut translate_buffer = vec![];
{ {
@ -124,12 +124,12 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
truncate_set1_flag, truncate_set1_flag,
complement_flag, complement_flag,
); );
translate_input_new(&mut locked_stdin, &mut writer, translate_op); translate_input(&mut locked_stdin, &mut writer, translate_op);
} }
{ {
let mut reader = BufReader::new(translate_buffer.as_bytes()); let mut reader = BufReader::new(translate_buffer.as_bytes());
let squeeze_op = SqueezeOperation::new(Sequence::parse_set_string(&sets[1]), false); let squeeze_op = SqueezeOperation::new(Sequence::parse_set_string(&sets[1]), false);
translate_input_new(&mut reader, &mut buffered_stdout, squeeze_op); translate_input(&mut reader, &mut buffered_stdout, squeeze_op);
} }
} }
} else { } else {
@ -139,7 +139,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
truncate_set1_flag, truncate_set1_flag,
complement_flag, complement_flag,
); );
translate_input_new(&mut locked_stdin, &mut buffered_stdout, op); translate_input(&mut locked_stdin, &mut buffered_stdout, op);
} }
0 0