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

Use delimited whenever possible and removed a duplicate parse

Browse source 
Signed-off-by: Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com>
This commit is contained in:
Hanif Bin Ariffin 2021-07-21 19:13:07 +08:00
parent 0254ceb48b
commit 5aeeb6cfe9
1 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,12 +1,12 @@
use crate::unicode_table; use crate::unicode_table;
use nom::{ use nom::{
branch::alt, branch::alt,
bytes::complete::{tag, take_while1}, bytes::complete::{tag, take_until},
character::complete::{anychar, one_of}, character::complete::{anychar, digit1, one_of},
combinator::{map_opt, recognize}, combinator::{map_opt, opt, recognize},
multi::{many0, many_m_n}, multi::{many0, many_m_n},
sequence::{preceded, separated_pair, tuple}, sequence::{delimited, preceded, separated_pair, tuple},
IResult, take_until1, IResult,
}; };
use std::{ use std::{
collections::HashMap, collections::HashMap,
@ -33,7 +33,6 @@ pub enum Sequence {
impl Sequence { impl Sequence {
pub fn parse_set_string(input: &str) -> Vec<Sequence> { pub fn parse_set_string(input: &str) -> Vec<Sequence> {
many0(alt(( many0(alt((
alt((Sequence::parse_octal, Sequence::parse_backslash)),
alt(( alt((
Sequence::parse_char_range, Sequence::parse_char_range,
Sequence::parse_char_star, Sequence::parse_char_star,
@ -50,11 +49,14 @@ impl Sequence {
Sequence::parse_print, Sequence::parse_print,
Sequence::parse_punct, Sequence::parse_punct,
Sequence::parse_space, Sequence::parse_space,
Sequence::parse_space,
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 // NOTE: This must be the last one
)),
alt((
Sequence::parse_octal,
Sequence::parse_backslash,
Sequence::parse_char, Sequence::parse_char,
)), )),
)))(input) )))(input)
@ -113,20 +115,16 @@ impl Sequence {
} }
fn parse_char_star(input: &str) -> IResult<&str, Sequence> { fn parse_char_star(input: &str) -> IResult<&str, Sequence> {
tuple((tag("["), anychar, tag("*]")))(input) delimited(tag("["), anychar, tag("*]"))(input).map(|(l, c)| (l, Sequence::CharStar(c)))
.map(|(l, (_, c, _))| (l, Sequence::CharStar(c)))
} }
fn parse_char_repeat(input: &str) -> IResult<&str, Sequence> { fn parse_char_repeat(input: &str) -> IResult<&str, Sequence> {
tuple(( delimited(
tag("["), tag("["),
anychar, separated_pair(anychar, tag("*"), digit1),
tag("*"),
// TODO: Extend this to support octal as well. Octal starts with 0.
take_while1(|c: char| c.is_digit(10)),
tag("]"), tag("]"),
))(input) )(input)
.map(|(l, (_, c, _, n, _))| { .map(|(l, (c, n))| {
( (
l, l,
Sequence::CharRange(Box::new(std::iter::repeat(c).take(n.parse().unwrap()))), Sequence::CharRange(Box::new(std::iter::repeat(c).take(n.parse().unwrap()))),
@ -255,7 +253,7 @@ impl Sequence {
} }
fn parse_char_equal(input: &str) -> IResult<&str, Sequence> { fn parse_char_equal(input: &str) -> IResult<&str, Sequence> {
tuple((tag("[="), anychar, tag("=]")))(input).map(|(_, (_, _, _))| todo!()) delimited(tag("[="), anychar, tag("=]"))(input).map(|(_, _)| todo!())
} }
} }