From 9c2f47534ae3637294a6c087c9dab3ac604c8728 Mon Sep 17 00:00:00 2001
From: sofia <sofia@teascade.net>
Date: Mon, 28 Jul 2025 01:43:30 +0300
Subject: [PATCH] Update how line number is shown in errors

---
 examples/hello_world_harder.reid |  2 +-
 reid/src/error_raporting.rs      | 32 +++++++++++++++-----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/examples/hello_world_harder.reid b/examples/hello_world_harder.reid
index 0132072..bb2802d 100644
--- a/examples/hello_world_harder.reid
+++ b/examples/hello_world_harder.reid
@@ -6,7 +6,7 @@ fn main() {
 
     test.push(String::from(" world: "));
 
-    test.push_num(175);
+    test.push_num("hello");
     
     print(test);
 
diff --git a/reid/src/error_raporting.rs b/reid/src/error_raporting.rs
index f1ff41e..40659a8 100644
--- a/reid/src/error_raporting.rs
+++ b/reid/src/error_raporting.rs
@@ -194,32 +194,30 @@ impl std::fmt::Display for ReidError {
                 None
             };
 
-            if curr_module != Some(meta.source_module_id) {
+            let module_name = if curr_module != Some(meta.source_module_id) {
                 curr_module = Some(meta.source_module_id);
                 if let Some(module) = self.map.module_map.get(&meta.source_module_id) {
-                    writeln!(
-                        f,
-                        "Errors in module {}:",
-                        color_err(format!("{}", module.name))?
-                    )?;
+                    module.name.clone()
                 } else {
-                    writeln!(f, "Errors detected: {}", color_err("in general")?)?;
+                    "unknown".to_owned()
                 }
-            }
+            } else {
+                "unknown".to_owned()
+            };
+
+            writeln!(f, "Errors detected: {}", color_err(format!("{}", module_name))?)?;
+
             writeln!(f)?;
             write!(f, "  Error: ")?;
             writeln!(f, "{}", color_err(format!("{}", error))?)?;
             write!(
                 f,
-                "{:>20}{}",
+                "{:>20} {}:{}",
                 color_warn("At: ")?,
-                position
-                    .map(|p| fmt_positions(p))
-                    .unwrap_or(String::from("{unknown}")),
+                module_name,
+                position.map(|p| fmt_positions(p)).unwrap_or(String::from("{unknown}")),
             )?;
-            if let (Some(position), Some(source)) =
-                (position, &module.and_then(|m| m.source.clone()))
-            {
+            if let (Some(position), Some(source)) = (position, &module.and_then(|m| m.source.clone())) {
                 writeln!(f, "{}", fmt_lines(source, position, 6)?)?;
             }
         }
@@ -286,9 +284,9 @@ fn fmt_lines(
 
 fn fmt_positions((start, end): (Position, Position)) -> String {
     if start == end {
-        format!("ln {}, col {}", start.1, start.0)
+        format!("{}:{}", start.1, start.0)
     } else if start.1 == end.1 {
-        format!("ln {}, col {}-{}", start.1, start.0, end.0)
+        format!("{}:{} - {}", start.1, start.0, end.0)
     } else {
         format!("{}:{} - {}:{}", start.1, start.0, end.1, end.0)
     }