From 8d49ac139aa72fe7f86fe5ab9046eedca1194f85 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sun, 5 Dec 2021 18:35:34 +0100
Subject: [PATCH] Use span in step error message

---
 src/eval/command/date.rs | 13 ++++++++-----
 src/files/commands.rs    |  2 +-
 src/files/parse.rs       | 15 ++++++++-------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/eval/command/date.rs b/src/eval/command/date.rs
index 7150e74..7de75c5 100644
--- a/src/eval/command/date.rs
+++ b/src/eval/command/date.rs
@@ -12,7 +12,7 @@ pub struct DateSpec {
     pub start_delta: Delta,
     pub start_time: Option<Time>,
     pub end_delta: Delta,
-    pub repeat: Option<Delta>,
+    pub repeat: Option<Spanned<Delta>>,
     pub start_at_done: bool,
 }
 
@@ -35,7 +35,10 @@ impl From<&commands::DateSpec> for DateSpec {
                 .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
             .repeat
             .as_ref()
@@ -82,13 +85,13 @@ impl DateSpec {
         Some((start, range))
     }
 
-    fn step(from: NaiveDate, repeat: &Delta) -> Result<NaiveDate> {
-        let to = repeat.apply_date(from)?;
+    fn step(from: NaiveDate, repeat: &Spanned<Delta>) -> Result<NaiveDate> {
+        let to = repeat.value.apply_date(from)?;
         if to > from {
             Ok(to)
         } else {
             Err(Error::RepeatDidNotMoveForwards {
-                span: todo!(),
+                span: repeat.span,
                 from,
                 to,
             })
diff --git a/src/files/commands.rs b/src/files/commands.rs
index a7422a4..b6d5069 100644
--- a/src/files/commands.rs
+++ b/src/files/commands.rs
@@ -151,7 +151,7 @@ pub struct Repeat {
     /// Start at the date when the latest `DONE` was created instead of the
     /// task's previous occurrence.
     pub start_at_done: bool,
-    pub delta: Delta,
+    pub delta: Spanned<Delta>,
 }
 
 #[derive(Debug)]
diff --git a/src/files/parse.rs b/src/files/parse.rs
index c7d403d..7155e05 100644
--- a/src/files/parse.rs
+++ b/src/files/parse.rs
@@ -202,8 +202,9 @@ fn parse_delta_step(
     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);
+    let span = (&p.as_span()).into();
 
     let mut sign = None;
     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<()> {
@@ -233,7 +234,7 @@ fn parse_date_fixed_start(p: Pair<'_, Rule>, spec: &mut DateSpec) -> Result<()>
     for p in p.into_inner() {
         match p.as_rule() {
             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),
             _ => unreachable!(),
         }
@@ -248,7 +249,7 @@ fn parse_date_fixed_end(p: Pair<'_, Rule>, spec: &mut DateSpec) -> Result<()> {
     for p in p.into_inner() {
         match p.as_rule() {
             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)?),
             _ => unreachable!(),
         }
@@ -436,7 +437,7 @@ fn parse_date_expr_start(p: Pair<'_, Rule>, spec: &mut FormulaSpec) -> Result<()
     for p in p.into_inner() {
         match p.as_rule() {
             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),
             _ => unreachable!(),
         }
@@ -450,7 +451,7 @@ fn parse_date_expr_end(p: Pair<'_, Rule>, spec: &mut FormulaSpec) -> Result<()>
 
     for p in p.into_inner() {
         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)?),
             _ => unreachable!(),
         }
@@ -501,7 +502,7 @@ fn parse_date_weekday_end(p: Pair<'_, Rule>, spec: &mut WeekdaySpec) -> Result<(
     for p in p.into_inner() {
         match p.as_rule() {
             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)?),
             _ => unreachable!(),
         }