kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: simplify Exception

Browse Source 
Remove repetition. Add functions to replace macros, but keep macros
in use for now as some compilers have broken std::source_location
support.
This commit is contained in:
bofdahof
2025-03-18 17:47:10 +10:00
committed by Ladislav Michl
parent a1c5950d9a
commit 838178bb1c
4 changed files with 354 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Base/Interpreter.cpp
View File

@@ -45,7 +45,7 @@ using namespace Base;
PyException::PyException(const Py::Object& obj)
{
_sErrMsg = obj.as_string();
setMessage(obj.as_string());
// WARNING: we are assuming that python type object will never be
// destroyed, so we don't keep reference here to save book-keeping in
// our copy constructor and destructor
@@ -64,7 +64,7 @@ PyException::PyException()
std::string prefix = PP_last_error_type; /* exception name text */
std::string error = PP_last_error_info; /* exception data text */
_sErrMsg = error;
setMessage(error);
_errorType = prefix;
// NOLINTNEXTLINE
@@ -106,17 +106,17 @@ void PyException::raiseException()
std::string exceptionname;
if (_exceptionType == Base::PyExc_FC_FreeCADAbort) {
edict.setItem("sclassname", Py::String(typeid(Base::AbortException).name()));
edict.setItem("sclassname", Py::String(typeid(AbortException).name()));
}
if (_isReported) {
if (getReported()) {
edict.setItem("breported", Py::True());
}
Base::ExceptionFactory::Instance().raiseException(edict.ptr());
}
if (_exceptionType == Base::PyExc_FC_FreeCADAbort) {
Base::AbortException exc(_sErrMsg.c_str());
exc.setReported(_isReported);
if (_exceptionType == PyExc_FC_FreeCADAbort) {
AbortException exc(getMessage());
exc.setReported(getReported());
throw exc;
}
@@ -125,16 +125,16 @@ void PyException::raiseException()
void PyException::ReportException() const
{
if (!_isReported) {
_isReported = true;
if (!getReported()) {
setReported(true);
// set sys.last_vars to make post-mortem debugging work
PyGILStateLocker locker;
PySys_SetObject("last_traceback", PP_last_traceback);
Base::Console().DeveloperError("pyException",
"%s%s: %s\n",
_stackTrace.c_str(),
_errorType.c_str(),
what());
Console().DeveloperError("pyException",
"%s%s: %s\n",
_stackTrace.c_str(),
_errorType.c_str(),
what());
}
}
@@ -187,7 +187,7 @@ SystemExitException::SystemExitException()
}
}
_sErrMsg = errMsg;
setMessage(errMsg);
_exitCode = errCode;
}
@@ -656,7 +656,7 @@ std::string InterpreterSingleton::init(int argc, char* argv[])
}
return getPythonPath();
}
catch (const Base::Exception& e) {
catch (const Exception& e) {
e.ReportException();
throw;
}