From 3e44ea65340c1ef36e63f0b442d1bb07d671085d Mon Sep 17 00:00:00 2001
From: Robert-M-Lucas <robert-m-lucas@example.com>
Date: Wed, 5 Jun 2024 05:44:56 +0100
Subject: [PATCH] Improved error handling

---
 .idea/workspace.xml                      | 23 ++++++++++++-----------
 main.why                                 |  2 +-
 src/root/errors/name_resolver_errors.rs  |  6 +++++-
 src/root/name_resolver/name_resolvers.rs | 11 ++++-------
 src/root/parser/parse.rs                 |  8 ++++++--
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3168d82..f18aa56 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,18 +9,9 @@
   <component name="ChangeListManager">
     <list default="true" id="6ca282eb-dc8c-4af0-945c-cd77d70c6194" name="Changes" comment="Improved error handling">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.why" beforeDir="false" afterPath="$PROJECT_DIR$/main.why" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/compiler/compile.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/compiler/compile.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/compiler/compile_function.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/compiler/compile_function.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/errors/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/errors/mod.rs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/root/errors/name_resolver_errors.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/errors/name_resolver_errors.rs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/root/name_resolver/name_resolvers.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/name_resolver/name_resolvers.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/name_resolver/resolve_function_signatures.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/name_resolver/resolve_function_signatures.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/name_resolver/resolve_names.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/name_resolver/resolve_names.rs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/root/parser/parse.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_function.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_function.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/parser/parse_parameters.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/parse_parameters.rs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -151,7 +142,9 @@
       <workItem from="1717451075678" duration="2900000" />
       <workItem from="1717458053238" duration="62000" />
       <workItem from="1717458137866" duration="79000" />
-      <workItem from="1717465660507" duration="7452000" />
+      <workItem from="1717465660507" duration="7712000" />
+      <workItem from="1717529235686" duration="1411000" />
+      <workItem from="1717561847985" duration="511000" />
     </task>
     <task id="LOCAL-00001" summary="Changes">
       <option name="closed" value="true" />
@@ -217,7 +210,15 @@
       <option name="project" value="LOCAL" />
       <updated>1717473113692</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="Improved error handling">
+      <option name="closed" value="true" />
+      <created>1717473365560</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1717473365560</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/main.why b/main.why
index 761d81c..573de27 100644
--- a/main.why
+++ b/main.why
@@ -3,6 +3,6 @@ struct A {
     b: int
 }
 
-fn main() -> int {
+fn main() -> intt {
     return 12;
 }
diff --git a/src/root/errors/name_resolver_errors.rs b/src/root/errors/name_resolver_errors.rs
index 93b8ac1..4bb543e 100644
--- a/src/root/errors/name_resolver_errors.rs
+++ b/src/root/errors/name_resolver_errors.rs
@@ -11,5 +11,9 @@ pub enum NRErrors {
     #[error("Cannot find method ({0}) of type ({1})")]
     CannotFindMethod(String, String),
     #[error("Two attributes found with the same name ({0})")]
-    SameAttributeName(String)
+    SameAttributeName(String),
+    #[error("Function reference cannot have indirection here")]
+    FunctionIndirectionError,
+    #[error("Identifier ({0}) not found")]
+    IdentifierNotFound(String)
 }
diff --git a/src/root/name_resolver/name_resolvers.rs b/src/root/name_resolver/name_resolvers.rs
index c2f6f62..6c9578f 100644
--- a/src/root/name_resolver/name_resolvers.rs
+++ b/src/root/name_resolver/name_resolvers.rs
@@ -4,6 +4,7 @@ use std::rc::Rc;
 use derive_getters::Getters;
 use crate::root::compiler::local_variable_table::LocalVariableTable;
 use crate::root::errors::name_resolver_errors::NRErrors;
+use crate::root::errors::name_resolver_errors::NRErrors::IdentifierNotFound;
 use crate::root::errors::WError;
 use crate::root::name_resolver::resolve_function_signatures::FunctionSignature;
 use crate::root::parser::parse::Location;
@@ -195,10 +196,6 @@ impl GlobalDefinitionTable {
         todo!()
     }
 
-    pub fn resolve_global_name(&self, name: &UnresolvedNameToken) -> NameResult {
-        todo!()
-    }
-
     pub fn resolve_global_name_to_id(&self, name: &UnresolvedNameToken, location: &Location) -> Result<NameResultId, WError> {
         let path = name.location().path();
 
@@ -214,7 +211,7 @@ impl GlobalDefinitionTable {
                         return Err(WError::n(NRErrors::FunctionSubname(next.clone(), name.base().clone()), location.clone()));
                     }
                     if name.indirection().has_indirection() {
-                        // TODO
+                        return Err(WError::n(NRErrors::FunctionIndirectionError, name.location().clone()));
                     }
                     Ok(Some(NameResultId::Function(*fid)))
                 }
@@ -299,12 +296,12 @@ impl GlobalDefinitionTable {
                 return Err(WError::n(NRErrors::FunctionSubname(next.clone(), name.base().clone()), location.clone()));
             }
             if name.indirection().has_indirection() {
-                // TODO
+                return Err(WError::n(NRErrors::FunctionIndirectionError, name.location().clone()));
             }
 
             return Ok(NameResultId::Function(*id))
         }
 
-        todo!()
+        Err(WError::n(IdentifierNotFound(name.base().clone()), name.location().clone()))
     }
 }
diff --git a/src/root/parser/parse.rs b/src/root/parser/parse.rs
index 9e6ac32..9f6c422 100644
--- a/src/root/parser/parse.rs
+++ b/src/root/parser/parse.rs
@@ -42,8 +42,12 @@ impl Location {
 
 const CHAR_LIMIT: usize = 61;
 
+
 impl Display for Location {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        // TODO: Inefficient!
+        // (Maybe fine because it is a 'bad' path?)
+
         writeln!(f, "{}", cformat!("<c,bold>In File:</>"))?;
         writeln!(f, "    {}", self.path.as_path().to_string_lossy())?;
         writeln!(f, "{}", cformat!("<c,bold>At:</>"))?;
@@ -65,7 +69,6 @@ impl Display for Location {
                 offset += 1;
             }
         }
-        println!("O: {offset}");
 
         let mut line_iter = file.lines();
 
@@ -103,7 +106,8 @@ impl Display for Location {
         end += 1;
 
         writeln!(f, "{:0width$} |  {}", self.line, line.chars().skip(start).take(end - start).collect::<String>(), width=largest_num_len)?;
-        writeln!(f, "{:0width$} |  {}^Here", "E", (0..(offset - start)).map(|_| ' ').collect::<String>(), width=largest_num_len)?;
+        let err_line = format!("{:0width$} |  {}^Here", "E", (0..(offset - start)).map(|_| ' ').collect::<String>(), width=largest_num_len);
+        writeln!(f, "{}", cformat!("<r,bold>{}</>", err_line))?;
 
         if let Some(line) = line_iter.next() {
             let line = if line.chars().count() > CHAR_LIMIT { format!("{} ...", line.chars().take(CHAR_LIMIT - 4).collect::<String>()) } else { line.to_string() };