add dui option for keeping comments in preprocessed source

Author: ludviggunne

main.cpp

@@ -41,7 +41,7 @@ int main(int argc, char **argv)
 
     // Settings..
     simplecpp::DUI dui;
-    dui.removeComments = true;
+    dui.removeIncludeComments = true;
     bool quiet = false;
     bool error_only = false;
     for (int i = 1; i < argc; i++) {
@@ -242,7 +242,8 @@ int main(int argc, char **argv)
             f.close();
             rawtokens = new simplecpp::TokenList(filename,files,&outputList);
         }
-        rawtokens->removeComments();
+        if (dui.removeSourceComments)
+            rawtokens->removeComments();
         simplecpp::FileDataCache filedata;
         simplecpp::preprocess(outputTokens, *rawtokens, files, filedata, dui, &outputList);
         simplecpp::cleanup(filedata);

simplecpp.cpp

@@ -3152,7 +3152,7 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::tryload(FileDat
 
     auto *const data = new FileData {path, TokenList(path, filenames, outputList)};
 
-    if (dui.removeComments)
+    if (dui.removeIncludeComments)
         data->tokens.removeComments();
 
     name_it->second = data;
@@ -3293,7 +3293,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
         if (!filedata->tokens.front())
             continue;
 
-        if (dui.removeComments)
+        if (dui.removeIncludeComments)
             filedata->tokens.removeComments();
 
         filelist.emplace_back(filedata->tokens.front());
@@ -3332,7 +3332,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
         if (!filedata->tokens.front())
             continue;
 
-        if (dui.removeComments)
+        if (dui.removeIncludeComments)
             filedata->tokens.removeComments();
 
         filelist.emplace_back(filedata->tokens.front());
@@ -3341,7 +3341,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
     return cache;
 }
 
-static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token *&tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList *outputList)
+static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token *&tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList *outputList, const simplecpp::DUI &dui)
 {
     const simplecpp::Token * const tok = tok1;
     const simplecpp::MacroMap::const_iterator it = tok->name ? macros.find(tok->str()) : macros.end();
@@ -3372,7 +3372,7 @@ static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token
         }
         output.takeTokens(value);
     } else {
-        if (!tok->comment)
+        if (!tok->comment || !dui.removeSourceComments)
             output.push_back(new simplecpp::Token(*tok));
         tok1 = tok->next;
     }
@@ -3647,7 +3647,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 TokenList inc2(files);
                 if (!inc1.empty() && inc1.cfront()->name) {
                     const Token *inctok = inc1.cfront();
-                    if (!preprocessToken(inc2, inctok, macros, files, outputList)) {
+                    if (!preprocessToken(inc2, inctok, macros, files, outputList, dui)) {
                         output.clear();
                         return;
                     }
@@ -3817,7 +3817,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         maybeUsedMacros[rawtok->next->str()].emplace_back(rawtok->next->location);
 
                         const Token *tmp = tok;
-                        if (!preprocessToken(expr, tmp, macros, files, outputList)) {
+                        if (!preprocessToken(expr, tmp, macros, files, outputList, dui)) {
                             output.clear();
                             return;
                         }
@@ -3915,7 +3915,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
         const Location loc(rawtok->location);
         TokenList tokens(files);
 
-        if (!preprocessToken(tokens, rawtok, macros, files, outputList)) {
+        if (!preprocessToken(tokens, rawtok, macros, files, outputList, dui)) {
             output.clear();
             return;
         }

simplecpp.h

@@ -438,7 +438,8 @@ namespace simplecpp {
         std::list<std::string> includes;
         std::string std;
         bool clearIncludeCache{};
-        bool removeComments{}; /** remove comment tokens from included files */
+        bool removeIncludeComments{}; /** remove comment tokens from included files */
+        bool removeSourceComments{true}; /** remove comment tokens from preprocessed files */
     };
 
     struct SIMPLECPP_LIB FileData {