Cppcheck: reduced scope of try-catch for simplecpp::Output in checkInternal()

Author: firewave

lib/cppcheck.cpp

@@ -1142,11 +1142,23 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
             try {
                 TokenList tokenlist{mSettings, file.lang()};
 
-                // Create tokens, skip rest of iteration if failed
-                Timer::run("Tokenizer::createTokens", mSettings.showtime, &s_timerResults, [&]() {
-                    simplecpp::TokenList tokensP = preprocessor.preprocess(currentConfig, files, true);
-                    tokenlist.createTokens(std::move(tokensP));
-                });
+                try {
+                    // Create tokens, skip rest of iteration if failed
+                    Timer::run("Tokenizer::createTokens", mSettings.showtime, &s_timerResults, [&]() {
+                        simplecpp::TokenList tokensP = preprocessor.preprocess(currentConfig, files, true);
+                        tokenlist.createTokens(std::move(tokensP));
+                    });
+                } catch (const simplecpp::Output &o) {
+                    // #error etc during preprocessing
+                    configurationError.push_back((currentConfig.empty() ? "\'\'" : currentConfig) + " : [" + o.location.file() + ':' + std::to_string(o.location.line) + "] " + o.msg);
+                    --checkCount; // don't count invalid configurations
+
+                    if (!hasValidConfig && currCfg == *configurations.rbegin()) {
+                        // If there is no valid configuration then report error..
+                        preprocessor.error(o.location.file(), o.location.line, o.location.col, o.msg, o.type);
+                    }
+                    continue;
+                }
                 hasValidConfig = true;
 
                 Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
@@ -1215,17 +1227,6 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
                     ErrorMessage errmsg = ErrorMessage::fromInternalError(e, &tokenizer.list, file.spath());
                     mErrorLogger.reportErr(errmsg);
                 }
-            } catch (const simplecpp::Output &o) {
-                // #error etc during preprocessing
-                configurationError.push_back((currentConfig.empty() ? "\'\'" : currentConfig) + " : [" + o.location.file() + ':' + std::to_string(o.location.line) + "] " + o.msg);
-                --checkCount; // don't count invalid configurations
-
-                if (!hasValidConfig && currCfg == *configurations.rbegin()) {
-                    // If there is no valid configuration then report error..
-                    preprocessor.error(o.location.file(), o.location.line, o.location.col, o.msg, o.type);
-                }
-                continue;
-
             } catch (const TerminateException &) {
                 // Analysis is terminated
                 if (analyzerInformation)

lib/cppcheck.h

@@ -203,7 +203,7 @@ class CPPCHECKLIB CppCheck {
      * @brief Check a file using stream
      * @param file the file
      * @param cfgname  cfg name
-     * @param createTokenList a function to create the simplecpp::TokenList with - throws simplecpp::Output
+     * @param createTokenList a function to create the simplecpp::TokenList with
      * @return number of errors found
      */
     unsigned int checkInternal(const FileWithDetails& file, const std::string &cfgname, int fileIndex, const CreateTokenListFn& createTokenList);

lib/preprocessor.h

@@ -118,6 +118,9 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
 
     void setPlatformInfo();
 
+    /**
+     * @throws simplecpp::Output thrown in case of preprocessing error if throwError is true
+     */
     simplecpp::TokenList preprocess(const std::string &cfg, std::vector<std::string> &files, bool throwError = false);
 
     std::string getcode(const std::string &cfg, std::vector<std::string> &files, bool writeLocations);
@@ -146,6 +149,9 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
 private:
     static bool hasErrors(const simplecpp::Output &output);
 
+    /**
+     * @throws simplecpp::Output thrown in case of preprocessing error if throwError is true
+     */
     bool handleErrors(const simplecpp::OutputList &outputList, bool throwError);
 
     static void simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList);