added simplecpp::View to be able to write portable simplecpp::TokenList code and added tests for all constructors

Author: firewave

simplecpp.h

@@ -69,6 +69,44 @@ namespace simplecpp {
     enum cppstd_t : std::int8_t { CPPUnknown=-1, CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26 };
 
     using TokenString = std::string;
+
+#if defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
+    using View = std::string_view;
+#else
+    struct View
+    {
+        // cppcheck-suppress noExplicitConstructor
+        View(const char* data)
+            : data_(data)
+            , size_(strlen(data))
+        {}
+
+#if !defined(__cpp_lib_span)
+        View(const char* data, std::size_t size)
+            : data_(data)
+            , size_(size)
+        {}
+
+        // cppcheck-suppress noExplicitConstructor
+        View(const std::string& str)
+            : data_(str.data())
+            , size_(str.size())
+        {}
+#endif
+
+        const char* data() const {
+            return data_;
+        }
+
+        std::size_t size() const {
+            return size_;
+        }
+
+        const char* data_;
+        std::size_t size_;
+    };
+#endif
+
     class Macro;
 
     /**
@@ -238,12 +276,10 @@ namespace simplecpp {
             : TokenList(reinterpret_cast<const unsigned char*>(data), size, filenames, filename, outputList, 0)
         {}
 #endif
-#if defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
         /** generates a token list from the given buffer */
-        TokenList(std::string_view data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
+        TokenList(View data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
             : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, outputList, 0)
         {}
-#endif
 #ifdef __cpp_lib_span
         /** generates a token list from the given buffer */
         TokenList(std::span<const char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)

test.cpp

@@ -3299,11 +3299,80 @@ static void preprocess_files()
     }
 }
 
-static void safe_api()
+static void tokenlist_api()
 {
+    std::vector<std::string> filenames;
+#  if !defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
+    // buffer
+    {
+        char input[] = "code"; // NOLINT(misc-const-correctness)
+        simplecpp::TokenList(input,sizeof(input),filenames,"");
+    }
+    {
+        const char input[] = "code";
+        simplecpp::TokenList(input,sizeof(input),filenames,"");
+    }
+    {
+        unsigned char input[] = "code"; // NOLINT(misc-const-correctness)
+        simplecpp::TokenList(input,sizeof(input),filenames,"");
+    }
+    {
+        const unsigned char input[] = "code";
+        simplecpp::TokenList(input,sizeof(input),filenames,"");
+    }
+#endif
+    // buffer via View
+    {
+        const char * const input = "code";
+        simplecpp::TokenList({input},filenames,"");
+    }
+    // buffer via View
+    {
+        char input[] = "code"; // NOLINT(misc-const-correctness)
+        simplecpp::TokenList(simplecpp::View{input},filenames,"");
+    }
+    {
+        const char input[] = "code";
+        simplecpp::TokenList(simplecpp::View{input},filenames,"");
+    }
+    // sized buffer via View
+    {
+        char input[] = "code"; // NOLINT(misc-const-correctness)
+        simplecpp::TokenList({input,sizeof(input)},filenames,"");
+    }
+    {
+        const char input[] = "code";
+        simplecpp::TokenList({input,sizeof(input)},filenames,"");
+    }
+    // array
+    {
+        char input[] = "code"; // NOLINT(misc-const-correctness)
+        simplecpp::TokenList(input,filenames,"");
+    }
+    {
+        const char input[] = "code";
+        simplecpp::TokenList(input,filenames,"");
+    }
+    {
+        unsigned char input[] = "code"; // NOLINT(misc-const-correctness)
+        simplecpp::TokenList(input,filenames,"");
+    }
+    {
+        const unsigned char input[] = "code";
+        simplecpp::TokenList(input,filenames,"");
+    }
+    // std::string via View
+    {
+        std::string input = "code"; // NOLINT(misc-const-correctness)
+        simplecpp::TokenList(input,filenames,"");
+    }
+    {
+        const std::string input = "code";
+        simplecpp::TokenList(input,filenames,"");
+    }
+
     // this test is to make sure the safe APIs are compiling
 #if defined(__cpp_lib_string_view) || defined(__cpp_lib_span)
-    std::vector<std::string> filenames;
 #  if defined(__cpp_lib_string_view)
     {
         const char input[] = "code";
@@ -3660,7 +3729,7 @@ int main(int argc, char **argv)
 
     TEST_CASE(preprocess_files);
 
-    TEST_CASE(safe_api);
+    TEST_CASE(tokenlist_api);
 
     TEST_CASE(isAbsolutePath);