Garmelon/today
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix cli arg anchoring

Browse source
This commit is contained in:
Joscha 2022-05-02 12:49:03 +02:00
parent 74433eccbe
commit f42cf01a15
3 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/files/cli.rs
View file

@ -57,11 +57,17 @@ fn parse_cli_date(p: Pair<'_, Rule>) -> Result<CliDate> {
Ok(CliDate { datum, delta })
}
fn parse_cli_date_arg(p: Pair<'_, Rule>) -> Result<CliDate> {
assert_eq!(p.as_rule(), Rule::cli_date_arg);
let p = p.into_inner().next().unwrap();
parse_cli_date(p)
}
impl FromStr for CliDate {
type Err = ParseError<()>;
fn from_str(s: &str) -> result::Result<Self, ParseError<()>> {
from_str_via_parse(s, Rule::cli_date, parse_cli_date)
from_str_via_parse(s, Rule::cli_date_arg, parse_cli_date_arg)
}
}
@ -81,11 +87,17 @@ fn parse_cli_ident(p: Pair<'_, Rule>) -> Result<CliIdent> {
})
}
fn parse_cli_ident_arg(p: Pair<'_, Rule>) -> Result<CliIdent> {
assert_eq!(p.as_rule(), Rule::cli_ident_arg);
let p = p.into_inner().next().unwrap();
parse_cli_ident(p)
}
impl FromStr for CliIdent {
type Err = ParseError<()>;
fn from_str(s: &str) -> result::Result<Self, ParseError<()>> {
from_str_via_parse(s, Rule::cli_ident, parse_cli_ident)
from_str_via_parse(s, Rule::cli_ident_arg, parse_cli_ident_arg)
}
}
@ -135,11 +147,12 @@ fn parse_cli_range(p: Pair<'_, Rule>) -> Result<CliRange> {
let (start, start_delta) = parse_cli_range_start(p.next().unwrap())?;
let (end, end_delta) = match p.next() {
// For some reason, the EOI gets captured but the SOI doesn't.
Some(p) if p.as_rule() != Rule::EOI => parse_cli_range_end(p)?,
_ => (None, None),
Some(p) => parse_cli_range_end(p)?,
None => (None, None),
};
assert_eq!(p.next(), None);
Ok(CliRange {
start,
start_delta,
@ -148,11 +161,17 @@ fn parse_cli_range(p: Pair<'_, Rule>) -> Result<CliRange> {
})
}
fn parse_cli_range_arg(p: Pair<'_, Rule>) -> Result<CliRange> {
assert_eq!(p.as_rule(), Rule::cli_range_arg);
let p = p.into_inner().next().unwrap();
parse_cli_range(p)
}
impl FromStr for CliRange {
type Err = ParseError<()>;
fn from_str(s: &str) -> result::Result<Self, ParseError<()>> {
from_str_via_parse(s, Rule::cli_range, parse_cli_range)
from_str_via_parse(s, Rule::cli_range_arg, parse_cli_range_arg)
}
}

9
src/files/grammar.pest
View file

@ -152,8 +152,13 @@ file = ${ SOI ~ (empty_line* ~ command)* ~ empty_line* ~ WHITESPACE* ~ EOI }
today = { "today" | "t" }
cli_datum = { datum | today }
cli_date = { cli_datum ~ delta? }
cli_ident = { SOI ~ (cli_date | number) ~ EOI }
cli_ident = { cli_date | number }
cli_range_start = { cli_datum ~ delta? }
cli_range_end = { cli_datum ~ delta? | delta }
cli_range = { SOI ~ cli_range_start ~ ("--" ~ cli_range_end)? ~ EOI }
cli_range = { cli_range_start ~ ("--" ~ cli_range_end)? }
cli_date_arg = { SOI ~ cli_date ~ EOI }
cli_ident_arg = { SOI ~ cli_ident ~ EOI }
cli_range_arg = { SOI ~ cli_range ~ EOI }
cli_command = ${ SOI ~ empty_line* ~ command ~ empty_line* ~ WHITESPACE* ~ EOI }