From 80de748737e5ba659f483de2b55aa05ee675c31c Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Thu, 26 Jul 2018 16:47:25 +0100
Subject: [PATCH] Hadrons: new exceptions which can save a integer

---
 extras/Hadrons/Exceptions.cc  | 34 +++++++++++++++++++++-------------
 extras/Hadrons/Exceptions.hpp | 27 +++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/extras/Hadrons/Exceptions.cc b/extras/Hadrons/Exceptions.cc
index e87181b2..1ff26afe 100644
--- a/extras/Hadrons/Exceptions.cc
+++ b/extras/Hadrons/Exceptions.cc
@@ -34,30 +34,38 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #define ERR_SUFF " (" + loc + ")"
 #endif
 
-#define CONST_EXC(name, init) \
+#define CTOR_EXC(name, init) \
 name::name(std::string msg, std::string loc)\
 :init\
 {}
 
+#define CTOR_EXC_REF(name, init) \
+name::name(std::string msg, std::string loc, const unsigned int address)\
+:init\
+{}
+
 using namespace Grid;
 using namespace Hadrons;
 using namespace Exceptions;
 
 // logic errors
-CONST_EXC(Logic, logic_error(msg + ERR_SUFF))
-CONST_EXC(Definition, Logic("definition error: " + msg, loc))
-CONST_EXC(Implementation, Logic("implementation error: " + msg, loc))
-CONST_EXC(Range, Logic("range error: " + msg, loc))
-CONST_EXC(Size, Logic("size error: " + msg, loc))
+CTOR_EXC(Logic, logic_error(msg + ERR_SUFF))
+CTOR_EXC(Definition, Logic("definition error: " + msg, loc))
+CTOR_EXC(Implementation, Logic("implementation error: " + msg, loc))
+CTOR_EXC(Range, Logic("range error: " + msg, loc))
+CTOR_EXC(Size, Logic("size error: " + msg, loc))
 
 // runtime errors
-CONST_EXC(Runtime, runtime_error(msg + ERR_SUFF))
-CONST_EXC(Argument, Runtime("argument error: " + msg, loc))
-CONST_EXC(Io, Runtime("IO error: " + msg, loc))
-CONST_EXC(Memory, Runtime("memory error: " + msg, loc))
-CONST_EXC(Parsing, Runtime("parsing error: " + msg, loc))
-CONST_EXC(Program, Runtime("program error: " + msg, loc))
-CONST_EXC(System, Runtime("system error: " + msg, loc))
+CTOR_EXC(Runtime, runtime_error(msg + ERR_SUFF))
+CTOR_EXC(Argument, Runtime("argument error: " + msg, loc))
+CTOR_EXC(Io, Runtime("IO error: " + msg, loc))
+CTOR_EXC(Memory, Runtime("memory error: " + msg, loc))
+CTOR_EXC(Parsing, Runtime("parsing error: " + msg, loc))
+CTOR_EXC(Program, Runtime("program error: " + msg, loc))
+CTOR_EXC(System, Runtime("system error: " + msg, loc))
+
+// virtual machine errors
+CTOR_EXC_REF(ObjectDefinition, RuntimeRef("object definition error: " + msg, loc, address));
 
 // abort functions
 void Grid::Hadrons::Exceptions::abort(const std::exception& e)
diff --git a/extras/Hadrons/Exceptions.hpp b/extras/Hadrons/Exceptions.hpp
index 3eb1c25f..38bee8c1 100644
--- a/extras/Hadrons/Exceptions.hpp
+++ b/extras/Hadrons/Exceptions.hpp
@@ -39,6 +39,9 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #define HADRONS_ERROR(exc, msg)\
 throw(Exceptions::exc(msg, HADRONS_SRC_LOC));
 
+#define HADRONS_ERROR_REF(exc, msg, address)\
+throw(Exceptions::exc(msg, HADRONS_SRC_LOC, address));
+
 #define DECL_EXC(name, base) \
 class name: public base\
 {\
@@ -46,6 +49,13 @@ public:\
     name(std::string msg, std::string loc);\
 }
 
+#define DECL_EXC_REF(name, base) \
+class name: public base\
+{\
+public:\
+    name(std::string msg, std::string loc, const unsigned int address);\
+}
+
 BEGIN_HADRONS_NAMESPACE
 
 namespace Exceptions
@@ -66,6 +76,23 @@ namespace Exceptions
     DECL_EXC(Program, Runtime);
     DECL_EXC(System, Runtime);
 
+    // virtual machine errors
+    class RuntimeRef: public Runtime
+    {
+    public:
+        RuntimeRef(std::string msg, std::string loc, const unsigned int address)
+        : Runtime(msg, loc), address_(address)
+        {}
+        unsigned int getAddress(void) const
+        {
+            return address_;
+        }
+    private:
+        unsigned int address_;
+    };
+
+    DECL_EXC_REF(ObjectDefinition, RuntimeRef);
+
     // abort functions
     void abort(const std::exception& e);
 }