1

Author: danmar

main.cpp

@@ -17,6 +17,7 @@ int main(int argc, char **argv)
 {
     bool error = false;
     const char *filename = nullptr;
+    bool precompile = false;
     bool use_istream = false;
 
     // Settings..
@@ -66,6 +67,12 @@ int main(int argc, char **argv)
                 quiet = true;
                 found = true;
                 break;
+            case 'p':
+                if (std::strcmp(arg, "-pc")==0) {
+                    precompile = true;
+                    found = true;
+                }
+                break;
             case 'e':
                 error_only = true;
                 found = true;
@@ -102,6 +109,7 @@ int main(int argc, char **argv)
         std::cout << "  -q              Quiet mode (no output)." << std::endl;
         std::cout << "  -is             Use std::istream interface." << std::endl;
         std::cout << "  -e              Output errors only." << std::endl;
+        std::cout << "  -pc             Precompile header." << std::endl;
         std::exit(0);
     }
 
@@ -123,15 +131,20 @@ int main(int argc, char **argv)
     }
     rawtokens->removeComments();
     simplecpp::TokenList outputTokens(files);
-    std::map<std::string, simplecpp::TokenList*> filedata;
-    simplecpp::preprocess(outputTokens, *rawtokens, files, filedata, dui, &outputList);
-    simplecpp::cleanup(filedata);
+    if (precompile) {
+        std::ofstream f(filename + std::string(".pc"));
+        f << simplecpp::precompileHeader(*rawtokens, files, dui, &outputList);
+    } else {
+        std::map<std::string, simplecpp::TokenList*> filedata;
+        simplecpp::preprocess(outputTokens, *rawtokens, files, filedata, dui, &outputList);
+        simplecpp::cleanup(filedata);
+    }
     delete rawtokens;
     rawtokens = nullptr;
 
     // Output
     if (!quiet) {
-        if (!error_only)
+        if (!error_only && !precompile)
             std::cout << outputTokens.stringify() << std::endl;
 
         for (const simplecpp::Output &output : outputList) {

simplecpp.cpp

@@ -3314,8 +3314,10 @@ static std::string getTimeDefine(const struct tm *timep)
     return std::string("\"").append(buf).append("\"");
 }
 
-void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, std::map<std::string, simplecpp::TokenList *> &filedata, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond)
+static void simplecppPreprocess(simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, std::map<std::string, simplecpp::TokenList *> &filedata, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond, simplecpp::MacroMap& macros)
 {
+    using namespace simplecpp;
+
 #ifdef SIMPLECPP_WINDOWS
     if (dui.clearIncludeCache)
         nonExistingFilesCache.clear();
@@ -3347,7 +3349,6 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     std::vector<std::string> dummy;
 
     const bool hasInclude = isCpp17OrLater(dui);
-    MacroMap macros;
     for (std::list<std::string>::const_iterator it = dui.defines.begin(); it != dui.defines.end(); ++it) {
         const std::string &macrostr = *it;
         const std::string::size_type eq = macrostr.find('=');
@@ -3792,6 +3793,64 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     }
 }
 
+void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, std::map<std::string, simplecpp::TokenList *> &filedata, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond)
+{
+    MacroMap macroMap;
+    simplecppPreprocess(output,
+                        rawtokens,
+                        files,
+                        filedata,
+                        dui,
+                        outputList,
+                        macroUsage,
+                        ifCond,
+                        macroMap);
+}
+
+
+std::string simplecpp::precompileHeader(const TokenList &rawtokens, std::vector<std::string> &files, const DUI &dui, OutputList *outputList)
+{
+    std::map<std::string, TokenList*> filedata;
+    simplecpp::TokenList output(files);
+    std::list<simplecpp::MacroUsage> macroUsage;
+    std::list<simplecpp::IfCond> ifCond;
+    simplecpp::MacroMap macroMap;
+    simplecppPreprocess(output,
+                        rawtokens,
+                        files,
+                        filedata,
+                        dui,
+                        outputList,
+                        &macroUsage,
+                        &ifCond,
+                        macroMap);
+
+    std::string ret;
+    unsigned int fileIndex = 0;
+    unsigned int line = 0;
+    unsigned int col = 0;
+    for (const simplecpp::Token *tok = output.cfront(); tok; tok = tok->next) {
+        ret += "\n";
+        if (tok->location.fileIndex != fileIndex) {
+            fileIndex = tok->location.fileIndex;
+            ret += "f" + toString(fileIndex);
+        }
+        if (tok->location.line != line) {
+            line = tok->location.line;
+            ret += "l" + toString(line);
+        }
+        if (tok->location.col != col) {
+            col = tok->location.col;
+            ret += "c" + toString(col);
+        }
+        ret += ":" + tok->str();
+    }
+    for (simplecpp::MacroMap::const_iterator it = macroMap.begin(); it != macroMap.end(); ++it) {
+        ret += "\nM" + it->second.name();
+    }
+    return ret;
+}
+
 void simplecpp::cleanup(std::map<std::string, TokenList*> &filedata)
 {
     for (std::map<std::string, TokenList*>::iterator it = filedata.begin(); it != filedata.end(); ++it)

simplecpp.h

@@ -365,6 +365,16 @@ namespace simplecpp {
      */
     SIMPLECPP_LIB void preprocess(TokenList &output, const TokenList &rawtokens, std::vector<std::string> &files, std::map<std::string, TokenList*> &filedata, const DUI &dui, OutputList *outputList = nullptr, std::list<MacroUsage> *macroUsage = nullptr, std::list<IfCond> *ifCond = nullptr);
 
+    /**
+     * Precompile header
+     * @param rawtokens Raw tokenlist for top sourcefile
+     * @param files internal data of simplecpp
+     * @param dui defines, undefs, and include paths
+     * @param outputList output: list that will receive output messages
+     * @return precompiled header data
+     */
+    SIMPLECPP_LIB std::string precompileHeader(const TokenList &rawtokens, std::vector<std::string> &files, const DUI &dui, OutputList *outputList = nullptr);
+
     /**
      * Deallocate data
      */