From 436dbd7364cc23341ac7dffc685c9d094e6815ba Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 4 Oct 2016 17:32:17 -0600 Subject: [PATCH] Make exception messages more consistent. In particular, change the following two things: (i) Say 'Additional information' instead of 'Additional Information' because the rest of the text is also capitalized in the common way. (ii) Indent the actual (additional) error text by four characters, just like the other additional pieces of information. The result is that errors now look like this: -------------------------------------------------------- An error occurred in line <710> of file in function int main() The violated condition was: false Additional information: abcdef Stacktrace: ----------- #0 ./step-6: main -------------------------------------------------------- --- include/deal.II/base/exceptions.h | 12 ++++++------ source/base/exceptions.cc | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h index c5298b6417..dab519cdc7 100644 --- a/include/deal.II/base/exceptions.h +++ b/include/deal.II/base/exceptions.h @@ -393,7 +393,7 @@ namespace deal_II_exceptions Exception (const std::string &msg = defaulttext) : arg (msg) {} \ virtual ~Exception () DEAL_II_NOEXCEPT {} \ virtual void print_info (std::ostream &out) const { \ - out << arg << std::endl; \ + out << " " << arg << std::endl; \ } \ private: \ const std::string arg; \ @@ -411,7 +411,7 @@ namespace deal_II_exceptions Exception1 (const type1 a1) : arg1 (a1) {} \ virtual ~Exception1 () DEAL_II_NOEXCEPT {} \ virtual void print_info (std::ostream &out) const { \ - out outsequence << std::endl; \ + out << " " outsequence << std::endl; \ } \ private: \ const type1 arg1; \ @@ -431,7 +431,7 @@ namespace deal_II_exceptions arg1 (a1), arg2(a2) {} \ virtual ~Exception2 () DEAL_II_NOEXCEPT {} \ virtual void print_info (std::ostream &out) const { \ - out outsequence << std::endl; \ + out << " " outsequence << std::endl; \ } \ private: \ const type1 arg1; \ @@ -452,7 +452,7 @@ namespace deal_II_exceptions arg1 (a1), arg2(a2), arg3(a3) {} \ virtual ~Exception3 () DEAL_II_NOEXCEPT {} \ virtual void print_info (std::ostream &out) const { \ - out outsequence << std::endl; \ + out << " " outsequence << std::endl; \ } \ private: \ const type1 arg1; \ @@ -475,7 +475,7 @@ namespace deal_II_exceptions arg1 (a1), arg2(a2), arg3(a3), arg4(a4) {} \ virtual ~Exception4 () DEAL_II_NOEXCEPT {} \ virtual void print_info (std::ostream &out) const { \ - out outsequence << std::endl; \ + out << " " outsequence << std::endl; \ } \ private: \ const type1 arg1; \ @@ -499,7 +499,7 @@ namespace deal_II_exceptions arg1 (a1), arg2(a2), arg3(a3), arg4(a4), arg5(a5) {} \ virtual ~Exception5 () DEAL_II_NOEXCEPT {} \ virtual void print_info (std::ostream &out) const { \ - out outsequence << std::endl; \ + out << " " outsequence << std::endl; \ } \ private: \ const type1 arg1; \ diff --git a/source/base/exceptions.cc b/source/base/exceptions.cc index 685623b2ed..405c597cc1 100644 --- a/source/base/exceptions.cc +++ b/source/base/exceptions.cc @@ -173,14 +173,14 @@ void ExceptionBase::print_exc_data (std::ostream &out) const << " " << exc << std::endl; // finally print the additional information the exception provides: - out << "Additional Information: " << std::endl; + out << "Additional information: " << std::endl; } void ExceptionBase::print_info (std::ostream &out) const { - out << "(none)" << std::endl; + out << " (none)" << std::endl; } -- 2.39.5