feat: Add convenient API to simplecpp:DUI for adding different type of search paths

Author: jcfr

main.cpp

@@ -43,13 +43,13 @@ int main(int argc, char **argv)
             }
             case 'I': { // include path
                 const char * const value = arg[2] ? (argv[i] + 2) : argv[++i];
-                dui.searchPaths.push_back({value, simplecpp::DUI::PathKind::Include});
+                dui.addIncludePath(value);
                 found = true;
                 break;
             }
             case 'F': { // framework path
                 const char * const value = arg[2] ? (argv[i] + 2) : argv[++i];
-                dui.searchPaths.push_back({value, simplecpp::DUI::PathKind::Framework});
+                dui.addFrameworkPath(value);
                 found = true;
                 break;
             }
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
                     use_istream = true;
                     found = true;
                 } else if (std::strncmp(arg, "-iframework", 11) == 0) {
-                    dui.searchPaths.push_back({arg + 11, simplecpp::DUI::PathKind::SystemFramework});
+                    dui.addSystemFrameworkPath(arg + 11);
                     found = true;
                 }
                 break;

simplecpp.h

@@ -423,6 +423,19 @@ namespace simplecpp {
             PathKind kind;
         };
 
+        // Mirrors compiler option -I<dir>
+        void addIncludePath(const std::string& path) {
+            searchPaths.push_back({path, PathKind::Include});
+        }
+        // Mirrors compiler option -F<dir>
+        void addFrameworkPath(const std::string& path) {
+            searchPaths.push_back({path, PathKind::Framework});
+        }
+        // Mirrors compiler option -iframework<dir>
+        void addSystemFrameworkPath(const std::string& path) {
+            searchPaths.push_back({path, PathKind::SystemFramework});
+        }
+
         std::list<std::string> defines;
         std::set<std::string> undefined;
 

test.cpp

@@ -2158,11 +2158,9 @@ static void appleFrameworkIncludeTest()
     simplecpp::TokenList tokens2(files);
     simplecpp::DUI dui;
 #ifdef SIMPLECPP_TEST_SOURCE_DIR
-    dui.searchPaths.push_back({testSourceDir + "/testsuite",
-                               simplecpp::DUI::PathKind::Framework
-                              });
+    dui.addFrameworkPath(testSourceDir + "/testsuite");
 #else
-    dui.searchPaths.push_back({"./testsuite", simplecpp::DUI::PathKind::Framework});
+    dui.addFrameworkPath("./testsuite");
 #endif
     simplecpp::OutputList outputList;
     simplecpp::preprocess(tokens2, rawtokens, files, cache, dui, &outputList);
@@ -2187,11 +2185,9 @@ static void appleFrameworkHasIncludeTest()
     simplecpp::TokenList tokens2(files);
     simplecpp::DUI dui;
 #ifdef SIMPLECPP_TEST_SOURCE_DIR
-    dui.searchPaths.push_back({testSourceDir + "/testsuite",
-                               simplecpp::DUI::PathKind::Framework
-                              });
+    dui.addFrameworkPath(testSourceDir + "/testsuite");
 #else
-    dui.searchPaths.push_back({"./testsuite", simplecpp::DUI::PathKind::Framework});
+    dui.addFrameworkPath("./testsuite");
 #endif
     dui.std = "c++17"; // enable __has_include