Adapt gdb interaction exception to cprover style

Author: danpoe

src/memory-analyzer/gdb_api.cpp

@@ -268,7 +268,7 @@ std::string gdb_apit::extract_value(const std::string &line)
   std::regex memmory_access_error("Cannot access memory");
   if(regex_search(line, memmory_access_error))
   {
-    throw gdb_inaccessible_memoryt("ERROR: " + line);
+    throw gdb_inaccessible_memory_exceptiont("ERROR: " + line);
   }
   throw gdb_interaction_exceptiont("Cannot extract value from this: " + line);
 }

src/memory-analyzer/gdb_api.h

@@ -42,29 +42,36 @@ class gdb_apit
   static gdb_output_recordt parse_gdb_output_record(const std::string &s);
 };
 
-class gdb_interaction_exceptiont : public std::exception
+class gdb_interaction_exceptiont : public cprover_exception_baset
 {
 public:
-  explicit gdb_interaction_exceptiont(std::string reason) : std::exception()
+  explicit gdb_interaction_exceptiont(std::string reason) : reason(reason)
   {
-    error = reason;
   }
-  const char *what() const throw()
+  std::string what() const override
   {
-    return error.c_str();
+    return reason;
   }
 
 private:
-  std::string error;
+  std::string reason;
 };
 
-class gdb_inaccessible_memoryt : public gdb_interaction_exceptiont
+class gdb_inaccessible_memory_exceptiont : public cprover_exception_baset
 {
 public:
-  explicit gdb_inaccessible_memoryt(std::string reason)
-    : gdb_interaction_exceptiont(reason)
+  explicit gdb_inaccessible_memory_exceptiont(std::string reason)
+    : reason(reason)
   {
   }
+
+  std::string what() const override
+  {
+    return reason;
+  }
+
+private:
+  std::string reason;
 };
 #endif
 #endif

unit/memory-analyzer/gdb_api.cpp

@@ -218,7 +218,8 @@ SCENARIO(
     const std::string line = "Cannot access memory at address 0x71";
     THEN("a gdb_inaccesible_memoryt excepition must be raised")
     {
-      REQUIRE_THROWS_AS(gdb_api.extract_value(line), gdb_inaccessible_memoryt);
+      REQUIRE_THROWS_AS(
+        gdb_api.extract_value(line), gdb_inaccessible_memory_exceptiont);
     }
   }