From 084480c807b58947b8487eb3a7c6a71bb388a832 Mon Sep 17 00:00:00 2001
From: Escherichia
Date: Wed, 3 Apr 2024 17:01:27 +0200
Subject: added Error and EError to expressions and propagated related changes

---
 compiler/Errors.ml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'compiler/Errors.ml')

diff --git a/compiler/Errors.ml b/compiler/Errors.ml
index 53e56c44..30887593 100644
--- a/compiler/Errors.ml
+++ b/compiler/Errors.ml
@@ -1,6 +1,7 @@
 let log = Logging.errors_log
 
-let meta_to_string (span : Meta.span) =
+let meta_to_string (meta : Meta.meta) =
+  let span = meta.span in
   let file = match span.file with Virtual s | Local s -> s in
   let loc_to_string (l : Meta.loc) : string =
     string_of_int l.line ^ ":" ^ string_of_int l.col
@@ -10,7 +11,7 @@ let meta_to_string (span : Meta.span) =
 
 let format_error_message (meta : Meta.meta option) (msg : string) =
   let meta =
-    match meta with None -> "" | Some meta -> "\n" ^ meta_to_string meta.span
+    match meta with None -> "" | Some meta -> "\n" ^ meta_to_string meta
   in
   msg ^ meta
 
-- 
cgit v1.2.3


From 16ea3ca854a77703487afa8732f247bc26cba695 Mon Sep 17 00:00:00 2001
From: Escherichia
Date: Thu, 4 Apr 2024 13:23:50 +0200
Subject: Now prints all errors in the error_list

---
 compiler/Errors.ml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'compiler/Errors.ml')

diff --git a/compiler/Errors.ml b/compiler/Errors.ml
index 30887593..7dfe659a 100644
--- a/compiler/Errors.ml
+++ b/compiler/Errors.ml
@@ -20,6 +20,12 @@ let format_error_message_with_file_line (file : string) (line : int)
   "In file " ^ file ^ ", line " ^ string_of_int line ^ ":\n"
   ^ format_error_message meta msg
 
+let error_list_to_string (error_list : (Meta.meta option * string) list) :
+    string =
+  List.fold_left
+    (fun errors (meta, msg) -> errors ^ "\n" ^ format_error_message meta msg)
+    "" error_list
+
 exception CFailure of (Meta.meta option * string)
 
 let error_list : (Meta.meta option * string) list ref = ref []
-- 
cgit v1.2.3


From 1f3ce79023d902d0145da38e878d991a6ba29236 Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Thu, 4 Apr 2024 15:47:54 +0200
Subject: Update the way errors are reported

---
 compiler/Errors.ml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'compiler/Errors.ml')

diff --git a/compiler/Errors.ml b/compiler/Errors.ml
index 7dfe659a..30887593 100644
--- a/compiler/Errors.ml
+++ b/compiler/Errors.ml
@@ -20,12 +20,6 @@ let format_error_message_with_file_line (file : string) (line : int)
   "In file " ^ file ^ ", line " ^ string_of_int line ^ ":\n"
   ^ format_error_message meta msg
 
-let error_list_to_string (error_list : (Meta.meta option * string) list) :
-    string =
-  List.fold_left
-    (fun errors (meta, msg) -> errors ^ "\n" ^ format_error_message meta msg)
-    "" error_list
-
 exception CFailure of (Meta.meta option * string)
 
 let error_list : (Meta.meta option * string) list ref = ref []
-- 
cgit v1.2.3