From 73a44a697af03bfeb49f191a739a139b26afc9fc Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Tue, 21 Dec 2021 19:33:55 +0100
Subject: [PATCH] Error when moving untimed entry to new time

---
 src/eval/command.rs   | 10 ++++++++--
 src/eval/error.rs     |  8 ++++++++
 src/files/commands.rs |  2 +-
 src/files/parse.rs    |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/eval/command.rs b/src/eval/command.rs
index b277a7d..e65e6e6 100644
--- a/src/eval/command.rs
+++ b/src/eval/command.rs
@@ -244,6 +244,7 @@ impl<'a> CommandState<'a> {
     }
 
     fn eval_except(&mut self, date: NaiveDate) {
+        // TODO Error if nothing is removed?
         self.dated.remove(&date);
     }
 
@@ -252,7 +253,7 @@ impl<'a> CommandState<'a> {
         span: Span,
         from: NaiveDate,
         to: Option<NaiveDate>,
-        to_time: Option<Time>,
+        to_time: Option<Spanned<Time>>,
     ) -> Result<()> {
         if let Some(mut entry) = self.dated.remove(&from) {
             let mut dates = entry.dates.expect("comes from self.dated");
@@ -264,7 +265,12 @@ impl<'a> CommandState<'a> {
             }
             if let Some(to_time) = to_time {
                 if let Some((root, _)) = dates.times() {
-                    delta = delta + Duration::minutes(root.minutes_to(to_time));
+                    delta = delta + Duration::minutes(root.minutes_to(to_time.value));
+                } else {
+                    return Err(Error::TimedMoveWithoutTime {
+                        index: self.command.source.file(),
+                        span: to_time.span,
+                    });
                 }
             }
 
diff --git a/src/eval/error.rs b/src/eval/error.rs
index b485143..5219f7f 100644
--- a/src/eval/error.rs
+++ b/src/eval/error.rs
@@ -48,6 +48,10 @@ pub enum Error {
     /// date `a`.
     #[error("tried to move nonexisting entry")]
     MoveWithoutSource { index: usize, span: Span },
+    /// A `MOVE a TO b` statement was executed where `b` contains a time but `a`
+    /// doesn't was executed.
+    #[error("tried to move un-timed entry to new time")]
+    TimedMoveWithoutTime { index: usize, span: Span },
     /// A division by zero has occurred.
     #[error("tried to divide by zero")]
     DivByZero {
@@ -162,6 +166,10 @@ impl Error {
                 let msg = "Tried to move nonexisting entry".to_string();
                 Self::print_at(sources, index, span, msg);
             }
+            Error::TimedMoveWithoutTime { index, span } => {
+                let msg = "Tried to move un-timed entry to new time".to_string();
+                Self::print_at(sources, index, span, msg);
+            }
             Error::DivByZero { index, span, date } => {
                 let msg = format!(
                     "Tried to divide by zero\
diff --git a/src/files/commands.rs b/src/files/commands.rs
index 90983d0..76166b0 100644
--- a/src/files/commands.rs
+++ b/src/files/commands.rs
@@ -266,7 +266,7 @@ pub enum Statement {
         span: Span,
         from: NaiveDate,
         to: Option<NaiveDate>,
-        to_time: Option<Time>,
+        to_time: Option<Spanned<Time>>,
     },
     Remind(Option<Spanned<Delta>>),
 }
diff --git a/src/files/parse.rs b/src/files/parse.rs
index 3e43ab0..8a756f7 100644
--- a/src/files/parse.rs
+++ b/src/files/parse.rs
@@ -624,7 +624,7 @@ fn parse_stmt_move(p: Pair<'_, Rule>) -> Result<Statement> {
     for p in p {
         match p.as_rule() {
             Rule::datum => to = Some(parse_datum(p)?.value),
-            Rule::time => to_time = Some(parse_time(p)?.value),
+            Rule::time => to_time = Some(parse_time(p)?),
             _ => unreachable!(),
         }
     }