From af298e6ac28c23d48e7ef021702bb66901cfb3aa Mon Sep 17 00:00:00 2001 From: Robert Chisholm Date: Fri, 28 Jul 2023 09:01:41 +0100 Subject: [PATCH] BugFix: Replace occurences of throw with THROW This was causing location to not be reported by certain exceptions. --- include/flamegpu/simulation/RunPlan.h | 4 ++-- include/flamegpu/simulation/RunPlanVector.h | 6 +++--- src/flamegpu/io/XMLLogger.cu | 24 ++++++++++----------- src/flamegpu/io/XMLStateReader.cpp | 24 ++++++++++----------- src/flamegpu/io/XMLStateWriter.cpp | 24 ++++++++++----------- src/flamegpu/simulation/RunPlan.cpp | 2 +- src/flamegpu/simulation/RunPlanVector.cpp | 2 +- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/flamegpu/simulation/RunPlan.h b/include/flamegpu/simulation/RunPlan.h index 2f88a04c5..24ccd3da4 100644 --- a/include/flamegpu/simulation/RunPlan.h +++ b/include/flamegpu/simulation/RunPlan.h @@ -264,7 +264,7 @@ void RunPlan::setProperty(const std::string &name, const flamegpu::size_type ind } const unsigned int t_index = detail::type_decode::len_t * index + detail::type_decode::len_t; if (it->second.data.elements < t_index || t_index < index) { - throw exception::OutOfBoundsException("Environment property array index out of bounds " + THROW exception::OutOfBoundsException("Environment property array index out of bounds " "in RunPlan::setProperty()\n"); } // Check whether array already exists in property overrides @@ -383,7 +383,7 @@ T RunPlan::getProperty(const std::string &name, const flamegpu::size_type index) } const unsigned int t_index = detail::type_decode::len_t * index + detail::type_decode::len_t; if (it->second.data.elements < t_index || t_index < index) { - throw exception::OutOfBoundsException("Environment property array index out of bounds " + THROW exception::OutOfBoundsException("Environment property array index out of bounds " "in RunPlan::getProperty()\n"); } // Check whether property already exists in property overrides diff --git a/include/flamegpu/simulation/RunPlanVector.h b/include/flamegpu/simulation/RunPlanVector.h index 50a1c86d6..df4589e96 100644 --- a/include/flamegpu/simulation/RunPlanVector.h +++ b/include/flamegpu/simulation/RunPlanVector.h @@ -371,7 +371,7 @@ void RunPlanVector::setProperty(const std::string &name, const flamegpu::size_ty } const unsigned int t_index = detail::type_decode::len_t * index + detail::type_decode::len_t; if (t_index > it->second.data.elements || t_index < index) { - throw exception::OutOfBoundsException("Environment property array index out of bounds " + THROW exception::OutOfBoundsException("Environment property array index out of bounds " "in RunPlanVector::setProperty()\n"); } for (auto &i : *this) { @@ -457,7 +457,7 @@ void RunPlanVector::setPropertyLerpRange(const std::string &name, const flamegpu } const unsigned int t_index = detail::type_decode::len_t * index + detail::type_decode::len_t; if (t_index > it->second.data.elements || t_index < index) { - throw exception::OutOfBoundsException("Environment property array index out of bounds " + THROW exception::OutOfBoundsException("Environment property array index out of bounds " "in RunPlanVector::setPropertyLerpRange()\n"); } unsigned int ct = 0; @@ -518,7 +518,7 @@ void RunPlanVector::setPropertyRandom(const std::string &name, const flamegpu::s } const unsigned int t_index = detail::type_decode::len_t * index + detail::type_decode::len_t; if (t_index > it->second.data.elements || t_index < index) { - throw exception::OutOfBoundsException("Environment property array index out of bounds " + THROW exception::OutOfBoundsException("Environment property array index out of bounds " "in RunPlanVector::setPropertyRandom()\n"); } for (auto &i : *this) { diff --git a/src/flamegpu/io/XMLLogger.cu b/src/flamegpu/io/XMLLogger.cu index 49fc4cb79..26988e660 100644 --- a/src/flamegpu/io/XMLLogger.cu +++ b/src/flamegpu/io/XMLLogger.cu @@ -15,9 +15,9 @@ namespace io { switch (a_eResult) { \ case tinyxml2::XML_ERROR_FILE_NOT_FOUND : \ case tinyxml2::XML_ERROR_FILE_COULD_NOT_BE_OPENED : \ - throw exception::InvalidInputFile("TinyXML error: File could not be opened.\n Error code: %d", a_eResult); \ + THROW exception::InvalidInputFile("TinyXML error: File could not be opened.\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_FILE_READ_ERROR : \ - throw exception::InvalidInputFile("TinyXML error: File could not be read.\n Error code: %d", a_eResult); \ + THROW exception::InvalidInputFile("TinyXML error: File could not be read.\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_PARSING_ELEMENT : \ case tinyxml2::XML_ERROR_PARSING_ATTRIBUTE : \ case tinyxml2::XML_ERROR_PARSING_TEXT : \ @@ -26,25 +26,25 @@ namespace io { case tinyxml2::XML_ERROR_PARSING_DECLARATION : \ case tinyxml2::XML_ERROR_PARSING_UNKNOWN : \ case tinyxml2::XML_ERROR_PARSING : \ - throw exception::TinyXMLError("TinyXML error: Error parsing file.\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: Error parsing file.\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_EMPTY_DOCUMENT : \ - throw exception::TinyXMLError("TinyXML error: XML_ERROR_EMPTY_DOCUMENT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ERROR_EMPTY_DOCUMENT\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_MISMATCHED_ELEMENT : \ - throw exception::TinyXMLError("TinyXML error: XML_ERROR_MISMATCHED_ELEMENT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ERROR_MISMATCHED_ELEMENT\n Error code: %d", a_eResult); \ case tinyxml2::XML_CAN_NOT_CONVERT_TEXT : \ - throw exception::TinyXMLError("TinyXML error: XML_CAN_NOT_CONVERT_TEXT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_CAN_NOT_CONVERT_TEXT\n Error code: %d", a_eResult); \ case tinyxml2::XML_NO_TEXT_NODE : \ - throw exception::TinyXMLError("TinyXML error: XML_NO_TEXT_NODE\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_NO_TEXT_NODE\n Error code: %d", a_eResult); \ case tinyxml2::XML_ELEMENT_DEPTH_EXCEEDED : \ - throw exception::TinyXMLError("TinyXML error: XML_ELEMENT_DEPTH_EXCEEDED\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ELEMENT_DEPTH_EXCEEDED\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_COUNT : \ - throw exception::TinyXMLError("TinyXML error: XML_ERROR_COUNT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ERROR_COUNT\n Error code: %d", a_eResult); \ case tinyxml2::XML_NO_ATTRIBUTE: \ - throw exception::TinyXMLError("TinyXML error: XML_NO_ATTRIBUTE\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_NO_ATTRIBUTE\n Error code: %d", a_eResult); \ case tinyxml2::XML_WRONG_ATTRIBUTE_TYPE : \ - throw exception::TinyXMLError("TinyXML error: XML_WRONG_ATTRIBUTE_TYPE\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_WRONG_ATTRIBUTE_TYPE\n Error code: %d", a_eResult); \ default: \ - throw exception::TinyXMLError("TinyXML error: Unrecognised error code\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: Unrecognised error code\n Error code: %d", a_eResult); \ } \ } #endif diff --git a/src/flamegpu/io/XMLStateReader.cpp b/src/flamegpu/io/XMLStateReader.cpp index 5aa3b0b66..ee64a2241 100644 --- a/src/flamegpu/io/XMLStateReader.cpp +++ b/src/flamegpu/io/XMLStateReader.cpp @@ -30,9 +30,9 @@ namespace io { switch (a_eResult) { \ case tinyxml2::XML_ERROR_FILE_NOT_FOUND : \ case tinyxml2::XML_ERROR_FILE_COULD_NOT_BE_OPENED : \ - throw exception::InvalidInputFile("TinyXML error: File could not be opened.\n Error code: %d", a_eResult); \ + THROW exception::InvalidInputFile("TinyXML error: File could not be opened.\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_FILE_READ_ERROR : \ - throw exception::InvalidInputFile("TinyXML error: File could not be read.\n Error code: %d", a_eResult); \ + THROW exception::InvalidInputFile("TinyXML error: File could not be read.\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_PARSING_ELEMENT : \ case tinyxml2::XML_ERROR_PARSING_ATTRIBUTE : \ case tinyxml2::XML_ERROR_PARSING_TEXT : \ @@ -41,25 +41,25 @@ namespace io { case tinyxml2::XML_ERROR_PARSING_DECLARATION : \ case tinyxml2::XML_ERROR_PARSING_UNKNOWN : \ case tinyxml2::XML_ERROR_PARSING : \ - throw exception::TinyXMLError("TinyXML error: Error parsing file.\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: Error parsing file.\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_EMPTY_DOCUMENT : \ - throw exception::TinyXMLError("TinyXML error: XML_ERROR_EMPTY_DOCUMENT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ERROR_EMPTY_DOCUMENT\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_MISMATCHED_ELEMENT : \ - throw exception::TinyXMLError("TinyXML error: XML_ERROR_MISMATCHED_ELEMENT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ERROR_MISMATCHED_ELEMENT\n Error code: %d", a_eResult); \ case tinyxml2::XML_CAN_NOT_CONVERT_TEXT : \ - throw exception::TinyXMLError("TinyXML error: XML_CAN_NOT_CONVERT_TEXT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_CAN_NOT_CONVERT_TEXT\n Error code: %d", a_eResult); \ case tinyxml2::XML_NO_TEXT_NODE : \ - throw exception::TinyXMLError("TinyXML error: XML_NO_TEXT_NODE\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_NO_TEXT_NODE\n Error code: %d", a_eResult); \ case tinyxml2::XML_ELEMENT_DEPTH_EXCEEDED : \ - throw exception::TinyXMLError("TinyXML error: XML_ELEMENT_DEPTH_EXCEEDED\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ELEMENT_DEPTH_EXCEEDED\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_COUNT : \ - throw exception::TinyXMLError("TinyXML error: XML_ERROR_COUNT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ERROR_COUNT\n Error code: %d", a_eResult); \ case tinyxml2::XML_NO_ATTRIBUTE: \ - throw exception::TinyXMLError("TinyXML error: XML_NO_ATTRIBUTE\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_NO_ATTRIBUTE\n Error code: %d", a_eResult); \ case tinyxml2::XML_WRONG_ATTRIBUTE_TYPE : \ - throw exception::TinyXMLError("TinyXML error: XML_WRONG_ATTRIBUTE_TYPE\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_WRONG_ATTRIBUTE_TYPE\n Error code: %d", a_eResult); \ default: \ - throw exception::TinyXMLError("TinyXML error: Unrecognised error code\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: Unrecognised error code\n Error code: %d", a_eResult); \ } \ } #endif diff --git a/src/flamegpu/io/XMLStateWriter.cpp b/src/flamegpu/io/XMLStateWriter.cpp index 179462d89..20152c131 100644 --- a/src/flamegpu/io/XMLStateWriter.cpp +++ b/src/flamegpu/io/XMLStateWriter.cpp @@ -28,9 +28,9 @@ namespace io { switch (a_eResult) { \ case tinyxml2::XML_ERROR_FILE_NOT_FOUND : \ case tinyxml2::XML_ERROR_FILE_COULD_NOT_BE_OPENED : \ - throw exception::InvalidInputFile("TinyXML error: File could not be opened.\n Error code: %d", a_eResult); \ + THROW exception::InvalidInputFile("TinyXML error: File could not be opened.\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_FILE_READ_ERROR : \ - throw exception::InvalidInputFile("TinyXML error: File could not be read.\n Error code: %d", a_eResult); \ + THROW exception::InvalidInputFile("TinyXML error: File could not be read.\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_PARSING_ELEMENT : \ case tinyxml2::XML_ERROR_PARSING_ATTRIBUTE : \ case tinyxml2::XML_ERROR_PARSING_TEXT : \ @@ -39,25 +39,25 @@ namespace io { case tinyxml2::XML_ERROR_PARSING_DECLARATION : \ case tinyxml2::XML_ERROR_PARSING_UNKNOWN : \ case tinyxml2::XML_ERROR_PARSING : \ - throw exception::TinyXMLError("TinyXML error: Error parsing file.\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: Error parsing file.\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_EMPTY_DOCUMENT : \ - throw exception::TinyXMLError("TinyXML error: XML_ERROR_EMPTY_DOCUMENT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ERROR_EMPTY_DOCUMENT\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_MISMATCHED_ELEMENT : \ - throw exception::TinyXMLError("TinyXML error: XML_ERROR_MISMATCHED_ELEMENT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ERROR_MISMATCHED_ELEMENT\n Error code: %d", a_eResult); \ case tinyxml2::XML_CAN_NOT_CONVERT_TEXT : \ - throw exception::TinyXMLError("TinyXML error: XML_CAN_NOT_CONVERT_TEXT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_CAN_NOT_CONVERT_TEXT\n Error code: %d", a_eResult); \ case tinyxml2::XML_NO_TEXT_NODE : \ - throw exception::TinyXMLError("TinyXML error: XML_NO_TEXT_NODE\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_NO_TEXT_NODE\n Error code: %d", a_eResult); \ case tinyxml2::XML_ELEMENT_DEPTH_EXCEEDED : \ - throw exception::TinyXMLError("TinyXML error: XML_ELEMENT_DEPTH_EXCEEDED\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ELEMENT_DEPTH_EXCEEDED\n Error code: %d", a_eResult); \ case tinyxml2::XML_ERROR_COUNT : \ - throw exception::TinyXMLError("TinyXML error: XML_ERROR_COUNT\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_ERROR_COUNT\n Error code: %d", a_eResult); \ case tinyxml2::XML_NO_ATTRIBUTE: \ - throw exception::TinyXMLError("TinyXML error: XML_NO_ATTRIBUTE\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_NO_ATTRIBUTE\n Error code: %d", a_eResult); \ case tinyxml2::XML_WRONG_ATTRIBUTE_TYPE : \ - throw exception::TinyXMLError("TinyXML error: XML_WRONG_ATTRIBUTE_TYPE\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: XML_WRONG_ATTRIBUTE_TYPE\n Error code: %d", a_eResult); \ default: \ - throw exception::TinyXMLError("TinyXML error: Unrecognised error code\n Error code: %d", a_eResult); \ + THROW exception::TinyXMLError("TinyXML error: Unrecognised error code\n Error code: %d", a_eResult); \ } \ } #endif diff --git a/src/flamegpu/simulation/RunPlan.cpp b/src/flamegpu/simulation/RunPlan.cpp index c0af8ef17..38c36354d 100644 --- a/src/flamegpu/simulation/RunPlan.cpp +++ b/src/flamegpu/simulation/RunPlan.cpp @@ -30,7 +30,7 @@ void RunPlan::setRandomSimulationSeed(const uint64_t _random_seed) { } void RunPlan::setSteps(const unsigned int _steps) { if (_steps == 0 && !allow_0_steps) { - throw exception::OutOfBoundsException("Model description requires atleast 1 exit condition to have unlimited steps, " + THROW exception::OutOfBoundsException("Model description requires atleast 1 exit condition to have unlimited steps, " "in RunPlan::setSteps()"); } steps = _steps; diff --git a/src/flamegpu/simulation/RunPlanVector.cpp b/src/flamegpu/simulation/RunPlanVector.cpp index 522a90885..20e2b5d5f 100644 --- a/src/flamegpu/simulation/RunPlanVector.cpp +++ b/src/flamegpu/simulation/RunPlanVector.cpp @@ -27,7 +27,7 @@ void RunPlanVector::setRandomSimulationSeed(const uint64_t initial_seed, const u } void RunPlanVector::setSteps(const unsigned int steps) { if (steps == 0 && !allow_0_steps) { - throw exception::OutOfBoundsException("Model description requires atleast 1 exit condition to have unlimited steps, " + THROW exception::OutOfBoundsException("Model description requires atleast 1 exit condition to have unlimited steps, " "in RunPlanVector::setSteps()"); } for (auto &i : *this) {