From ab249a1f95e898b2d81e480b32a5b6ad9e4a7087 Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Sun, 11 Apr 2021 18:40:46 -0600
Subject: add more error context

---
 src/makefile/input.rs | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'src/makefile/input.rs')

diff --git a/src/makefile/input.rs b/src/makefile/input.rs
index beb517a..e8e2e95 100644
--- a/src/makefile/input.rs
+++ b/src/makefile/input.rs
@@ -327,8 +327,24 @@ impl<'a, 'parent, R: BufRead> MakefileReader<'a, 'parent, R> {
             };
 
             match line_type {
-                LineType::Rule => self.read_rule(&line_tokens, line_number)?,
-                LineType::Macro => self.read_macro(line_tokens, line_number)?,
+                LineType::Rule => {
+                    self.read_rule(&line_tokens, line_number)
+                        .wrap_err_with(|| {
+                            format!(
+                                "while parsing rule definition starting on line {}",
+                                line_number
+                            )
+                        })?
+                }
+                LineType::Macro => {
+                    self.read_macro(line_tokens, line_number)
+                        .wrap_err_with(|| {
+                            format!(
+                                "while parsing macro definition starting on line {}",
+                                line_number
+                            )
+                        })?
+                }
                 LineType::Unknown => {
                     if !line_tokens.is_empty() {
                         // TODO handle assignments here
@@ -772,7 +788,9 @@ impl<'a, 'parent, R: BufRead> MakefileReader<'a, 'parent, R> {
     }
 
     fn expand_macros(&self, text: &TokenString) -> Result<String> {
-        self.macros.expand(text)
+        self.macros
+            .expand(text)
+            .wrap_err_with(|| format!("while expanding \"{}\"", text))
     }
 
     pub fn finish(self) -> FinishedMakefileReader {
-- 
cgit v1.2.3