Merge branch 'noreturn' into 'master'

Sprinkle some [[noreturn]] where possible

See merge request OpenMW/openmw!793

components/bsa/bsa_file.cpp

@@ -33,7 +33,7 @@ using namespace Bsa;
 
 
 /// Error handling
-void BSAFile::fail(const std::string &msg)
+[[noreturn]] void BSAFile::fail(const std::string &msg)
 {
     throw std::runtime_error("BSA Error: " + msg + "\nArchive: " + mFilename);
 }

components/bsa/bsa_file.hpp

@@ -106,7 +106,7 @@ protected:
     Lookup mLookup;
 
     /// Error handling
-    void fail(const std::string &msg);
+    [[noreturn]] void fail(const std::string &msg);
 
     /// Read header information from the input source
     virtual void readHeader();

components/compiler/parser.cpp

@@ -10,7 +10,7 @@ namespace Compiler
 {
     // Report the error and throw an exception.
 
-    void Parser::reportSeriousError (const std::string& message, const TokenLoc& loc)
+    [[noreturn]] void Parser::reportSeriousError (const std::string& message, const TokenLoc& loc)
     {
         mErrorHandler.error (message, loc);
         throw SourceException();
@@ -25,7 +25,7 @@ namespace Compiler
 
     // Report an unexpected EOF condition.
 
-    void Parser::reportEOF()
+    [[noreturn]] void Parser::reportEOF()
     {
         mErrorHandler.endOfFile();
         throw EOFException();

components/compiler/parser.hpp

@@ -23,13 +23,13 @@ namespace Compiler
 
         protected:
 
-            void reportSeriousError (const std::string& message, const TokenLoc& loc);
+            [[noreturn]] void reportSeriousError (const std::string& message, const TokenLoc& loc);
             ///< Report the error and throw a exception.
 
             void reportWarning (const std::string& message, const TokenLoc& loc);
             ///< Report the warning without throwing an exception.
 
-            void reportEOF();
+            [[noreturn]] void reportEOF();
             ///< Report an unexpected EOF condition.
 
             ErrorHandler& getErrorHandler();

components/esm/esmreader.cpp

@@ -315,7 +315,7 @@ std::string ESMReader::getString(int size)
     return std::string (ptr, size);
 }
 
-void ESMReader::fail(const std::string &msg)
+[[noreturn]] void ESMReader::fail(const std::string &msg)
 {
     std::stringstream ss;
 

components/esm/esmreader.hpp

@@ -250,7 +250,7 @@ public:
   void skip(int bytes);
 
   /// Used for error handling
-  void fail(const std::string &msg);
+  [[noreturn]] void fail(const std::string &msg);
 
   /// Sets font encoder for ESM strings
   void setEncoder(ToUTF8::Utf8Encoder* encoder);

components/fontloader/fontloader.cpp

@@ -132,7 +132,7 @@ namespace
             return encoder.getUtf8(std::string(1, c));
     }
 
-    void fail (Files::IStreamPtr file, const std::string& fileName, const std::string& message)
+    [[noreturn]] void fail (Files::IStreamPtr file, const std::string& fileName, const std::string& message)
     {
         std::stringstream error;
         error << "Font loading error: " << message;

components/interpreter/interpreter.cpp

@@ -81,13 +81,13 @@ namespace Interpreter
         abortUnknownSegment (code);
     }
 
-    void Interpreter::abortUnknownCode (int segment, int opcode)
+    [[noreturn]] void Interpreter::abortUnknownCode (int segment, int opcode)
     {
         const std::string error = "unknown opcode " + std::to_string(opcode) + " in segment " + std::to_string(segment);
         throw std::runtime_error (error);
     }
 
-    void Interpreter::abortUnknownSegment (Type_Code code)
+    [[noreturn]] void Interpreter::abortUnknownSegment (Type_Code code)
     {
         const std::string error = "opcode outside of the allocated segment range: " + std::to_string(code);
         throw std::runtime_error (error);

components/interpreter/interpreter.hpp

@@ -28,9 +28,9 @@ namespace Interpreter
 
             void execute (Type_Code code);
 
-            void abortUnknownCode (int segment, int opcode);
+            [[noreturn]] void abortUnknownCode (int segment, int opcode);
 
-            void abortUnknownSegment (Type_Code code);
+            [[noreturn]] void abortUnknownSegment (Type_Code code);
 
             void begin();
 

components/nif/niffile.hpp

@@ -92,11 +92,9 @@ public:
     };
 
     /// Used if file parsing fails
-    void fail(const std::string &msg) const
+    [[noreturn]] void fail(const std::string &msg) const
     {
-        std::string err = " NIFFile Error: " + msg;
+        throw std::runtime_error(" NIFFile Error: " + msg + "\nFile: " + filename);
-        err += "\nFile: " + filename;
-        throw std::runtime_error(err);
     }
     /// Used when something goes wrong, but not catastrophically so
     void warn(const std::string &msg) const

components/nifbullet/bulletnifloader.hpp

@@ -43,7 +43,7 @@ public:
         Log(Debug::Warning) << "NIFLoader: Warn: " << msg;
     }
 
-    void fail(const std::string &msg)
+    [[noreturn]] void fail(const std::string &msg)
     {
         Log(Debug::Error) << "NIFLoader: Fail: "<< msg;
         abort();

components/settings/parser.cpp

@@ -318,7 +318,7 @@ bool Settings::SettingsFileParser::skipWhiteSpace(size_t& i, std::string& str)
     return i < str.size();
 }
 
-void Settings::SettingsFileParser::fail(const std::string& message)
+[[noreturn]] void Settings::SettingsFileParser::fail(const std::string& message)
 {
     std::stringstream error;
     error << "Error on line " << mLine << " in " << mFile << ":\n" << message;

components/settings/parser.hpp

@@ -20,7 +20,7 @@ namespace Settings
         /// @return false if we have reached the end of the string
         bool skipWhiteSpace(size_t& i, std::string& str);
 
-        void fail(const std::string& message);
+        [[noreturn]] void fail(const std::string& message);
 
         std::string mFile;
         int mLine = 0;