Include and path handling optimization (danmar#447)

Author: glankk

integration_test.py

@@ -237,7 +237,13 @@ def test_same_name_header(record_property, tmpdir):
     assert stderr == ""
 
 def test_pragma_once_matching(record_property, tmpdir):
-    if platform.system() == "win32":
+    test_dir = os.path.join(tmpdir, "test_dir")
+    test_subdir = os.path.join(test_dir, "test_subdir")
+
+    test_file = os.path.join(test_dir, "test.c")
+    once_header = os.path.join(test_dir, "once.h")
+
+    if platform.system() == "Windows":
         names_to_test = [
             '"once.h"',
             '"Once.h"',
@@ -251,21 +257,21 @@ def test_pragma_once_matching(record_property, tmpdir):
             '"test_subdir/../Once.h"',
             '"Test_Subdir/../once.h"',
             '"Test_Subdir/../Once.h"',
+            f"\"{test_dir}/once.h\"",
+            f"\"{test_dir}/Once.h\"",
+            f"<{test_dir}/once.h>",
+            f"<{test_dir}/Once.h>",
         ]
     else:
         names_to_test = [
             '"once.h"',
             '<once.h>',
             '"../test_dir/once.h"',
             '"test_subdir/../once.h"',
+            f"\"{test_dir}/once.h\"",
+            f"<{test_dir}/once.h>",
         ]
 
-    test_dir = os.path.join(tmpdir, "test_dir")
-    test_subdir = os.path.join(test_dir, "test_subdir")
-
-    test_file = os.path.join(test_dir, "test.c")
-    once_header = os.path.join(test_dir, "once.h")
-
     os.mkdir(test_dir)
     os.mkdir(test_subdir)
 

main.cpp

@@ -9,7 +9,6 @@
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <map>
 #include <string>
 #include <vector>
 
@@ -128,7 +127,7 @@ int main(int argc, char **argv)
     }
     rawtokens->removeComments();
     simplecpp::TokenList outputTokens(files);
-    std::map<std::string, simplecpp::TokenList*> filedata;
+    simplecpp::FileDataCache filedata;
     simplecpp::preprocess(outputTokens, *rawtokens, files, filedata, dui, &outputList);
     simplecpp::cleanup(filedata);
     delete rawtokens;