Fix #14086 (simplecpp: Update to 1.5.2) (danmar#7762)

Author: glankk

externals/simplecpp/simplecpp.cpp

@@ -745,7 +745,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
 
         // number or name
         if (isNameChar(ch)) {
-            const bool num = std::isdigit(ch);
+            const bool num = !!std::isdigit(ch);
             while (stream.good() && isNameChar(ch)) {
                 currentToken += ch;
                 ch = stream.readChar();
@@ -886,7 +886,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             }
 
             if (prefix.empty())
-                push_back(new Token(s, location, std::isspace(stream.peekChar()))); // push string without newlines
+                push_back(new Token(s, location, !!std::isspace(stream.peekChar()))); // push string without newlines
             else
                 back()->setstr(prefix + s);
 
@@ -916,7 +916,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             }
         }
 
-        push_back(new Token(currentToken, location, std::isspace(stream.peekChar())));
+        push_back(new Token(currentToken, location, !!std::isspace(stream.peekChar())));
 
         if (multiline)
             location.col += currentToken.size();
@@ -3109,15 +3109,13 @@ bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)
 #endif
 }
 
-simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList *outputList)
+simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, FileDataCache cache)
 {
 #ifdef SIMPLECPP_WINDOWS
     if (dui.clearIncludeCache)
         nonExistingFilesCache.clear();
 #endif
 
-    FileDataCache cache;
-
     std::list<const Token *> filelist;
 
     // -include files
@@ -3173,15 +3171,21 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
         const bool systemheader = (htok->str()[0] == '<');
         const std::string header(htok->str().substr(1U, htok->str().size() - 2U));
 
-        FileData *const filedata = cache.get(sourcefile, header, dui, systemheader, filenames, outputList).first;
-        if (!filedata)
+        const auto loadResult = cache.get(sourcefile, header, dui, systemheader, filenames, outputList);
+        const bool loaded = loadResult.second;
+
+        if (!loaded)
+            continue;
+
+        FileData *const filedata = loadResult.first;
+
+        if (!filedata->tokens.front())
             continue;
 
         if (dui.removeComments)
             filedata->tokens.removeComments();
 
-        if (filedata->tokens.front())
-            filelist.push_back(filedata->tokens.front());
+        filelist.push_back(filedata->tokens.front());
     }
 
     return cache;
@@ -3236,7 +3240,7 @@ static std::string getDateDefine(const struct tm *timep)
 static std::string getTimeDefine(const struct tm *timep)
 {
     char buf[] = "??:??:??";
-    strftime(buf, sizeof(buf), "%T", timep);
+    strftime(buf, sizeof(buf), "%H:%M:%S", timep);
     return std::string("\"").append(buf).append("\"");
 }
 

externals/simplecpp/simplecpp.h

@@ -353,49 +353,6 @@ namespace simplecpp {
         bool removeComments; /** remove comment tokens from included files */
     };
 
-    SIMPLECPP_LIB long long characterLiteralToLL(const std::string& str);
-
-    SIMPLECPP_LIB FileDataCache load(const TokenList &rawtokens, std::vector<std::string> &filenames, const DUI &dui, OutputList *outputList = nullptr);
-
-    /**
-     * Preprocess
-     * @todo simplify interface
-     * @param output TokenList that receives the preprocessing output
-     * @param rawtokens Raw tokenlist for top sourcefile
-     * @param files internal data of simplecpp
-     * @param cache output from simplecpp::load()
-     * @param dui defines, undefs, and include paths
-     * @param outputList output: list that will receive output messages
-     * @param macroUsage output: macro usage
-     * @param ifCond output: #if/#elif expressions
-     */
-    SIMPLECPP_LIB void preprocess(TokenList &output, const TokenList &rawtokens, std::vector<std::string> &files, FileDataCache &cache, const DUI &dui, OutputList *outputList = nullptr, std::list<MacroUsage> *macroUsage = nullptr, std::list<IfCond> *ifCond = nullptr);
-
-    /**
-     * Deallocate data
-     */
-    SIMPLECPP_LIB void cleanup(FileDataCache &cache);
-
-    /** Simplify path */
-    SIMPLECPP_LIB std::string simplifyPath(std::string path);
-
-    /** Convert Cygwin path to Windows path */
-    SIMPLECPP_LIB std::string convertCygwinToWindowsPath(const std::string &cygwinPath);
-
-    /** Returns the C version a given standard */
-    SIMPLECPP_LIB cstd_t getCStd(const std::string &std);
-
-    /** Returns the C++ version a given standard */
-    SIMPLECPP_LIB cppstd_t getCppStd(const std::string &std);
-
-    /** Returns the __STDC_VERSION__ value for a given standard */
-    SIMPLECPP_LIB std::string getCStdString(const std::string &std);
-    SIMPLECPP_LIB std::string getCStdString(cstd_t std);
-
-    /** Returns the __cplusplus value for a given standard */
-    SIMPLECPP_LIB std::string getCppStdString(const std::string &std);
-    SIMPLECPP_LIB std::string getCppStdString(cppstd_t std);
-
     struct SIMPLECPP_LIB FileData {
         /** The canonical filename associated with this data */
         std::string filename;
@@ -503,8 +460,50 @@ namespace simplecpp {
         container_type mData;
         name_map_type mNameMap;
         id_map_type mIdMap;
-
     };
+
+    SIMPLECPP_LIB long long characterLiteralToLL(const std::string& str);
+
+    SIMPLECPP_LIB FileDataCache load(const TokenList &rawtokens, std::vector<std::string> &filenames, const DUI &dui, OutputList *outputList = nullptr, FileDataCache cache = {});
+
+    /**
+     * Preprocess
+     * @todo simplify interface
+     * @param output TokenList that receives the preprocessing output
+     * @param rawtokens Raw tokenlist for top sourcefile
+     * @param files internal data of simplecpp
+     * @param cache output from simplecpp::load()
+     * @param dui defines, undefs, and include paths
+     * @param outputList output: list that will receive output messages
+     * @param macroUsage output: macro usage
+     * @param ifCond output: #if/#elif expressions
+     */
+    SIMPLECPP_LIB void preprocess(TokenList &output, const TokenList &rawtokens, std::vector<std::string> &files, FileDataCache &cache, const DUI &dui, OutputList *outputList = nullptr, std::list<MacroUsage> *macroUsage = nullptr, std::list<IfCond> *ifCond = nullptr);
+
+    /**
+     * Deallocate data
+     */
+    SIMPLECPP_LIB void cleanup(FileDataCache &cache);
+
+    /** Simplify path */
+    SIMPLECPP_LIB std::string simplifyPath(std::string path);
+
+    /** Convert Cygwin path to Windows path */
+    SIMPLECPP_LIB std::string convertCygwinToWindowsPath(const std::string &cygwinPath);
+
+    /** Returns the C version a given standard */
+    SIMPLECPP_LIB cstd_t getCStd(const std::string &std);
+
+    /** Returns the C++ version a given standard */
+    SIMPLECPP_LIB cppstd_t getCppStd(const std::string &std);
+
+    /** Returns the __STDC_VERSION__ value for a given standard */
+    SIMPLECPP_LIB std::string getCStdString(const std::string &std);
+    SIMPLECPP_LIB std::string getCStdString(cstd_t std);
+
+    /** Returns the __cplusplus value for a given standard */
+    SIMPLECPP_LIB std::string getCppStdString(const std::string &std);
+    SIMPLECPP_LIB std::string getCppStdString(cppstd_t std);
 }
 
 #if defined(_MSC_VER)