Tidy up some use of Error for throw

modules/beast_core/diagnostic/ProtectedCall.cpp

@@ -34,10 +34,6 @@ namespace vf
 namespace
 {
 
-//
-// While this object is in scope, any Windows SEH
-// exceptions will be caught and re-thrown as an Error object.
-//
 class ScopedPlatformExceptionCatcher : public Uncopyable
 {
 public:
@@ -155,7 +151,7 @@ public:
                 break;
             }
 
-            Throw (Error ().fail (__FILE__, __LINE__, s, Error::platform));
+            beast_reportFatalError (s, __FILE__, __LINE__);
         }
 
         return s_sehPrev (ei);
@@ -218,26 +214,6 @@ bool CatchAny (Function <void (void)> f, bool returnFromException)
 
         caughtException = false;
     }
-    catch (Error& e)
-    {
-        if (!returnFromException)
-        {
-            JUCEApplication* app = JUCEApplication::getInstance ();
-
-            if (app)
-            {
-                app->unhandledException (
-                    &e,
-                    e.getSourceFilename (),
-                    e.getLineNumber ());
-            }
-            else
-            {
-                std::cout << e.what ();
-                std::unexpected ();
-            }
-        }
-    }
     catch (std::exception& e)
     {
         if (!returnFromException)

modules/beast_core/memory/FifoFreeStoreWithTLS.cpp

@@ -115,7 +115,7 @@ public:
         const size_t bytesNeeded = headerBytes + bytes;
 
         if (bytesNeeded > m_allocator.m_pages->getPageBytes ())
-            Throw (Error ().fail (__FILE__, __LINE__, TRANS ("the memory request was too large")));
+            fatal_error ("the memory request was too large");
 
         Header* header;
 

modules/beast_core/memory/FifoFreeStoreWithoutTLS.cpp

@@ -144,7 +144,7 @@ FifoFreeStoreWithoutTLS::FifoFreeStoreWithoutTLS ()
     : m_pages (GlobalPagedFreeStore::getInstance ())
 {
     if (m_pages->getPageBytes () < sizeof (Block) + 256)
-        Throw (Error ().fail (__FILE__, __LINE__, TRANS ("the block size is too small")));
+        fatal_error ("the block size is too small");
 
     m_active = newBlock ();
 }
@@ -161,7 +161,7 @@ void* FifoFreeStoreWithoutTLS::allocate (const size_t bytes)
     const size_t actual = sizeof (Header) + bytes;
 
     if (actual > m_pages->getPageBytes ())
-        Throw (Error ().fail (__FILE__, __LINE__, TRANS ("the memory request was too large")));
+        fatal_error ("the memory request was too large");
 
     Header* h;
 

modules/beast_core/memory/PagedFreeStore.cpp

@@ -123,16 +123,14 @@ void* PagedFreeStore::allocate ()
         const bool exhausted = m_newPagesLeft.release ();
 
         if (exhausted)
-            Throw (Error ().fail (__FILE__, __LINE__,
+            fatal_error ("the limit of memory allocations was reached");
-                                  TRANS ("the limit of memory allocations was reached")));
 
 #endif
 
         void* storage = ::malloc (m_pageBytes);
 
         if (!storage)
-            Throw (Error ().fail (__FILE__, __LINE__,
+            fatal_error ("a memory allocation failed");
-                                  TRANS ("a memory allocation failed")));
 
         page = new (storage) Page (this);
 

modules/beast_core/memory/PagedFreeStore.h

@@ -46,7 +46,7 @@ public:
     inline void* allocate (const size_t bytes)
     {
         if (bytes > m_pageBytes)
-            Throw (Error ().fail (__FILE__, __LINE__, "the size is too large"));
+            fatal_error ("the size is too large");
 
         return allocate ();
     }

modules/beast_core/misc/Result.cpp

@@ -64,7 +64,7 @@ bool Result::operator!= (const Result& other) const noexcept
 
 Result Result::fail (const String& errorMessage) noexcept
 {
-    return Result (errorMessage.isEmpty() ? "Unknown Error" : errorMessage);
+    return Result (errorMessage.isEmpty() ? "Unknown error" : errorMessage);
 }
 
 const String& Result::getErrorMessage() const noexcept

modules/beast_core/thread/Listeners.cpp

@@ -380,7 +380,7 @@ ListenersBase::Proxy::Proxy (void const* const member, const size_t bytes)
     : m_bytes (bytes)
 {
     if (bytes > maxMemberBytes)
-        Throw (Error ().fail (__FILE__, __LINE__, "the Proxy member is too large"));
+        fatal_error ("the Proxy member is too large");
 
     memcpy (m_member, member, bytes);
 }

modules/beast_sqdb/api/type_conversion_traits.h

@@ -72,9 +72,7 @@ struct type_conversion
     static void from_base(base_type const& in, indicator ind, T& out)
     {
         // null not allowed
-        if (ind == i_null)
+        check_precondition (ind != i_null);
-            Throw(Error().fail(__FILE__, __LINE__));
-
         out = in;
     }
 

modules/beast_sqdb/source/into_type.cpp

@@ -97,8 +97,7 @@ void standard_into_type::do_into()
     if (colType == SQLITE_NULL)
     {
         // null encountered with no indicator
-        if (!m_ind)
+        check_precondition (m_ind != nullptr);
-            Throw(Error().fail(__FILE__, __LINE__));
 
         *m_ind = i_null;
     }
@@ -164,7 +163,7 @@ void standard_into_type::do_into()
                 break;
 
             default:
-                Throw(Error().fail(__FILE__, __LINE__));
+                fatal_error ("unknown case");
             }
         }
         break;
@@ -188,7 +187,7 @@ void standard_into_type::do_into()
                 break;
 
             default:
-                Throw(Error().fail(__FILE__, __LINE__));
+                fatal_error ("unknown case");
             };
         }
         break;
@@ -208,7 +207,7 @@ void standard_into_type::do_into()
             break;
 
             case x_stdwstring:
-                Throw(Error().fail(__FILE__, __LINE__));
+                fatal_error ("invalid case");
                 break;
 
             case x_beastString:
@@ -276,7 +275,7 @@ void standard_into_type::do_into()
                     break;
 
                 default:
-                    Throw(Error().fail(__FILE__, __LINE__));
+                    fatal_error ("unknown case");
                 }
 
             }
@@ -286,10 +285,10 @@ void standard_into_type::do_into()
         break;
 
         case SQLITE_BLOB:
-            Throw(Error().fail(__FILE__, __LINE__));
+            fatal_error ("invalid case");
 
         default:
-            Throw(Error().fail(__FILE__, __LINE__));
+            fatal_error ("unknown case");
         };
     }
 

modules/beast_sqdb/source/session.cpp

@@ -67,14 +67,12 @@ public:
     {
         int threadSafe = sqlite3_threadsafe();
 
-        if (threadSafe == 0)
+        check_precondition (threadSafe != 0);
-            Throw(Error().fail(__FILE__, __LINE__, Error::assertFailed));
 
 #if 0
         int result = sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
 
-        if (result != SQLITE_OK)
+        check_postcondition (result == SQLITE_OK);
-            Throw(Error().fail(__FILE__, __LINE__, Error::assertFailed));
 #endif
 
         sqlite3_initialize();
@@ -115,8 +113,7 @@ session::~session()
 
 Error session::clone()
 {
-    if (m_connection)
+    check_precondition (! m_connection);
-        Throw(Error().fail(__FILE__, __LINE__));    // already open
 
     return open(m_fileName, m_connectString);
 }
@@ -134,8 +131,7 @@ Error session::open(String fileName, std::string options)
     Error err;
 
     // can't open twice
-    if (m_connection)
+    check_precondition (! m_connection);
-        Throw(err.fail(__FILE__, __LINE__, Error::fileInUse));
 
     int mode = 0;
     int flags = 0;
@@ -183,13 +179,12 @@ Error session::open(String fileName, std::string options)
                 }
                 else
                 {
-                    Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+                    fatal_error ("bad parameter");
                 }
             }
             else
             {
-                // duplicate
+                fatal_error ("duplicate parameter");
-                Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
             }
         }
 
@@ -210,13 +205,12 @@ Error session::open(String fileName, std::string options)
                 }
                 else
                 {
-                    Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+                    fatal_error ("bad parameter");
                 }
             }
             else
             {
-                // duplicate
+                fatal_error ("duplicate parameter");
-                Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
             }
         }
 
@@ -235,19 +229,17 @@ Error session::open(String fileName, std::string options)
                 }
                 else
                 {
-                    Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+                    fatal_error ("bad parameter");
                 }
             }
             else
             {
-                // duplicate
+                fatal_error ("duplicate parameter");
-                Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
             }
         }
         else
         {
-            // unknown option
+            fatal_error ("unknown parameter");
-            Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
         }
     }
 

modules/beast_sqdb/source/statement_imp.cpp

@@ -180,8 +180,7 @@ Error statement_imp::execute()
 {
     Error error;
 
-    if (!m_stmt)
+    check_precondition (m_stmt != nullptr);
-        Throw(Error().fail(__FILE__, __LINE__, Error::badParameter));
 
     // ???
     m_bGotData = false;
@@ -253,7 +252,7 @@ bool statement_imp::fetch(Error& error)
     else
     {
         // should never get SQLITE_OK here
-        Throw(Error().fail(__FILE__, __LINE__, Error::assertFailed));
+        fatal_error ("invalid result");
     }
 
     return m_bGotData;

modules/beast_sqdb/source/transaction.cpp

@@ -77,8 +77,7 @@ Error transaction::commit()
     Error error;
 
     // already handled
-    if (m_bHandled)
+    check_precondition (!m_bHandled);
-        Throw(Error().fail(__FILE__, __LINE__));
 
     // if commit() throws, m_bHandled will remain false
     // and the destructor will attempt a rollback.
@@ -93,8 +92,7 @@ Error transaction::commit()
 void transaction::rollback()
 {
     // already handled
-    if (m_bHandled)
+    check_precondition (!m_bHandled);
-        Throw(Error().fail(__FILE__, __LINE__));
 
     m_session.rollback();
     m_bHandled = true;

modules/beast_sqdb/source/use_type.cpp

@@ -87,8 +87,7 @@ inline T const& as(void const* v)
 {
     T const& val = *static_cast <T const*>(v);
 
-    if (val > T(std::numeric_limits<L>::max()))
+    check_precondition (val <= T(std::numeric_limits<L>::max()));
-        Throw(Error().fail(__FILE__, __LINE__));
 
     return val;
 }
@@ -203,7 +202,7 @@ void standard_use_type::do_use()
     case x_stdtm:
     case x_blob:
     default:
-        Throw(Error().fail(__FILE__, __LINE__, Error::badParameter));
+        fatal_error ("bad parameter");
     }
 
     if (result != SQLITE_OK)