Replaces catch2 with doctest (#25)

Decreases compile time while everything stays the same.

It is also possible to increase the warning levels.

Author: TinyTinni

include/vdf_parser.hpp

@@ -82,7 +82,7 @@ template <typename T> struct literal_macro_help
     {
         return c;
     }
-    static CONSTEXPR const char result(const char c, const wchar_t) NOEXCEPT
+    static CONSTEXPR char result(const char c, const wchar_t) NOEXCEPT
     {
         return c;
     }
@@ -95,7 +95,7 @@ template <> struct literal_macro_help<wchar_t>
     {
         return wc;
     }
-    static CONSTEXPR const wchar_t result(const char, const wchar_t wc) NOEXCEPT
+    static CONSTEXPR wchar_t result(const char, const wchar_t wc) NOEXCEPT
     {
         return wc;
     }
@@ -109,10 +109,18 @@ inline std::string string_converter(const std::wstring &w) NOEXCEPT
 {
     std::mbstate_t state = std::mbstate_t();
     auto wstr = w.data();
+// unsafe: ignores any error handling
+// and disables warning that wcsrtombs_s should be used
+#ifdef WIN32
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
     std::size_t len = 1 + std::wcsrtombs(nullptr, &wstr, 0, &state);
     std::string mbstr(len, '\0');
-    // unsafe: ignores any error handling
     std::wcsrtombs(&mbstr[0], &wstr, mbstr.size(), &state);
+#ifdef WIN32
+#pragma warning(pop)
+#endif
     return mbstr;
 }
 
@@ -258,7 +266,7 @@ std::basic_string<typename iStreamT::char_type> read_file(iStreamT &inStream)
         return str;
 
     inStream.seekg(0, std::ios::beg);
-    inStream.read(&str[0], str.size());
+    inStream.read(&str[0], static_cast<std::streamsize>(str.size()));
     return str;
 }
 
@@ -502,8 +510,7 @@ std::vector<std::unique_ptr<OutputT>> read_internal(
 
             curIter = skip_whitespaces(curIter, last);
 
-            auto conditional = conditional_fullfilled(curIter, last);
-            if (!conditional)
+            if (!conditional_fullfilled(curIter, last))
                 continue;
             if (curIter == last)
                 throw std::runtime_error{"key declared, but no value"};
@@ -538,8 +545,7 @@ std::vector<std::unique_ptr<OutputT>> read_internal(
                 curIter =
                     valueEnd + ((*valueEnd == TYTI_L(charT, '\"')) ? 1 : 0);
 
-                auto conditional = conditional_fullfilled(curIter, last);
-                if (!conditional)
+                if (!conditional_fullfilled(curIter, last))
                     continue;
 
                 // process value

tests/CMakeLists.txt

@@ -2,16 +2,21 @@
 set(SRCS
  "main.cpp"
  "vdf_parser_test.cpp"
- "catch.cpp"
  "../Readme.md")
 
 add_executable(tests ${SRCS})
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT tests) #requires cmake 3.6
 set_property(TARGET tests PROPERTY COMPILE_WARNING_AS_ERROR ON)
-add_definitions("-DSOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}\"" "-DCATCH_AMALGAMATED_CUSTOM_MAIN")
+add_definitions("-DSOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
 target_compile_features(tests PUBLIC cxx_std_17)
 target_link_libraries(tests PRIVATE ValveFileVDF)
 
+target_compile_options(tests PRIVATE
+     $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+          -Wall -Wextra -Wconversion -pedantic-errors -Wsign-conversion>
+     $<$<CXX_COMPILER_ID:MSVC>:
+          /W4>)
+
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     target_link_libraries(tests PUBLIC -fsanitize=address,undefined)
 endif()