diff --git a/.gitattributes b/.gitattributes index 8f07935a..2a995eea 100644 --- a/.gitattributes +++ b/.gitattributes @@ -63,3 +63,5 @@ meson.build text eol=lf encoding=UTF-8 *.psd binary *.rc binary *.xlsx binary + +vendor/* linguist-vendored diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1644bcc8..90127517 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -52,7 +52,7 @@ jobs: - name: Install dependencies run: | apt-get -y update - apt-get -y install --no-install-recommends ${{ matrix.compiler }} lld meson pkgconf git ca-certificates locales-all python3-pip catch2 nlohmann-json3-dev + apt-get -y install --no-install-recommends ${{ matrix.compiler }} lld meson pkgconf git ca-certificates locales-all python3-pip - uses: actions/checkout@v2 @@ -93,8 +93,6 @@ jobs: pip3 install meson ninja - uses: actions/checkout@v2 - with: - submodules: true - uses: ilammy/msvc-dev-cmd@v1 @@ -158,4 +156,4 @@ jobs: # build tipi . --dont-upgrade --verbose -t linux-cxx17 - ./build/linux-cxx17/bin/simple_parser ../example.toml \ No newline at end of file + ./build/linux-cxx17/bin/simple_parser ../example.toml diff --git a/.gitmodules b/.gitmodules index 3263b211..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,21 +0,0 @@ -[submodule "external/toml-test"] - path = external/toml-test - url = https://github.com/BurntSushi/toml-test.git - shallow = true -[submodule "external/toml-spec-tests"] - path = external/toml-spec-tests - url = https://github.com/iarna/toml-spec-tests.git - shallow = true -[submodule "external/tloptional"] - path = external/tloptional - url = https://github.com/TartanLlama/optional.git - shallow = true -[submodule "external/json"] - path = external/json - url = https://github.com/nlohmann/json.git - shallow = true -[submodule "external/Catch2"] - path = external/Catch2 - url = https://github.com/catchorg/Catch2.git - branch = v2.x - shallow = true diff --git a/.tipi/deps b/.tipi/deps index cd4e1dc8..3944afa7 100644 --- a/.tipi/deps +++ b/.tipi/deps @@ -1,7 +1,3 @@ { - "x": ["/external"], - "requires": { - "tipi-deps/Catch2@file://single_include": { "@": "v2.x" }, - "nlohmann/json": { "@": "v3.10.5" } - } + "requires": {} } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d3d5b0aa..b33f7121 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,11 +21,7 @@ If you wish to submit a PR, please be aware that:
## Building and running the tests -Testing is done using [Catch2], included in the respository as a submodule under `extern/Catch2`. -The first time you want to begin testing you'll need to ensure submodules have been fetched: -```bash -git submodule update --init --depth 1 external/Catch2 external/tloptional -``` +Testing is done using [Catch2], vendored in the respository at `vendor/catch.hpp`. ### Testing on Windows with Visual Studio diff --git a/README.md b/README.md index f671ac9d..c6fa6e31 100644 --- a/README.md +++ b/README.md @@ -162,8 +162,8 @@ FetchContent_MakeAvailable(tomlplusplus) git submodule add --depth 1 https://github.com/marzer/tomlplusplus.git tomlplusplus git config -f .gitmodules submodule.tomlplusplus.shallow true ``` -> ℹ️ The toml++ repository has some submodules of its own, but **they are only used for testing**! -> You should not use the `--recursive` option for regular library consumption. +> ⚠️ The toml++ repository has some submodules of its own, but **they are only used for testing**! +> You should **not** use the `--recursive` option for regular library consumption. ### Other environments and package managers diff --git a/docs/pages/main_page.dox b/docs/pages/main_page.dox index 37afbf81..7d0c557f 100644 --- a/docs/pages/main_page.dox +++ b/docs/pages/main_page.dox @@ -521,8 +521,8 @@ FetchContent_MakeAvailable(tomlplusplus) git submodule add --depth 1 https://github.com/marzer/tomlplusplus.git tomlplusplus git config -f .gitmodules submodule.tomlplusplus.shallow true \ebash -\note The toml++ repository has some submodules of its own, but **they are only used for testing**! You should not use -the `--recursive` option for regular library consumption. +\attention The toml++ repository has some submodules of its own, but **they are only used for testing**! +You should **not** use the `--recursive` option for regular library consumption. @@ -535,7 +535,7 @@ integration you'd like to see and have the technical know-how to make it happen, \subsection mainpage-adding-lib-python Special mention: Python There exists a python wrapper library built around toml++ called -\github{bobfang1992/pytomlpp, pytomlpp} which is, at the time of writing, the one of only two natively-compiled +\github{bobfang1992/pytomlpp, pytomlpp} which is, at the time of writing, one of only two natively-compiled TOML libraries available for python, and thus one of the fastest options available: \out @@ -554,8 +554,8 @@ Install it using `pip`: pip install pytomlpp \ebash -Note that I'm not the owner of that project so if you wish to report a bug relating to the python -implementation, please do so at their repository, not on the main toml++ one. +Note that I'm not the owner of that project, so if you wish to report a bug relating to the python +implementation please do so at their repository, not on the main toml++ one. diff --git a/external/Catch2 b/external/Catch2 deleted file mode 160000 index d71b4617..00000000 --- a/external/Catch2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d71b4617e9935f8589870af211f5b7552d743654 diff --git a/external/json b/external/json deleted file mode 160000 index fcc36f99..00000000 --- a/external/json +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fcc36f99ba1afc7baebe24e0c7429d2039d32d99 diff --git a/external/tloptional b/external/tloptional deleted file mode 160000 index c28fcf74..00000000 --- a/external/tloptional +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c28fcf74d207fc667c4ed3dbae4c251ea551c8c1 diff --git a/external/toml-spec-tests b/external/toml-spec-tests deleted file mode 160000 index 1880b1a1..00000000 --- a/external/toml-spec-tests +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1880b1a17849f6ad49a7a5e87d6a3ac3963172da diff --git a/external/toml-test b/external/toml-test deleted file mode 160000 index 10cdc99d..00000000 --- a/external/toml-test +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 10cdc99d96fbf1350a8891a9d93295fcc85aa694 diff --git a/include/toml++/impl/node_view.h b/include/toml++/impl/node_view.h index 7cb2f105..4f3994d7 100644 --- a/include/toml++/impl/node_view.h +++ b/include/toml++/impl/node_view.h @@ -567,7 +567,7 @@ TOML_NAMESPACE_START private: /// \cond template - static constexpr bool visit_is_nothrow = noexcept(std::declval()->visit(std::declval())); + static constexpr bool visit_is_nothrow = noexcept(std::declval()->visit(std::declval())); /// \endcond public: diff --git a/include/toml++/impl/preprocessor.h b/include/toml++/impl/preprocessor.h index 7d4dc9a6..ddfb0d26 100644 --- a/include/toml++/impl/preprocessor.h +++ b/include/toml++/impl/preprocessor.h @@ -404,9 +404,10 @@ #endif // dll/shared lib function exports (legacy - TOML_API was the old name for this setting) -#if !defined(TOML_EXPORTED_MEMBER_FUNCTION) \ +#if !defined(TOML_EXPORTED_MEMBER_FUNCTION) \ && !defined(TOML_EXPORTED_STATIC_FUNCTION) \ && !defined(TOML_EXPORTED_FREE_FUNCTION) \ + && !defined(TOML_EXPORTED_CLASS) \ && defined(TOML_API) #define TOML_EXPORTED_MEMBER_FUNCTION TOML_API #define TOML_EXPORTED_STATIC_FUNCTION TOML_API diff --git a/meson.build b/meson.build index d527d623..3e818e25 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,6 @@ project( version: '3.1.0', meson_version: '>=0.54.0', license: 'MIT', - subproject_dir: 'external', default_options: [ # https://mesonbuild.com/Builtin-options.html # core options 'buildtype=release', diff --git a/tests/impl_toml.cpp b/tests/impl_toml.cpp index 5ad5c88e..6169a680 100644 --- a/tests/impl_toml.cpp +++ b/tests/impl_toml.cpp @@ -8,10 +8,6 @@ #define TOML_IMPLEMENTATION #endif -#if USE_TARTANLLAMA_OPTIONAL -#include "lib_tloptional.h" -#endif - #if USE_SINGLE_HEADER #include "../toml.hpp" #else diff --git a/tests/lib_catch2.h b/tests/lib_catch2.h index acd97959..e70283aa 100644 --- a/tests/lib_catch2.h +++ b/tests/lib_catch2.h @@ -22,13 +22,7 @@ #pragma warning(disable : 5105) #endif -#if __has_include() -#include -#elif __has_include() -#include -#else -#error Catch2 is missing! You probably need to fetch submodules ("git submodule update --init --depth 1 external/Catch2") -#endif +#include "../vendor/catch.hpp" #ifdef __clang__ #pragma clang diagnostic pop diff --git a/tests/lib_tloptional.h b/tests/lib_tloptional.h deleted file mode 100644 index d66b1da6..00000000 --- a/tests/lib_tloptional.h +++ /dev/null @@ -1,30 +0,0 @@ -// This file is a part of toml++ and is subject to the the terms of the MIT license. -// Copyright (c) Mark Gillard -// See https://github.com/marzer/tomlplusplus/blob/master/LICENSE for the full license text. -// SPDX-License-Identifier: MIT -#pragma once - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Weverything" -#elif defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wall" -#pragma GCC diagnostic ignored "-Wextra" -#pragma GCC diagnostic ignored "-Wpadded" -#pragma GCC diagnostic ignored "-Wfloat-equal" -#endif - -#if __has_include() -#include -#elif __has_include() -#include -#else -#error TartanLlama/optional is missing! You probably need to fetch submodules ("git submodule update --init --depth 1 external/tloptional") -#endif - -#ifdef __clang__ -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif diff --git a/tests/meson.build b/tests/meson.build index a464089a..3278fe0a 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -33,29 +33,6 @@ test_deps = [tomlplusplus_dep] fs = import('fs') -catch2_dep = dependency('catch2', required: false) -if catch2_dep.found() - test_deps += catch2_dep -elif fs.exists('..'/'external'/'Catch2'/'single_include') - catch2_dep = declare_dependency(include_directories: '..'/'external'/'Catch2'/'single_include') - test_deps += catch2_dep -else - error('Catch2 is missing! You probably need to fetch submodules ("git submodule update --init --depth 1 external/Catch2"') -endif - -has_tl_optional = false -tl_optional_dep = dependency('tl-optional', required: false) -if tl_optional_dep.found() - test_deps += tl_optional_dep - has_tl_optional = true -elif fs.exists('..'/'external'/'tloptional'/'include') - tl_optional_dep = declare_dependency(include_directories: '..'/'external'/'tloptional'/'include') - test_deps += tl_optional_dep - has_tl_optional = true -else - warning('tl-optional not found, skipping its tests') -endif - ####################################################################################################################### # fast math check ####################################################################################################################### @@ -153,14 +130,6 @@ foreach cpp20 : cpp20_modes and not get_option('compile_library') ) - # use tl::optional to test that the TOML_OPTIONAL_TYPE config option works as advertised - tl_optional = ( - test_counter % 2 == 1 - and has_tl_optional - and not get_option('compile_library') - and exceptions # requires exceptions in its API - ) - # use asan in the tests address_sanitizer = ( get_option('asan_tests') @@ -241,11 +210,6 @@ foreach cpp20 : cpp20_modes test_args += '-DUSE_SINGLE_HEADER=1' endif - if tl_optional - test_args += '-DUSE_TARTANLLAMA_OPTIONAL=1' - test_name = test_name + '_tlopt' - endif - test_executables += [[ test_name, executable( diff --git a/tests/settings.h b/tests/settings.h index 948d5161..6e403e16 100644 --- a/tests/settings.h +++ b/tests/settings.h @@ -22,14 +22,6 @@ #define LEAK_TESTS 0 #endif -// use tl::optional? -#if defined(USE_TARTANLLAMA_OPTIONAL) && USE_TARTANLLAMA_OPTIONAL -#define TOML_OPTIONAL_TYPE tl::optional -#else -#undef USE_TARTANLLAMA_OPTIONAL -#define USE_TARTANLLAMA_OPTIONAL 0 -#endif - // catch2 config #define CATCH_CONFIG_CPP11_TO_STRING #define CATCH_CONFIG_CPP17_OPTIONAL diff --git a/tests/tests.h b/tests/tests.h index fab6fa23..cb85c931 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -6,10 +6,6 @@ #pragma once #include "settings.h" -#if USE_TARTANLLAMA_OPTIONAL -#include "lib_tloptional.h" -#endif - #if USE_SINGLE_HEADER #include "../toml.hpp" #else diff --git a/tests/vs/test_debug_x64.vcxproj b/tests/vs/test_debug_x64.vcxproj index 2cba6e08..add468cf 100644 --- a/tests/vs/test_debug_x64.vcxproj +++ b/tests/vs/test_debug_x64.vcxproj @@ -1,126 +1,145 @@  - - - Debug - x64 - - - - 16.0 - {202DCF23-B4E4-5FB9-AFA8-CC9A718067FF} - 10.0 - x64 - - - - Application - true - v143 - MultiByte - - - Application - false - v143 - true - MultiByte - - - - - - - - - ..\tests;%(AdditionalIncludeDirectories) - Sync - Use - tests.h - TOML_ENABLE_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions) - LEAK_TESTS=1;%(PreprocessorDefinitions) - _HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions) - SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions) - stdcpp17 - true - EnableAllWarnings - %(DisableSpecificWarnings);4127 - %(DisableSpecificWarnings);4324 - %(DisableSpecificWarnings);4464 - %(DisableSpecificWarnings);4505 - %(DisableSpecificWarnings);4514 - %(DisableSpecificWarnings);4577 - %(DisableSpecificWarnings);4582 - %(DisableSpecificWarnings);4623 - %(DisableSpecificWarnings);4625 - %(DisableSpecificWarnings);4626 - %(DisableSpecificWarnings);4710 - %(DisableSpecificWarnings);4711 - %(DisableSpecificWarnings);4738 - %(DisableSpecificWarnings);4820 - %(DisableSpecificWarnings);4866 - %(DisableSpecificWarnings);4868 - %(DisableSpecificWarnings);4946 - %(DisableSpecificWarnings);5026 - %(DisableSpecificWarnings);5027 - %(DisableSpecificWarnings);5039 - %(DisableSpecificWarnings);5045 - - - - $(ProjectDir)..\ - - - - - - - - - - - NotUsing - - - NotUsing - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - + + + Debug + x64 + + + + 16.0 + {202DCF23-B4E4-5FB9-AFA8-CC9A718067FF} + 10.0 + x64 + + + + Application + true + v143 + MultiByte + + + Application + false + v143 + true + MultiByte + + + + + + + + + ..\tests;%(AdditionalIncludeDirectories) + Sync + Use + tests.h + TOML_ENABLE_UNRELEASED_FEATURES=0;%(PreprocessorDefinitions) + LEAK_TESTS=1;%(PreprocessorDefinitions) + _HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) + SHOULD_HAVE_EXCEPTIONS=0;%(PreprocessorDefinitions) + SHOULD_HAVE_EXCEPTIONS=1;%(PreprocessorDefinitions) + stdcpp17 + true + EnableAllWarnings + %(DisableSpecificWarnings);4127 + + %(DisableSpecificWarnings);4324 + + %(DisableSpecificWarnings);4464 + + %(DisableSpecificWarnings);4505 + + %(DisableSpecificWarnings);4514 + + %(DisableSpecificWarnings);4577 + + %(DisableSpecificWarnings);4582 + + %(DisableSpecificWarnings);4623 + + %(DisableSpecificWarnings);4625 + + %(DisableSpecificWarnings);4626 + + %(DisableSpecificWarnings);4710 + + %(DisableSpecificWarnings);4711 + + %(DisableSpecificWarnings);4738 + + %(DisableSpecificWarnings);4820 + + %(DisableSpecificWarnings);4866 + + %(DisableSpecificWarnings);4868 + + %(DisableSpecificWarnings);4946 + + %(DisableSpecificWarnings);5026 + + %(DisableSpecificWarnings);5027 + + %(DisableSpecificWarnings);5039 + + %(DisableSpecificWarnings);5045 + + + + + $(ProjectDir)..\ + + + + + + + + + + + NotUsing + + + NotUsing + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/toml++.props b/toml++.props index c1adf752..9338ee38 100644 --- a/toml++.props +++ b/toml++.props @@ -60,7 +60,7 @@ $(TomlOutRoot)bin\win$(PlatformArchitecture)_vc$(PlatformToolsetVersion)_$(Configuration)_$(ConfigurationType)\ $(TomlOutRoot)build\$(ProjectName)_win$(PlatformArchitecture)_vc$(PlatformToolsetVersion)_$(Configuration)\ - $(TomlRepoRoot)include;$(TomlRepoRoot)external;$(IncludePath) + $(TomlRepoRoot)include;$(IncludePath) @@ -197,4 +197,3 @@ - diff --git a/toml++.vcxproj b/toml++.vcxproj index c666f633..61f878e4 100644 --- a/toml++.vcxproj +++ b/toml++.vcxproj @@ -93,8 +93,12 @@ + + + + @@ -105,7 +109,6 @@ - @@ -121,6 +124,7 @@ + diff --git a/toml++.vcxproj.filters b/toml++.vcxproj.filters index d43d9ef7..729445d1 100644 --- a/toml++.vcxproj.filters +++ b/toml++.vcxproj.filters @@ -181,9 +181,6 @@ cmake - - cmake - @@ -229,6 +226,19 @@ .github\workflows + + cmake + + + cmake + + + .tipi + + + + vendor + @@ -261,6 +271,12 @@ {f9731b43-6c33-4209-9e53-e65af54f80c4} + + {f34bec4a-27c1-478d-bdff-2f672cb564db} + + + {d6d69e89-b238-4dee-9f6a-68b755154539} + diff --git a/toml-test/README.md b/toml-test/README.md index d3439832..d2247d54 100644 --- a/toml-test/README.md +++ b/toml-test/README.md @@ -11,11 +11,7 @@ For this document to make sense, you will need to: 1. Follow the installation instructions from the [toml-test] README to compile the `toml-test` runner 2. Add `toml-test` as an alias or have it on the system PATH -3. Clone the toml++ repository's [nlohmann/json] submodule: -```bash -git submodule update --init --depth 1 external/json -``` -4. **Linux only:** Install `ninja` and `meson`: +3. **Linux only:** Install `ninja` and `meson`: ```bash sudo apt update && sudo apt install -y python3 python3-pip ninja-build sudo pip3 install meson @@ -46,5 +42,4 @@ ninja && toml-test ./toml-test/tt_decoder && toml-test ./toml-test/tt_encoder -- [toml-test]: https://github.com/BurntSushi/toml-test [CONTRIBUTING]: ../CONTRIBUTING.md -[nlohmann/json]: https://github.com/nlohmann/json [meson]: https://mesonbuild.com/ diff --git a/toml-test/meson.build b/toml-test/meson.build index 77228c91..4e79e4da 100644 --- a/toml-test/meson.build +++ b/toml-test/meson.build @@ -1,6 +1,5 @@ tt_deps = [ - tomlplusplus_dep, - dependency('nlohmann_json', fallback: ['json', 'nlohmann_json_dep']) + tomlplusplus_dep ] if get_option('build_tt_encoder') diff --git a/toml-test/tt.h b/toml-test/tt.h index cae2f304..c7a0cee5 100644 --- a/toml-test/tt.h +++ b/toml-test/tt.h @@ -15,13 +15,8 @@ #pragma warning(push, 0) #endif -#if __has_include() -#include -#elif __has_include() -#include -#else -#error nlohmann/json is missing! You probably need to fetch submodules ("git submodule update --init --depth 1 external/json") -#endif +#define JSON_HAS_FILESYSTEM 0 +#include "../vendor/json.hpp" #include #include diff --git a/toml.hpp b/toml.hpp index d2e0e28d..8963914e 100644 --- a/toml.hpp +++ b/toml.hpp @@ -419,9 +419,10 @@ #endif // dll/shared lib function exports (legacy - TOML_API was the old name for this setting) -#if !defined(TOML_EXPORTED_MEMBER_FUNCTION) \ +#if !defined(TOML_EXPORTED_MEMBER_FUNCTION) \ && !defined(TOML_EXPORTED_STATIC_FUNCTION) \ && !defined(TOML_EXPORTED_FREE_FUNCTION) \ + && !defined(TOML_EXPORTED_CLASS) \ && defined(TOML_API) #define TOML_EXPORTED_MEMBER_FUNCTION TOML_API #define TOML_EXPORTED_STATIC_FUNCTION TOML_API @@ -3530,7 +3531,7 @@ TOML_NAMESPACE_START private: template - static constexpr bool visit_is_nothrow = noexcept(std::declval()->visit(std::declval())); + static constexpr bool visit_is_nothrow = noexcept(std::declval()->visit(std::declval())); public: diff --git a/tools/generate_conformance_tests.py b/tools/generate_conformance_tests.py index 8da97497..45eeaed1 100755 --- a/tools/generate_conformance_tests.py +++ b/tools/generate_conformance_tests.py @@ -438,8 +438,30 @@ def add_condition(tests, condition, names): -def load_valid_inputs(tests, extern_root): - tests['valid']['burntsushi'] = load_tests(Path(extern_root, 'toml-test', 'tests', 'valid'), True, ( +def find_tests_dir(*relative_path): + paths = ( + (Path.cwd(),), + ('.',), + (utils.entry_script_dir(), '..', '..') # side-by-side with toml_++ repo folder + ) + for p in paths: + try: + path = Path(*p, *relative_path).resolve() + if path.exists() and path.is_dir(): + return path + except: + pass + return None + + + +def load_burnsushi_tests(tests): + + root_dir = find_tests_dir('toml-test', 'tests') + if root_dir is None: + raise Exception(r'could not find burntsushi/toml-test') + + tests['valid']['burntsushi'] = load_tests(Path(root_dir, 'valid'), True, ( # broken by the json reader 'key-alphanum', )) @@ -450,7 +472,30 @@ def load_valid_inputs(tests, extern_root): 'string-escape-esc', # \e in strings )) - tests['valid']['iarna'] = load_tests(Path(extern_root, 'toml-spec-tests', 'values'), True, ( + tests['invalid']['burntsushi'] = load_tests(Path(root_dir, 'invalid'), False) + add_condition(tests['invalid']['burntsushi'], '!TOML_LANG_UNRELEASED', ( + 'datetime-no-secs', + re.compile(r'inline-table-linebreak-.*'), + 'inline-table-trailing-comma', + 'key-special-character', + 'multi-line-inline-table', + 'string-basic-byte-escapes', + )) + + + +def load_iarna_tests(tests): + + root_dir = find_tests_dir('toml-spec-tests') + if root_dir is None: + raise Exception(r'could not find iarni/toml-spec-tests') + + tests['invalid']['iarna'] = load_tests(Path(root_dir, 'errors'), False) + add_condition(tests['invalid']['iarna'], '!TOML_LANG_UNRELEASED', ( + 'inline-table-trailing-comma', + )) + + tests['valid']['iarna'] = load_tests(Path(root_dir, 'values'), True, ( # these are stress-tests for 'large' datasets. I test these separately. Having them inline in C++ code is insane. 'qa-array-inline-1000', 'qa-array-inline-nested-1000', @@ -470,24 +515,6 @@ def load_valid_inputs(tests, extern_root): -def load_invalid_inputs(tests, extern_root): - tests['invalid']['burntsushi'] = load_tests(Path(extern_root, 'toml-test', 'tests', 'invalid'), False) - add_condition(tests['invalid']['burntsushi'], '!TOML_LANG_UNRELEASED', ( - 'datetime-no-secs', - re.compile(r'inline-table-linebreak-.*'), - 'inline-table-trailing-comma', - 'key-special-character', - 'multi-line-inline-table', - 'string-basic-byte-escapes', - )) - - tests['invalid']['iarna'] = load_tests(Path(extern_root, 'toml-spec-tests', 'errors'), False) - add_condition(tests['invalid']['iarna'], '!TOML_LANG_UNRELEASED', ( - 'inline-table-trailing-comma', - )) - - - def write_test_file(name, all_tests): for test in all_tests: @@ -586,12 +613,9 @@ def write_test_file(name, all_tests): def main(): - extern_root = Path(utils.entry_script_dir(), '..', 'external').resolve() - utils.assert_existing_directory(extern_root) - assert extern_root.exists() all_tests = { 'valid': dict(), 'invalid': dict() } - load_valid_inputs(all_tests, extern_root) - load_invalid_inputs(all_tests, extern_root) + load_burnsushi_tests(all_tests) + load_iarna_tests(all_tests) for validity, sources in all_tests.items(): for source, tests in sources.items(): write_test_file('{}/{}'.format(source, validity), tests ) diff --git a/vendor/README.md b/vendor/README.md new file mode 100644 index 00000000..a38255ec --- /dev/null +++ b/vendor/README.md @@ -0,0 +1,8 @@ +# Vendored dependencies + +The code files in this directory are third-party 'vendor' dependencies used by the various test applications. + +⚠️ They are **not** required for regular use of toml++. ⚠️ + +⚠️ They are not **not** `#included` anywhere in toml++. ⚠️ + diff --git a/vendor/catch.hpp b/vendor/catch.hpp new file mode 100644 index 00000000..d2a12427 --- /dev/null +++ b/vendor/catch.hpp @@ -0,0 +1,17970 @@ +/* + * Catch v2.13.9 + * Generated: 2022-04-12 22:37:23.260201 + * ---------------------------------------------------------- + * This file has been merged from multiple headers. Please don't edit it directly + * Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved. + * + * Distributed under the Boost Software License, Version 1.0. (See accompanying + * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + */ +#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED +#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED +// start catch.hpp + + +#define CATCH_VERSION_MAJOR 2 +#define CATCH_VERSION_MINOR 13 +#define CATCH_VERSION_PATCH 9 + +#ifdef __clang__ +# pragma clang system_header +#elif defined __GNUC__ +# pragma GCC system_header +#endif + +// start catch_suppress_warnings.h + +#ifdef __clang__ +# ifdef __ICC // icpc defines the __clang__ macro +# pragma warning(push) +# pragma warning(disable: 161 1682) +# else // __ICC +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wpadded" +# pragma clang diagnostic ignored "-Wswitch-enum" +# pragma clang diagnostic ignored "-Wcovered-switch-default" +# endif +#elif defined __GNUC__ + // Because REQUIREs trigger GCC's -Wparentheses, and because still + // supported version of g++ have only buggy support for _Pragmas, + // Wparentheses have to be suppressed globally. +# pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details + +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-variable" +# pragma GCC diagnostic ignored "-Wpadded" +#endif +// end catch_suppress_warnings.h +#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) +# define CATCH_IMPL +# define CATCH_CONFIG_ALL_PARTS +#endif + +// In the impl file, we want to have access to all parts of the headers +// Can also be used to sanely support PCHs +#if defined(CATCH_CONFIG_ALL_PARTS) +# define CATCH_CONFIG_EXTERNAL_INTERFACES +# if defined(CATCH_CONFIG_DISABLE_MATCHERS) +# undef CATCH_CONFIG_DISABLE_MATCHERS +# endif +# if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) +# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER +# endif +#endif + +#if !defined(CATCH_CONFIG_IMPL_ONLY) +// start catch_platform.h + +// See e.g.: +// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html +#ifdef __APPLE__ +# include +# if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \ + (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1) +# define CATCH_PLATFORM_MAC +# elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1) +# define CATCH_PLATFORM_IPHONE +# endif + +#elif defined(linux) || defined(__linux) || defined(__linux__) +# define CATCH_PLATFORM_LINUX + +#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__) +# define CATCH_PLATFORM_WINDOWS +#endif + +// end catch_platform.h + +#ifdef CATCH_IMPL +# ifndef CLARA_CONFIG_MAIN +# define CLARA_CONFIG_MAIN_NOT_DEFINED +# define CLARA_CONFIG_MAIN +# endif +#endif + +// start catch_user_interfaces.h + +namespace Catch { + unsigned int rngSeed(); +} + +// end catch_user_interfaces.h +// start catch_tag_alias_autoregistrar.h + +// start catch_common.h + +// start catch_compiler_capabilities.h + +// Detect a number of compiler features - by compiler +// The following features are defined: +// +// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported? +// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported? +// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported? +// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled? +// **************** +// Note to maintainers: if new toggles are added please document them +// in configuration.md, too +// **************** + +// In general each macro has a _NO_ form +// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature. +// Many features, at point of detection, define an _INTERNAL_ macro, so they +// can be combined, en-mass, with the _NO_ forms later. + +#ifdef __cplusplus + +# if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) +# define CATCH_CPP14_OR_GREATER +# endif + +# if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) +# define CATCH_CPP17_OR_GREATER +# endif + +#endif + +// Only GCC compiler should be used in this block, so other compilers trying to +// mask themselves as GCC should be ignored. +#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__) +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" ) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic pop" ) + +# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) + +#endif + +#if defined(__clang__) + +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" ) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic pop" ) + +// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug +// which results in calls to destructors being emitted for each temporary, +// without a matching initialization. In practice, this can result in something +// like `std::string::~string` being called on an uninitialized value. +// +// For example, this code will likely segfault under IBM XL: +// ``` +// REQUIRE(std::string("12") + "34" == "1234") +// ``` +// +// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented. +# if !defined(__ibmxl__) && !defined(__CUDACC__) +# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */ +# endif + +# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \ + _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"") + +# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) + +# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" ) + +# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" ) + +# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wunused-template\"" ) + +#endif // __clang__ + +//////////////////////////////////////////////////////////////////////////////// +// Assume that non-Windows platforms support posix signals by default +#if !defined(CATCH_PLATFORM_WINDOWS) + #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS +#endif + +//////////////////////////////////////////////////////////////////////////////// +// We know some environments not to support full POSIX signals +#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__) + #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS +#endif + +#ifdef __OS400__ +# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS +# define CATCH_CONFIG_COLOUR_NONE +#endif + +//////////////////////////////////////////////////////////////////////////////// +// Android somehow still does not support std::to_string +#if defined(__ANDROID__) +# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING +# define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE +#endif + +//////////////////////////////////////////////////////////////////////////////// +// Not all Windows environments support SEH properly +#if defined(__MINGW32__) +# define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH +#endif + +//////////////////////////////////////////////////////////////////////////////// +// PS4 +#if defined(__ORBIS__) +# define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE +#endif + +//////////////////////////////////////////////////////////////////////////////// +// Cygwin +#ifdef __CYGWIN__ + +// Required for some versions of Cygwin to declare gettimeofday +// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin +# define _BSD_SOURCE +// some versions of cygwin (most) do not support std::to_string. Use the libstd check. +// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813 +# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ + && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) + +# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING + +# endif +#endif // __CYGWIN__ + +//////////////////////////////////////////////////////////////////////////////// +// Visual C++ +#if defined(_MSC_VER) + +// Universal Windows platform does not support SEH +// Or console colours (or console at all...) +# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) +# define CATCH_CONFIG_COLOUR_NONE +# else +# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH +# endif + +# if !defined(__clang__) // Handle Clang masquerading for msvc + +// MSVC traditional preprocessor needs some workaround for __VA_ARGS__ +// _MSVC_TRADITIONAL == 0 means new conformant preprocessor +// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor +# if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL) +# define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +# endif // MSVC_TRADITIONAL + +// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop` +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) ) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION __pragma( warning(pop) ) +# endif // __clang__ + +#endif // _MSC_VER + +#if defined(_REENTRANT) || defined(_MSC_VER) +// Enable async processing, as -pthread is specified or no additional linking is required +# define CATCH_INTERNAL_CONFIG_USE_ASYNC +#endif // _MSC_VER + +//////////////////////////////////////////////////////////////////////////////// +// Check if we are compiled with -fno-exceptions or equivalent +#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND) +# define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED +#endif + +//////////////////////////////////////////////////////////////////////////////// +// DJGPP +#ifdef __DJGPP__ +# define CATCH_INTERNAL_CONFIG_NO_WCHAR +#endif // __DJGPP__ + +//////////////////////////////////////////////////////////////////////////////// +// Embarcadero C++Build +#if defined(__BORLANDC__) + #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN +#endif + +//////////////////////////////////////////////////////////////////////////////// + +// Use of __COUNTER__ is suppressed during code analysis in +// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly +// handled by it. +// Otherwise all supported compilers support COUNTER macro, +// but user still might want to turn it off +#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L ) + #define CATCH_INTERNAL_CONFIG_COUNTER +#endif + +//////////////////////////////////////////////////////////////////////////////// + +// RTX is a special version of Windows that is real time. +// This means that it is detected as Windows, but does not provide +// the same set of capabilities as real Windows does. +#if defined(UNDER_RTSS) || defined(RTX64_BUILD) + #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH + #define CATCH_INTERNAL_CONFIG_NO_ASYNC + #define CATCH_CONFIG_COLOUR_NONE +#endif + +#if !defined(_GLIBCXX_USE_C99_MATH_TR1) +#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER +#endif + +// Various stdlib support checks that require __has_include +#if defined(__has_include) + // Check if string_view is available and usable + #if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW + #endif + + // Check if optional is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) + + // Check if byte is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # include + # if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0) + # define CATCH_INTERNAL_CONFIG_CPP17_BYTE + # endif + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) + + // Check if variant is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # if defined(__clang__) && (__clang_major__ < 8) + // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852 + // fix should be in clang 8, workaround in libstdc++ 8.2 + # include + # if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) + # define CATCH_CONFIG_NO_CPP17_VARIANT + # else + # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT + # endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) + # else + # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT + # endif // defined(__clang__) && (__clang_major__ < 8) + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) +#endif // defined(__has_include) + +#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) +# define CATCH_CONFIG_COUNTER +#endif +#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH) +# define CATCH_CONFIG_WINDOWS_SEH +#endif +// This is set by default, because we assume that unix compilers are posix-signal-compatible by default. +#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) +# define CATCH_CONFIG_POSIX_SIGNALS +#endif +// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions. +#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR) +# define CATCH_CONFIG_WCHAR +#endif + +#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING) +# define CATCH_CONFIG_CPP11_TO_STRING +#endif + +#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL) +# define CATCH_CONFIG_CPP17_OPTIONAL +#endif + +#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW) +# define CATCH_CONFIG_CPP17_STRING_VIEW +#endif + +#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT) +# define CATCH_CONFIG_CPP17_VARIANT +#endif + +#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE) +# define CATCH_CONFIG_CPP17_BYTE +#endif + +#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT) +# define CATCH_INTERNAL_CONFIG_NEW_CAPTURE +#endif + +#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE) +# define CATCH_CONFIG_NEW_CAPTURE +#endif + +#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) +# define CATCH_CONFIG_DISABLE_EXCEPTIONS +#endif + +#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN) +# define CATCH_CONFIG_POLYFILL_ISNAN +#endif + +#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC) && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC) +# define CATCH_CONFIG_USE_ASYNC +#endif + +#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE) +# define CATCH_CONFIG_ANDROID_LOGWRITE +#endif + +#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER) +# define CATCH_CONFIG_GLOBAL_NEXTAFTER +#endif + +// Even if we do not think the compiler has that warning, we still have +// to provide a macro that can be used by the code. +#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION) +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION +#endif +#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION +#endif +#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS +#endif +#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS +#endif +#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS +#endif +#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS +#endif + +// The goal of this macro is to avoid evaluation of the arguments, but +// still have the compiler warn on problems inside... +#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN) +# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) +#endif + +#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10) +# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS +#elif defined(__clang__) && (__clang_major__ < 5) +# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS +#endif + +#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS +#endif + +#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) +#define CATCH_TRY if ((true)) +#define CATCH_CATCH_ALL if ((false)) +#define CATCH_CATCH_ANON(type) if ((false)) +#else +#define CATCH_TRY try +#define CATCH_CATCH_ALL catch (...) +#define CATCH_CATCH_ANON(type) catch (type) +#endif + +#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) +#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +#endif + +// end catch_compiler_capabilities.h +#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line +#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) +#ifdef CATCH_CONFIG_COUNTER +# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ ) +#else +# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) +#endif + +#include +#include +#include + +// We need a dummy global operator<< so we can bring it into Catch namespace later +struct Catch_global_namespace_dummy {}; +std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); + +namespace Catch { + + struct CaseSensitive { enum Choice { + Yes, + No + }; }; + + class NonCopyable { + NonCopyable( NonCopyable const& ) = delete; + NonCopyable( NonCopyable && ) = delete; + NonCopyable& operator = ( NonCopyable const& ) = delete; + NonCopyable& operator = ( NonCopyable && ) = delete; + + protected: + NonCopyable(); + virtual ~NonCopyable(); + }; + + struct SourceLineInfo { + + SourceLineInfo() = delete; + SourceLineInfo( char const* _file, std::size_t _line ) noexcept + : file( _file ), + line( _line ) + {} + + SourceLineInfo( SourceLineInfo const& other ) = default; + SourceLineInfo& operator = ( SourceLineInfo const& ) = default; + SourceLineInfo( SourceLineInfo&& ) noexcept = default; + SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default; + + bool empty() const noexcept { return file[0] == '\0'; } + bool operator == ( SourceLineInfo const& other ) const noexcept; + bool operator < ( SourceLineInfo const& other ) const noexcept; + + char const* file; + std::size_t line; + }; + + std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); + + // Bring in operator<< from global namespace into Catch namespace + // This is necessary because the overload of operator<< above makes + // lookup stop at namespace Catch + using ::operator<<; + + // Use this in variadic streaming macros to allow + // >> +StreamEndStop + // as well as + // >> stuff +StreamEndStop + struct StreamEndStop { + std::string operator+() const; + }; + template + T const& operator + ( T const& value, StreamEndStop ) { + return value; + } +} + +#define CATCH_INTERNAL_LINEINFO \ + ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) + +// end catch_common.h +namespace Catch { + + struct RegistrarForTagAliases { + RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); + }; + +} // end namespace Catch + +#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \ + CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ + CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ + namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \ + CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION + +// end catch_tag_alias_autoregistrar.h +// start catch_test_registry.h + +// start catch_interfaces_testcase.h + +#include + +namespace Catch { + + class TestSpec; + + struct ITestInvoker { + virtual void invoke () const = 0; + virtual ~ITestInvoker(); + }; + + class TestCase; + struct IConfig; + + struct ITestCaseRegistry { + virtual ~ITestCaseRegistry(); + virtual std::vector const& getAllTests() const = 0; + virtual std::vector const& getAllTestsSorted( IConfig const& config ) const = 0; + }; + + bool isThrowSafe( TestCase const& testCase, IConfig const& config ); + bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ); + std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ); + std::vector const& getAllTestCasesSorted( IConfig const& config ); + +} + +// end catch_interfaces_testcase.h +// start catch_stringref.h + +#include +#include +#include +#include + +namespace Catch { + + /// A non-owning string class (similar to the forthcoming std::string_view) + /// Note that, because a StringRef may be a substring of another string, + /// it may not be null terminated. + class StringRef { + public: + using size_type = std::size_t; + using const_iterator = const char*; + + private: + static constexpr char const* const s_empty = ""; + + char const* m_start = s_empty; + size_type m_size = 0; + + public: // construction + constexpr StringRef() noexcept = default; + + StringRef( char const* rawChars ) noexcept; + + constexpr StringRef( char const* rawChars, size_type size ) noexcept + : m_start( rawChars ), + m_size( size ) + {} + + StringRef( std::string const& stdString ) noexcept + : m_start( stdString.c_str() ), + m_size( stdString.size() ) + {} + + explicit operator std::string() const { + return std::string(m_start, m_size); + } + + public: // operators + auto operator == ( StringRef const& other ) const noexcept -> bool; + auto operator != (StringRef const& other) const noexcept -> bool { + return !(*this == other); + } + + auto operator[] ( size_type index ) const noexcept -> char { + assert(index < m_size); + return m_start[index]; + } + + public: // named queries + constexpr auto empty() const noexcept -> bool { + return m_size == 0; + } + constexpr auto size() const noexcept -> size_type { + return m_size; + } + + // Returns the current start pointer. If the StringRef is not + // null-terminated, throws std::domain_exception + auto c_str() const -> char const*; + + public: // substrings and searches + // Returns a substring of [start, start + length). + // If start + length > size(), then the substring is [start, size()). + // If start > size(), then the substring is empty. + auto substr( size_type start, size_type length ) const noexcept -> StringRef; + + // Returns the current start pointer. May not be null-terminated. + auto data() const noexcept -> char const*; + + constexpr auto isNullTerminated() const noexcept -> bool { + return m_start[m_size] == '\0'; + } + + public: // iterators + constexpr const_iterator begin() const { return m_start; } + constexpr const_iterator end() const { return m_start + m_size; } + }; + + auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&; + auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&; + + constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { + return StringRef( rawChars, size ); + } +} // namespace Catch + +constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { + return Catch::StringRef( rawChars, size ); +} + +// end catch_stringref.h +// start catch_preprocessor.hpp + + +#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__ +#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__))) + +#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__ +// MSVC needs more evaluations +#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__))) +#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__)) +#else +#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL5(__VA_ARGS__) +#endif + +#define CATCH_REC_END(...) +#define CATCH_REC_OUT + +#define CATCH_EMPTY() +#define CATCH_DEFER(id) id CATCH_EMPTY() + +#define CATCH_REC_GET_END2() 0, CATCH_REC_END +#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2 +#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1 +#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT +#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0) +#define CATCH_REC_NEXT(test, next) CATCH_REC_NEXT1(CATCH_REC_GET_END test, next) + +#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST2(f, x, peek, ...) f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) + +#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...) f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) + +// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results, +// and passes userdata as the first parameter to each invocation, +// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c) +#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) + +#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) + +#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param) +#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__ +#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__ +#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF +#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__) +#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__ +#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) +#else +// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF +#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__) +#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__ +#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1) +#endif + +#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__ +#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name) + +#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__) + +#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper()) +#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)) +#else +#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper())) +#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))) +#endif + +#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\ + CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__) + +#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0) +#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1) +#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2) +#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3) +#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4) +#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5) +#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6) +#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7) +#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8) +#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9) +#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) + +#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N + +#define INTERNAL_CATCH_TYPE_GEN\ + template struct TypeList {};\ + template\ + constexpr auto get_wrapper() noexcept -> TypeList { return {}; }\ + template class...> struct TemplateTypeList{};\ + template class...Cs>\ + constexpr auto get_wrapper() noexcept -> TemplateTypeList { return {}; }\ + template\ + struct append;\ + template\ + struct rewrap;\ + template class, typename...>\ + struct create;\ + template class, typename>\ + struct convert;\ + \ + template \ + struct append { using type = T; };\ + template< template class L1, typename...E1, template class L2, typename...E2, typename...Rest>\ + struct append, L2, Rest...> { using type = typename append, Rest...>::type; };\ + template< template class L1, typename...E1, typename...Rest>\ + struct append, TypeList, Rest...> { using type = L1; };\ + \ + template< template class Container, template class List, typename...elems>\ + struct rewrap, List> { using type = TypeList>; };\ + template< template class Container, template class List, class...Elems, typename...Elements>\ + struct rewrap, List, Elements...> { using type = typename append>, typename rewrap, Elements...>::type>::type; };\ + \ + template