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

Use span in step error message

Browse source
This commit is contained in:
Joscha 2021-12-05 18:35:34 +01:00
parent 96be690e9a
commit 8d49ac139a
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/eval/command/date.rs
View file

@ -12,7 +12,7 @@ pub struct DateSpec {
pub start_delta: Delta, pub start_delta: Delta,
pub start_time: Option<Time>, pub start_time: Option<Time>,
pub end_delta: Delta, pub end_delta: Delta,
pub repeat: Option<Delta>, pub repeat: Option<Spanned<Delta>>,
pub start_at_done: bool, pub start_at_done: bool,
} }
@ -35,7 +35,10 @@ impl From<&commands::DateSpec> for DateSpec {
.push(Spanned::new(time.span, DeltaStep::Time(time.value))); .push(Spanned::new(time.span, DeltaStep::Time(time.value)));
} }
let repeat: Option<Delta> = spec.repeat.as_ref().map(|repeat| (&repeat.delta).into()); let repeat: Option<Spanned<Delta>> = spec
.repeat
.as_ref()
.map(|repeat| Spanned::new(repeat.delta.span, (&repeat.delta.value).into()));
let start_at_done = spec let start_at_done = spec
.repeat .repeat
.as_ref() .as_ref()
@ -82,13 +85,13 @@ impl DateSpec {
Some((start, range)) Some((start, range))
} }
fn step(from: NaiveDate, repeat: &Delta) -> Result<NaiveDate> { fn step(from: NaiveDate, repeat: &Spanned<Delta>) -> Result<NaiveDate> {
let to = repeat.apply_date(from)?; let to = repeat.value.apply_date(from)?;
if to > from { if to > from {
Ok(to) Ok(to)
} else { } else {
Err(Error::RepeatDidNotMoveForwards { Err(Error::RepeatDidNotMoveForwards {
span: todo!(), span: repeat.span,
from, from,
to, to,
}) })

2
src/files/commands.rs
View file

@ -151,7 +151,7 @@ pub struct Repeat {
/// Start at the date when the latest `DONE` was created instead of the /// Start at the date when the latest `DONE` was created instead of the
/// task's previous occurrence. /// task's previous occurrence.
pub start_at_done: bool, pub start_at_done: bool,
pub delta: Delta, pub delta: Spanned<Delta>,
} }
#[derive(Debug)] #[derive(Debug)]

15
src/files/parse.rs
View file

@ -202,8 +202,9 @@ fn parse_delta_step(
Ok(Spanned::new(span, f(value))) Ok(Spanned::new(span, f(value)))
} }
fn parse_delta(p: Pair<'_, Rule>) -> Result<Delta> { fn parse_delta(p: Pair<'_, Rule>) -> Result<Spanned<Delta>> {
assert_eq!(p.as_rule(), Rule::delta); assert_eq!(p.as_rule(), Rule::delta);
let span = (&p.as_span()).into();
let mut sign = None; let mut sign = None;
let mut steps = vec![]; let mut steps = vec![];
@ -224,7 +225,7 @@ fn parse_delta(p: Pair<'_, Rule>) -> Result<Delta> {
} }
} }
Ok(Delta(steps)) Ok(Spanned::new(span, Delta(steps)))
} }
fn parse_date_fixed_start(p: Pair<'_, Rule>, spec: &mut DateSpec) -> Result<()> { fn parse_date_fixed_start(p: Pair<'_, Rule>, spec: &mut DateSpec) -> Result<()> {
@ -233,7 +234,7 @@ fn parse_date_fixed_start(p: Pair<'_, Rule>, spec: &mut DateSpec) -> Result<()>
for p in p.into_inner() { for p in p.into_inner() {
match p.as_rule() { match p.as_rule() {
Rule::datum => spec.start = parse_datum(p)?.value, Rule::datum => spec.start = parse_datum(p)?.value,
Rule::delta => spec.start_delta = Some(parse_delta(p)?), Rule::delta => spec.start_delta = Some(parse_delta(p)?.value),
Rule::time => spec.start_time = Some(parse_time(p)?.value), Rule::time => spec.start_time = Some(parse_time(p)?.value),
_ => unreachable!(), _ => unreachable!(),
} }
@ -248,7 +249,7 @@ fn parse_date_fixed_end(p: Pair<'_, Rule>, spec: &mut DateSpec) -> Result<()> {
for p in p.into_inner() { for p in p.into_inner() {
match p.as_rule() { match p.as_rule() {
Rule::datum => spec.end = Some(parse_datum(p)?), Rule::datum => spec.end = Some(parse_datum(p)?),
Rule::delta => spec.end_delta = Some(parse_delta(p)?), Rule::delta => spec.end_delta = Some(parse_delta(p)?.value),
Rule::time => spec.end_time = Some(parse_time(p)?), Rule::time => spec.end_time = Some(parse_time(p)?),
_ => unreachable!(), _ => unreachable!(),
} }
@ -436,7 +437,7 @@ fn parse_date_expr_start(p: Pair<'_, Rule>, spec: &mut FormulaSpec) -> Result<()
for p in p.into_inner() { for p in p.into_inner() {
match p.as_rule() { match p.as_rule() {
Rule::paren_expr => spec.start = Some(parse_expr(p.into_inner().next().unwrap())), Rule::paren_expr => spec.start = Some(parse_expr(p.into_inner().next().unwrap())),
Rule::delta => spec.start_delta = Some(parse_delta(p)?), Rule::delta => spec.start_delta = Some(parse_delta(p)?.value),
Rule::time => spec.start_time = Some(parse_time(p)?.value), Rule::time => spec.start_time = Some(parse_time(p)?.value),
_ => unreachable!(), _ => unreachable!(),
} }
@ -450,7 +451,7 @@ fn parse_date_expr_end(p: Pair<'_, Rule>, spec: &mut FormulaSpec) -> Result<()>
for p in p.into_inner() { for p in p.into_inner() {
match p.as_rule() { match p.as_rule() {
Rule::delta => spec.end_delta = Some(parse_delta(p)?), Rule::delta => spec.end_delta = Some(parse_delta(p)?.value),
Rule::time => spec.end_time = Some(parse_time(p)?), Rule::time => spec.end_time = Some(parse_time(p)?),
_ => unreachable!(), _ => unreachable!(),
} }
@ -501,7 +502,7 @@ fn parse_date_weekday_end(p: Pair<'_, Rule>, spec: &mut WeekdaySpec) -> Result<(
for p in p.into_inner() { for p in p.into_inner() {
match p.as_rule() { match p.as_rule() {
Rule::weekday => spec.end = Some(parse_weekday(p)), Rule::weekday => spec.end = Some(parse_weekday(p)),
Rule::delta => spec.end_delta = Some(parse_delta(p)?), Rule::delta => spec.end_delta = Some(parse_delta(p)?.value),
Rule::time => spec.end_time = Some(parse_time(p)?), Rule::time => spec.end_time = Some(parse_time(p)?),
_ => unreachable!(), _ => unreachable!(),
} }