From 5b1d2e43d5857f414f076a8a53698ce7c5973d64 Mon Sep 17 00:00:00 2001
From: Nathanne Isip <nathanneisip@gmail.com>
Date: Mon, 16 Sep 2024 11:03:42 +0800
Subject: [PATCH] Improved interpreter error message handling and printing.

---
 src/Zhivo.cpp | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/Zhivo.cpp b/src/Zhivo.cpp
index 176c01f..b87914e 100644
--- a/src/Zhivo.cpp
+++ b/src/Zhivo.cpp
@@ -37,27 +37,35 @@ auto interpreter() -> int {
         return 0;
     }
     catch(const LexicalAnalysisException& lexAnlExc) {
-        std::cerr << "[LEXANL]:  " << lexAnlExc.what() << std::endl;
+        std::cerr << "[\u001b[1;31mLexical Error\u001b[0m]:" << std::endl
+            << "\t" << lexAnlExc.what() << std::endl;
     }
     catch(const ParserException& parserExc) {
-        std::cerr << "[PARSER]:  " << parserExc.what() << std::endl;
-        std::cerr << "           " <<
+        std::cerr << "[\u001b[1;31mParser Error\u001b[0m]:  \u001b[3;37m"
+            << parserExc.what() << "\u001b[0m" << std::endl;
+        std::cerr << "                 " <<
             parserExc.getAddress()->toString() << std::endl;
     }
-    catch(const TerminativeReturnSignal& retExc) {
-        std::cerr << "[OBJECT]:  " <<
-            retExc.getObject().toString() << std::endl;
-    }
     catch(const TerminativeBreakSignal& breakExc) {
-        std::cerr << "[RUNTIME]: " <<
-            "Invalid break statement signal caught." << std::endl;
+        std::cerr << "[\u001b[1;31mRuntime Error\u001b[0m]: "
+            << "\u001b[3;37mInvalid break statement signal caught.\u001b[0m"
+            << std::endl << "                 "
+            << breakExc.getAddress().toString() << std::endl;
     }
     catch(const TerminativeContinueSignal& continueExc) {
-        std::cerr << "[RUNTIME]: " <<
-            "Invalid break statement signal caught." << std::endl;
+        std::cerr << "[\u001b[1;31mRuntime Error\u001b[0m]: "
+            << "\u001b[3;37mInvalid break statement signal caught.\u001b[0m"
+            << std::endl << "                 "
+            << continueExc.getAddress().toString() << std::endl;
+    }
+    catch(const TerminativeReturnSignal& retExc) {
+        std::cerr << "\u001b[0;93m"
+            << retExc.getObject().toString()
+            << "\u001b[0m" << std::endl;
     }
     catch(const std::exception& exc) {
-        std::cerr << "[RUNTIME]: " << exc.what() << std::endl;
+        std::cerr << "[\u001b[1;31mRuntime Error\u001b[0m]: \u001b[3;37m"
+            << exc.what() << "\u001b[0m" << std::endl;
     }
 
     return 1;