diff --git a/.gitignore b/.gitignore index a9bc8605e2f..e656256b62f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ deps *.gcda *.gcno .ycm_extra_conf.pyc +mason_packages diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..44fba9a2fd4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".mason"] + path = .mason + url = https://github.com/mapbox/mason.git diff --git a/.mason b/.mason new file mode 160000 index 00000000000..6adb140160c --- /dev/null +++ b/.mason @@ -0,0 +1 @@ +Subproject commit 6adb140160cb549400f73ea35c1d9eb5782210e0 diff --git a/.travis.yml b/.travis.yml index 99d0b48c20a..e45e137a9fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,127 +1,159 @@ -language: c +language: generic sudo: false -# Save common build configurations as shortcuts, so we can reference them later. -addons_shortcuts: - addons_clang35: &clang35 - apt: - sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5', 'boost-latest' ] - packages: [ 'clang-3.5', 'libboost1.55-all-dev' ] - addons_clang36: &clang36 - apt: - sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6', 'boost-latest' ] - packages: [ 'clang-3.6', 'libboost1.55-all-dev' ] - addons_clang37: &clang37 - apt: - sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7', 'boost-latest' ] - packages: [ 'clang-3.7', 'libboost1.55-all-dev' ] - addons_clang38: &clang38 - apt: - sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise', 'boost-latest' ] - packages: [ 'clang-3.8', 'libboost1.55-all-dev'] - addons_gcc47: &gcc47 - apt: - sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ] - packages: [ 'g++-4.7', 'libboost1.55-all-dev' ] - addons_gcc48: &gcc48 - apt: - sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ] - packages: [ 'g++-4.8', 'libboost1.55-all-dev' ] - addons_gcc49: &gcc49 - apt: - sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ] - packages: [ 'g++-4.9', 'libboost1.55-all-dev' ] - addons_gcc5: &gcc5 - apt: - sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ] - packages: [ 'g++-5', 'libboost1.55-all-dev' ] - matrix: include: + # clang++ 4.0 via mason with -flto and -fsanitize=cfi + - os: linux + compiler: "clang++-40-mason" + env: CXX=clang++-4.0 CXXFLAGS="-flto -fsanitize=cfi -fvisibility=hidden" LDFLAGS="-flto -fsanitize=cfi -fvisibility=hidden" + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'libstdc++-4.9-dev' ] + before_install: + - git submodule update --init + - ./.mason/mason install clang++ 4.0.1 + - export PATH=$(./.mason/mason prefix clang++ 4.0.1)/bin:${PATH} + - ./.mason/mason install binutils 2.27 + - export PATH=$(./.mason/mason prefix binutils 2.27)/bin:${PATH} + # clang++ 4.0 via mason with -fsanitize=address + - os: linux + compiler: "clang++-40-mason" + env: CXX=clang++-4.0 CXXFLAGS="-fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer -fno-common" LDFLAGS="-fsanitize=address" ASAN_OPTIONS=check_initialization_order=1:detect_stack_use_after_return=1 + sudo: required + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'libstdc++-4.9-dev' ] + before_install: + - git submodule update --init + - ./.mason/mason install clang++ 4.0.1 + - export PATH=$(./.mason/mason prefix clang++ 4.0.1)/bin:${PATH} + # clang++ 4.0 via mason with -fsanitize=undefined + - os: linux + compiler: "clang++-40-mason" + env: CXX=clang++-4.0 CXXFLAGS="-fsanitize=undefined" LDFLAGS="-fsanitize=undefined" + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'libstdc++-4.9-dev' ] + before_install: + - git submodule update --init + - ./.mason/mason install clang++ 4.0.1 + - export PATH=$(./.mason/mason prefix clang++ 4.0.1)/bin:${PATH} + # clang++ 4.0 via mason with -fsanitize=integer + - os: linux + compiler: "clang++-40-mason" + env: CXX=clang++-4.0 CXXFLAGS="-fsanitize=integer" LDFLAGS="-fsanitize=integer" + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'libstdc++-4.9-dev' ] + before_install: + - git submodule update --init + - ./.mason/mason install clang++ 4.0.1 + - export PATH=$(./.mason/mason prefix clang++ 4.0.1)/bin:${PATH} + # clang++ 4.0 via mason with -fsanitize=safe-stack + - os: linux + compiler: "clang++-40-mason" + env: CXX=clang++-4.0 CXXFLAGS="-fsanitize=safe-stack" LDFLAGS="-fsanitize=safe-stack" + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'libstdc++-4.9-dev' ] + before_install: + - git submodule update --init + - ./.mason/mason install clang++ 4.0.1 + - export PATH=$(./.mason/mason prefix clang++ 4.0.1)/bin:${PATH} - os: osx - osx_image: xcode6 + osx_image: xcode8 + env: OSX_OLDEST_SUPPORTED=10.7 TEST_GYP_BUILD=True compiler: clang - os: osx - osx_image: xcode7 - env: TEST_GYP_BUILD=True + osx_image: xcode8 + env: OSX_OLDEST_SUPPORTED=10.12 compiler: clang - os: linux compiler: "clang35" - env: CXX=clang++-3.5 - addons: *clang35 + env: CXX=clang++-3.5 COVERAGE=True + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ] + packages: [ 'clang-3.5', 'libstdc++-4.9-dev' ] - os: linux compiler: "clang36" env: CXX=clang++-3.6 - addons: *clang36 - - os: linux - compiler: "clang37" - env: CXX=clang++-3.7 COVERAGE=True - addons: *clang37 - - os: linux - compiler: "clang38" - env: CXX=clang++-3.8 - addons: *clang38 - - os: linux - compiler: "clang38" - env: CXX=clang++-3.8 CXX_STD=c++14 - addons: *clang38 - - os: linux - compiler: "gcc47" - env: CXX=g++-4.7 - addons: *gcc47 + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6' ] + packages: [ 'clang-3.6' ] - os: linux compiler: "gcc48" env: CXX=g++-4.8 - addons: *gcc48 + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'g++-4.8' ] - os: linux compiler: "gcc49" env: CXX=g++-4.9 - addons: *gcc49 - - os: linux - compiler: "gcc49" - env: CXX=g++-4.9 CXX_STD=c++14 - addons: *gcc49 + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'g++-4.9' ] - os: linux compiler: "gcc5" - env: CXX=g++-5 CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" - addons: *gcc5 + env: CXX=g++-5 + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'g++-5' ] - os: linux - compiler: "gcc5" - env: CXX=g++-5 CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1" - addons: *gcc5 + compiler: "gcc6" + env: CXX=g++-6 CXX_STD=c++14 + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'g++-6' ] -before_install: +install: - echo ${CXX} - if [[ $(uname -s) == 'Linux' ]]; then export PYTHONPATH=$(pwd)/.local/lib/python2.7/site-packages; else - brew install boost; export PYTHONPATH=$(pwd)/.local/lib/python/site-packages; fi - if [[ ${COVERAGE:-0} == 'True' ]]; then PYTHONUSERBASE=$(pwd)/.local pip install --user cpp-coveralls; fi -install: +script: + # Build in Release + - make - make test - make bench - - if [[ $(uname -s) == 'Linux' ]]; then - make sizes /usr/include/boost/variant.hpp; - else - make sizes `brew --prefix`/include/boost/variant.hpp; - fi + - make sizes + - scripts/run_compilation_failure_tests.sh + - make clean; + # Build in Debug + - export BUILDTYPE=Debug + - make + - make test + - make bench + - make sizes - scripts/run_compilation_failure_tests.sh - if [[ ${TEST_GYP_BUILD:-0} == 'True' ]]; then make clean; make gyp; fi -script: +after_script: - if [[ ${COVERAGE:-0} == 'True' ]]; then make clean; make coverage; ./out/cov-test; cp unit*gc* test/; - ./.local/bin/cpp-coveralls -i optional.hpp -i recursive_wrapper.hpp -i variant.hpp -i variant_io.hpp --gcov-options '\-lp'; + ./.local/bin/cpp-coveralls --gcov /usr/bin/llvm-cov-3.5 --gcov-options '\-lp' -i optional.hpp -i recursive_wrapper.hpp -i variant.hpp -i variant_io.hpp variant_cast.hpp; fi diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000000..f6c4ca044bf --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,420 @@ +# Variant changelog + +## 1.2.0 + +Released: July 3, 2020 + +(82f9561) + +* Use perfect forwarding for internal value types deductions (#178) (#180) +* Implement support for "moving" values out (#142) (#178) (#180) +* Preserve ability to specify explicit `return_type` in visitors (#181) +* Add self-assignment checks in copy and move assignment operator= (#164) +* Add relevant tests + +## 1.1.6 + +Released: April 25, 2019 + +(a4f87dc) + +* make type used for `type_index` configurable via `type_index_t` typdef + use `unsigned int` by default. This addresses `sizeof` discrepancies between boost/std/mapbox variants (ref #19) [view commit](http://github.com/mapbox/variant/commit/9eec1fd48947d81af3debb82686c593b15f79aad) +* use `mapbox::util::type_index_t` (#19) [view commit](http://github.com/mapbox/variant/commit/05ee9aca16c3968e34db3b241c44eecb981344e0) +* Ensure internal index type is capable of holding all alternatives (ref #138) [view commit](http://github.com/mapbox/variant/commit/fa8e124a2367abc9c06f7e83926691085eed45c0) +* Add compile time check to disallow array types as alternatives. [view commit](http://github.com/mapbox/variant/commit/3f6fd131ef07a091338cec81ec8d23d6ca44528d) +* Make `type_index_t` configurable at compile time via `MAPBOX_VARIANT_MINIMIZE_SIZE` and `MAPBOX_VARIANT_OPTIMIZE_FOR_SPEED`. Default is `unsigned int`. (ref #138) [view commit](http://github.com/mapbox/variant/commit/35487cd39400b9a4bd30a18e6dfbf9cb1aaa80cd) +* add missing [view commit](http://github.com/mapbox/variant/commit/c839c666c324306a252b0fbcadd31e80e02e2898) +* Adds a test for polymorphic lambdas in match, resolves #140 [view commit](http://github.com/mapbox/variant/commit/9ac8978f5125182ac1bd9a1b68533bf9695f7289) +* Merge pull request #138 from mapbox/sizeof [view commit](http://github.com/mapbox/variant/commit/3d807d31621d52a8b27494c8f80aa50f6464f17d) +* Merge pull request #141 from mapbox/match-otherwise [view commit](http://github.com/mapbox/variant/commit/916139a2e51e125816efce6e19d428385601273f) +* Update bundled Catch to v1.9.0 [view commit](http://github.com/mapbox/variant/commit/f9c265d7e7a188aa4437f534d4c0648af0118b51) +* REQUIRE_THROWS etc take an expression not a block [view commit](http://github.com/mapbox/variant/commit/a064940e2ce7e40ef5e4db5710b399c68a71be4b) +* Merge pull request #143 from tomhughes/catch [view commit](http://github.com/mapbox/variant/commit/550ac2f159ca883d360c196149b466955c77a573) +* Add static_variant_cast, dynamic_variant_cast [view commit](http://github.com/mapbox/variant/commit/51fccd755b05ee9d3dec9da239acd15d0823c381) +* Merge pull request #144 from narizhny/Casts [view commit](http://github.com/mapbox/variant/commit/291121f6ac682c6cc5a7a69f253492f03ca7324f) +* recursive_wrapper fail to compile when used with 2 classes which are base and derived #146 [view commit](http://github.com/mapbox/variant/commit/7a541ba10d2eb9a9da0f11bb27319cd125d43a3d) +* recursive_wrapper test - avoid constructing new functor in recursive calls, call itself via `this` pointer. [view commit](http://github.com/mapbox/variant/commit/ea106db54b167b8dce7c0b3b9b59bb06b209db33) +* Merge branch 'master' of https://github.com/BlueSolei/variant into BlueSolei-master [view commit](http://github.com/mapbox/variant/commit/195367cfc19e1e08933487fa7cc56cb7f6d25cc8) +* Merge branch 'BlueSolei-master' [view commit](http://github.com/mapbox/variant/commit/e01b7bf3334e788fb99f4a510d5bc87a4a581342) +* add test for ref #147 + https://github.com/mapbox/variant/pull/147 [view commit](http://github.com/mapbox/variant/commit/6247207595902dbf898a430346335af2a3485c74) +* - Add a project mapbox_variant. - Use of the 'os' module to capture CXX_STD. - Common configs moved to project. - Built targets moved to 'out' directory. [view commit](http://github.com/mapbox/variant/commit/b2471ffc74c163194943b17b2b2c5758c59655ca) +* - Remove the use of boost libraries. - Add default build. [view commit](http://github.com/mapbox/variant/commit/561a09dd005468f9cdef651030471a1215f1885f) +* - Use of the module 'os' to get BOOST_DIR. - Add macro SINGLE_THREADED to single threading mode. - Define single threading mode as default. - Add lambda_overload_test and hashable_test. [view commit](http://github.com/mapbox/variant/commit/bd0a2d559724b8daa7d1ff33df90976e26a595aa) +* - Add auxiliar rule exe-test. [view commit](http://github.com/mapbox/variant/commit/04a6797a6aa2a86dd3eb6517893255c010f6e524) +* Merge pull request #153 from ricardocosme/boost-build [view commit](http://github.com/mapbox/variant/commit/266f68d9f1c3ad65e6d6c264f0130bc4c652618a) +* Use forwarding reference in make_visitor and visitor [view commit](http://github.com/mapbox/variant/commit/9f991da78d3146d32be67695a89c2b1197c826b2) +* Add copy assignment and move assignment operators. [view commit](http://github.com/mapbox/variant/commit/f0b50062b4fd2bf2b86aeada2efa8e36cfa6cb1c) +* Merge pull request #154 from ricardocosme/forwarding_reference_make_visitor [view commit](http://github.com/mapbox/variant/commit/b78b51548743737357e5b3bbe296f465d5f4fdae) +* add CHANGELOG.md skeleton [view commit](http://github.com/mapbox/variant/commit/555436f715e5e0929a13664f0911ecc4931356d1) +* add to CHANGELOG entries. [view commit](http://github.com/mapbox/variant/commit/6497bce683e6e8edf80f80bc4fed65235690b335) +* update CHANGELOG (git log ... --pretty=format:'* %s [view commit](http://github.com/mapbox/variant/commit/%H)' --reverse) [view commit](http://github.com/mapbox/variant/commit/75bb549d233eb94c74d2730dc3a8d8ed35c87f3d) +* use full sha1 [view commit](http://github.com/mapbox/variant/commit/ba3085a5eb6e874d43432dc75f3392092e1e7214) +* add intial `variant_alternative` implementation (#161 http://en.cppreference.com/w/cpp/utility/variant/variant_alternative) [view commit](http://github.com/mapbox/variant/commit/43357808cc93e69d2975e31e68986137ac5e88c9) +* add lost test check + remove stderr [view commit](http://github.com/mapbox/variant/commit/4b98c485cf7d74691f7921145054641daa66936e) +* alternative implementation of `variant_alternative` [view commit](http://github.com/mapbox/variant/commit/3449d00cf525d8ef98cee0f4a276e2928398a8f9) +* add `variant_alternative_t` [view commit](http://github.com/mapbox/variant/commit/3ffef950b005f31961f167242911b2f97d2634c3) +* add optimized 'variant_alternative' implementation usinh built-in `__type_pack_element` when available (clang++) [view commit](http://github.com/mapbox/variant/commit/ae193141379c1706e17098c67c5b4e4f48b19c48) +* add compile index in range check for __type_pack_element branch. [view commit](http://github.com/mapbox/variant/commit/8b1de314711bff2f9f3c748ac0ed7cd7d6400331) +* fix preprocessor logic [view commit](http://github.com/mapbox/variant/commit/30560e19e60c23227b29bc3434a163d2343333d3) +* add `variant_size` helper [view commit](http://github.com/mapbox/variant/commit/835ebc19321c6a9696a2072b7fbd5ca3de818860) +* Merge pull request #162 from mapbox/variant_alternative [view commit](http://github.com/mapbox/variant/commit/237f83cad2c76b1717ba4076c30aca32339336a8) +* Removes deprecated static_visitor to avoid msvc C4996 compiler warning [view commit](http://github.com/mapbox/variant/commit/215d64585ef92e16f18f5da81195b0279f53f599) +* Merge pull request #163 from MaxRis/master [view commit](http://github.com/mapbox/variant/commit/859a8c933a0c2ab18941acb9dcf834799c0de46c) +* Fix README.md issues [view commit](http://github.com/mapbox/variant/commit/0888a8e92df4c1cfd85419b05910355b2d78013b) +* Merge pull request #165 from nick70/master [view commit](http://github.com/mapbox/variant/commit/5eee328d69aaa805bd0b43bdaede12a8eb4632eb) +* Fix the noexcept specifications for move assignment and conversion. [view commit](http://github.com/mapbox/variant/commit/9c81bef8cf285d9fb45f1eaf9b29eba4fee08d1b) +* Merge pull request #160 from mlogan/master [view commit](http://github.com/mapbox/variant/commit/256ddd55582bb7c06c342315dbacc6a42fee4b34) +* report actual file size not allocated size. [view commit](http://github.com/mapbox/variant/commit/ef3856c85f389d4be7feb6555336168c4adcfa0e) +* use `ls -lah` as `du -h --apparent-size` is not universally supported. [view commit](http://github.com/mapbox/variant/commit/a64062576d9af09469183a94b9770c8e7f877a93) +* fix Makefile [view commit](http://github.com/mapbox/variant/commit/502e32b8bade6e19d7fe511f4634e7033f61235f) +* try fixing travis via upgrading clang++ from 3.9.1 -> 4.0.1 [view commit](http://github.com/mapbox/variant/commit/f31bcfb4bc97cf4c5e89b01bbfa7df4cd553f576) +* steady .. downgrade clang++ to 4.0.0 [view commit](http://github.com/mapbox/variant/commit/11a36a9f12adc30ac47afc9681ec8aa1a2d68c28) +* update mason [view commit](http://github.com/mapbox/variant/commit/fe0a0666fc734033f6a9cd2256226eec5943138a) +* update mason + update clang++ to 4.0.1 [view commit](http://github.com/mapbox/variant/commit/c1a14e7d9e9a10ea7d793d83043d9a18b974ca8e) +* Run ASAN builda in isolated VM via `sudo : required` [view commit](http://github.com/mapbox/variant/commit/5a5ecca5bef02072109a714bab840a36ea772f01) +* Merge pull request #167 from mapbox/clang++4 [view commit](http://github.com/mapbox/variant/commit/0f734f01e685a298e3756d30044a4164786c58c5) +* Moved to in-class initialization [view commit](http://github.com/mapbox/variant/commit/2fef61f08e44bcc99b1acc21ea78554b08d8f6e7) +* Merge pull request #171 from mapbox/jrex-mute-clang-analyzer [view commit](http://github.com/mapbox/variant/commit/0305fdb2a462ca39db7b8cce189561bed17b48 + +## 1.1.5 + +Released: January 7, 2017 + +(d2588a8f1d6b5d480d228e6d8a906ce634bdea9a) + +* add package.json for publishing to npm [view commit](http://github.com/mapbox/variant/commit/cb5635ba2556d76aaba97e4d0fc14b82b48f8b61) +* test with clang 3.9 and g++-6 [view commit](http://github.com/mapbox/variant/commit/efa75df2735d3f5a5fa2646528d4006bf9b5b3dc) +* travis: fix addons [view commit](http://github.com/mapbox/variant/commit/ce2eea64499cd37eec7932ddf82f72b9f1a1b79e) +* makefile improvements [view commit](http://github.com/mapbox/variant/commit/c81b475b40797d503f18ddad4c065f6b1694d341) +* upgrade boost to 1.62.0 [view commit](http://github.com/mapbox/variant/commit/b9c58d631a22e97f4069a819765f5c157525df6a) +* upgrade mason [view commit](http://github.com/mapbox/variant/commit/a760cea8dab53e587498470861b364f1256a5e0d) +* test clang++ via mason [view commit](http://github.com/mapbox/variant/commit/84eeb54c9408297db4bc57e3ea5a1b3d9f075a66) +* fix clang++ PATH [view commit](http://github.com/mapbox/variant/commit/e07a533a8f451fe541db683fc713eb0012730115) +* disable clang++ 3.9, will work on getting working in a branch [view commit](http://github.com/mapbox/variant/commit/702826365d1ea13710b82949c254af5920c92999) +* test with clang++ sanitizers and flto [view commit](http://github.com/mapbox/variant/commit/9b2de45460f4df3a22c6607043d50df730dd42af) +* fix LDFLAGS [view commit](http://github.com/mapbox/variant/commit/20d693ed9a04cc6b689f4c6a1ed58c96f964b08a) +* -fsanitize=cfi and -fsanitize=safe-stack [view commit](http://github.com/mapbox/variant/commit/d1bb6e54608c6bfe3970b2653971da49b3c15ef8) +* more sanitizer options [view commit](http://github.com/mapbox/variant/commit/4fe5ced5db2cb46b23a6e326b5bf9292d95c0642) +* re-enable older compilers, trim excess [view commit](http://github.com/mapbox/variant/commit/6317a0b7406395729139327a83a71cfa14513fac) +* avoid expensive instantiation of tuple constructor in noexcept [view commit](http://github.com/mapbox/variant/commit/4febf973c2a0fc297869d78fc82368a16ee7f4fb) +* Merge pull request #132 from lightmare/avoid-tuple-instantiation [view commit](http://github.com/mapbox/variant/commit/18919174da93165a79ca5fdbfde4b172182c6156) +* enable -Werror, suppress warnings from non variant headers using isystem [view commit](http://github.com/mapbox/variant/commit/253047f53549c3fb1df441859cfd42aecc9f3a8f) +* fix conversion warnings [view commit](http://github.com/mapbox/variant/commit/539d712746d08a172e68a47f7aa73ffdda40b70b) +* build in both release and debug on travis [view commit](http://github.com/mapbox/variant/commit/cf9a534991b5a36f86674975768e0a1600c776be) +* fortification flags + -pthreads for linux where needed [view commit](http://github.com/mapbox/variant/commit/886377de081dd8099ef4a7869ae3ff5d6c850c8d) +* try without pthreads [view commit](http://github.com/mapbox/variant/commit/1023f2d9adcf0a14be7cb729abab8156ecd962c5) +* limit some flags to clang++ [view commit](http://github.com/mapbox/variant/commit/904dcaee6d0d872eae52578e38199577418f9a32) +* Add -pthread [view commit](http://github.com/mapbox/variant/commit/b433986199b7dfbe59fa498eb80791a49c625170) +* upgrade libstdc++ for coverage build [view commit](http://github.com/mapbox/variant/commit/7b409402c3cf4a0260aa36ee768ee474aa3683c1) +* drop -Wstack-protector which gives unhelpful warnings [view commit](http://github.com/mapbox/variant/commit/c8ec829ffb4498a0aea8ffa9b62ba4932cdefbdf) +* disable -Wparentheses for older gcc [view commit](http://github.com/mapbox/variant/commit/a80beaafc20c2c015ace5fb1e4c99f6de8c24d75) +* Merge pull request #133 from mapbox/Werror [view commit](http://github.com/mapbox/variant/commit/a9707c3de095c715f84a1855684a3dc8e37a594a) +* remove useless and/or dubious compiler flags [view commit](http://github.com/mapbox/variant/commit/5141d8d21a5b648e9fef879bfc12b29ffac7288d) +* Merge pull request #134 from lightmare/warnings [view commit](http://github.com/mapbox/variant/commit/18a8055fef0e14110c313ca358f0f7c88290bed0) +* osx: test that will support both latest (10.12) and oldest with c++11 support: 10.7 [view commit](http://github.com/mapbox/variant/commit/4923eb527c129060ba970d622d639ad2ada42497) +* fix gyp build [view commit](http://github.com/mapbox/variant/commit/5baa948fa73313091bc082b9f3d17c5b5f600cac) +* upgrade to llvm 3.9.1 [view commit](http://github.com/mapbox/variant/commit/f5fb4661ebf1ecd0167bce50b00a8339604395b0) +* upgrade mason [view commit](http://github.com/mapbox/variant/commit/61f8acea1b09de639b46c8af0c5aae29f51dd05c) +* Merge pull request #135 from mapbox/llvm-3.9.1 [view commit](http://github.com/mapbox/variant/commit/05b7612aa86c28f95d39ba786c7b611e811e4bf8) +* Trivial missing comma in README example code [view commit](http://github.com/mapbox/variant/commit/d2588a8f1d6b5d480d228e6d8a906ce634bdea9a) + +## 1.1.4 + +Released: December 21, 2016 + +(02bd1ac4c07e6db9fe0f01267853e43b41637b74) + +* Provides Convenient Lambda Overload Visitor Interface, resolves #113. [view commit](http://github.com/mapbox/variant/commit/d09188640b6d5a637f391108f849a962d02dbb40) +* Removes ::type Usage [view commit](http://github.com/mapbox/variant/commit/2275a61974aaf117fa8d08c08d640ffd05935db8) +* Adds C++14 SFINAE Test [view commit](http://github.com/mapbox/variant/commit/4d462f27b2d852f66a3769e5983691c0f9233c9e) +* Merge branch 'daniel-j-h-lambda-visitor' [view commit](http://github.com/mapbox/variant/commit/9a115c5eb3c09509c70a57b25b283b6e1cbba919) +* Makes variant hashable iff Ts... are hashable, closes #125 [view commit](http://github.com/mapbox/variant/commit/97d0379f0afc87cd74a10be56fbccfa04785f568) +* Implements Pattern Matching for Sum Types via `.match` Member Function. [view commit](http://github.com/mapbox/variant/commit/720c23736bb318937d0f53a413a617ff05040b73) +* Adds Documentation for Readme, resolves #98 [view commit](http://github.com/mapbox/variant/commit/d0266436b18ea3b1f15c8a244985b57a0a2b3770) +* Merge pull request #126 from daniel-j-h/hashable [view commit](http://github.com/mapbox/variant/commit/3c17c37aea0d7e3d9e860b746d54160ec820e6a2) +* Merge pull request #128 from daniel-j-h/match [view commit](http://github.com/mapbox/variant/commit/ed84def128ed99a4b3b1ebcde278be7f761e782e) +* Merge pull request #129 from daniel-j-h/docs [view commit](http://github.com/mapbox/variant/commit/02bd1ac4c07e6db9fe0f01267853e43b41637b74) + + +## 1.1.3 + +Released: October 24, 2016 + +(a5a79a594f39d705a7ef969f54a0743516f0bc6d) + +* use C++17 disjunction for no-references and one-convertible tests [view commit](http://github.com/mapbox/variant/commit/2c7ddecdb7ec3b1c1a6bc1797528375e513b7ab0) +* Merge pull request #116 from lightmare/disjunction [view commit](http://github.com/mapbox/variant/commit/8e2f6964157885f1655c1673d65f3aea9b90fe18) +* Update README [view commit](http://github.com/mapbox/variant/commit/aaddee9270e3956cee98cdd7d04aea848d69f5f0) +* expose `using types = std::tuple;` - useful for adapting variant to `boost::spirit` (QI,Karma,X3) [view commit](http://github.com/mapbox/variant/commit/e5818212a8f7ef89df0aa76d5244eca78b8dbb8d) +* add `struct adapted_variant_tag;` [view commit](http://github.com/mapbox/variant/commit/173a7457952d0f24e2c55d5eb3ea785ad41639fb) +* Merge pull request #120 from mapbox/types [view commit](http://github.com/mapbox/variant/commit/84a426a31ad3b63c4b8f8d189841e19af48cda40) +* nicer stderr [view commit](http://github.com/mapbox/variant/commit/9b46167f5c42a19a3b66cb92eb60418486b4e424) +* Fix #122 by adding an extra compile check in universal ctor (via @lightmare) + test case [view commit](http://github.com/mapbox/variant/commit/a5a79a594f39d705a7ef969f54a0743516f0bc6d) + + +## 1.1.2 + +Released: July 26, 2016 + +(388376ac9f0102feba2d2122873b08e15a66a879) + +* Re-implement type matching logic to reject ambigious conversions [view commit](http://github.com/mapbox/variant/commit/71ac8fdf96e547dca34fe58c5cd8d1dce2ef0dac) +* update tests [view commit](http://github.com/mapbox/variant/commit/8be6a2aa8f85e1455198eff31a577a1fb95e1d46) +* comment out code [view commit](http://github.com/mapbox/variant/commit/075d9636fdfe563b535fa3ba087409f940c018e4) +* Merge pull request #114 from mapbox/strict-conversions [view commit](http://github.com/mapbox/variant/commit/388376ac9f0102feba2d2122873b08e15a66a879) + + +## 1.1.1 + +Released: July 18, 2016 + +(c511b2f34d966c09e02a1b833db33a9a1f9b2196) + +## 1.1.0 + +Released: February 11, 2016 + +(5aab5df0dc899b484c04ce9c649645787ee0bc5c) + +* remove erroneous `;` ref #96 [view commit](http://github.com/mapbox/variant/commit/3f025adbf599d8dd9bfca02d45b37e49a2cae841) +* fix coverage to avoid warning: unit.gcno:version '402*', prefer '406*' [view commit](http://github.com/mapbox/variant/commit/b0ee4729bfc9ea649abe40f279de384df75b79d1) +* fix clang 3.8 compile, try 3.9 [view commit](http://github.com/mapbox/variant/commit/f034d5571de987d14b404dba94e7269ac41fa583) +* remove invalid option for llvm-cov [view commit](http://github.com/mapbox/variant/commit/5f6ed7149d737edf9f1f019beb54cbe5289c474c) +* run coverage with clang 3.5 - fix clang 3.8 build [view commit](http://github.com/mapbox/variant/commit/82bb901b6cc0de8c238a07292163dc7c28a26ce4) +* issue warning `-Wweak-vtables` so this issue is not forgotten (https://github.com/mapbox/variant/issues/95) [view commit](http://github.com/mapbox/variant/commit/35ca16c74f5712afb4f042f45ea64078fa0b630e) +* move headers into include/mapbox folder - closes #99 [view commit](http://github.com/mapbox/variant/commit/f00b24bf65e8af7fddc56ac4a3abe67ed974b0a5) +* Update README.md [view commit](http://github.com/mapbox/variant/commit/13c631a6297d9abc9677c1afc1a3907fec7c16b4) +* Add include directory [view commit](http://github.com/mapbox/variant/commit/7e4a01189bb4050524954b2a88c82de7cb82ea4a) +* Merge branch 'master' into include [view commit](http://github.com/mapbox/variant/commit/9bd902536f533305186aaf70edb2f0b9713f6b6b) +* fix typo [view commit](http://github.com/mapbox/variant/commit/a606e90243dcf145cf06d46e8e30c447f85af178) +* ammend include dir [view commit](http://github.com/mapbox/variant/commit/343831611e60e324e311d67f05da953e357df0a1) +* update remaining `` to `` [view commit](http://github.com/mapbox/variant/commit/bfe0f19dd14dedad9c0a6f1e211e81bd1233564e) +* fix compilation [view commit](http://github.com/mapbox/variant/commit/390229a59703d2467347d62f3e134e67ea6835cc) +* Merge pull request #101 from mapbox/include [view commit](http://github.com/mapbox/variant/commit/1bc46e525a9dec71af28f822e5fc031c1352ad2e) +* Remove Xcode 6 from CI matrix [view commit](http://github.com/mapbox/variant/commit/9b2fc858ccd84509fd7164a4847e7dc95e58d5a5) +* Install boost with mason; eliminate boost::timer dependency [view commit](http://github.com/mapbox/variant/commit/04dc3a46b02d6b8714d00280bb85c88716727862) +* `is()` - add specialisation for recursive_wrapper + update tests (ref #102) [view commit](http://github.com/mapbox/variant/commit/c6ae1ea0acf8c4392a806ad3abd5b11eb3b8a8ce) +* remove expected error string - current implementation emits compiler specific error message e.g [view commit](http://github.com/mapbox/variant/commit/4368d75292ae5149034b59b483fc3f8b3956a839) +* Jamroot - add missing include directory ./test/include for auto_cpu_timer.hpp [view commit](http://github.com/mapbox/variant/commit/7f7470fee6a42c3c68f1fa359a28cf762df385c3) +* Update README.md [view commit](http://github.com/mapbox/variant/commit/8bdad6b6d73844ef8437f004654c0745f0cec96a) +* Fix building with GCC (g++-5.2.0) on OS X (Darwin) (ref #108) [view commit](http://github.com/mapbox/variant/commit/55579f03fba747500b3a105ae73a7dfe6059cfc1) +* Update README.md [view commit](http://github.com/mapbox/variant/commit/33e27ec4c7cc5e1669f2181d13eacdfff15dfb61) +* Merge pull request #109 from mapbox/darwin-build-flags [view commit](http://github.com/mapbox/variant/commit/2f8a4a381f2ad8f9c2d3d068a757a3e0e9994495) +* Add get_unchecked() to enable use with exceptions disabled [view commit](http://github.com/mapbox/variant/commit/434dab048d52e4141146bb95fdabdf7aa62e799b) +* remove unused internal metafunctions [view commit](http://github.com/mapbox/variant/commit/48d60445cca1d71fbebb6456b5d45a18bb9cb3b8) +* add static which() function to get a contained types' which value [view commit](http://github.com/mapbox/variant/commit/74ce146d9b96081965d5fcdf53feefab6199468c) +* Merge branch 'master' into 111-which-constexpr [view commit](http://github.com/mapbox/variant/commit/dca3d967c165de1d0fb3bb5e1c2d6b4bcd76782f) +* Merge branch '111-which-constexpr' [view commit](http://github.com/mapbox/variant/commit/bb8c2d20317191f5228341a87b0c362c4d15be5b) +* variant - yield return type of mapbox::util::get automatically and make interface consistent (addresses #82) [view commit](http://github.com/mapbox/variant/commit/adf0e02bceb74339b8ccc3e9e3f316917cb3cc22) +* uncomment tests ref #82 [view commit](http://github.com/mapbox/variant/commit/37acc5a7caef10d2f52dbdcee71be53b79dda027) +* Merge pull request #110 from mapbox/110-get_unchecked [view commit](http://github.com/mapbox/variant/commit/20e44accb1edf84d944d44f91ed7401198368aae) +* c++ apply formatting [view commit](http://github.com/mapbox/variant/commit/372d7c88fe796a138d0e578328914ac80e5a949a) +* use local HAS_EXCEPTIONS #define (__EXCEPTIONS is g++/clang specific macro) [view commit](http://github.com/mapbox/variant/commit/eedafd31f9fdbaffcb605d8d34a3a3443a4f7a2d) +* update .mason pkgs [view commit](http://github.com/mapbox/variant/commit/b5728ad76e1402c130a9330aa44b6f4b655b13b4) +* fix value_traits to be able to match T, T& and T const& to the direct type stored in variant (ref #112) [view commit](http://github.com/mapbox/variant/commit/b3a002d185afac295486e2ebd6b84c78a2267ba0) +* add test for b3a002d185afac295486e2ebd6b84c78a2267ba0 (ref #112) [view commit](http://github.com/mapbox/variant/commit/c511b2f34d966c09e02a1b833db33a9a1f9b2196) + +## 1.0 + +Released: April 1, 2015 + +(bf485dfb59aef26f3ef2183d7c8c1111ad97062b) + +* Initial commit [view commit](http://github.com/mapbox/variant/commit/9b82890ea11742eafd686f44b8cc7075029dbd7b) +* initial import [view commit](http://github.com/mapbox/variant/commit/bb95645b86a8fe427df9af799ecd139e4fab38ef) +* remove unused boost::static_visitor [view commit](http://github.com/mapbox/variant/commit/2dbc79fdd28c2ad9623c6516069ae616af11cdc5) +* call reserve in boost::variant test and change order [view commit](http://github.com/mapbox/variant/commit/9c1d245388396ac289ccee238b549e48a7916f9e) +* add readme and makefile [view commit](http://github.com/mapbox/variant/commit/5afa5b2e1756dfb0e332f3e11bffdfb33cd31f75) +* makefile fixups [view commit](http://github.com/mapbox/variant/commit/c627c07afc972b3f1bab3ca219416d6e918cd39b) +* turn on more aggressive warnings and fix them where appropriate [view commit](http://github.com/mapbox/variant/commit/20ee8ffe2889f9e0f4974ba2aba028ccd3ce347a) +* -Wsign-compare [view commit](http://github.com/mapbox/variant/commit/12ef94a8c0edb897858b82d0064093e251ac4024) +* remove unneeded headers [view commit](http://github.com/mapbox/variant/commit/eeba005f2f2e287f23661e9dd555e57e0365d22c) +* include [view commit](http://github.com/mapbox/variant/commit/a7b562eb0ef665b57e3a29a2ff83721bc3f66a03) +* include headers for new/size_t/move [view commit](http://github.com/mapbox/variant/commit/c3963a96aab7d3d2e380652e4268c5d729778a59) +* add sizes target to check object sizes [view commit](http://github.com/mapbox/variant/commit/a1685041726cba13aa9fb728ec4963f3e7872200) +* add tests [view commit](http://github.com/mapbox/variant/commit/df1d00cc50d3b5a1cce203305d52f536f622663c) +* interleave test runs to ensure first run penalty does not murky the results [view commit](http://github.com/mapbox/variant/commit/969a346db6ab41adb66f7b3cbbcc92cd15c3b339) +* add to gitignore [view commit](http://github.com/mapbox/variant/commit/e98fc0736064d3131a25e899420b41276e801a45) +* fix build on ubuntu/g++-4.8 [view commit](http://github.com/mapbox/variant/commit/b8ab4b8c6beb2d0d4bb2afc9fda901c83588d153) +* debug/release builds + profiling [view commit](http://github.com/mapbox/variant/commit/a25c3597deb4d889085bc9492d2cf4f6df847a5a) +* pass release flags to make sizes [view commit](http://github.com/mapbox/variant/commit/23f112ae5e551a731939e8220a16a6c7a29d844b) +* force inlining to reduce final object size (yes **reduce**, with clang++ at least) [view commit](http://github.com/mapbox/variant/commit/c65aa114402e8f7b1d44062ff973f7c807741d06) +* optimization: avoid overhead of function call for invalid type check [view commit](http://github.com/mapbox/variant/commit/cebd6a31e54d84811cccab62991d142aa8aacbad) +* test threaded [view commit](http://github.com/mapbox/variant/commit/5a84ea2f40ccd2cadbc1091fae05b37b1d69c85c) +* 10 threads [view commit](http://github.com/mapbox/variant/commit/c06ebf15268925ef5e0f3ce763db13fd0c27ef2b) +* use perfect forwarding instead of move [view commit](http://github.com/mapbox/variant/commit/cd81aed73c9f1176e26090abc60a9d2467f5d5bf) +* const as const can. also reimplementation of operator= to allow for ADL in swap [view commit](http://github.com/mapbox/variant/commit/33603114129c387c5938287f1839f852a8f3a5f2) +* Merge pull request #1 from artemp/consts_and_fwds [view commit](http://github.com/mapbox/variant/commit/dff07459931e6d76b4eea6092041cbf247e01f64) +* implement comparison operators (==,<) implement operator<< [view commit](http://github.com/mapbox/variant/commit/cb9374b1ebb4c2da42e06af71ca738e9316b0582) +* make THREADS=4 ( we want to test variant not an operating system, better still make it config (TODO)) add simple test for operator== and operator<< ( define VARIANT_LOGICAL_TESTS to enable) [view commit](http://github.com/mapbox/variant/commit/68aa114c5d06a979b8fb31f0cdd2647833544cb1) +* c++ : better names (#2) [view commit](http://github.com/mapbox/variant/commit/48dd83308ebb5ab21c295499948d27d42801b306) +* c++ : better names (#2) [view commit](http://github.com/mapbox/variant/commit/46f40479fd02170b9d4bf48655a6a6a7845d77cc) +* Merge branch 'master' of github.com:artemp/variant [view commit](http://github.com/mapbox/variant/commit/41d5626bee25a4edd36c2e2d05bde46751417baa) +* Added const [view commit](http://github.com/mapbox/variant/commit/9d7afc7362e095acf032b5a3d2057d960157ffcb) +* Fixed var names [view commit](http://github.com/mapbox/variant/commit/7423b70b907b640b477c9675d79b43abb6bf21ed) +* changing const keyword position to 'T const &' [view commit](http://github.com/mapbox/variant/commit/f6677d163a1c1df6d960baa7d0d7983edac95cc3) +* Add -march=native to release build flags, implies -mtune=.. [view commit](http://github.com/mapbox/variant/commit/3ff69626f348da3f6827fc1573e014400d5f6813) +* Merge pull request #7 from artemp/const_correctness_part2 [view commit](http://github.com/mapbox/variant/commit/f8ff1da09fdb3902b39cb6893fda048b2760da68) +* Merge pull request #8 from artemp/architecture-optimizations [view commit](http://github.com/mapbox/variant/commit/4b325da289df3e91bc32d71d4adceb28d3cf8215) +* fix remaining names [view commit](http://github.com/mapbox/variant/commit/2de14db6a431689e07630f42ee18a30101ed11b3) +* add -march=native to Jamroot [view commit](http://github.com/mapbox/variant/commit/8c03239ed115ed51d181ea52a40f0e9e8ec73f42) +* more name fixing ref #2 [view commit](http://github.com/mapbox/variant/commit/f27bd4c7f514f9f646eb0766cfd8f4b7e8f0ed33) +* structs dont have private members [view commit](http://github.com/mapbox/variant/commit/3d0072d34600bbf2fc21bee3db65770cf6796402) +* add pgo option to Makefile [view commit](http://github.com/mapbox/variant/commit/7f4f85e93d09630dd78ba5eb113bb03fb9804979) +* Merge pull request #9 from artemp/classes_and_structs [view commit](http://github.com/mapbox/variant/commit/21ced9474d93a96bb5c7cd527efa5e0ba742e84a) +* Merge pull request #10 from artemp/profile_guided_optimization [view commit](http://github.com/mapbox/variant/commit/0fc8f6b3911b6b6c0dbe72d5c440c7c094add899) +* + implement binary visitation [view commit](http://github.com/mapbox/variant/commit/943b24689b918f13ee1bdeb43111cbdf49139797) +* more realistic test [view commit](http://github.com/mapbox/variant/commit/e481fdb58ac2fec43a18ba119715f539ba000007) +* fix return types [view commit](http://github.com/mapbox/variant/commit/b41b4f69c21e552198310ebaf17c4776e2b4dc1f) +* Return uint64_t [view commit](http://github.com/mapbox/variant/commit/de6db67da287a8f80b956c85a5a6bff2af6cd52f) +* recursive_wrapper init impl [view commit](http://github.com/mapbox/variant/commit/f1c12747d921763288435beb53fbf23eafb6100d) +* Merge branch 'master' of github.com:artemp/variant [view commit](http://github.com/mapbox/variant/commit/49274509129f7f5957cc785b82771ad772fb2478) +* + add static_visitor requirement to ease return_type deduction [view commit](http://github.com/mapbox/variant/commit/80d999a3471b5647a17c14217ef237f8e9f82543) +* fix binary visitor test [view commit](http://github.com/mapbox/variant/commit/87207d76fb81f87b0bbde00c1ed44ec6043103fa) +* use static_visitor as a base class for all visitors [view commit](http://github.com/mapbox/variant/commit/48f78bcd767b99575a5af4aeb0490342e8a2b7a9) +* recursive_wrapper test (work-in-progress) [view commit](http://github.com/mapbox/variant/commit/05af9c4f21eefc91c713bc1e34e0e04b0556519a) +* include recursive_wrapper [view commit](http://github.com/mapbox/variant/commit/cbd9e2cf91e58baebd79ce336ba4b20148f303af) +* update test (FIXME - inteface is very clunky atm and needs more work) [view commit](http://github.com/mapbox/variant/commit/d2cda9a88684d2e7fad3d3527e53f7c64c84378e) +* unwrap recursive_wrapper [view commit](http://github.com/mapbox/variant/commit/bc65cb8d7be23806dc63c2adf03fc8e9b5557f66) +* + const [view commit](http://github.com/mapbox/variant/commit/6e9a10f43eab476d68399d6dcc51a2464cd2f0b8) +* recursive variant test using std::unique_ptr move semantics [view commit](http://github.com/mapbox/variant/commit/5ebf86772daade4490652218e3437d5d0ca7d1de) +* add missing test file [view commit](http://github.com/mapbox/variant/commit/b4abfa58efb676aa86a3dd2dfee04f7e95aee7fd) +* update recursive_wrapper and unique_ptr tests to accept arg [view commit](http://github.com/mapbox/variant/commit/edcb444afc193784cb6237616d68973b36e7920e) +* make test -> make bench [view commit](http://github.com/mapbox/variant/commit/fc80297390285e83394983201473d01edfa17d4c) +* fix compile of test/variant [view commit](http://github.com/mapbox/variant/commit/da417016e6af968cdcea1b2ec9f2023d3ee77cad) +* recursive_wrapper.hpp depends on boost checked delete for the moment [view commit](http://github.com/mapbox/variant/commit/a8d019d470e11eb3a569581ce140397bb6f6e31d) +* shuffle code, all build targets in out/ directory [view commit](http://github.com/mapbox/variant/commit/8e5abd0f14e298b9cc93f7428c2cd21ce732fad9) +* all tests in ./test directory [view commit](http://github.com/mapbox/variant/commit/dadea1f2a7d9c08e1a5979cc5bb824779fb73380) +* add travis [view commit](http://github.com/mapbox/variant/commit/7e775d10774261b5461474013b840fdd899db023) +* fix travis targets [view commit](http://github.com/mapbox/variant/commit/c6bd4f8131f6a58d6d6dfaf3017c8793a0da9819) +* travis: upgrade to gcc-4.8 for c++11 support [view commit](http://github.com/mapbox/variant/commit/84fdc9e2c0701980c083ff3cb8701f3076f10fa6) +* fix a few -Wsign-compare warnings [view commit](http://github.com/mapbox/variant/commit/d3d0704c59dba67f925b707d6c72babadd607ce9) +* fix -Wshadow warning [view commit](http://github.com/mapbox/variant/commit/e19d0e5aca3b4e4a76e29e34352d634b7c495202) +* fix linux compile of binary_visitor_test.cpp [view commit](http://github.com/mapbox/variant/commit/d8df077f29428c55688910d5f96e79b6d351d5e1) +* qualify c++11 int types [view commit](http://github.com/mapbox/variant/commit/62e7165925bfce3e4c11a2fce1cad8d486825613) +* fix #12 [view commit](http://github.com/mapbox/variant/commit/c0593af2c3066d13f30bf15241da313539539f18) +* test with both gcc 4.7 and 4.8 [view commit](http://github.com/mapbox/variant/commit/916719bb38cec2e9f4ff7c3d2ef480734badbb7d) +* Add BSD license [view commit](http://github.com/mapbox/variant/commit/cf7f7bef518d7dd67d74e84bdbaf40a6c5826114) +* add unit tests [view commit](http://github.com/mapbox/variant/commit/0ef558f9607844fa88b1857e6ff993121dd84d71) +* port logical tests to test/unit.cpp - refs #15 [view commit](http://github.com/mapbox/variant/commit/7109df9c4f423b846839240d720de4a89be101c8) +* version, starting at 0.1.0 [view commit](http://github.com/mapbox/variant/commit/e5c89779e59bc22571ce5beb27a823b94b2be786) +* try building on windows with gyp [view commit](http://github.com/mapbox/variant/commit/b97876a2e5ddaf8931cecd36b5a649fb3e1eb420) +* call gyp_main.py [view commit](http://github.com/mapbox/variant/commit/24cddfbc76c713046b130158c72231bd827d4a23) +* be explicit about config and platform [view commit](http://github.com/mapbox/variant/commit/bc80b31f8c4afd469f65046cfc3fe18bba95fbd3) +* also test building with gyp on travis [view commit](http://github.com/mapbox/variant/commit/51eda4f439c24223a964fe25d077ff1efa27dce0) +* try 'any cpu' [view commit](http://github.com/mapbox/variant/commit/41056fa781bf3c6a79182db338595b44d6370c25) +* put msbuild on path [view commit](http://github.com/mapbox/variant/commit/948a6ccb89ae2b4a3682805519b585bf573763a9) +* appveyor: try building 32 bit [view commit](http://github.com/mapbox/variant/commit/1b89ab841021d28da193e3b1fab27269651bdc17) +* Update README.md [view commit](http://github.com/mapbox/variant/commit/011b5125a4bb139f794bb37080bd33cae6519f7c) +* + it breaks builds for me - I have 'using clang ..' in $(boost-dir)/tools/build/v2/user-config.jam where it should be. [view commit](http://github.com/mapbox/variant/commit/1b2fc49bbc7e76bbaf2c64ea44cb3f287d5948a5) +* ```apply_visitor``` interface not-compatible with boost::apply_visitor (by changing args order) wasn't smart [view commit](http://github.com/mapbox/variant/commit/67ac560672e5ea7bf99a4a823b5259ccd6d1bd5d) +* fix syntax [view commit](http://github.com/mapbox/variant/commit/002ccdcde4aacfcc6b67ad4981c05402514c09f1) +* windows support [view commit](http://github.com/mapbox/variant/commit/64f8fb4473f3ef6f7117dc02f02a20645e415b72) +* update readme [view commit](http://github.com/mapbox/variant/commit/20f26eceebef717a0ee759b42bfe939a95874807) +* appeveyor: try building for just x86 [view commit](http://github.com/mapbox/variant/commit/b3f8117d05071981106b7d1fe15405a318d3c1df) +* fix setting of msbuild_toolset for c++11 support [view commit](http://github.com/mapbox/variant/commit/d0603d41a8597089c0c1cd099ebb8bcf5e1414d3) +* Add vcbuild.bat [view commit](http://github.com/mapbox/variant/commit/bb12b87574fcdaa7bdca6c1529d442eab2d52b97) +* remove sizeof checks since they are implementation depedenent [view commit](http://github.com/mapbox/variant/commit/f5af06c20329a0c762af9420a3ae2e3d22c02c91) +* comment failing test on windows [view commit](http://github.com/mapbox/variant/commit/7d4dc68667659e7585d28f743509956e92759255) +* appveyor: re-enable matrix [view commit](http://github.com/mapbox/variant/commit/6dbc0546bdab9e8dc291eb08d2e6dce13a0dcfe8) +* add to be include order agnostic [view commit](http://github.com/mapbox/variant/commit/9be8c519c67ef2ec8d3b5a7b736f0a8b870b43ed) +* Merge pull request #16 from DennisOSRM/master [view commit](http://github.com/mapbox/variant/commit/b27a14e98d9eadf2aabd628a602f9e4a5fcb0a5f) +* move detail tests + add initial comments (@artemp, please review) [view commit](http://github.com/mapbox/variant/commit/ea25e84aeec16588857ac83c1241d34a5df4adac) +* fix typo in code comment [skip ci] [view commit](http://github.com/mapbox/variant/commit/b773421f5868315eccd504204f32ee8c02e78dc6) +* rename internal id to index, add tests [view commit](http://github.com/mapbox/variant/commit/390e2315b97bbc71aa575d98bacc1ed760d0aa4a) +* Merge pull request #18 from mapbox/type_index [view commit](http://github.com/mapbox/variant/commit/046296a95c9d34224c23c843bc8bd6d502f81b47) +* modify tests slightly to output num_iter ((3+2)-4) [view commit](http://github.com/mapbox/variant/commit/602eceb753751ae30cd5ca7a25d3337179ba6b5e) +* boost is uneeded for unit.cpp tests [view commit](http://github.com/mapbox/variant/commit/e1de3d78e8827d5b6819cc91b430429a46093c95) +* enable ctor's for valid types at compile time [view commit](http://github.com/mapbox/variant/commit/31e3fd96fe4f86d9ac5ac53d6e3e07605307eb5c) +* [travis] multi-os [view commit](http://github.com/mapbox/variant/commit/2f1e36d25f152c31cc3b2673946a8670dd189e74) +* fix path to boost/variant.hpp on linux [view commit](http://github.com/mapbox/variant/commit/b31579c99042d36672fa9eefb09bcdb01e1bcc0a) +* move variant and friends into mapbox namespace for easy integration [view commit](http://github.com/mapbox/variant/commit/df55ab6ef48d1a28c58e409d71b3ee4b416cdf31) +* fix namespace [view commit](http://github.com/mapbox/variant/commit/397ed9c90bc55bbf2f3331f43a707789869d064a) +* inline accessors/setters [view commit](http://github.com/mapbox/variant/commit/2ebabd9b6cb1b95605b01708899498ac70b84201) +* default ctor : initialise with default contructed first type in parameters pack [view commit](http://github.com/mapbox/variant/commit/4d038f1462698c0977e14eacfd9abeb8da95c852) +* add default ctor test [view commit](http://github.com/mapbox/variant/commit/d7fa62b52f771f0d194441b5889409e792eff740) +* c++11 : use type aliases instead of typedefs [view commit](http://github.com/mapbox/variant/commit/03eb4c7d287b72eb43d2b6456ef38437c8c0ac34) +* converting operator= [view commit](http://github.com/mapbox/variant/commit/0eed7c3c1477e0673d379336b0745606d2780d8f) +* avoid wrapped object copying [view commit](http://github.com/mapbox/variant/commit/f7648ba392aea548fe0d583ceee2048ad57e2f54) +* fix move ctor + housekeeping [view commit](http://github.com/mapbox/variant/commit/6aee8c4a7543e0d38f64a07d67aaf394bea704d9) +* add [view commit](http://github.com/mapbox/variant/commit/82cc6e2335b377b5e61e9a3bc974e619658ab515) +* remove unused header [view commit](http://github.com/mapbox/variant/commit/74425f135a6b7cdd49d86d2dd84cf9bdfe9154c2) +* uncomment to test single threaded [view commit](http://github.com/mapbox/variant/commit/7296d18458e2dbfc7ddb39f0fe5b96962c264dc6) +* fix bug : assign correct index (in reverse order of args) e.g first type is sizeof...(Types) - 1 [view commit](http://github.com/mapbox/variant/commit/7eb748eb65729c2d91a7c4f16e5bd56eb3038bdd) +* fix default ctor unit test [view commit](http://github.com/mapbox/variant/commit/03af9e421b36e17a9b873cb24347f6bad7c3dc6d) +* [gyp] fix typo in Windows release targets [view commit](http://github.com/mapbox/variant/commit/2d8ca78704f69c6498a0e689222588275c8f33aa) +* add non-const visitor interface (#22) [view commit](http://github.com/mapbox/variant/commit/54d07c9d336c989fe3c1231bbb7f6465ebc68da2) +* add unary_visitor test [view commit](http://github.com/mapbox/variant/commit/3b31c34368613c4cd101e6f7ee9677c2c7b6b75e) +* support implicit type convertions [view commit](http://github.com/mapbox/variant/commit/724a40baec3ded142c631b66521502840d8d183f) +* update to use recursive_wrapper -> T conversions [view commit](http://github.com/mapbox/variant/commit/7e609812f15cbf41fab978fd3222c6029a5b67eb) +* unit test : update to use latest variant impl [view commit](http://github.com/mapbox/variant/commit/d1392fa431b5b5dac99cdb8b937ec05e13d98847) +* Mapbox name without the inner uppercase B. [view commit](http://github.com/mapbox/variant/commit/4e11d41723af714895c90cb8b9798527c946b2b4) +* Fix typo in comment. [view commit](http://github.com/mapbox/variant/commit/01509c76c30bea7a6bfffd0e59f9bbdbae8f1026) +* Formatting fixes. [view commit](http://github.com/mapbox/variant/commit/cfd7d991b23b2ecc659d18f22a2f78a05074450c) +* Use formatting "TYPE const&". [view commit](http://github.com/mapbox/variant/commit/9253ffdda65bd41ed21f9328a20a335fa0f5d582) +* Remove superfluous and inconsistent whitespace. [view commit](http://github.com/mapbox/variant/commit/d855ba8672fc5f439594325663899564f0632c94) +* Add comments for closing namespaces. [view commit](http://github.com/mapbox/variant/commit/3c2d662abb352bd429777251ddc613e751e49123) +* Merge branch 'joto-master' [view commit](http://github.com/mapbox/variant/commit/49e9f351a7a8d5615f8fb5ae2d4840042fc95bcc) +* Fix typos, whitespace and test tags. [view commit](http://github.com/mapbox/variant/commit/a12326984f323d10648115d94ace0b510d097b06) +* Add tests for implicit conversion and exceptions for wrong types. [view commit](http://github.com/mapbox/variant/commit/12c70938b00215ce86e48657d60a650dbfd8966e) +* Add test for printer visitor. [view commit](http://github.com/mapbox/variant/commit/fd470a6fde0941407a74c3d544c009eac0579e4f) +* Add test case for issue #25. [view commit](http://github.com/mapbox/variant/commit/74f1c5d9b02788fb9524ae674d43fdf07671d9cc) +* fix appveyor link in readme [view commit](http://github.com/mapbox/variant/commit/d49f82efb7689b8bc67be30633dd7f41b54f2e5a) +* Remove the need for the static_visitor class. [view commit](http://github.com/mapbox/variant/commit/e9283622a33231500c8cc3d1f27358d431c1e8a2) +* msvs: also define _DEBUG for debug builds [view commit](http://github.com/mapbox/variant/commit/c4bb359f883b568a88d5be8b3e4ce5c45626d71f) +* [appveyor] more debug flags [view commit](http://github.com/mapbox/variant/commit/b852c8d386e59a145a6b684d036ee7e327d0efe2) +* [appveyor][gyp] correct msvs_settings usage [view commit](http://github.com/mapbox/variant/commit/1f707864e37c305779e3398006b20e2ee5f14866) +* customize release builds [view commit](http://github.com/mapbox/variant/commit/4661a3c06b3738c7564c18474577d4faece6613a) +* [gyp][windows] add exception handling/rtti [view commit](http://github.com/mapbox/variant/commit/02556c9c317834ad3f05aa88dacc072ad9a63c99) +* use numeric values in valid range to avoid overflowing [view commit](http://github.com/mapbox/variant/commit/854c5a7a115d92b67698f3654d915edd483456b9) +* Removed wrong comments. [view commit](http://github.com/mapbox/variant/commit/8b6c0b34b76144d697ede0f386f1ea2f9c6ae2d1) +* Removed test case. [view commit](http://github.com/mapbox/variant/commit/08a7e04e3cf3ebd54e289201b1bd3d85225248ee) +* allow explicit un-initilised variant ctor [view commit](http://github.com/mapbox/variant/commit/d99139d4dee3ae4fa2b7465000d08fc5f5907e82) +* add boost::variant compatible accessors [view commit](http://github.com/mapbox/variant/commit/2afd3415cc28b8b7184e2750ac90e739c078b335) +* more verbose output to test script [view commit](http://github.com/mapbox/variant/commit/0c8b6b736788718ed28a0676cdb0b390249d5540) +* variant : make operator<< stricter to avoid unexpected instantiations [view commit](http://github.com/mapbox/variant/commit/76027798360405d910f8af9d6ae873fa5905be13) +* Add details on advantages of Mapbox variant [view commit](http://github.com/mapbox/variant/commit/a5ee02b2aacb0109725c611beaafc27dce89c12d) +* remove unneeded header [view commit](http://github.com/mapbox/variant/commit/73da70737f0e55b2276173ca923eb91bd8ae4f32) +* less debug info in release mode [view commit](http://github.com/mapbox/variant/commit/607ed1344f8117000e03da0b8bfb9268a1f826ee) +* rough cut of an optional type [view commit](http://github.com/mapbox/variant/commit/9badbd0fa37863240cf678be61116003d345a20a) +* add operator* and a static assert against reference types [view commit](http://github.com/mapbox/variant/commit/1141292eeed4a95f3e54c85e98f9ded180f84f32) +* Merge pull request #30 from DennisOSRM/optional [view commit](http://github.com/mapbox/variant/commit/32f971794c643d11f5bf374caef44cee295cdf7d) +* remove some whitespace [view commit](http://github.com/mapbox/variant/commit/f4bcf3ff733acbd4a798f1e9a5f80d5422bc9b79) +* explicit operator bool() const noexcept [view commit](http://github.com/mapbox/variant/commit/c77d98b3e8d06714ed0b0c288cd9ad457f2708c4) +* rename none_t -> none_type, move to private member of optional [view commit](http://github.com/mapbox/variant/commit/43e2e9a943555c09ce6ffb9c825a64bff229a3a6) +* remove instantiation of none_type as per @kkaefer's suggestion [view commit](http://github.com/mapbox/variant/commit/7242396fb5468defba37afd03e7a633075fa51ce) +* remove none_type and its complicated typedef from detail namespace, add it as private member class to optional [view commit](http://github.com/mapbox/variant/commit/c5f720515ad21fe3913fc841ea427ebdd1fa4c68) +* guard against self-assignment [view commit](http://github.com/mapbox/variant/commit/10a039c78b58857f8793dae3b0359cf1d6fb11ef) +* add unit tests for optional type [view commit](http://github.com/mapbox/variant/commit/607c6332cb96261a43a16fa94aea5d034ae58aac) +* Merge pull request #31 from mapbox/optional [view commit](http://github.com/mapbox/variant/commit/4cdd805a04175248b221753a0974de15c8f5b397) +* reformat optional.hpp to be more legible and less linty [view commit](http://github.com/mapbox/variant/commit/54e1dfe7631207da3f6a2bbc895c5240592ea5ea) +* universal-references: template variant(T && val) {} it turned out we don't need a separate converting copy ctor (fixes windows compiler) [view commit](http://github.com/mapbox/variant/commit/82df4ed9cd2a8335c7e50b913f827216604dab07) +* Merge pull request #32 from mapbox/universal-references [view commit](http://github.com/mapbox/variant/commit/804fb6f370a35eaea3e273ebfcb2f92ef7379e91) +* use std::forward for perfect forwarding (via @DennisOSRM) [view commit](http://github.com/mapbox/variant/commit/eb995158362307cea98e36eb782dd4ae63593d0f) +* fix assignment of optionals, adds a unit test [view commit](http://github.com/mapbox/variant/commit/f69f317069523cb6994fa9d594240deeb537753c) +* Merge pull request #33 from mapbox/fix_assignment_operator [view commit](http://github.com/mapbox/variant/commit/c56af229af98b71ba8ef637f3237cab828f0ec14) +* readme improvements [view commit](http://github.com/mapbox/variant/commit/5b8972b6ebcd095f35b810c43639785235218bbd) +* Merge branch 'master' into result_of [view commit](http://github.com/mapbox/variant/commit/4900027d0f66a7c701e22c667e92ce7b7521a73c) +* cast lhs to rhs type to avoid signed/unsigned comparisons warnings [view commit](http://github.com/mapbox/variant/commit/17074a3de539256ccab3871033df33c9d387dcbf) +* attempting to fix travis [view commit](http://github.com/mapbox/variant/commit/4fb9bd65ac4a204f8721f9528df9c14907a151f9) +* Merge branch 'master' into result_of [view commit](http://github.com/mapbox/variant/commit/fbcc50b57e58460e0cd90a232673271eff72311c) +* make deriving from static_visitor and providing result_type an option [view commit](http://github.com/mapbox/variant/commit/76ab6d4aa54664d7f8849695896ca57f4984bed0) +* Merge branch 'result_of' [view commit](http://github.com/mapbox/variant/commit/3cc2d708e0552ba4ebce11d4d67f798813f15aa2) +* fix automatic return_type calculation - ref #35 [view commit](http://github.com/mapbox/variant/commit/00ab88117ed25f78cdca2faa00beea0061271e85) +* test either g++ or clang++ [view commit](http://github.com/mapbox/variant/commit/199b3eca054075319a1978f09bdd77f9ff42e681) +* try adding code coverage / coveralls upload [view commit](http://github.com/mapbox/variant/commit/11e65282e335ed4a50bf261d21b8194230787ed8) +* fix bash syntax [view commit](http://github.com/mapbox/variant/commit/2fbfcd33998992df4d77f329e7a75c864616d0ab) +* add recursive wrapper to coverage [view commit](http://github.com/mapbox/variant/commit/f87a1cf10d62814d3bf4e72ac260a92e483ffb25) +* move operator<< into separate header [view commit](http://github.com/mapbox/variant/commit/24dcab23c4f70e54838e4a32a228aba8045ae17b) +* add coverage report [view commit](http://github.com/mapbox/variant/commit/89f8a41a4da81c2a01d39f83cf52e61997ce76ba) +* clean up coverage files in test directory too [skip ci] [view commit](http://github.com/mapbox/variant/commit/7dfdfa271e43780aff640852a632e88443b6fe32) +* add get() overloads for when T is stored in recursive_wrapper also makes get() a compile time error where T is not in Types... (ref #24) [view commit](http://github.com/mapbox/variant/commit/36f1e12f66570f2a1f04535dc0ac0485d48e2bbe) +* update unit test to match c64c74775a80474f2012c1a49ab2865e3666107a [view commit](http://github.com/mapbox/variant/commit/c117592337cc20c238d4ce9f9d8847aff0cd55ab) +* add which() method returning zero based index of stored T in Types... for boost::variant() compatibility [view commit](http://github.com/mapbox/variant/commit/3b02ca0e3ab1a36dd6ec9138e7f93eb3176ae5f7) +* add reference_wrapper test [view commit](http://github.com/mapbox/variant/commit/5a2d5c5f292ae2d6128d02e7ee2b3b3d72facfc2) +* remove boost variant header [view commit](http://github.com/mapbox/variant/commit/c53422fb2d4e44b7e276fcde65498b603f429a2f) +* add support for 'unwrapping' std::reference_wrapper and accessing std::reference_wrapper::type through get() + update test [view commit](http://github.com/mapbox/variant/commit/587519521ae0d9a24f997ab2dff77f13309aa5d2) +* pass F (functor) by ref/const ref [view commit](http://github.com/mapbox/variant/commit/2e0ce4a86d0b9d0ff9855838349fb599b15a274a) +* pass by const ref in 'apply_const' [view commit](http://github.com/mapbox/variant/commit/a3014f54651b71e25d81fbeaf99f29d63c625703) +* Revert "pass by const ref in 'apply_const'" [view commit](http://github.com/mapbox/variant/commit/e031c53d0c876ecf2b9d4a6e0a5383bd4169df71) +* Revert "pass F (functor) by ref/const ref" [view commit](http://github.com/mapbox/variant/commit/bf485dfb59aef26f3ef2183d7c8c1111ad97062b) diff --git a/Jamroot b/Jamroot index 1e98cf555a5..4e7a01f39b5 100644 --- a/Jamroot +++ b/Jamroot @@ -1,73 +1,62 @@ -# Inofficial and incomplete build file using Boost build system. +# Unofficial and incomplete build file using Boost build system. # You should use make unless you know what you are doing. -local BOOST_DIR = "/usr/local" ; - -#using clang : : ; - -lib system : : boost_system $(BOOST_DIR)/lib ; -lib timer : chrono : boost_timer $(BOOST_DIR)/lib ; -lib chrono : system : boost_chrono $(BOOST_DIR)/lib ; - -exe variant-test - : - test/bench_variant.cpp - .//system - .//timer - .//chrono - : - $(BOOST_DIR)/include - ./ - #SINGLE_THREADED - release:-march=native - ; +import os ; +local boost_dir = [ os.environ BOOST_DIR ] ; +if ! $(boost_dir) +{ + boost_dir = "/usr/local" ; +} -exe binary-visitor-test - : - test/binary_visitor_test.cpp - .//system - .//timer - .//chrono - : - $(BOOST_DIR)/include - ./ - release:-march=native - ; +#using clang : : ; -exe recursive-wrapper-test - : - test/recursive_wrapper_test.cpp - .//system - .//timer - .//chrono - : - $(BOOST_DIR)/include - ./ - release:-march=native +local cxx_std = [ os.environ CXX_STD ] ; +if ! $(cxx_std) +{ + cxx_std = c++11 ; +} + +project mapbox_variant + : requirements + -std=$(cxx_std) + $(boost_dir)/include + include + test/include + release:-march=native + single:SINGLE_THREADED + : default-build + release + speed + single ; -exe unique-ptr-test - : - test/unique_ptr_test.cpp - .//system - .//timer - .//chrono - : - $(BOOST_DIR)/include - ./ - release:-march=native +rule exe-test ( name : reqs * : deps * ) +{ + exe $(name) + : test/$(name).cpp + : $(reqs) + : $(deps) + ; + explicit $(name) ; +} + +exe-test bench_variant + : release:-Wweak-vtables ; - -exe reference_wrapper_test - : - test/reference_wrapper_test.cpp - .//system - .//timer - .//chrono - : - $(BOOST_DIR)/include - ./ - release:-march=native - ; +exe-test binary_visitor_test ; +exe-test recursive_wrapper_test ; +exe-test unique_ptr_test ; +exe-test reference_wrapper_test ; +exe-test lambda_overload_test ; +exe-test hashable_test ; + +install out + : bench_variant + binary_visitor_test + unique_ptr_test + reference_wrapper_test + lambda_overload_test + hashable_test + ; diff --git a/Makefile b/Makefile index 36652511d46..2559c0579f5 100644 --- a/Makefile +++ b/Makefile @@ -1,32 +1,53 @@ +MASON = .mason/mason +BOOST_VERSION = 1.62.0 CXX := $(CXX) CXX_STD ?= c++11 -BOOST_LIBS = -lboost_timer -lboost_system -lboost_chrono -RELEASE_FLAGS = -O3 -DNDEBUG -march=native -DSINGLE_THREADED -fvisibility-inlines-hidden -DEBUG_FLAGS = -O0 -g -DDEBUG -fno-inline-functions -COMMON_FLAGS = -Wall -pedantic -Wextra -Wsign-compare -Wsign-conversion -Wshadow -Wunused-parameter -std=$(CXX_STD) +BOOST_ROOT = $(shell $(MASON) prefix boost $(BOOST_VERSION)) +BOOST_FLAGS = -isystem $(BOOST_ROOT)/include/ +RELEASE_FLAGS = -O3 -DNDEBUG -march=native -DSINGLE_THREADED -fvisibility-inlines-hidden -fvisibility=hidden +DEBUG_FLAGS = -O0 -g -DDEBUG -fno-inline-functions -fno-omit-frame-pointer -fPIE +WARNING_FLAGS = -Werror -Wall -Wextra -pedantic \ + -Wformat=2 -Wsign-conversion -Wshadow -Wunused-parameter + +COMMON_FLAGS = -std=$(CXX_STD) +COMMON_FLAGS += $(WARNING_FLAGS) + CXXFLAGS := $(CXXFLAGS) LDFLAGS := $(LDFLAGS) -OS:=$(shell uname -s) -ifeq ($(OS),Darwin) - CXXFLAGS += -stdlib=libc++ - LDFLAGS += -stdlib=libc++ -F/ -framework CoreFoundation -else - BOOST_LIBS += -lrt +export BUILDTYPE ?= Release + +OS := $(shell uname -s) +ifeq ($(OS), Linux) + EXTRA_FLAGS = -pthread endif +ifeq ($(OS), Darwin) + OSX_OLDEST_SUPPORTED ?= 10.7 + # we need to explicitly ask for libc++ otherwise the + # default will flip back to libstdc++ for mmacosx-version-min < 10.9 + EXTRA_FLAGS = -stdlib=libc++ -mmacosx-version-min=$(OSX_OLDEST_SUPPORTED) +endif + -ifeq (sizes,$(firstword $(MAKECMDGOALS))) - RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS)) - $(eval $(RUN_ARGS):;@:) - ifndef RUN_ARGS - $(error sizes target requires you pass full path to boost variant.hpp) - endif - .PHONY: $(RUN_ARGS) +ifeq ($(BUILDTYPE),Release) + FINAL_CXXFLAGS := $(COMMON_FLAGS) $(RELEASE_FLAGS) $(CXXFLAGS) $(EXTRA_FLAGS) +else + FINAL_CXXFLAGS := $(COMMON_FLAGS) $(DEBUG_FLAGS) $(CXXFLAGS) $(EXTRA_FLAGS) endif -all: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test + + +ALL_HEADERS = $(shell find include/mapbox/ '(' -name '*.hpp' ')') + +all: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test out/lambda_overload_test out/hashable_test + +$(MASON): + git submodule update --init .mason + +mason_packages/headers/boost: $(MASON) + $(MASON) install boost $(BOOST_VERSION) ./deps/gyp: git clone --depth 1 https://chromium.googlesource.com/external/gyp.git ./deps/gyp @@ -34,27 +55,35 @@ all: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wra gyp: ./deps/gyp deps/gyp/gyp --depth=. -Goutput_dir=./ --generator-output=./out -f make make V=1 -C ./out tests - ./out/Release/tests + ./out/$(BUILDTYPE)/tests + +out/bench-variant-debug: Makefile mason_packages/headers/boost test/bench_variant.cpp + mkdir -p ./out + $(CXX) -o out/bench-variant-debug test/bench_variant.cpp -I./include -isystem test/include $(FINAL_CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS) + +out/bench-variant: Makefile mason_packages/headers/boost test/bench_variant.cpp + mkdir -p ./out + $(CXX) -o out/bench-variant test/bench_variant.cpp -I./include -isystem test/include $(FINAL_CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS) -out/bench-variant-debug: Makefile test/bench_variant.cpp variant.hpp recursive_wrapper.hpp +out/unique_ptr_test: Makefile mason_packages/headers/boost test/unique_ptr_test.cpp mkdir -p ./out - $(CXX) -o out/bench-variant-debug test/bench_variant.cpp -I./ -pthreads $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) + $(CXX) -o out/unique_ptr_test test/unique_ptr_test.cpp -I./include -isystem test/include $(FINAL_CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS) -out/bench-variant: Makefile test/bench_variant.cpp variant.hpp recursive_wrapper.hpp +out/recursive_wrapper_test: Makefile mason_packages/headers/boost test/recursive_wrapper_test.cpp mkdir -p ./out - $(CXX) -o out/bench-variant test/bench_variant.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) + $(CXX) -o out/recursive_wrapper_test test/recursive_wrapper_test.cpp -I./include -isystem test/include $(FINAL_CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS) -out/unique_ptr_test: Makefile test/unique_ptr_test.cpp variant.hpp recursive_wrapper.hpp +out/binary_visitor_test: Makefile mason_packages/headers/boost test/binary_visitor_test.cpp mkdir -p ./out - $(CXX) -o out/unique_ptr_test test/unique_ptr_test.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) + $(CXX) -o out/binary_visitor_test test/binary_visitor_test.cpp -I./include -isystem test/include $(FINAL_CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS) -out/recursive_wrapper_test: Makefile test/recursive_wrapper_test.cpp variant.hpp recursive_wrapper.hpp +out/lambda_overload_test: Makefile mason_packages/headers/boost test/lambda_overload_test.cpp mkdir -p ./out - $(CXX) -o out/recursive_wrapper_test test/recursive_wrapper_test.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) + $(CXX) -o out/lambda_overload_test test/lambda_overload_test.cpp -I./include -isystem test/include $(FINAL_CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS) -out/binary_visitor_test: Makefile test/binary_visitor_test.cpp variant.hpp variant_io.hpp recursive_wrapper.hpp +out/hashable_test: Makefile mason_packages/headers/boost test/hashable_test.cpp mkdir -p ./out - $(CXX) -o out/binary_visitor_test test/binary_visitor_test.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) + $(CXX) -o out/hashable_test test/hashable_test.cpp -I./include -isystem test/include $(FINAL_CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS) bench: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test ./out/bench-variant 100000 @@ -64,13 +93,31 @@ bench: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_w out/unit.o: Makefile test/unit.cpp mkdir -p ./out - $(CXX) -c -o $@ test/unit.cpp -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) + $(CXX) -c -o $@ test/unit.cpp -isystem test/include $(FINAL_CXXFLAGS) -out/%.o: test/t/%.cpp Makefile optional.hpp recursive_wrapper.hpp variant.hpp variant_io.hpp +out/%.o: test/t/%.cpp Makefile $(ALL_HEADERS) mkdir -p ./out - $(CXX) -c -o $@ $< -I. -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) + $(CXX) -c -o $@ $< -Iinclude -isystem test/include $(FINAL_CXXFLAGS) + +out/unit: out/unit.o \ + out/binary_visitor_1.o \ + out/binary_visitor_2.o \ + out/binary_visitor_3.o \ + out/binary_visitor_4.o \ + out/binary_visitor_5.o \ + out/binary_visitor_6.o \ + out/issue21.o \ + out/issue122.o \ + out/mutating_visitor.o \ + out/optional.o \ + out/recursive_wrapper.o \ + out/sizeof.o \ + out/unary_visitor.o \ + out/variant.o \ + out/variant_alternative.o \ + out/nothrow_move.o \ + out/visitor_result_type.o \ -out/unit: out/unit.o out/binary_visitor_1.o out/binary_visitor_2.o out/binary_visitor_3.o out/binary_visitor_4.o out/binary_visitor_5.o out/binary_visitor_6.o out/issue21.o out/mutating_visitor.o out/optional.o out/recursive_wrapper.o out/sizeof.o out/unary_visitor.o out/variant.o mkdir -p ./out $(CXX) -o $@ $^ $(LDFLAGS) @@ -79,14 +126,14 @@ test: out/unit coverage: mkdir -p ./out - $(CXX) -o out/cov-test --coverage test/unit.cpp test/t/*.cpp -I./ -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) + $(CXX) -o out/cov-test --coverage test/unit.cpp test/t/*.cpp -I./include -isystem test/include $(FINAL_CXXFLAGS) $(LDFLAGS) -sizes: Makefile variant.hpp recursive_wrapper.hpp +sizes: Makefile mkdir -p ./out - @$(CXX) -o ./out/our_variant_hello_world.out variant.hpp $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) && du -h ./out/our_variant_hello_world.out - @$(CXX) -o ./out/boost_variant_hello_world.out $(RUN_ARGS) $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) && du -h ./out/boost_variant_hello_world.out - @$(CXX) -o ./out/our_variant_hello_world ./test/our_variant_hello_world.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) && du -h ./out/our_variant_hello_world - @$(CXX) -o ./out/boost_variant_hello_world ./test/boost_variant_hello_world.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) && du -h ./out/boost_variant_hello_world + @$(CXX) -o ./out/our_variant_hello_world.out include/mapbox/variant.hpp -I./include $(FINAL_CXXFLAGS) && ls -lah ./out/our_variant_hello_world.out + @$(CXX) -o ./out/boost_variant_hello_world.out $(BOOST_ROOT)/include/boost/variant.hpp -I./include $(FINAL_CXXFLAGS) $(BOOST_FLAGS) && ls -lah ./out/boost_variant_hello_world.out + @$(CXX) -o ./out/our_variant_hello_world ./test/our_variant_hello_world.cpp -I./include $(FINAL_CXXFLAGS) && ls -lah ./out/our_variant_hello_world + @$(CXX) -o ./out/boost_variant_hello_world ./test/boost_variant_hello_world.cpp -I./include $(FINAL_CXXFLAGS) $(BOOST_FLAGS) && ls -lah ./out/boost_variant_hello_world profile: out/bench-variant-debug mkdir -p profiling/ @@ -102,9 +149,9 @@ clean: rm -f test/*gcov rm -f *.gcda *.gcno -pgo: out Makefile variant.hpp recursive_wrapper.hpp - $(CXX) -o out/bench-variant test/bench_variant.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) -pg -fprofile-generate +pgo: out Makefile + $(CXX) -o out/bench-variant test/bench_variant.cpp -I./include $(FINAL_CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS) -pg -fprofile-generate ./test-variant 500000 >/dev/null 2>/dev/null - $(CXX) -o out/bench-variant test/bench_variant.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) -fprofile-use + $(CXX) -o out/bench-variant test/bench_variant.cpp -I./include $(FINAL_CXXFLAGS) $(LDFLAGS) $(BOOST_FLAGS) -fprofile-use .PHONY: sizes test diff --git a/README.md b/README.md index 24cdb570b9d..6bf97f0c451 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,167 @@ # Mapbox Variant -An alternative to `boost::variant` for C++11. +An header-only alternative to `boost::variant` for C++11 and C++14 [![Build Status](https://secure.travis-ci.org/mapbox/variant.svg)](https://travis-ci.org/mapbox/variant) [![Build status](https://ci.appveyor.com/api/projects/status/v9tatx21j1k0fcgy)](https://ci.appveyor.com/project/Mapbox/variant) [![Coverage Status](https://coveralls.io/repos/mapbox/variant/badge.svg?branch=master&service=github)](https://coveralls.io/r/mapbox/variant?branch=master) +## Introduction + +Variant's basic building blocks are: + +- `variant` - a type-safe representation for sum-types / discriminated unions +- `recursive_wrapper` - a helper type to represent recursive "tree-like" variants +- `apply_visitor(visitor, myVariant)` - to invoke a custom visitor on the variant's underlying type +- `get()` - a function to directly unwrap a variant's underlying type +- `.match([](Type){})` - a variant convenience member function taking an arbitrary number of lambdas creating a visitor behind the scenes and applying it to the variant + +### Basic Usage - HTTP API Example + +Suppose you want to represent a HTTP API response which is either a JSON result or an error: + +```c++ +struct Result { + Json object; +}; + +struct Error { + int32_t code; + string message; +}; +``` + +You can represent this at type level using a variant which is either an `Error` or a `Result`: + +```c++ +using Response = variant; + +Response makeRequest() { + return Error{501, "Not Implemented"}; +} + +Response ret = makeRequest(); +``` + +To see which type the `Response` holds you pattern match on the variant unwrapping the underlying value: + +```c++ +ret.match([] (Result r) { print(r.object); }, + [] (Error e) { print(e.message); }); +``` + +Instead of using the variant's convenience `.match` pattern matching function you can create a type visitor functor and use `apply_visitor` manually: + +```c++ +struct ResponseVisitor { + void operator()(Result r) const { + print(r.object); + } + + void operator()(Error e) const { + print(e.message); + } +}; + +ResponseVisitor visitor; +apply_visitor(visitor, ret); +``` + +In both cases the compiler makes sure you handle all types the variant can represent at compile. + +### Recursive Variants - JSON Example + +[JSON](http://www.json.org/) consists of types `String`, `Number`, `True`, `False`, `Null`, `Array` and `Object`. + +```c++ +struct String { string value; }; +struct Number { double value; }; +struct True { }; +struct False { }; +struct Null { }; +struct Array { vector values; }; +struct Object { unordered_map values; }; +``` + +This works for primitive types but how do we represent recursive types such as `Array` which can hold multiple elements and `Array` itself, too? + +For these use cases Variant provides a `recursive_wrapper` helper type which lets you express recursive Variants. + +```c++ +struct String { string value; }; +struct Number { double value; }; +struct True { }; +struct False { }; +struct Null { }; + +// Forward declarations only +struct Array; +struct Object; + +using Value = variant, recursive_wrapper>; + +struct Array { + vector values; +}; + +struct Object { + unordered_map values; +}; +``` + +For walking the JSON representation you can again either create a `JSONVisitor`: + +```c++ +struct JSONVisitor { + + void operator()(Null) const { + print("null"); + } + + // same for all other JSON types +}; + +JSONVisitor visitor; +apply_visitor(visitor, json); +``` + +Or use the convenience `.match` pattern matching function: + +```c++ +json.match([] (Null) { print("null"); }, + ...); +``` + +To summarize: use `recursive_wrapper` to represent recursive "tree-like" representations: + +```c++ +struct Empty { }; +struct Node; + +using Tree = variant>; + +struct Node { + uint64_t value; +} +``` + +### Advanced Usage Tips + +Creating type aliases for variants is a great way to reduce repetition. +Keep in mind those type aliases are not checked at type level, though. +We recommend creating a new type for all but basic variant usage: + +```c++ +// the compiler can't tell the following two apart +using APIResult = variant; +using FilesystemResult = variant; + +// new type +struct APIResult : variant { + using Base = variant; + using Base::Base; +} +``` ## Why use Mapbox Variant? @@ -22,7 +178,6 @@ Time to compile header | 185 ms | 675 ms (Numbers from an older version of Mapbox variant.) - ## Goals Mapbox `variant` has been a very valuable, lightweight alternative for apps @@ -45,29 +200,25 @@ implementations](doc/other_implementations.md). Want to know more about the upcoming standard? Have a look at our [overview](doc/standards_effort.md). +Most modern high-level languages provide ways to express sum types directly. +If you're curious have a look at Haskell's pattern matching or Rust's and Swift's enums. ## Depends - - Compiler supporting `-std=c++11` or `-std=c++14` +- Compiler supporting `-std=c++11` or `-std=c++14` Tested with: - - g++-4.7 - - g++-4.8 - - g++-4.9 - - g++-5 - - clang++-3.5 - - clang++-3.6 - - clang++-3.7 - - clang++-3.8 - - Visual Studio 2015 - -## Usage - -There is nothing to build, just include `variant.hpp` and -`recursive_wrapper.hpp` in your project. Include `variant_io.hpp` if you need -the `operator<<` overload for variant. - +- g++-4.7 +- g++-4.8 +- g++-4.9 +- g++-5.2 +- clang++-3.5 +- clang++-3.6 +- clang++-3.7 +- clang++-3.8 +- clang++-3.9 +- Visual Studio 2015 ## Unit Tests @@ -75,37 +226,23 @@ On Unix systems compile and run the unit tests with `make test`. On Windows run `scripts/build-local.bat`. - ## Limitations -* The `variant` can not hold references (something like `variant` is +- The `variant` can not hold references (something like `variant` is not possible). You might want to try `std::reference_wrapper` instead. - ## Deprecations -* The included implementation of `optional` is deprecated and will be removed - in a future version. See https://github.com/mapbox/variant/issues/64. -* Old versions of the code needed visitors to derive from `static_visitor`. +- The included implementation of `optional` is deprecated and will be removed + in a future version. See [issue #64](https://github.com/mapbox/variant/issues/64). +- Old versions of the code needed visitors to derive from `static_visitor`. This is not needed any more and marked as deprecated. The `static_visitor` class will be removed in future versions. - ## Benchmarks -The benchmarks depend on: - - - Boost headers (for benchmarking against `boost::variant`) - - Boost built with `--with-timer` (used for benchmark timing) - -On Unix systems set your boost includes and libs locations and run `make test`: - - export LDFLAGS='-L/opt/boost/lib' - export CXXFLAGS='-I/opt/boost/include' make bench - ## Check object sizes make sizes /path/to/boost/variant.hpp - diff --git a/optional.hpp b/include/mapbox/optional.hpp similarity index 97% rename from optional.hpp rename to include/mapbox/optional.hpp index 1185894e736..d84705c1ac5 100644 --- a/optional.hpp +++ b/include/mapbox/optional.hpp @@ -6,7 +6,7 @@ #include #include -#include "variant.hpp" +#include namespace mapbox { namespace util { @@ -22,7 +22,7 @@ class optional variant variant_; - public: +public: optional() = default; optional(optional const& rhs) diff --git a/recursive_wrapper.hpp b/include/mapbox/recursive_wrapper.hpp similarity index 96% rename from recursive_wrapper.hpp rename to include/mapbox/recursive_wrapper.hpp index 4becdd689d4..4ffcbd7c936 100644 --- a/recursive_wrapper.hpp +++ b/include/mapbox/recursive_wrapper.hpp @@ -29,7 +29,7 @@ class recursive_wrapper this->get() = rhs; } - public: +public: using type = T; /** @@ -42,9 +42,9 @@ class recursive_wrapper * @throws any exception thrown by the default constructur of T. */ recursive_wrapper() - : p_(new T){}; + : p_(new T){} - ~recursive_wrapper() noexcept { delete p_; }; + ~recursive_wrapper() noexcept { delete p_; } recursive_wrapper(recursive_wrapper const& operand) : p_(new T(operand.get())) {} diff --git a/include/mapbox/variant.hpp b/include/mapbox/variant.hpp new file mode 100644 index 00000000000..06a46abe5d5 --- /dev/null +++ b/include/mapbox/variant.hpp @@ -0,0 +1,1053 @@ +#ifndef MAPBOX_UTIL_VARIANT_HPP +#define MAPBOX_UTIL_VARIANT_HPP + +#include +#include // size_t +#include // operator new +#include // runtime_error +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +// clang-format off +// [[deprecated]] is only available in C++14, use this for the time being +#if __cplusplus <= 201103L +# ifdef __GNUC__ +# define MAPBOX_VARIANT_DEPRECATED __attribute__((deprecated)) +# elif defined(_MSC_VER) +# define MAPBOX_VARIANT_DEPRECATED __declspec(deprecated) +# else +# define MAPBOX_VARIANT_DEPRECATED +# endif +#else +# define MAPBOX_VARIANT_DEPRECATED [[deprecated]] +#endif + + +#ifdef _MSC_VER +// https://msdn.microsoft.com/en-us/library/bw1hbe6y.aspx +# ifdef NDEBUG +# define VARIANT_INLINE __forceinline +# else +# define VARIANT_INLINE //__declspec(noinline) +# endif +#else +# ifdef NDEBUG +# define VARIANT_INLINE //inline __attribute__((always_inline)) +# else +# define VARIANT_INLINE __attribute__((noinline)) +# endif +#endif +// clang-format on + +// Exceptions +#if defined( __EXCEPTIONS) || defined( _MSC_VER) +#define HAS_EXCEPTIONS +#endif + +#define VARIANT_MAJOR_VERSION 1 +#define VARIANT_MINOR_VERSION 1 +#define VARIANT_PATCH_VERSION 0 + +#define VARIANT_VERSION (VARIANT_MAJOR_VERSION * 100000) + (VARIANT_MINOR_VERSION * 100) + (VARIANT_PATCH_VERSION) + +namespace mapbox { +namespace util { + +// XXX This should derive from std::logic_error instead of std::runtime_error. +// See https://github.com/mapbox/variant/issues/48 for details. +class bad_variant_access : public std::runtime_error +{ + +public: + explicit bad_variant_access(const std::string& what_arg) + : runtime_error(what_arg) {} + + explicit bad_variant_access(const char* what_arg) + : runtime_error(what_arg) {} + +}; // class bad_variant_access + +#if !defined(MAPBOX_VARIANT_MINIMIZE_SIZE) +using type_index_t = unsigned int; +#else +#if defined(MAPBOX_VARIANT_OPTIMIZE_FOR_SPEED) +using type_index_t = std::uint_fast8_t; +#else +using type_index_t = std::uint_least8_t; +#endif +#endif + +namespace detail { + +static constexpr type_index_t invalid_value = type_index_t(-1); + +template +struct direct_type; + +template +struct direct_type +{ + static constexpr type_index_t index = std::is_same::value + ? sizeof...(Types) + : direct_type::index; +}; + +template +struct direct_type +{ + static constexpr type_index_t index = invalid_value; +}; + +#if __cpp_lib_logical_traits >= 201510L + +using std::conjunction; +using std::disjunction; + +#else + +template +struct conjunction : std::true_type {}; + +template +struct conjunction : B1 {}; + +template +struct conjunction : std::conditional::type {}; + +template +struct conjunction : std::conditional, B1>::type {}; + +template +struct disjunction : std::false_type {}; + +template +struct disjunction : B1 {}; + +template +struct disjunction : std::conditional::type {}; + +template +struct disjunction : std::conditional>::type {}; + +#endif + +template +struct convertible_type; + +template +struct convertible_type +{ + static constexpr type_index_t index = std::is_convertible::value + ? disjunction...>::value ? invalid_value : sizeof...(Types) + : convertible_type::index; +}; + +template +struct convertible_type +{ + static constexpr type_index_t index = invalid_value; +}; + +template +struct value_traits +{ + using value_type = typename std::remove_const::type>::type; + using value_type_wrapper = recursive_wrapper; + static constexpr type_index_t direct_index = direct_type::index; + static constexpr bool is_direct = direct_index != invalid_value; + static constexpr type_index_t index_direct_or_wrapper = is_direct ? direct_index : direct_type::index; + static constexpr bool is_direct_or_wrapper = index_direct_or_wrapper != invalid_value; + static constexpr type_index_t index = is_direct_or_wrapper ? index_direct_or_wrapper : convertible_type::index; + static constexpr bool is_valid = index != invalid_value; + static constexpr type_index_t tindex = is_valid ? sizeof...(Types)-index : 0; + using target_type = typename std::tuple_element>::type; +}; + +template +struct copy_cvref +{ + using type = Dest; +}; + +template +struct copy_cvref +{ + using type = Dest const&; +}; + +template +struct copy_cvref +{ + using type = Dest&; +}; + +template +struct copy_cvref +{ + using type = Dest&&; +}; + +template +struct deduced_result_type +{}; + +template +struct deduced_result_type()(std::declval()...))> +{ + using type = decltype(std::declval()(std::declval()...)); +}; + +template +struct visitor_result_type : deduced_result_type +{}; + +// specialization for explicit result_type member in visitor class +template +struct visitor_result_type::type::result_type>())> +{ + using type = typename std::decay::type::result_type; +}; + +template +using result_of_unary_visit = typename visitor_result_type::type; + +template +using result_of_binary_visit = typename visitor_result_type::type; + +template +struct static_max; + +template +struct static_max +{ + static const type_index_t value = arg; +}; + +template +struct static_max +{ + static const type_index_t value = arg1 >= arg2 ? static_max::value : static_max::value; +}; + +template +struct variant_helper; + +template +struct variant_helper +{ + VARIANT_INLINE static void destroy(const type_index_t type_index, void* data) + { + if (type_index == sizeof...(Types)) + { + reinterpret_cast(data)->~T(); + } + else + { + variant_helper::destroy(type_index, data); + } + } + + VARIANT_INLINE static void move(const type_index_t old_type_index, void* old_value, void* new_value) + { + if (old_type_index == sizeof...(Types)) + { + new (new_value) T(std::move(*reinterpret_cast(old_value))); + } + else + { + variant_helper::move(old_type_index, old_value, new_value); + } + } + + VARIANT_INLINE static void copy(const type_index_t old_type_index, const void* old_value, void* new_value) + { + if (old_type_index == sizeof...(Types)) + { + new (new_value) T(*reinterpret_cast(old_value)); + } + else + { + variant_helper::copy(old_type_index, old_value, new_value); + } + } +}; + +template <> +struct variant_helper<> +{ + VARIANT_INLINE static void destroy(const type_index_t, void*) {} + VARIANT_INLINE static void move(const type_index_t, void*, void*) {} + VARIANT_INLINE static void copy(const type_index_t, const void*, void*) {} +}; + +template +struct unwrapper +{ + using value_type = T; + + template + static auto apply(typename std::remove_reference::type& var) + -> typename std::enable_if::value, + decltype(var.template get_unchecked())>::type + { + return var.template get_unchecked(); + } + + template + static auto apply(typename std::remove_reference::type& var) + -> typename std::enable_if::value, + decltype(std::move(var.template get_unchecked()))>::type + { + return std::move(var.template get_unchecked()); + } +}; + +template +struct unwrapper> : unwrapper +{}; + +template +struct unwrapper> : unwrapper +{}; + +template +struct dispatcher; + +template +struct dispatcher +{ + template + VARIANT_INLINE static R apply(V&& v, F&& f) + { + if (v.template is()) + { + return std::forward(f)(unwrapper::template apply(v)); + } + else + { + return dispatcher::apply(std::forward(v), std::forward(f)); + } + } +}; + +template +struct dispatcher +{ + template + VARIANT_INLINE static R apply(V&& v, F&& f) + { + return std::forward(f)(unwrapper::template apply(v)); + } +}; + +template +struct binary_dispatcher_rhs; + +template +struct binary_dispatcher_rhs +{ + template + VARIANT_INLINE static R apply(V&& lhs, V&& rhs, F&& f) + { + if (rhs.template is()) // call binary functor + { + return std::forward(f)(unwrapper::template apply(lhs), + unwrapper::template apply(rhs)); + } + else + { + return binary_dispatcher_rhs::apply(std::forward(lhs), + std::forward(rhs), + std::forward(f)); + } + } +}; + +template +struct binary_dispatcher_rhs +{ + template + VARIANT_INLINE static R apply(V&& lhs, V&& rhs, F&& f) + { + return std::forward(f)(unwrapper::template apply(lhs), + unwrapper::template apply(rhs)); + } +}; + +template +struct binary_dispatcher_lhs; + +template +struct binary_dispatcher_lhs +{ + template + VARIANT_INLINE static R apply(V&& lhs, V&& rhs, F&& f) + { + if (lhs.template is()) // call binary functor + { + return std::forward(f)(unwrapper::template apply(lhs), + unwrapper::template apply(rhs)); + } + else + { + return binary_dispatcher_lhs::apply(std::forward(lhs), + std::forward(rhs), + std::forward(f)); + } + } +}; + +template +struct binary_dispatcher_lhs +{ + template + VARIANT_INLINE static R apply(V&& lhs, V&& rhs, F&& f) + { + return std::forward(f)(unwrapper::template apply(lhs), + unwrapper::template apply(rhs)); + } +}; + +template +struct binary_dispatcher; + +template +struct binary_dispatcher +{ + template + VARIANT_INLINE static R apply(V&& v0, V&& v1, F&& f) + { + if (v0.template is()) + { + if (v1.template is()) + { + return std::forward(f)(unwrapper::template apply(v0), + unwrapper::template apply(v1)); // call binary functor + } + else + { + return binary_dispatcher_rhs::apply(std::forward(v0), + std::forward(v1), + std::forward(f)); + } + } + else if (v1.template is()) + { + return binary_dispatcher_lhs::apply(std::forward(v0), + std::forward(v1), + std::forward(f)); + } + return binary_dispatcher::apply(std::forward(v0), + std::forward(v1), + std::forward(f)); + } +}; + +template +struct binary_dispatcher +{ + template + VARIANT_INLINE static R apply(V&& v0, V&& v1, F&& f) + { + return std::forward(f)(unwrapper::template apply(v0), + unwrapper::template apply(v1)); // call binary functor + } +}; + +// comparator functors +struct equal_comp +{ + template + bool operator()(T const& lhs, T const& rhs) const + { + return lhs == rhs; + } +}; + +struct less_comp +{ + template + bool operator()(T const& lhs, T const& rhs) const + { + return lhs < rhs; + } +}; + +template +class comparer +{ +public: + explicit comparer(Variant const& lhs) noexcept + : lhs_(lhs) {} + comparer& operator=(comparer const&) = delete; + // visitor + template + bool operator()(T const& rhs_content) const + { + T const& lhs_content = lhs_.template get_unchecked(); + return Comp()(lhs_content, rhs_content); + } + +private: + Variant const& lhs_; +}; + +// hashing visitor +struct hasher +{ + template + std::size_t operator()(const T& hashable) const + { + return std::hash{}(hashable); + } +}; + +} // namespace detail + +struct no_init {}; + +template +class variant +{ + static_assert(sizeof...(Types) > 0, "Template parameter type list of variant can not be empty."); + static_assert(!detail::disjunction...>::value, "Variant can not hold reference types. Maybe use std::reference_wrapper?"); + static_assert(!detail::disjunction...>::value, "Variant can not hold array types."); + static_assert(sizeof...(Types) < std::numeric_limits::max(), "Internal index type must be able to accommodate all alternatives."); +private: + static const std::size_t data_size = detail::static_max::value; + static const std::size_t data_align = detail::static_max::value; +public: + struct adapted_variant_tag; + using types = std::tuple; +private: + using first_type = typename std::tuple_element<0, types>::type; + using unwrap_first_type = typename detail::unwrapper::value_type; + using data_type = typename std::aligned_storage::type; + using helper_type = detail::variant_helper; + + template + using alternative_ref = typename detail::copy_cvref::type; + + type_index_t type_index; +#ifdef __clang_analyzer__ + data_type data {}; +#else + data_type data; +#endif + +public: + VARIANT_INLINE variant() noexcept(std::is_nothrow_default_constructible::value) + : type_index(sizeof...(Types)-1) + { + static_assert(std::is_default_constructible::value, "First type in variant must be default constructible to allow default construction of variant."); + new (&data) first_type(); + } + + VARIANT_INLINE variant(no_init) noexcept + : type_index(detail::invalid_value) {} + + // http://isocpp.org/blog/2012/11/universal-references-in-c11-scott-meyers + template , + typename Enable = typename std::enable_if, typename Traits::value_type>::value>::type > + VARIANT_INLINE variant(T&& val) noexcept(std::is_nothrow_constructible::value) + : type_index(Traits::index) + { + new (&data) typename Traits::target_type(std::forward(val)); + } + + VARIANT_INLINE variant(variant const& old) + : type_index(old.type_index) + { + helper_type::copy(old.type_index, &old.data, &data); + } + + VARIANT_INLINE variant(variant&& old) + noexcept(detail::conjunction...>::value) + : type_index(old.type_index) + { + helper_type::move(old.type_index, &old.data, &data); + } + +private: + VARIANT_INLINE void copy_assign(variant const& rhs) + { + helper_type::destroy(type_index, &data); + type_index = detail::invalid_value; + helper_type::copy(rhs.type_index, &rhs.data, &data); + type_index = rhs.type_index; + } + + VARIANT_INLINE void move_assign(variant&& rhs) + { + helper_type::destroy(type_index, &data); + type_index = detail::invalid_value; + helper_type::move(rhs.type_index, &rhs.data, &data); + type_index = rhs.type_index; + } + +public: + VARIANT_INLINE variant& operator=(variant&& other) + // note we check for nothrow-constructible, not nothrow-assignable, since + // move_assign uses move-construction via placement new. + noexcept(detail::conjunction...>::value) + { + if (this == &other) { // playing safe in release mode, hit assertion in debug. + assert(false); + return *this; + } + move_assign(std::move(other)); + return *this; + } + + VARIANT_INLINE variant& operator=(variant const& other) + { + if (this != &other) + copy_assign(other); + return *this; + } + + // conversions + // move-assign + template , + typename Enable = typename std::enable_if, typename Traits::value_type>::value>::type > + VARIANT_INLINE variant& operator=(T&& rhs) + // not that we check is_nothrow_constructible, not is_nothrow_move_assignable, + // since we construct a temporary + noexcept(std::is_nothrow_constructible::value + && std::is_nothrow_move_assignable>::value) + { + variant temp(std::forward(rhs)); + move_assign(std::move(temp)); + return *this; + } + + // copy-assign + template + VARIANT_INLINE variant& operator=(T const& rhs) + { + variant temp(rhs); + copy_assign(temp); + return *this; + } + + template ::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE bool is() const + { + return type_index == detail::direct_type::index; + } + + template , Types...>::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE bool is() const + { + return type_index == detail::direct_type, Types...>::index; + } + + VARIANT_INLINE bool valid() const + { + return type_index != detail::invalid_value; + } + + template + VARIANT_INLINE void set(Args&&... args) + { + helper_type::destroy(type_index, &data); + type_index = detail::invalid_value; + new (&data) T(std::forward(args)...); + type_index = detail::direct_type::index; + } + + // get_unchecked() + template ::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T& get_unchecked() + { + return *reinterpret_cast(&data); + } + +#ifdef HAS_EXCEPTIONS + // get() + template ::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T& get() + { + if (type_index == detail::direct_type::index) + { + return *reinterpret_cast(&data); + } + else + { + throw bad_variant_access("in get()"); + } + } +#endif + + template ::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T const& get_unchecked() const + { + return *reinterpret_cast(&data); + } + +#ifdef HAS_EXCEPTIONS + template ::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T const& get() const + { + if (type_index == detail::direct_type::index) + { + return *reinterpret_cast(&data); + } + else + { + throw bad_variant_access("in get()"); + } + } +#endif + + // get_unchecked() - T stored as recursive_wrapper + template , Types...>::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T& get_unchecked() + { + return (*reinterpret_cast*>(&data)).get(); + } + +#ifdef HAS_EXCEPTIONS + // get() - T stored as recursive_wrapper + template , Types...>::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T& get() + { + if (type_index == detail::direct_type, Types...>::index) + { + return (*reinterpret_cast*>(&data)).get(); + } + else + { + throw bad_variant_access("in get()"); + } + } +#endif + + template , Types...>::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T const& get_unchecked() const + { + return (*reinterpret_cast const*>(&data)).get(); + } + +#ifdef HAS_EXCEPTIONS + template , Types...>::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T const& get() const + { + if (type_index == detail::direct_type, Types...>::index) + { + return (*reinterpret_cast const*>(&data)).get(); + } + else + { + throw bad_variant_access("in get()"); + } + } +#endif + + // get_unchecked() - T stored as std::reference_wrapper + template , Types...>::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T& get_unchecked() + { + return (*reinterpret_cast*>(&data)).get(); + } + +#ifdef HAS_EXCEPTIONS + // get() - T stored as std::reference_wrapper + template , Types...>::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T& get() + { + if (type_index == detail::direct_type, Types...>::index) + { + return (*reinterpret_cast*>(&data)).get(); + } + else + { + throw bad_variant_access("in get()"); + } + } +#endif + + template , Types...>::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T const& get_unchecked() const + { + return (*reinterpret_cast const*>(&data)).get(); + } + +#ifdef HAS_EXCEPTIONS + template , Types...>::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE T const& get() const + { + if (type_index == detail::direct_type, Types...>::index) + { + return (*reinterpret_cast const*>(&data)).get(); + } + else + { + throw bad_variant_access("in get()"); + } + } +#endif + + // This function is deprecated because it returns an internal index field. + // Use which() instead. + MAPBOX_VARIANT_DEPRECATED VARIANT_INLINE type_index_t get_type_index() const + { + return type_index; + } + + VARIANT_INLINE int which() const noexcept + { + return static_cast(sizeof...(Types) - type_index - 1); + } + + template ::index != detail::invalid_value)>::type* = nullptr> + VARIANT_INLINE static constexpr int which() noexcept + { + return static_cast(sizeof...(Types)-detail::direct_type::index - 1); + } + + // visitor + // unary + template , + typename R = detail::result_of_unary_visit> + VARIANT_INLINE static R visit(V&& v, F&& f) + { + return detail::dispatcher::apply(std::forward(v), std::forward(f)); + } + + // binary + template , + typename R = detail::result_of_binary_visit> + VARIANT_INLINE static R binary_visit(V&& v0, V&& v1, F&& f) + { + return detail::binary_dispatcher::apply(std::forward(v0), + std::forward(v1), + std::forward(f)); + } + + // match + // unary + template + auto VARIANT_INLINE match(Fs&&... fs) const& + -> decltype(variant::visit(*this, ::mapbox::util::make_visitor(std::forward(fs)...))) + { + return variant::visit(*this, ::mapbox::util::make_visitor(std::forward(fs)...)); + } + // non-const + template + auto VARIANT_INLINE match(Fs&&... fs) & + -> decltype(variant::visit(*this, ::mapbox::util::make_visitor(std::forward(fs)...))) + { + return variant::visit(*this, ::mapbox::util::make_visitor(std::forward(fs)...)); + } + template + auto VARIANT_INLINE match(Fs&&... fs) && + -> decltype(variant::visit(std::move(*this), ::mapbox::util::make_visitor(std::forward(fs)...))) + { + return variant::visit(std::move(*this), ::mapbox::util::make_visitor(std::forward(fs)...)); + } + + ~variant() noexcept // no-throw destructor + { + helper_type::destroy(type_index, &data); + } + + // comparison operators + // equality + VARIANT_INLINE bool operator==(variant const& rhs) const + { + assert(valid() && rhs.valid()); + if (this->which() != rhs.which()) + { + return false; + } + detail::comparer visitor(*this); + return visit(rhs, visitor); + } + + VARIANT_INLINE bool operator!=(variant const& rhs) const + { + return !(*this == rhs); + } + + // less than + VARIANT_INLINE bool operator<(variant const& rhs) const + { + assert(valid() && rhs.valid()); + if (this->which() != rhs.which()) + { + return this->which() < rhs.which(); + } + detail::comparer visitor(*this); + return visit(rhs, visitor); + } + VARIANT_INLINE bool operator>(variant const& rhs) const + { + return rhs < *this; + } + VARIANT_INLINE bool operator<=(variant const& rhs) const + { + return !(*this > rhs); + } + VARIANT_INLINE bool operator>=(variant const& rhs) const + { + return !(*this < rhs); + } +}; + +// unary visitor interface +template +auto VARIANT_INLINE apply_visitor(F&& f, V&& v) + -> decltype(v.visit(std::forward(v), std::forward(f))) +{ + return v.visit(std::forward(v), std::forward(f)); +} + +// binary visitor interface +template +auto VARIANT_INLINE apply_visitor(F&& f, V&& v0, V&& v1) + -> decltype(v0.binary_visit(std::forward(v0), std::forward(v1), std::forward(f))) +{ + return v0.binary_visit(std::forward(v0), std::forward(v1), std::forward(f)); +} + +// getter interface + +#ifdef HAS_EXCEPTIONS +template +auto get(T& var)->decltype(var.template get()) +{ + return var.template get(); +} +#endif + +template +ResultType& get_unchecked(T& var) +{ + return var.template get_unchecked(); +} + +#ifdef HAS_EXCEPTIONS +template +auto get(T const& var)->decltype(var.template get()) +{ + return var.template get(); +} +#endif + +template +ResultType const& get_unchecked(T const& var) +{ + return var.template get_unchecked(); +} +// variant_size +template +struct variant_size; + +//variable templates is c++14 +//template +//constexpr std::size_t variant_size_v = variant_size::value; + +template +struct variant_size + : variant_size {}; + +template +struct variant_size + : variant_size {}; + +template +struct variant_size + : variant_size {}; + +template +struct variant_size> + : std::integral_constant {}; + +// variant_alternative +template +struct variant_alternative; + +#if defined(__clang__) +#if __has_builtin(__type_pack_element) +#define has_type_pack_element +#endif +#endif + +#if defined(has_type_pack_element) +template +struct variant_alternative> +{ + static_assert(sizeof...(Types) > Index , "Index out of range"); + using type = __type_pack_element; +}; +#else +template +struct variant_alternative> + : variant_alternative> +{ + static_assert(sizeof...(Types) > Index -1 , "Index out of range"); +}; + +template +struct variant_alternative<0, variant> +{ + using type = First; +}; + +#endif + +template +using variant_alternative_t = typename variant_alternative::type; + +template +struct variant_alternative + : std::add_const> {}; + +template +struct variant_alternative + : std::add_volatile> {}; + +template +struct variant_alternative + : std::add_cv> {}; + +} // namespace util +} // namespace mapbox + +// hashable iff underlying types are hashable +namespace std { +template +struct hash< ::mapbox::util::variant> { + std::size_t operator()(const ::mapbox::util::variant& v) const noexcept + { + return ::mapbox::util::apply_visitor(::mapbox::util::detail::hasher{}, v); + } +}; + +} + +#endif // MAPBOX_UTIL_VARIANT_HPP diff --git a/include/mapbox/variant_cast.hpp b/include/mapbox/variant_cast.hpp new file mode 100644 index 00000000000..fe1ab354324 --- /dev/null +++ b/include/mapbox/variant_cast.hpp @@ -0,0 +1,85 @@ +#ifndef VARIANT_CAST_HPP +#define VARIANT_CAST_HPP + +#include + +namespace mapbox { +namespace util { + +namespace detail { + +template +class static_caster +{ +public: + template + T& operator()(V& v) const + { + return static_cast(v); + } +}; + +template +class dynamic_caster +{ +public: + using result_type = T&; + template + T& operator()(V& v, typename std::enable_if::value>::type* = nullptr) const + { + throw std::bad_cast(); + } + template + T& operator()(V& v, typename std::enable_if::value>::type* = nullptr) const + { + return dynamic_cast(v); + } +}; + +template +class dynamic_caster +{ +public: + using result_type = T*; + template + T* operator()(V& v, typename std::enable_if::value>::type* = nullptr) const + { + return nullptr; + } + template + T* operator()(V& v, typename std::enable_if::value>::type* = nullptr) const + { + return dynamic_cast(&v); + } +}; +} + +template +typename detail::dynamic_caster::result_type +dynamic_variant_cast(V& v) +{ + return mapbox::util::apply_visitor(detail::dynamic_caster(), v); +} + +template +typename detail::dynamic_caster::result_type +dynamic_variant_cast(const V& v) +{ + return mapbox::util::apply_visitor(detail::dynamic_caster(), v); +} + +template +T& static_variant_cast(V& v) +{ + return mapbox::util::apply_visitor(detail::static_caster(), v); +} + +template +const T& static_variant_cast(const V& v) +{ + return mapbox::util::apply_visitor(detail::static_caster(), v); +} +} +} + +#endif // VARIANT_CAST_HPP diff --git a/variant_io.hpp b/include/mapbox/variant_io.hpp similarity index 94% rename from variant_io.hpp rename to include/mapbox/variant_io.hpp index e64cbadfc62..1456cc5abc7 100644 --- a/variant_io.hpp +++ b/include/mapbox/variant_io.hpp @@ -3,7 +3,7 @@ #include -#include "variant.hpp" +#include namespace mapbox { namespace util { @@ -13,7 +13,7 @@ namespace detail { template class printer { - public: +public: explicit printer(Out& out) : out_(out) {} printer& operator=(printer const&) = delete; @@ -25,7 +25,7 @@ class printer out_ << operand; } - private: +private: Out& out_; }; } diff --git a/include/mapbox/variant_visitor.hpp b/include/mapbox/variant_visitor.hpp new file mode 100644 index 00000000000..54ddba0e1c7 --- /dev/null +++ b/include/mapbox/variant_visitor.hpp @@ -0,0 +1,43 @@ +#ifndef MAPBOX_UTIL_VARIANT_VISITOR_HPP +#define MAPBOX_UTIL_VARIANT_VISITOR_HPP + +#include + +namespace mapbox { +namespace util { + +template +struct visitor; + +template +struct visitor : Fn +{ + using Fn::operator(); + + template + visitor(T&& fn) : Fn(std::forward(fn)) {} +}; + +template +struct visitor : Fn, visitor +{ + using Fn::operator(); + using visitor::operator(); + + template + visitor(T&& fn, Ts&&... fns) + : Fn(std::forward(fn)) + , visitor(std::forward(fns)...) {} +}; + +template +visitor::type...> make_visitor(Fns&&... fns) +{ + return visitor::type...> + (std::forward(fns)...); +} + +} // namespace util +} // namespace mapbox + +#endif // MAPBOX_UTIL_VARIANT_VISITOR_HPP diff --git a/package.json b/package.json new file mode 100644 index 00000000000..abca950f8be --- /dev/null +++ b/package.json @@ -0,0 +1,10 @@ +{ + "name": "variant", + "version": "1.1.6", + "description": "C++11/C++14 variant", + "main": "./package.json", + "repository" : { + "type" : "git", + "url" : "git://github.com/mapbox/variant.git" + } +} diff --git a/scripts/run_compilation_failure_tests.sh b/scripts/run_compilation_failure_tests.sh index c2608fee5b8..5a140618740 100755 --- a/scripts/run_compilation_failure_tests.sh +++ b/scripts/run_compilation_failure_tests.sh @@ -14,7 +14,7 @@ fi error_msg() { if [ ! -z "$1" ]; then - printf 'output was:\n=======\n%s\n=======\n' "$1" + printf 'output was:\n=======\n%s\n=======\n' "$1" fi } @@ -22,29 +22,28 @@ exit_code=0 for test_code in $DIR/*.cpp; do name=`basename $test_code .cpp` - result=`${CXX} -std=c++11 -c -o /dev/null -I. ${CXXFLAGS} ${test_code} 2>&1` + result=`${CXX} -std=c++11 -c -o /dev/null -I./include ${CXXFLAGS} ${test_code} 2>&1` status=$? if [ $status = 1 ]; then - expected=`sed -n -e '/@EXPECTED/s/.*: \+//p' ${test_code}` - if echo $result | grep -q "$expected"; then - echo "$name [OK]" - else - echo "$name [FAILED - wrong error message]" - echo "Expected error message: $expected" - error_msg "$result" - exit_code=1 - fi + expected=`sed -n -e '/@EXPECTED/s/.*: \+//p' ${test_code}` + if echo $result | grep -q "$expected"; then + echo "$name [OK]" + else + echo "$name [FAILED - wrong error message]" + echo "Expected error message: $expected" + error_msg "$result" + exit_code=1 + fi elif [ $status = 0 ]; then - echo "$name [FAILED - compile was successful]" - error_msg "$result" - exit_code=1 + echo "$name [FAILED - compile was successful]" + error_msg "$result" + exit_code=1 else - echo "$name [FAILED - unknown error in compile]" - error_msg "$result" - exit_code=1 + echo "$name [FAILED - unknown error in compile]" + error_msg "$result" + exit_code=1 fi done exit ${exit_code} - diff --git a/test/bench_variant.cpp b/test/bench_variant.cpp index 700dac73555..567bfe499fd 100644 --- a/test/bench_variant.cpp +++ b/test/bench_variant.cpp @@ -1,4 +1,3 @@ - #include #include #include @@ -8,10 +7,10 @@ #include #include -#include -#include +#include "auto_cpu_timer.hpp" -#include "variant.hpp" +#include +#include #define TEXT_SHORT "Test" #define TEXT_LONG "Testing various variant implementations with a longish string ........................................." @@ -140,12 +139,12 @@ int main(int argc, char** argv) { std::cerr << "custom variant: "; - boost::timer::auto_cpu_timer t; + auto_cpu_timer t; run_variant_test(NUM_RUNS); } { std::cerr << "boost variant: "; - boost::timer::auto_cpu_timer t; + auto_cpu_timer t; run_boost_test(NUM_RUNS); } } @@ -158,7 +157,7 @@ int main(int argc, char** argv) typedef thread_group::value_type value_type; thread_group tg; std::cerr << "custom variant: "; - boost::timer::auto_cpu_timer timer; + auto_cpu_timer timer; for (std::size_t i = 0; i < THREADS; ++i) { tg.emplace_back(new std::thread(run_variant_test, NUM_RUNS)); @@ -171,7 +170,7 @@ int main(int argc, char** argv) typedef thread_group::value_type value_type; thread_group tg; std::cerr << "boost variant: "; - boost::timer::auto_cpu_timer timer; + auto_cpu_timer timer; for (std::size_t i = 0; i < THREADS; ++i) { tg.emplace_back(new std::thread(run_boost_test, NUM_RUNS)); diff --git a/test/binary_visitor_test.cpp b/test/binary_visitor_test.cpp index fa0f2ead827..8a735926775 100644 --- a/test/binary_visitor_test.cpp +++ b/test/binary_visitor_test.cpp @@ -9,8 +9,8 @@ #include #include -#include "variant.hpp" -#include "variant_io.hpp" +#include +#include using namespace mapbox; diff --git a/test/compilation_failure/default_constructor.cpp b/test/compilation_failure/default_constructor.cpp index c75a8c16ace..b4e83d42b38 100644 --- a/test/compilation_failure/default_constructor.cpp +++ b/test/compilation_failure/default_constructor.cpp @@ -1,7 +1,6 @@ - // @EXPECTED: First type in variant must be default constructible to allow default construction of variant -#include +#include // Checks that the first type in a variant must be default constructible to // make the variant default constructible. diff --git a/test/compilation_failure/empty_typelist.cpp b/test/compilation_failure/empty_typelist.cpp index 69a631c7b26..9b8a1257103 100644 --- a/test/compilation_failure/empty_typelist.cpp +++ b/test/compilation_failure/empty_typelist.cpp @@ -1,7 +1,6 @@ - // @EXPECTED: Template parameter type list of variant can not be empty -#include +#include // Empty type list should not work. diff --git a/test/compilation_failure/equality.cpp b/test/compilation_failure/equality.cpp index b99a3086e85..36a19900682 100644 --- a/test/compilation_failure/equality.cpp +++ b/test/compilation_failure/equality.cpp @@ -1,7 +1,6 @@ - // @EXPECTED: -#include +#include int main() { diff --git a/test/compilation_failure/get_type.cpp b/test/compilation_failure/get_type.cpp index 5123eb10d26..744602fd5de 100644 --- a/test/compilation_failure/get_type.cpp +++ b/test/compilation_failure/get_type.cpp @@ -1,7 +1,6 @@ +// @EXPECTED: no matching .*\ -// @EXPECTED: enable_if - -#include +#include int main() { diff --git a/test/compilation_failure/is_type.cpp b/test/compilation_failure/is_type.cpp index a79638e8dac..95ccff47e53 100644 --- a/test/compilation_failure/is_type.cpp +++ b/test/compilation_failure/is_type.cpp @@ -1,7 +1,6 @@ +// @EXPECTED: -// @EXPECTED: invalid type in T in `is()` for this variant - -#include +#include int main() { diff --git a/test/compilation_failure/mutating_visitor_on_const.cpp b/test/compilation_failure/mutating_visitor_on_const.cpp index ee77b5614fb..eb0ed18eeca 100644 --- a/test/compilation_failure/mutating_visitor_on_const.cpp +++ b/test/compilation_failure/mutating_visitor_on_const.cpp @@ -1,7 +1,6 @@ +// @EXPECTED: no matching function for call to .*\ -// @EXPECTED: const int - -#include +#include struct mutating_visitor { diff --git a/test/compilation_failure/no-reference.cpp b/test/compilation_failure/no-reference.cpp index 17123ce8bf9..2f547fc1f95 100644 --- a/test/compilation_failure/no-reference.cpp +++ b/test/compilation_failure/no-reference.cpp @@ -1,7 +1,6 @@ - // @EXPECTED: Variant can not hold reference types -#include +#include int main() { diff --git a/test/hashable_test.cpp b/test/hashable_test.cpp new file mode 100644 index 00000000000..f3393a9ed37 --- /dev/null +++ b/test/hashable_test.cpp @@ -0,0 +1,158 @@ +#include +#include +#include +#include +#include +#include +#include + +#include + +using namespace mapbox::util; + +void test_singleton() +{ + using V = variant; + + V singleton = 5; + + if (std::hash{}(singleton) != std::hash{}(5)) + { + std::cerr << "Expected variant hash to be the same as hash of its value\n"; + std::exit(EXIT_FAILURE); + } +} + +void test_default_hashable() +{ + using V = variant; + + V var; + + // Check int hashes + var = 1; + + if (std::hash{}(var) != std::hash{}(1)) + { + std::cerr << "Expected variant hash to be the same as hash of its value\n"; + std::exit(EXIT_FAILURE); + } + + // Check double hashes + var = 23.4; + + if (std::hash{}(var) != std::hash{}(23.4)) + { + std::cerr << "Expected variant hash to be the same as hash of its value\n"; + std::exit(EXIT_FAILURE); + } + + // Check string hashes + var = std::string{"Hello, World!"}; + + if (std::hash{}(var) != std::hash{}("Hello, World!")) + { + std::cerr << "Expected variant hash to be the same as hash of its value\n"; + std::exit(EXIT_FAILURE); + } +} + +struct Hashable +{ + static const constexpr auto const_hash = 5; +}; + +namespace std { +template <> +struct hash +{ + std::size_t operator()(const Hashable&) const noexcept + { + return Hashable::const_hash; + } +}; +} + +void test_custom_hasher() +{ + using V = variant; + + V var; + + var = Hashable{}; + + if (std::hash{}(var) != Hashable::const_hash) + { + std::cerr << "Expected variant hash to be the same as hash of its value\n"; + std::exit(EXIT_FAILURE); + } +} + +void test_hashable_in_container() +{ + using V = variant; + + // won't compile if V is not Hashable + std::unordered_set vs; + + vs.insert(1); + vs.insert(2.3); + vs.insert("4"); +} + +struct Empty +{ +}; + +struct Node; + +using Tree = variant>; + +struct Node +{ + Node(Tree left_, Tree right_) : left(std::move(left_)), right(std::move(right_)) {} + + Tree left = Empty{}; + Tree right = Empty{}; +}; + +namespace std { +template <> +struct hash +{ + std::size_t operator()(const Empty&) const noexcept + { + return 3; + } +}; + +template <> +struct hash +{ + std::size_t operator()(const Node& n) const noexcept + { + return 5 + std::hash{}(n.left) + std::hash{}(n.right); + } +}; +} + +void test_recursive_hashable() +{ + + Tree tree = Node{Node{Empty{}, Empty{}}, Empty{}}; + + if (std::hash{}(tree) != ((5 + (5 + (3 + 3))) + 3)) + { + std::cerr << "Expected variant hash to be the same as hash of its value\n"; + std::exit(EXIT_FAILURE); + } +} + +int main() +{ + test_singleton(); + test_default_hashable(); + test_custom_hasher(); + test_hashable_in_container(); + test_recursive_hashable(); +} diff --git a/test/include/auto_cpu_timer.hpp b/test/include/auto_cpu_timer.hpp new file mode 100644 index 00000000000..b41935fb154 --- /dev/null +++ b/test/include/auto_cpu_timer.hpp @@ -0,0 +1,16 @@ +#pragma once + +#include +#include + +struct auto_cpu_timer { + std::chrono::time_point start; + auto_cpu_timer() : start(std::chrono::high_resolution_clock::now()) { + } + ~auto_cpu_timer() { + auto end = std::chrono::high_resolution_clock::now(); + std::chrono::microseconds elapsed = + std::chrono::duration_cast(end - start); + std::cerr << elapsed.count() << "us" << std::endl; + } +}; diff --git a/test/include/catch.hpp b/test/include/catch.hpp index dd6e3ede8bf..f6c44e42747 100644 --- a/test/include/catch.hpp +++ b/test/include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.3.2 - * Generated: 2015-12-28 15:07:07.166291 + * Catch v1.9.0 + * Generated: 2017-04-07 22:51:48.249456 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -14,44 +14,46 @@ #define TWOBLUECUBES_CATCH_HPP_INCLUDED #ifdef __clang__ -#pragma clang system_header +# pragma clang system_header #elif defined __GNUC__ -#pragma GCC system_header +# pragma GCC system_header #endif // #included from: internal/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 ignored "-Wglobal-constructors" -#pragma clang diagnostic ignored "-Wvariadic-macros" -#pragma clang diagnostic ignored "-Wc99-extensions" -#pragma clang diagnostic ignored "-Wunused-variable" -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#pragma clang diagnostic ignored "-Wc++98-compat" -#pragma clang diagnostic ignored "-Wc++98-compat-pedantic" -#pragma clang diagnostic ignored "-Wswitch-enum" -#pragma clang diagnostic ignored "-Wcovered-switch-default" -#endif +# ifdef __ICC // icpc defines the __clang__ macro +# pragma warning(push) +# pragma warning(disable: 161 1682) +# else // __ICC +# pragma clang diagnostic ignored "-Wglobal-constructors" +# pragma clang diagnostic ignored "-Wvariadic-macros" +# pragma clang diagnostic ignored "-Wc99-extensions" +# pragma clang diagnostic ignored "-Wunused-variable" +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wpadded" +# pragma clang diagnostic ignored "-Wc++98-compat" +# pragma clang diagnostic ignored "-Wc++98-compat-pedantic" +# pragma clang diagnostic ignored "-Wswitch-enum" +# pragma clang diagnostic ignored "-Wcovered-switch-default" +# endif #elif defined __GNUC__ -#pragma GCC diagnostic ignored "-Wvariadic-macros" -#pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpadded" +# pragma GCC diagnostic ignored "-Wvariadic-macros" +# pragma GCC diagnostic ignored "-Wunused-variable" +# pragma GCC diagnostic ignored "-Wparentheses" + +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wpadded" #endif #if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) -#define CATCH_IMPL +# define CATCH_IMPL #endif #ifdef CATCH_IMPL -#ifndef CLARA_CONFIG_MAIN -#define CLARA_CONFIG_MAIN_NOT_DEFINED -#define CLARA_CONFIG_MAIN -#endif +# ifndef CLARA_CONFIG_MAIN +# define CLARA_CONFIG_MAIN_NOT_DEFINED +# define CLARA_CONFIG_MAIN +# endif #endif // #included from: internal/catch_notimplemented_exception.h @@ -60,17 +62,6 @@ // #included from: catch_common.h #define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED -#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) -#define INTERNAL_CATCH_UNIQUE_NAME(name) INTERNAL_CATCH_UNIQUE_NAME_LINE(name, __LINE__) - -#define INTERNAL_CATCH_STRINGIFY2(expr) #expr -#define INTERNAL_CATCH_STRINGIFY(expr) INTERNAL_CATCH_STRINGIFY2(expr) - -#include -#include -#include - // #included from: catch_compiler_capabilities.h #define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED @@ -85,11 +76,15 @@ // CATCH_CONFIG_CPP11_LONG_LONG : is long long supported? // CATCH_CONFIG_CPP11_OVERRIDE : is override supported? // CATCH_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr) +// CATCH_CONFIG_CPP11_SHUFFLE : is std::shuffle supported? +// CATCH_CONFIG_CPP11_TYPE_TRAITS : are type_traits and enable_if supported? // CATCH_CONFIG_CPP11_OR_GREATER : Is C++11 supported? // CATCH_CONFIG_VARIADIC_MACROS : are variadic macros supported? - +// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported? +// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported? +// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported? // **************** // Note to maintainers: if new toggles are added please document them // in configuration.md, too @@ -102,18 +97,58 @@ // All the C++11 features can be disabled with CATCH_CONFIG_NO_CPP11 -#ifdef __clang__ +#ifdef __cplusplus -#if __has_feature(cxx_nullptr) -#define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -#endif +# if __cplusplus >= 201103L +# define CATCH_CPP11_OR_GREATER +# endif + +# if __cplusplus >= 201402L +# define CATCH_CPP14_OR_GREATER +# endif -#if __has_feature(cxx_noexcept) -#define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT #endif +#ifdef __clang__ + +# if __has_feature(cxx_nullptr) +# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR +# endif + +# if __has_feature(cxx_noexcept) +# define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT +# endif + +# if defined(CATCH_CPP11_OR_GREATER) +# define CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ + _Pragma( "clang diagnostic push" ) \ + _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) +# define CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ + _Pragma( "clang diagnostic pop" ) + +# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ + _Pragma( "clang diagnostic push" ) \ + _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) +# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ + _Pragma( "clang diagnostic pop" ) +# endif + #endif // __clang__ +//////////////////////////////////////////////////////////////////////////////// +// Cygwin +#ifdef __CYGWIN__ + +# if !defined(CATCH_CONFIG_POSIX_SIGNALS) +# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS +# endif + +// 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 + +#endif // __CYGWIN__ + //////////////////////////////////////////////////////////////////////////////// // Borland #ifdef __BORLANDC__ @@ -136,9 +171,9 @@ // GCC #ifdef __GNUC__ -#if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__) -#define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -#endif +# if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__) +# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR +# endif // - otherwise more recent versions define __cplusplus >= 201103L // and will get picked up below @@ -149,14 +184,18 @@ // Visual C++ #ifdef _MSC_VER +#define CATCH_INTERNAL_CONFIG_WINDOWS_SEH + #if (_MSC_VER >= 1600) -#define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -#define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR +# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR +# define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR #endif -#if (_MSC_VER >= 1900) // (VC++ 13 (VS2015)) +#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015)) #define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT #define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS +#define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE +#define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS #endif #endif // _MSC_VER @@ -164,273 +203,313 @@ //////////////////////////////////////////////////////////////////////////////// // Use variadic macros if the compiler supports them -#if (defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \ - (defined __WAVE__ && __WAVE_HAS_VARIADICS) || \ - (defined __GNUC__ && __GNUC__ >= 3) || \ - (!defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L) +#if ( defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \ + ( defined __WAVE__ && __WAVE_HAS_VARIADICS ) || \ + ( defined __GNUC__ && __GNUC__ >= 3 ) || \ + ( !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L ) #define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS #endif -//////////////////////////////////////////////////////////////////////////////// -// C++ language feature support - -// catch all support for C++11 -#if defined(__cplusplus) && __cplusplus >= 201103L - -#define CATCH_CPP11_OR_GREATER - -#if !defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) -#define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -#endif - -#ifndef CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -#define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -#endif - -#ifndef CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#endif - -#ifndef CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM -#define CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM -#endif +// Use __COUNTER__ if the compiler supports it +#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \ + ( defined __GNUC__ && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 ) || \ + ( defined __clang__ && __clang_major__ >= 3 ) -#ifndef CATCH_INTERNAL_CONFIG_CPP11_TUPLE -#define CATCH_INTERNAL_CONFIG_CPP11_TUPLE -#endif +#define CATCH_INTERNAL_CONFIG_COUNTER -#ifndef CATCH_INTERNAL_CONFIG_VARIADIC_MACROS -#define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS #endif -#if !defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) -#define CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG -#endif +//////////////////////////////////////////////////////////////////////////////// +// C++ language feature support -#if !defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) -#define CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE -#endif -#if !defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) -#define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR -#endif +// catch all support for C++11 +#if defined(CATCH_CPP11_OR_GREATER) + +# if !defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) +# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR +# endif + +# ifndef CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT +# define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT +# endif + +# ifndef CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS +# define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS +# endif + +# ifndef CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM +# define CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM +# endif + +# ifndef CATCH_INTERNAL_CONFIG_CPP11_TUPLE +# define CATCH_INTERNAL_CONFIG_CPP11_TUPLE +# endif + +# ifndef CATCH_INTERNAL_CONFIG_VARIADIC_MACROS +# define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS +# endif + +# if !defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) +# define CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG +# endif + +# if !defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) +# define CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE +# endif +# if !defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) +# define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR +# endif +# if !defined(CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE) +# define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE +# endif +# if !defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS) +# define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS +# endif #endif // __cplusplus >= 201103L // Now set the actual defines based on the above + anything the user has configured #if defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NO_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_NO_CPP11) -#define CATCH_CONFIG_CPP11_NULLPTR +# define CATCH_CONFIG_CPP11_NULLPTR #endif #if defined(CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_NO_CPP11) -#define CATCH_CONFIG_CPP11_NOEXCEPT +# define CATCH_CONFIG_CPP11_NOEXCEPT #endif #if defined(CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_NO_CPP11) -#define CATCH_CONFIG_CPP11_GENERATED_METHODS +# define CATCH_CONFIG_CPP11_GENERATED_METHODS #endif #if defined(CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_NO_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_NO_CPP11) -#define CATCH_CONFIG_CPP11_IS_ENUM +# define CATCH_CONFIG_CPP11_IS_ENUM #endif #if defined(CATCH_INTERNAL_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_CPP11_NO_TUPLE) && !defined(CATCH_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_NO_CPP11) -#define CATCH_CONFIG_CPP11_TUPLE +# define CATCH_CONFIG_CPP11_TUPLE #endif #if defined(CATCH_INTERNAL_CONFIG_VARIADIC_MACROS) && !defined(CATCH_CONFIG_NO_VARIADIC_MACROS) && !defined(CATCH_CONFIG_VARIADIC_MACROS) -#define CATCH_CONFIG_VARIADIC_MACROS +# define CATCH_CONFIG_VARIADIC_MACROS +#endif +#if defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_NO_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_CPP11) +# define CATCH_CONFIG_CPP11_LONG_LONG +#endif +#if defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_NO_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_CPP11) +# define CATCH_CONFIG_CPP11_OVERRIDE +#endif +#if defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_NO_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_CPP11) +# define CATCH_CONFIG_CPP11_UNIQUE_PTR #endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_CPP11) -#define CATCH_CONFIG_CPP11_LONG_LONG +// Use of __COUNTER__ is suppressed if __JETBRAINS_IDE__ is #defined (meaning we're being parsed by a JetBrains IDE for +// analytics) because, at time of writing, __COUNTER__ is not properly handled by it. +// This does not affect compilation +#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) && !defined(__JETBRAINS_IDE__) +# define CATCH_CONFIG_COUNTER #endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_CPP11) -#define CATCH_CONFIG_CPP11_OVERRIDE +#if defined(CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_NO_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_NO_CPP11) +# define CATCH_CONFIG_CPP11_SHUFFLE +#endif +# if defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_NO_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_NO_CPP11) +# define CATCH_CONFIG_CPP11_TYPE_TRAITS +# endif +#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_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_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) +# define CATCH_CONFIG_POSIX_SIGNALS +#endif + +#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS +# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS #endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_CPP11) -#define CATCH_CONFIG_CPP11_UNIQUE_PTR +#if !defined(CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS +# define CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS #endif // noexcept support: #if defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_NOEXCEPT) -#define CATCH_NOEXCEPT noexcept -#define CATCH_NOEXCEPT_IS(x) noexcept(x) +# define CATCH_NOEXCEPT noexcept +# define CATCH_NOEXCEPT_IS(x) noexcept(x) #else -#define CATCH_NOEXCEPT throw() -#define CATCH_NOEXCEPT_IS(x) +# define CATCH_NOEXCEPT throw() +# define CATCH_NOEXCEPT_IS(x) #endif // nullptr support #ifdef CATCH_CONFIG_CPP11_NULLPTR -#define CATCH_NULL nullptr +# define CATCH_NULL nullptr #else -#define CATCH_NULL NULL +# define CATCH_NULL NULL #endif // override support #ifdef CATCH_CONFIG_CPP11_OVERRIDE -#define CATCH_OVERRIDE override +# define CATCH_OVERRIDE override #else -#define CATCH_OVERRIDE +# define CATCH_OVERRIDE #endif // unique_ptr support #ifdef CATCH_CONFIG_CPP11_UNIQUE_PTR -#define CATCH_AUTO_PTR(T) std::unique_ptr +# define CATCH_AUTO_PTR( T ) std::unique_ptr #else -#define CATCH_AUTO_PTR(T) std::auto_ptr +# define CATCH_AUTO_PTR( T ) std::auto_ptr #endif +#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 + +#define INTERNAL_CATCH_STRINGIFY2( expr ) #expr +#define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr ) + +#include +#include + namespace Catch { -struct IConfig; + struct IConfig; -struct CaseSensitive -{ - enum Choice - { + struct CaseSensitive { enum Choice { Yes, No - }; -}; + }; }; -class NonCopyable -{ + class NonCopyable { #ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - NonCopyable(NonCopyable const&) = delete; - NonCopyable(NonCopyable&&) = delete; - NonCopyable& operator=(NonCopyable const&) = delete; - NonCopyable& operator=(NonCopyable&&) = delete; + NonCopyable( NonCopyable const& ) = delete; + NonCopyable( NonCopyable && ) = delete; + NonCopyable& operator = ( NonCopyable const& ) = delete; + NonCopyable& operator = ( NonCopyable && ) = delete; #else - NonCopyable(NonCopyable const& info); - NonCopyable& operator=(NonCopyable const&); + NonCopyable( NonCopyable const& info ); + NonCopyable& operator = ( NonCopyable const& ); #endif - protected: - NonCopyable() {} - virtual ~NonCopyable(); -}; - -class SafeBool -{ - public: - typedef void (SafeBool::*type)() const; - - static type makeSafe(bool value) - { - return value ? &SafeBool::trueValue : 0; - } - - private: - void trueValue() const {} -}; - -template -inline void deleteAll(ContainerT& container) -{ - typename ContainerT::const_iterator it = container.begin(); - typename ContainerT::const_iterator itEnd = container.end(); - for (; it != itEnd; ++it) - delete *it; -} -template -inline void deleteAllValues(AssociativeContainerT& container) -{ - typename AssociativeContainerT::const_iterator it = container.begin(); - typename AssociativeContainerT::const_iterator itEnd = container.end(); - for (; it != itEnd; ++it) - delete it->second; -} - -bool startsWith(std::string const& s, std::string const& prefix); -bool endsWith(std::string const& s, std::string const& suffix); -bool contains(std::string const& s, std::string const& infix); -void toLowerInPlace(std::string& s); -std::string toLower(std::string const& s); -std::string trim(std::string const& str); -bool replaceInPlace(std::string& str, std::string const& replaceThis, std::string const& withThis); - -struct pluralise -{ - pluralise(std::size_t count, std::string const& label); - - friend std::ostream& operator<<(std::ostream& os, pluralise const& pluraliser); + protected: + NonCopyable() {} + virtual ~NonCopyable(); + }; - std::size_t m_count; - std::string m_label; -}; + class SafeBool { + public: + typedef void (SafeBool::*type)() const; -struct SourceLineInfo -{ + static type makeSafe( bool value ) { + return value ? &SafeBool::trueValue : 0; + } + private: + void trueValue() const {} + }; - SourceLineInfo(); - SourceLineInfo(char const* _file, std::size_t _line); - SourceLineInfo(SourceLineInfo const& other); -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - SourceLineInfo(SourceLineInfo&&) = default; - SourceLineInfo& operator=(SourceLineInfo const&) = default; - SourceLineInfo& operator=(SourceLineInfo&&) = default; -#endif - bool empty() const; - bool operator==(SourceLineInfo const& other) const; - bool operator<(SourceLineInfo const& other) const; + template + inline void deleteAll( ContainerT& container ) { + typename ContainerT::const_iterator it = container.begin(); + typename ContainerT::const_iterator itEnd = container.end(); + for(; it != itEnd; ++it ) + delete *it; + } + template + inline void deleteAllValues( AssociativeContainerT& container ) { + typename AssociativeContainerT::const_iterator it = container.begin(); + typename AssociativeContainerT::const_iterator itEnd = container.end(); + for(; it != itEnd; ++it ) + delete it->second; + } + + bool startsWith( std::string const& s, std::string const& prefix ); + bool startsWith( std::string const& s, char prefix ); + bool endsWith( std::string const& s, std::string const& suffix ); + bool endsWith( std::string const& s, char suffix ); + bool contains( std::string const& s, std::string const& infix ); + void toLowerInPlace( std::string& s ); + std::string toLower( std::string const& s ); + std::string trim( std::string const& str ); + bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ); + + struct pluralise { + pluralise( std::size_t count, std::string const& label ); + + friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ); + + std::size_t m_count; + std::string m_label; + }; - std::string file; - std::size_t line; -}; + struct SourceLineInfo { + + SourceLineInfo(); + SourceLineInfo( char const* _file, std::size_t _line ); +# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS + SourceLineInfo(SourceLineInfo const& other) = default; + SourceLineInfo( SourceLineInfo && ) = default; + SourceLineInfo& operator = ( SourceLineInfo const& ) = default; + SourceLineInfo& operator = ( SourceLineInfo && ) = default; +# endif + bool empty() const; + bool operator == ( SourceLineInfo const& other ) const; + bool operator < ( SourceLineInfo const& other ) const; + + char const* file; + std::size_t line; + }; -std::ostream& operator<<(std::ostream& os, SourceLineInfo const& info); + std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); -// This is just here to avoid compiler warnings with macro constants and boolean literals -inline bool isTrue(bool value) { return value; } -inline bool alwaysTrue() { return true; } -inline bool alwaysFalse() { return false; } + // This is just here to avoid compiler warnings with macro constants and boolean literals + inline bool isTrue( bool value ){ return value; } + inline bool alwaysTrue() { return true; } + inline bool alwaysFalse() { return false; } -void throwLogicError(std::string const& message, SourceLineInfo const& locationInfo); + void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ); -void seedRng(IConfig const& config); -unsigned int rngSeed(); + void seedRng( IConfig const& config ); + unsigned int rngSeed(); -// Use this in variadic streaming macros to allow -// >> +StreamEndStop -// as well as -// >> stuff +StreamEndStop -struct StreamEndStop -{ - std::string operator+() - { - return std::string(); + // Use this in variadic streaming macros to allow + // >> +StreamEndStop + // as well as + // >> stuff +StreamEndStop + struct StreamEndStop { + std::string operator+() { + return std::string(); + } + }; + template + T const& operator + ( T const& value, StreamEndStop ) { + return value; } -}; -template -T const& operator+(T const& value, StreamEndStop) -{ - return value; -} } -#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo(__FILE__, static_cast(__LINE__)) -#define CATCH_INTERNAL_ERROR(msg) ::Catch::throwLogicError(msg, CATCH_INTERNAL_LINEINFO); - -#include +#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) +#define CATCH_INTERNAL_ERROR( msg ) ::Catch::throwLogicError( msg, CATCH_INTERNAL_LINEINFO ); namespace Catch { -class NotImplementedException : public std::exception -{ - public: - NotImplementedException(SourceLineInfo const& lineInfo); - NotImplementedException(NotImplementedException const&) {} + class NotImplementedException : public std::exception + { + public: + NotImplementedException( SourceLineInfo const& lineInfo ); + NotImplementedException( NotImplementedException const& ) {} - virtual ~NotImplementedException() CATCH_NOEXCEPT {} + virtual ~NotImplementedException() CATCH_NOEXCEPT {} - virtual const char* what() const CATCH_NOEXCEPT; + virtual const char* what() const CATCH_NOEXCEPT; - private: - std::string m_what; - SourceLineInfo m_lineInfo; -}; + private: + std::string m_what; + SourceLineInfo m_lineInfo; + }; } // end namespace Catch /////////////////////////////////////////////////////////////////////////////// -#define CATCH_NOT_IMPLEMENTED throw Catch::NotImplementedException(CATCH_INTERNAL_LINEINFO) +#define CATCH_NOT_IMPLEMENTED throw Catch::NotImplementedException( CATCH_INTERNAL_LINEINFO ) // #included from: internal/catch_context.h #define TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED @@ -442,22 +521,20 @@ class NotImplementedException : public std::exception namespace Catch { -struct IGeneratorInfo -{ - virtual ~IGeneratorInfo(); - virtual bool moveNext() = 0; - virtual std::size_t getCurrentIndex() const = 0; -}; + struct IGeneratorInfo { + virtual ~IGeneratorInfo(); + virtual bool moveNext() = 0; + virtual std::size_t getCurrentIndex() const = 0; + }; -struct IGeneratorsForTest -{ - virtual ~IGeneratorsForTest(); + struct IGeneratorsForTest { + virtual ~IGeneratorsForTest(); - virtual IGeneratorInfo& getGeneratorInfo(std::string const& fileInfo, std::size_t size) = 0; - virtual bool moveNext() = 0; -}; + virtual IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) = 0; + virtual bool moveNext() = 0; + }; -IGeneratorsForTest* createGeneratorsForTest(); + IGeneratorsForTest* createGeneratorsForTest(); } // end namespace Catch @@ -471,83 +548,72 @@ IGeneratorsForTest* createGeneratorsForTest(); namespace Catch { -// An intrusive reference counting smart pointer. -// T must implement addRef() and release() methods -// typically implementing the IShared interface -template -class Ptr -{ - public: - Ptr() : m_p(CATCH_NULL) {} - Ptr(T* p) : m_p(p) - { - if (m_p) - m_p->addRef(); - } - Ptr(Ptr const& other) : m_p(other.m_p) - { - if (m_p) - m_p->addRef(); - } - ~Ptr() - { - if (m_p) - m_p->release(); - } - void reset() - { - if (m_p) - m_p->release(); - m_p = CATCH_NULL; - } - Ptr& operator=(T* p) - { - Ptr temp(p); - swap(temp); - return *this; - } - Ptr& operator=(Ptr const& other) - { - Ptr temp(other); - swap(temp); - return *this; - } - void swap(Ptr& other) { std::swap(m_p, other.m_p); } - T* get() const { return m_p; } - T& operator*() const { return *m_p; } - T* operator->() const { return m_p; } - bool operator!() const { return m_p == CATCH_NULL; } - operator SafeBool::type() const { return SafeBool::makeSafe(m_p != CATCH_NULL); } + // An intrusive reference counting smart pointer. + // T must implement addRef() and release() methods + // typically implementing the IShared interface + template + class Ptr { + public: + Ptr() : m_p( CATCH_NULL ){} + Ptr( T* p ) : m_p( p ){ + if( m_p ) + m_p->addRef(); + } + Ptr( Ptr const& other ) : m_p( other.m_p ){ + if( m_p ) + m_p->addRef(); + } + ~Ptr(){ + if( m_p ) + m_p->release(); + } + void reset() { + if( m_p ) + m_p->release(); + m_p = CATCH_NULL; + } + Ptr& operator = ( T* p ){ + Ptr temp( p ); + swap( temp ); + return *this; + } + Ptr& operator = ( Ptr const& other ){ + Ptr temp( other ); + swap( temp ); + return *this; + } + void swap( Ptr& other ) { std::swap( m_p, other.m_p ); } + T* get() const{ return m_p; } + T& operator*() const { return *m_p; } + T* operator->() const { return m_p; } + bool operator !() const { return m_p == CATCH_NULL; } + operator SafeBool::type() const { return SafeBool::makeSafe( m_p != CATCH_NULL ); } - private: - T* m_p; -}; + private: + T* m_p; + }; -struct IShared : NonCopyable -{ - virtual ~IShared(); - virtual void addRef() const = 0; - virtual void release() const = 0; -}; + struct IShared : NonCopyable { + virtual ~IShared(); + virtual void addRef() const = 0; + virtual void release() const = 0; + }; -template -struct SharedImpl : T -{ + template + struct SharedImpl : T { - SharedImpl() : m_rc(0) {} + SharedImpl() : m_rc( 0 ){} - virtual void addRef() const - { - ++m_rc; - } - virtual void release() const - { - if (--m_rc == 0) - delete this; - } + virtual void addRef() const { + ++m_rc; + } + virtual void release() const { + if( --m_rc == 0 ) + delete this; + } - mutable unsigned int m_rc; -}; + mutable unsigned int m_rc; + }; } // end namespace Catch @@ -555,42 +621,39 @@ struct SharedImpl : T #pragma clang diagnostic pop #endif -#include -#include -#include - namespace Catch { -class TestCase; -class Stream; -struct IResultCapture; -struct IRunner; -struct IGeneratorsForTest; -struct IConfig; + class TestCase; + class Stream; + struct IResultCapture; + struct IRunner; + struct IGeneratorsForTest; + struct IConfig; -struct IContext -{ - virtual ~IContext(); + struct IContext + { + virtual ~IContext(); - virtual IResultCapture* getResultCapture() = 0; - virtual IRunner* getRunner() = 0; - virtual size_t getGeneratorIndex(std::string const& fileInfo, size_t totalSize) = 0; - virtual bool advanceGeneratorsForCurrentTest() = 0; - virtual Ptr getConfig() const = 0; -}; + virtual IResultCapture* getResultCapture() = 0; + virtual IRunner* getRunner() = 0; + virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) = 0; + virtual bool advanceGeneratorsForCurrentTest() = 0; + virtual Ptr getConfig() const = 0; + }; -struct IMutableContext : IContext -{ - virtual ~IMutableContext(); - virtual void setResultCapture(IResultCapture* resultCapture) = 0; - virtual void setRunner(IRunner* runner) = 0; - virtual void setConfig(Ptr const& config) = 0; -}; + struct IMutableContext : IContext + { + virtual ~IMutableContext(); + virtual void setResultCapture( IResultCapture* resultCapture ) = 0; + virtual void setRunner( IRunner* runner ) = 0; + virtual void setConfig( Ptr const& config ) = 0; + }; + + IContext& getCurrentContext(); + IMutableContext& getCurrentMutableContext(); + void cleanUpContext(); + Stream createStream( std::string const& streamName ); -IContext& getCurrentContext(); -IMutableContext& getCurrentMutableContext(); -void cleanUpContext(); -Stream createStream(std::string const& streamName); } // #included from: internal/catch_test_registry.hpp @@ -603,162 +666,174 @@ Stream createStream(std::string const& streamName); namespace Catch { -class TestSpec; + class TestSpec; -struct ITestCase : IShared -{ - virtual void invoke() const = 0; + struct ITestCase : IShared { + virtual void invoke () const = 0; + protected: + virtual ~ITestCase(); + }; - protected: - virtual ~ITestCase(); -}; + class TestCase; + struct IConfig; -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; + }; -struct ITestCaseRegistry -{ - virtual ~ITestCaseRegistry(); - virtual std::vector const& getAllTests() const = 0; - virtual std::vector const& getAllTestsSorted(IConfig const& config) const = 0; -}; + 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 ); -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); } namespace Catch { -template -class MethodTestCase : public SharedImpl -{ +template +class MethodTestCase : public SharedImpl { - public: - MethodTestCase(void (C::*method)()) : m_method(method) {} +public: + MethodTestCase( void (C::*method)() ) : m_method( method ) {} - virtual void invoke() const - { + virtual void invoke() const { C obj; (obj.*m_method)(); } - private: +private: virtual ~MethodTestCase() {} void (C::*m_method)(); }; -typedef void (*TestFunction)(); +typedef void(*TestFunction)(); -struct NameAndDesc -{ - NameAndDesc(const char* _name = "", const char* _description = "") - : name(_name), description(_description) - { - } +struct NameAndDesc { + NameAndDesc( const char* _name = "", const char* _description= "" ) + : name( _name ), description( _description ) + {} const char* name; const char* description; }; -void registerTestCase(ITestCase* testCase, - char const* className, - NameAndDesc const& nameAndDesc, - SourceLineInfo const& lineInfo); +void registerTestCase + ( ITestCase* testCase, + char const* className, + NameAndDesc const& nameAndDesc, + SourceLineInfo const& lineInfo ); -struct AutoReg -{ +struct AutoReg { - AutoReg(TestFunction function, + AutoReg + ( TestFunction function, SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc); + NameAndDesc const& nameAndDesc ); - template - AutoReg(void (C::*method)(), + template + AutoReg + ( void (C::*method)(), char const* className, NameAndDesc const& nameAndDesc, - SourceLineInfo const& lineInfo) - { + SourceLineInfo const& lineInfo ) { - registerTestCase(new MethodTestCase(method), - className, - nameAndDesc, - lineInfo); + registerTestCase + ( new MethodTestCase( method ), + className, + nameAndDesc, + lineInfo ); } ~AutoReg(); - private: - AutoReg(AutoReg const&); - void operator=(AutoReg const&); +private: + AutoReg( AutoReg const& ); + void operator= ( AutoReg const& ); }; -void registerTestCaseFunction(TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc); +void registerTestCaseFunction + ( TestFunction function, + SourceLineInfo const& lineInfo, + NameAndDesc const& nameAndDesc ); } // end namespace Catch #ifdef CATCH_CONFIG_VARIADIC_MACROS -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TESTCASE(...) \ - static void INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____)(); \ - namespace { \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME(autoRegistrar)(&INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____), CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc(__VA_ARGS__)); \ - } \ - static void INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____)() - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_METHOD_AS_TEST_CASE(QualifiedMethod, ...) \ - namespace { \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME(autoRegistrar)(&QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc(__VA_ARGS__), CATCH_INTERNAL_LINEINFO); \ - } - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TEST_CASE_METHOD(ClassName, ...) \ - namespace { \ - struct INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____) : ClassName \ - { \ - void test(); \ - }; \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME(autoRegistrar)(&INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____)::test, #ClassName, Catch::NameAndDesc(__VA_ARGS__), CATCH_INTERNAL_LINEINFO); \ - } \ - void INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____)::test() - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_REGISTER_TESTCASE(Function, ...) \ - Catch::AutoReg(Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc(__VA_ARGS__)); + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \ + static void TestName(); \ + CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ + namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); } \ + CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ + static void TestName() + #define INTERNAL_CATCH_TESTCASE( ... ) \ + INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ ) + + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \ + CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ + namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); } \ + CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS + + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\ + CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ + namespace{ \ + struct TestName : ClassName{ \ + void test(); \ + }; \ + Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestName::test, #ClassName, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); \ + } \ + CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ + void TestName::test() + #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \ + INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ ) + + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \ + CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ + Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); \ + CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS #else -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TESTCASE(Name, Desc) \ - static void INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____)(); \ - namespace { \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME(autoRegistrar)(&INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____), CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc(Name, Desc)); \ - } \ - static void INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____)() - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_METHOD_AS_TEST_CASE(QualifiedMethod, Name, Desc) \ - namespace { \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME(autoRegistrar)(&QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc(Name, Desc), CATCH_INTERNAL_LINEINFO); \ - } - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TEST_CASE_METHOD(ClassName, TestName, Desc) \ - namespace { \ - struct INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____) : ClassName \ - { \ - void test(); \ - }; \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME(autoRegistrar)(&INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____)::test, #ClassName, Catch::NameAndDesc(TestName, Desc), CATCH_INTERNAL_LINEINFO); \ - } \ - void INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____T_E_S_T____)::test() + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_TESTCASE2( TestName, Name, Desc ) \ + static void TestName(); \ + CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ + namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); }\ + CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ + static void TestName() + #define INTERNAL_CATCH_TESTCASE( Name, Desc ) \ + INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), Name, Desc ) + + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, Name, Desc ) \ + CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ + namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( Name, Desc ), CATCH_INTERNAL_LINEINFO ); } \ + CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS + + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestCaseName, ClassName, TestName, Desc )\ + CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ + namespace{ \ + struct TestCaseName : ClassName{ \ + void test(); \ + }; \ + Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestCaseName::test, #ClassName, Catch::NameAndDesc( TestName, Desc ), CATCH_INTERNAL_LINEINFO ); \ + } \ + CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ + void TestCaseName::test() + #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, TestName, Desc )\ + INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, TestName, Desc ) + + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, Name, Desc ) \ + CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ + Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); \ + CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_REGISTER_TESTCASE(Function, Name, Desc) \ - Catch::AutoReg(Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc(Name, Desc)); #endif // #included from: internal/catch_capture.hpp @@ -772,11 +847,8 @@ void registerTestCaseFunction(TestFunction function, namespace Catch { -// ResultWas::OfType enum -struct ResultWas -{ - enum OfType - { + // ResultWas::OfType enum + struct ResultWas { enum OfType { Unknown = -1, Ok = 0, Info = 1, @@ -794,39 +866,31 @@ struct ResultWas FatalErrorCondition = 0x200 | FailureBit - }; -}; + }; }; -inline bool isOk(ResultWas::OfType resultType) -{ - return (resultType & ResultWas::FailureBit) == 0; -} -inline bool isJustInfo(int flags) -{ - return flags == ResultWas::Info; -} + inline bool isOk( ResultWas::OfType resultType ) { + return ( resultType & ResultWas::FailureBit ) == 0; + } + inline bool isJustInfo( int flags ) { + return flags == ResultWas::Info; + } -// ResultDisposition::Flags enum -struct ResultDisposition -{ - enum Flags - { + // ResultDisposition::Flags enum + struct ResultDisposition { enum Flags { Normal = 0x01, - ContinueOnFailure = 0x02, // Failures fail test, but execution continues - FalseTest = 0x04, // Prefix expression with ! - SuppressFail = 0x08 // Failures are reported but do not fail the test - }; -}; + ContinueOnFailure = 0x02, // Failures fail test, but execution continues + FalseTest = 0x04, // Prefix expression with ! + SuppressFail = 0x08 // Failures are reported but do not fail the test + }; }; -inline ResultDisposition::Flags operator|(ResultDisposition::Flags lhs, ResultDisposition::Flags rhs) -{ - return static_cast(static_cast(lhs) | static_cast(rhs)); -} + inline ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) { + return static_cast( static_cast( lhs ) | static_cast( rhs ) ); + } -inline bool shouldContinueOnFailure(int flags) { return (flags & ResultDisposition::ContinueOnFailure) != 0; } -inline bool isFalseTest(int flags) { return (flags & ResultDisposition::FalseTest) != 0; } -inline bool shouldSuppressFailure(int flags) { return (flags & ResultDisposition::SuppressFail) != 0; } + inline bool shouldContinueOnFailure( int flags ) { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; } + inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; } + inline bool shouldSuppressFailure( int flags ) { return ( flags & ResultDisposition::SuppressFail ) != 0; } } // end namespace Catch @@ -837,59 +901,114 @@ inline bool shouldSuppressFailure(int flags) { return (flags & ResultDisposition namespace Catch { -struct AssertionInfo -{ - AssertionInfo() {} - AssertionInfo(std::string const& _macroName, - SourceLineInfo const& _lineInfo, - std::string const& _capturedExpression, - ResultDisposition::Flags _resultDisposition); - - std::string macroName; - SourceLineInfo lineInfo; - std::string capturedExpression; - ResultDisposition::Flags resultDisposition; -}; + struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison; -struct AssertionResultData -{ - AssertionResultData() : resultType(ResultWas::Unknown) {} + struct DecomposedExpression + { + virtual ~DecomposedExpression() {} + virtual bool isBinaryExpression() const { + return false; + } + virtual void reconstructExpression( std::string& dest ) const = 0; - std::string reconstructedExpression; - std::string message; - ResultWas::OfType resultType; -}; + // Only simple binary comparisons can be decomposed. + // If more complex check is required then wrap sub-expressions in parentheses. + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( T const& ); + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( T const& ); + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( T const& ); + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( T const& ); + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator % ( T const& ); + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( T const& ); + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( T const& ); -class AssertionResult -{ - public: - AssertionResult(); - AssertionResult(AssertionInfo const& info, AssertionResultData const& data); - ~AssertionResult(); -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - AssertionResult(AssertionResult const&) = default; - AssertionResult(AssertionResult&&) = default; - AssertionResult& operator=(AssertionResult const&) = default; - AssertionResult& operator=(AssertionResult&&) = default; -#endif - - bool isOk() const; - bool succeeded() const; - ResultWas::OfType getResultType() const; - bool hasExpression() const; - bool hasMessage() const; - std::string getExpression() const; - std::string getExpressionInMacro() const; - bool hasExpandedExpression() const; - std::string getExpandedExpression() const; - std::string getMessage() const; - SourceLineInfo getSourceInfo() const; - std::string getTestMacroName() const; - - protected: - AssertionInfo m_info; - AssertionResultData m_resultData; -}; + private: + DecomposedExpression& operator = (DecomposedExpression const&); + }; + + struct AssertionInfo + { + AssertionInfo() {} + AssertionInfo( std::string const& _macroName, + SourceLineInfo const& _lineInfo, + std::string const& _capturedExpression, + ResultDisposition::Flags _resultDisposition ); + + std::string macroName; + SourceLineInfo lineInfo; + std::string capturedExpression; + ResultDisposition::Flags resultDisposition; + }; + + struct AssertionResultData + { + AssertionResultData() : decomposedExpression( CATCH_NULL ) + , resultType( ResultWas::Unknown ) + , negated( false ) + , parenthesized( false ) {} + + void negate( bool parenthesize ) { + negated = !negated; + parenthesized = parenthesize; + if( resultType == ResultWas::Ok ) + resultType = ResultWas::ExpressionFailed; + else if( resultType == ResultWas::ExpressionFailed ) + resultType = ResultWas::Ok; + } + + std::string const& reconstructExpression() const { + if( decomposedExpression != CATCH_NULL ) { + decomposedExpression->reconstructExpression( reconstructedExpression ); + if( parenthesized ) { + reconstructedExpression.insert( 0, 1, '(' ); + reconstructedExpression.append( 1, ')' ); + } + if( negated ) { + reconstructedExpression.insert( 0, 1, '!' ); + } + decomposedExpression = CATCH_NULL; + } + return reconstructedExpression; + } + + mutable DecomposedExpression const* decomposedExpression; + mutable std::string reconstructedExpression; + std::string message; + ResultWas::OfType resultType; + bool negated; + bool parenthesized; + }; + + class AssertionResult { + public: + AssertionResult(); + AssertionResult( AssertionInfo const& info, AssertionResultData const& data ); + ~AssertionResult(); +# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS + AssertionResult( AssertionResult const& ) = default; + AssertionResult( AssertionResult && ) = default; + AssertionResult& operator = ( AssertionResult const& ) = default; + AssertionResult& operator = ( AssertionResult && ) = default; +# endif + + bool isOk() const; + bool succeeded() const; + ResultWas::OfType getResultType() const; + bool hasExpression() const; + bool hasMessage() const; + std::string getExpression() const; + std::string getExpressionInMacro() const; + bool hasExpandedExpression() const; + std::string getExpandedExpression() const; + std::string getMessage() const; + SourceLineInfo getSourceInfo() const; + std::string getTestMacroName() const; + void discardDecomposedExpression() const; + void expandDecomposedExpression() const; + + protected: + AssertionInfo m_info; + AssertionResultData m_resultData; + }; } // end namespace Catch @@ -898,453 +1017,239 @@ class AssertionResult namespace Catch { namespace Matchers { -namespace Impl { - -namespace Generic { -template -class AllOf; -template -class AnyOf; -template -class Not; -} - -template -struct Matcher : SharedImpl -{ - typedef ExpressionT ExpressionType; + namespace Impl { + + template struct MatchAllOf; + template struct MatchAnyOf; + template struct MatchNotOf; + + class MatcherUntypedBase { + public: + std::string toString() const { + if( m_cachedToString.empty() ) + m_cachedToString = describe(); + return m_cachedToString; + } - virtual ~Matcher() {} - virtual Ptr clone() const = 0; - virtual bool match(ExpressionT const& expr) const = 0; - virtual std::string toString() const = 0; + protected: + virtual ~MatcherUntypedBase(); + virtual std::string describe() const = 0; + mutable std::string m_cachedToString; + private: + MatcherUntypedBase& operator = ( MatcherUntypedBase const& ); + }; - Generic::AllOf operator&&(Matcher const& other) const; - Generic::AnyOf operator||(Matcher const& other) const; - Generic::Not operator!() const; -}; + template + struct MatcherMethod { + virtual bool match( ObjectT const& arg ) const = 0; + }; + template + struct MatcherMethod { + virtual bool match( PtrT* arg ) const = 0; + }; -template -struct MatcherImpl : Matcher -{ + template + struct MatcherBase : MatcherUntypedBase, MatcherMethod { - virtual Ptr> clone() const - { - return Ptr>(new DerivedT(static_cast(*this))); - } -}; + MatchAllOf operator && ( MatcherBase const& other ) const; + MatchAnyOf operator || ( MatcherBase const& other ) const; + MatchNotOf operator ! () const; + }; -namespace Generic { -template -class Not : public MatcherImpl, ExpressionT> -{ - public: - explicit Not(Matcher const& matcher) : m_matcher(matcher.clone()) {} - Not(Not const& other) : m_matcher(other.m_matcher) {} - - virtual bool match(ExpressionT const& expr) const CATCH_OVERRIDE - { - return !m_matcher->match(expr); - } - - virtual std::string toString() const CATCH_OVERRIDE - { - return "not " + m_matcher->toString(); - } - - private: - Ptr> m_matcher; -}; - -template -class AllOf : public MatcherImpl, ExpressionT> -{ - public: - AllOf() {} - AllOf(AllOf const& other) : m_matchers(other.m_matchers) {} - - AllOf& add(Matcher const& matcher) - { - m_matchers.push_back(matcher.clone()); - return *this; - } - virtual bool match(ExpressionT const& expr) const - { - for (std::size_t i = 0; i < m_matchers.size(); ++i) - if (!m_matchers[i]->match(expr)) - return false; - return true; - } - virtual std::string toString() const - { - std::ostringstream oss; - oss << "( "; - for (std::size_t i = 0; i < m_matchers.size(); ++i) - { - if (i != 0) - oss << " and "; - oss << m_matchers[i]->toString(); - } - oss << " )"; - return oss.str(); - } - - AllOf operator&&(Matcher const& other) const - { - AllOf allOfExpr(*this); - allOfExpr.add(other); - return allOfExpr; - } - - private: - std::vector>> m_matchers; -}; - -template -class AnyOf : public MatcherImpl, ExpressionT> -{ - public: - AnyOf() {} - AnyOf(AnyOf const& other) : m_matchers(other.m_matchers) {} - - AnyOf& add(Matcher const& matcher) - { - m_matchers.push_back(matcher.clone()); - return *this; - } - virtual bool match(ExpressionT const& expr) const - { - for (std::size_t i = 0; i < m_matchers.size(); ++i) - if (m_matchers[i]->match(expr)) + template + struct MatchAllOf : MatcherBase { + virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE { + for( std::size_t i = 0; i < m_matchers.size(); ++i ) { + if (!m_matchers[i]->match(arg)) + return false; + } return true; - return false; - } - virtual std::string toString() const - { - std::ostringstream oss; - oss << "( "; - for (std::size_t i = 0; i < m_matchers.size(); ++i) - { - if (i != 0) - oss << " or "; - oss << m_matchers[i]->toString(); - } - oss << " )"; - return oss.str(); - } + } + virtual std::string describe() const CATCH_OVERRIDE { + std::string description; + description.reserve( 4 + m_matchers.size()*32 ); + description += "( "; + for( std::size_t i = 0; i < m_matchers.size(); ++i ) { + if( i != 0 ) + description += " and "; + description += m_matchers[i]->toString(); + } + description += " )"; + return description; + } - AnyOf operator||(Matcher const& other) const - { - AnyOf anyOfExpr(*this); - anyOfExpr.add(other); - return anyOfExpr; - } + MatchAllOf& operator && ( MatcherBase const& other ) { + m_matchers.push_back( &other ); + return *this; + } - private: - std::vector>> m_matchers; -}; + std::vector const*> m_matchers; + }; + template + struct MatchAnyOf : MatcherBase { -} // namespace Generic + virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE { + for( std::size_t i = 0; i < m_matchers.size(); ++i ) { + if (m_matchers[i]->match(arg)) + return true; + } + return false; + } + virtual std::string describe() const CATCH_OVERRIDE { + std::string description; + description.reserve( 4 + m_matchers.size()*32 ); + description += "( "; + for( std::size_t i = 0; i < m_matchers.size(); ++i ) { + if( i != 0 ) + description += " or "; + description += m_matchers[i]->toString(); + } + description += " )"; + return description; + } -template -Generic::AllOf Matcher::operator&&(Matcher const& other) const -{ - Generic::AllOf allOfExpr; - allOfExpr.add(*this); - allOfExpr.add(other); - return allOfExpr; -} + MatchAnyOf& operator || ( MatcherBase const& other ) { + m_matchers.push_back( &other ); + return *this; + } -template -Generic::AnyOf Matcher::operator||(Matcher const& other) const -{ - Generic::AnyOf anyOfExpr; - anyOfExpr.add(*this); - anyOfExpr.add(other); - return anyOfExpr; -} + std::vector const*> m_matchers; + }; -template -Generic::Not Matcher::operator!() const -{ - return Generic::Not(*this); -} + template + struct MatchNotOf : MatcherBase { -namespace StdString { + MatchNotOf( MatcherBase const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {} -inline std::string makeString(std::string const& str) { return str; } -inline std::string makeString(const char* str) { return str ? std::string(str) : std::string(); } + virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE { + return !m_underlyingMatcher.match( arg ); + } -struct CasedString -{ - CasedString(std::string const& str, CaseSensitive::Choice caseSensitivity) - : m_caseSensitivity(caseSensitivity), - m_str(adjustString(str)) - { - } - std::string adjustString(std::string const& str) const - { - return m_caseSensitivity == CaseSensitive::No - ? toLower(str) - : str; - } - std::string toStringSuffix() const - { - return m_caseSensitivity == CaseSensitive::No - ? " (case insensitive)" - : ""; - } - CaseSensitive::Choice m_caseSensitivity; - std::string m_str; -}; + virtual std::string describe() const CATCH_OVERRIDE { + return "not " + m_underlyingMatcher.toString(); + } + MatcherBase const& m_underlyingMatcher; + }; -struct Equals : MatcherImpl -{ - Equals(std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) - : m_data(str, caseSensitivity) - { - } - Equals(Equals const& other) : m_data(other.m_data) {} + template + MatchAllOf MatcherBase::operator && ( MatcherBase const& other ) const { + return MatchAllOf() && *this && other; + } + template + MatchAnyOf MatcherBase::operator || ( MatcherBase const& other ) const { + return MatchAnyOf() || *this || other; + } + template + MatchNotOf MatcherBase::operator ! () const { + return MatchNotOf( *this ); + } - virtual ~Equals(); + } // namespace Impl - virtual bool match(std::string const& expr) const - { - return m_data.m_str == m_data.adjustString(expr); - ; + // The following functions create the actual matcher objects. + // This allows the types to be inferred + // - deprecated: prefer ||, && and ! + template + inline Impl::MatchNotOf Not( Impl::MatcherBase const& underlyingMatcher ) { + return Impl::MatchNotOf( underlyingMatcher ); } - virtual std::string toString() const - { - return "equals: \"" + m_data.m_str + "\"" + m_data.toStringSuffix(); - } - - CasedString m_data; -}; - -struct Contains : MatcherImpl -{ - Contains(std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) - : m_data(substr, caseSensitivity) {} - Contains(Contains const& other) : m_data(other.m_data) {} - - virtual ~Contains(); - - virtual bool match(std::string const& expr) const - { - return m_data.adjustString(expr).find(m_data.m_str) != std::string::npos; + template + inline Impl::MatchAllOf AllOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2 ) { + return Impl::MatchAllOf() && m1 && m2; } - virtual std::string toString() const - { - return "contains: \"" + m_data.m_str + "\"" + m_data.toStringSuffix(); + template + inline Impl::MatchAllOf AllOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2, Impl::MatcherBase const& m3 ) { + return Impl::MatchAllOf() && m1 && m2 && m3; } - - CasedString m_data; -}; - -struct StartsWith : MatcherImpl -{ - StartsWith(std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) - : m_data(substr, caseSensitivity) {} - - StartsWith(StartsWith const& other) : m_data(other.m_data) {} - - virtual ~StartsWith(); - - virtual bool match(std::string const& expr) const - { - return m_data.adjustString(expr).find(m_data.m_str) == 0; + template + inline Impl::MatchAnyOf AnyOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2 ) { + return Impl::MatchAnyOf() || m1 || m2; } - virtual std::string toString() const - { - return "starts with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix(); + template + inline Impl::MatchAnyOf AnyOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2, Impl::MatcherBase const& m3 ) { + return Impl::MatchAnyOf() || m1 || m2 || m3; } - CasedString m_data; -}; +} // namespace Matchers -struct EndsWith : MatcherImpl -{ - EndsWith(std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) - : m_data(substr, caseSensitivity) {} - EndsWith(EndsWith const& other) : m_data(other.m_data) {} +using namespace Matchers; +using Matchers::Impl::MatcherBase; - virtual ~EndsWith(); +} // namespace Catch - virtual bool match(std::string const& expr) const - { - return m_data.adjustString(expr).find(m_data.m_str) == expr.size() - m_data.m_str.size(); - } - virtual std::string toString() const - { - return "ends with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix(); - } +namespace Catch { - CasedString m_data; -}; -} // namespace StdString -} // namespace Impl + struct TestFailureException{}; -// The following functions create the actual matcher objects. -// This allows the types to be inferred -template -inline Impl::Generic::Not Not(Impl::Matcher const& m) -{ - return Impl::Generic::Not(m); -} + template class ExpressionLhs; -template -inline Impl::Generic::AllOf AllOf(Impl::Matcher const& m1, - Impl::Matcher const& m2) -{ - return Impl::Generic::AllOf().add(m1).add(m2); -} -template -inline Impl::Generic::AllOf AllOf(Impl::Matcher const& m1, - Impl::Matcher const& m2, - Impl::Matcher const& m3) -{ - return Impl::Generic::AllOf().add(m1).add(m2).add(m3); -} -template -inline Impl::Generic::AnyOf AnyOf(Impl::Matcher const& m1, - Impl::Matcher const& m2) -{ - return Impl::Generic::AnyOf().add(m1).add(m2); -} -template -inline Impl::Generic::AnyOf AnyOf(Impl::Matcher const& m1, - Impl::Matcher const& m2, - Impl::Matcher const& m3) -{ - return Impl::Generic::AnyOf().add(m1).add(m2).add(m3); -} - -inline Impl::StdString::Equals Equals(std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) -{ - return Impl::StdString::Equals(str, caseSensitivity); -} -inline Impl::StdString::Equals Equals(const char* str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) -{ - return Impl::StdString::Equals(Impl::StdString::makeString(str), caseSensitivity); -} -inline Impl::StdString::Contains Contains(std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) -{ - return Impl::StdString::Contains(substr, caseSensitivity); -} -inline Impl::StdString::Contains Contains(const char* substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes) -{ - return Impl::StdString::Contains(Impl::StdString::makeString(substr), caseSensitivity); -} -inline Impl::StdString::StartsWith StartsWith(std::string const& substr) -{ - return Impl::StdString::StartsWith(substr); -} -inline Impl::StdString::StartsWith StartsWith(const char* substr) -{ - return Impl::StdString::StartsWith(Impl::StdString::makeString(substr)); -} -inline Impl::StdString::EndsWith EndsWith(std::string const& substr) -{ - return Impl::StdString::EndsWith(substr); -} -inline Impl::StdString::EndsWith EndsWith(const char* substr) -{ - return Impl::StdString::EndsWith(Impl::StdString::makeString(substr)); -} + struct CopyableStream { + CopyableStream() {} + CopyableStream( CopyableStream const& other ) { + oss << other.oss.str(); + } + CopyableStream& operator=( CopyableStream const& other ) { + oss.str(std::string()); + oss << other.oss.str(); + return *this; + } + std::ostringstream oss; + }; -} // namespace Matchers + class ResultBuilder : public DecomposedExpression { + public: + ResultBuilder( char const* macroName, + SourceLineInfo const& lineInfo, + char const* capturedExpression, + ResultDisposition::Flags resultDisposition, + char const* secondArg = "" ); + ~ResultBuilder(); + + template + ExpressionLhs operator <= ( T const& operand ); + ExpressionLhs operator <= ( bool value ); + + template + ResultBuilder& operator << ( T const& value ) { + m_stream.oss << value; + return *this; + } -using namespace Matchers; + ResultBuilder& setResultType( ResultWas::OfType result ); + ResultBuilder& setResultType( bool result ); -} // namespace Catch + void endExpression( DecomposedExpression const& expr ); -namespace Catch { + virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE; -struct TestFailureException -{ -}; + AssertionResult build() const; + AssertionResult build( DecomposedExpression const& expr ) const; -template -class ExpressionLhs; + void useActiveException( ResultDisposition::Flags resultDisposition = ResultDisposition::Normal ); + void captureResult( ResultWas::OfType resultType ); + void captureExpression(); + void captureExpectedException( std::string const& expectedMessage ); + void captureExpectedException( Matchers::Impl::MatcherBase const& matcher ); + void handleResult( AssertionResult const& result ); + void react(); + bool shouldDebugBreak() const; + bool allowThrows() const; -struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison; + template + void captureMatch( ArgT const& arg, MatcherT const& matcher, char const* matcherString ); -struct CopyableStream -{ - CopyableStream() {} - CopyableStream(CopyableStream const& other) - { - oss << other.oss.str(); - } - CopyableStream& operator=(CopyableStream const& other) - { - oss.str(""); - oss << other.oss.str(); - return *this; - } - std::ostringstream oss; -}; + void setExceptionGuard(); + void unsetExceptionGuard(); -class ResultBuilder -{ - public: - ResultBuilder(char const* macroName, - SourceLineInfo const& lineInfo, - char const* capturedExpression, - ResultDisposition::Flags resultDisposition, - char const* secondArg = ""); - - template - ExpressionLhs operator<=(T const& operand); - ExpressionLhs operator<=(bool value); - - template - ResultBuilder& operator<<(T const& value) - { - m_stream.oss << value; - return *this; - } + private: + AssertionInfo m_assertionInfo; + AssertionResultData m_data; + CopyableStream m_stream; - template - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator&&(RhsT const&); - template - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator||(RhsT const&); - - ResultBuilder& setResultType(ResultWas::OfType result); - ResultBuilder& setResultType(bool result); - ResultBuilder& setLhs(std::string const& lhs); - ResultBuilder& setRhs(std::string const& rhs); - ResultBuilder& setOp(std::string const& op); - - void endExpression(); - - std::string reconstructExpression() const; - AssertionResult build() const; - - void useActiveException(ResultDisposition::Flags resultDisposition = ResultDisposition::Normal); - void captureResult(ResultWas::OfType resultType); - void captureExpression(); - void captureExpectedException(std::string const& expectedMessage); - void captureExpectedException(Matchers::Impl::Matcher const& matcher); - void handleResult(AssertionResult const& result); - void react(); - bool shouldDebugBreak() const; - bool allowThrows() const; - - private: - AssertionInfo m_assertionInfo; - AssertionResultData m_data; - struct ExprComponents - { - ExprComponents() : testFalse(false) {} - bool testFalse; - std::string lhs, rhs, op; - } m_exprComponents; - CopyableStream m_stream; - - bool m_shouldDebugBreak; - bool m_shouldThrow; -}; + bool m_shouldDebugBreak; + bool m_shouldThrow; + bool m_guardException; + }; } // namespace Catch @@ -1357,7 +1262,8 @@ class ResultBuilder #ifdef _MSC_VER #pragma warning(push) -#pragma warning(disable : 4389) // '==' : signed/unsigned mismatch +#pragma warning(disable:4389) // '==' : signed/unsigned mismatch +#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform) #endif #include @@ -1365,300 +1271,193 @@ class ResultBuilder namespace Catch { namespace Internal { -enum Operator -{ - IsEqualTo, - IsNotEqualTo, - IsLessThan, - IsGreaterThan, - IsLessThanOrEqualTo, - IsGreaterThanOrEqualTo -}; + enum Operator { + IsEqualTo, + IsNotEqualTo, + IsLessThan, + IsGreaterThan, + IsLessThanOrEqualTo, + IsGreaterThanOrEqualTo + }; -template -struct OperatorTraits -{ - static const char* getName() { return "*error*"; } -}; -template <> -struct OperatorTraits -{ - static const char* getName() { return "=="; } -}; -template <> -struct OperatorTraits -{ - static const char* getName() { return "!="; } -}; -template <> -struct OperatorTraits -{ - static const char* getName() { return "<"; } -}; -template <> -struct OperatorTraits -{ - static const char* getName() { return ">"; } -}; -template <> -struct OperatorTraits -{ - static const char* getName() { return "<="; } -}; -template <> -struct OperatorTraits -{ - static const char* getName() { return ">="; } -}; + template struct OperatorTraits { static const char* getName(){ return "*error*"; } }; + template<> struct OperatorTraits { static const char* getName(){ return "=="; } }; + template<> struct OperatorTraits { static const char* getName(){ return "!="; } }; + template<> struct OperatorTraits { static const char* getName(){ return "<"; } }; + template<> struct OperatorTraits { static const char* getName(){ return ">"; } }; + template<> struct OperatorTraits { static const char* getName(){ return "<="; } }; + template<> struct OperatorTraits{ static const char* getName(){ return ">="; } }; -template -inline T& opCast(T const& t) -{ - return const_cast(t); -} + template + inline T& opCast(T const& t) { return const_cast(t); } // nullptr_t support based on pull request #154 from Konstantin Baumann #ifdef CATCH_CONFIG_CPP11_NULLPTR -inline std::nullptr_t opCast(std::nullptr_t) -{ - return nullptr; -} + inline std::nullptr_t opCast(std::nullptr_t) { return nullptr; } #endif // CATCH_CONFIG_CPP11_NULLPTR -// So the compare overloads can be operator agnostic we convey the operator as a template -// enum, which is used to specialise an Evaluator for doing the comparison. -template -class Evaluator -{ -}; + // So the compare overloads can be operator agnostic we convey the operator as a template + // enum, which is used to specialise an Evaluator for doing the comparison. + template + class Evaluator{}; -template -struct Evaluator -{ - static bool evaluate(T1 const& lhs, T2 const& rhs) - { - return opCast(lhs) == opCast(rhs); - } -}; -template -struct Evaluator -{ - static bool evaluate(T1 const& lhs, T2 const& rhs) - { - return opCast(lhs) != opCast(rhs); + template + struct Evaluator { + static bool evaluate( T1 const& lhs, T2 const& rhs) { + return bool( opCast( lhs ) == opCast( rhs ) ); + } + }; + template + struct Evaluator { + static bool evaluate( T1 const& lhs, T2 const& rhs ) { + return bool( opCast( lhs ) != opCast( rhs ) ); + } + }; + template + struct Evaluator { + static bool evaluate( T1 const& lhs, T2 const& rhs ) { + return bool( opCast( lhs ) < opCast( rhs ) ); + } + }; + template + struct Evaluator { + static bool evaluate( T1 const& lhs, T2 const& rhs ) { + return bool( opCast( lhs ) > opCast( rhs ) ); + } + }; + template + struct Evaluator { + static bool evaluate( T1 const& lhs, T2 const& rhs ) { + return bool( opCast( lhs ) >= opCast( rhs ) ); + } + }; + template + struct Evaluator { + static bool evaluate( T1 const& lhs, T2 const& rhs ) { + return bool( opCast( lhs ) <= opCast( rhs ) ); + } + }; + + template + bool applyEvaluator( T1 const& lhs, T2 const& rhs ) { + return Evaluator::evaluate( lhs, rhs ); } -}; -template -struct Evaluator -{ - static bool evaluate(T1 const& lhs, T2 const& rhs) - { - return opCast(lhs) < opCast(rhs); + + // This level of indirection allows us to specialise for integer types + // to avoid signed/ unsigned warnings + + // "base" overload + template + bool compare( T1 const& lhs, T2 const& rhs ) { + return Evaluator::evaluate( lhs, rhs ); } -}; -template -struct Evaluator -{ - static bool evaluate(T1 const& lhs, T2 const& rhs) - { - return opCast(lhs) > opCast(rhs); + + // unsigned X to int + template bool compare( unsigned int lhs, int rhs ) { + return applyEvaluator( lhs, static_cast( rhs ) ); } -}; -template -struct Evaluator -{ - static bool evaluate(T1 const& lhs, T2 const& rhs) - { - return opCast(lhs) >= opCast(rhs); + template bool compare( unsigned long lhs, int rhs ) { + return applyEvaluator( lhs, static_cast( rhs ) ); } -}; -template -struct Evaluator -{ - static bool evaluate(T1 const& lhs, T2 const& rhs) - { - return opCast(lhs) <= opCast(rhs); + template bool compare( unsigned char lhs, int rhs ) { + return applyEvaluator( lhs, static_cast( rhs ) ); } -}; - -template -bool applyEvaluator(T1 const& lhs, T2 const& rhs) -{ - return Evaluator::evaluate(lhs, rhs); -} - -// This level of indirection allows us to specialise for integer types -// to avoid signed/ unsigned warnings -// "base" overload -template -bool compare(T1 const& lhs, T2 const& rhs) -{ - return Evaluator::evaluate(lhs, rhs); -} - -// unsigned X to int -template -bool compare(unsigned int lhs, int rhs) -{ - return applyEvaluator(lhs, static_cast(rhs)); -} -template -bool compare(unsigned long lhs, int rhs) -{ - return applyEvaluator(lhs, static_cast(rhs)); -} -template -bool compare(unsigned char lhs, int rhs) -{ - return applyEvaluator(lhs, static_cast(rhs)); -} - -// unsigned X to long -template -bool compare(unsigned int lhs, long rhs) -{ - return applyEvaluator(lhs, static_cast(rhs)); -} -template -bool compare(unsigned long lhs, long rhs) -{ - return applyEvaluator(lhs, static_cast(rhs)); -} -template -bool compare(unsigned char lhs, long rhs) -{ - return applyEvaluator(lhs, static_cast(rhs)); -} + // unsigned X to long + template bool compare( unsigned int lhs, long rhs ) { + return applyEvaluator( lhs, static_cast( rhs ) ); + } + template bool compare( unsigned long lhs, long rhs ) { + return applyEvaluator( lhs, static_cast( rhs ) ); + } + template bool compare( unsigned char lhs, long rhs ) { + return applyEvaluator( lhs, static_cast( rhs ) ); + } -// int to unsigned X -template -bool compare(int lhs, unsigned int rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(int lhs, unsigned long rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(int lhs, unsigned char rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} + // int to unsigned X + template bool compare( int lhs, unsigned int rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( int lhs, unsigned long rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( int lhs, unsigned char rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } -// long to unsigned X -template -bool compare(long lhs, unsigned int rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(long lhs, unsigned long rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(long lhs, unsigned char rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} + // long to unsigned X + template bool compare( long lhs, unsigned int rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( long lhs, unsigned long rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( long lhs, unsigned char rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } -// pointer to long (when comparing against NULL) -template -bool compare(long lhs, T* rhs) -{ - return Evaluator::evaluate(reinterpret_cast(lhs), rhs); -} -template -bool compare(T* lhs, long rhs) -{ - return Evaluator::evaluate(lhs, reinterpret_cast(rhs)); -} + // pointer to long (when comparing against NULL) + template bool compare( long lhs, T* rhs ) { + return Evaluator::evaluate( reinterpret_cast( lhs ), rhs ); + } + template bool compare( T* lhs, long rhs ) { + return Evaluator::evaluate( lhs, reinterpret_cast( rhs ) ); + } -// pointer to int (when comparing against NULL) -template -bool compare(int lhs, T* rhs) -{ - return Evaluator::evaluate(reinterpret_cast(lhs), rhs); -} -template -bool compare(T* lhs, int rhs) -{ - return Evaluator::evaluate(lhs, reinterpret_cast(rhs)); -} + // pointer to int (when comparing against NULL) + template bool compare( int lhs, T* rhs ) { + return Evaluator::evaluate( reinterpret_cast( lhs ), rhs ); + } + template bool compare( T* lhs, int rhs ) { + return Evaluator::evaluate( lhs, reinterpret_cast( rhs ) ); + } #ifdef CATCH_CONFIG_CPP11_LONG_LONG -// long long to unsigned X -template -bool compare(long long lhs, unsigned int rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(long long lhs, unsigned long rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(long long lhs, unsigned long long rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(long long lhs, unsigned char rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} + // long long to unsigned X + template bool compare( long long lhs, unsigned int rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( long long lhs, unsigned long rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( long long lhs, unsigned long long rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( long long lhs, unsigned char rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } -// unsigned long long to X -template -bool compare(unsigned long long lhs, int rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(unsigned long long lhs, long rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(unsigned long long lhs, long long rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} -template -bool compare(unsigned long long lhs, char rhs) -{ - return applyEvaluator(static_cast(lhs), rhs); -} + // unsigned long long to X + template bool compare( unsigned long long lhs, int rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( unsigned long long lhs, long rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( unsigned long long lhs, long long rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } + template bool compare( unsigned long long lhs, char rhs ) { + return applyEvaluator( static_cast( lhs ), rhs ); + } -// pointer to long long (when comparing against NULL) -template -bool compare(long long lhs, T* rhs) -{ - return Evaluator::evaluate(reinterpret_cast(lhs), rhs); -} -template -bool compare(T* lhs, long long rhs) -{ - return Evaluator::evaluate(lhs, reinterpret_cast(rhs)); -} + // pointer to long long (when comparing against NULL) + template bool compare( long long lhs, T* rhs ) { + return Evaluator::evaluate( reinterpret_cast( lhs ), rhs ); + } + template bool compare( T* lhs, long long rhs ) { + return Evaluator::evaluate( lhs, reinterpret_cast( rhs ) ); + } #endif // CATCH_CONFIG_CPP11_LONG_LONG #ifdef CATCH_CONFIG_CPP11_NULLPTR -// pointer to nullptr_t (when comparing against nullptr) -template -bool compare(std::nullptr_t, T* rhs) -{ - return Evaluator::evaluate(nullptr, rhs); -} -template -bool compare(T* lhs, std::nullptr_t) -{ - return Evaluator::evaluate(lhs, nullptr); -} + // pointer to nullptr_t (when comparing against nullptr) + template bool compare( std::nullptr_t, T* rhs ) { + return Evaluator::evaluate( nullptr, rhs ); + } + template bool compare( T* lhs, std::nullptr_t ) { + return Evaluator::evaluate( lhs, nullptr ); + } #endif // CATCH_CONFIG_CPP11_NULLPTR } // end of namespace Internal @@ -1671,11 +1470,11 @@ bool compare(T* lhs, std::nullptr_t) // #included from: catch_tostring.h #define TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED -#include +#include #include #include -#include #include +#include #ifdef __OBJC__ // #included from: catch_objc_arc.hpp @@ -1689,34 +1488,29 @@ bool compare(T* lhs, std::nullptr_t) #define CATCH_ARC_ENABLED 0 #endif -void arcSafeRelease(NSObject* obj); -id performOptionalSelector(id obj, SEL sel); +void arcSafeRelease( NSObject* obj ); +id performOptionalSelector( id obj, SEL sel ); #if !CATCH_ARC_ENABLED -inline void arcSafeRelease(NSObject* obj) -{ +inline void arcSafeRelease( NSObject* obj ) { [obj release]; } -inline id performOptionalSelector(id obj, SEL sel) -{ - if ([obj respondsToSelector:sel]) - return [obj performSelector:sel]; +inline id performOptionalSelector( id obj, SEL sel ) { + if( [obj respondsToSelector: sel] ) + return [obj performSelector: sel]; return nil; } #define CATCH_UNSAFE_UNRETAINED #define CATCH_ARC_STRONG #else -inline void arcSafeRelease(NSObject*) -{ -} -inline id performOptionalSelector(id obj, SEL sel) -{ +inline void arcSafeRelease( NSObject* ){} +inline id performOptionalSelector( id obj, SEL sel ) { #ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Warc-performSelector-leaks" #endif - if ([obj respondsToSelector:sel]) - return [obj performSelector:sel]; + if( [obj respondsToSelector: sel] ) + return [obj performSelector: sel]; #ifdef __clang__ #pragma clang diagnostic pop #endif @@ -1739,168 +1533,161 @@ inline id performOptionalSelector(id obj, SEL sel) namespace Catch { // Why we're here. -template -std::string toString(T const& value); +template +std::string toString( T const& value ); // Built in overloads -std::string toString(std::string const& value); -std::string toString(std::wstring const& value); -std::string toString(const char* const value); -std::string toString(char* const value); -std::string toString(const wchar_t* const value); -std::string toString(wchar_t* const value); -std::string toString(int value); -std::string toString(unsigned long value); -std::string toString(unsigned int value); -std::string toString(const double value); -std::string toString(const float value); -std::string toString(bool value); -std::string toString(char value); -std::string toString(signed char value); -std::string toString(unsigned char value); +std::string toString( std::string const& value ); +std::string toString( std::wstring const& value ); +std::string toString( const char* const value ); +std::string toString( char* const value ); +std::string toString( const wchar_t* const value ); +std::string toString( wchar_t* const value ); +std::string toString( int value ); +std::string toString( unsigned long value ); +std::string toString( unsigned int value ); +std::string toString( const double value ); +std::string toString( const float value ); +std::string toString( bool value ); +std::string toString( char value ); +std::string toString( signed char value ); +std::string toString( unsigned char value ); #ifdef CATCH_CONFIG_CPP11_LONG_LONG -std::string toString(long long value); -std::string toString(unsigned long long value); +std::string toString( long long value ); +std::string toString( unsigned long long value ); #endif #ifdef CATCH_CONFIG_CPP11_NULLPTR -std::string toString(std::nullptr_t); +std::string toString( std::nullptr_t ); #endif #ifdef __OBJC__ -std::string toString(NSString const* const& nsstring); -std::string toString(NSString* CATCH_ARC_STRONG const& nsstring); -std::string toString(NSObject* const& nsObject); + std::string toString( NSString const * const& nsstring ); + std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ); + std::string toString( NSObject* const& nsObject ); #endif namespace Detail { -extern const std::string unprintableString; + extern const std::string unprintableString; -struct BorgType -{ - template - BorgType(T const&); -}; + #if !defined(CATCH_CONFIG_CPP11_STREAM_INSERTABLE_CHECK) + struct BorgType { + template BorgType( T const& ); + }; -struct TrueType -{ - char sizer[1]; -}; -struct FalseType -{ - char sizer[2]; -}; + struct TrueType { char sizer[1]; }; + struct FalseType { char sizer[2]; }; -TrueType& testStreamable(std::ostream&); -FalseType testStreamable(FalseType); + TrueType& testStreamable( std::ostream& ); + FalseType testStreamable( FalseType ); -FalseType operator<<(std::ostream const&, BorgType const&); + FalseType operator<<( std::ostream const&, BorgType const& ); -template -struct IsStreamInsertable -{ - static std::ostream& s; - static T const& t; - enum - { - value = sizeof(testStreamable(s << t)) == sizeof(TrueType) + template + struct IsStreamInsertable { + static std::ostream &s; + static T const&t; + enum { value = sizeof( testStreamable(s << t) ) == sizeof( TrueType ) }; }; -}; +#else + template + class IsStreamInsertable { + template + static auto test(int) + -> decltype( std::declval() << std::declval(), std::true_type() ); + + template + static auto test(...) -> std::false_type; + + public: + static const bool value = decltype(test(0))::value; + }; +#endif #if defined(CATCH_CONFIG_CPP11_IS_ENUM) -template ::value> -struct EnumStringMaker -{ - static std::string convert(T const&) { return unprintableString; } -}; + template::value + > + struct EnumStringMaker + { + static std::string convert( T const& ) { return unprintableString; } + }; -template -struct EnumStringMaker -{ - static std::string convert(T const& v) + template + struct EnumStringMaker { - return ::Catch::toString( - static_cast::type>(v)); - } -}; + static std::string convert( T const& v ) + { + return ::Catch::toString( + static_cast::type>(v) + ); + } + }; #endif -template -struct StringMakerBase -{ + template + struct StringMakerBase { #if defined(CATCH_CONFIG_CPP11_IS_ENUM) - template - static std::string convert(T const& v) - { - return EnumStringMaker::convert(v); - } + template + static std::string convert( T const& v ) + { + return EnumStringMaker::convert( v ); + } #else - template - static std::string convert(T const&) - { - return unprintableString; - } + template + static std::string convert( T const& ) { return unprintableString; } #endif -}; + }; -template <> -struct StringMakerBase -{ - template - static std::string convert(T const& _value) - { - std::ostringstream oss; - oss << _value; - return oss.str(); - } -}; + template<> + struct StringMakerBase { + template + static std::string convert( T const& _value ) { + std::ostringstream oss; + oss << _value; + return oss.str(); + } + }; -std::string rawMemoryToString(const void* object, std::size_t size); + std::string rawMemoryToString( const void *object, std::size_t size ); -template -inline std::string rawMemoryToString(const T& object) -{ - return rawMemoryToString(&object, sizeof(object)); -} + template + inline std::string rawMemoryToString( const T& object ) { + return rawMemoryToString( &object, sizeof(object) ); + } } // end namespace Detail -template -struct StringMaker : Detail::StringMakerBase::value> -{ -}; +template +struct StringMaker : + Detail::StringMakerBase::value> {}; -template -struct StringMaker -{ - template - static std::string convert(U* p) - { - if (!p) +template +struct StringMaker { + template + static std::string convert( U* p ) { + if( !p ) return "NULL"; else - return Detail::rawMemoryToString(p); + return Detail::rawMemoryToString( p ); } }; -template -struct StringMaker -{ - static std::string convert(R C::*p) - { - if (!p) +template +struct StringMaker { + static std::string convert( R C::* p ) { + if( !p ) return "NULL"; else - return Detail::rawMemoryToString(p); + return Detail::rawMemoryToString( p ); } }; namespace Detail { -template -std::string rangeToString(InputIterator first, InputIterator last); + template + std::string rangeToString( InputIterator first, InputIterator last ); } //template @@ -1910,48 +1697,47 @@ std::string rangeToString(InputIterator first, InputIterator last); // } //}; -template -std::string toString(std::vector const& v) -{ - return Detail::rangeToString(v.begin(), v.end()); +template +std::string toString( std::vector const& v ) { + return Detail::rangeToString( v.begin(), v.end() ); } #ifdef CATCH_CONFIG_CPP11_TUPLE // toString for tuples namespace TupleDetail { -template < - typename Tuple, - std::size_t N = 0, - bool = (N < std::tuple_size::value)> -struct ElementPrinter -{ - static void print(const Tuple& tuple, std::ostream& os) - { - os << (N ? ", " : " ") - << Catch::toString(std::get(tuple)); - ElementPrinter::print(tuple, os); - } -}; - -template < - typename Tuple, - std::size_t N> -struct ElementPrinter -{ - static void print(const Tuple&, std::ostream&) {} -}; -} - -template -struct StringMaker> -{ - - static std::string convert(const std::tuple& tuple) + template< + typename Tuple, + std::size_t N = 0, + bool = (N < std::tuple_size::value) + > + struct ElementPrinter { + static void print( const Tuple& tuple, std::ostream& os ) + { + os << ( N ? ", " : " " ) + << Catch::toString(std::get(tuple)); + ElementPrinter::print(tuple,os); + } + }; + + template< + typename Tuple, + std::size_t N + > + struct ElementPrinter { + static void print( const Tuple&, std::ostream& ) {} + }; + +} + +template +struct StringMaker> { + + static std::string convert( const std::tuple& tuple ) { std::ostringstream os; os << '{'; - TupleDetail::ElementPrinter>::print(tuple, os); + TupleDetail::ElementPrinter>::print( tuple, os ); os << " }"; return os.str(); } @@ -1959,11 +1745,10 @@ struct StringMaker> #endif // CATCH_CONFIG_CPP11_TUPLE namespace Detail { -template -std::string makeString(T const& value) -{ - return StringMaker::convert(value); -} + template + std::string makeString( T const& value ) { + return StringMaker::convert( value ); + } } // end namespace Detail /// \brief converts any type to a string @@ -1973,150 +1758,206 @@ std::string makeString(T const& value) /// that and writes {?}. /// Overload (not specialise) this template for custom typs that you don't want /// to provide an ostream overload for. -template -std::string toString(T const& value) -{ - return StringMaker::convert(value); +template +std::string toString( T const& value ) { + return StringMaker::convert( value ); } -namespace Detail { -template -std::string rangeToString(InputIterator first, InputIterator last) -{ - std::ostringstream oss; - oss << "{ "; - if (first != last) - { - oss << Catch::toString(*first); - for (++first; first != last; ++first) - oss << ", " << Catch::toString(*first); + namespace Detail { + template + std::string rangeToString( InputIterator first, InputIterator last ) { + std::ostringstream oss; + oss << "{ "; + if( first != last ) { + oss << Catch::toString( *first ); + for( ++first ; first != last ; ++first ) + oss << ", " << Catch::toString( *first ); + } + oss << " }"; + return oss.str(); } - oss << " }"; - return oss.str(); -} } } // end namespace Catch namespace Catch { -// Wraps the LHS of an expression and captures the operator and RHS (if any) - -// wrapping them all in a ResultBuilder object -template -class ExpressionLhs -{ - ExpressionLhs& operator=(ExpressionLhs const&); -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - ExpressionLhs& operator=(ExpressionLhs&&) = delete; -#endif +template +class BinaryExpression; - public: - ExpressionLhs(ResultBuilder& rb, T lhs) : m_rb(rb), m_lhs(lhs) {} -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - ExpressionLhs(ExpressionLhs const&) = default; - ExpressionLhs(ExpressionLhs&&) = default; -#endif +template +class MatchExpression; - template - ResultBuilder& operator==(RhsT const& rhs) - { - return captureExpression(rhs); +// Wraps the LHS of an expression and overloads comparison operators +// for also capturing those and RHS (if any) +template +class ExpressionLhs : public DecomposedExpression { +public: + ExpressionLhs( ResultBuilder& rb, T lhs ) : m_rb( rb ), m_lhs( lhs ), m_truthy(false) {} + + ExpressionLhs& operator = ( const ExpressionLhs& ); + + template + BinaryExpression + operator == ( RhsT const& rhs ) { + return captureExpression( rhs ); } - template - ResultBuilder& operator!=(RhsT const& rhs) - { - return captureExpression(rhs); + template + BinaryExpression + operator != ( RhsT const& rhs ) { + return captureExpression( rhs ); } - template - ResultBuilder& operator<(RhsT const& rhs) - { - return captureExpression(rhs); + template + BinaryExpression + operator < ( RhsT const& rhs ) { + return captureExpression( rhs ); } - template - ResultBuilder& operator>(RhsT const& rhs) - { - return captureExpression(rhs); + template + BinaryExpression + operator > ( RhsT const& rhs ) { + return captureExpression( rhs ); } - template - ResultBuilder& operator<=(RhsT const& rhs) - { - return captureExpression(rhs); + template + BinaryExpression + operator <= ( RhsT const& rhs ) { + return captureExpression( rhs ); } - template - ResultBuilder& operator>=(RhsT const& rhs) - { - return captureExpression(rhs); + template + BinaryExpression + operator >= ( RhsT const& rhs ) { + return captureExpression( rhs ); } - ResultBuilder& operator==(bool rhs) - { - return captureExpression(rhs); + BinaryExpression operator == ( bool rhs ) { + return captureExpression( rhs ); } - ResultBuilder& operator!=(bool rhs) - { - return captureExpression(rhs); + BinaryExpression operator != ( bool rhs ) { + return captureExpression( rhs ); } - void endExpression() - { - bool value = m_lhs ? true : false; + void endExpression() { + m_truthy = m_lhs ? true : false; m_rb - .setLhs(Catch::toString(value)) - .setResultType(value) - .endExpression(); - } - - // Only simple binary expressions are allowed on the LHS. - // If more complex compositions are required then place the sub expression in parentheses - template - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator+(RhsT const&); - template - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator-(RhsT const&); - template - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator/(RhsT const&); - template - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator*(RhsT const&); - template - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator&&(RhsT const&); - template - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator||(RhsT const&); - - private: - template - ResultBuilder& captureExpression(RhsT const& rhs) - { - return m_rb - .setResultType(Internal::compare(m_lhs, rhs)) - .setLhs(Catch::toString(m_lhs)) - .setRhs(Catch::toString(rhs)) - .setOp(Internal::OperatorTraits::getName()); + .setResultType( m_truthy ) + .endExpression( *this ); + } + + virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE { + dest = Catch::toString( m_truthy ); + } + +private: + template + BinaryExpression captureExpression( RhsT& rhs ) const { + return BinaryExpression( m_rb, m_lhs, rhs ); } - private: + template + BinaryExpression captureExpression( bool rhs ) const { + return BinaryExpression( m_rb, m_lhs, rhs ); + } + +private: ResultBuilder& m_rb; T m_lhs; + bool m_truthy; +}; + +template +class BinaryExpression : public DecomposedExpression { +public: + BinaryExpression( ResultBuilder& rb, LhsT lhs, RhsT rhs ) + : m_rb( rb ), m_lhs( lhs ), m_rhs( rhs ) {} + + BinaryExpression& operator = ( BinaryExpression& ); + + void endExpression() const { + m_rb + .setResultType( Internal::compare( m_lhs, m_rhs ) ) + .endExpression( *this ); + } + + virtual bool isBinaryExpression() const CATCH_OVERRIDE { + return true; + } + + virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE { + std::string lhs = Catch::toString( m_lhs ); + std::string rhs = Catch::toString( m_rhs ); + char delim = lhs.size() + rhs.size() < 40 && + lhs.find('\n') == std::string::npos && + rhs.find('\n') == std::string::npos ? ' ' : '\n'; + dest.reserve( 7 + lhs.size() + rhs.size() ); + // 2 for spaces around operator + // 2 for operator + // 2 for parentheses (conditionally added later) + // 1 for negation (conditionally added later) + dest = lhs; + dest += delim; + dest += Internal::OperatorTraits::getName(); + dest += delim; + dest += rhs; + } + +private: + ResultBuilder& m_rb; + LhsT m_lhs; + RhsT m_rhs; +}; + +template +class MatchExpression : public DecomposedExpression { +public: + MatchExpression( ArgT arg, MatcherT matcher, char const* matcherString ) + : m_arg( arg ), m_matcher( matcher ), m_matcherString( matcherString ) {} + + virtual bool isBinaryExpression() const CATCH_OVERRIDE { + return true; + } + + virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE { + std::string matcherAsString = m_matcher.toString(); + dest = Catch::toString( m_arg ); + dest += ' '; + if( matcherAsString == Detail::unprintableString ) + dest += m_matcherString; + else + dest += matcherAsString; + } + +private: + ArgT m_arg; + MatcherT m_matcher; + char const* m_matcherString; }; } // end namespace Catch + namespace Catch { -template -inline ExpressionLhs ResultBuilder::operator<=(T const& operand) -{ - return ExpressionLhs(*this, operand); -} + template + inline ExpressionLhs ResultBuilder::operator <= ( T const& operand ) { + return ExpressionLhs( *this, operand ); + } -inline ExpressionLhs ResultBuilder::operator<=(bool value) -{ - return ExpressionLhs(*this, value); -} + inline ExpressionLhs ResultBuilder::operator <= ( bool value ) { + return ExpressionLhs( *this, value ); + } + + template + inline void ResultBuilder::captureMatch( ArgT const& arg, MatcherT const& matcher, + char const* matcherString ) { + MatchExpression expr( arg, matcher, matcherString ); + setResultType( matcher.match( arg ) ); + endExpression( expr ); + } } // namespace Catch @@ -2127,60 +1968,52 @@ inline ExpressionLhs ResultBuilder::operator<=(bool value) namespace Catch { -struct MessageInfo -{ - MessageInfo(std::string const& _macroName, - SourceLineInfo const& _lineInfo, - ResultWas::OfType _type); + struct MessageInfo { + MessageInfo( std::string const& _macroName, + SourceLineInfo const& _lineInfo, + ResultWas::OfType _type ); - std::string macroName; - SourceLineInfo lineInfo; - ResultWas::OfType type; - std::string message; - unsigned int sequence; - - bool operator==(MessageInfo const& other) const - { - return sequence == other.sequence; - } - bool operator<(MessageInfo const& other) const - { - return sequence < other.sequence; - } + std::string macroName; + SourceLineInfo lineInfo; + ResultWas::OfType type; + std::string message; + unsigned int sequence; - private: - static unsigned int globalCount; -}; + bool operator == ( MessageInfo const& other ) const { + return sequence == other.sequence; + } + bool operator < ( MessageInfo const& other ) const { + return sequence < other.sequence; + } + private: + static unsigned int globalCount; + }; -struct MessageBuilder -{ - MessageBuilder(std::string const& macroName, - SourceLineInfo const& lineInfo, - ResultWas::OfType type) - : m_info(macroName, lineInfo, type) - { - } + struct MessageBuilder { + MessageBuilder( std::string const& macroName, + SourceLineInfo const& lineInfo, + ResultWas::OfType type ) + : m_info( macroName, lineInfo, type ) + {} - template - MessageBuilder& operator<<(T const& value) - { - m_stream << value; - return *this; - } + template + MessageBuilder& operator << ( T const& value ) { + m_stream << value; + return *this; + } - MessageInfo m_info; - std::ostringstream m_stream; -}; + MessageInfo m_info; + std::ostringstream m_stream; + }; -class ScopedMessage -{ - public: - ScopedMessage(MessageBuilder const& builder); - ScopedMessage(ScopedMessage const& other); - ~ScopedMessage(); + class ScopedMessage { + public: + ScopedMessage( MessageBuilder const& builder ); + ScopedMessage( ScopedMessage const& other ); + ~ScopedMessage(); - MessageInfo m_info; -}; + MessageInfo m_info; + }; } // end namespace Catch @@ -2191,35 +2024,36 @@ class ScopedMessage namespace Catch { -class TestCase; -class AssertionResult; -struct AssertionInfo; -struct SectionInfo; -struct SectionEndInfo; -struct MessageInfo; -class ScopedMessageBuilder; -struct Counts; + class TestCase; + class AssertionResult; + struct AssertionInfo; + struct SectionInfo; + struct SectionEndInfo; + struct MessageInfo; + class ScopedMessageBuilder; + struct Counts; -struct IResultCapture -{ + struct IResultCapture { - virtual ~IResultCapture(); + virtual ~IResultCapture(); - virtual void assertionEnded(AssertionResult const& result) = 0; - virtual bool sectionStarted(SectionInfo const& sectionInfo, - Counts& assertions) = 0; - virtual void sectionEnded(SectionEndInfo const& endInfo) = 0; - virtual void sectionEndedEarly(SectionEndInfo const& endInfo) = 0; - virtual void pushScopedMessage(MessageInfo const& message) = 0; - virtual void popScopedMessage(MessageInfo const& message) = 0; + virtual void assertionEnded( AssertionResult const& result ) = 0; + virtual bool sectionStarted( SectionInfo const& sectionInfo, + Counts& assertions ) = 0; + virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0; + virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0; + virtual void pushScopedMessage( MessageInfo const& message ) = 0; + virtual void popScopedMessage( MessageInfo const& message ) = 0; - virtual std::string getCurrentTestName() const = 0; - virtual const AssertionResult* getLastResult() const = 0; + virtual std::string getCurrentTestName() const = 0; + virtual const AssertionResult* getLastResult() const = 0; - virtual void handleFatalErrorCondition(std::string const& message) = 0; -}; + virtual void exceptionEarlyReported() = 0; + + virtual void handleFatalErrorCondition( std::string const& message ) = 0; + }; -IResultCapture& getResultCapture(); + IResultCapture& getResultCapture(); } // #included from: catch_debugger.h @@ -2229,220 +2063,233 @@ IResultCapture& getResultCapture(); #define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) -#define CATCH_PLATFORM_MAC -#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) -#define CATCH_PLATFORM_IPHONE +# define CATCH_PLATFORM_MAC +#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) +# define CATCH_PLATFORM_IPHONE +#elif defined(linux) || defined(__linux) || defined(__linux__) +# define CATCH_PLATFORM_LINUX #elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) -#define CATCH_PLATFORM_WINDOWS +# define CATCH_PLATFORM_WINDOWS +# if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) +# define CATCH_DEFINES_NOMINMAX +# endif +# if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN) +# define CATCH_DEFINES_WIN32_LEAN_AND_MEAN +# endif #endif #include -namespace Catch { - -bool isDebuggerActive(); -void writeToDebugConsole(std::string const& text); -} +namespace Catch{ -#ifdef CATCH_PLATFORM_MAC - -// The following code snippet based on: -// http://cocoawithlove.com/2008/03/break-into-debugger.html -#ifdef DEBUG -#if defined(__ppc64__) || defined(__ppc__) -#define CATCH_BREAK_INTO_DEBUGGER() \ - if (Catch::isDebuggerActive()) \ - { \ - __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \ - : \ - : \ - : "memory", "r0", "r3", "r4"); \ - } -#else -#define CATCH_BREAK_INTO_DEBUGGER() \ - if (Catch::isDebuggerActive()) \ - { \ - __asm__("int $3\n" \ - : \ - :); \ - } -#endif -#endif + bool isDebuggerActive(); + void writeToDebugConsole( std::string const& text ); +} + +#ifdef CATCH_PLATFORM_MAC + // The following code snippet based on: + // http://cocoawithlove.com/2008/03/break-into-debugger.html + #if defined(__ppc64__) || defined(__ppc__) + #define CATCH_TRAP() \ + __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \ + : : : "memory","r0","r3","r4" ) + #else + #define CATCH_TRAP() __asm__("int $3\n" : : ) + #endif + +#elif defined(CATCH_PLATFORM_LINUX) + // If we can use inline assembler, do it because this allows us to break + // directly at the location of the failing check instead of breaking inside + // raise() called from it, i.e. one stack frame below. + #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64)) + #define CATCH_TRAP() asm volatile ("int $3") + #else // Fall back to the generic way. + #include + + #define CATCH_TRAP() raise(SIGTRAP) + #endif #elif defined(_MSC_VER) -#define CATCH_BREAK_INTO_DEBUGGER() \ - if (Catch::isDebuggerActive()) \ - { \ - __debugbreak(); \ - } + #define CATCH_TRAP() __debugbreak() #elif defined(__MINGW32__) -extern "C" __declspec(dllimport) void __stdcall DebugBreak(); -#define CATCH_BREAK_INTO_DEBUGGER() \ - if (Catch::isDebuggerActive()) \ - { \ - DebugBreak(); \ - } + extern "C" __declspec(dllimport) void __stdcall DebugBreak(); + #define CATCH_TRAP() DebugBreak() #endif -#ifndef CATCH_BREAK_INTO_DEBUGGER -#define CATCH_BREAK_INTO_DEBUGGER() Catch::alwaysTrue(); +#ifdef CATCH_TRAP + #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } +#else + #define CATCH_BREAK_INTO_DEBUGGER() Catch::alwaysTrue(); #endif // #included from: catch_interfaces_runner.h #define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED namespace Catch { -class TestCase; + class TestCase; -struct IRunner -{ - virtual ~IRunner(); - virtual bool aborting() const = 0; -}; + struct IRunner { + virtual ~IRunner(); + virtual bool aborting() const = 0; + }; } +#if defined(CATCH_CONFIG_FAST_COMPILE) +/////////////////////////////////////////////////////////////////////////////// +// We can speedup compilation significantly by breaking into debugger lower in +// the callstack, because then we don't have to expand CATCH_BREAK_INTO_DEBUGGER +// macro in each assertion +#define INTERNAL_CATCH_REACT( resultBuilder ) \ + resultBuilder.react(); + +/////////////////////////////////////////////////////////////////////////////// +// Another way to speed-up compilation is to omit local try-catch for REQUIRE* +// macros. +// This can potentially cause false negative, if the test code catches +// the exception before it propagates back up to the runner. +#define INTERNAL_CATCH_TEST_NO_TRY( macroName, resultDisposition, expr ) \ + do { \ + Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \ + __catchResult.setExceptionGuard(); \ + CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ + ( __catchResult <= expr ).endExpression(); \ + CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ + __catchResult.unsetExceptionGuard(); \ + INTERNAL_CATCH_REACT( __catchResult ) \ + } while( Catch::isTrue( false && static_cast( !!(expr) ) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look +// The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&. + +#define INTERNAL_CHECK_THAT_NO_TRY( macroName, matcher, resultDisposition, arg ) \ + do { \ + Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition ); \ + __catchResult.setExceptionGuard(); \ + __catchResult.captureMatch( arg, matcher, #matcher ); \ + __catchResult.unsetExceptionGuard(); \ + INTERNAL_CATCH_REACT( __catchResult ) \ + } while( Catch::alwaysFalse() ) + +#else /////////////////////////////////////////////////////////////////////////////// // In the event of a failure works out if the debugger needs to be invoked // and/or an exception thrown and takes appropriate action. // This needs to be done as a macro so the debugger will stop in the user // source code rather than in Catch library code -#define INTERNAL_CATCH_REACT(resultBuilder) \ - if (resultBuilder.shouldDebugBreak()) CATCH_BREAK_INTO_DEBUGGER(); \ +#define INTERNAL_CATCH_REACT( resultBuilder ) \ + if( resultBuilder.shouldDebugBreak() ) CATCH_BREAK_INTO_DEBUGGER(); \ resultBuilder.react(); +#endif /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TEST(expr, resultDisposition, macroName) \ - do \ - { \ - Catch::ResultBuilder __catchResult(macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition); \ - try \ - { \ - (__catchResult <= expr).endExpression(); \ - } \ - catch (...) \ - { \ - __catchResult.useActiveException(Catch::ResultDisposition::Normal); \ - } \ - INTERNAL_CATCH_REACT(__catchResult) \ - } while (Catch::isTrue(false && (expr))) // expr here is never evaluated at runtime but it forces the compiler to give it a look +#define INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ) \ + do { \ + Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \ + try { \ + CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ + ( __catchResult <= expr ).endExpression(); \ + CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ + } \ + catch( ... ) { \ + __catchResult.useActiveException( resultDisposition ); \ + } \ + INTERNAL_CATCH_REACT( __catchResult ) \ + } while( Catch::isTrue( false && static_cast( !!(expr) ) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look + // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&. /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_IF(expr, resultDisposition, macroName) \ - INTERNAL_CATCH_TEST(expr, resultDisposition, macroName); \ - if (Catch::getResultCapture().getLastResult()->succeeded()) +#define INTERNAL_CATCH_IF( macroName, resultDisposition, expr ) \ + INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ); \ + if( Catch::getResultCapture().getLastResult()->succeeded() ) /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_ELSE(expr, resultDisposition, macroName) \ - INTERNAL_CATCH_TEST(expr, resultDisposition, macroName); \ - if (!Catch::getResultCapture().getLastResult()->succeeded()) +#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, expr ) \ + INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ); \ + if( !Catch::getResultCapture().getLastResult()->succeeded() ) /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_NO_THROW(expr, resultDisposition, macroName) \ - do \ - { \ - Catch::ResultBuilder __catchResult(macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition); \ - try \ - { \ - expr; \ - __catchResult.captureResult(Catch::ResultWas::Ok); \ - } \ - catch (...) \ - { \ - __catchResult.useActiveException(resultDisposition); \ - } \ - INTERNAL_CATCH_REACT(__catchResult) \ - } while (Catch::alwaysFalse()) +#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, expr ) \ + do { \ + Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \ + try { \ + static_cast(expr); \ + __catchResult.captureResult( Catch::ResultWas::Ok ); \ + } \ + catch( ... ) { \ + __catchResult.useActiveException( resultDisposition ); \ + } \ + INTERNAL_CATCH_REACT( __catchResult ) \ + } while( Catch::alwaysFalse() ) /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_THROWS(expr, resultDisposition, matcher, macroName) \ - do \ - { \ - Catch::ResultBuilder __catchResult(macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition, #matcher); \ - if (__catchResult.allowThrows()) \ - try \ - { \ - expr; \ - __catchResult.captureResult(Catch::ResultWas::DidntThrowException); \ - } \ - catch (...) \ - { \ - __catchResult.captureExpectedException(matcher); \ - } \ - else \ - __catchResult.captureResult(Catch::ResultWas::Ok); \ - INTERNAL_CATCH_REACT(__catchResult) \ - } while (Catch::alwaysFalse()) +#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, matcher, expr ) \ + do { \ + Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition, #matcher ); \ + if( __catchResult.allowThrows() ) \ + try { \ + static_cast(expr); \ + __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \ + } \ + catch( ... ) { \ + __catchResult.captureExpectedException( matcher ); \ + } \ + else \ + __catchResult.captureResult( Catch::ResultWas::Ok ); \ + INTERNAL_CATCH_REACT( __catchResult ) \ + } while( Catch::alwaysFalse() ) /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_THROWS_AS(expr, exceptionType, resultDisposition, macroName) \ - do \ - { \ - Catch::ResultBuilder __catchResult(macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition); \ - if (__catchResult.allowThrows()) \ - try \ - { \ - expr; \ - __catchResult.captureResult(Catch::ResultWas::DidntThrowException); \ - } \ - catch (exceptionType) \ - { \ - __catchResult.captureResult(Catch::ResultWas::Ok); \ - } \ - catch (...) \ - { \ - __catchResult.useActiveException(resultDisposition); \ - } \ - else \ - __catchResult.captureResult(Catch::ResultWas::Ok); \ - INTERNAL_CATCH_REACT(__catchResult) \ - } while (Catch::alwaysFalse()) +#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \ + do { \ + Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr ", " #exceptionType, resultDisposition ); \ + if( __catchResult.allowThrows() ) \ + try { \ + static_cast(expr); \ + __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \ + } \ + catch( exceptionType ) { \ + __catchResult.captureResult( Catch::ResultWas::Ok ); \ + } \ + catch( ... ) { \ + __catchResult.useActiveException( resultDisposition ); \ + } \ + else \ + __catchResult.captureResult( Catch::ResultWas::Ok ); \ + INTERNAL_CATCH_REACT( __catchResult ) \ + } while( Catch::alwaysFalse() ) /////////////////////////////////////////////////////////////////////////////// #ifdef CATCH_CONFIG_VARIADIC_MACROS -#define INTERNAL_CATCH_MSG(messageType, resultDisposition, macroName, ...) \ - do \ - { \ - Catch::ResultBuilder __catchResult(macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition); \ - __catchResult << __VA_ARGS__ + ::Catch::StreamEndStop(); \ - __catchResult.captureResult(messageType); \ - INTERNAL_CATCH_REACT(__catchResult) \ - } while (Catch::alwaysFalse()) + #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \ + do { \ + Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \ + __catchResult << __VA_ARGS__ + ::Catch::StreamEndStop(); \ + __catchResult.captureResult( messageType ); \ + INTERNAL_CATCH_REACT( __catchResult ) \ + } while( Catch::alwaysFalse() ) #else -#define INTERNAL_CATCH_MSG(messageType, resultDisposition, macroName, log) \ - do \ - { \ - Catch::ResultBuilder __catchResult(macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition); \ - __catchResult << log + ::Catch::StreamEndStop(); \ - __catchResult.captureResult(messageType); \ - INTERNAL_CATCH_REACT(__catchResult) \ - } while (Catch::alwaysFalse()) + #define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, log ) \ + do { \ + Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \ + __catchResult << log + ::Catch::StreamEndStop(); \ + __catchResult.captureResult( messageType ); \ + INTERNAL_CATCH_REACT( __catchResult ) \ + } while( Catch::alwaysFalse() ) #endif /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_INFO(log, macroName) \ - Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME(scopedMessage) = Catch::MessageBuilder(macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info) << log; +#define INTERNAL_CATCH_INFO( macroName, log ) \ + Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) = Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log; /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CHECK_THAT(arg, matcher, resultDisposition, macroName) \ - do \ - { \ - Catch::ResultBuilder __catchResult(macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition); \ - try \ - { \ - std::string matcherAsString = (matcher).toString(); \ - __catchResult \ - .setLhs(Catch::toString(arg)) \ - .setRhs(matcherAsString == Catch::Detail::unprintableString ? #matcher : matcherAsString) \ - .setOp("matches") \ - .setResultType((matcher).match(arg)); \ - __catchResult.captureExpression(); \ - } \ - catch (...) \ - { \ - __catchResult.useActiveException(resultDisposition | Catch::ResultDisposition::ContinueOnFailure); \ - } \ - INTERNAL_CATCH_REACT(__catchResult) \ - } while (Catch::alwaysFalse()) +#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \ + do { \ + Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition ); \ + try { \ + __catchResult.captureMatch( arg, matcher, #matcher ); \ + } catch( ... ) { \ + __catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \ + } \ + INTERNAL_CATCH_REACT( __catchResult ) \ + } while( Catch::alwaysFalse() ) // #included from: internal/catch_section.h #define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED @@ -2457,103 +2304,93 @@ struct IRunner namespace Catch { -struct Counts -{ - Counts() : passed(0), failed(0), failedButOk(0) {} + struct Counts { + Counts() : passed( 0 ), failed( 0 ), failedButOk( 0 ) {} - Counts operator-(Counts const& other) const - { - Counts diff; - diff.passed = passed - other.passed; - diff.failed = failed - other.failed; - diff.failedButOk = failedButOk - other.failedButOk; - return diff; - } - Counts& operator+=(Counts const& other) - { - passed += other.passed; - failed += other.failed; - failedButOk += other.failedButOk; - return *this; - } + Counts operator - ( Counts const& other ) const { + Counts diff; + diff.passed = passed - other.passed; + diff.failed = failed - other.failed; + diff.failedButOk = failedButOk - other.failedButOk; + return diff; + } + Counts& operator += ( Counts const& other ) { + passed += other.passed; + failed += other.failed; + failedButOk += other.failedButOk; + return *this; + } - std::size_t total() const - { - return passed + failed + failedButOk; - } - bool allPassed() const - { - return failed == 0 && failedButOk == 0; - } - bool allOk() const - { - return failed == 0; - } + std::size_t total() const { + return passed + failed + failedButOk; + } + bool allPassed() const { + return failed == 0 && failedButOk == 0; + } + bool allOk() const { + return failed == 0; + } - std::size_t passed; - std::size_t failed; - std::size_t failedButOk; -}; + std::size_t passed; + std::size_t failed; + std::size_t failedButOk; + }; -struct Totals -{ + struct Totals { - Totals operator-(Totals const& other) const - { - Totals diff; - diff.assertions = assertions - other.assertions; - diff.testCases = testCases - other.testCases; - return diff; - } + Totals operator - ( Totals const& other ) const { + Totals diff; + diff.assertions = assertions - other.assertions; + diff.testCases = testCases - other.testCases; + return diff; + } - Totals delta(Totals const& prevTotals) const - { - Totals diff = *this - prevTotals; - if (diff.assertions.failed > 0) - ++diff.testCases.failed; - else if (diff.assertions.failedButOk > 0) - ++diff.testCases.failedButOk; - else - ++diff.testCases.passed; - return diff; - } + Totals delta( Totals const& prevTotals ) const { + Totals diff = *this - prevTotals; + if( diff.assertions.failed > 0 ) + ++diff.testCases.failed; + else if( diff.assertions.failedButOk > 0 ) + ++diff.testCases.failedButOk; + else + ++diff.testCases.passed; + return diff; + } - Totals& operator+=(Totals const& other) - { - assertions += other.assertions; - testCases += other.testCases; - return *this; - } + Totals& operator += ( Totals const& other ) { + assertions += other.assertions; + testCases += other.testCases; + return *this; + } - Counts assertions; - Counts testCases; -}; + Counts assertions; + Counts testCases; + }; } +#include + namespace Catch { -struct SectionInfo -{ - SectionInfo(SourceLineInfo const& _lineInfo, + struct SectionInfo { + SectionInfo + ( SourceLineInfo const& _lineInfo, std::string const& _name, - std::string const& _description = std::string()); + std::string const& _description = std::string() ); - std::string name; - std::string description; - SourceLineInfo lineInfo; -}; + std::string name; + std::string description; + SourceLineInfo lineInfo; + }; -struct SectionEndInfo -{ - SectionEndInfo(SectionInfo const& _sectionInfo, Counts const& _prevAssertions, double _durationInSeconds) - : sectionInfo(_sectionInfo), prevAssertions(_prevAssertions), durationInSeconds(_durationInSeconds) - { - } + struct SectionEndInfo { + SectionEndInfo( SectionInfo const& _sectionInfo, Counts const& _prevAssertions, double _durationInSeconds ) + : sectionInfo( _sectionInfo ), prevAssertions( _prevAssertions ), durationInSeconds( _durationInSeconds ) + {} - SectionInfo sectionInfo; - Counts prevAssertions; - double durationInSeconds; -}; + SectionInfo sectionInfo; + Counts prevAssertions; + double durationInSeconds; + }; } // end namespace Catch @@ -2568,18 +2405,17 @@ typedef unsigned long long uint64_t; namespace Catch { -class Timer -{ - public: - Timer() : m_ticks(0) {} - void start(); - unsigned int getElapsedMicroseconds() const; - unsigned int getElapsedMilliseconds() const; - double getElapsedSeconds() const; - - private: - uint64_t m_ticks; -}; + class Timer { + public: + Timer() : m_ticks( 0 ) {} + void start(); + unsigned int getElapsedMicroseconds() const; + unsigned int getElapsedMilliseconds() const; + double getElapsedSeconds() const; + + private: + uint64_t m_ticks; + }; } // namespace Catch @@ -2587,166 +2423,150 @@ class Timer namespace Catch { -class Section : NonCopyable -{ - public: - Section(SectionInfo const& info); - ~Section(); + class Section : NonCopyable { + public: + Section( SectionInfo const& info ); + ~Section(); - // This indicates whether the section should be executed or not - operator bool() const; + // This indicates whether the section should be executed or not + operator bool() const; - private: - SectionInfo m_info; + private: + SectionInfo m_info; - std::string m_name; - Counts m_assertions; - bool m_sectionIncluded; - Timer m_timer; -}; + std::string m_name; + Counts m_assertions; + bool m_sectionIncluded; + Timer m_timer; + }; } // end namespace Catch #ifdef CATCH_CONFIG_VARIADIC_MACROS -#define INTERNAL_CATCH_SECTION(...) \ - if (Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME(catch_internal_Section) = Catch::SectionInfo(CATCH_INTERNAL_LINEINFO, __VA_ARGS__)) + #define INTERNAL_CATCH_SECTION( ... ) \ + if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) #else -#define INTERNAL_CATCH_SECTION(name, desc) \ - if (Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME(catch_internal_Section) = Catch::SectionInfo(CATCH_INTERNAL_LINEINFO, name, desc)) + #define INTERNAL_CATCH_SECTION( name, desc ) \ + if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, name, desc ) ) #endif // #included from: internal/catch_generators.hpp #define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED -#include -#include -#include #include +#include +#include namespace Catch { -template -struct IGenerator -{ +template +struct IGenerator { virtual ~IGenerator() {} - virtual T getValue(std::size_t index) const = 0; - virtual std::size_t size() const = 0; + virtual T getValue( std::size_t index ) const = 0; + virtual std::size_t size () const = 0; }; -template -class BetweenGenerator : public IGenerator -{ - public: - BetweenGenerator(T from, T to) : m_from(from), m_to(to) {} +template +class BetweenGenerator : public IGenerator { +public: + BetweenGenerator( T from, T to ) : m_from( from ), m_to( to ){} - virtual T getValue(std::size_t index) const - { - return m_from + static_cast(index); + virtual T getValue( std::size_t index ) const { + return m_from+static_cast( index ); } - virtual std::size_t size() const - { - return static_cast(1 + m_to - m_from); + virtual std::size_t size() const { + return static_cast( 1+m_to-m_from ); } - private: +private: + T m_from; T m_to; }; -template -class ValuesGenerator : public IGenerator -{ - public: - ValuesGenerator() {} +template +class ValuesGenerator : public IGenerator { +public: + ValuesGenerator(){} - void add(T value) - { - m_values.push_back(value); + void add( T value ) { + m_values.push_back( value ); } - virtual T getValue(std::size_t index) const - { + virtual T getValue( std::size_t index ) const { return m_values[index]; } - virtual std::size_t size() const - { + virtual std::size_t size() const { return m_values.size(); } - private: +private: std::vector m_values; }; -template -class CompositeGenerator -{ - public: - CompositeGenerator() : m_totalSize(0) {} +template +class CompositeGenerator { +public: + CompositeGenerator() : m_totalSize( 0 ) {} // *** Move semantics, similar to auto_ptr *** - CompositeGenerator(CompositeGenerator& other) - : m_fileInfo(other.m_fileInfo), - m_totalSize(0) + CompositeGenerator( CompositeGenerator& other ) + : m_fileInfo( other.m_fileInfo ), + m_totalSize( 0 ) { - move(other); + move( other ); } - CompositeGenerator& setFileInfo(const char* fileInfo) - { + CompositeGenerator& setFileInfo( const char* fileInfo ) { m_fileInfo = fileInfo; return *this; } - ~CompositeGenerator() - { - deleteAll(m_composed); + ~CompositeGenerator() { + deleteAll( m_composed ); } - operator T() const - { - size_t overallIndex = getCurrentContext().getGeneratorIndex(m_fileInfo, m_totalSize); + operator T () const { + size_t overallIndex = getCurrentContext().getGeneratorIndex( m_fileInfo, m_totalSize ); typename std::vector*>::const_iterator it = m_composed.begin(); typename std::vector*>::const_iterator itEnd = m_composed.end(); - for (size_t index = 0; it != itEnd; ++it) + for( size_t index = 0; it != itEnd; ++it ) { const IGenerator* generator = *it; - if (overallIndex >= index && overallIndex < index + generator->size()) + if( overallIndex >= index && overallIndex < index + generator->size() ) { - return generator->getValue(overallIndex - index); + return generator->getValue( overallIndex-index ); } index += generator->size(); } - CATCH_INTERNAL_ERROR("Indexed past end of generated range"); + CATCH_INTERNAL_ERROR( "Indexed past end of generated range" ); return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so } - void add(const IGenerator* generator) - { + void add( const IGenerator* generator ) { m_totalSize += generator->size(); - m_composed.push_back(generator); + m_composed.push_back( generator ); } - CompositeGenerator& then(CompositeGenerator& other) - { - move(other); + CompositeGenerator& then( CompositeGenerator& other ) { + move( other ); return *this; } - CompositeGenerator& then(T value) - { + CompositeGenerator& then( T value ) { ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add(value); - add(valuesGen); + valuesGen->add( value ); + add( valuesGen ); return *this; } - private: - void move(CompositeGenerator& other) - { - std::copy(other.m_composed.begin(), other.m_composed.end(), std::back_inserter(m_composed)); +private: + + void move( CompositeGenerator& other ) { + m_composed.insert( m_composed.end(), other.m_composed.begin(), other.m_composed.end() ); m_totalSize += other.m_totalSize; other.m_composed.clear(); } @@ -2756,50 +2576,47 @@ class CompositeGenerator size_t m_totalSize; }; -namespace Generators { -template -CompositeGenerator between(T from, T to) +namespace Generators { - CompositeGenerator generators; - generators.add(new BetweenGenerator(from, to)); - return generators; -} + template + CompositeGenerator between( T from, T to ) { + CompositeGenerator generators; + generators.add( new BetweenGenerator( from, to ) ); + return generators; + } -template -CompositeGenerator values(T val1, T val2) -{ - CompositeGenerator generators; - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add(val1); - valuesGen->add(val2); - generators.add(valuesGen); - return generators; -} + template + CompositeGenerator values( T val1, T val2 ) { + CompositeGenerator generators; + ValuesGenerator* valuesGen = new ValuesGenerator(); + valuesGen->add( val1 ); + valuesGen->add( val2 ); + generators.add( valuesGen ); + return generators; + } -template -CompositeGenerator values(T val1, T val2, T val3) -{ - CompositeGenerator generators; - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add(val1); - valuesGen->add(val2); - valuesGen->add(val3); - generators.add(valuesGen); - return generators; -} + template + CompositeGenerator values( T val1, T val2, T val3 ){ + CompositeGenerator generators; + ValuesGenerator* valuesGen = new ValuesGenerator(); + valuesGen->add( val1 ); + valuesGen->add( val2 ); + valuesGen->add( val3 ); + generators.add( valuesGen ); + return generators; + } -template -CompositeGenerator values(T val1, T val2, T val3, T val4) -{ - CompositeGenerator generators; - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add(val1); - valuesGen->add(val2); - valuesGen->add(val3); - valuesGen->add(val4); - generators.add(valuesGen); - return generators; -} + template + CompositeGenerator values( T val1, T val2, T val3, T val4 ) { + CompositeGenerator generators; + ValuesGenerator* valuesGen = new ValuesGenerator(); + valuesGen->add( val1 ); + valuesGen->add( val2 ); + valuesGen->add( val3 ); + valuesGen->add( val4 ); + generators.add( valuesGen ); + return generators; + } } // end namespace Generators @@ -2807,10 +2624,10 @@ using namespace Generators; } // end namespace Catch -#define INTERNAL_CATCH_LINESTR2(line) #line -#define INTERNAL_CATCH_LINESTR(line) INTERNAL_CATCH_LINESTR2(line) +#define INTERNAL_CATCH_LINESTR2( line ) #line +#define INTERNAL_CATCH_LINESTR( line ) INTERNAL_CATCH_LINESTR2( line ) -#define INTERNAL_CATCH_GENERATE(expr) expr.setFileInfo(__FILE__ "(" INTERNAL_CATCH_LINESTR(__LINE__) ")") +#define INTERNAL_CATCH_GENERATE( expr ) expr.setFileInfo( __FILE__ "(" INTERNAL_CATCH_LINESTR( __LINE__ ) ")" ) // #included from: internal/catch_interfaces_exception.h #define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED @@ -2825,103 +2642,99 @@ using namespace Generators; namespace Catch { -class TestCase; -struct ITestCaseRegistry; -struct IExceptionTranslatorRegistry; -struct IExceptionTranslator; -struct IReporterRegistry; -struct IReporterFactory; + class TestCase; + struct ITestCaseRegistry; + struct IExceptionTranslatorRegistry; + struct IExceptionTranslator; + struct IReporterRegistry; + struct IReporterFactory; + struct ITagAliasRegistry; -struct IRegistryHub -{ - virtual ~IRegistryHub(); + struct IRegistryHub { + virtual ~IRegistryHub(); - virtual IReporterRegistry const& getReporterRegistry() const = 0; - virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0; - virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0; -}; + virtual IReporterRegistry const& getReporterRegistry() const = 0; + virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0; + virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0; -struct IMutableRegistryHub -{ - virtual ~IMutableRegistryHub(); - virtual void registerReporter(std::string const& name, Ptr const& factory) = 0; - virtual void registerListener(Ptr const& factory) = 0; - virtual void registerTest(TestCase const& testInfo) = 0; - virtual void registerTranslator(const IExceptionTranslator* translator) = 0; -}; + virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0; + }; + + struct IMutableRegistryHub { + virtual ~IMutableRegistryHub(); + virtual void registerReporter( std::string const& name, Ptr const& factory ) = 0; + virtual void registerListener( Ptr const& factory ) = 0; + virtual void registerTest( TestCase const& testInfo ) = 0; + virtual void registerTranslator( const IExceptionTranslator* translator ) = 0; + virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0; + }; + + IRegistryHub& getRegistryHub(); + IMutableRegistryHub& getMutableRegistryHub(); + void cleanUp(); + std::string translateActiveException(); -IRegistryHub& getRegistryHub(); -IMutableRegistryHub& getMutableRegistryHub(); -void cleanUp(); -std::string translateActiveException(); } namespace Catch { -typedef std::string (*exceptionTranslateFunction)(); + typedef std::string(*exceptionTranslateFunction)(); -struct IExceptionTranslator; -typedef std::vector ExceptionTranslators; + struct IExceptionTranslator; + typedef std::vector ExceptionTranslators; -struct IExceptionTranslator -{ - virtual ~IExceptionTranslator(); - virtual std::string translate(ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd) const = 0; -}; - -struct IExceptionTranslatorRegistry -{ - virtual ~IExceptionTranslatorRegistry(); + struct IExceptionTranslator { + virtual ~IExceptionTranslator(); + virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0; + }; - virtual std::string translateActiveException() const = 0; -}; + struct IExceptionTranslatorRegistry { + virtual ~IExceptionTranslatorRegistry(); -class ExceptionTranslatorRegistrar -{ - template - class ExceptionTranslator : public IExceptionTranslator - { - public: - ExceptionTranslator(std::string (*translateFunction)(T&)) - : m_translateFunction(translateFunction) - { - } + virtual std::string translateActiveException() const = 0; + }; - virtual std::string translate(ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd) const CATCH_OVERRIDE - { - try - { - if (it == itEnd) - throw; - else - return (*it)->translate(it + 1, itEnd); - } - catch (T& ex) - { - return m_translateFunction(ex); + class ExceptionTranslatorRegistrar { + template + class ExceptionTranslator : public IExceptionTranslator { + public: + + ExceptionTranslator( std::string(*translateFunction)( T& ) ) + : m_translateFunction( translateFunction ) + {} + + virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const CATCH_OVERRIDE { + try { + if( it == itEnd ) + throw; + else + return (*it)->translate( it+1, itEnd ); + } + catch( T& ex ) { + return m_translateFunction( ex ); + } } - } - protected: - std::string (*m_translateFunction)(T&); - }; + protected: + std::string(*m_translateFunction)( T& ); + }; - public: - template - ExceptionTranslatorRegistrar(std::string (*translateFunction)(T&)) - { - getMutableRegistryHub().registerTranslator(new ExceptionTranslator(translateFunction)); - } -}; + public: + template + ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) { + getMutableRegistryHub().registerTranslator + ( new ExceptionTranslator( translateFunction ) ); + } + }; } /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TRANSLATE_EXCEPTION(signature) \ - static std::string INTERNAL_CATCH_UNIQUE_NAME(catch_internal_ExceptionTranslator)(signature); \ - namespace { \ - Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME(catch_internal_ExceptionRegistrar)(&INTERNAL_CATCH_UNIQUE_NAME(catch_internal_ExceptionTranslator)); \ - } \ - static std::string INTERNAL_CATCH_UNIQUE_NAME(catch_internal_ExceptionTranslator)(signature) +#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \ + static std::string translatorName( signature ); \ + namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); }\ + static std::string translatorName( signature ) + +#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature ) // #included from: internal/catch_approx.hpp #define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED @@ -2929,93 +2742,313 @@ class ExceptionTranslatorRegistrar #include #include +#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) +#include +#endif + namespace Catch { namespace Detail { -class Approx -{ - public: - explicit Approx(double value) - : m_epsilon(std::numeric_limits::epsilon() * 100), - m_scale(1.0), - m_value(value) - { - } + class Approx { + public: + explicit Approx ( double value ) + : m_epsilon( std::numeric_limits::epsilon()*100 ), + m_margin( 0.0 ), + m_scale( 1.0 ), + m_value( value ) + {} + + Approx( Approx const& other ) + : m_epsilon( other.m_epsilon ), + m_margin( other.m_margin ), + m_scale( other.m_scale ), + m_value( other.m_value ) + {} + + static Approx custom() { + return Approx( 0 ); + } + + Approx operator()( double value ) { + Approx approx( value ); + approx.epsilon( m_epsilon ); + approx.margin( m_margin ); + approx.scale( m_scale ); + return approx; + } + +#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) + + template ::value>::type> + explicit Approx( T value ): Approx(static_cast(value)) + {} + + template ::value>::type> + friend bool operator == ( const T& lhs, Approx const& rhs ) { + // Thanks to Richard Harris for his help refining this formula + auto lhs_v = double(lhs); + bool relativeOK = std::fabs(lhs_v - rhs.m_value) < rhs.m_epsilon * (rhs.m_scale + (std::max)(std::fabs(lhs_v), std::fabs(rhs.m_value))); + if (relativeOK) { + return true; + } + return std::fabs(lhs_v - rhs.m_value) < rhs.m_margin; + } - Approx(Approx const& other) - : m_epsilon(other.m_epsilon), - m_scale(other.m_scale), - m_value(other.m_value) - { - } + template ::value>::type> + friend bool operator == ( Approx const& lhs, const T& rhs ) { + return operator==( rhs, lhs ); + } - static Approx custom() - { - return Approx(0); - } + template ::value>::type> + friend bool operator != ( T lhs, Approx const& rhs ) { + return !operator==( lhs, rhs ); + } - Approx operator()(double value) - { - Approx approx(value); - approx.epsilon(m_epsilon); - approx.scale(m_scale); - return approx; - } + template ::value>::type> + friend bool operator != ( Approx const& lhs, T rhs ) { + return !operator==( rhs, lhs ); + } + + template ::value>::type> + friend bool operator <= ( T lhs, Approx const& rhs ) { + return double(lhs) < rhs.m_value || lhs == rhs; + } + + template ::value>::type> + friend bool operator <= ( Approx const& lhs, T rhs ) { + return lhs.m_value < double(rhs) || lhs == rhs; + } + + template ::value>::type> + friend bool operator >= ( T lhs, Approx const& rhs ) { + return double(lhs) > rhs.m_value || lhs == rhs; + } + + template ::value>::type> + friend bool operator >= ( Approx const& lhs, T rhs ) { + return lhs.m_value > double(rhs) || lhs == rhs; + } +#else + friend bool operator == ( double lhs, Approx const& rhs ) { + // Thanks to Richard Harris for his help refining this formula + bool relativeOK = std::fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( std::fabs(lhs), std::fabs(rhs.m_value) ) ); + if (relativeOK) { + return true; + } + return std::fabs(lhs - rhs.m_value) < rhs.m_margin; + } + + friend bool operator == ( Approx const& lhs, double rhs ) { + return operator==( rhs, lhs ); + } + + friend bool operator != ( double lhs, Approx const& rhs ) { + return !operator==( lhs, rhs ); + } + + friend bool operator != ( Approx const& lhs, double rhs ) { + return !operator==( rhs, lhs ); + } + + friend bool operator <= ( double lhs, Approx const& rhs ) { + return lhs < rhs.m_value || lhs == rhs; + } + + friend bool operator <= ( Approx const& lhs, double rhs ) { + return lhs.m_value < rhs || lhs == rhs; + } + + friend bool operator >= ( double lhs, Approx const& rhs ) { + return lhs > rhs.m_value || lhs == rhs; + } + + friend bool operator >= ( Approx const& lhs, double rhs ) { + return lhs.m_value > rhs || lhs == rhs; + } +#endif + + Approx& epsilon( double newEpsilon ) { + m_epsilon = newEpsilon; + return *this; + } + + Approx& margin( double newMargin ) { + m_margin = newMargin; + return *this; + } + + Approx& scale( double newScale ) { + m_scale = newScale; + return *this; + } + + std::string toString() const { + std::ostringstream oss; + oss << "Approx( " << Catch::toString( m_value ) << " )"; + return oss.str(); + } + + private: + double m_epsilon; + double m_margin; + double m_scale; + double m_value; + }; +} + +template<> +inline std::string toString( Detail::Approx const& value ) { + return value.toString(); +} + +} // end namespace Catch + +// #included from: internal/catch_matchers_string.h +#define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED + +namespace Catch { +namespace Matchers { + + namespace StdString { + + struct CasedString + { + CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity ); + std::string adjustString( std::string const& str ) const; + std::string caseSensitivitySuffix() const; + + CaseSensitive::Choice m_caseSensitivity; + std::string m_str; + }; + + struct StringMatcherBase : MatcherBase { + StringMatcherBase( std::string const& operation, CasedString const& comparator ); + virtual std::string describe() const CATCH_OVERRIDE; + + CasedString m_comparator; + std::string m_operation; + }; + + struct EqualsMatcher : StringMatcherBase { + EqualsMatcher( CasedString const& comparator ); + virtual bool match( std::string const& source ) const CATCH_OVERRIDE; + }; + struct ContainsMatcher : StringMatcherBase { + ContainsMatcher( CasedString const& comparator ); + virtual bool match( std::string const& source ) const CATCH_OVERRIDE; + }; + struct StartsWithMatcher : StringMatcherBase { + StartsWithMatcher( CasedString const& comparator ); + virtual bool match( std::string const& source ) const CATCH_OVERRIDE; + }; + struct EndsWithMatcher : StringMatcherBase { + EndsWithMatcher( CasedString const& comparator ); + virtual bool match( std::string const& source ) const CATCH_OVERRIDE; + }; + + } // namespace StdString + + // The following functions create the actual matcher objects. + // This allows the types to be inferred + + StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); + StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); + StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); + StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); + +} // namespace Matchers +} // namespace Catch + +// #included from: internal/catch_matchers_vector.h +#define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED + +namespace Catch { +namespace Matchers { + + namespace Vector { + + template + struct ContainsElementMatcher : MatcherBase, T> { + + ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {} + + bool match(std::vector const &v) const CATCH_OVERRIDE { + return std::find(v.begin(), v.end(), m_comparator) != v.end(); + } + + virtual std::string describe() const CATCH_OVERRIDE { + return "Contains: " + Catch::toString( m_comparator ); + } + + T const& m_comparator; + }; + + template + struct ContainsMatcher : MatcherBase, std::vector > { + + ContainsMatcher(std::vector const &comparator) : m_comparator( comparator ) {} + + bool match(std::vector const &v) const CATCH_OVERRIDE { + // !TBD: see note in EqualsMatcher + if (m_comparator.size() > v.size()) + return false; + for (size_t i = 0; i < m_comparator.size(); ++i) + if (std::find(v.begin(), v.end(), m_comparator[i]) == v.end()) + return false; + return true; + } + virtual std::string describe() const CATCH_OVERRIDE { + return "Contains: " + Catch::toString( m_comparator ); + } + + std::vector const& m_comparator; + }; + + template + struct EqualsMatcher : MatcherBase, std::vector > { - friend bool operator==(double lhs, Approx const& rhs) - { - // Thanks to Richard Harris for his help refining this formula - return fabs(lhs - rhs.m_value) < rhs.m_epsilon * (rhs.m_scale + (std::max)(fabs(lhs), fabs(rhs.m_value))); - } + EqualsMatcher(std::vector const &comparator) : m_comparator( comparator ) {} - friend bool operator==(Approx const& lhs, double rhs) - { - return operator==(rhs, lhs); - } + bool match(std::vector const &v) const CATCH_OVERRIDE { + // !TBD: This currently works if all elements can be compared using != + // - a more general approach would be via a compare template that defaults + // to using !=. but could be specialised for, e.g. std::vector etc + // - then just call that directly + if (m_comparator.size() != v.size()) + return false; + for (size_t i = 0; i < v.size(); ++i) + if (m_comparator[i] != v[i]) + return false; + return true; + } + virtual std::string describe() const CATCH_OVERRIDE { + return "Equals: " + Catch::toString( m_comparator ); + } + std::vector const& m_comparator; + }; - friend bool operator!=(double lhs, Approx const& rhs) - { - return !operator==(lhs, rhs); - } + } // namespace Vector - friend bool operator!=(Approx const& lhs, double rhs) - { - return !operator==(rhs, lhs); - } + // The following functions create the actual matcher objects. + // This allows the types to be inferred - Approx& epsilon(double newEpsilon) - { - m_epsilon = newEpsilon; - return *this; + template + Vector::ContainsMatcher Contains( std::vector const& comparator ) { + return Vector::ContainsMatcher( comparator ); } - Approx& scale(double newScale) - { - m_scale = newScale; - return *this; + template + Vector::ContainsElementMatcher VectorContains( T const& comparator ) { + return Vector::ContainsElementMatcher( comparator ); } - std::string toString() const - { - std::ostringstream oss; - oss << "Approx( " << Catch::toString(m_value) << " )"; - return oss.str(); + template + Vector::EqualsMatcher Equals( std::vector const& comparator ) { + return Vector::EqualsMatcher( comparator ); } - private: - double m_epsilon; - double m_scale; - double m_value; -}; -} - -template <> -inline std::string toString(Detail::Approx const& value) -{ - return value.toString(); -} - -} // end namespace Catch +} // namespace Matchers +} // namespace Catch // #included from: internal/catch_interfaces_tag_alias_registry.h #define TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED @@ -3027,110 +3060,94 @@ inline std::string toString(Detail::Approx const& value) namespace Catch { -struct TagAlias -{ - TagAlias(std::string _tag, SourceLineInfo _lineInfo) : tag(_tag), lineInfo(_lineInfo) {} + struct TagAlias { + TagAlias( std::string const& _tag, SourceLineInfo _lineInfo ) : tag( _tag ), lineInfo( _lineInfo ) {} - std::string tag; - SourceLineInfo lineInfo; -}; + std::string tag; + SourceLineInfo lineInfo; + }; -struct RegistrarForTagAliases -{ - RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo); -}; + struct RegistrarForTagAliases { + RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); + }; } // end namespace Catch -#define CATCH_REGISTER_TAG_ALIAS(alias, spec) \ - namespace { \ - Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME(AutoRegisterTagAlias)(alias, spec, CATCH_INTERNAL_LINEINFO); \ - } +#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } // #included from: catch_option.hpp #define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED namespace Catch { -// An optional type -template -class Option -{ - public: - Option() : nullableValue(CATCH_NULL) {} - Option(T const& _value) - : nullableValue(new (storage) T(_value)) - { - } - Option(Option const& _other) - : nullableValue(_other ? new (storage) T(*_other) : CATCH_NULL) - { - } - - ~Option() - { - reset(); - } + // An optional type + template + class Option { + public: + Option() : nullableValue( CATCH_NULL ) {} + Option( T const& _value ) + : nullableValue( new( storage ) T( _value ) ) + {} + Option( Option const& _other ) + : nullableValue( _other ? new( storage ) T( *_other ) : CATCH_NULL ) + {} + + ~Option() { + reset(); + } - Option& operator=(Option const& _other) - { - if (&_other != this) - { + Option& operator= ( Option const& _other ) { + if( &_other != this ) { + reset(); + if( _other ) + nullableValue = new( storage ) T( *_other ); + } + return *this; + } + Option& operator = ( T const& _value ) { reset(); - if (_other) - nullableValue = new (storage) T(*_other); + nullableValue = new( storage ) T( _value ); + return *this; } - return *this; - } - Option& operator=(T const& _value) - { - reset(); - nullableValue = new (storage) T(_value); - return *this; - } - void reset() - { - if (nullableValue) - nullableValue->~T(); - nullableValue = CATCH_NULL; - } + void reset() { + if( nullableValue ) + nullableValue->~T(); + nullableValue = CATCH_NULL; + } - T& operator*() { return *nullableValue; } - T const& operator*() const { return *nullableValue; } - T* operator->() { return nullableValue; } - const T* operator->() const { return nullableValue; } + T& operator*() { return *nullableValue; } + T const& operator*() const { return *nullableValue; } + T* operator->() { return nullableValue; } + const T* operator->() const { return nullableValue; } - T valueOr(T const& defaultValue) const - { - return nullableValue ? *nullableValue : defaultValue; - } + T valueOr( T const& defaultValue ) const { + return nullableValue ? *nullableValue : defaultValue; + } - bool some() const { return nullableValue != CATCH_NULL; } - bool none() const { return nullableValue == CATCH_NULL; } + bool some() const { return nullableValue != CATCH_NULL; } + bool none() const { return nullableValue == CATCH_NULL; } - bool operator!() const { return nullableValue == CATCH_NULL; } - operator SafeBool::type() const - { - return SafeBool::makeSafe(some()); - } + bool operator !() const { return nullableValue == CATCH_NULL; } + operator SafeBool::type() const { + return SafeBool::makeSafe( some() ); + } - private: - T* nullableValue; - char storage[sizeof(T)]; -}; + private: + T* nullableValue; + char storage[sizeof(T)]; + }; } // end namespace Catch namespace Catch { -struct ITagAliasRegistry -{ - virtual ~ITagAliasRegistry(); - virtual Option find(std::string const& alias) const = 0; - virtual std::string expandAliases(std::string const& unexpandedTestSpec) const = 0; + struct ITagAliasRegistry { + virtual ~ITagAliasRegistry(); + virtual Option find( std::string const& alias ) const = 0; + virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0; - static ITagAliasRegistry const& get(); -}; + static ITagAliasRegistry const& get(); + }; } // end namespace Catch @@ -3139,8 +3156,8 @@ struct ITagAliasRegistry // #included from: internal/catch_test_case_info.h #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED -#include #include +#include #ifdef __clang__ #pragma clang diagnostic push @@ -3149,76 +3166,76 @@ struct ITagAliasRegistry namespace Catch { -struct ITestCase; + struct ITestCase; -struct TestCaseInfo -{ - enum SpecialProperties - { - None = 0, - IsHidden = 1 << 1, - ShouldFail = 1 << 2, - MayFail = 1 << 3, - Throws = 1 << 4 - }; - - TestCaseInfo(std::string const& _name, - std::string const& _className, - std::string const& _description, - std::set const& _tags, - SourceLineInfo const& _lineInfo); - - TestCaseInfo(TestCaseInfo const& other); - - friend void setTags(TestCaseInfo& testCaseInfo, std::set const& tags); - - bool isHidden() const; - bool throws() const; - bool okToFail() const; - bool expectedToFail() const; - - std::string name; - std::string className; - std::string description; - std::set tags; - std::set lcaseTags; - std::string tagsAsString; - SourceLineInfo lineInfo; - SpecialProperties properties; -}; + struct TestCaseInfo { + enum SpecialProperties{ + None = 0, + IsHidden = 1 << 1, + ShouldFail = 1 << 2, + MayFail = 1 << 3, + Throws = 1 << 4, + NonPortable = 1 << 5 + }; -class TestCase : public TestCaseInfo -{ - public: - TestCase(ITestCase* testCase, TestCaseInfo const& info); - TestCase(TestCase const& other); + TestCaseInfo( std::string const& _name, + std::string const& _className, + std::string const& _description, + std::set const& _tags, + SourceLineInfo const& _lineInfo ); + + TestCaseInfo( TestCaseInfo const& other ); + + friend void setTags( TestCaseInfo& testCaseInfo, std::set const& tags ); + + bool isHidden() const; + bool throws() const; + bool okToFail() const; + bool expectedToFail() const; + + std::string name; + std::string className; + std::string description; + std::set tags; + std::set lcaseTags; + std::string tagsAsString; + SourceLineInfo lineInfo; + SpecialProperties properties; + }; - TestCase withName(std::string const& _newName) const; + class TestCase : public TestCaseInfo { + public: - void invoke() const; + TestCase( ITestCase* testCase, TestCaseInfo const& info ); + TestCase( TestCase const& other ); - TestCaseInfo const& getTestCaseInfo() const; + TestCase withName( std::string const& _newName ) const; - void swap(TestCase& other); - bool operator==(TestCase const& other) const; - bool operator<(TestCase const& other) const; - TestCase& operator=(TestCase const& other); + void invoke() const; - private: - Ptr test; -}; + TestCaseInfo const& getTestCaseInfo() const; + + void swap( TestCase& other ); + bool operator == ( TestCase const& other ) const; + bool operator < ( TestCase const& other ) const; + TestCase& operator = ( TestCase const& other ); + + private: + Ptr test; + }; -TestCase makeTestCase(ITestCase* testCase, - std::string const& className, - std::string const& name, - std::string const& description, - SourceLineInfo const& lineInfo); + TestCase makeTestCase( ITestCase* testCase, + std::string const& className, + std::string const& name, + std::string const& description, + SourceLineInfo const& lineInfo ); } #ifdef __clang__ #pragma clang diagnostic pop #endif + #ifdef __OBJC__ // #included from: internal/catch_objc.hpp #define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED @@ -3238,204 +3255,208 @@ TestCase makeTestCase(ITestCase* testCase, @optional -- (void)setUp; -- (void)tearDown; +-(void) setUp; +-(void) tearDown; @end namespace Catch { -class OcMethod : public SharedImpl -{ - - public: - OcMethod(Class cls, SEL sel) : m_cls(cls), m_sel(sel) {} - - virtual void invoke() const - { - id obj = [[m_cls alloc] init]; + class OcMethod : public SharedImpl { - performOptionalSelector(obj, @selector(setUp)); - performOptionalSelector(obj, m_sel); - performOptionalSelector(obj, @selector(tearDown)); + public: + OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {} - arcSafeRelease(obj); - } + virtual void invoke() const { + id obj = [[m_cls alloc] init]; - private: - virtual ~OcMethod() {} + performOptionalSelector( obj, @selector(setUp) ); + performOptionalSelector( obj, m_sel ); + performOptionalSelector( obj, @selector(tearDown) ); - Class m_cls; - SEL m_sel; -}; + arcSafeRelease( obj ); + } + private: + virtual ~OcMethod() {} -namespace Detail { + Class m_cls; + SEL m_sel; + }; -inline std::string getAnnotation(Class cls, - std::string const& annotationName, - std::string const& testCaseName) -{ - NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()]; - SEL sel = NSSelectorFromString(selStr); - arcSafeRelease(selStr); - id value = performOptionalSelector(cls, sel); - if (value) - return [(NSString*)value UTF8String]; - return ""; -} -} + namespace Detail{ + + inline std::string getAnnotation( Class cls, + std::string const& annotationName, + std::string const& testCaseName ) { + NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()]; + SEL sel = NSSelectorFromString( selStr ); + arcSafeRelease( selStr ); + id value = performOptionalSelector( cls, sel ); + if( value ) + return [(NSString*)value UTF8String]; + return ""; + } + } -inline size_t registerTestMethods() -{ - size_t noTestMethods = 0; - int noClasses = objc_getClassList(CATCH_NULL, 0); + inline size_t registerTestMethods() { + size_t noTestMethods = 0; + int noClasses = objc_getClassList( CATCH_NULL, 0 ); - Class* classes = (CATCH_UNSAFE_UNRETAINED Class*)malloc(sizeof(Class) * noClasses); - objc_getClassList(classes, noClasses); + Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses); + objc_getClassList( classes, noClasses ); - for (int c = 0; c < noClasses; c++) - { - Class cls = classes[c]; - { - u_int count; - Method* methods = class_copyMethodList(cls, &count); - for (u_int m = 0; m < count; m++) + for( int c = 0; c < noClasses; c++ ) { + Class cls = classes[c]; { - SEL selector = method_getName(methods[m]); - std::string methodName = sel_getName(selector); - if (startsWith(methodName, "Catch_TestCase_")) - { - std::string testCaseName = methodName.substr(15); - std::string name = Detail::getAnnotation(cls, "Name", testCaseName); - std::string desc = Detail::getAnnotation(cls, "Description", testCaseName); - const char* className = class_getName(cls); - - getMutableRegistryHub().registerTest(makeTestCase(new OcMethod(cls, selector), className, name.c_str(), desc.c_str(), SourceLineInfo())); - noTestMethods++; + u_int count; + Method* methods = class_copyMethodList( cls, &count ); + for( u_int m = 0; m < count ; m++ ) { + SEL selector = method_getName(methods[m]); + std::string methodName = sel_getName(selector); + if( startsWith( methodName, "Catch_TestCase_" ) ) { + std::string testCaseName = methodName.substr( 15 ); + std::string name = Detail::getAnnotation( cls, "Name", testCaseName ); + std::string desc = Detail::getAnnotation( cls, "Description", testCaseName ); + const char* className = class_getName( cls ); + + getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, name.c_str(), desc.c_str(), SourceLineInfo() ) ); + noTestMethods++; + } } + free(methods); } - free(methods); } + return noTestMethods; } - return noTestMethods; -} -namespace Matchers { -namespace Impl { -namespace NSStringMatchers { + namespace Matchers { + namespace Impl { + namespace NSStringMatchers { -template -struct StringHolder : MatcherImpl -{ - StringHolder(NSString* substr) : m_substr([substr copy]) {} - StringHolder(StringHolder const& other) : m_substr([other.m_substr copy]) {} - StringHolder() - { - arcSafeRelease(m_substr); - } + struct StringHolder : MatcherBase{ + StringHolder( NSString* substr ) : m_substr( [substr copy] ){} + StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){} + StringHolder() { + arcSafeRelease( m_substr ); + } - NSString* m_substr; -}; + virtual bool match( NSString* arg ) const CATCH_OVERRIDE { + return false; + } -struct Equals : StringHolder -{ - Equals(NSString* substr) : StringHolder(substr) {} + NSString* m_substr; + }; - virtual bool match(ExpressionType const& str) const - { - return (str != nil || m_substr == nil) && - [str isEqualToString:m_substr]; - } + struct Equals : StringHolder { + Equals( NSString* substr ) : StringHolder( substr ){} - virtual std::string toString() const - { - return "equals string: " + Catch::toString(m_substr); - } -}; + virtual bool match( NSString* str ) const CATCH_OVERRIDE { + return (str != nil || m_substr == nil ) && + [str isEqualToString:m_substr]; + } -struct Contains : StringHolder -{ - Contains(NSString* substr) : StringHolder(substr) {} + virtual std::string describe() const CATCH_OVERRIDE { + return "equals string: " + Catch::toString( m_substr ); + } + }; - virtual bool match(ExpressionType const& str) const - { - return (str != nil || m_substr == nil) && - [str rangeOfString:m_substr].location != NSNotFound; - } + struct Contains : StringHolder { + Contains( NSString* substr ) : StringHolder( substr ){} - virtual std::string toString() const - { - return "contains string: " + Catch::toString(m_substr); - } -}; + virtual bool match( NSString* str ) const { + return (str != nil || m_substr == nil ) && + [str rangeOfString:m_substr].location != NSNotFound; + } -struct StartsWith : StringHolder -{ - StartsWith(NSString* substr) : StringHolder(substr) {} + virtual std::string describe() const CATCH_OVERRIDE { + return "contains string: " + Catch::toString( m_substr ); + } + }; - virtual bool match(ExpressionType const& str) const - { - return (str != nil || m_substr == nil) && - [str rangeOfString:m_substr].location == 0; - } + struct StartsWith : StringHolder { + StartsWith( NSString* substr ) : StringHolder( substr ){} - virtual std::string toString() const - { - return "starts with: " + Catch::toString(m_substr); - } -}; -struct EndsWith : StringHolder -{ - EndsWith(NSString* substr) : StringHolder(substr) {} + virtual bool match( NSString* str ) const { + return (str != nil || m_substr == nil ) && + [str rangeOfString:m_substr].location == 0; + } - virtual bool match(ExpressionType const& str) const - { - return (str != nil || m_substr == nil) && - [str rangeOfString:m_substr].location == [str length] - [m_substr length]; - } + virtual std::string describe() const CATCH_OVERRIDE { + return "starts with: " + Catch::toString( m_substr ); + } + }; + struct EndsWith : StringHolder { + EndsWith( NSString* substr ) : StringHolder( substr ){} - virtual std::string toString() const - { - return "ends with: " + Catch::toString(m_substr); - } -}; + virtual bool match( NSString* str ) const { + return (str != nil || m_substr == nil ) && + [str rangeOfString:m_substr].location == [str length] - [m_substr length]; + } -} // namespace NSStringMatchers -} // namespace Impl + virtual std::string describe() const CATCH_OVERRIDE { + return "ends with: " + Catch::toString( m_substr ); + } + }; -inline Impl::NSStringMatchers::Equals -Equals(NSString* substr) { return Impl::NSStringMatchers::Equals(substr); } + } // namespace NSStringMatchers + } // namespace Impl -inline Impl::NSStringMatchers::Contains -Contains(NSString* substr) { return Impl::NSStringMatchers::Contains(substr); } + inline Impl::NSStringMatchers::Equals + Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); } -inline Impl::NSStringMatchers::StartsWith -StartsWith(NSString* substr) { return Impl::NSStringMatchers::StartsWith(substr); } + inline Impl::NSStringMatchers::Contains + Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); } -inline Impl::NSStringMatchers::EndsWith -EndsWith(NSString* substr) { return Impl::NSStringMatchers::EndsWith(substr); } + inline Impl::NSStringMatchers::StartsWith + StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); } -} // namespace Matchers + inline Impl::NSStringMatchers::EndsWith + EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); } -using namespace Matchers; + } // namespace Matchers + + using namespace Matchers; } // namespace Catch /////////////////////////////////////////////////////////////////////////////// -#define OC_TEST_CASE(name, desc) \ - +(NSString*)INTERNAL_CATCH_UNIQUE_NAME(Catch_Name_test) \ - { \ - return @name; \ - } \ - +(NSString*)INTERNAL_CATCH_UNIQUE_NAME(Catch_Description_test) \ - { \ - return @desc; \ - } \ - -(void)INTERNAL_CATCH_UNIQUE_NAME(Catch_TestCase_test) +#define OC_TEST_CASE( name, desc )\ ++(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Name_test ) \ +{\ +return @ name; \ +}\ ++(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Description_test ) \ +{ \ +return @ desc; \ +} \ +-(void) INTERNAL_CATCH_UNIQUE_NAME( Catch_TestCase_test ) #endif #ifdef CATCH_IMPL + +// !TBD: Move the leak detector code into a separate header +#ifdef CATCH_CONFIG_WINDOWS_CRTDBG +#include +class LeakDetector { +public: + LeakDetector() { + int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); + flag |= _CRTDBG_LEAK_CHECK_DF; + flag |= _CRTDBG_ALLOC_MEM_DF; + _CrtSetDbgFlag(flag); + _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG); + _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); + // Change this to leaking allocation's number to break there + _CrtSetBreakAlloc(-1); + } +}; +#else +class LeakDetector {}; +#endif + +LeakDetector leakDetector; + // #included from: internal/catch_impl.hpp #define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED @@ -3475,68 +3496,64 @@ using namespace Matchers; // #included from: catch_wildcard_pattern.hpp #define TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED -namespace Catch { -class WildcardPattern +#include + +namespace Catch { - enum WildcardPosition - { - NoWildcard = 0, - WildcardAtStart = 1, - WildcardAtEnd = 2, - WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd - }; + class WildcardPattern { + enum WildcardPosition { + NoWildcard = 0, + WildcardAtStart = 1, + WildcardAtEnd = 2, + WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd + }; - public: - WildcardPattern(std::string const& pattern, CaseSensitive::Choice caseSensitivity) - : m_caseSensitivity(caseSensitivity), - m_wildcard(NoWildcard), - m_pattern(adjustCase(pattern)) - { - if (startsWith(m_pattern, "*")) - { - m_pattern = m_pattern.substr(1); - m_wildcard = WildcardAtStart; - } - if (endsWith(m_pattern, "*")) - { - m_pattern = m_pattern.substr(0, m_pattern.size() - 1); - m_wildcard = static_cast(m_wildcard | WildcardAtEnd); - } - } - virtual ~WildcardPattern(); - virtual bool matches(std::string const& str) const - { - switch (m_wildcard) + public: + + WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity ) + : m_caseSensitivity( caseSensitivity ), + m_wildcard( NoWildcard ), + m_pattern( adjustCase( pattern ) ) { - case NoWildcard: - return m_pattern == adjustCase(str); - case WildcardAtStart: - return endsWith(adjustCase(str), m_pattern); - case WildcardAtEnd: - return startsWith(adjustCase(str), m_pattern); - case WildcardAtBothEnds: - return contains(adjustCase(str), m_pattern); + if( startsWith( m_pattern, '*' ) ) { + m_pattern = m_pattern.substr( 1 ); + m_wildcard = WildcardAtStart; + } + if( endsWith( m_pattern, '*' ) ) { + m_pattern = m_pattern.substr( 0, m_pattern.size()-1 ); + m_wildcard = static_cast( m_wildcard | WildcardAtEnd ); + } } + virtual ~WildcardPattern(); + virtual bool matches( std::string const& str ) const { + switch( m_wildcard ) { + case NoWildcard: + return m_pattern == adjustCase( str ); + case WildcardAtStart: + return endsWith( adjustCase( str ), m_pattern ); + case WildcardAtEnd: + return startsWith( adjustCase( str ), m_pattern ); + case WildcardAtBothEnds: + return contains( adjustCase( str ), m_pattern ); + } #ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunreachable-code" #endif - throw std::logic_error("Unknown enum"); + throw std::logic_error( "Unknown enum" ); #ifdef __clang__ #pragma clang diagnostic pop #endif - } - - private: - std::string adjustCase(std::string const& str) const - { - return m_caseSensitivity == CaseSensitive::No ? toLower(str) : str; - } - CaseSensitive::Choice m_caseSensitivity; - WildcardPosition m_wildcard; - std::string m_pattern; -}; + } + private: + std::string adjustCase( std::string const& str ) const { + return m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str; + } + CaseSensitive::Choice m_caseSensitivity; + WildcardPosition m_wildcard; + std::string m_pattern; + }; } #include @@ -3544,87 +3561,74 @@ class WildcardPattern namespace Catch { -class TestSpec -{ - struct Pattern : SharedImpl<> - { - virtual ~Pattern(); - virtual bool matches(TestCaseInfo const& testCase) const = 0; - }; - class NamePattern : public Pattern - { - public: - NamePattern(std::string const& name) - : m_wildcardPattern(toLower(name), CaseSensitive::No) - { - } - virtual ~NamePattern(); - virtual bool matches(TestCaseInfo const& testCase) const - { - return m_wildcardPattern.matches(toLower(testCase.name)); - } - - private: - WildcardPattern m_wildcardPattern; - }; + class TestSpec { + struct Pattern : SharedImpl<> { + virtual ~Pattern(); + virtual bool matches( TestCaseInfo const& testCase ) const = 0; + }; + class NamePattern : public Pattern { + public: + NamePattern( std::string const& name ) + : m_wildcardPattern( toLower( name ), CaseSensitive::No ) + {} + virtual ~NamePattern(); + virtual bool matches( TestCaseInfo const& testCase ) const { + return m_wildcardPattern.matches( toLower( testCase.name ) ); + } + private: + WildcardPattern m_wildcardPattern; + }; - class TagPattern : public Pattern - { - public: - TagPattern(std::string const& tag) : m_tag(toLower(tag)) {} - virtual ~TagPattern(); - virtual bool matches(TestCaseInfo const& testCase) const - { - return testCase.lcaseTags.find(m_tag) != testCase.lcaseTags.end(); - } + class TagPattern : public Pattern { + public: + TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {} + virtual ~TagPattern(); + virtual bool matches( TestCaseInfo const& testCase ) const { + return testCase.lcaseTags.find( m_tag ) != testCase.lcaseTags.end(); + } + private: + std::string m_tag; + }; - private: - std::string m_tag; - }; + class ExcludedPattern : public Pattern { + public: + ExcludedPattern( Ptr const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {} + virtual ~ExcludedPattern(); + virtual bool matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); } + private: + Ptr m_underlyingPattern; + }; - class ExcludedPattern : public Pattern - { - public: - ExcludedPattern(Ptr const& underlyingPattern) : m_underlyingPattern(underlyingPattern) {} - virtual ~ExcludedPattern(); - virtual bool matches(TestCaseInfo const& testCase) const { return !m_underlyingPattern->matches(testCase); } - private: - Ptr m_underlyingPattern; - }; + struct Filter { + std::vector > m_patterns; - struct Filter - { - std::vector> m_patterns; + bool matches( TestCaseInfo const& testCase ) const { + // All patterns in a filter must match for the filter to be a match + for( std::vector >::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it ) { + if( !(*it)->matches( testCase ) ) + return false; + } + return true; + } + }; - bool matches(TestCaseInfo const& testCase) const - { - // All patterns in a filter must match for the filter to be a match - for (std::vector>::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it) - if (!(*it)->matches(testCase)) - return false; - return true; + public: + bool hasFilters() const { + return !m_filters.empty(); + } + bool matches( TestCaseInfo const& testCase ) const { + // A TestSpec matches if any filter matches + for( std::vector::const_iterator it = m_filters.begin(), itEnd = m_filters.end(); it != itEnd; ++it ) + if( it->matches( testCase ) ) + return true; + return false; } - }; - - public: - bool hasFilters() const - { - return !m_filters.empty(); - } - bool matches(TestCaseInfo const& testCase) const - { - // A TestSpec matches if any filter matches - for (std::vector::const_iterator it = m_filters.begin(), itEnd = m_filters.end(); it != itEnd; ++it) - if (it->matches(testCase)) - return true; - return false; - } - private: - std::vector m_filters; + private: + std::vector m_filters; - friend class TestSpecParser; -}; + friend class TestSpecParser; + }; } #ifdef __clang__ @@ -3633,124 +3637,110 @@ class TestSpec namespace Catch { -class TestSpecParser -{ - enum Mode - { - None, - Name, - QuotedName, - Tag - }; - Mode m_mode; - bool m_exclusion; - std::size_t m_start, m_pos; - std::string m_arg; - TestSpec::Filter m_currentFilter; - TestSpec m_testSpec; - ITagAliasRegistry const* m_tagAliases; - - public: - TestSpecParser(ITagAliasRegistry const& tagAliases) : m_tagAliases(&tagAliases) {} - - TestSpecParser& parse(std::string const& arg) - { - m_mode = None; - m_exclusion = false; - m_start = std::string::npos; - m_arg = m_tagAliases->expandAliases(arg); - for (m_pos = 0; m_pos < m_arg.size(); ++m_pos) - visitChar(m_arg[m_pos]); - if (m_mode == Name) - addPattern(); - return *this; - } - TestSpec testSpec() - { - addFilter(); - return m_testSpec; - } - - private: - void visitChar(char c) - { - if (m_mode == None) - { - switch (c) - { - case ' ': - return; - case '~': - m_exclusion = true; - return; - case '[': - return startNewMode(Tag, ++m_pos); - case '"': - return startNewMode(QuotedName, ++m_pos); - default: - startNewMode(Name, m_pos); - break; - } - } - if (m_mode == Name) - { - if (c == ',') - { + class TestSpecParser { + enum Mode{ None, Name, QuotedName, Tag, EscapedName }; + Mode m_mode; + bool m_exclusion; + std::size_t m_start, m_pos; + std::string m_arg; + std::vector m_escapeChars; + TestSpec::Filter m_currentFilter; + TestSpec m_testSpec; + ITagAliasRegistry const* m_tagAliases; + + public: + TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {} + + TestSpecParser& parse( std::string const& arg ) { + m_mode = None; + m_exclusion = false; + m_start = std::string::npos; + m_arg = m_tagAliases->expandAliases( arg ); + m_escapeChars.clear(); + for( m_pos = 0; m_pos < m_arg.size(); ++m_pos ) + visitChar( m_arg[m_pos] ); + if( m_mode == Name ) addPattern(); - addFilter(); + return *this; + } + TestSpec testSpec() { + addFilter(); + return m_testSpec; + } + private: + void visitChar( char c ) { + if( m_mode == None ) { + switch( c ) { + case ' ': return; + case '~': m_exclusion = true; return; + case '[': return startNewMode( Tag, ++m_pos ); + case '"': return startNewMode( QuotedName, ++m_pos ); + case '\\': return escape(); + default: startNewMode( Name, m_pos ); break; + } } - else if (c == '[') - { - if (subString() == "exclude:") - m_exclusion = true; - else + if( m_mode == Name ) { + if( c == ',' ) { addPattern(); - startNewMode(Tag, ++m_pos); + addFilter(); + } + else if( c == '[' ) { + if( subString() == "exclude:" ) + m_exclusion = true; + else + addPattern(); + startNewMode( Tag, ++m_pos ); + } + else if( c == '\\' ) + escape(); } + else if( m_mode == EscapedName ) + m_mode = Name; + else if( m_mode == QuotedName && c == '"' ) + addPattern(); + else if( m_mode == Tag && c == ']' ) + addPattern(); + } + void startNewMode( Mode mode, std::size_t start ) { + m_mode = mode; + m_start = start; + } + void escape() { + if( m_mode == None ) + m_start = m_pos; + m_mode = EscapedName; + m_escapeChars.push_back( m_pos ); + } + std::string subString() const { return m_arg.substr( m_start, m_pos - m_start ); } + template + void addPattern() { + std::string token = subString(); + for( size_t i = 0; i < m_escapeChars.size(); ++i ) + token = token.substr( 0, m_escapeChars[i]-m_start-i ) + token.substr( m_escapeChars[i]-m_start-i+1 ); + m_escapeChars.clear(); + if( startsWith( token, "exclude:" ) ) { + m_exclusion = true; + token = token.substr( 8 ); + } + if( !token.empty() ) { + Ptr pattern = new T( token ); + if( m_exclusion ) + pattern = new TestSpec::ExcludedPattern( pattern ); + m_currentFilter.m_patterns.push_back( pattern ); + } + m_exclusion = false; + m_mode = None; } - else if (m_mode == QuotedName && c == '"') - addPattern(); - else if (m_mode == Tag && c == ']') - addPattern(); - } - void startNewMode(Mode mode, std::size_t start) - { - m_mode = mode; - m_start = start; - } - std::string subString() const { return m_arg.substr(m_start, m_pos - m_start); } - template - void addPattern() - { - std::string token = subString(); - if (startsWith(token, "exclude:")) - { - m_exclusion = true; - token = token.substr(8); - } - if (!token.empty()) - { - Ptr pattern = new T(token); - if (m_exclusion) - pattern = new TestSpec::ExcludedPattern(pattern); - m_currentFilter.m_patterns.push_back(pattern); - } - m_exclusion = false; - m_mode = None; - } - void addFilter() - { - if (!m_currentFilter.m_patterns.empty()) - { - m_testSpec.m_filters.push_back(m_currentFilter); - m_currentFilter = TestSpec::Filter(); + void addFilter() { + if( !m_currentFilter.m_patterns.empty() ) { + m_testSpec.m_filters.push_back( m_currentFilter ); + m_currentFilter = TestSpec::Filter(); + } } + }; + inline TestSpec parseTestSpec( std::string const& arg ) { + return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec(); } -}; -inline TestSpec parseTestSpec(std::string const& arg) -{ - return TestSpecParser(ITagAliasRegistry::get()).parse(arg).testSpec(); -} } // namespace Catch @@ -3761,71 +3751,61 @@ inline TestSpec parseTestSpec(std::string const& arg) // #included from: catch_interfaces_config.h #define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED -#include +#include #include #include namespace Catch { -struct Verbosity -{ - enum Level - { + struct Verbosity { enum Level { NoOutput = 0, Quiet, Normal - }; -}; + }; }; -struct WarnAbout -{ - enum What - { + struct WarnAbout { enum What { Nothing = 0x00, NoAssertions = 0x01 - }; -}; + }; }; -struct ShowDurations -{ - enum OrNot - { + struct ShowDurations { enum OrNot { DefaultForReporter, Always, Never - }; -}; -struct RunTests -{ - enum InWhatOrder - { + }; }; + struct RunTests { enum InWhatOrder { InDeclarationOrder, InLexicographicalOrder, InRandomOrder - }; -}; + }; }; + struct UseColour { enum YesOrNo { + Auto, + Yes, + No + }; }; -class TestSpec; + class TestSpec; -struct IConfig : IShared -{ + struct IConfig : IShared { - virtual ~IConfig(); - - virtual bool allowThrows() const = 0; - virtual std::ostream& stream() const = 0; - virtual std::string name() const = 0; - virtual bool includeSuccessfulResults() const = 0; - virtual bool shouldDebugBreak() const = 0; - virtual bool warnAboutMissingAssertions() const = 0; - virtual int abortAfter() const = 0; - virtual bool showInvisibles() const = 0; - virtual ShowDurations::OrNot showDurations() const = 0; - virtual TestSpec const& testSpec() const = 0; - virtual RunTests::InWhatOrder runOrder() const = 0; - virtual unsigned int rngSeed() const = 0; - virtual bool forceColour() const = 0; -}; + virtual ~IConfig(); + + virtual bool allowThrows() const = 0; + virtual std::ostream& stream() const = 0; + virtual std::string name() const = 0; + virtual bool includeSuccessfulResults() const = 0; + virtual bool shouldDebugBreak() const = 0; + virtual bool warnAboutMissingAssertions() const = 0; + virtual int abortAfter() const = 0; + virtual bool showInvisibles() const = 0; + virtual ShowDurations::OrNot showDurations() const = 0; + virtual TestSpec const& testSpec() const = 0; + virtual RunTests::InWhatOrder runOrder() const = 0; + virtual unsigned int rngSeed() const = 0; + virtual UseColour::YesOrNo useColour() const = 0; + virtual std::vector const& getSectionsToRun() const = 0; + + }; } // #included from: catch_stream.h @@ -3838,71 +3818,62 @@ struct IConfig : IShared namespace Catch { -class StreamBufBase : public std::streambuf -{ - public: - virtual ~StreamBufBase() CATCH_NOEXCEPT; -}; + class StreamBufBase : public std::streambuf { + public: + virtual ~StreamBufBase() CATCH_NOEXCEPT; + }; } -#include -#include #include +#include +#include +#include namespace Catch { -std::ostream& cout(); -std::ostream& cerr(); - -struct IStream -{ - virtual ~IStream() CATCH_NOEXCEPT; - virtual std::ostream& stream() const = 0; -}; - -class FileStream : public IStream -{ - mutable std::ofstream m_ofs; - - public: - FileStream(std::string const& filename); - virtual ~FileStream() CATCH_NOEXCEPT; - - public: // IStream - virtual std::ostream& stream() const CATCH_OVERRIDE; -}; + std::ostream& cout(); + std::ostream& cerr(); -class CoutStream : public IStream -{ - mutable std::ostream m_os; + struct IStream { + virtual ~IStream() CATCH_NOEXCEPT; + virtual std::ostream& stream() const = 0; + }; - public: - CoutStream(); - virtual ~CoutStream() CATCH_NOEXCEPT; + class FileStream : public IStream { + mutable std::ofstream m_ofs; + public: + FileStream( std::string const& filename ); + virtual ~FileStream() CATCH_NOEXCEPT; + public: // IStream + virtual std::ostream& stream() const CATCH_OVERRIDE; + }; - public: // IStream - virtual std::ostream& stream() const CATCH_OVERRIDE; -}; + class CoutStream : public IStream { + mutable std::ostream m_os; + public: + CoutStream(); + virtual ~CoutStream() CATCH_NOEXCEPT; -class DebugOutStream : public IStream -{ - std::auto_ptr m_streamBuf; - mutable std::ostream m_os; + public: // IStream + virtual std::ostream& stream() const CATCH_OVERRIDE; + }; - public: - DebugOutStream(); - virtual ~DebugOutStream() CATCH_NOEXCEPT; + class DebugOutStream : public IStream { + CATCH_AUTO_PTR( StreamBufBase ) m_streamBuf; + mutable std::ostream m_os; + public: + DebugOutStream(); + virtual ~DebugOutStream() CATCH_NOEXCEPT; - public: // IStream - virtual std::ostream& stream() const CATCH_OVERRIDE; -}; + public: // IStream + virtual std::ostream& stream() const CATCH_OVERRIDE; + }; } -#include -#include #include -#include #include +#include +#include #ifndef CATCH_CONFIG_CONSOLE_WIDTH #define CATCH_CONFIG_CONSOLE_WIDTH 80 @@ -3910,142 +3881,133 @@ class DebugOutStream : public IStream namespace Catch { -struct ConfigData -{ - - ConfigData() - : listTests(false), - listTags(false), - listReporters(false), - listTestNamesOnly(false), - showSuccessfulTests(false), - shouldDebugBreak(false), - noThrow(false), - showHelp(false), - showInvisibles(false), - forceColour(false), - filenamesAsTags(false), - abortAfter(-1), - rngSeed(0), - verbosity(Verbosity::Normal), - warnings(WarnAbout::Nothing), - showDurations(ShowDurations::DefaultForReporter), - runOrder(RunTests::InDeclarationOrder) - { - } - - bool listTests; - bool listTags; - bool listReporters; - bool listTestNamesOnly; - - bool showSuccessfulTests; - bool shouldDebugBreak; - bool noThrow; - bool showHelp; - bool showInvisibles; - bool forceColour; - bool filenamesAsTags; - - int abortAfter; - unsigned int rngSeed; - - Verbosity::Level verbosity; - WarnAbout::What warnings; - ShowDurations::OrNot showDurations; - RunTests::InWhatOrder runOrder; - - std::string outputFilename; - std::string name; - std::string processName; - - std::vector reporterNames; - std::vector testsOrTags; -}; - -class Config : public SharedImpl -{ - private: - Config(Config const& other); - Config& operator=(Config const& other); - virtual void dummy(); - - public: - Config() - { - } + struct ConfigData { + + ConfigData() + : listTests( false ), + listTags( false ), + listReporters( false ), + listTestNamesOnly( false ), + showSuccessfulTests( false ), + shouldDebugBreak( false ), + noThrow( false ), + showHelp( false ), + showInvisibles( false ), + filenamesAsTags( false ), + abortAfter( -1 ), + rngSeed( 0 ), + verbosity( Verbosity::Normal ), + warnings( WarnAbout::Nothing ), + showDurations( ShowDurations::DefaultForReporter ), + runOrder( RunTests::InDeclarationOrder ), + useColour( UseColour::Auto ) + {} + + bool listTests; + bool listTags; + bool listReporters; + bool listTestNamesOnly; + + bool showSuccessfulTests; + bool shouldDebugBreak; + bool noThrow; + bool showHelp; + bool showInvisibles; + bool filenamesAsTags; + + int abortAfter; + unsigned int rngSeed; + + Verbosity::Level verbosity; + WarnAbout::What warnings; + ShowDurations::OrNot showDurations; + RunTests::InWhatOrder runOrder; + UseColour::YesOrNo useColour; + + std::string outputFilename; + std::string name; + std::string processName; + + std::vector reporterNames; + std::vector testsOrTags; + std::vector sectionsToRun; + }; - Config(ConfigData const& data) - : m_data(data), - m_stream(openStream()) - { - if (!data.testsOrTags.empty()) - { - TestSpecParser parser(ITagAliasRegistry::get()); - for (std::size_t i = 0; i < data.testsOrTags.size(); ++i) - parser.parse(data.testsOrTags[i]); - m_testSpec = parser.testSpec(); + class Config : public SharedImpl { + private: + Config( Config const& other ); + Config& operator = ( Config const& other ); + virtual void dummy(); + public: + + Config() + {} + + Config( ConfigData const& data ) + : m_data( data ), + m_stream( openStream() ) + { + if( !data.testsOrTags.empty() ) { + TestSpecParser parser( ITagAliasRegistry::get() ); + for( std::size_t i = 0; i < data.testsOrTags.size(); ++i ) + parser.parse( data.testsOrTags[i] ); + m_testSpec = parser.testSpec(); + } } - } - - virtual ~Config() - { - } - std::string const& getFilename() const - { - return m_data.outputFilename; - } + virtual ~Config() {} - bool listTests() const { return m_data.listTests; } - bool listTestNamesOnly() const { return m_data.listTestNamesOnly; } - bool listTags() const { return m_data.listTags; } - bool listReporters() const { return m_data.listReporters; } + std::string const& getFilename() const { + return m_data.outputFilename ; + } - std::string getProcessName() const { return m_data.processName; } + bool listTests() const { return m_data.listTests; } + bool listTestNamesOnly() const { return m_data.listTestNamesOnly; } + bool listTags() const { return m_data.listTags; } + bool listReporters() const { return m_data.listReporters; } - bool shouldDebugBreak() const { return m_data.shouldDebugBreak; } + std::string getProcessName() const { return m_data.processName; } - std::vector getReporterNames() const { return m_data.reporterNames; } + std::vector const& getReporterNames() const { return m_data.reporterNames; } + std::vector const& getSectionsToRun() const CATCH_OVERRIDE { return m_data.sectionsToRun; } - int abortAfter() const { return m_data.abortAfter; } + virtual TestSpec const& testSpec() const CATCH_OVERRIDE { return m_testSpec; } - TestSpec const& testSpec() const { return m_testSpec; } + bool showHelp() const { return m_data.showHelp; } - bool showHelp() const { return m_data.showHelp; } - bool showInvisibles() const { return m_data.showInvisibles; } + // IConfig interface + virtual bool allowThrows() const CATCH_OVERRIDE { return !m_data.noThrow; } + virtual std::ostream& stream() const CATCH_OVERRIDE { return m_stream->stream(); } + virtual std::string name() const CATCH_OVERRIDE { return m_data.name.empty() ? m_data.processName : m_data.name; } + virtual bool includeSuccessfulResults() const CATCH_OVERRIDE { return m_data.showSuccessfulTests; } + virtual bool warnAboutMissingAssertions() const CATCH_OVERRIDE { return m_data.warnings & WarnAbout::NoAssertions; } + virtual ShowDurations::OrNot showDurations() const CATCH_OVERRIDE { return m_data.showDurations; } + virtual RunTests::InWhatOrder runOrder() const CATCH_OVERRIDE { return m_data.runOrder; } + virtual unsigned int rngSeed() const CATCH_OVERRIDE { return m_data.rngSeed; } + virtual UseColour::YesOrNo useColour() const CATCH_OVERRIDE { return m_data.useColour; } + virtual bool shouldDebugBreak() const CATCH_OVERRIDE { return m_data.shouldDebugBreak; } + virtual int abortAfter() const CATCH_OVERRIDE { return m_data.abortAfter; } + virtual bool showInvisibles() const CATCH_OVERRIDE { return m_data.showInvisibles; } - // IConfig interface - virtual bool allowThrows() const { return !m_data.noThrow; } - virtual std::ostream& stream() const { return m_stream->stream(); } - virtual std::string name() const { return m_data.name.empty() ? m_data.processName : m_data.name; } - virtual bool includeSuccessfulResults() const { return m_data.showSuccessfulTests; } - virtual bool warnAboutMissingAssertions() const { return m_data.warnings & WarnAbout::NoAssertions; } - virtual ShowDurations::OrNot showDurations() const { return m_data.showDurations; } - virtual RunTests::InWhatOrder runOrder() const { return m_data.runOrder; } - virtual unsigned int rngSeed() const { return m_data.rngSeed; } - virtual bool forceColour() const { return m_data.forceColour; } + private: - private: - IStream const* openStream() - { - if (m_data.outputFilename.empty()) - return new CoutStream(); - else if (m_data.outputFilename[0] == '%') - { - if (m_data.outputFilename == "%debug") - return new DebugOutStream(); + IStream const* openStream() { + if( m_data.outputFilename.empty() ) + return new CoutStream(); + else if( m_data.outputFilename[0] == '%' ) { + if( m_data.outputFilename == "%debug" ) + return new DebugOutStream(); + else + throw std::domain_error( "Unrecognised stream: " + m_data.outputFilename ); + } else - throw std::domain_error("Unrecognised stream: " + m_data.outputFilename); + return new FileStream( m_data.outputFilename ); } - else - return new FileStream(m_data.outputFilename); - } - ConfigData m_data; + ConfigData m_data; - std::auto_ptr m_stream; - TestSpec m_testSpec; -}; + CATCH_AUTO_PTR( IStream const ) m_stream; + TestSpec m_testSpec; + }; } // end namespace Catch @@ -4063,6 +4025,8 @@ class Config : public SharedImpl #define STITCH_CLARA_OPEN_NAMESPACE namespace Catch { // #included from: ../external/clara.h +// Version 0.0.2.4 + // Only use header guard if we are not using an outer namespace #if !defined(TWOBLUECUBES_CLARA_H_INCLUDED) || defined(STITCH_CLARA_OPEN_NAMESPACE) @@ -4084,9 +4048,11 @@ class Config : public SharedImpl #define TBC_TEXT_FORMAT_H_INCLUDED #endif -#include #include #include +#include +#include +#include // Use optional outer namespace #ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE @@ -4096,153 +4062,121 @@ namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE { namespace Tbc { #ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH -const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH; + const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH; #else -const unsigned int consoleWidth = 80; + const unsigned int consoleWidth = 80; #endif -struct TextAttributes -{ - TextAttributes() - : initialIndent(std::string::npos), - indent(0), - width(consoleWidth - 1), - tabChar('\t') - { - } - - TextAttributes& setInitialIndent(std::size_t _value) - { - initialIndent = _value; - return *this; - } - TextAttributes& setIndent(std::size_t _value) - { - indent = _value; - return *this; - } - TextAttributes& setWidth(std::size_t _value) - { - width = _value; - return *this; - } - TextAttributes& setTabChar(char _value) - { - tabChar = _value; - return *this; - } - - std::size_t initialIndent; // indent of first line, or npos - std::size_t indent; // indent of subsequent lines, or all if initialIndent is npos - std::size_t width; // maximum width of text, including indent. Longer text will wrap - char tabChar; // If this char is seen the indent is changed to current pos -}; - -class Text -{ - public: - Text(std::string const& _str, TextAttributes const& _attr = TextAttributes()) - : attr(_attr) - { - std::string wrappableChars = " [({.,/|\\-"; - std::size_t indent = _attr.initialIndent != std::string::npos - ? _attr.initialIndent - : _attr.indent; - std::string remainder = _str; - - while (!remainder.empty()) - { - if (lines.size() >= 1000) - { - lines.push_back("... message truncated due to excessive size"); - return; - } - std::size_t tabPos = std::string::npos; - std::size_t width = (std::min)(remainder.size(), _attr.width - indent); - std::size_t pos = remainder.find_first_of('\n'); - if (pos <= width) - { - width = pos; - } - pos = remainder.find_last_of(_attr.tabChar, width); - if (pos != std::string::npos) - { - tabPos = pos; - if (remainder[width] == '\n') - width--; - remainder = remainder.substr(0, tabPos) + remainder.substr(tabPos + 1); - } + struct TextAttributes { + TextAttributes() + : initialIndent( std::string::npos ), + indent( 0 ), + width( consoleWidth-1 ), + tabChar( '\t' ) + {} + + TextAttributes& setInitialIndent( std::size_t _value ) { initialIndent = _value; return *this; } + TextAttributes& setIndent( std::size_t _value ) { indent = _value; return *this; } + TextAttributes& setWidth( std::size_t _value ) { width = _value; return *this; } + TextAttributes& setTabChar( char _value ) { tabChar = _value; return *this; } + + std::size_t initialIndent; // indent of first line, or npos + std::size_t indent; // indent of subsequent lines, or all if initialIndent is npos + std::size_t width; // maximum width of text, including indent. Longer text will wrap + char tabChar; // If this char is seen the indent is changed to current pos + }; - if (width == remainder.size()) - { - spliceLine(indent, remainder, width); - } - else if (remainder[width] == '\n') - { - spliceLine(indent, remainder, width); - if (width <= 1 || remainder.size() != 1) - remainder = remainder.substr(1); - indent = _attr.indent; - } - else - { - pos = remainder.find_last_of(wrappableChars, width); - if (pos != std::string::npos && pos > 0) - { - spliceLine(indent, remainder, pos); - if (remainder[0] == ' ') - remainder = remainder.substr(1); + class Text { + public: + Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() ) + : attr( _attr ) + { + std::string wrappableChars = " [({.,/|\\-"; + std::size_t indent = _attr.initialIndent != std::string::npos + ? _attr.initialIndent + : _attr.indent; + std::string remainder = _str; + + while( !remainder.empty() ) { + if( lines.size() >= 1000 ) { + lines.push_back( "... message truncated due to excessive size" ); + return; } - else - { - spliceLine(indent, remainder, width - 1); - lines.back() += "-"; + std::size_t tabPos = std::string::npos; + std::size_t width = (std::min)( remainder.size(), _attr.width - indent ); + std::size_t pos = remainder.find_first_of( '\n' ); + if( pos <= width ) { + width = pos; } - if (lines.size() == 1) + pos = remainder.find_last_of( _attr.tabChar, width ); + if( pos != std::string::npos ) { + tabPos = pos; + if( remainder[width] == '\n' ) + width--; + remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 ); + } + + if( width == remainder.size() ) { + spliceLine( indent, remainder, width ); + } + else if( remainder[width] == '\n' ) { + spliceLine( indent, remainder, width ); + if( width <= 1 || remainder.size() != 1 ) + remainder = remainder.substr( 1 ); indent = _attr.indent; - if (tabPos != std::string::npos) - indent += tabPos; + } + else { + pos = remainder.find_last_of( wrappableChars, width ); + if( pos != std::string::npos && pos > 0 ) { + spliceLine( indent, remainder, pos ); + if( remainder[0] == ' ' ) + remainder = remainder.substr( 1 ); + } + else { + spliceLine( indent, remainder, width-1 ); + lines.back() += "-"; + } + if( lines.size() == 1 ) + indent = _attr.indent; + if( tabPos != std::string::npos ) + indent += tabPos; + } } } - } - void spliceLine(std::size_t _indent, std::string& _remainder, std::size_t _pos) - { - lines.push_back(std::string(_indent, ' ') + _remainder.substr(0, _pos)); - _remainder = _remainder.substr(_pos); - } + void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) { + lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) ); + _remainder = _remainder.substr( _pos ); + } - typedef std::vector::const_iterator const_iterator; + typedef std::vector::const_iterator const_iterator; - const_iterator begin() const { return lines.begin(); } - const_iterator end() const { return lines.end(); } - std::string const& last() const { return lines.back(); } - std::size_t size() const { return lines.size(); } - std::string const& operator[](std::size_t _index) const { return lines[_index]; } - std::string toString() const - { - std::ostringstream oss; - oss << *this; - return oss.str(); - } + const_iterator begin() const { return lines.begin(); } + const_iterator end() const { return lines.end(); } + std::string const& last() const { return lines.back(); } + std::size_t size() const { return lines.size(); } + std::string const& operator[]( std::size_t _index ) const { return lines[_index]; } + std::string toString() const { + std::ostringstream oss; + oss << *this; + return oss.str(); + } - inline friend std::ostream& operator<<(std::ostream& _stream, Text const& _text) - { - for (Text::const_iterator it = _text.begin(), itEnd = _text.end(); - it != itEnd; ++it) - { - if (it != _text.begin()) - _stream << "\n"; - _stream << *it; + inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) { + for( Text::const_iterator it = _text.begin(), itEnd = _text.end(); + it != itEnd; ++it ) { + if( it != _text.begin() ) + _stream << "\n"; + _stream << *it; + } + return _stream; } - return _stream; - } - private: - std::string str; - TextAttributes attr; - std::vector lines; -}; + private: + std::string str; + TextAttributes attr; + std::vector lines; + }; } // end namespace Tbc @@ -4250,17 +4184,167 @@ class Text } // end outer namespace #endif -#endif // TBC_TEXT_FORMAT_H_INCLUDED +#endif // TBC_TEXT_FORMAT_H_INCLUDED + +// ----------- end of #include from tbc_text_format.h ----------- +// ........... back in clara.h + +#undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE + +// ----------- #included from clara_compilers.h ----------- + +#ifndef TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED +#define TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED + +// Detect a number of compiler features - mostly C++11/14 conformance - by compiler +// The following features are defined: +// +// CLARA_CONFIG_CPP11_NULLPTR : is nullptr supported? +// CLARA_CONFIG_CPP11_NOEXCEPT : is noexcept supported? +// CLARA_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods +// CLARA_CONFIG_CPP11_OVERRIDE : is override supported? +// CLARA_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr) + +// CLARA_CONFIG_CPP11_OR_GREATER : Is C++11 supported? + +// CLARA_CONFIG_VARIADIC_MACROS : are variadic macros supported? + +// In general each macro has a _NO_ form +// (e.g. CLARA_CONFIG_CPP11_NO_NULLPTR) 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. + +// All the C++11 features can be disabled with CLARA_CONFIG_NO_CPP11 + +#ifdef __clang__ + +#if __has_feature(cxx_nullptr) +#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR +#endif + +#if __has_feature(cxx_noexcept) +#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT +#endif + +#endif // __clang__ + +//////////////////////////////////////////////////////////////////////////////// +// GCC +#ifdef __GNUC__ + +#if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__) +#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR +#endif + +// - otherwise more recent versions define __cplusplus >= 201103L +// and will get picked up below + +#endif // __GNUC__ + +//////////////////////////////////////////////////////////////////////////////// +// Visual C++ +#ifdef _MSC_VER + +#if (_MSC_VER >= 1600) +#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR +#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR +#endif + +#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015)) +#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT +#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS +#endif + +#endif // _MSC_VER + +//////////////////////////////////////////////////////////////////////////////// +// C++ language feature support + +// catch all support for C++11 +#if defined(__cplusplus) && __cplusplus >= 201103L + +#define CLARA_CPP11_OR_GREATER + +#if !defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR) +#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR +#endif + +#ifndef CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT +#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT +#endif + +#ifndef CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS +#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS +#endif + +#if !defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE) +#define CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE +#endif +#if !defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) +#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR +#endif + +#endif // __cplusplus >= 201103L + +// Now set the actual defines based on the above + anything the user has configured +#if defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NO_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_NO_CPP11) +#define CLARA_CONFIG_CPP11_NULLPTR +#endif +#if defined(CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_NO_CPP11) +#define CLARA_CONFIG_CPP11_NOEXCEPT +#endif +#if defined(CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_NO_CPP11) +#define CLARA_CONFIG_CPP11_GENERATED_METHODS +#endif +#if defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_OVERRIDE) && !defined(CLARA_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_CPP11) +#define CLARA_CONFIG_CPP11_OVERRIDE +#endif +#if defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_UNIQUE_PTR) && !defined(CLARA_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_CPP11) +#define CLARA_CONFIG_CPP11_UNIQUE_PTR +#endif + +// noexcept support: +#if defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_NOEXCEPT) +#define CLARA_NOEXCEPT noexcept +# define CLARA_NOEXCEPT_IS(x) noexcept(x) +#else +#define CLARA_NOEXCEPT throw() +# define CLARA_NOEXCEPT_IS(x) +#endif + +// nullptr support +#ifdef CLARA_CONFIG_CPP11_NULLPTR +#define CLARA_NULL nullptr +#else +#define CLARA_NULL NULL +#endif + +// override support +#ifdef CLARA_CONFIG_CPP11_OVERRIDE +#define CLARA_OVERRIDE override +#else +#define CLARA_OVERRIDE +#endif + +// unique_ptr support +#ifdef CLARA_CONFIG_CPP11_UNIQUE_PTR +# define CLARA_AUTO_PTR( T ) std::unique_ptr +#else +# define CLARA_AUTO_PTR( T ) std::auto_ptr +#endif -// ----------- end of #include from tbc_text_format.h ----------- -// ........... back in /Users/philnash/Dev/OSS/Clara/srcs/clara.h +#endif // TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED -#undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE +// ----------- end of #include from clara_compilers.h ----------- +// ........... back in clara.h -#include #include -#include #include +#include + +#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) +#define CLARA_PLATFORM_WINDOWS +#endif // Use optional outer namespace #ifdef STITCH_CLARA_OPEN_NAMESPACE @@ -4269,795 +4353,688 @@ STITCH_CLARA_OPEN_NAMESPACE namespace Clara { -struct UnpositionalTag -{ -}; + struct UnpositionalTag {}; -extern UnpositionalTag _; + extern UnpositionalTag _; #ifdef CLARA_CONFIG_MAIN -UnpositionalTag _; + UnpositionalTag _; #endif -namespace Detail { + namespace Detail { #ifdef CLARA_CONSOLE_WIDTH -const unsigned int consoleWidth = CLARA_CONFIG_CONSOLE_WIDTH; + const unsigned int consoleWidth = CLARA_CONFIG_CONSOLE_WIDTH; #else -const unsigned int consoleWidth = 80; + const unsigned int consoleWidth = 80; #endif -using namespace Tbc; + using namespace Tbc; -inline bool startsWith(std::string const& str, std::string const& prefix) -{ - return str.size() >= prefix.size() && str.substr(0, prefix.size()) == prefix; -} + inline bool startsWith( std::string const& str, std::string const& prefix ) { + return str.size() >= prefix.size() && str.substr( 0, prefix.size() ) == prefix; + } -template -struct RemoveConstRef -{ - typedef T type; -}; -template -struct RemoveConstRef -{ - typedef T type; -}; -template -struct RemoveConstRef -{ - typedef T type; -}; -template -struct RemoveConstRef -{ - typedef T type; -}; + template struct RemoveConstRef{ typedef T type; }; + template struct RemoveConstRef{ typedef T type; }; + template struct RemoveConstRef{ typedef T type; }; + template struct RemoveConstRef{ typedef T type; }; -template -struct IsBool -{ - static const bool value = false; -}; -template <> -struct IsBool -{ - static const bool value = true; -}; + template struct IsBool { static const bool value = false; }; + template<> struct IsBool { static const bool value = true; }; -template -void convertInto(std::string const& _source, T& _dest) -{ - std::stringstream ss; - ss << _source; - ss >> _dest; - if (ss.fail()) - throw std::runtime_error("Unable to convert " + _source + " to destination type"); -} -inline void convertInto(std::string const& _source, std::string& _dest) -{ - _dest = _source; -} -inline void convertInto(std::string const& _source, bool& _dest) -{ - std::string sourceLC = _source; - std::transform(sourceLC.begin(), sourceLC.end(), sourceLC.begin(), ::tolower); - if (sourceLC == "y" || sourceLC == "1" || sourceLC == "true" || sourceLC == "yes" || sourceLC == "on") - _dest = true; - else if (sourceLC == "n" || sourceLC == "0" || sourceLC == "false" || sourceLC == "no" || sourceLC == "off") - _dest = false; - else - throw std::runtime_error("Expected a boolean value but did not recognise:\n '" + _source + "'"); -} -inline void convertInto(bool _source, bool& _dest) -{ - _dest = _source; -} -template -inline void convertInto(bool, T&) -{ - throw std::runtime_error("Invalid conversion"); -} + template + void convertInto( std::string const& _source, T& _dest ) { + std::stringstream ss; + ss << _source; + ss >> _dest; + if( ss.fail() ) + throw std::runtime_error( "Unable to convert " + _source + " to destination type" ); + } + inline void convertInto( std::string const& _source, std::string& _dest ) { + _dest = _source; + } + char toLowerCh(char c) { + return static_cast( std::tolower( c ) ); + } + inline void convertInto( std::string const& _source, bool& _dest ) { + std::string sourceLC = _source; + std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), toLowerCh ); + if( sourceLC == "y" || sourceLC == "1" || sourceLC == "true" || sourceLC == "yes" || sourceLC == "on" ) + _dest = true; + else if( sourceLC == "n" || sourceLC == "0" || sourceLC == "false" || sourceLC == "no" || sourceLC == "off" ) + _dest = false; + else + throw std::runtime_error( "Expected a boolean value but did not recognise:\n '" + _source + "'" ); + } -template -struct IArgFunction -{ - virtual ~IArgFunction() {} -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - IArgFunction() = default; - IArgFunction(IArgFunction const&) = default; + template + struct IArgFunction { + virtual ~IArgFunction() {} +#ifdef CLARA_CONFIG_CPP11_GENERATED_METHODS + IArgFunction() = default; + IArgFunction( IArgFunction const& ) = default; #endif - virtual void set(ConfigT& config, std::string const& value) const = 0; - virtual void setFlag(ConfigT& config) const = 0; - virtual bool takesArg() const = 0; - virtual IArgFunction* clone() const = 0; -}; - -template -class BoundArgFunction -{ - public: - BoundArgFunction() : functionObj(CATCH_NULL) {} - BoundArgFunction(IArgFunction* _functionObj) : functionObj(_functionObj) {} - BoundArgFunction(BoundArgFunction const& other) : functionObj(other.functionObj ? other.functionObj->clone() : CATCH_NULL) {} - BoundArgFunction& operator=(BoundArgFunction const& other) - { - IArgFunction* newFunctionObj = other.functionObj ? other.functionObj->clone() : CATCH_NULL; - delete functionObj; - functionObj = newFunctionObj; - return *this; - } - ~BoundArgFunction() { delete functionObj; } - - void set(ConfigT& config, std::string const& value) const - { - functionObj->set(config, value); - } - void setFlag(ConfigT& config) const - { - functionObj->setFlag(config); - } - bool takesArg() const { return functionObj->takesArg(); } - - bool isSet() const - { - return functionObj != CATCH_NULL; - } - - private: - IArgFunction* functionObj; -}; - -template -struct NullBinder : IArgFunction -{ - virtual void set(C&, std::string const&) const {} - virtual void setFlag(C&) const {} - virtual bool takesArg() const { return true; } - virtual IArgFunction* clone() const { return new NullBinder(*this); } -}; - -template -struct BoundDataMember : IArgFunction -{ - BoundDataMember(M C::*_member) : member(_member) {} - virtual void set(C& p, std::string const& stringValue) const - { - convertInto(stringValue, p.*member); - } - virtual void setFlag(C& p) const - { - convertInto(true, p.*member); - } - virtual bool takesArg() const { return !IsBool::value; } - virtual IArgFunction* clone() const { return new BoundDataMember(*this); } - M C::*member; -}; -template -struct BoundUnaryMethod : IArgFunction -{ - BoundUnaryMethod(void (C::*_member)(M)) : member(_member) {} - virtual void set(C& p, std::string const& stringValue) const - { - typename RemoveConstRef::type value; - convertInto(stringValue, value); - (p.*member)(value); - } - virtual void setFlag(C& p) const - { - typename RemoveConstRef::type value; - convertInto(true, value); - (p.*member)(value); - } - virtual bool takesArg() const { return !IsBool::value; } - virtual IArgFunction* clone() const { return new BoundUnaryMethod(*this); } - void (C::*member)(M); -}; -template -struct BoundNullaryMethod : IArgFunction -{ - BoundNullaryMethod(void (C::*_member)()) : member(_member) {} - virtual void set(C& p, std::string const& stringValue) const - { - bool value; - convertInto(stringValue, value); - if (value) - (p.*member)(); - } - virtual void setFlag(C& p) const - { - (p.*member)(); - } - virtual bool takesArg() const { return false; } - virtual IArgFunction* clone() const { return new BoundNullaryMethod(*this); } - void (C::*member)(); -}; - -template -struct BoundUnaryFunction : IArgFunction -{ - BoundUnaryFunction(void (*_function)(C&)) : function(_function) {} - virtual void set(C& obj, std::string const& stringValue) const - { - bool value; - convertInto(stringValue, value); - if (value) - function(obj); - } - virtual void setFlag(C& p) const - { - function(p); - } - virtual bool takesArg() const { return false; } - virtual IArgFunction* clone() const { return new BoundUnaryFunction(*this); } - void (*function)(C&); -}; + virtual void set( ConfigT& config, std::string const& value ) const = 0; + virtual bool takesArg() const = 0; + virtual IArgFunction* clone() const = 0; + }; -template -struct BoundBinaryFunction : IArgFunction -{ - BoundBinaryFunction(void (*_function)(C&, T)) : function(_function) {} - virtual void set(C& obj, std::string const& stringValue) const - { - typename RemoveConstRef::type value; - convertInto(stringValue, value); - function(obj, value); - } - virtual void setFlag(C& obj) const - { - typename RemoveConstRef::type value; - convertInto(true, value); - function(obj, value); - } - virtual bool takesArg() const { return !IsBool::value; } - virtual IArgFunction* clone() const { return new BoundBinaryFunction(*this); } - void (*function)(C&, T); -}; + template + class BoundArgFunction { + public: + BoundArgFunction() : functionObj( CLARA_NULL ) {} + BoundArgFunction( IArgFunction* _functionObj ) : functionObj( _functionObj ) {} + BoundArgFunction( BoundArgFunction const& other ) : functionObj( other.functionObj ? other.functionObj->clone() : CLARA_NULL ) {} + BoundArgFunction& operator = ( BoundArgFunction const& other ) { + IArgFunction* newFunctionObj = other.functionObj ? other.functionObj->clone() : CLARA_NULL; + delete functionObj; + functionObj = newFunctionObj; + return *this; + } + ~BoundArgFunction() { delete functionObj; } -} // namespace Detail + void set( ConfigT& config, std::string const& value ) const { + functionObj->set( config, value ); + } + bool takesArg() const { return functionObj->takesArg(); } -struct Parser -{ - Parser() : separators(" \t=:") {} + bool isSet() const { + return functionObj != CLARA_NULL; + } + private: + IArgFunction* functionObj; + }; - struct Token - { - enum Type - { - Positional, - ShortOpt, - LongOpt + template + struct NullBinder : IArgFunction{ + virtual void set( C&, std::string const& ) const {} + virtual bool takesArg() const { return true; } + virtual IArgFunction* clone() const { return new NullBinder( *this ); } }; - Token(Type _type, std::string const& _data) : type(_type), data(_data) {} - Type type; - std::string data; - }; - void parseIntoTokens(int argc, char const* const* argv, std::vector& tokens) const - { - const std::string doubleDash = "--"; - for (int i = 1; i < argc && argv[i] != doubleDash; ++i) - parseIntoTokens(argv[i], tokens); - } - void parseIntoTokens(std::string arg, std::vector& tokens) const - { - while (!arg.empty()) - { - Parser::Token token(Parser::Token::Positional, arg); - arg = ""; - if (token.data[0] == '-') - { - if (token.data.size() > 1 && token.data[1] == '-') - { - token = Parser::Token(Parser::Token::LongOpt, token.data.substr(2)); - } - else - { - token = Parser::Token(Parser::Token::ShortOpt, token.data.substr(1)); - if (token.data.size() > 1 && separators.find(token.data[1]) == std::string::npos) - { - arg = "-" + token.data.substr(1); - token.data = token.data.substr(0, 1); - } - } + template + struct BoundDataMember : IArgFunction{ + BoundDataMember( M C::* _member ) : member( _member ) {} + virtual void set( C& p, std::string const& stringValue ) const { + convertInto( stringValue, p.*member ); } - if (token.type != Parser::Token::Positional) - { - std::size_t pos = token.data.find_first_of(separators); - if (pos != std::string::npos) - { - arg = token.data.substr(pos + 1); - token.data = token.data.substr(0, pos); - } + virtual bool takesArg() const { return !IsBool::value; } + virtual IArgFunction* clone() const { return new BoundDataMember( *this ); } + M C::* member; + }; + template + struct BoundUnaryMethod : IArgFunction{ + BoundUnaryMethod( void (C::*_member)( M ) ) : member( _member ) {} + virtual void set( C& p, std::string const& stringValue ) const { + typename RemoveConstRef::type value; + convertInto( stringValue, value ); + (p.*member)( value ); } - tokens.push_back(token); - } - } - std::string separators; -}; + virtual bool takesArg() const { return !IsBool::value; } + virtual IArgFunction* clone() const { return new BoundUnaryMethod( *this ); } + void (C::*member)( M ); + }; + template + struct BoundNullaryMethod : IArgFunction{ + BoundNullaryMethod( void (C::*_member)() ) : member( _member ) {} + virtual void set( C& p, std::string const& stringValue ) const { + bool value; + convertInto( stringValue, value ); + if( value ) + (p.*member)(); + } + virtual bool takesArg() const { return false; } + virtual IArgFunction* clone() const { return new BoundNullaryMethod( *this ); } + void (C::*member)(); + }; -template -struct CommonArgProperties -{ - CommonArgProperties() {} - CommonArgProperties(Detail::BoundArgFunction const& _boundField) : boundField(_boundField) {} + template + struct BoundUnaryFunction : IArgFunction{ + BoundUnaryFunction( void (*_function)( C& ) ) : function( _function ) {} + virtual void set( C& obj, std::string const& stringValue ) const { + bool value; + convertInto( stringValue, value ); + if( value ) + function( obj ); + } + virtual bool takesArg() const { return false; } + virtual IArgFunction* clone() const { return new BoundUnaryFunction( *this ); } + void (*function)( C& ); + }; - Detail::BoundArgFunction boundField; - std::string description; - std::string detail; - std::string placeholder; // Only value if boundField takes an arg + template + struct BoundBinaryFunction : IArgFunction{ + BoundBinaryFunction( void (*_function)( C&, T ) ) : function( _function ) {} + virtual void set( C& obj, std::string const& stringValue ) const { + typename RemoveConstRef::type value; + convertInto( stringValue, value ); + function( obj, value ); + } + virtual bool takesArg() const { return !IsBool::value; } + virtual IArgFunction* clone() const { return new BoundBinaryFunction( *this ); } + void (*function)( C&, T ); + }; - bool takesArg() const - { - return !placeholder.empty(); - } - void validate() const - { - if (!boundField.isSet()) - throw std::logic_error("option not bound"); - } -}; -struct OptionArgProperties -{ - std::vector shortNames; - std::string longName; + } // namespace Detail - bool hasShortName(std::string const& shortName) const - { - return std::find(shortNames.begin(), shortNames.end(), shortName) != shortNames.end(); - } - bool hasLongName(std::string const& _longName) const - { - return _longName == longName; - } -}; -struct PositionalArgProperties -{ - PositionalArgProperties() : position(-1) {} - int position; // -1 means non-positional (floating) + inline std::vector argsToVector( int argc, char const* const* const argv ) { + std::vector args( static_cast( argc ) ); + for( std::size_t i = 0; i < static_cast( argc ); ++i ) + args[i] = argv[i]; - bool isFixedPositional() const - { - return position != -1; + return args; } -}; -template -class CommandLine -{ + class Parser { + enum Mode { None, MaybeShortOpt, SlashOpt, ShortOpt, LongOpt, Positional }; + Mode mode; + std::size_t from; + bool inQuotes; + public: - struct Arg : CommonArgProperties, OptionArgProperties, PositionalArgProperties - { - Arg() {} - Arg(Detail::BoundArgFunction const& _boundField) : CommonArgProperties(_boundField) {} + struct Token { + enum Type { Positional, ShortOpt, LongOpt }; + Token( Type _type, std::string const& _data ) : type( _type ), data( _data ) {} + Type type; + std::string data; + }; - using CommonArgProperties::placeholder; // !TBD + Parser() : mode( None ), from( 0 ), inQuotes( false ){} - std::string dbgName() const - { - if (!longName.empty()) - return "--" + longName; - if (!shortNames.empty()) - return "-" + shortNames[0]; - return "positional args"; + void parseIntoTokens( std::vector const& args, std::vector& tokens ) { + const std::string doubleDash = "--"; + for( std::size_t i = 1; i < args.size() && args[i] != doubleDash; ++i ) + parseIntoTokens( args[i], tokens); } - std::string commands() const - { - std::ostringstream oss; - bool first = true; - std::vector::const_iterator it = shortNames.begin(), itEnd = shortNames.end(); - for (; it != itEnd; ++it) - { - if (first) - first = false; - else - oss << ", "; - oss << "-" << *it; + + void parseIntoTokens( std::string const& arg, std::vector& tokens ) { + for( std::size_t i = 0; i < arg.size(); ++i ) { + char c = arg[i]; + if( c == '"' ) + inQuotes = !inQuotes; + mode = handleMode( i, c, arg, tokens ); } - if (!longName.empty()) - { - if (!first) - oss << ", "; - oss << "--" << longName; + mode = handleMode( arg.size(), '\0', arg, tokens ); + } + Mode handleMode( std::size_t i, char c, std::string const& arg, std::vector& tokens ) { + switch( mode ) { + case None: return handleNone( i, c ); + case MaybeShortOpt: return handleMaybeShortOpt( i, c ); + case ShortOpt: + case LongOpt: + case SlashOpt: return handleOpt( i, c, arg, tokens ); + case Positional: return handlePositional( i, c, arg, tokens ); + default: throw std::logic_error( "Unknown mode" ); } - if (!placeholder.empty()) - oss << " <" << placeholder << ">"; - return oss.str(); } - }; - - typedef CATCH_AUTO_PTR(Arg) ArgAutoPtr; - friend void addOptName(Arg& arg, std::string const& optName) - { - if (optName.empty()) - return; - if (Detail::startsWith(optName, "--")) - { - if (!arg.longName.empty()) - throw std::logic_error("Only one long opt may be specified. '" + arg.longName + "' already specified, now attempting to add '" + optName + "'"); - arg.longName = optName.substr(2); + Mode handleNone( std::size_t i, char c ) { + if( inQuotes ) { + from = i; + return Positional; + } + switch( c ) { + case '-': return MaybeShortOpt; +#ifdef CLARA_PLATFORM_WINDOWS + case '/': from = i+1; return SlashOpt; +#endif + default: from = i; return Positional; + } + } + Mode handleMaybeShortOpt( std::size_t i, char c ) { + switch( c ) { + case '-': from = i+1; return LongOpt; + default: from = i; return ShortOpt; + } } - else if (Detail::startsWith(optName, "-")) - arg.shortNames.push_back(optName.substr(1)); - else - throw std::logic_error("option must begin with - or --. Option was: '" + optName + "'"); - } - friend void setPositionalArg(Arg& arg, int position) - { - arg.position = position; - } - class ArgBuilder - { - public: - ArgBuilder(Arg* arg) : m_arg(arg) {} + Mode handleOpt( std::size_t i, char c, std::string const& arg, std::vector& tokens ) { + if( std::string( ":=\0", 3 ).find( c ) == std::string::npos ) + return mode; - // Bind a non-boolean data member (requires placeholder string) - template - void bind(M C::*field, std::string const& placeholder) - { - m_arg->boundField = new Detail::BoundDataMember(field); - m_arg->placeholder = placeholder; - } - // Bind a boolean data member (no placeholder required) - template - void bind(bool C::*field) - { - m_arg->boundField = new Detail::BoundDataMember(field); + std::string optName = arg.substr( from, i-from ); + if( mode == ShortOpt ) + for( std::size_t j = 0; j < optName.size(); ++j ) + tokens.push_back( Token( Token::ShortOpt, optName.substr( j, 1 ) ) ); + else if( mode == SlashOpt && optName.size() == 1 ) + tokens.push_back( Token( Token::ShortOpt, optName ) ); + else + tokens.push_back( Token( Token::LongOpt, optName ) ); + return None; } + Mode handlePositional( std::size_t i, char c, std::string const& arg, std::vector& tokens ) { + if( inQuotes || std::string( "\0", 1 ).find( c ) == std::string::npos ) + return mode; - // Bind a method taking a single, non-boolean argument (requires a placeholder string) - template - void bind(void (C::*unaryMethod)(M), std::string const& placeholder) - { - m_arg->boundField = new Detail::BoundUnaryMethod(unaryMethod); - m_arg->placeholder = placeholder; + std::string data = arg.substr( from, i-from ); + tokens.push_back( Token( Token::Positional, data ) ); + return None; } + }; - // Bind a method taking a single, boolean argument (no placeholder string required) - template - void bind(void (C::*unaryMethod)(bool)) - { - m_arg->boundField = new Detail::BoundUnaryMethod(unaryMethod); - } + template + struct CommonArgProperties { + CommonArgProperties() {} + CommonArgProperties( Detail::BoundArgFunction const& _boundField ) : boundField( _boundField ) {} - // Bind a method that takes no arguments (will be called if opt is present) - template - void bind(void (C::*nullaryMethod)()) - { - m_arg->boundField = new Detail::BoundNullaryMethod(nullaryMethod); + Detail::BoundArgFunction boundField; + std::string description; + std::string detail; + std::string placeholder; // Only value if boundField takes an arg + + bool takesArg() const { + return !placeholder.empty(); } + void validate() const { + if( !boundField.isSet() ) + throw std::logic_error( "option not bound" ); + } + }; + struct OptionArgProperties { + std::vector shortNames; + std::string longName; - // Bind a free function taking a single argument - the object to operate on (no placeholder string required) - template - void bind(void (*unaryFunction)(C&)) - { - m_arg->boundField = new Detail::BoundUnaryFunction(unaryFunction); + bool hasShortName( std::string const& shortName ) const { + return std::find( shortNames.begin(), shortNames.end(), shortName ) != shortNames.end(); + } + bool hasLongName( std::string const& _longName ) const { + return _longName == longName; } + }; + struct PositionalArgProperties { + PositionalArgProperties() : position( -1 ) {} + int position; // -1 means non-positional (floating) - // Bind a free function taking a single argument - the object to operate on (requires a placeholder string) - template - void bind(void (*binaryFunction)(C&, T), std::string const& placeholder) - { - m_arg->boundField = new Detail::BoundBinaryFunction(binaryFunction); - m_arg->placeholder = placeholder; + bool isFixedPositional() const { + return position != -1; } + }; + + template + class CommandLine { - ArgBuilder& describe(std::string const& description) + struct Arg : CommonArgProperties, OptionArgProperties, PositionalArgProperties { + Arg() {} + Arg( Detail::BoundArgFunction const& _boundField ) : CommonArgProperties( _boundField ) {} + + using CommonArgProperties::placeholder; // !TBD + + std::string dbgName() const { + if( !longName.empty() ) + return "--" + longName; + if( !shortNames.empty() ) + return "-" + shortNames[0]; + return "positional args"; + } + std::string commands() const { + std::ostringstream oss; + bool first = true; + std::vector::const_iterator it = shortNames.begin(), itEnd = shortNames.end(); + for(; it != itEnd; ++it ) { + if( first ) + first = false; + else + oss << ", "; + oss << "-" << *it; + } + if( !longName.empty() ) { + if( !first ) + oss << ", "; + oss << "--" << longName; + } + if( !placeholder.empty() ) + oss << " <" << placeholder << ">"; + return oss.str(); + } + }; + + typedef CLARA_AUTO_PTR( Arg ) ArgAutoPtr; + + friend void addOptName( Arg& arg, std::string const& optName ) { - m_arg->description = description; - return *this; + if( optName.empty() ) + return; + if( Detail::startsWith( optName, "--" ) ) { + if( !arg.longName.empty() ) + throw std::logic_error( "Only one long opt may be specified. '" + + arg.longName + + "' already specified, now attempting to add '" + + optName + "'" ); + arg.longName = optName.substr( 2 ); + } + else if( Detail::startsWith( optName, "-" ) ) + arg.shortNames.push_back( optName.substr( 1 ) ); + else + throw std::logic_error( "option must begin with - or --. Option was: '" + optName + "'" ); } - ArgBuilder& detail(std::string const& _detail) + friend void setPositionalArg( Arg& arg, int position ) { - m_arg->detail = _detail; - return *this; + arg.position = position; } - protected: - Arg* m_arg; - }; + class ArgBuilder { + public: + ArgBuilder( Arg* arg ) : m_arg( arg ) {} - class OptBuilder : public ArgBuilder - { - public: - OptBuilder(Arg* arg) : ArgBuilder(arg) {} - OptBuilder(OptBuilder& other) : ArgBuilder(other) {} + // Bind a non-boolean data member (requires placeholder string) + template + void bind( M C::* field, std::string const& placeholder ) { + m_arg->boundField = new Detail::BoundDataMember( field ); + m_arg->placeholder = placeholder; + } + // Bind a boolean data member (no placeholder required) + template + void bind( bool C::* field ) { + m_arg->boundField = new Detail::BoundDataMember( field ); + } - OptBuilder& operator[](std::string const& optName) - { - addOptName(*ArgBuilder::m_arg, optName); - return *this; - } - }; + // Bind a method taking a single, non-boolean argument (requires a placeholder string) + template + void bind( void (C::* unaryMethod)( M ), std::string const& placeholder ) { + m_arg->boundField = new Detail::BoundUnaryMethod( unaryMethod ); + m_arg->placeholder = placeholder; + } - public: - CommandLine() - : m_boundProcessName(new Detail::NullBinder()), - m_highestSpecifiedArgPosition(0), - m_throwOnUnrecognisedTokens(false) - { - } - CommandLine(CommandLine const& other) - : m_boundProcessName(other.m_boundProcessName), - m_options(other.m_options), - m_positionalArgs(other.m_positionalArgs), - m_highestSpecifiedArgPosition(other.m_highestSpecifiedArgPosition), - m_throwOnUnrecognisedTokens(other.m_throwOnUnrecognisedTokens) - { - if (other.m_floatingArg.get()) - m_floatingArg.reset(new Arg(*other.m_floatingArg)); - } + // Bind a method taking a single, boolean argument (no placeholder string required) + template + void bind( void (C::* unaryMethod)( bool ) ) { + m_arg->boundField = new Detail::BoundUnaryMethod( unaryMethod ); + } - CommandLine& setThrowOnUnrecognisedTokens(bool shouldThrow = true) - { - m_throwOnUnrecognisedTokens = shouldThrow; - return *this; - } + // Bind a method that takes no arguments (will be called if opt is present) + template + void bind( void (C::* nullaryMethod)() ) { + m_arg->boundField = new Detail::BoundNullaryMethod( nullaryMethod ); + } - OptBuilder operator[](std::string const& optName) - { - m_options.push_back(Arg()); - addOptName(m_options.back(), optName); - OptBuilder builder(&m_options.back()); - return builder; - } + // Bind a free function taking a single argument - the object to operate on (no placeholder string required) + template + void bind( void (* unaryFunction)( C& ) ) { + m_arg->boundField = new Detail::BoundUnaryFunction( unaryFunction ); + } - ArgBuilder operator[](int position) - { - m_positionalArgs.insert(std::make_pair(position, Arg())); - if (position > m_highestSpecifiedArgPosition) - m_highestSpecifiedArgPosition = position; - setPositionalArg(m_positionalArgs[position], position); - ArgBuilder builder(&m_positionalArgs[position]); - return builder; - } + // Bind a free function taking a single argument - the object to operate on (requires a placeholder string) + template + void bind( void (* binaryFunction)( C&, T ), std::string const& placeholder ) { + m_arg->boundField = new Detail::BoundBinaryFunction( binaryFunction ); + m_arg->placeholder = placeholder; + } - // Invoke this with the _ instance - ArgBuilder operator[](UnpositionalTag) - { - if (m_floatingArg.get()) - throw std::logic_error("Only one unpositional argument can be added"); - m_floatingArg.reset(new Arg()); - ArgBuilder builder(m_floatingArg.get()); - return builder; - } + ArgBuilder& describe( std::string const& description ) { + m_arg->description = description; + return *this; + } + ArgBuilder& detail( std::string const& detail ) { + m_arg->detail = detail; + return *this; + } - template - void bindProcessName(M C::*field) - { - m_boundProcessName = new Detail::BoundDataMember(field); - } - template - void bindProcessName(void (C::*_unaryMethod)(M)) - { - m_boundProcessName = new Detail::BoundUnaryMethod(_unaryMethod); - } + protected: + Arg* m_arg; + }; + + class OptBuilder : public ArgBuilder { + public: + OptBuilder( Arg* arg ) : ArgBuilder( arg ) {} + OptBuilder( OptBuilder& other ) : ArgBuilder( other ) {} + + OptBuilder& operator[]( std::string const& optName ) { + addOptName( *ArgBuilder::m_arg, optName ); + return *this; + } + }; + + public: + + CommandLine() + : m_boundProcessName( new Detail::NullBinder() ), + m_highestSpecifiedArgPosition( 0 ), + m_throwOnUnrecognisedTokens( false ) + {} + CommandLine( CommandLine const& other ) + : m_boundProcessName( other.m_boundProcessName ), + m_options ( other.m_options ), + m_positionalArgs( other.m_positionalArgs ), + m_highestSpecifiedArgPosition( other.m_highestSpecifiedArgPosition ), + m_throwOnUnrecognisedTokens( other.m_throwOnUnrecognisedTokens ) + { + if( other.m_floatingArg.get() ) + m_floatingArg.reset( new Arg( *other.m_floatingArg ) ); + } + + CommandLine& setThrowOnUnrecognisedTokens( bool shouldThrow = true ) { + m_throwOnUnrecognisedTokens = shouldThrow; + return *this; + } + + OptBuilder operator[]( std::string const& optName ) { + m_options.push_back( Arg() ); + addOptName( m_options.back(), optName ); + OptBuilder builder( &m_options.back() ); + return builder; + } + + ArgBuilder operator[]( int position ) { + m_positionalArgs.insert( std::make_pair( position, Arg() ) ); + if( position > m_highestSpecifiedArgPosition ) + m_highestSpecifiedArgPosition = position; + setPositionalArg( m_positionalArgs[position], position ); + ArgBuilder builder( &m_positionalArgs[position] ); + return builder; + } + + // Invoke this with the _ instance + ArgBuilder operator[]( UnpositionalTag ) { + if( m_floatingArg.get() ) + throw std::logic_error( "Only one unpositional argument can be added" ); + m_floatingArg.reset( new Arg() ); + ArgBuilder builder( m_floatingArg.get() ); + return builder; + } - void optUsage(std::ostream& os, std::size_t indent = 0, std::size_t width = Detail::consoleWidth) const - { - typename std::vector::const_iterator itBegin = m_options.begin(), itEnd = m_options.end(), it; - std::size_t maxWidth = 0; - for (it = itBegin; it != itEnd; ++it) - maxWidth = (std::max)(maxWidth, it->commands().size()); + template + void bindProcessName( M C::* field ) { + m_boundProcessName = new Detail::BoundDataMember( field ); + } + template + void bindProcessName( void (C::*_unaryMethod)( M ) ) { + m_boundProcessName = new Detail::BoundUnaryMethod( _unaryMethod ); + } - for (it = itBegin; it != itEnd; ++it) - { - Detail::Text usageText(it->commands(), Detail::TextAttributes() - .setWidth(maxWidth + indent) - .setIndent(indent)); - Detail::Text desc(it->description, Detail::TextAttributes() - .setWidth(width - maxWidth - 3)); + void optUsage( std::ostream& os, std::size_t indent = 0, std::size_t width = Detail::consoleWidth ) const { + typename std::vector::const_iterator itBegin = m_options.begin(), itEnd = m_options.end(), it; + std::size_t maxWidth = 0; + for( it = itBegin; it != itEnd; ++it ) + maxWidth = (std::max)( maxWidth, it->commands().size() ); - for (std::size_t i = 0; i < (std::max)(usageText.size(), desc.size()); ++i) - { - std::string usageCol = i < usageText.size() ? usageText[i] : ""; - os << usageCol; + for( it = itBegin; it != itEnd; ++it ) { + Detail::Text usage( it->commands(), Detail::TextAttributes() + .setWidth( maxWidth+indent ) + .setIndent( indent ) ); + Detail::Text desc( it->description, Detail::TextAttributes() + .setWidth( width - maxWidth - 3 ) ); + + for( std::size_t i = 0; i < (std::max)( usage.size(), desc.size() ); ++i ) { + std::string usageCol = i < usage.size() ? usage[i] : ""; + os << usageCol; - if (i < desc.size() && !desc[i].empty()) - os << std::string(indent + 2 + maxWidth - usageCol.size(), ' ') - << desc[i]; - os << "\n"; + if( i < desc.size() && !desc[i].empty() ) + os << std::string( indent + 2 + maxWidth - usageCol.size(), ' ' ) + << desc[i]; + os << "\n"; + } } } - } - std::string optUsage() const - { - std::ostringstream oss; - optUsage(oss); - return oss.str(); - } + std::string optUsage() const { + std::ostringstream oss; + optUsage( oss ); + return oss.str(); + } - void argSynopsis(std::ostream& os) const - { - for (int i = 1; i <= m_highestSpecifiedArgPosition; ++i) - { - if (i > 1) - os << " "; - typename std::map::const_iterator it = m_positionalArgs.find(i); - if (it != m_positionalArgs.end()) - os << "<" << it->second.placeholder << ">"; - else if (m_floatingArg.get()) - os << "<" << m_floatingArg->placeholder << ">"; - else - throw std::logic_error("non consecutive positional arguments with no floating args"); + void argSynopsis( std::ostream& os ) const { + for( int i = 1; i <= m_highestSpecifiedArgPosition; ++i ) { + if( i > 1 ) + os << " "; + typename std::map::const_iterator it = m_positionalArgs.find( i ); + if( it != m_positionalArgs.end() ) + os << "<" << it->second.placeholder << ">"; + else if( m_floatingArg.get() ) + os << "<" << m_floatingArg->placeholder << ">"; + else + throw std::logic_error( "non consecutive positional arguments with no floating args" ); + } + // !TBD No indication of mandatory args + if( m_floatingArg.get() ) { + if( m_highestSpecifiedArgPosition > 1 ) + os << " "; + os << "[<" << m_floatingArg->placeholder << "> ...]"; + } } - // !TBD No indication of mandatory args - if (m_floatingArg.get()) - { - if (m_highestSpecifiedArgPosition > 1) - os << " "; - os << "[<" << m_floatingArg->placeholder << "> ...]"; + std::string argSynopsis() const { + std::ostringstream oss; + argSynopsis( oss ); + return oss.str(); } - } - std::string argSynopsis() const - { - std::ostringstream oss; - argSynopsis(oss); - return oss.str(); - } - void usage(std::ostream& os, std::string const& procName) const - { - validate(); - os << "usage:\n " << procName << " "; - argSynopsis(os); - if (!m_options.empty()) - { - os << " [options]\n\nwhere options are: \n"; - optUsage(os, 2); + void usage( std::ostream& os, std::string const& procName ) const { + validate(); + os << "usage:\n " << procName << " "; + argSynopsis( os ); + if( !m_options.empty() ) { + os << " [options]\n\nwhere options are: \n"; + optUsage( os, 2 ); + } + os << "\n"; + } + std::string usage( std::string const& procName ) const { + std::ostringstream oss; + usage( oss, procName ); + return oss.str(); } - os << "\n"; - } - std::string usage(std::string const& procName) const - { - std::ostringstream oss; - usage(oss, procName); - return oss.str(); - } - - ConfigT parse(int argc, char const* const* argv) const - { - ConfigT config; - parseInto(argc, argv, config); - return config; - } - - std::vector parseInto(int argc, char const* const* argv, ConfigT& config) const - { - std::string processName = argv[0]; - std::size_t lastSlash = processName.find_last_of("/\\"); - if (lastSlash != std::string::npos) - processName = processName.substr(lastSlash + 1); - m_boundProcessName.set(config, processName); - std::vector tokens; - Parser parser; - parser.parseIntoTokens(argc, argv, tokens); - return populate(tokens, config); - } - - std::vector populate(std::vector const& tokens, ConfigT& config) const - { - validate(); - std::vector unusedTokens = populateOptions(tokens, config); - unusedTokens = populateFixedArgs(unusedTokens, config); - unusedTokens = populateFloatingArgs(unusedTokens, config); - return unusedTokens; - } - - std::vector populateOptions(std::vector const& tokens, ConfigT& config) const - { - std::vector unusedTokens; - std::vector errors; - for (std::size_t i = 0; i < tokens.size(); ++i) - { - Parser::Token const& token = tokens[i]; - typename std::vector::const_iterator it = m_options.begin(), itEnd = m_options.end(); - for (; it != itEnd; ++it) - { - Arg const& arg = *it; - try - { - if ((token.type == Parser::Token::ShortOpt && arg.hasShortName(token.data)) || - (token.type == Parser::Token::LongOpt && arg.hasLongName(token.data))) - { - if (arg.takesArg()) - { - if (i == tokens.size() - 1 || tokens[i + 1].type != Parser::Token::Positional) - errors.push_back("Expected argument to option: " + token.data); - else - arg.boundField.set(config, tokens[++i].data); - } - else - { - arg.boundField.setFlag(config); + ConfigT parse( std::vector const& args ) const { + ConfigT config; + parseInto( args, config ); + return config; + } + + std::vector parseInto( std::vector const& args, ConfigT& config ) const { + std::string processName = args.empty() ? std::string() : args[0]; + std::size_t lastSlash = processName.find_last_of( "/\\" ); + if( lastSlash != std::string::npos ) + processName = processName.substr( lastSlash+1 ); + m_boundProcessName.set( config, processName ); + std::vector tokens; + Parser parser; + parser.parseIntoTokens( args, tokens ); + return populate( tokens, config ); + } + + std::vector populate( std::vector const& tokens, ConfigT& config ) const { + validate(); + std::vector unusedTokens = populateOptions( tokens, config ); + unusedTokens = populateFixedArgs( unusedTokens, config ); + unusedTokens = populateFloatingArgs( unusedTokens, config ); + return unusedTokens; + } + + std::vector populateOptions( std::vector const& tokens, ConfigT& config ) const { + std::vector unusedTokens; + std::vector errors; + for( std::size_t i = 0; i < tokens.size(); ++i ) { + Parser::Token const& token = tokens[i]; + typename std::vector::const_iterator it = m_options.begin(), itEnd = m_options.end(); + for(; it != itEnd; ++it ) { + Arg const& arg = *it; + + try { + if( ( token.type == Parser::Token::ShortOpt && arg.hasShortName( token.data ) ) || + ( token.type == Parser::Token::LongOpt && arg.hasLongName( token.data ) ) ) { + if( arg.takesArg() ) { + if( i == tokens.size()-1 || tokens[i+1].type != Parser::Token::Positional ) + errors.push_back( "Expected argument to option: " + token.data ); + else + arg.boundField.set( config, tokens[++i].data ); + } + else { + arg.boundField.set( config, "true" ); + } + break; } - break; + } + catch( std::exception& ex ) { + errors.push_back( std::string( ex.what() ) + "\n- while parsing: (" + arg.commands() + ")" ); } } - catch (std::exception& ex) - { - errors.push_back(std::string(ex.what()) + "\n- while parsing: (" + arg.commands() + ")"); + if( it == itEnd ) { + if( token.type == Parser::Token::Positional || !m_throwOnUnrecognisedTokens ) + unusedTokens.push_back( token ); + else if( errors.empty() && m_throwOnUnrecognisedTokens ) + errors.push_back( "unrecognised option: " + token.data ); } } - if (it == itEnd) - { - if (token.type == Parser::Token::Positional || !m_throwOnUnrecognisedTokens) - unusedTokens.push_back(token); - else if (errors.empty() && m_throwOnUnrecognisedTokens) - errors.push_back("unrecognised option: " + token.data); + if( !errors.empty() ) { + std::ostringstream oss; + for( std::vector::const_iterator it = errors.begin(), itEnd = errors.end(); + it != itEnd; + ++it ) { + if( it != errors.begin() ) + oss << "\n"; + oss << *it; + } + throw std::runtime_error( oss.str() ); } - } - if (!errors.empty()) - { - std::ostringstream oss; - for (std::vector::const_iterator it = errors.begin(), itEnd = errors.end(); - it != itEnd; - ++it) - { - if (it != errors.begin()) - oss << "\n"; - oss << *it; + return unusedTokens; + } + std::vector populateFixedArgs( std::vector const& tokens, ConfigT& config ) const { + std::vector unusedTokens; + int position = 1; + for( std::size_t i = 0; i < tokens.size(); ++i ) { + Parser::Token const& token = tokens[i]; + typename std::map::const_iterator it = m_positionalArgs.find( position ); + if( it != m_positionalArgs.end() ) + it->second.boundField.set( config, token.data ); + else + unusedTokens.push_back( token ); + if( token.type == Parser::Token::Positional ) + position++; } - throw std::runtime_error(oss.str()); - } - return unusedTokens; - } - std::vector populateFixedArgs(std::vector const& tokens, ConfigT& config) const - { - std::vector unusedTokens; - int position = 1; - for (std::size_t i = 0; i < tokens.size(); ++i) - { - Parser::Token const& token = tokens[i]; - typename std::map::const_iterator it = m_positionalArgs.find(position); - if (it != m_positionalArgs.end()) - it->second.boundField.set(config, token.data); - else - unusedTokens.push_back(token); - if (token.type == Parser::Token::Positional) - position++; + return unusedTokens; + } + std::vector populateFloatingArgs( std::vector const& tokens, ConfigT& config ) const { + if( !m_floatingArg.get() ) + return tokens; + std::vector unusedTokens; + for( std::size_t i = 0; i < tokens.size(); ++i ) { + Parser::Token const& token = tokens[i]; + if( token.type == Parser::Token::Positional ) + m_floatingArg->boundField.set( config, token.data ); + else + unusedTokens.push_back( token ); + } + return unusedTokens; } - return unusedTokens; - } - std::vector populateFloatingArgs(std::vector const& tokens, ConfigT& config) const - { - if (!m_floatingArg.get()) - return tokens; - std::vector unusedTokens; - for (std::size_t i = 0; i < tokens.size(); ++i) + + void validate() const { - Parser::Token const& token = tokens[i]; - if (token.type == Parser::Token::Positional) - m_floatingArg->boundField.set(config, token.data); - else - unusedTokens.push_back(token); + if( m_options.empty() && m_positionalArgs.empty() && !m_floatingArg.get() ) + throw std::logic_error( "No options or arguments specified" ); + + for( typename std::vector::const_iterator it = m_options.begin(), + itEnd = m_options.end(); + it != itEnd; ++it ) + it->validate(); } - return unusedTokens; - } - void validate() const - { - if (m_options.empty() && m_positionalArgs.empty() && !m_floatingArg.get()) - throw std::logic_error("No options or arguments specified"); - - for (typename std::vector::const_iterator it = m_options.begin(), - itEnd = m_options.end(); - it != itEnd; ++it) - it->validate(); - } - - private: - Detail::BoundArgFunction m_boundProcessName; - std::vector m_options; - std::map m_positionalArgs; - ArgAutoPtr m_floatingArg; - int m_highestSpecifiedArgPosition; - bool m_throwOnUnrecognisedTokens; -}; + private: + Detail::BoundArgFunction m_boundProcessName; + std::vector m_options; + std::map m_positionalArgs; + ArgAutoPtr m_floatingArg; + int m_highestSpecifiedArgPosition; + bool m_throwOnUnrecognisedTokens; + }; } // end namespace Clara @@ -5075,185 +5052,202 @@ STITCH_CLARA_CLOSE_NAMESPACE #endif #include +#include namespace Catch { -inline void abortAfterFirst(ConfigData& config) { config.abortAfter = 1; } -inline void abortAfterX(ConfigData& config, int x) -{ - if (x < 1) - throw std::runtime_error("Value after -x or --abortAfter must be greater than zero"); - config.abortAfter = x; -} -inline void addTestOrTags(ConfigData& config, std::string const& _testSpec) { config.testsOrTags.push_back(_testSpec); } -inline void addReporterName(ConfigData& config, std::string const& _reporterName) { config.reporterNames.push_back(_reporterName); } - -inline void addWarning(ConfigData& config, std::string const& _warning) -{ - if (_warning == "NoAssertions") - config.warnings = static_cast(config.warnings | WarnAbout::NoAssertions); - else - throw std::runtime_error("Unrecognised warning: '" + _warning + "'"); -} -inline void setOrder(ConfigData& config, std::string const& order) -{ - if (startsWith("declared", order)) - config.runOrder = RunTests::InDeclarationOrder; - else if (startsWith("lexical", order)) - config.runOrder = RunTests::InLexicographicalOrder; - else if (startsWith("random", order)) - config.runOrder = RunTests::InRandomOrder; - else - throw std::runtime_error("Unrecognised ordering: '" + order + "'"); -} -inline void setRngSeed(ConfigData& config, std::string const& seed) -{ - if (seed == "time") - { - config.rngSeed = static_cast(std::time(0)); - } - else - { - std::stringstream ss; - ss << seed; - ss >> config.rngSeed; - if (ss.fail()) - throw std::runtime_error("Argment to --rng-seed should be the word 'time' or a number"); + inline void abortAfterFirst( ConfigData& config ) { config.abortAfter = 1; } + inline void abortAfterX( ConfigData& config, int x ) { + if( x < 1 ) + throw std::runtime_error( "Value after -x or --abortAfter must be greater than zero" ); + config.abortAfter = x; } -} -inline void setVerbosity(ConfigData& config, int level) -{ - // !TBD: accept strings? - config.verbosity = static_cast(level); -} -inline void setShowDurations(ConfigData& config, bool _showDurations) -{ - config.showDurations = _showDurations - ? ShowDurations::Always - : ShowDurations::Never; -} -inline void loadTestNamesFromFile(ConfigData& config, std::string const& _filename) -{ - std::ifstream f(_filename.c_str()); - if (!f.is_open()) - throw std::domain_error("Unable to load input file: " + _filename); + inline void addTestOrTags( ConfigData& config, std::string const& _testSpec ) { config.testsOrTags.push_back( _testSpec ); } + inline void addSectionToRun( ConfigData& config, std::string const& sectionName ) { config.sectionsToRun.push_back( sectionName ); } + inline void addReporterName( ConfigData& config, std::string const& _reporterName ) { config.reporterNames.push_back( _reporterName ); } - std::string line; - while (std::getline(f, line)) - { - line = trim(line); - if (!line.empty() && !startsWith(line, "#")) - addTestOrTags(config, "\"" + line + "\","); + inline void addWarning( ConfigData& config, std::string const& _warning ) { + if( _warning == "NoAssertions" ) + config.warnings = static_cast( config.warnings | WarnAbout::NoAssertions ); + else + throw std::runtime_error( "Unrecognised warning: '" + _warning + '\'' ); + } + inline void setOrder( ConfigData& config, std::string const& order ) { + if( startsWith( "declared", order ) ) + config.runOrder = RunTests::InDeclarationOrder; + else if( startsWith( "lexical", order ) ) + config.runOrder = RunTests::InLexicographicalOrder; + else if( startsWith( "random", order ) ) + config.runOrder = RunTests::InRandomOrder; + else + throw std::runtime_error( "Unrecognised ordering: '" + order + '\'' ); + } + inline void setRngSeed( ConfigData& config, std::string const& seed ) { + if( seed == "time" ) { + config.rngSeed = static_cast( std::time(0) ); + } + else { + std::stringstream ss; + ss << seed; + ss >> config.rngSeed; + if( ss.fail() ) + throw std::runtime_error( "Argument to --rng-seed should be the word 'time' or a number" ); + } + } + inline void setVerbosity( ConfigData& config, int level ) { + // !TBD: accept strings? + config.verbosity = static_cast( level ); + } + inline void setShowDurations( ConfigData& config, bool _showDurations ) { + config.showDurations = _showDurations + ? ShowDurations::Always + : ShowDurations::Never; + } + inline void setUseColour( ConfigData& config, std::string const& value ) { + std::string mode = toLower( value ); + + if( mode == "yes" ) + config.useColour = UseColour::Yes; + else if( mode == "no" ) + config.useColour = UseColour::No; + else if( mode == "auto" ) + config.useColour = UseColour::Auto; + else + throw std::runtime_error( "colour mode must be one of: auto, yes or no" ); + } + inline void forceColour( ConfigData& config ) { + config.useColour = UseColour::Yes; + } + inline void loadTestNamesFromFile( ConfigData& config, std::string const& _filename ) { + std::ifstream f( _filename.c_str() ); + if( !f.is_open() ) + throw std::domain_error( "Unable to load input file: " + _filename ); + + std::string line; + while( std::getline( f, line ) ) { + line = trim(line); + if( !line.empty() && !startsWith( line, '#' ) ) { + if( !startsWith( line, '"' ) ) + line = '"' + line + '"'; + addTestOrTags( config, line + ',' ); + } + } } -} -inline Clara::CommandLine makeCommandLineParser() -{ + inline Clara::CommandLine makeCommandLineParser() { - using namespace Clara; - CommandLine cli; + using namespace Clara; + CommandLine cli; - cli.bindProcessName(&ConfigData::processName); + cli.bindProcessName( &ConfigData::processName ); - cli["-?"]["-h"]["--help"] - .describe("display usage information") - .bind(&ConfigData::showHelp); + cli["-?"]["-h"]["--help"] + .describe( "display usage information" ) + .bind( &ConfigData::showHelp ); - cli["-l"]["--list-tests"] - .describe("list all/matching test cases") - .bind(&ConfigData::listTests); + cli["-l"]["--list-tests"] + .describe( "list all/matching test cases" ) + .bind( &ConfigData::listTests ); - cli["-t"]["--list-tags"] - .describe("list all/matching tags") - .bind(&ConfigData::listTags); + cli["-t"]["--list-tags"] + .describe( "list all/matching tags" ) + .bind( &ConfigData::listTags ); - cli["-s"]["--success"] - .describe("include successful tests in output") - .bind(&ConfigData::showSuccessfulTests); + cli["-s"]["--success"] + .describe( "include successful tests in output" ) + .bind( &ConfigData::showSuccessfulTests ); - cli["-b"]["--break"] - .describe("break into debugger on failure") - .bind(&ConfigData::shouldDebugBreak); + cli["-b"]["--break"] + .describe( "break into debugger on failure" ) + .bind( &ConfigData::shouldDebugBreak ); - cli["-e"]["--nothrow"] - .describe("skip exception tests") - .bind(&ConfigData::noThrow); + cli["-e"]["--nothrow"] + .describe( "skip exception tests" ) + .bind( &ConfigData::noThrow ); - cli["-i"]["--invisibles"] - .describe("show invisibles (tabs, newlines)") - .bind(&ConfigData::showInvisibles); + cli["-i"]["--invisibles"] + .describe( "show invisibles (tabs, newlines)" ) + .bind( &ConfigData::showInvisibles ); - cli["-o"]["--out"] - .describe("output filename") - .bind(&ConfigData::outputFilename, "filename"); + cli["-o"]["--out"] + .describe( "output filename" ) + .bind( &ConfigData::outputFilename, "filename" ); - cli["-r"]["--reporter"] - // .placeholder( "name[:filename]" ) - .describe("reporter to use (defaults to console)") - .bind(&addReporterName, "name"); + cli["-r"]["--reporter"] +// .placeholder( "name[:filename]" ) + .describe( "reporter to use (defaults to console)" ) + .bind( &addReporterName, "name" ); - cli["-n"]["--name"] - .describe("suite name") - .bind(&ConfigData::name, "name"); + cli["-n"]["--name"] + .describe( "suite name" ) + .bind( &ConfigData::name, "name" ); - cli["-a"]["--abort"] - .describe("abort at first failure") - .bind(&abortAfterFirst); + cli["-a"]["--abort"] + .describe( "abort at first failure" ) + .bind( &abortAfterFirst ); - cli["-x"]["--abortx"] - .describe("abort after x failures") - .bind(&abortAfterX, "no. failures"); + cli["-x"]["--abortx"] + .describe( "abort after x failures" ) + .bind( &abortAfterX, "no. failures" ); - cli["-w"]["--warn"] - .describe("enable warnings") - .bind(&addWarning, "warning name"); + cli["-w"]["--warn"] + .describe( "enable warnings" ) + .bind( &addWarning, "warning name" ); - // - needs updating if reinstated - // cli.into( &setVerbosity ) - // .describe( "level of verbosity (0=no output)" ) - // .shortOpt( "v") - // .longOpt( "verbosity" ) - // .placeholder( "level" ); +// - needs updating if reinstated +// cli.into( &setVerbosity ) +// .describe( "level of verbosity (0=no output)" ) +// .shortOpt( "v") +// .longOpt( "verbosity" ) +// .placeholder( "level" ); - cli[_] - .describe("which test or tests to use") - .bind(&addTestOrTags, "test name, pattern or tags"); + cli[_] + .describe( "which test or tests to use" ) + .bind( &addTestOrTags, "test name, pattern or tags" ); - cli["-d"]["--durations"] - .describe("show test durations") - .bind(&setShowDurations, "yes/no"); + cli["-d"]["--durations"] + .describe( "show test durations" ) + .bind( &setShowDurations, "yes|no" ); - cli["-f"]["--input-file"] - .describe("load test names to run from a file") - .bind(&loadTestNamesFromFile, "filename"); + cli["-f"]["--input-file"] + .describe( "load test names to run from a file" ) + .bind( &loadTestNamesFromFile, "filename" ); - cli["-#"]["--filenames-as-tags"] - .describe("adds a tag for the filename") - .bind(&ConfigData::filenamesAsTags); + cli["-#"]["--filenames-as-tags"] + .describe( "adds a tag for the filename" ) + .bind( &ConfigData::filenamesAsTags ); - // Less common commands which don't have a short form - cli["--list-test-names-only"] - .describe("list all/matching test cases names only") - .bind(&ConfigData::listTestNamesOnly); + cli["-c"]["--section"] + .describe( "specify section to run" ) + .bind( &addSectionToRun, "section name" ); - cli["--list-reporters"] - .describe("list all reporters") - .bind(&ConfigData::listReporters); + // Less common commands which don't have a short form + cli["--list-test-names-only"] + .describe( "list all/matching test cases names only" ) + .bind( &ConfigData::listTestNamesOnly ); - cli["--order"] - .describe("test case order (defaults to decl)") - .bind(&setOrder, "decl|lex|rand"); + cli["--list-reporters"] + .describe( "list all reporters" ) + .bind( &ConfigData::listReporters ); - cli["--rng-seed"] - .describe("set a specific seed for random numbers") - .bind(&setRngSeed, "'time'|number"); + cli["--order"] + .describe( "test case order (defaults to decl)" ) + .bind( &setOrder, "decl|lex|rand" ); - cli["--force-colour"] - .describe("force colourised output") - .bind(&ConfigData::forceColour); + cli["--rng-seed"] + .describe( "set a specific seed for random numbers" ) + .bind( &setRngSeed, "'time'|number" ); - return cli; -} + cli["--force-colour"] + .describe( "force colourised output (deprecated)" ) + .bind( &forceColour ); + + cli["--use-colour"] + .describe( "should output be colourised" ) + .bind( &setUseColour, "yes|no" ); + + return cli; + } } // end namespace Catch @@ -5269,18 +5263,18 @@ inline Clara::CommandLine makeCommandLineParser() // #included from: ../external/tbc_text_format.h // Only use header guard if we are not using an outer namespace #ifndef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE -#ifdef TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED -#ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -#define TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -#endif -#else -#define TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED -#endif +# ifdef TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED +# ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED +# define TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED +# endif +# else +# define TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED +# endif #endif #ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -#include #include #include +#include // Use optional outer namespace #ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE @@ -5290,153 +5284,132 @@ namespace CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE { namespace Tbc { #ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH -const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH; + const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH; #else -const unsigned int consoleWidth = 80; + const unsigned int consoleWidth = 80; #endif -struct TextAttributes -{ - TextAttributes() - : initialIndent(std::string::npos), - indent(0), - width(consoleWidth - 1), - tabChar('\t') - { - } - - TextAttributes& setInitialIndent(std::size_t _value) - { - initialIndent = _value; - return *this; - } - TextAttributes& setIndent(std::size_t _value) - { - indent = _value; - return *this; - } - TextAttributes& setWidth(std::size_t _value) - { - width = _value; - return *this; - } - TextAttributes& setTabChar(char _value) - { - tabChar = _value; - return *this; - } + struct TextAttributes { + TextAttributes() + : initialIndent( std::string::npos ), + indent( 0 ), + width( consoleWidth-1 ) + {} - std::size_t initialIndent; // indent of first line, or npos - std::size_t indent; // indent of subsequent lines, or all if initialIndent is npos - std::size_t width; // maximum width of text, including indent. Longer text will wrap - char tabChar; // If this char is seen the indent is changed to current pos -}; + TextAttributes& setInitialIndent( std::size_t _value ) { initialIndent = _value; return *this; } + TextAttributes& setIndent( std::size_t _value ) { indent = _value; return *this; } + TextAttributes& setWidth( std::size_t _value ) { width = _value; return *this; } -class Text -{ - public: - Text(std::string const& _str, TextAttributes const& _attr = TextAttributes()) - : attr(_attr) - { - std::string wrappableChars = " [({.,/|\\-"; - std::size_t indent = _attr.initialIndent != std::string::npos - ? _attr.initialIndent - : _attr.indent; - std::string remainder = _str; + std::size_t initialIndent; // indent of first line, or npos + std::size_t indent; // indent of subsequent lines, or all if initialIndent is npos + std::size_t width; // maximum width of text, including indent. Longer text will wrap + }; - while (!remainder.empty()) + class Text { + public: + Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() ) + : attr( _attr ) { - if (lines.size() >= 1000) - { - lines.push_back("... message truncated due to excessive size"); - return; - } - std::size_t tabPos = std::string::npos; - std::size_t width = (std::min)(remainder.size(), _attr.width - indent); - std::size_t pos = remainder.find_first_of('\n'); - if (pos <= width) - { - width = pos; - } - pos = remainder.find_last_of(_attr.tabChar, width); - if (pos != std::string::npos) - { - tabPos = pos; - if (remainder[width] == '\n') - width--; - remainder = remainder.substr(0, tabPos) + remainder.substr(tabPos + 1); - } + const std::string wrappableBeforeChars = "[({<\t"; + const std::string wrappableAfterChars = "])}>-,./|\\"; + const std::string wrappableInsteadOfChars = " \n\r"; + std::string indent = _attr.initialIndent != std::string::npos + ? std::string( _attr.initialIndent, ' ' ) + : std::string( _attr.indent, ' ' ); - if (width == remainder.size()) - { - spliceLine(indent, remainder, width); - } - else if (remainder[width] == '\n') - { - spliceLine(indent, remainder, width); - if (width <= 1 || remainder.size() != 1) - remainder = remainder.substr(1); - indent = _attr.indent; - } - else - { - pos = remainder.find_last_of(wrappableChars, width); - if (pos != std::string::npos && pos > 0) - { - spliceLine(indent, remainder, pos); - if (remainder[0] == ' ') - remainder = remainder.substr(1); + typedef std::string::const_iterator iterator; + iterator it = _str.begin(); + const iterator strEnd = _str.end(); + + while( it != strEnd ) { + + if( lines.size() >= 1000 ) { + lines.push_back( "... message truncated due to excessive size" ); + return; } - else - { - spliceLine(indent, remainder, width - 1); - lines.back() += "-"; + + std::string suffix; + std::size_t width = (std::min)( static_cast( strEnd-it ), _attr.width-static_cast( indent.size() ) ); + iterator itEnd = it+width; + iterator itNext = _str.end(); + + iterator itNewLine = std::find( it, itEnd, '\n' ); + if( itNewLine != itEnd ) + itEnd = itNewLine; + + if( itEnd != strEnd ) { + bool foundWrapPoint = false; + iterator findIt = itEnd; + do { + if( wrappableAfterChars.find( *findIt ) != std::string::npos && findIt != itEnd ) { + itEnd = findIt+1; + itNext = findIt+1; + foundWrapPoint = true; + } + else if( findIt > it && wrappableBeforeChars.find( *findIt ) != std::string::npos ) { + itEnd = findIt; + itNext = findIt; + foundWrapPoint = true; + } + else if( wrappableInsteadOfChars.find( *findIt ) != std::string::npos ) { + itNext = findIt+1; + itEnd = findIt; + foundWrapPoint = true; + } + if( findIt == it ) + break; + else + --findIt; + } + while( !foundWrapPoint ); + + if( !foundWrapPoint ) { + // No good wrap char, so we'll break mid word and add a hyphen + --itEnd; + itNext = itEnd; + suffix = "-"; + } + else { + while( itEnd > it && wrappableInsteadOfChars.find( *(itEnd-1) ) != std::string::npos ) + --itEnd; + } } - if (lines.size() == 1) - indent = _attr.indent; - if (tabPos != std::string::npos) - indent += tabPos; + lines.push_back( indent + std::string( it, itEnd ) + suffix ); + + if( indent.size() != _attr.indent ) + indent = std::string( _attr.indent, ' ' ); + it = itNext; } } - } - - void spliceLine(std::size_t _indent, std::string& _remainder, std::size_t _pos) - { - lines.push_back(std::string(_indent, ' ') + _remainder.substr(0, _pos)); - _remainder = _remainder.substr(_pos); - } - typedef std::vector::const_iterator const_iterator; + typedef std::vector::const_iterator const_iterator; - const_iterator begin() const { return lines.begin(); } - const_iterator end() const { return lines.end(); } - std::string const& last() const { return lines.back(); } - std::size_t size() const { return lines.size(); } - std::string const& operator[](std::size_t _index) const { return lines[_index]; } - std::string toString() const - { - std::ostringstream oss; - oss << *this; - return oss.str(); - } + const_iterator begin() const { return lines.begin(); } + const_iterator end() const { return lines.end(); } + std::string const& last() const { return lines.back(); } + std::size_t size() const { return lines.size(); } + std::string const& operator[]( std::size_t _index ) const { return lines[_index]; } + std::string toString() const { + std::ostringstream oss; + oss << *this; + return oss.str(); + } - inline friend std::ostream& operator<<(std::ostream& _stream, Text const& _text) - { - for (Text::const_iterator it = _text.begin(), itEnd = _text.end(); - it != itEnd; ++it) - { - if (it != _text.begin()) - _stream << "\n"; - _stream << *it; + inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) { + for( Text::const_iterator it = _text.begin(), itEnd = _text.end(); + it != itEnd; ++it ) { + if( it != _text.begin() ) + _stream << "\n"; + _stream << *it; + } + return _stream; } - return _stream; - } - private: - std::string str; - TextAttributes attr; - std::vector lines; -}; + private: + std::string str; + TextAttributes attr; + std::vector lines; + }; } // end namespace Tbc @@ -5448,8 +5421,8 @@ class Text #undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE namespace Catch { -using Tbc::Text; -using Tbc::TextAttributes; + using Tbc::Text; + using Tbc::TextAttributes; } // #included from: catch_console_colour.hpp @@ -5457,510 +5430,473 @@ using Tbc::TextAttributes; namespace Catch { -struct Colour -{ - enum Code - { - None = 0, + struct Colour { + enum Code { + None = 0, - White, - Red, - Green, - Blue, - Cyan, - Yellow, - Grey, + White, + Red, + Green, + Blue, + Cyan, + Yellow, + Grey, - Bright = 0x10, + Bright = 0x10, - BrightRed = Bright | Red, - BrightGreen = Bright | Green, - LightGrey = Bright | Grey, - BrightWhite = Bright | White, + BrightRed = Bright | Red, + BrightGreen = Bright | Green, + LightGrey = Bright | Grey, + BrightWhite = Bright | White, - // By intention - FileName = LightGrey, - Warning = Yellow, - ResultError = BrightRed, - ResultSuccess = BrightGreen, - ResultExpectedFailure = Warning, + // By intention + FileName = LightGrey, + Warning = Yellow, + ResultError = BrightRed, + ResultSuccess = BrightGreen, + ResultExpectedFailure = Warning, - Error = BrightRed, - Success = Green, + Error = BrightRed, + Success = Green, - OriginalExpression = Cyan, - ReconstructedExpression = Yellow, + OriginalExpression = Cyan, + ReconstructedExpression = Yellow, - SecondaryText = LightGrey, - Headers = White - }; + SecondaryText = LightGrey, + Headers = White + }; - // Use constructed object for RAII guard - Colour(Code _colourCode); - Colour(Colour const& other); - ~Colour(); + // Use constructed object for RAII guard + Colour( Code _colourCode ); + Colour( Colour const& other ); + ~Colour(); - // Use static method for one-shot changes - static void use(Code _colourCode); + // Use static method for one-shot changes + static void use( Code _colourCode ); - private: - bool m_moved; -}; + private: + bool m_moved; + }; -inline std::ostream& operator<<(std::ostream& os, Colour const&) { return os; } + inline std::ostream& operator << ( std::ostream& os, Colour const& ) { return os; } } // end namespace Catch // #included from: catch_interfaces_reporter.h #define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED -#include -#include -#include #include +#include +#include -namespace Catch { -struct ReporterConfig -{ - explicit ReporterConfig(Ptr const& _fullConfig) - : m_stream(&_fullConfig->stream()), m_fullConfig(_fullConfig) {} - - ReporterConfig(Ptr const& _fullConfig, std::ostream& _stream) - : m_stream(&_stream), m_fullConfig(_fullConfig) {} - - std::ostream& stream() const { return *m_stream; } - Ptr fullConfig() const { return m_fullConfig; } - - private: - std::ostream* m_stream; - Ptr m_fullConfig; -}; - -struct ReporterPreferences +namespace Catch { - ReporterPreferences() - : shouldRedirectStdOut(false) - { - } + struct ReporterConfig { + explicit ReporterConfig( Ptr const& _fullConfig ) + : m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {} - bool shouldRedirectStdOut; -}; + ReporterConfig( Ptr const& _fullConfig, std::ostream& _stream ) + : m_stream( &_stream ), m_fullConfig( _fullConfig ) {} -template -struct LazyStat : Option -{ - LazyStat() : used(false) {} - LazyStat& operator=(T const& _value) - { - Option::operator=(_value); - used = false; - return *this; - } - void reset() - { - Option::reset(); - used = false; - } - bool used; -}; + std::ostream& stream() const { return *m_stream; } + Ptr fullConfig() const { return m_fullConfig; } -struct TestRunInfo -{ - TestRunInfo(std::string const& _name) : name(_name) {} - std::string name; -}; -struct GroupInfo -{ - GroupInfo(std::string const& _name, - std::size_t _groupIndex, - std::size_t _groupsCount) - : name(_name), - groupIndex(_groupIndex), - groupsCounts(_groupsCount) - { - } + private: + std::ostream* m_stream; + Ptr m_fullConfig; + }; - std::string name; - std::size_t groupIndex; - std::size_t groupsCounts; -}; + struct ReporterPreferences { + ReporterPreferences() + : shouldRedirectStdOut( false ) + {} -struct AssertionStats -{ - AssertionStats(AssertionResult const& _assertionResult, - std::vector const& _infoMessages, - Totals const& _totals) - : assertionResult(_assertionResult), - infoMessages(_infoMessages), - totals(_totals) - { - if (assertionResult.hasMessage()) - { - // Copy message into messages list. - // !TBD This should have been done earlier, somewhere - MessageBuilder builder(assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType()); - builder << assertionResult.getMessage(); - builder.m_info.message = builder.m_stream.str(); + bool shouldRedirectStdOut; + }; - infoMessages.push_back(builder.m_info); + template + struct LazyStat : Option { + LazyStat() : used( false ) {} + LazyStat& operator=( T const& _value ) { + Option::operator=( _value ); + used = false; + return *this; } - } - virtual ~AssertionStats(); - -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - AssertionStats(AssertionStats const&) = default; - AssertionStats(AssertionStats&&) = default; - AssertionStats& operator=(AssertionStats const&) = default; - AssertionStats& operator=(AssertionStats&&) = default; -#endif - - AssertionResult assertionResult; - std::vector infoMessages; - Totals totals; -}; - -struct SectionStats -{ - SectionStats(SectionInfo const& _sectionInfo, - Counts const& _assertions, - double _durationInSeconds, - bool _missingAssertions) - : sectionInfo(_sectionInfo), - assertions(_assertions), - durationInSeconds(_durationInSeconds), - missingAssertions(_missingAssertions) - { - } - virtual ~SectionStats(); -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - SectionStats(SectionStats const&) = default; - SectionStats(SectionStats&&) = default; - SectionStats& operator=(SectionStats const&) = default; - SectionStats& operator=(SectionStats&&) = default; -#endif - - SectionInfo sectionInfo; - Counts assertions; - double durationInSeconds; - bool missingAssertions; -}; - -struct TestCaseStats -{ - TestCaseStats(TestCaseInfo const& _testInfo, - Totals const& _totals, - std::string const& _stdOut, - std::string const& _stdErr, - bool _aborting) - : testInfo(_testInfo), - totals(_totals), - stdOut(_stdOut), - stdErr(_stdErr), - aborting(_aborting) - { - } - virtual ~TestCaseStats(); - -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - TestCaseStats(TestCaseStats const&) = default; - TestCaseStats(TestCaseStats&&) = default; - TestCaseStats& operator=(TestCaseStats const&) = default; - TestCaseStats& operator=(TestCaseStats&&) = default; -#endif - - TestCaseInfo testInfo; - Totals totals; - std::string stdOut; - std::string stdErr; - bool aborting; -}; + void reset() { + Option::reset(); + used = false; + } + bool used; + }; -struct TestGroupStats -{ - TestGroupStats(GroupInfo const& _groupInfo, - Totals const& _totals, - bool _aborting) - : groupInfo(_groupInfo), - totals(_totals), - aborting(_aborting) - { - } - TestGroupStats(GroupInfo const& _groupInfo) - : groupInfo(_groupInfo), - aborting(false) - { - } - virtual ~TestGroupStats(); + struct TestRunInfo { + TestRunInfo( std::string const& _name ) : name( _name ) {} + std::string name; + }; + struct GroupInfo { + GroupInfo( std::string const& _name, + std::size_t _groupIndex, + std::size_t _groupsCount ) + : name( _name ), + groupIndex( _groupIndex ), + groupsCounts( _groupsCount ) + {} + + std::string name; + std::size_t groupIndex; + std::size_t groupsCounts; + }; -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - TestGroupStats(TestGroupStats const&) = default; - TestGroupStats(TestGroupStats&&) = default; - TestGroupStats& operator=(TestGroupStats const&) = default; - TestGroupStats& operator=(TestGroupStats&&) = default; -#endif + struct AssertionStats { + AssertionStats( AssertionResult const& _assertionResult, + std::vector const& _infoMessages, + Totals const& _totals ) + : assertionResult( _assertionResult ), + infoMessages( _infoMessages ), + totals( _totals ) + { + if( assertionResult.hasMessage() ) { + // Copy message into messages list. + // !TBD This should have been done earlier, somewhere + MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() ); + builder << assertionResult.getMessage(); + builder.m_info.message = builder.m_stream.str(); + + infoMessages.push_back( builder.m_info ); + } + } + virtual ~AssertionStats(); - GroupInfo groupInfo; - Totals totals; - bool aborting; -}; +# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS + AssertionStats( AssertionStats const& ) = default; + AssertionStats( AssertionStats && ) = default; + AssertionStats& operator = ( AssertionStats const& ) = default; + AssertionStats& operator = ( AssertionStats && ) = default; +# endif -struct TestRunStats -{ - TestRunStats(TestRunInfo const& _runInfo, - Totals const& _totals, - bool _aborting) - : runInfo(_runInfo), - totals(_totals), - aborting(_aborting) - { - } - virtual ~TestRunStats(); + AssertionResult assertionResult; + std::vector infoMessages; + Totals totals; + }; -#ifndef CATCH_CONFIG_CPP11_GENERATED_METHODS - TestRunStats(TestRunStats const& _other) - : runInfo(_other.runInfo), - totals(_other.totals), - aborting(_other.aborting) - { - } -#else - TestRunStats(TestRunStats const&) = default; - TestRunStats(TestRunStats&&) = default; - TestRunStats& operator=(TestRunStats const&) = default; - TestRunStats& operator=(TestRunStats&&) = default; -#endif + struct SectionStats { + SectionStats( SectionInfo const& _sectionInfo, + Counts const& _assertions, + double _durationInSeconds, + bool _missingAssertions ) + : sectionInfo( _sectionInfo ), + assertions( _assertions ), + durationInSeconds( _durationInSeconds ), + missingAssertions( _missingAssertions ) + {} + virtual ~SectionStats(); +# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS + SectionStats( SectionStats const& ) = default; + SectionStats( SectionStats && ) = default; + SectionStats& operator = ( SectionStats const& ) = default; + SectionStats& operator = ( SectionStats && ) = default; +# endif + + SectionInfo sectionInfo; + Counts assertions; + double durationInSeconds; + bool missingAssertions; + }; - TestRunInfo runInfo; - Totals totals; - bool aborting; -}; + struct TestCaseStats { + TestCaseStats( TestCaseInfo const& _testInfo, + Totals const& _totals, + std::string const& _stdOut, + std::string const& _stdErr, + bool _aborting ) + : testInfo( _testInfo ), + totals( _totals ), + stdOut( _stdOut ), + stdErr( _stdErr ), + aborting( _aborting ) + {} + virtual ~TestCaseStats(); + +# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS + TestCaseStats( TestCaseStats const& ) = default; + TestCaseStats( TestCaseStats && ) = default; + TestCaseStats& operator = ( TestCaseStats const& ) = default; + TestCaseStats& operator = ( TestCaseStats && ) = default; +# endif + + TestCaseInfo testInfo; + Totals totals; + std::string stdOut; + std::string stdErr; + bool aborting; + }; -struct IStreamingReporter : IShared -{ - virtual ~IStreamingReporter(); + struct TestGroupStats { + TestGroupStats( GroupInfo const& _groupInfo, + Totals const& _totals, + bool _aborting ) + : groupInfo( _groupInfo ), + totals( _totals ), + aborting( _aborting ) + {} + TestGroupStats( GroupInfo const& _groupInfo ) + : groupInfo( _groupInfo ), + aborting( false ) + {} + virtual ~TestGroupStats(); + +# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS + TestGroupStats( TestGroupStats const& ) = default; + TestGroupStats( TestGroupStats && ) = default; + TestGroupStats& operator = ( TestGroupStats const& ) = default; + TestGroupStats& operator = ( TestGroupStats && ) = default; +# endif + + GroupInfo groupInfo; + Totals totals; + bool aborting; + }; - // Implementing class must also provide the following static method: - // static std::string getDescription(); + struct TestRunStats { + TestRunStats( TestRunInfo const& _runInfo, + Totals const& _totals, + bool _aborting ) + : runInfo( _runInfo ), + totals( _totals ), + aborting( _aborting ) + {} + virtual ~TestRunStats(); + +# ifndef CATCH_CONFIG_CPP11_GENERATED_METHODS + TestRunStats( TestRunStats const& _other ) + : runInfo( _other.runInfo ), + totals( _other.totals ), + aborting( _other.aborting ) + {} +# else + TestRunStats( TestRunStats const& ) = default; + TestRunStats( TestRunStats && ) = default; + TestRunStats& operator = ( TestRunStats const& ) = default; + TestRunStats& operator = ( TestRunStats && ) = default; +# endif + + TestRunInfo runInfo; + Totals totals; + bool aborting; + }; - virtual ReporterPreferences getPreferences() const = 0; + class MultipleReporters; - virtual void noMatchingTestCases(std::string const& spec) = 0; + struct IStreamingReporter : IShared { + virtual ~IStreamingReporter(); - virtual void testRunStarting(TestRunInfo const& testRunInfo) = 0; - virtual void testGroupStarting(GroupInfo const& groupInfo) = 0; + // Implementing class must also provide the following static method: + // static std::string getDescription(); - virtual void testCaseStarting(TestCaseInfo const& testInfo) = 0; - virtual void sectionStarting(SectionInfo const& sectionInfo) = 0; + virtual ReporterPreferences getPreferences() const = 0; - virtual void assertionStarting(AssertionInfo const& assertionInfo) = 0; + virtual void noMatchingTestCases( std::string const& spec ) = 0; - // The return value indicates if the messages buffer should be cleared: - virtual bool assertionEnded(AssertionStats const& assertionStats) = 0; + virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0; + virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0; - virtual void sectionEnded(SectionStats const& sectionStats) = 0; - virtual void testCaseEnded(TestCaseStats const& testCaseStats) = 0; - virtual void testGroupEnded(TestGroupStats const& testGroupStats) = 0; - virtual void testRunEnded(TestRunStats const& testRunStats) = 0; + virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0; + virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0; - virtual void skipTest(TestCaseInfo const& testInfo) = 0; -}; + virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0; -struct IReporterFactory : IShared -{ - virtual ~IReporterFactory(); - virtual IStreamingReporter* create(ReporterConfig const& config) const = 0; - virtual std::string getDescription() const = 0; -}; + // The return value indicates if the messages buffer should be cleared: + virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0; -struct IReporterRegistry -{ - typedef std::map> FactoryMap; - typedef std::vector> Listeners; + virtual void sectionEnded( SectionStats const& sectionStats ) = 0; + virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0; + virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0; + virtual void testRunEnded( TestRunStats const& testRunStats ) = 0; - virtual ~IReporterRegistry(); - virtual IStreamingReporter* create(std::string const& name, Ptr const& config) const = 0; - virtual FactoryMap const& getFactories() const = 0; - virtual Listeners const& getListeners() const = 0; -}; + virtual void skipTest( TestCaseInfo const& testInfo ) = 0; -Ptr addReporter(Ptr const& existingReporter, Ptr const& additionalReporter); -} + virtual MultipleReporters* tryAsMulti() { return CATCH_NULL; } + }; -#include -#include + struct IReporterFactory : IShared { + virtual ~IReporterFactory(); + virtual IStreamingReporter* create( ReporterConfig const& config ) const = 0; + virtual std::string getDescription() const = 0; + }; -namespace Catch { + struct IReporterRegistry { + typedef std::map > FactoryMap; + typedef std::vector > Listeners; -inline std::size_t listTests(Config const& config) -{ + virtual ~IReporterRegistry(); + virtual IStreamingReporter* create( std::string const& name, Ptr const& config ) const = 0; + virtual FactoryMap const& getFactories() const = 0; + virtual Listeners const& getListeners() const = 0; + }; - TestSpec testSpec = config.testSpec(); - if (config.testSpec().hasFilters()) - Catch::cout() << "Matching test cases:\n"; - else - { - Catch::cout() << "All available test cases:\n"; - testSpec = TestSpecParser(ITagAliasRegistry::get()).parse("*").testSpec(); - } + Ptr addReporter( Ptr const& existingReporter, Ptr const& additionalReporter ); - std::size_t matchedTests = 0; - TextAttributes nameAttr, tagsAttr; - nameAttr.setInitialIndent(2).setIndent(4); - tagsAttr.setIndent(6); +} - std::vector matchedTestCases = filterTests(getAllTestCasesSorted(config), testSpec, config); - for (std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); - it != itEnd; - ++it) - { - matchedTests++; - TestCaseInfo const& testCaseInfo = it->getTestCaseInfo(); - Colour::Code colour = testCaseInfo.isHidden() - ? Colour::SecondaryText - : Colour::None; - Colour colourGuard(colour); +#include +#include - Catch::cout() << Text(testCaseInfo.name, nameAttr) << std::endl; - if (!testCaseInfo.tags.empty()) - Catch::cout() << Text(testCaseInfo.tagsAsString, tagsAttr) << std::endl; - } +namespace Catch { - if (!config.testSpec().hasFilters()) - Catch::cout() << pluralise(matchedTests, "test case") << "\n" - << std::endl; - else - Catch::cout() << pluralise(matchedTests, "matching test case") << "\n" - << std::endl; - return matchedTests; -} + inline std::size_t listTests( Config const& config ) { -inline std::size_t listTestsNamesOnly(Config const& config) -{ - TestSpec testSpec = config.testSpec(); - if (!config.testSpec().hasFilters()) - testSpec = TestSpecParser(ITagAliasRegistry::get()).parse("*").testSpec(); - std::size_t matchedTests = 0; - std::vector matchedTestCases = filterTests(getAllTestCasesSorted(config), testSpec, config); - for (std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); - it != itEnd; - ++it) - { - matchedTests++; - TestCaseInfo const& testCaseInfo = it->getTestCaseInfo(); - Catch::cout() << testCaseInfo.name << std::endl; - } - return matchedTests; -} + TestSpec testSpec = config.testSpec(); + if( config.testSpec().hasFilters() ) + Catch::cout() << "Matching test cases:\n"; + else { + Catch::cout() << "All available test cases:\n"; + testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec(); + } -struct TagInfo -{ - TagInfo() : count(0) {} - void add(std::string const& spelling) - { - ++count; - spellings.insert(spelling); - } - std::string all() const - { - std::string out; - for (std::set::const_iterator it = spellings.begin(), itEnd = spellings.end(); - it != itEnd; - ++it) - out += "[" + *it + "]"; - return out; - } - std::set spellings; - std::size_t count; -}; + std::size_t matchedTests = 0; + TextAttributes nameAttr, tagsAttr; + nameAttr.setInitialIndent( 2 ).setIndent( 4 ); + tagsAttr.setIndent( 6 ); -inline std::size_t listTags(Config const& config) -{ - TestSpec testSpec = config.testSpec(); - if (config.testSpec().hasFilters()) - Catch::cout() << "Tags for matching test cases:\n"; - else - { - Catch::cout() << "All available tags:\n"; - testSpec = TestSpecParser(ITagAliasRegistry::get()).parse("*").testSpec(); - } + std::vector matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config ); + for( std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); + it != itEnd; + ++it ) { + matchedTests++; + TestCaseInfo const& testCaseInfo = it->getTestCaseInfo(); + Colour::Code colour = testCaseInfo.isHidden() + ? Colour::SecondaryText + : Colour::None; + Colour colourGuard( colour ); - std::map tagCounts; + Catch::cout() << Text( testCaseInfo.name, nameAttr ) << std::endl; + if( !testCaseInfo.tags.empty() ) + Catch::cout() << Text( testCaseInfo.tagsAsString, tagsAttr ) << std::endl; + } - std::vector matchedTestCases = filterTests(getAllTestCasesSorted(config), testSpec, config); - for (std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); - it != itEnd; - ++it) - { - for (std::set::const_iterator tagIt = it->getTestCaseInfo().tags.begin(), - tagItEnd = it->getTestCaseInfo().tags.end(); - tagIt != tagItEnd; - ++tagIt) - { - std::string tagName = *tagIt; - std::string lcaseTagName = toLower(tagName); - std::map::iterator countIt = tagCounts.find(lcaseTagName); - if (countIt == tagCounts.end()) - countIt = tagCounts.insert(std::make_pair(lcaseTagName, TagInfo())).first; - countIt->second.add(tagName); + if( !config.testSpec().hasFilters() ) + Catch::cout() << pluralise( matchedTests, "test case" ) << '\n' << std::endl; + else + Catch::cout() << pluralise( matchedTests, "matching test case" ) << '\n' << std::endl; + return matchedTests; + } + + inline std::size_t listTestsNamesOnly( Config const& config ) { + TestSpec testSpec = config.testSpec(); + if( !config.testSpec().hasFilters() ) + testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec(); + std::size_t matchedTests = 0; + std::vector matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config ); + for( std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); + it != itEnd; + ++it ) { + matchedTests++; + TestCaseInfo const& testCaseInfo = it->getTestCaseInfo(); + if( startsWith( testCaseInfo.name, '#' ) ) + Catch::cout() << '"' << testCaseInfo.name << '"' << std::endl; + else + Catch::cout() << testCaseInfo.name << std::endl; } + return matchedTests; } - for (std::map::const_iterator countIt = tagCounts.begin(), - countItEnd = tagCounts.end(); - countIt != countItEnd; - ++countIt) - { - std::ostringstream oss; - oss << " " << std::setw(2) << countIt->second.count << " "; - Text wrapper(countIt->second.all(), TextAttributes() - .setInitialIndent(0) - .setIndent(oss.str().size()) - .setWidth(CATCH_CONFIG_CONSOLE_WIDTH - 10)); - Catch::cout() << oss.str() << wrapper << "\n"; - } - Catch::cout() << pluralise(tagCounts.size(), "tag") << "\n" - << std::endl; - return tagCounts.size(); -} + struct TagInfo { + TagInfo() : count ( 0 ) {} + void add( std::string const& spelling ) { + ++count; + spellings.insert( spelling ); + } + std::string all() const { + std::string out; + for( std::set::const_iterator it = spellings.begin(), itEnd = spellings.end(); + it != itEnd; + ++it ) + out += "[" + *it + "]"; + return out; + } + std::set spellings; + std::size_t count; + }; -inline std::size_t listReporters(Config const& /*config*/) -{ - Catch::cout() << "Available reporters:\n"; - IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories(); - IReporterRegistry::FactoryMap::const_iterator itBegin = factories.begin(), itEnd = factories.end(), it; - std::size_t maxNameLen = 0; - for (it = itBegin; it != itEnd; ++it) - maxNameLen = (std::max)(maxNameLen, it->first.size()); - - for (it = itBegin; it != itEnd; ++it) - { - Text wrapper(it->second->getDescription(), TextAttributes() - .setInitialIndent(0) - .setIndent(7 + maxNameLen) - .setWidth(CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen - 8)); - Catch::cout() << " " - << it->first - << ":" - << std::string(maxNameLen - it->first.size() + 2, ' ') - << wrapper << "\n"; - } - Catch::cout() << std::endl; - return factories.size(); -} + inline std::size_t listTags( Config const& config ) { + TestSpec testSpec = config.testSpec(); + if( config.testSpec().hasFilters() ) + Catch::cout() << "Tags for matching test cases:\n"; + else { + Catch::cout() << "All available tags:\n"; + testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec(); + } + + std::map tagCounts; + + std::vector matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config ); + for( std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); + it != itEnd; + ++it ) { + for( std::set::const_iterator tagIt = it->getTestCaseInfo().tags.begin(), + tagItEnd = it->getTestCaseInfo().tags.end(); + tagIt != tagItEnd; + ++tagIt ) { + std::string tagName = *tagIt; + std::string lcaseTagName = toLower( tagName ); + std::map::iterator countIt = tagCounts.find( lcaseTagName ); + if( countIt == tagCounts.end() ) + countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first; + countIt->second.add( tagName ); + } + } -inline Option list(Config const& config) -{ - Option listedCount; - if (config.listTests()) - listedCount = listedCount.valueOr(0) + listTests(config); - if (config.listTestNamesOnly()) - listedCount = listedCount.valueOr(0) + listTestsNamesOnly(config); - if (config.listTags()) - listedCount = listedCount.valueOr(0) + listTags(config); - if (config.listReporters()) - listedCount = listedCount.valueOr(0) + listReporters(config); - return listedCount; -} + for( std::map::const_iterator countIt = tagCounts.begin(), + countItEnd = tagCounts.end(); + countIt != countItEnd; + ++countIt ) { + std::ostringstream oss; + oss << " " << std::setw(2) << countIt->second.count << " "; + Text wrapper( countIt->second.all(), TextAttributes() + .setInitialIndent( 0 ) + .setIndent( oss.str().size() ) + .setWidth( CATCH_CONFIG_CONSOLE_WIDTH-10 ) ); + Catch::cout() << oss.str() << wrapper << '\n'; + } + Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl; + return tagCounts.size(); + } + + inline std::size_t listReporters( Config const& /*config*/ ) { + Catch::cout() << "Available reporters:\n"; + IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories(); + IReporterRegistry::FactoryMap::const_iterator itBegin = factories.begin(), itEnd = factories.end(), it; + std::size_t maxNameLen = 0; + for(it = itBegin; it != itEnd; ++it ) + maxNameLen = (std::max)( maxNameLen, it->first.size() ); + + for(it = itBegin; it != itEnd; ++it ) { + Text wrapper( it->second->getDescription(), TextAttributes() + .setInitialIndent( 0 ) + .setIndent( 7+maxNameLen ) + .setWidth( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 ) ); + Catch::cout() << " " + << it->first + << ':' + << std::string( maxNameLen - it->first.size() + 2, ' ' ) + << wrapper << '\n'; + } + Catch::cout() << std::endl; + return factories.size(); + } + + inline Option list( Config const& config ) { + Option listedCount; + if( config.listTests() ) + listedCount = listedCount.valueOr(0) + listTests( config ); + if( config.listTestNamesOnly() ) + listedCount = listedCount.valueOr(0) + listTestsNamesOnly( config ); + if( config.listTags() ) + listedCount = listedCount.valueOr(0) + listTags( config ); + if( config.listReporters() ) + listedCount = listedCount.valueOr(0) + listReporters( config ); + return listedCount; + } } // end namespace Catch @@ -5970,348 +5906,349 @@ inline Option list(Config const& config) // #included from: catch_test_case_tracker.hpp #define TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED -#include -#include +#include #include +#include #include +#include + +CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS namespace Catch { namespace TestCaseTracking { -struct ITracker : SharedImpl<> -{ - virtual ~ITracker(); + struct NameAndLocation { + std::string name; + SourceLineInfo location; - // static queries - virtual std::string name() const = 0; + NameAndLocation( std::string const& _name, SourceLineInfo const& _location ) + : name( _name ), + location( _location ) + {} + }; - // dynamic queries - virtual bool isComplete() const = 0; // Successfully completed or failed - virtual bool isSuccessfullyCompleted() const = 0; - virtual bool isOpen() const = 0; // Started but not complete - virtual bool hasChildren() const = 0; + struct ITracker : SharedImpl<> { + virtual ~ITracker(); - virtual ITracker& parent() = 0; + // static queries + virtual NameAndLocation const& nameAndLocation() const = 0; - // actions - virtual void close() = 0; // Successfully complete - virtual void fail() = 0; - virtual void markAsNeedingAnotherRun() = 0; + // dynamic queries + virtual bool isComplete() const = 0; // Successfully completed or failed + virtual bool isSuccessfullyCompleted() const = 0; + virtual bool isOpen() const = 0; // Started but not complete + virtual bool hasChildren() const = 0; - virtual void addChild(Ptr const& child) = 0; - virtual ITracker* findChild(std::string const& name) = 0; - virtual void openChild() = 0; -}; + virtual ITracker& parent() = 0; -class TrackerContext -{ + // actions + virtual void close() = 0; // Successfully complete + virtual void fail() = 0; + virtual void markAsNeedingAnotherRun() = 0; - enum RunState - { - NotStarted, - Executing, - CompletedCycle + virtual void addChild( Ptr const& child ) = 0; + virtual ITracker* findChild( NameAndLocation const& nameAndLocation ) = 0; + virtual void openChild() = 0; + + // Debug/ checking + virtual bool isSectionTracker() const = 0; + virtual bool isIndexTracker() const = 0; }; - Ptr m_rootTracker; - ITracker* m_currentTracker; - RunState m_runState; + class TrackerContext { - public: - static TrackerContext& instance() - { - static TrackerContext s_instance; - return s_instance; - } + enum RunState { + NotStarted, + Executing, + CompletedCycle + }; - TrackerContext() - : m_currentTracker(CATCH_NULL), - m_runState(NotStarted) - { - } + Ptr m_rootTracker; + ITracker* m_currentTracker; + RunState m_runState; - ITracker& startRun(); + public: - void endRun() - { - m_rootTracker.reset(); - m_currentTracker = CATCH_NULL; - m_runState = NotStarted; - } + static TrackerContext& instance() { + static TrackerContext s_instance; + return s_instance; + } - void startCycle() - { - m_currentTracker = m_rootTracker.get(); - m_runState = Executing; - } - void completeCycle() - { - m_runState = CompletedCycle; - } + TrackerContext() + : m_currentTracker( CATCH_NULL ), + m_runState( NotStarted ) + {} - bool completedCycle() const - { - return m_runState == CompletedCycle; - } - ITracker& currentTracker() - { - return *m_currentTracker; - } - void setCurrentTracker(ITracker* tracker) - { - m_currentTracker = tracker; - } -}; + ITracker& startRun(); -class TrackerBase : public ITracker -{ - protected: - enum CycleState - { - NotStarted, - Executing, - ExecutingChildren, - NeedsAnotherRun, - CompletedSuccessfully, - Failed - }; - class TrackerHasName - { - std::string m_name; + void endRun() { + m_rootTracker.reset(); + m_currentTracker = CATCH_NULL; + m_runState = NotStarted; + } - public: - TrackerHasName(std::string const& name) : m_name(name) {} - bool operator()(Ptr const& tracker) - { - return tracker->name() == m_name; - } - }; - typedef std::vector> Children; - std::string m_name; - TrackerContext& m_ctx; - ITracker* m_parent; - Children m_children; - CycleState m_runState; - - public: - TrackerBase(std::string const& name, TrackerContext& ctx, ITracker* parent) - : m_name(name), - m_ctx(ctx), - m_parent(parent), - m_runState(NotStarted) - { - } - virtual ~TrackerBase(); + void startCycle() { + m_currentTracker = m_rootTracker.get(); + m_runState = Executing; + } + void completeCycle() { + m_runState = CompletedCycle; + } - virtual std::string name() const CATCH_OVERRIDE - { - return m_name; - } - virtual bool isComplete() const CATCH_OVERRIDE - { - return m_runState == CompletedSuccessfully || m_runState == Failed; - } - virtual bool isSuccessfullyCompleted() const CATCH_OVERRIDE - { - return m_runState == CompletedSuccessfully; - } - virtual bool isOpen() const CATCH_OVERRIDE - { - return m_runState != NotStarted && !isComplete(); - } - virtual bool hasChildren() const CATCH_OVERRIDE - { - return !m_children.empty(); - } + bool completedCycle() const { + return m_runState == CompletedCycle; + } + ITracker& currentTracker() { + return *m_currentTracker; + } + void setCurrentTracker( ITracker* tracker ) { + m_currentTracker = tracker; + } + }; - virtual void addChild(Ptr const& child) CATCH_OVERRIDE - { - m_children.push_back(child); - } + class TrackerBase : public ITracker { + protected: + enum CycleState { + NotStarted, + Executing, + ExecutingChildren, + NeedsAnotherRun, + CompletedSuccessfully, + Failed + }; + class TrackerHasName { + NameAndLocation m_nameAndLocation; + public: + TrackerHasName( NameAndLocation const& nameAndLocation ) : m_nameAndLocation( nameAndLocation ) {} + bool operator ()( Ptr const& tracker ) { + return + tracker->nameAndLocation().name == m_nameAndLocation.name && + tracker->nameAndLocation().location == m_nameAndLocation.location; + } + }; + typedef std::vector > Children; + NameAndLocation m_nameAndLocation; + TrackerContext& m_ctx; + ITracker* m_parent; + Children m_children; + CycleState m_runState; + public: + TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ) + : m_nameAndLocation( nameAndLocation ), + m_ctx( ctx ), + m_parent( parent ), + m_runState( NotStarted ) + {} + virtual ~TrackerBase(); - virtual ITracker* findChild(std::string const& name) CATCH_OVERRIDE - { - Children::const_iterator it = std::find_if(m_children.begin(), m_children.end(), TrackerHasName(name)); - return (it != m_children.end()) - ? it->get() - : CATCH_NULL; - } - virtual ITracker& parent() CATCH_OVERRIDE - { - assert(m_parent); // Should always be non-null except for root - return *m_parent; - } + virtual NameAndLocation const& nameAndLocation() const CATCH_OVERRIDE { + return m_nameAndLocation; + } + virtual bool isComplete() const CATCH_OVERRIDE { + return m_runState == CompletedSuccessfully || m_runState == Failed; + } + virtual bool isSuccessfullyCompleted() const CATCH_OVERRIDE { + return m_runState == CompletedSuccessfully; + } + virtual bool isOpen() const CATCH_OVERRIDE { + return m_runState != NotStarted && !isComplete(); + } + virtual bool hasChildren() const CATCH_OVERRIDE { + return !m_children.empty(); + } - virtual void openChild() CATCH_OVERRIDE - { - if (m_runState != ExecutingChildren) - { - m_runState = ExecutingChildren; - if (m_parent) - m_parent->openChild(); + virtual void addChild( Ptr const& child ) CATCH_OVERRIDE { + m_children.push_back( child ); } - } - void open() - { - m_runState = Executing; - moveToThis(); - if (m_parent) - m_parent->openChild(); - } - virtual void close() CATCH_OVERRIDE - { + virtual ITracker* findChild( NameAndLocation const& nameAndLocation ) CATCH_OVERRIDE { + Children::const_iterator it = std::find_if( m_children.begin(), m_children.end(), TrackerHasName( nameAndLocation ) ); + return( it != m_children.end() ) + ? it->get() + : CATCH_NULL; + } + virtual ITracker& parent() CATCH_OVERRIDE { + assert( m_parent ); // Should always be non-null except for root + return *m_parent; + } - // Close any still open children (e.g. generators) - while (&m_ctx.currentTracker() != this) - m_ctx.currentTracker().close(); + virtual void openChild() CATCH_OVERRIDE { + if( m_runState != ExecutingChildren ) { + m_runState = ExecutingChildren; + if( m_parent ) + m_parent->openChild(); + } + } - switch (m_runState) - { - case NotStarted: - case CompletedSuccessfully: - case Failed: - throw std::logic_error("Illogical state"); - - case NeedsAnotherRun: - break; - ; - - case Executing: - m_runState = CompletedSuccessfully; - break; - case ExecutingChildren: - if (m_children.empty() || m_children.back()->isComplete()) - m_runState = CompletedSuccessfully; - break; - - default: - throw std::logic_error("Unexpected state"); - } - moveToParent(); - m_ctx.completeCycle(); - } - virtual void fail() CATCH_OVERRIDE - { - m_runState = Failed; - if (m_parent) - m_parent->markAsNeedingAnotherRun(); - moveToParent(); - m_ctx.completeCycle(); - } - virtual void markAsNeedingAnotherRun() CATCH_OVERRIDE - { - m_runState = NeedsAnotherRun; - } + virtual bool isSectionTracker() const CATCH_OVERRIDE { return false; } + virtual bool isIndexTracker() const CATCH_OVERRIDE { return false; } - private: - void moveToParent() - { - assert(m_parent); - m_ctx.setCurrentTracker(m_parent); - } - void moveToThis() - { - m_ctx.setCurrentTracker(this); - } -}; + void open() { + m_runState = Executing; + moveToThis(); + if( m_parent ) + m_parent->openChild(); + } -class SectionTracker : public TrackerBase -{ - public: - SectionTracker(std::string const& name, TrackerContext& ctx, ITracker* parent) - : TrackerBase(name, ctx, parent) - { - } - virtual ~SectionTracker(); + virtual void close() CATCH_OVERRIDE { - static SectionTracker& acquire(TrackerContext& ctx, std::string const& name) - { - SectionTracker* section = CATCH_NULL; + // Close any still open children (e.g. generators) + while( &m_ctx.currentTracker() != this ) + m_ctx.currentTracker().close(); - ITracker& currentTracker = ctx.currentTracker(); - if (ITracker* childTracker = currentTracker.findChild(name)) - { - section = dynamic_cast(childTracker); - assert(section); + switch( m_runState ) { + case NotStarted: + case CompletedSuccessfully: + case Failed: + throw std::logic_error( "Illogical state" ); + + case NeedsAnotherRun: + break;; + + case Executing: + m_runState = CompletedSuccessfully; + break; + case ExecutingChildren: + if( m_children.empty() || m_children.back()->isComplete() ) + m_runState = CompletedSuccessfully; + break; + + default: + throw std::logic_error( "Unexpected state" ); + } + moveToParent(); + m_ctx.completeCycle(); } - else - { - section = new SectionTracker(name, ctx, ¤tTracker); - currentTracker.addChild(section); + virtual void fail() CATCH_OVERRIDE { + m_runState = Failed; + if( m_parent ) + m_parent->markAsNeedingAnotherRun(); + moveToParent(); + m_ctx.completeCycle(); + } + virtual void markAsNeedingAnotherRun() CATCH_OVERRIDE { + m_runState = NeedsAnotherRun; } - if (!ctx.completedCycle() && !section->isComplete()) + private: + void moveToParent() { + assert( m_parent ); + m_ctx.setCurrentTracker( m_parent ); + } + void moveToThis() { + m_ctx.setCurrentTracker( this ); + } + }; + + class SectionTracker : public TrackerBase { + std::vector m_filters; + public: + SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ) + : TrackerBase( nameAndLocation, ctx, parent ) { + if( parent ) { + while( !parent->isSectionTracker() ) + parent = &parent->parent(); - section->open(); + SectionTracker& parentSection = static_cast( *parent ); + addNextFilters( parentSection.m_filters ); + } } - return *section; - } -}; + virtual ~SectionTracker(); -class IndexTracker : public TrackerBase -{ - int m_size; - int m_index; - - public: - IndexTracker(std::string const& name, TrackerContext& ctx, ITracker* parent, int size) - : TrackerBase(name, ctx, parent), - m_size(size), - m_index(-1) - { - } - virtual ~IndexTracker(); + virtual bool isSectionTracker() const CATCH_OVERRIDE { return true; } - static IndexTracker& acquire(TrackerContext& ctx, std::string const& name, int size) - { - IndexTracker* tracker = CATCH_NULL; + static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) { + SectionTracker* section = CATCH_NULL; - ITracker& currentTracker = ctx.currentTracker(); - if (ITracker* childTracker = currentTracker.findChild(name)) - { - tracker = dynamic_cast(childTracker); - assert(tracker); + ITracker& currentTracker = ctx.currentTracker(); + if( ITracker* childTracker = currentTracker.findChild( nameAndLocation ) ) { + assert( childTracker ); + assert( childTracker->isSectionTracker() ); + section = static_cast( childTracker ); + } + else { + section = new SectionTracker( nameAndLocation, ctx, ¤tTracker ); + currentTracker.addChild( section ); + } + if( !ctx.completedCycle() ) + section->tryOpen(); + return *section; } - else - { - tracker = new IndexTracker(name, ctx, ¤tTracker, size); - currentTracker.addChild(tracker); + + void tryOpen() { + if( !isComplete() && (m_filters.empty() || m_filters[0].empty() || m_filters[0] == m_nameAndLocation.name ) ) + open(); } - if (!ctx.completedCycle() && !tracker->isComplete()) - { - if (tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun) - tracker->moveNext(); - tracker->open(); + void addInitialFilters( std::vector const& filters ) { + if( !filters.empty() ) { + m_filters.push_back(""); // Root - should never be consulted + m_filters.push_back(""); // Test Case - not a section filter + m_filters.insert( m_filters.end(), filters.begin(), filters.end() ); + } + } + void addNextFilters( std::vector const& filters ) { + if( filters.size() > 1 ) + m_filters.insert( m_filters.end(), ++filters.begin(), filters.end() ); } + }; - return *tracker; - } + class IndexTracker : public TrackerBase { + int m_size; + int m_index; + public: + IndexTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent, int size ) + : TrackerBase( nameAndLocation, ctx, parent ), + m_size( size ), + m_index( -1 ) + {} + virtual ~IndexTracker(); + + virtual bool isIndexTracker() const CATCH_OVERRIDE { return true; } + + static IndexTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation, int size ) { + IndexTracker* tracker = CATCH_NULL; + + ITracker& currentTracker = ctx.currentTracker(); + if( ITracker* childTracker = currentTracker.findChild( nameAndLocation ) ) { + assert( childTracker ); + assert( childTracker->isIndexTracker() ); + tracker = static_cast( childTracker ); + } + else { + tracker = new IndexTracker( nameAndLocation, ctx, ¤tTracker, size ); + currentTracker.addChild( tracker ); + } - int index() const { return m_index; } + if( !ctx.completedCycle() && !tracker->isComplete() ) { + if( tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun ) + tracker->moveNext(); + tracker->open(); + } - void moveNext() - { - m_index++; - m_children.clear(); - } + return *tracker; + } - virtual void close() CATCH_OVERRIDE - { - TrackerBase::close(); - if (m_runState == CompletedSuccessfully && m_index < m_size - 1) - m_runState = Executing; - } -}; + int index() const { return m_index; } -inline ITracker& TrackerContext::startRun() -{ - m_rootTracker = new SectionTracker("{root}", *this, CATCH_NULL); - m_currentTracker = CATCH_NULL; - m_runState = Executing; - return *m_rootTracker; -} + void moveNext() { + m_index++; + m_children.clear(); + } + + virtual void close() CATCH_OVERRIDE { + TrackerBase::close(); + if( m_runState == CompletedSuccessfully && m_index < m_size-1 ) + m_runState = Executing; + } + }; + + inline ITracker& TrackerContext::startRun() { + m_rootTracker = new SectionTracker( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, CATCH_NULL ); + m_currentTracker = CATCH_NULL; + m_runState = Executing; + return *m_rootTracker; + } } // namespace TestCaseTracking @@ -6322,90 +6259,216 @@ using TestCaseTracking::IndexTracker; } // namespace Catch +CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS + // #included from: catch_fatal_condition.hpp #define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED namespace Catch { -// Report the error condition then exit the process -inline void fatal(std::string const& message, int exitCode) -{ - IContext& context = Catch::getCurrentContext(); - IResultCapture* resultCapture = context.getResultCapture(); - resultCapture->handleFatalErrorCondition(message); + // Report the error condition + inline void reportFatal( std::string const& message ) { + IContext& context = Catch::getCurrentContext(); + IResultCapture* resultCapture = context.getResultCapture(); + resultCapture->handleFatalErrorCondition( message ); + } + +} // namespace Catch + +#if defined ( CATCH_PLATFORM_WINDOWS ) ///////////////////////////////////////// +// #included from: catch_windows_h_proxy.h + +#define TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED + +#ifdef CATCH_DEFINES_NOMINMAX +# define NOMINMAX +#endif +#ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif + +#ifdef __AFXDLL +#include +#else +#include +#endif + +#ifdef CATCH_DEFINES_NOMINMAX +# undef NOMINMAX +#endif +#ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN +# undef WIN32_LEAN_AND_MEAN +#endif + + +# if !defined ( CATCH_CONFIG_WINDOWS_SEH ) + +namespace Catch { + struct FatalConditionHandler { + void reset() {} + }; +} + +# else // CATCH_CONFIG_WINDOWS_SEH is defined - if (Catch::alwaysTrue()) // avoids "no return" warnings - exit(exitCode); -} +namespace Catch { -} // namespace Catch + struct SignalDefs { DWORD id; const char* name; }; + extern SignalDefs signalDefs[]; + // There is no 1-1 mapping between signals and windows exceptions. + // Windows can easily distinguish between SO and SigSegV, + // but SigInt, SigTerm, etc are handled differently. + SignalDefs signalDefs[] = { + { EXCEPTION_ILLEGAL_INSTRUCTION, "SIGILL - Illegal instruction signal" }, + { EXCEPTION_STACK_OVERFLOW, "SIGSEGV - Stack overflow" }, + { EXCEPTION_ACCESS_VIOLATION, "SIGSEGV - Segmentation violation signal" }, + { EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error" }, + }; -#if defined(CATCH_PLATFORM_WINDOWS) ///////////////////////////////////////// + struct FatalConditionHandler { -namespace Catch { + static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) { + for (int i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { + if (ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) { + reportFatal(signalDefs[i].name); + } + } + // If its not an exception we care about, pass it along. + // This stops us from eating debugger breaks etc. + return EXCEPTION_CONTINUE_SEARCH; + } + + FatalConditionHandler() { + isSet = true; + // 32k seems enough for Catch to handle stack overflow, + // but the value was found experimentally, so there is no strong guarantee + guaranteeSize = 32 * 1024; + exceptionHandlerHandle = CATCH_NULL; + // Register as first handler in current chain + exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException); + // Pass in guarantee size to be filled + SetThreadStackGuarantee(&guaranteeSize); + } + + static void reset() { + if (isSet) { + // Unregister handler and restore the old guarantee + RemoveVectoredExceptionHandler(exceptionHandlerHandle); + SetThreadStackGuarantee(&guaranteeSize); + exceptionHandlerHandle = CATCH_NULL; + isSet = false; + } + } -struct FatalConditionHandler -{ - void reset() {} -}; + ~FatalConditionHandler() { + reset(); + } + private: + static bool isSet; + static ULONG guaranteeSize; + static PVOID exceptionHandlerHandle; + }; + + bool FatalConditionHandler::isSet = false; + ULONG FatalConditionHandler::guaranteeSize = 0; + PVOID FatalConditionHandler::exceptionHandlerHandle = CATCH_NULL; } // namespace Catch +# endif // CATCH_CONFIG_WINDOWS_SEH + #else // Not Windows - assumed to be POSIX compatible ////////////////////////// +# if !defined(CATCH_CONFIG_POSIX_SIGNALS) + +namespace Catch { + struct FatalConditionHandler { + void reset() {} + }; +} + +# else // CATCH_CONFIG_POSIX_SIGNALS is defined + #include namespace Catch { -struct SignalDefs -{ - int id; - const char* name; -}; -extern SignalDefs signalDefs[]; -SignalDefs signalDefs[] = { - {SIGINT, "SIGINT - Terminal interrupt signal"}, - {SIGILL, "SIGILL - Illegal instruction signal"}, - {SIGFPE, "SIGFPE - Floating point error signal"}, - {SIGSEGV, "SIGSEGV - Segmentation violation signal"}, - {SIGTERM, "SIGTERM - Termination request signal"}, - {SIGABRT, "SIGABRT - Abort (abnormal termination) signal"}}; - -struct FatalConditionHandler -{ + struct SignalDefs { + int id; + const char* name; + }; + extern SignalDefs signalDefs[]; + SignalDefs signalDefs[] = { + { SIGINT, "SIGINT - Terminal interrupt signal" }, + { SIGILL, "SIGILL - Illegal instruction signal" }, + { SIGFPE, "SIGFPE - Floating point error signal" }, + { SIGSEGV, "SIGSEGV - Segmentation violation signal" }, + { SIGTERM, "SIGTERM - Termination request signal" }, + { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" } + }; - static void handleSignal(int sig) - { - for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) - if (sig == signalDefs[i].id) - fatal(signalDefs[i].name, -sig); - fatal("", -sig); - } + struct FatalConditionHandler { - FatalConditionHandler() : m_isSet(true) - { - for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) - signal(signalDefs[i].id, handleSignal); - } - ~FatalConditionHandler() - { - reset(); - } - void reset() - { - if (m_isSet) - { - for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) - signal(signalDefs[i].id, SIG_DFL); - m_isSet = false; + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; + static char altStackMem[SIGSTKSZ]; + + static void handleSignal( int sig ) { + std::string name = ""; + for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { + SignalDefs &def = signalDefs[i]; + if (sig == def.id) { + name = def.name; + break; + } + } + reset(); + reportFatal(name); + raise( sig ); + } + + FatalConditionHandler() { + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; + sigStack.ss_size = SIGSTKSZ; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { 0 }; + + sa.sa_handler = handleSignal; + sa.sa_flags = SA_ONSTACK; + for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) { + sigaction(signalDefs[i].id, &sa, &oldSigActions[i]); + } } - } - bool m_isSet; -}; + ~FatalConditionHandler() { + reset(); + } + static void reset() { + if( isSet ) { + // Set signals back to previous values -- hopefully nobody overwrote them in the meantime + for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) { + sigaction(signalDefs[i].id, &oldSigActions[i], CATCH_NULL); + } + // Return the old stack + sigaltstack(&oldSigStack, CATCH_NULL); + isSet = false; + } + } + }; + + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; + char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; } // namespace Catch +# endif // CATCH_CONFIG_POSIX_SIGNALS + #endif // not Windows #include @@ -6413,358 +6476,351 @@ struct FatalConditionHandler namespace Catch { -class StreamRedirect -{ + class StreamRedirect { - public: - StreamRedirect(std::ostream& stream, std::string& targetString) - : m_stream(stream), - m_prevBuf(stream.rdbuf()), - m_targetString(targetString) - { - stream.rdbuf(m_oss.rdbuf()); - } + public: + StreamRedirect( std::ostream& stream, std::string& targetString ) + : m_stream( stream ), + m_prevBuf( stream.rdbuf() ), + m_targetString( targetString ) + { + stream.rdbuf( m_oss.rdbuf() ); + } - ~StreamRedirect() - { - m_targetString += m_oss.str(); - m_stream.rdbuf(m_prevBuf); - } + ~StreamRedirect() { + m_targetString += m_oss.str(); + m_stream.rdbuf( m_prevBuf ); + } - private: - std::ostream& m_stream; - std::streambuf* m_prevBuf; - std::ostringstream m_oss; - std::string& m_targetString; -}; + private: + std::ostream& m_stream; + std::streambuf* m_prevBuf; + std::ostringstream m_oss; + std::string& m_targetString; + }; -/////////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////// -class RunContext : public IResultCapture, public IRunner -{ + class RunContext : public IResultCapture, public IRunner { - RunContext(RunContext const&); - void operator=(RunContext const&); + RunContext( RunContext const& ); + void operator =( RunContext const& ); - public: - explicit RunContext(Ptr const& _config, Ptr const& reporter) - : m_runInfo(_config->name()), - m_context(getCurrentMutableContext()), - m_activeTestCase(CATCH_NULL), - m_config(_config), - m_reporter(reporter) - { - m_context.setRunner(this); - m_context.setConfig(m_config); - m_context.setResultCapture(this); - m_reporter->testRunStarting(m_runInfo); - } + public: - virtual ~RunContext() - { - m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting())); - } + explicit RunContext( Ptr const& _config, Ptr const& reporter ) + : m_runInfo( _config->name() ), + m_context( getCurrentMutableContext() ), + m_activeTestCase( CATCH_NULL ), + m_config( _config ), + m_reporter( reporter ), + m_shouldReportUnexpected ( true ) + { + m_context.setRunner( this ); + m_context.setConfig( m_config ); + m_context.setResultCapture( this ); + m_reporter->testRunStarting( m_runInfo ); + } - void testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) - { - m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount)); - } - void testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) - { - m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting())); - } + virtual ~RunContext() { + m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) ); + } - Totals runTest(TestCase const& testCase) - { - Totals prevTotals = m_totals; + void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount ) { + m_reporter->testGroupStarting( GroupInfo( testSpec, groupIndex, groupsCount ) ); + } + void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount ) { + m_reporter->testGroupEnded( TestGroupStats( GroupInfo( testSpec, groupIndex, groupsCount ), totals, aborting() ) ); + } - std::string redirectedCout; - std::string redirectedCerr; + Totals runTest( TestCase const& testCase ) { + Totals prevTotals = m_totals; - TestCaseInfo testInfo = testCase.getTestCaseInfo(); + std::string redirectedCout; + std::string redirectedCerr; - m_reporter->testCaseStarting(testInfo); + TestCaseInfo testInfo = testCase.getTestCaseInfo(); - m_activeTestCase = &testCase; + m_reporter->testCaseStarting( testInfo ); - do - { - m_trackerContext.startRun(); - do - { - m_trackerContext.startCycle(); - m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, testInfo.name); - runCurrentTest(redirectedCout, redirectedCerr); - } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting()); + m_activeTestCase = &testCase; + + do { + ITracker& rootTracker = m_trackerContext.startRun(); + assert( rootTracker.isSectionTracker() ); + static_cast( rootTracker ).addInitialFilters( m_config->getSectionsToRun() ); + do { + m_trackerContext.startCycle(); + m_testCaseTracker = &SectionTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( testInfo.name, testInfo.lineInfo ) ); + runCurrentTest( redirectedCout, redirectedCerr ); + } + while( !m_testCaseTracker->isSuccessfullyCompleted() && !aborting() ); + } + // !TBD: deprecated - this will be replaced by indexed trackers + while( getCurrentContext().advanceGeneratorsForCurrentTest() && !aborting() ); + + Totals deltaTotals = m_totals.delta( prevTotals ); + if( testInfo.expectedToFail() && deltaTotals.testCases.passed > 0 ) { + deltaTotals.assertions.failed++; + deltaTotals.testCases.passed--; + deltaTotals.testCases.failed++; + } + m_totals.testCases += deltaTotals.testCases; + m_reporter->testCaseEnded( TestCaseStats( testInfo, + deltaTotals, + redirectedCout, + redirectedCerr, + aborting() ) ); + + m_activeTestCase = CATCH_NULL; + m_testCaseTracker = CATCH_NULL; + + return deltaTotals; } - // !TBD: deprecated - this will be replaced by indexed trackers - while (getCurrentContext().advanceGeneratorsForCurrentTest() && !aborting()); - Totals deltaTotals = m_totals.delta(prevTotals); - m_totals.testCases += deltaTotals.testCases; - m_reporter->testCaseEnded(TestCaseStats(testInfo, - deltaTotals, - redirectedCout, - redirectedCerr, - aborting())); + Ptr config() const { + return m_config; + } - m_activeTestCase = CATCH_NULL; - m_testCaseTracker = CATCH_NULL; + private: // IResultCapture - return deltaTotals; - } + virtual void assertionEnded( AssertionResult const& result ) { + if( result.getResultType() == ResultWas::Ok ) { + m_totals.assertions.passed++; + } + else if( !result.isOk() ) { + m_totals.assertions.failed++; + } - Ptr config() const - { - return m_config; - } + if( m_reporter->assertionEnded( AssertionStats( result, m_messages, m_totals ) ) ) + m_messages.clear(); - private: // IResultCapture - virtual void assertionEnded(AssertionResult const& result) - { - if (result.getResultType() == ResultWas::Ok) - { - m_totals.assertions.passed++; + // Reset working state + m_lastAssertionInfo = AssertionInfo( std::string(), m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}" , m_lastAssertionInfo.resultDisposition ); + m_lastResult = result; } - else if (!result.isOk()) + + virtual bool sectionStarted ( + SectionInfo const& sectionInfo, + Counts& assertions + ) { + ITracker& sectionTracker = SectionTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( sectionInfo.name, sectionInfo.lineInfo ) ); + if( !sectionTracker.isOpen() ) + return false; + m_activeSections.push_back( §ionTracker ); + + m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo; + + m_reporter->sectionStarting( sectionInfo ); + + assertions = m_totals.assertions; + + return true; + } + bool testForMissingAssertions( Counts& assertions ) { + if( assertions.total() != 0 ) + return false; + if( !m_config->warnAboutMissingAssertions() ) + return false; + if( m_trackerContext.currentTracker().hasChildren() ) + return false; m_totals.assertions.failed++; + assertions.failed++; + return true; } - if (m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals))) - m_messages.clear(); + virtual void sectionEnded( SectionEndInfo const& endInfo ) { + Counts assertions = m_totals.assertions - endInfo.prevAssertions; + bool missingAssertions = testForMissingAssertions( assertions ); - // Reset working state - m_lastAssertionInfo = AssertionInfo("", m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}", m_lastAssertionInfo.resultDisposition); - m_lastResult = result; - } + if( !m_activeSections.empty() ) { + m_activeSections.back()->close(); + m_activeSections.pop_back(); + } - virtual bool sectionStarted( - SectionInfo const& sectionInfo, - Counts& assertions) - { - std::ostringstream oss; - oss << sectionInfo.name << "@" << sectionInfo.lineInfo; + m_reporter->sectionEnded( SectionStats( endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions ) ); + m_messages.clear(); + } - ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, oss.str()); - if (!sectionTracker.isOpen()) - return false; - m_activeSections.push_back(§ionTracker); + virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) { + if( m_unfinishedSections.empty() ) + m_activeSections.back()->fail(); + else + m_activeSections.back()->close(); + m_activeSections.pop_back(); - m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo; + m_unfinishedSections.push_back( endInfo ); + } - m_reporter->sectionStarting(sectionInfo); + virtual void pushScopedMessage( MessageInfo const& message ) { + m_messages.push_back( message ); + } - assertions = m_totals.assertions; + virtual void popScopedMessage( MessageInfo const& message ) { + m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), message ), m_messages.end() ); + } - return true; - } - bool testForMissingAssertions(Counts& assertions) - { - if (assertions.total() != 0) - return false; - if (!m_config->warnAboutMissingAssertions()) - return false; - if (m_trackerContext.currentTracker().hasChildren()) - return false; - m_totals.assertions.failed++; - assertions.failed++; - return true; - } + virtual std::string getCurrentTestName() const { + return m_activeTestCase + ? m_activeTestCase->getTestCaseInfo().name + : std::string(); + } - virtual void sectionEnded(SectionEndInfo const& endInfo) - { - Counts assertions = m_totals.assertions - endInfo.prevAssertions; - bool missingAssertions = testForMissingAssertions(assertions); + virtual const AssertionResult* getLastResult() const { + return &m_lastResult; + } - if (!m_activeSections.empty()) - { - m_activeSections.back()->close(); - m_activeSections.pop_back(); + virtual void exceptionEarlyReported() { + m_shouldReportUnexpected = false; } - m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions)); - m_messages.clear(); - } + virtual void handleFatalErrorCondition( std::string const& message ) { + // Don't rebuild the result -- the stringification itself can cause more fatal errors + // Instead, fake a result data. + AssertionResultData tempResult; + tempResult.resultType = ResultWas::FatalErrorCondition; + tempResult.message = message; + AssertionResult result(m_lastAssertionInfo, tempResult); - virtual void sectionEndedEarly(SectionEndInfo const& endInfo) - { - if (m_unfinishedSections.empty()) - m_activeSections.back()->fail(); - else - m_activeSections.back()->close(); - m_activeSections.pop_back(); + getResultCapture().assertionEnded(result); - m_unfinishedSections.push_back(endInfo); - } + handleUnfinishedSections(); - virtual void pushScopedMessage(MessageInfo const& message) - { - m_messages.push_back(message); - } + // Recreate section for test case (as we will lose the one that was in scope) + TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo(); + SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description ); - virtual void popScopedMessage(MessageInfo const& message) - { - m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end()); - } + Counts assertions; + assertions.failed = 1; + SectionStats testCaseSectionStats( testCaseSection, assertions, 0, false ); + m_reporter->sectionEnded( testCaseSectionStats ); - virtual std::string getCurrentTestName() const - { - return m_activeTestCase - ? m_activeTestCase->getTestCaseInfo().name - : ""; - } + TestCaseInfo testInfo = m_activeTestCase->getTestCaseInfo(); - virtual const AssertionResult* getLastResult() const - { - return &m_lastResult; - } + Totals deltaTotals; + deltaTotals.testCases.failed = 1; + m_reporter->testCaseEnded( TestCaseStats( testInfo, + deltaTotals, + std::string(), + std::string(), + false ) ); + m_totals.testCases.failed++; + testGroupEnded( std::string(), m_totals, 1, 1 ); + m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, false ) ); + } - virtual void handleFatalErrorCondition(std::string const& message) - { - ResultBuilder resultBuilder = makeUnexpectedResultBuilder(); - resultBuilder.setResultType(ResultWas::FatalErrorCondition); - resultBuilder << message; - resultBuilder.captureExpression(); + public: + // !TBD We need to do this another way! + bool aborting() const { + return m_totals.assertions.failed == static_cast( m_config->abortAfter() ); + } - handleUnfinishedSections(); + private: - // Recreate section for test case (as we will lose the one that was in scope) - TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo(); - SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description); + void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr ) { + TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo(); + SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description ); + m_reporter->sectionStarting( testCaseSection ); + Counts prevAssertions = m_totals.assertions; + double duration = 0; + m_shouldReportUnexpected = true; + try { + m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, std::string(), ResultDisposition::Normal ); - Counts assertions; - assertions.failed = 1; - SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false); - m_reporter->sectionEnded(testCaseSectionStats); - - TestCaseInfo testInfo = m_activeTestCase->getTestCaseInfo(); - - Totals deltaTotals; - deltaTotals.testCases.failed = 1; - m_reporter->testCaseEnded(TestCaseStats(testInfo, - deltaTotals, - "", - "", - false)); - m_totals.testCases.failed++; - testGroupEnded("", m_totals, 1, 1); - m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false)); - } - - public: - // !TBD We need to do this another way! - bool aborting() const - { - return m_totals.assertions.failed == static_cast(m_config->abortAfter()); - } + seedRng( *m_config ); - private: - void runCurrentTest(std::string& redirectedCout, std::string& redirectedCerr) - { - TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo(); - SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description); - m_reporter->sectionStarting(testCaseSection); - Counts prevAssertions = m_totals.assertions; - double duration = 0; - try - { - m_lastAssertionInfo = AssertionInfo("TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal); + Timer timer; + timer.start(); + if( m_reporter->getPreferences().shouldRedirectStdOut ) { + StreamRedirect coutRedir( Catch::cout(), redirectedCout ); + StreamRedirect cerrRedir( Catch::cerr(), redirectedCerr ); + invokeActiveTestCase(); + } + else { + invokeActiveTestCase(); + } + duration = timer.getElapsedSeconds(); + } + catch( TestFailureException& ) { + // This just means the test was aborted due to failure + } + catch(...) { + // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions + // are reported without translation at the point of origin. +#ifdef CATCH_CONFIG_FAST_COMPILE + if (m_shouldReportUnexpected) { + makeUnexpectedResultBuilder().useActiveException(); + } +#endif + } + m_testCaseTracker->close(); + handleUnfinishedSections(); + m_messages.clear(); - seedRng(*m_config); + Counts assertions = m_totals.assertions - prevAssertions; + bool missingAssertions = testForMissingAssertions( assertions ); - Timer timer; - timer.start(); - if (m_reporter->getPreferences().shouldRedirectStdOut) - { - StreamRedirect coutRedir(Catch::cout(), redirectedCout); - StreamRedirect cerrRedir(Catch::cerr(), redirectedCerr); - invokeActiveTestCase(); - } - else - { - invokeActiveTestCase(); + if( testCaseInfo.okToFail() ) { + std::swap( assertions.failedButOk, assertions.failed ); + m_totals.assertions.failed -= assertions.failedButOk; + m_totals.assertions.failedButOk += assertions.failedButOk; } - duration = timer.getElapsedSeconds(); - } - catch (TestFailureException&) - { - // This just means the test was aborted due to failure + + SectionStats testCaseSectionStats( testCaseSection, assertions, duration, missingAssertions ); + m_reporter->sectionEnded( testCaseSectionStats ); } - catch (...) - { - makeUnexpectedResultBuilder().useActiveException(); + + void invokeActiveTestCase() { + FatalConditionHandler fatalConditionHandler; // Handle signals + m_activeTestCase->invoke(); + fatalConditionHandler.reset(); } - m_testCaseTracker->close(); - handleUnfinishedSections(); - m_messages.clear(); - Counts assertions = m_totals.assertions - prevAssertions; - bool missingAssertions = testForMissingAssertions(assertions); + private: - if (testCaseInfo.okToFail()) - { - std::swap(assertions.failedButOk, assertions.failed); - m_totals.assertions.failed -= assertions.failedButOk; - m_totals.assertions.failedButOk += assertions.failedButOk; + ResultBuilder makeUnexpectedResultBuilder() const { + return ResultBuilder( m_lastAssertionInfo.macroName.c_str(), + m_lastAssertionInfo.lineInfo, + m_lastAssertionInfo.capturedExpression.c_str(), + m_lastAssertionInfo.resultDisposition ); } - SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions); - m_reporter->sectionEnded(testCaseSectionStats); - } - - void invokeActiveTestCase() - { - FatalConditionHandler fatalConditionHandler; // Handle signals - m_activeTestCase->invoke(); - fatalConditionHandler.reset(); - } + void handleUnfinishedSections() { + // If sections ended prematurely due to an exception we stored their + // infos here so we can tear them down outside the unwind process. + for( std::vector::const_reverse_iterator it = m_unfinishedSections.rbegin(), + itEnd = m_unfinishedSections.rend(); + it != itEnd; + ++it ) + sectionEnded( *it ); + m_unfinishedSections.clear(); + } - private: - ResultBuilder makeUnexpectedResultBuilder() const - { - return ResultBuilder(m_lastAssertionInfo.macroName.c_str(), - m_lastAssertionInfo.lineInfo, - m_lastAssertionInfo.capturedExpression.c_str(), - m_lastAssertionInfo.resultDisposition); - } + TestRunInfo m_runInfo; + IMutableContext& m_context; + TestCase const* m_activeTestCase; + ITracker* m_testCaseTracker; + ITracker* m_currentSectionTracker; + AssertionResult m_lastResult; - void handleUnfinishedSections() - { - // If sections ended prematurely due to an exception we stored their - // infos here so we can tear them down outside the unwind process. - for (std::vector::const_reverse_iterator it = m_unfinishedSections.rbegin(), - itEnd = m_unfinishedSections.rend(); - it != itEnd; - ++it) - sectionEnded(*it); - m_unfinishedSections.clear(); - } - - TestRunInfo m_runInfo; - IMutableContext& m_context; - TestCase const* m_activeTestCase; - ITracker* m_testCaseTracker; - ITracker* m_currentSectionTracker; - AssertionResult m_lastResult; - - Ptr m_config; - Totals m_totals; - Ptr m_reporter; - std::vector m_messages; - AssertionInfo m_lastAssertionInfo; - std::vector m_unfinishedSections; - std::vector m_activeSections; - TrackerContext m_trackerContext; -}; + Ptr m_config; + Totals m_totals; + Ptr m_reporter; + std::vector m_messages; + AssertionInfo m_lastAssertionInfo; + std::vector m_unfinishedSections; + std::vector m_activeSections; + TrackerContext m_trackerContext; + bool m_shouldReportUnexpected; + }; -IResultCapture& getResultCapture() -{ - if (IResultCapture* capture = getCurrentContext().getResultCapture()) - return *capture; - else - throw std::logic_error("No result capture instance"); -} + IResultCapture& getResultCapture() { + if( IResultCapture* capture = getCurrentContext().getResultCapture() ) + return *capture; + else + throw std::logic_error( "No result capture instance" ); + } } // end namespace Catch @@ -6773,261 +6829,228 @@ IResultCapture& getResultCapture() namespace Catch { -// Versioning information -struct Version -{ - Version(unsigned int _majorVersion, - unsigned int _minorVersion, - unsigned int _patchNumber, - std::string const& _branchName, - unsigned int _buildNumber); + // Versioning information + struct Version { + Version( unsigned int _majorVersion, + unsigned int _minorVersion, + unsigned int _patchNumber, + char const * const _branchName, + unsigned int _buildNumber ); - unsigned int const majorVersion; - unsigned int const minorVersion; - unsigned int const patchNumber; + unsigned int const majorVersion; + unsigned int const minorVersion; + unsigned int const patchNumber; - // buildNumber is only used if branchName is not null - std::string const branchName; - unsigned int const buildNumber; + // buildNumber is only used if branchName is not null + char const * const branchName; + unsigned int const buildNumber; - friend std::ostream& operator<<(std::ostream& os, Version const& version); + friend std::ostream& operator << ( std::ostream& os, Version const& version ); - private: - void operator=(Version const&); -}; + private: + void operator=( Version const& ); + }; -extern Version libraryVersion; + inline Version libraryVersion(); } #include -#include #include +#include namespace Catch { -Ptr createReporter(std::string const& reporterName, Ptr const& config) -{ - Ptr reporter = getRegistryHub().getReporterRegistry().create(reporterName, config.get()); - if (!reporter) - { - std::ostringstream oss; - oss << "No reporter registered with name: '" << reporterName << "'"; - throw std::domain_error(oss.str()); + Ptr createReporter( std::string const& reporterName, Ptr const& config ) { + Ptr reporter = getRegistryHub().getReporterRegistry().create( reporterName, config.get() ); + if( !reporter ) { + std::ostringstream oss; + oss << "No reporter registered with name: '" << reporterName << "'"; + throw std::domain_error( oss.str() ); + } + return reporter; } - return reporter; -} -Ptr makeReporter(Ptr const& config) -{ - std::vector reporters = config->getReporterNames(); - if (reporters.empty()) - reporters.push_back("console"); - - Ptr reporter; - for (std::vector::const_iterator it = reporters.begin(), itEnd = reporters.end(); - it != itEnd; - ++it) - reporter = addReporter(reporter, createReporter(*it, config)); - return reporter; -} -Ptr addListeners(Ptr const& config, Ptr reporters) -{ - IReporterRegistry::Listeners listeners = getRegistryHub().getReporterRegistry().getListeners(); - for (IReporterRegistry::Listeners::const_iterator it = listeners.begin(), itEnd = listeners.end(); - it != itEnd; - ++it) - reporters = addReporter(reporters, (*it)->create(ReporterConfig(config))); - return reporters; -} + Ptr makeReporter( Ptr const& config ) { + std::vector reporters = config->getReporterNames(); + if( reporters.empty() ) + reporters.push_back( "console" ); -Totals runTests(Ptr const& config) -{ + Ptr reporter; + for( std::vector::const_iterator it = reporters.begin(), itEnd = reporters.end(); + it != itEnd; + ++it ) + reporter = addReporter( reporter, createReporter( *it, config ) ); + return reporter; + } + Ptr addListeners( Ptr const& config, Ptr reporters ) { + IReporterRegistry::Listeners listeners = getRegistryHub().getReporterRegistry().getListeners(); + for( IReporterRegistry::Listeners::const_iterator it = listeners.begin(), itEnd = listeners.end(); + it != itEnd; + ++it ) + reporters = addReporter(reporters, (*it)->create( ReporterConfig( config ) ) ); + return reporters; + } - Ptr iconfig = config.get(); + Totals runTests( Ptr const& config ) { - Ptr reporter = makeReporter(config); - reporter = addListeners(iconfig, reporter); + Ptr iconfig = config.get(); - RunContext context(iconfig, reporter); + Ptr reporter = makeReporter( config ); + reporter = addListeners( iconfig, reporter ); - Totals totals; + RunContext context( iconfig, reporter ); - context.testGroupStarting(config->name(), 1, 1); + Totals totals; - TestSpec testSpec = config->testSpec(); - if (!testSpec.hasFilters()) - testSpec = TestSpecParser(ITagAliasRegistry::get()).parse("~[.]").testSpec(); // All not hidden tests + context.testGroupStarting( config->name(), 1, 1 ); - std::vector const& allTestCases = getAllTestCasesSorted(*iconfig); - for (std::vector::const_iterator it = allTestCases.begin(), itEnd = allTestCases.end(); - it != itEnd; - ++it) - { - if (!context.aborting() && matchTest(*it, testSpec, *iconfig)) - totals += context.runTest(*it); - else - reporter->skipTest(*it); - } + TestSpec testSpec = config->testSpec(); + if( !testSpec.hasFilters() ) + testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "~[.]" ).testSpec(); // All not hidden tests - context.testGroupEnded(iconfig->name(), totals, 1, 1); - return totals; -} + std::vector const& allTestCases = getAllTestCasesSorted( *iconfig ); + for( std::vector::const_iterator it = allTestCases.begin(), itEnd = allTestCases.end(); + it != itEnd; + ++it ) { + if( !context.aborting() && matchTest( *it, testSpec, *iconfig ) ) + totals += context.runTest( *it ); + else + reporter->skipTest( *it ); + } -void applyFilenamesAsTags(IConfig const& config) -{ - std::vector const& tests = getAllTestCasesSorted(config); - for (std::size_t i = 0; i < tests.size(); ++i) - { - TestCase& test = const_cast(tests[i]); - std::set tags = test.tags; + context.testGroupEnded( iconfig->name(), totals, 1, 1 ); + return totals; + } - std::string filename = test.lineInfo.file; - std::string::size_type lastSlash = filename.find_last_of("\\/"); - if (lastSlash != std::string::npos) - filename = filename.substr(lastSlash + 1); + void applyFilenamesAsTags( IConfig const& config ) { + std::vector const& tests = getAllTestCasesSorted( config ); + for(std::size_t i = 0; i < tests.size(); ++i ) { + TestCase& test = const_cast( tests[i] ); + std::set tags = test.tags; - std::string::size_type lastDot = filename.find_last_of("."); - if (lastDot != std::string::npos) - filename = filename.substr(0, lastDot); + std::string filename = test.lineInfo.file; + std::string::size_type lastSlash = filename.find_last_of( "\\/" ); + if( lastSlash != std::string::npos ) + filename = filename.substr( lastSlash+1 ); - tags.insert("#" + filename); - setTags(test, tags); + std::string::size_type lastDot = filename.find_last_of( "." ); + if( lastDot != std::string::npos ) + filename = filename.substr( 0, lastDot ); + + tags.insert( "#" + filename ); + setTags( test, tags ); + } } -} -class Session : NonCopyable -{ - static bool alreadyInstantiated; + class Session : NonCopyable { + static bool alreadyInstantiated; - public: - struct OnUnusedOptions - { - enum DoWhat - { - Ignore, - Fail - }; - }; + public: - Session() - : m_cli(makeCommandLineParser()) - { - if (alreadyInstantiated) - { - std::string msg = "Only one instance of Catch::Session can ever be used"; - Catch::cerr() << msg << std::endl; - throw std::logic_error(msg); - } - alreadyInstantiated = true; - } - ~Session() - { - Catch::cleanUp(); - } + struct OnUnusedOptions { enum DoWhat { Ignore, Fail }; }; - void showHelp(std::string const& processName) - { - Catch::cout() << "\nCatch v" << libraryVersion << "\n"; + Session() + : m_cli( makeCommandLineParser() ) { + if( alreadyInstantiated ) { + std::string msg = "Only one instance of Catch::Session can ever be used"; + Catch::cerr() << msg << std::endl; + throw std::logic_error( msg ); + } + alreadyInstantiated = true; + } + ~Session() { + Catch::cleanUp(); + } - m_cli.usage(Catch::cout(), processName); - Catch::cout() << "For more detail usage please see the project docs\n" - << std::endl; - } + void showHelp( std::string const& processName ) { + Catch::cout() << "\nCatch v" << libraryVersion() << "\n"; - int applyCommandLine(int argc, char const* const argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail) - { - try - { - m_cli.setThrowOnUnrecognisedTokens(unusedOptionBehaviour == OnUnusedOptions::Fail); - m_unusedTokens = m_cli.parseInto(argc, argv, m_configData); - if (m_configData.showHelp) - showHelp(m_configData.processName); - m_config.reset(); + m_cli.usage( Catch::cout(), processName ); + Catch::cout() << "For more detail usage please see the project docs\n" << std::endl; } - catch (std::exception& ex) - { - { - Colour colourGuard(Colour::Red); - Catch::cerr() - << "\nError(s) in input:\n" - << Text(ex.what(), TextAttributes().setIndent(2)) - << "\n\n"; + + int applyCommandLine( int argc, char const* const* const argv, OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) { + try { + m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail ); + m_unusedTokens = m_cli.parseInto( Clara::argsToVector( argc, argv ), m_configData ); + if( m_configData.showHelp ) + showHelp( m_configData.processName ); + m_config.reset(); + } + catch( std::exception& ex ) { + { + Colour colourGuard( Colour::Red ); + Catch::cerr() + << "\nError(s) in input:\n" + << Text( ex.what(), TextAttributes().setIndent(2) ) + << "\n\n"; + } + m_cli.usage( Catch::cout(), m_configData.processName ); + return (std::numeric_limits::max)(); } - m_cli.usage(Catch::cout(), m_configData.processName); - return (std::numeric_limits::max)(); + return 0; } - return 0; - } - void useConfigData(ConfigData const& _configData) - { - m_configData = _configData; - m_config.reset(); - } + void useConfigData( ConfigData const& _configData ) { + m_configData = _configData; + m_config.reset(); + } - int run(int argc, char const* const argv[]) - { + int run( int argc, char const* const* const argv ) { - int returnCode = applyCommandLine(argc, argv); - if (returnCode == 0) - returnCode = run(); - return returnCode; - } + int returnCode = applyCommandLine( argc, argv ); + if( returnCode == 0 ) + returnCode = run(); + return returnCode; + } - int run() - { - if (m_configData.showHelp) - return 0; + int run() { + if( m_configData.showHelp ) + return 0; + + try + { + config(); // Force config to be constructed - try - { - config(); // Force config to be constructed + seedRng( *m_config ); - seedRng(*m_config); + if( m_configData.filenamesAsTags ) + applyFilenamesAsTags( *m_config ); - if (m_configData.filenamesAsTags) - applyFilenamesAsTags(*m_config); + // Handle list request + if( Option listed = list( config() ) ) + return static_cast( *listed ); - // Handle list request - if (Option listed = list(config())) - return static_cast(*listed); + return static_cast( runTests( m_config ).assertions.failed ); + } + catch( std::exception& ex ) { + Catch::cerr() << ex.what() << std::endl; + return (std::numeric_limits::max)(); + } + } - return static_cast(runTests(m_config).assertions.failed); + Clara::CommandLine const& cli() const { + return m_cli; } - catch (std::exception& ex) - { - Catch::cerr() << ex.what() << std::endl; - return (std::numeric_limits::max)(); + std::vector const& unusedTokens() const { + return m_unusedTokens; } - } - - Clara::CommandLine const& cli() const - { - return m_cli; - } - std::vector const& unusedTokens() const - { - return m_unusedTokens; - } - ConfigData& configData() - { - return m_configData; - } - Config& config() - { - if (!m_config) - m_config = new Config(m_configData); - return *m_config; - } - - private: - Clara::CommandLine m_cli; - std::vector m_unusedTokens; - ConfigData m_configData; - Ptr m_config; -}; + ConfigData& configData() { + return m_configData; + } + Config& config() { + if( !m_config ) + m_config = new Config( m_configData ); + return *m_config; + } + private: + Clara::CommandLine m_cli; + std::vector m_unusedTokens; + ConfigData m_configData; + Ptr m_config; + }; -bool Session::alreadyInstantiated = false; + bool Session::alreadyInstantiated = false; } // end namespace Catch @@ -7037,196 +7060,192 @@ bool Session::alreadyInstantiated = false; // #included from: catch_test_case_registry_impl.hpp #define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED -#include -#include +#include #include #include -#include +#include namespace Catch { -struct LexSort -{ - bool operator()(TestCase i, TestCase j) const { return (i < j); } -}; -struct RandomNumberGenerator -{ - int operator()(int n) const { return std::rand() % n; } -}; + struct RandomNumberGenerator { + typedef std::ptrdiff_t result_type; -inline std::vector sortTests(IConfig const& config, std::vector const& unsortedTestCases) -{ + result_type operator()( result_type n ) const { return std::rand() % n; } - std::vector sorted = unsortedTestCases; +#ifdef CATCH_CONFIG_CPP11_SHUFFLE + static constexpr result_type min() { return 0; } + static constexpr result_type max() { return 1000000; } + result_type operator()() const { return std::rand() % max(); } +#endif + template + static void shuffle( V& vector ) { + RandomNumberGenerator rng; +#ifdef CATCH_CONFIG_CPP11_SHUFFLE + std::shuffle( vector.begin(), vector.end(), rng ); +#else + std::random_shuffle( vector.begin(), vector.end(), rng ); +#endif + } + }; - switch (config.runOrder()) - { - case RunTests::InLexicographicalOrder: - std::sort(sorted.begin(), sorted.end(), LexSort()); - break; - case RunTests::InRandomOrder: - { - seedRng(config); + inline std::vector sortTests( IConfig const& config, std::vector const& unsortedTestCases ) { - RandomNumberGenerator rng; - std::random_shuffle(sorted.begin(), sorted.end(), rng); - } - break; - case RunTests::InDeclarationOrder: - // already in declaration order - break; - } - return sorted; -} -bool matchTest(TestCase const& testCase, TestSpec const& testSpec, IConfig const& config) -{ - return testSpec.matches(testCase) && (config.allowThrows() || !testCase.throws()); -} + std::vector sorted = unsortedTestCases; -void enforceNoDuplicateTestCases(std::vector const& functions) -{ - std::set seenFunctions; - for (std::vector::const_iterator it = functions.begin(), itEnd = functions.end(); - it != itEnd; - ++it) - { - std::pair::const_iterator, bool> prev = seenFunctions.insert(*it); - if (!prev.second) - { - Catch::cerr() - << Colour(Colour::Red) - << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n" - << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n" - << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl; - exit(1); + switch( config.runOrder() ) { + case RunTests::InLexicographicalOrder: + std::sort( sorted.begin(), sorted.end() ); + break; + case RunTests::InRandomOrder: + { + seedRng( config ); + RandomNumberGenerator::shuffle( sorted ); + } + break; + case RunTests::InDeclarationOrder: + // already in declaration order + break; } + return sorted; + } + bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) { + return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() ); } -} -std::vector filterTests(std::vector const& testCases, TestSpec const& testSpec, IConfig const& config) -{ - std::vector filtered; - filtered.reserve(testCases.size()); - for (std::vector::const_iterator it = testCases.begin(), itEnd = testCases.end(); - it != itEnd; - ++it) - if (matchTest(*it, testSpec, config)) - filtered.push_back(*it); - return filtered; -} -std::vector const& getAllTestCasesSorted(IConfig const& config) -{ - return getRegistryHub().getTestCaseRegistry().getAllTestsSorted(config); -} + void enforceNoDuplicateTestCases( std::vector const& functions ) { + std::set seenFunctions; + for( std::vector::const_iterator it = functions.begin(), itEnd = functions.end(); + it != itEnd; + ++it ) { + std::pair::const_iterator, bool> prev = seenFunctions.insert( *it ); + if( !prev.second ) { + std::ostringstream ss; -class TestRegistry : public ITestCaseRegistry -{ - public: - TestRegistry() - : m_currentSortOrder(RunTests::InDeclarationOrder), - m_unnamedCount(0) - { - } - virtual ~TestRegistry(); + ss << Colour( Colour::Red ) + << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n" + << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << '\n' + << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl; - virtual void registerTest(TestCase const& testCase) - { - std::string name = testCase.getTestCaseInfo().name; - if (name == "") - { - std::ostringstream oss; - oss << "Anonymous test case " << ++m_unnamedCount; - return registerTest(testCase.withName(oss.str())); + throw std::runtime_error(ss.str()); + } } - m_functions.push_back(testCase); } - virtual std::vector const& getAllTests() const - { - return m_functions; + std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ) { + std::vector filtered; + filtered.reserve( testCases.size() ); + for( std::vector::const_iterator it = testCases.begin(), itEnd = testCases.end(); + it != itEnd; + ++it ) + if( matchTest( *it, testSpec, config ) ) + filtered.push_back( *it ); + return filtered; + } + std::vector const& getAllTestCasesSorted( IConfig const& config ) { + return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config ); } - virtual std::vector const& getAllTestsSorted(IConfig const& config) const - { - if (m_sortedFunctions.empty()) - enforceNoDuplicateTestCases(m_functions); - if (m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty()) - { - m_sortedFunctions = sortTests(config, m_functions); - m_currentSortOrder = config.runOrder(); + class TestRegistry : public ITestCaseRegistry { + public: + TestRegistry() + : m_currentSortOrder( RunTests::InDeclarationOrder ), + m_unnamedCount( 0 ) + {} + virtual ~TestRegistry(); + + virtual void registerTest( TestCase const& testCase ) { + std::string name = testCase.getTestCaseInfo().name; + if( name.empty() ) { + std::ostringstream oss; + oss << "Anonymous test case " << ++m_unnamedCount; + return registerTest( testCase.withName( oss.str() ) ); + } + m_functions.push_back( testCase ); } - return m_sortedFunctions; - } - private: - std::vector m_functions; - mutable RunTests::InWhatOrder m_currentSortOrder; - mutable std::vector m_sortedFunctions; - size_t m_unnamedCount; - std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised -}; + virtual std::vector const& getAllTests() const { + return m_functions; + } + virtual std::vector const& getAllTestsSorted( IConfig const& config ) const { + if( m_sortedFunctions.empty() ) + enforceNoDuplicateTestCases( m_functions ); -/////////////////////////////////////////////////////////////////////////// + if( m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) { + m_sortedFunctions = sortTests( config, m_functions ); + m_currentSortOrder = config.runOrder(); + } + return m_sortedFunctions; + } -class FreeFunctionTestCase : public SharedImpl -{ - public: - FreeFunctionTestCase(TestFunction fun) : m_fun(fun) {} + private: + std::vector m_functions; + mutable RunTests::InWhatOrder m_currentSortOrder; + mutable std::vector m_sortedFunctions; + size_t m_unnamedCount; + std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised + }; - virtual void invoke() const - { - m_fun(); - } + /////////////////////////////////////////////////////////////////////////// - private: - virtual ~FreeFunctionTestCase(); + class FreeFunctionTestCase : public SharedImpl { + public: - TestFunction m_fun; -}; + FreeFunctionTestCase( TestFunction fun ) : m_fun( fun ) {} -inline std::string extractClassName(std::string const& classOrQualifiedMethodName) -{ - std::string className = classOrQualifiedMethodName; - if (startsWith(className, "&")) - { - std::size_t lastColons = className.rfind("::"); - std::size_t penultimateColons = className.rfind("::", lastColons - 1); - if (penultimateColons == std::string::npos) - penultimateColons = 1; - className = className.substr(penultimateColons, lastColons - penultimateColons); - } - return className; -} + virtual void invoke() const { + m_fun(); + } -void registerTestCase(ITestCase* testCase, - char const* classOrQualifiedMethodName, - NameAndDesc const& nameAndDesc, - SourceLineInfo const& lineInfo) -{ + private: + virtual ~FreeFunctionTestCase(); - getMutableRegistryHub().registerTest(makeTestCase(testCase, - extractClassName(classOrQualifiedMethodName), - nameAndDesc.name, - nameAndDesc.description, - lineInfo)); -} -void registerTestCaseFunction(TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc) -{ - registerTestCase(new FreeFunctionTestCase(function), "", nameAndDesc, lineInfo); -} + TestFunction m_fun; + }; -/////////////////////////////////////////////////////////////////////////// + inline std::string extractClassName( std::string const& classOrQualifiedMethodName ) { + std::string className = classOrQualifiedMethodName; + if( startsWith( className, '&' ) ) + { + std::size_t lastColons = className.rfind( "::" ); + std::size_t penultimateColons = className.rfind( "::", lastColons-1 ); + if( penultimateColons == std::string::npos ) + penultimateColons = 1; + className = className.substr( penultimateColons, lastColons-penultimateColons ); + } + return className; + } -AutoReg::AutoReg(TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc) -{ - registerTestCaseFunction(function, lineInfo, nameAndDesc); -} + void registerTestCase + ( ITestCase* testCase, + char const* classOrQualifiedMethodName, + NameAndDesc const& nameAndDesc, + SourceLineInfo const& lineInfo ) { + + getMutableRegistryHub().registerTest + ( makeTestCase + ( testCase, + extractClassName( classOrQualifiedMethodName ), + nameAndDesc.name, + nameAndDesc.description, + lineInfo ) ); + } + void registerTestCaseFunction + ( TestFunction function, + SourceLineInfo const& lineInfo, + NameAndDesc const& nameAndDesc ) { + registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo ); + } + + /////////////////////////////////////////////////////////////////////////// -AutoReg::~AutoReg() {} + AutoReg::AutoReg + ( TestFunction function, + SourceLineInfo const& lineInfo, + NameAndDesc const& nameAndDesc ) { + registerTestCaseFunction( function, lineInfo, nameAndDesc ); + } + + AutoReg::~AutoReg() {} } // end namespace Catch @@ -7237,42 +7256,37 @@ AutoReg::~AutoReg() {} namespace Catch { -class ReporterRegistry : public IReporterRegistry -{ + class ReporterRegistry : public IReporterRegistry { - public: - virtual ~ReporterRegistry() CATCH_OVERRIDE {} + public: - virtual IStreamingReporter* create(std::string const& name, Ptr const& config) const CATCH_OVERRIDE - { - FactoryMap::const_iterator it = m_factories.find(name); - if (it == m_factories.end()) - return CATCH_NULL; - return it->second->create(ReporterConfig(config)); - } + virtual ~ReporterRegistry() CATCH_OVERRIDE {} - void registerReporter(std::string const& name, Ptr const& factory) - { - m_factories.insert(std::make_pair(name, factory)); - } - void registerListener(Ptr const& factory) - { - m_listeners.push_back(factory); - } + virtual IStreamingReporter* create( std::string const& name, Ptr const& config ) const CATCH_OVERRIDE { + FactoryMap::const_iterator it = m_factories.find( name ); + if( it == m_factories.end() ) + return CATCH_NULL; + return it->second->create( ReporterConfig( config ) ); + } - virtual FactoryMap const& getFactories() const CATCH_OVERRIDE - { - return m_factories; - } - virtual Listeners const& getListeners() const CATCH_OVERRIDE - { - return m_listeners; - } + void registerReporter( std::string const& name, Ptr const& factory ) { + m_factories.insert( std::make_pair( name, factory ) ); + } + void registerListener( Ptr const& factory ) { + m_listeners.push_back( factory ); + } - private: - FactoryMap m_factories; - Listeners m_listeners; -}; + virtual FactoryMap const& getFactories() const CATCH_OVERRIDE { + return m_factories; + } + virtual Listeners const& getListeners() const CATCH_OVERRIDE { + return m_listeners; + } + + private: + FactoryMap m_factories; + Listeners m_listeners; + }; } // #included from: catch_exception_translator_registry.hpp @@ -7284,174 +7298,172 @@ class ReporterRegistry : public IReporterRegistry namespace Catch { -class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry -{ - public: - ~ExceptionTranslatorRegistry() - { - deleteAll(m_translators); - } + class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry { + public: + ~ExceptionTranslatorRegistry() { + deleteAll( m_translators ); + } - virtual void registerTranslator(const IExceptionTranslator* translator) - { - m_translators.push_back(translator); - } + virtual void registerTranslator( const IExceptionTranslator* translator ) { + m_translators.push_back( translator ); + } - virtual std::string translateActiveException() const - { - try - { + virtual std::string translateActiveException() const { + try { #ifdef __OBJC__ - // In Objective-C try objective-c exceptions first - @try - { + // In Objective-C try objective-c exceptions first + @try { + return tryTranslators(); + } + @catch (NSException *exception) { + return Catch::toString( [exception description] ); + } +#else return tryTranslators(); +#endif } - @catch (NSException* exception) - { - return Catch::toString([exception description]); + catch( TestFailureException& ) { + throw; + } + catch( std::exception& ex ) { + return ex.what(); + } + catch( std::string& msg ) { + return msg; + } + catch( const char* msg ) { + return msg; + } + catch(...) { + return "Unknown exception"; } -#else - return tryTranslators(); -#endif - } - catch (TestFailureException&) - { - throw; - } - catch (std::exception& ex) - { - return ex.what(); - } - catch (std::string& msg) - { - return msg; - } - catch (const char* msg) - { - return msg; - } - catch (...) - { - return "Unknown exception"; } - } - std::string tryTranslators() const - { - if (m_translators.empty()) - throw; - else - return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end()); - } + std::string tryTranslators() const { + if( m_translators.empty() ) + throw; + else + return m_translators[0]->translate( m_translators.begin()+1, m_translators.end() ); + } - private: - std::vector m_translators; -}; + private: + std::vector m_translators; + }; } +// #included from: catch_tag_alias_registry.h +#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED + +#include + namespace Catch { -namespace { + class TagAliasRegistry : public ITagAliasRegistry { + public: + virtual ~TagAliasRegistry(); + virtual Option find( std::string const& alias ) const; + virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const; + void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ); -class RegistryHub : public IRegistryHub, public IMutableRegistryHub -{ + private: + std::map m_registry; + }; - RegistryHub(RegistryHub const&); - void operator=(RegistryHub const&); +} // end namespace Catch - public: // IRegistryHub - RegistryHub() - { - } - virtual IReporterRegistry const& getReporterRegistry() const CATCH_OVERRIDE - { - return m_reporterRegistry; - } - virtual ITestCaseRegistry const& getTestCaseRegistry() const CATCH_OVERRIDE - { - return m_testCaseRegistry; - } - virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() CATCH_OVERRIDE - { - return m_exceptionTranslatorRegistry; +namespace Catch { + + namespace { + + class RegistryHub : public IRegistryHub, public IMutableRegistryHub { + + RegistryHub( RegistryHub const& ); + void operator=( RegistryHub const& ); + + public: // IRegistryHub + RegistryHub() { + } + virtual IReporterRegistry const& getReporterRegistry() const CATCH_OVERRIDE { + return m_reporterRegistry; + } + virtual ITestCaseRegistry const& getTestCaseRegistry() const CATCH_OVERRIDE { + return m_testCaseRegistry; + } + virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() CATCH_OVERRIDE { + return m_exceptionTranslatorRegistry; + } + virtual ITagAliasRegistry const& getTagAliasRegistry() const CATCH_OVERRIDE { + return m_tagAliasRegistry; + } + + public: // IMutableRegistryHub + virtual void registerReporter( std::string const& name, Ptr const& factory ) CATCH_OVERRIDE { + m_reporterRegistry.registerReporter( name, factory ); + } + virtual void registerListener( Ptr const& factory ) CATCH_OVERRIDE { + m_reporterRegistry.registerListener( factory ); + } + virtual void registerTest( TestCase const& testInfo ) CATCH_OVERRIDE { + m_testCaseRegistry.registerTest( testInfo ); + } + virtual void registerTranslator( const IExceptionTranslator* translator ) CATCH_OVERRIDE { + m_exceptionTranslatorRegistry.registerTranslator( translator ); + } + virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) CATCH_OVERRIDE { + m_tagAliasRegistry.add( alias, tag, lineInfo ); + } + + private: + TestRegistry m_testCaseRegistry; + ReporterRegistry m_reporterRegistry; + ExceptionTranslatorRegistry m_exceptionTranslatorRegistry; + TagAliasRegistry m_tagAliasRegistry; + }; + + // Single, global, instance + inline RegistryHub*& getTheRegistryHub() { + static RegistryHub* theRegistryHub = CATCH_NULL; + if( !theRegistryHub ) + theRegistryHub = new RegistryHub(); + return theRegistryHub; + } } - public: // IMutableRegistryHub - virtual void registerReporter(std::string const& name, Ptr const& factory) CATCH_OVERRIDE - { - m_reporterRegistry.registerReporter(name, factory); + IRegistryHub& getRegistryHub() { + return *getTheRegistryHub(); } - virtual void registerListener(Ptr const& factory) CATCH_OVERRIDE - { - m_reporterRegistry.registerListener(factory); + IMutableRegistryHub& getMutableRegistryHub() { + return *getTheRegistryHub(); } - virtual void registerTest(TestCase const& testInfo) CATCH_OVERRIDE - { - m_testCaseRegistry.registerTest(testInfo); + void cleanUp() { + delete getTheRegistryHub(); + getTheRegistryHub() = CATCH_NULL; + cleanUpContext(); } - virtual void registerTranslator(const IExceptionTranslator* translator) CATCH_OVERRIDE - { - m_exceptionTranslatorRegistry.registerTranslator(translator); + std::string translateActiveException() { + return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException(); } - private: - TestRegistry m_testCaseRegistry; - ReporterRegistry m_reporterRegistry; - ExceptionTranslatorRegistry m_exceptionTranslatorRegistry; -}; - -// Single, global, instance -inline RegistryHub*& getTheRegistryHub() -{ - static RegistryHub* theRegistryHub = CATCH_NULL; - if (!theRegistryHub) - theRegistryHub = new RegistryHub(); - return theRegistryHub; -} -} - -IRegistryHub& getRegistryHub() -{ - return *getTheRegistryHub(); -} -IMutableRegistryHub& getMutableRegistryHub() -{ - return *getTheRegistryHub(); -} -void cleanUp() -{ - delete getTheRegistryHub(); - getTheRegistryHub() = CATCH_NULL; - cleanUpContext(); -} -std::string translateActiveException() -{ - return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException(); -} - } // end namespace Catch // #included from: catch_notimplemented_exception.hpp #define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED -#include +#include namespace Catch { -NotImplementedException::NotImplementedException(SourceLineInfo const& lineInfo) - : m_lineInfo(lineInfo) -{ - std::ostringstream oss; - oss << lineInfo << ": function "; - oss << "not implemented"; - m_what = oss.str(); -} + NotImplementedException::NotImplementedException( SourceLineInfo const& lineInfo ) + : m_lineInfo( lineInfo ) { + std::ostringstream oss; + oss << lineInfo << ": function "; + oss << "not implemented"; + m_what = oss.str(); + } -const char* NotImplementedException::what() const CATCH_NOEXCEPT -{ - return m_what.c_str(); -} + const char* NotImplementedException::what() const CATCH_NOEXCEPT { + return m_what.c_str(); + } } // end namespace Catch @@ -7461,410 +7473,369 @@ const char* NotImplementedException::what() const CATCH_NOEXCEPT // #included from: catch_stream.hpp #define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED +#include #include #include -#include namespace Catch { -template -class StreamBufImpl : public StreamBufBase -{ - char data[bufferSize]; - WriterF m_writer; - - public: - StreamBufImpl() - { - setp(data, data + sizeof(data)); - } - - ~StreamBufImpl() CATCH_NOEXCEPT - { - sync(); - } - - private: - int overflow(int c) - { - sync(); + template + class StreamBufImpl : public StreamBufBase { + char data[bufferSize]; + WriterF m_writer; - if (c != EOF) - { - if (pbase() == epptr()) - m_writer(std::string(1, static_cast(c))); - else - sputc(static_cast(c)); + public: + StreamBufImpl() { + setp( data, data + sizeof(data) ); } - return 0; - } - int sync() - { - if (pbase() != pptr()) - { - m_writer(std::string(pbase(), static_cast(pptr() - pbase()))); - setp(pbase(), epptr()); + ~StreamBufImpl() CATCH_NOEXCEPT { + sync(); } - return 0; - } -}; -/////////////////////////////////////////////////////////////////////////// + private: + int overflow( int c ) { + sync(); -FileStream::FileStream(std::string const& filename) -{ - m_ofs.open(filename.c_str()); - if (m_ofs.fail()) - { - std::ostringstream oss; - oss << "Unable to open file: '" << filename << "'"; - throw std::domain_error(oss.str()); - } -} + if( c != EOF ) { + if( pbase() == epptr() ) + m_writer( std::string( 1, static_cast( c ) ) ); + else + sputc( static_cast( c ) ); + } + return 0; + } + + int sync() { + if( pbase() != pptr() ) { + m_writer( std::string( pbase(), static_cast( pptr() - pbase() ) ) ); + setp( pbase(), epptr() ); + } + return 0; + } + }; -std::ostream& FileStream::stream() const -{ - return m_ofs; -} + /////////////////////////////////////////////////////////////////////////// -struct OutputDebugWriter -{ + FileStream::FileStream( std::string const& filename ) { + m_ofs.open( filename.c_str() ); + if( m_ofs.fail() ) { + std::ostringstream oss; + oss << "Unable to open file: '" << filename << '\''; + throw std::domain_error( oss.str() ); + } + } - void operator()(std::string const& str) - { - writeToDebugConsole(str); + std::ostream& FileStream::stream() const { + return m_ofs; } -}; -DebugOutStream::DebugOutStream() - : m_streamBuf(new StreamBufImpl()), - m_os(m_streamBuf.get()) -{ -} + struct OutputDebugWriter { -std::ostream& DebugOutStream::stream() const -{ - return m_os; -} + void operator()( std::string const&str ) { + writeToDebugConsole( str ); + } + }; -// Store the streambuf from cout up-front because -// cout may get redirected when running tests -CoutStream::CoutStream() - : m_os(Catch::cout().rdbuf()) -{ -} + DebugOutStream::DebugOutStream() + : m_streamBuf( new StreamBufImpl() ), + m_os( m_streamBuf.get() ) + {} -std::ostream& CoutStream::stream() const -{ - return m_os; -} + std::ostream& DebugOutStream::stream() const { + return m_os; + } + + // Store the streambuf from cout up-front because + // cout may get redirected when running tests + CoutStream::CoutStream() + : m_os( Catch::cout().rdbuf() ) + {} + + std::ostream& CoutStream::stream() const { + return m_os; + } #ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions -std::ostream& cout() -{ - return std::cout; -} -std::ostream& cerr() -{ - return std::cerr; -} + std::ostream& cout() { + return std::cout; + } + std::ostream& cerr() { + return std::cerr; + } #endif } namespace Catch { -class Context : public IMutableContext -{ + class Context : public IMutableContext { - Context() : m_config(CATCH_NULL), m_runner(CATCH_NULL), m_resultCapture(CATCH_NULL) {} - Context(Context const&); - void operator=(Context const&); + Context() : m_config( CATCH_NULL ), m_runner( CATCH_NULL ), m_resultCapture( CATCH_NULL ) {} + Context( Context const& ); + void operator=( Context const& ); - public: // IContext - virtual IResultCapture* getResultCapture() - { - return m_resultCapture; - } - virtual IRunner* getRunner() - { - return m_runner; - } - virtual size_t getGeneratorIndex(std::string const& fileInfo, size_t totalSize) - { - return getGeneratorsForCurrentTest() - .getGeneratorInfo(fileInfo, totalSize) + public: + virtual ~Context() { + deleteAllValues( m_generatorsByTestName ); + } + + public: // IContext + virtual IResultCapture* getResultCapture() { + return m_resultCapture; + } + virtual IRunner* getRunner() { + return m_runner; + } + virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) { + return getGeneratorsForCurrentTest() + .getGeneratorInfo( fileInfo, totalSize ) .getCurrentIndex(); - } - virtual bool advanceGeneratorsForCurrentTest() - { - IGeneratorsForTest* generators = findGeneratorsForCurrentTest(); - return generators && generators->moveNext(); - } + } + virtual bool advanceGeneratorsForCurrentTest() { + IGeneratorsForTest* generators = findGeneratorsForCurrentTest(); + return generators && generators->moveNext(); + } - virtual Ptr getConfig() const - { - return m_config; - } + virtual Ptr getConfig() const { + return m_config; + } - public: // IMutableContext - virtual void setResultCapture(IResultCapture* resultCapture) - { - m_resultCapture = resultCapture; - } - virtual void setRunner(IRunner* runner) - { - m_runner = runner; - } - virtual void setConfig(Ptr const& config) - { - m_config = config; - } + public: // IMutableContext + virtual void setResultCapture( IResultCapture* resultCapture ) { + m_resultCapture = resultCapture; + } + virtual void setRunner( IRunner* runner ) { + m_runner = runner; + } + virtual void setConfig( Ptr const& config ) { + m_config = config; + } - friend IMutableContext& getCurrentMutableContext(); + friend IMutableContext& getCurrentMutableContext(); - private: - IGeneratorsForTest* findGeneratorsForCurrentTest() - { - std::string testName = getResultCapture()->getCurrentTestName(); + private: + IGeneratorsForTest* findGeneratorsForCurrentTest() { + std::string testName = getResultCapture()->getCurrentTestName(); - std::map::const_iterator it = - m_generatorsByTestName.find(testName); - return it != m_generatorsByTestName.end() - ? it->second - : CATCH_NULL; - } + std::map::const_iterator it = + m_generatorsByTestName.find( testName ); + return it != m_generatorsByTestName.end() + ? it->second + : CATCH_NULL; + } - IGeneratorsForTest& getGeneratorsForCurrentTest() - { - IGeneratorsForTest* generators = findGeneratorsForCurrentTest(); - if (!generators) - { - std::string testName = getResultCapture()->getCurrentTestName(); - generators = createGeneratorsForTest(); - m_generatorsByTestName.insert(std::make_pair(testName, generators)); + IGeneratorsForTest& getGeneratorsForCurrentTest() { + IGeneratorsForTest* generators = findGeneratorsForCurrentTest(); + if( !generators ) { + std::string testName = getResultCapture()->getCurrentTestName(); + generators = createGeneratorsForTest(); + m_generatorsByTestName.insert( std::make_pair( testName, generators ) ); + } + return *generators; } - return *generators; - } - private: - Ptr m_config; - IRunner* m_runner; - IResultCapture* m_resultCapture; - std::map m_generatorsByTestName; -}; + private: + Ptr m_config; + IRunner* m_runner; + IResultCapture* m_resultCapture; + std::map m_generatorsByTestName; + }; -namespace { -Context* currentContext = CATCH_NULL; -} -IMutableContext& getCurrentMutableContext() -{ - if (!currentContext) - currentContext = new Context(); - return *currentContext; -} -IContext& getCurrentContext() -{ - return getCurrentMutableContext(); -} + namespace { + Context* currentContext = CATCH_NULL; + } + IMutableContext& getCurrentMutableContext() { + if( !currentContext ) + currentContext = new Context(); + return *currentContext; + } + IContext& getCurrentContext() { + return getCurrentMutableContext(); + } -void cleanUpContext() -{ - delete currentContext; - currentContext = CATCH_NULL; -} + void cleanUpContext() { + delete currentContext; + currentContext = CATCH_NULL; + } } // #included from: catch_console_colour_impl.hpp #define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED +// #included from: catch_errno_guard.hpp +#define TWOBLUECUBES_CATCH_ERRNO_GUARD_HPP_INCLUDED + +#include + namespace Catch { -namespace { -struct IColourImpl -{ - virtual ~IColourImpl() {} - virtual void use(Colour::Code _colourCode) = 0; -}; + class ErrnoGuard { + public: + ErrnoGuard():m_oldErrno(errno){} + ~ErrnoGuard() { errno = m_oldErrno; } + private: + int m_oldErrno; + }; -struct NoColourImpl : IColourImpl -{ - void use(Colour::Code) {} +} - static IColourImpl* instance() - { - static NoColourImpl s_instance; - return &s_instance; - } -}; +namespace Catch { + namespace { -} // anon namespace -} // namespace Catch + struct IColourImpl { + virtual ~IColourImpl() {} + virtual void use( Colour::Code _colourCode ) = 0; + }; -#if !defined(CATCH_CONFIG_COLOUR_NONE) && !defined(CATCH_CONFIG_COLOUR_WINDOWS) && !defined(CATCH_CONFIG_COLOUR_ANSI) -#ifdef CATCH_PLATFORM_WINDOWS -#define CATCH_CONFIG_COLOUR_WINDOWS -#else -#define CATCH_CONFIG_COLOUR_ANSI -#endif -#endif + struct NoColourImpl : IColourImpl { + void use( Colour::Code ) {} -#if defined(CATCH_CONFIG_COLOUR_WINDOWS) ///////////////////////////////////////// + static IColourImpl* instance() { + static NoColourImpl s_instance; + return &s_instance; + } + }; -#ifndef NOMINMAX -#define NOMINMAX -#endif + } // anon namespace +} // namespace Catch -#ifdef __AFXDLL -#include -#else -#include +#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI ) +# ifdef CATCH_PLATFORM_WINDOWS +# define CATCH_CONFIG_COLOUR_WINDOWS +# else +# define CATCH_CONFIG_COLOUR_ANSI +# endif #endif +#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) ///////////////////////////////////////// + namespace Catch { namespace { -class Win32ColourImpl : public IColourImpl -{ - public: - Win32ColourImpl() : stdoutHandle(GetStdHandle(STD_OUTPUT_HANDLE)) - { - CONSOLE_SCREEN_BUFFER_INFO csbiInfo; - GetConsoleScreenBufferInfo(stdoutHandle, &csbiInfo); - originalForegroundAttributes = csbiInfo.wAttributes & ~(BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY); - originalBackgroundAttributes = csbiInfo.wAttributes & ~(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY); - } + class Win32ColourImpl : public IColourImpl { + public: + Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) ) + { + CONSOLE_SCREEN_BUFFER_INFO csbiInfo; + GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo ); + originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY ); + originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY ); + } + + virtual void use( Colour::Code _colourCode ) { + switch( _colourCode ) { + case Colour::None: return setTextAttribute( originalForegroundAttributes ); + case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE ); + case Colour::Red: return setTextAttribute( FOREGROUND_RED ); + case Colour::Green: return setTextAttribute( FOREGROUND_GREEN ); + case Colour::Blue: return setTextAttribute( FOREGROUND_BLUE ); + case Colour::Cyan: return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN ); + case Colour::Yellow: return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN ); + case Colour::Grey: return setTextAttribute( 0 ); + + case Colour::LightGrey: return setTextAttribute( FOREGROUND_INTENSITY ); + case Colour::BrightRed: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED ); + case Colour::BrightGreen: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN ); + case Colour::BrightWhite: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE ); + + case Colour::Bright: throw std::logic_error( "not a colour" ); + } + } - virtual void use(Colour::Code _colourCode) - { - switch (_colourCode) - { - case Colour::None: - return setTextAttribute(originalForegroundAttributes); - case Colour::White: - return setTextAttribute(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); - case Colour::Red: - return setTextAttribute(FOREGROUND_RED); - case Colour::Green: - return setTextAttribute(FOREGROUND_GREEN); - case Colour::Blue: - return setTextAttribute(FOREGROUND_BLUE); - case Colour::Cyan: - return setTextAttribute(FOREGROUND_BLUE | FOREGROUND_GREEN); - case Colour::Yellow: - return setTextAttribute(FOREGROUND_RED | FOREGROUND_GREEN); - case Colour::Grey: - return setTextAttribute(0); - - case Colour::LightGrey: - return setTextAttribute(FOREGROUND_INTENSITY); - case Colour::BrightRed: - return setTextAttribute(FOREGROUND_INTENSITY | FOREGROUND_RED); - case Colour::BrightGreen: - return setTextAttribute(FOREGROUND_INTENSITY | FOREGROUND_GREEN); - case Colour::BrightWhite: - return setTextAttribute(FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); - - case Colour::Bright: - throw std::logic_error("not a colour"); - } - } - - private: - void setTextAttribute(WORD _textAttribute) - { - SetConsoleTextAttribute(stdoutHandle, _textAttribute | originalBackgroundAttributes); - } - HANDLE stdoutHandle; - WORD originalForegroundAttributes; - WORD originalBackgroundAttributes; -}; + private: + void setTextAttribute( WORD _textAttribute ) { + SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes ); + } + HANDLE stdoutHandle; + WORD originalForegroundAttributes; + WORD originalBackgroundAttributes; + }; -IColourImpl* platformColourInstance() -{ - static Win32ColourImpl s_instance; - return &s_instance; -} + IColourImpl* platformColourInstance() { + static Win32ColourImpl s_instance; + + Ptr config = getCurrentContext().getConfig(); + UseColour::YesOrNo colourMode = config + ? config->useColour() + : UseColour::Auto; + if( colourMode == UseColour::Auto ) + colourMode = !isDebuggerActive() + ? UseColour::Yes + : UseColour::No; + return colourMode == UseColour::Yes + ? &s_instance + : NoColourImpl::instance(); + } } // end anon namespace } // end namespace Catch -#elif defined(CATCH_CONFIG_COLOUR_ANSI) ////////////////////////////////////// +#elif defined( CATCH_CONFIG_COLOUR_ANSI ) ////////////////////////////////////// #include namespace Catch { namespace { -// use POSIX/ ANSI console terminal codes -// Thanks to Adam Strzelecki for original contribution -// (http://github.com/nanoant) -// https://github.com/philsquared/Catch/pull/131 -class PosixColourImpl : public IColourImpl -{ - public: - virtual void use(Colour::Code _colourCode) - { - switch (_colourCode) - { - case Colour::None: - case Colour::White: - return setColour("[0m"); - case Colour::Red: - return setColour("[0;31m"); - case Colour::Green: - return setColour("[0;32m"); - case Colour::Blue: - return setColour("[0:34m"); - case Colour::Cyan: - return setColour("[0;36m"); - case Colour::Yellow: - return setColour("[0;33m"); - case Colour::Grey: - return setColour("[1;30m"); - - case Colour::LightGrey: - return setColour("[0;37m"); - case Colour::BrightRed: - return setColour("[1;31m"); - case Colour::BrightGreen: - return setColour("[1;32m"); - case Colour::BrightWhite: - return setColour("[1;37m"); - - case Colour::Bright: - throw std::logic_error("not a colour"); - } - } - static IColourImpl* instance() - { - static PosixColourImpl s_instance; - return &s_instance; - } + // use POSIX/ ANSI console terminal codes + // Thanks to Adam Strzelecki for original contribution + // (http://github.com/nanoant) + // https://github.com/philsquared/Catch/pull/131 + class PosixColourImpl : public IColourImpl { + public: + virtual void use( Colour::Code _colourCode ) { + switch( _colourCode ) { + case Colour::None: + case Colour::White: return setColour( "[0m" ); + case Colour::Red: return setColour( "[0;31m" ); + case Colour::Green: return setColour( "[0;32m" ); + case Colour::Blue: return setColour( "[0;34m" ); + case Colour::Cyan: return setColour( "[0;36m" ); + case Colour::Yellow: return setColour( "[0;33m" ); + case Colour::Grey: return setColour( "[1;30m" ); + + case Colour::LightGrey: return setColour( "[0;37m" ); + case Colour::BrightRed: return setColour( "[1;31m" ); + case Colour::BrightGreen: return setColour( "[1;32m" ); + case Colour::BrightWhite: return setColour( "[1;37m" ); + + case Colour::Bright: throw std::logic_error( "not a colour" ); + } + } + static IColourImpl* instance() { + static PosixColourImpl s_instance; + return &s_instance; + } - private: - void setColour(const char* _escapeCode) - { - Catch::cout() << '\033' << _escapeCode; - } -}; + private: + void setColour( const char* _escapeCode ) { + Catch::cout() << '\033' << _escapeCode; + } + }; -IColourImpl* platformColourInstance() -{ - Ptr config = getCurrentContext().getConfig(); - return (config && config->forceColour()) || isatty(STDOUT_FILENO) - ? PosixColourImpl::instance() - : NoColourImpl::instance(); -} + IColourImpl* platformColourInstance() { + ErrnoGuard guard; + Ptr config = getCurrentContext().getConfig(); + UseColour::YesOrNo colourMode = config + ? config->useColour() + : UseColour::Auto; + if( colourMode == UseColour::Auto ) + colourMode = (!isDebuggerActive() && isatty(STDOUT_FILENO) ) + ? UseColour::Yes + : UseColour::No; + return colourMode == UseColour::Yes + ? PosixColourImpl::instance() + : NoColourImpl::instance(); + } } // end anon namespace } // end namespace Catch -#else // not Windows or ANSI /////////////////////////////////////////////// +#else // not Windows or ANSI /////////////////////////////////////////////// namespace Catch { -static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); } + static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); } } // end namespace Catch @@ -7872,105 +7843,88 @@ static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); namespace Catch { -Colour::Colour(Code _colourCode) : m_moved(false) { use(_colourCode); } -Colour::Colour(Colour const& _other) : m_moved(false) { const_cast(_other).m_moved = true; } -Colour::~Colour() -{ - if (!m_moved) use(None); -} + Colour::Colour( Code _colourCode ) : m_moved( false ) { use( _colourCode ); } + Colour::Colour( Colour const& _other ) : m_moved( false ) { const_cast( _other ).m_moved = true; } + Colour::~Colour(){ if( !m_moved ) use( None ); } -void Colour::use(Code _colourCode) -{ - static IColourImpl* impl = isDebuggerActive() - ? NoColourImpl::instance() - : platformColourInstance(); - impl->use(_colourCode); -} + void Colour::use( Code _colourCode ) { + static IColourImpl* impl = platformColourInstance(); + impl->use( _colourCode ); + } } // end namespace Catch // #included from: catch_generators_impl.hpp #define TWOBLUECUBES_CATCH_GENERATORS_IMPL_HPP_INCLUDED -#include -#include #include +#include +#include namespace Catch { -struct GeneratorInfo : IGeneratorInfo -{ + struct GeneratorInfo : IGeneratorInfo { - GeneratorInfo(std::size_t size) - : m_size(size), - m_currentIndex(0) - { - } + GeneratorInfo( std::size_t size ) + : m_size( size ), + m_currentIndex( 0 ) + {} - bool moveNext() - { - if (++m_currentIndex == m_size) - { - m_currentIndex = 0; - return false; + bool moveNext() { + if( ++m_currentIndex == m_size ) { + m_currentIndex = 0; + return false; + } + return true; } - return true; - } - std::size_t getCurrentIndex() const - { - return m_currentIndex; - } + std::size_t getCurrentIndex() const { + return m_currentIndex; + } - std::size_t m_size; - std::size_t m_currentIndex; -}; + std::size_t m_size; + std::size_t m_currentIndex; + }; -/////////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////// -class GeneratorsForTest : public IGeneratorsForTest -{ + class GeneratorsForTest : public IGeneratorsForTest { - public: - ~GeneratorsForTest() - { - deleteAll(m_generatorsInOrder); - } + public: + ~GeneratorsForTest() { + deleteAll( m_generatorsInOrder ); + } - IGeneratorInfo& getGeneratorInfo(std::string const& fileInfo, std::size_t size) - { - std::map::const_iterator it = m_generatorsByName.find(fileInfo); - if (it == m_generatorsByName.end()) - { - IGeneratorInfo* info = new GeneratorInfo(size); - m_generatorsByName.insert(std::make_pair(fileInfo, info)); - m_generatorsInOrder.push_back(info); - return *info; + IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) { + std::map::const_iterator it = m_generatorsByName.find( fileInfo ); + if( it == m_generatorsByName.end() ) { + IGeneratorInfo* info = new GeneratorInfo( size ); + m_generatorsByName.insert( std::make_pair( fileInfo, info ) ); + m_generatorsInOrder.push_back( info ); + return *info; + } + return *it->second; } - return *it->second; - } - bool moveNext() - { - std::vector::const_iterator it = m_generatorsInOrder.begin(); - std::vector::const_iterator itEnd = m_generatorsInOrder.end(); - for (; it != itEnd; ++it) - { - if ((*it)->moveNext()) - return true; + bool moveNext() { + std::vector::const_iterator it = m_generatorsInOrder.begin(); + std::vector::const_iterator itEnd = m_generatorsInOrder.end(); + for(; it != itEnd; ++it ) { + if( (*it)->moveNext() ) + return true; + } + return false; } - return false; - } - private: - std::map m_generatorsByName; - std::vector m_generatorsInOrder; -}; + private: + std::map m_generatorsByName; + std::vector m_generatorsInOrder; + }; -IGeneratorsForTest* createGeneratorsForTest() -{ - return new GeneratorsForTest(); -} + IGeneratorsForTest* createGeneratorsForTest() + { + return new GeneratorsForTest(); + } } // end namespace Catch @@ -7979,301 +7933,273 @@ IGeneratorsForTest* createGeneratorsForTest() namespace Catch { -AssertionInfo::AssertionInfo(std::string const& _macroName, - SourceLineInfo const& _lineInfo, - std::string const& _capturedExpression, - ResultDisposition::Flags _resultDisposition) - : macroName(_macroName), - lineInfo(_lineInfo), - capturedExpression(_capturedExpression), - resultDisposition(_resultDisposition) -{ -} + AssertionInfo::AssertionInfo( std::string const& _macroName, + SourceLineInfo const& _lineInfo, + std::string const& _capturedExpression, + ResultDisposition::Flags _resultDisposition ) + : macroName( _macroName ), + lineInfo( _lineInfo ), + capturedExpression( _capturedExpression ), + resultDisposition( _resultDisposition ) + {} -AssertionResult::AssertionResult() {} + AssertionResult::AssertionResult() {} -AssertionResult::AssertionResult(AssertionInfo const& info, AssertionResultData const& data) - : m_info(info), - m_resultData(data) -{ -} + AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data ) + : m_info( info ), + m_resultData( data ) + {} -AssertionResult::~AssertionResult() {} + AssertionResult::~AssertionResult() {} -// Result was a success -bool AssertionResult::succeeded() const -{ - return Catch::isOk(m_resultData.resultType); -} + // Result was a success + bool AssertionResult::succeeded() const { + return Catch::isOk( m_resultData.resultType ); + } -// Result was a success, or failure is suppressed -bool AssertionResult::isOk() const -{ - return Catch::isOk(m_resultData.resultType) || shouldSuppressFailure(m_info.resultDisposition); -} + // Result was a success, or failure is suppressed + bool AssertionResult::isOk() const { + return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition ); + } -ResultWas::OfType AssertionResult::getResultType() const -{ - return m_resultData.resultType; -} + ResultWas::OfType AssertionResult::getResultType() const { + return m_resultData.resultType; + } -bool AssertionResult::hasExpression() const -{ - return !m_info.capturedExpression.empty(); -} + bool AssertionResult::hasExpression() const { + return !m_info.capturedExpression.empty(); + } -bool AssertionResult::hasMessage() const -{ - return !m_resultData.message.empty(); -} + bool AssertionResult::hasMessage() const { + return !m_resultData.message.empty(); + } -std::string AssertionResult::getExpression() const -{ - if (isFalseTest(m_info.resultDisposition)) - return "!" + m_info.capturedExpression; - else - return m_info.capturedExpression; -} -std::string AssertionResult::getExpressionInMacro() const -{ - if (m_info.macroName.empty()) - return m_info.capturedExpression; - else - return m_info.macroName + "( " + m_info.capturedExpression + " )"; -} + std::string AssertionResult::getExpression() const { + if( isFalseTest( m_info.resultDisposition ) ) + return '!' + m_info.capturedExpression; + else + return m_info.capturedExpression; + } + std::string AssertionResult::getExpressionInMacro() const { + if( m_info.macroName.empty() ) + return m_info.capturedExpression; + else + return m_info.macroName + "( " + m_info.capturedExpression + " )"; + } -bool AssertionResult::hasExpandedExpression() const -{ - return hasExpression() && getExpandedExpression() != getExpression(); -} + bool AssertionResult::hasExpandedExpression() const { + return hasExpression() && getExpandedExpression() != getExpression(); + } -std::string AssertionResult::getExpandedExpression() const -{ - return m_resultData.reconstructedExpression; -} + std::string AssertionResult::getExpandedExpression() const { + return m_resultData.reconstructExpression(); + } -std::string AssertionResult::getMessage() const -{ - return m_resultData.message; -} -SourceLineInfo AssertionResult::getSourceInfo() const -{ - return m_info.lineInfo; -} + std::string AssertionResult::getMessage() const { + return m_resultData.message; + } + SourceLineInfo AssertionResult::getSourceInfo() const { + return m_info.lineInfo; + } -std::string AssertionResult::getTestMacroName() const -{ - return m_info.macroName; -} + std::string AssertionResult::getTestMacroName() const { + return m_info.macroName; + } + + void AssertionResult::discardDecomposedExpression() const { + m_resultData.decomposedExpression = CATCH_NULL; + } + + void AssertionResult::expandDecomposedExpression() const { + m_resultData.reconstructExpression(); + } } // end namespace Catch // #included from: catch_test_case_info.hpp #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED -namespace Catch { - -inline TestCaseInfo::SpecialProperties parseSpecialTag(std::string const& tag) -{ - if (startsWith(tag, ".") || - tag == "hide" || - tag == "!hide") - return TestCaseInfo::IsHidden; - else if (tag == "!throws") - return TestCaseInfo::Throws; - else if (tag == "!shouldfail") - return TestCaseInfo::ShouldFail; - else if (tag == "!mayfail") - return TestCaseInfo::MayFail; - else - return TestCaseInfo::None; -} -inline bool isReservedTag(std::string const& tag) -{ - return parseSpecialTag(tag) == TestCaseInfo::None && tag.size() > 0 && !isalnum(tag[0]); -} -inline void enforceNotReservedTag(std::string const& tag, SourceLineInfo const& _lineInfo) -{ - if (isReservedTag(tag)) - { - { - Colour colourGuard(Colour::Red); - Catch::cerr() - << "Tag name [" << tag << "] not allowed.\n" - << "Tag names starting with non alpha-numeric characters are reserved\n"; - } - { - Colour colourGuard(Colour::FileName); - Catch::cerr() << _lineInfo << std::endl; - } - exit(1); - } -} - -TestCase makeTestCase(ITestCase* _testCase, - std::string const& _className, - std::string const& _name, - std::string const& _descOrTags, - SourceLineInfo const& _lineInfo) -{ - bool isHidden(startsWith(_name, "./")); // Legacy support +#include - // Parse out tags - std::set tags; - std::string desc, tag; - bool inTag = false; - for (std::size_t i = 0; i < _descOrTags.size(); ++i) - { - char c = _descOrTags[i]; - if (!inTag) - { - if (c == '[') - inTag = true; - else - desc += c; - } - else - { - if (c == ']') - { - TestCaseInfo::SpecialProperties prop = parseSpecialTag(tag); - if (prop == TestCaseInfo::IsHidden) - isHidden = true; - else if (prop == TestCaseInfo::None) - enforceNotReservedTag(tag, _lineInfo); +namespace Catch { - tags.insert(tag); - tag.clear(); - inTag = false; + inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) { + if( startsWith( tag, '.' ) || + tag == "hide" || + tag == "!hide" ) + return TestCaseInfo::IsHidden; + else if( tag == "!throws" ) + return TestCaseInfo::Throws; + else if( tag == "!shouldfail" ) + return TestCaseInfo::ShouldFail; + else if( tag == "!mayfail" ) + return TestCaseInfo::MayFail; + else if( tag == "!nonportable" ) + return TestCaseInfo::NonPortable; + else + return TestCaseInfo::None; + } + inline bool isReservedTag( std::string const& tag ) { + return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( tag[0] ); + } + inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) { + if( isReservedTag( tag ) ) { + std::ostringstream ss; + ss << Colour(Colour::Red) + << "Tag name [" << tag << "] not allowed.\n" + << "Tag names starting with non alpha-numeric characters are reserved\n" + << Colour(Colour::FileName) + << _lineInfo << '\n'; + throw std::runtime_error(ss.str()); + } + } + + TestCase makeTestCase( ITestCase* _testCase, + std::string const& _className, + std::string const& _name, + std::string const& _descOrTags, + SourceLineInfo const& _lineInfo ) + { + bool isHidden( startsWith( _name, "./" ) ); // Legacy support + + // Parse out tags + std::set tags; + std::string desc, tag; + bool inTag = false; + for( std::size_t i = 0; i < _descOrTags.size(); ++i ) { + char c = _descOrTags[i]; + if( !inTag ) { + if( c == '[' ) + inTag = true; + else + desc += c; + } + else { + if( c == ']' ) { + TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag ); + if( prop == TestCaseInfo::IsHidden ) + isHidden = true; + else if( prop == TestCaseInfo::None ) + enforceNotReservedTag( tag, _lineInfo ); + + tags.insert( tag ); + tag.clear(); + inTag = false; + } + else + tag += c; } - else - tag += c; } - } - if (isHidden) - { - tags.insert("hide"); - tags.insert("."); + if( isHidden ) { + tags.insert( "hide" ); + tags.insert( "." ); + } + + TestCaseInfo info( _name, _className, desc, tags, _lineInfo ); + return TestCase( _testCase, info ); } - TestCaseInfo info(_name, _className, desc, tags, _lineInfo); - return TestCase(_testCase, info); -} + void setTags( TestCaseInfo& testCaseInfo, std::set const& tags ) + { + testCaseInfo.tags = tags; + testCaseInfo.lcaseTags.clear(); -void setTags(TestCaseInfo& testCaseInfo, std::set const& tags) -{ - testCaseInfo.tags = tags; - testCaseInfo.lcaseTags.clear(); + std::ostringstream oss; + for( std::set::const_iterator it = tags.begin(), itEnd = tags.end(); it != itEnd; ++it ) { + oss << '[' << *it << ']'; + std::string lcaseTag = toLower( *it ); + testCaseInfo.properties = static_cast( testCaseInfo.properties | parseSpecialTag( lcaseTag ) ); + testCaseInfo.lcaseTags.insert( lcaseTag ); + } + testCaseInfo.tagsAsString = oss.str(); + } - std::ostringstream oss; - for (std::set::const_iterator it = tags.begin(), itEnd = tags.end(); it != itEnd; ++it) + TestCaseInfo::TestCaseInfo( std::string const& _name, + std::string const& _className, + std::string const& _description, + std::set const& _tags, + SourceLineInfo const& _lineInfo ) + : name( _name ), + className( _className ), + description( _description ), + lineInfo( _lineInfo ), + properties( None ) { - oss << "[" << *it << "]"; - std::string lcaseTag = toLower(*it); - testCaseInfo.properties = static_cast(testCaseInfo.properties | parseSpecialTag(lcaseTag)); - testCaseInfo.lcaseTags.insert(lcaseTag); + setTags( *this, _tags ); } - testCaseInfo.tagsAsString = oss.str(); -} - -TestCaseInfo::TestCaseInfo(std::string const& _name, - std::string const& _className, - std::string const& _description, - std::set const& _tags, - SourceLineInfo const& _lineInfo) - : name(_name), - className(_className), - description(_description), - lineInfo(_lineInfo), - properties(None) -{ - setTags(*this, _tags); -} -TestCaseInfo::TestCaseInfo(TestCaseInfo const& other) - : name(other.name), - className(other.className), - description(other.description), - tags(other.tags), - lcaseTags(other.lcaseTags), - tagsAsString(other.tagsAsString), - lineInfo(other.lineInfo), - properties(other.properties) -{ -} + TestCaseInfo::TestCaseInfo( TestCaseInfo const& other ) + : name( other.name ), + className( other.className ), + description( other.description ), + tags( other.tags ), + lcaseTags( other.lcaseTags ), + tagsAsString( other.tagsAsString ), + lineInfo( other.lineInfo ), + properties( other.properties ) + {} -bool TestCaseInfo::isHidden() const -{ - return (properties & IsHidden) != 0; -} -bool TestCaseInfo::throws() const -{ - return (properties & Throws) != 0; -} -bool TestCaseInfo::okToFail() const -{ - return (properties & (ShouldFail | MayFail)) != 0; -} -bool TestCaseInfo::expectedToFail() const -{ - return (properties & (ShouldFail)) != 0; -} + bool TestCaseInfo::isHidden() const { + return ( properties & IsHidden ) != 0; + } + bool TestCaseInfo::throws() const { + return ( properties & Throws ) != 0; + } + bool TestCaseInfo::okToFail() const { + return ( properties & (ShouldFail | MayFail ) ) != 0; + } + bool TestCaseInfo::expectedToFail() const { + return ( properties & (ShouldFail ) ) != 0; + } -TestCase::TestCase(ITestCase* testCase, TestCaseInfo const& info) : TestCaseInfo(info), test(testCase) {} + TestCase::TestCase( ITestCase* testCase, TestCaseInfo const& info ) : TestCaseInfo( info ), test( testCase ) {} -TestCase::TestCase(TestCase const& other) - : TestCaseInfo(other), - test(other.test) -{ -} + TestCase::TestCase( TestCase const& other ) + : TestCaseInfo( other ), + test( other.test ) + {} -TestCase TestCase::withName(std::string const& _newName) const -{ - TestCase other(*this); - other.name = _newName; - return other; -} + TestCase TestCase::withName( std::string const& _newName ) const { + TestCase other( *this ); + other.name = _newName; + return other; + } -void TestCase::swap(TestCase& other) -{ - test.swap(other.test); - name.swap(other.name); - className.swap(other.className); - description.swap(other.description); - tags.swap(other.tags); - lcaseTags.swap(other.lcaseTags); - tagsAsString.swap(other.tagsAsString); - std::swap(TestCaseInfo::properties, static_cast(other).properties); - std::swap(lineInfo, other.lineInfo); -} + void TestCase::swap( TestCase& other ) { + test.swap( other.test ); + name.swap( other.name ); + className.swap( other.className ); + description.swap( other.description ); + tags.swap( other.tags ); + lcaseTags.swap( other.lcaseTags ); + tagsAsString.swap( other.tagsAsString ); + std::swap( TestCaseInfo::properties, static_cast( other ).properties ); + std::swap( lineInfo, other.lineInfo ); + } -void TestCase::invoke() const -{ - test->invoke(); -} + void TestCase::invoke() const { + test->invoke(); + } -bool TestCase::operator==(TestCase const& other) const -{ - return test.get() == other.test.get() && - name == other.name && - className == other.className; -} + bool TestCase::operator == ( TestCase const& other ) const { + return test.get() == other.test.get() && + name == other.name && + className == other.className; + } -bool TestCase::operator<(TestCase const& other) const -{ - return name < other.name; -} -TestCase& TestCase::operator=(TestCase const& other) -{ - TestCase temp(other); - swap(temp); - return *this; -} + bool TestCase::operator < ( TestCase const& other ) const { + return name < other.name; + } + TestCase& TestCase::operator = ( TestCase const& other ) { + TestCase temp( other ); + swap( temp ); + return *this; + } -TestCaseInfo const& TestCase::getTestCaseInfo() const -{ - return *this; -} + TestCaseInfo const& TestCase::getTestCaseInfo() const + { + return *this; + } } // end namespace Catch @@ -8282,34 +8208,36 @@ TestCaseInfo const& TestCase::getTestCaseInfo() const namespace Catch { -Version::Version(unsigned int _majorVersion, - unsigned int _minorVersion, - unsigned int _patchNumber, - std::string const& _branchName, - unsigned int _buildNumber) - : majorVersion(_majorVersion), - minorVersion(_minorVersion), - patchNumber(_patchNumber), - branchName(_branchName), - buildNumber(_buildNumber) -{ -} - -std::ostream& operator<<(std::ostream& os, Version const& version) -{ - os << version.majorVersion << "." - << version.minorVersion << "." - << version.patchNumber; + Version::Version + ( unsigned int _majorVersion, + unsigned int _minorVersion, + unsigned int _patchNumber, + char const * const _branchName, + unsigned int _buildNumber ) + : majorVersion( _majorVersion ), + minorVersion( _minorVersion ), + patchNumber( _patchNumber ), + branchName( _branchName ), + buildNumber( _buildNumber ) + {} + + std::ostream& operator << ( std::ostream& os, Version const& version ) { + os << version.majorVersion << '.' + << version.minorVersion << '.' + << version.patchNumber; + // branchName is never null -> 0th char is \0 if it is empty + if (version.branchName[0]) { + os << '-' << version.branchName + << '.' << version.buildNumber; + } + return os; + } - if (!version.branchName.empty()) - { - os << "-" << version.branchName - << "." << version.buildNumber; + inline Version libraryVersion() { + static Version version( 1, 9, 0, "", 0 ); + return version; } - return os; -} -Version libraryVersion(1, 3, 2, "", 0); } // #included from: catch_message.hpp @@ -8317,36 +8245,35 @@ Version libraryVersion(1, 3, 2, "", 0); namespace Catch { -MessageInfo::MessageInfo(std::string const& _macroName, - SourceLineInfo const& _lineInfo, - ResultWas::OfType _type) - : macroName(_macroName), - lineInfo(_lineInfo), - type(_type), - sequence(++globalCount) -{ -} + MessageInfo::MessageInfo( std::string const& _macroName, + SourceLineInfo const& _lineInfo, + ResultWas::OfType _type ) + : macroName( _macroName ), + lineInfo( _lineInfo ), + type( _type ), + sequence( ++globalCount ) + {} -// This may need protecting if threading support is added -unsigned int MessageInfo::globalCount = 0; + // This may need protecting if threading support is added + unsigned int MessageInfo::globalCount = 0; -//////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////// -ScopedMessage::ScopedMessage(MessageBuilder const& builder) - : m_info(builder.m_info) -{ - m_info.message = builder.m_stream.str(); - getResultCapture().pushScopedMessage(m_info); -} -ScopedMessage::ScopedMessage(ScopedMessage const& other) - : m_info(other.m_info) -{ -} + ScopedMessage::ScopedMessage( MessageBuilder const& builder ) + : m_info( builder.m_info ) + { + m_info.message = builder.m_stream.str(); + getResultCapture().pushScopedMessage( m_info ); + } + ScopedMessage::ScopedMessage( ScopedMessage const& other ) + : m_info( other.m_info ) + {} -ScopedMessage::~ScopedMessage() -{ - getResultCapture().popScopedMessage(m_info); -} + ScopedMessage::~ScopedMessage() { + if ( !std::uncaught_exception() ){ + getResultCapture().popScopedMessage(m_info); + } + } } // end namespace Catch @@ -8356,136 +8283,122 @@ ScopedMessage::~ScopedMessage() // #included from: catch_legacy_reporter_adapter.h #define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_H_INCLUDED -namespace Catch { -// Deprecated -struct IReporter : IShared -{ - virtual ~IReporter(); - - virtual bool shouldRedirectStdout() const = 0; - - virtual void StartTesting() = 0; - virtual void EndTesting(Totals const& totals) = 0; - virtual void StartGroup(std::string const& groupName) = 0; - virtual void EndGroup(std::string const& groupName, Totals const& totals) = 0; - virtual void StartTestCase(TestCaseInfo const& testInfo) = 0; - virtual void EndTestCase(TestCaseInfo const& testInfo, Totals const& totals, std::string const& stdOut, std::string const& stdErr) = 0; - virtual void StartSection(std::string const& sectionName, std::string const& description) = 0; - virtual void EndSection(std::string const& sectionName, Counts const& assertions) = 0; - virtual void NoAssertionsInSection(std::string const& sectionName) = 0; - virtual void NoAssertionsInTestCase(std::string const& testName) = 0; - virtual void Aborted() = 0; - virtual void Result(AssertionResult const& result) = 0; -}; +namespace Catch +{ + // Deprecated + struct IReporter : IShared { + virtual ~IReporter(); + + virtual bool shouldRedirectStdout() const = 0; + + virtual void StartTesting() = 0; + virtual void EndTesting( Totals const& totals ) = 0; + virtual void StartGroup( std::string const& groupName ) = 0; + virtual void EndGroup( std::string const& groupName, Totals const& totals ) = 0; + virtual void StartTestCase( TestCaseInfo const& testInfo ) = 0; + virtual void EndTestCase( TestCaseInfo const& testInfo, Totals const& totals, std::string const& stdOut, std::string const& stdErr ) = 0; + virtual void StartSection( std::string const& sectionName, std::string const& description ) = 0; + virtual void EndSection( std::string const& sectionName, Counts const& assertions ) = 0; + virtual void NoAssertionsInSection( std::string const& sectionName ) = 0; + virtual void NoAssertionsInTestCase( std::string const& testName ) = 0; + virtual void Aborted() = 0; + virtual void Result( AssertionResult const& result ) = 0; + }; -class LegacyReporterAdapter : public SharedImpl -{ - public: - LegacyReporterAdapter(Ptr const& legacyReporter); - virtual ~LegacyReporterAdapter(); - - virtual ReporterPreferences getPreferences() const; - virtual void noMatchingTestCases(std::string const&); - virtual void testRunStarting(TestRunInfo const&); - virtual void testGroupStarting(GroupInfo const& groupInfo); - virtual void testCaseStarting(TestCaseInfo const& testInfo); - virtual void sectionStarting(SectionInfo const& sectionInfo); - virtual void assertionStarting(AssertionInfo const&); - virtual bool assertionEnded(AssertionStats const& assertionStats); - virtual void sectionEnded(SectionStats const& sectionStats); - virtual void testCaseEnded(TestCaseStats const& testCaseStats); - virtual void testGroupEnded(TestGroupStats const& testGroupStats); - virtual void testRunEnded(TestRunStats const& testRunStats); - virtual void skipTest(TestCaseInfo const&); - - private: - Ptr m_legacyReporter; -}; + class LegacyReporterAdapter : public SharedImpl + { + public: + LegacyReporterAdapter( Ptr const& legacyReporter ); + virtual ~LegacyReporterAdapter(); + + virtual ReporterPreferences getPreferences() const; + virtual void noMatchingTestCases( std::string const& ); + virtual void testRunStarting( TestRunInfo const& ); + virtual void testGroupStarting( GroupInfo const& groupInfo ); + virtual void testCaseStarting( TestCaseInfo const& testInfo ); + virtual void sectionStarting( SectionInfo const& sectionInfo ); + virtual void assertionStarting( AssertionInfo const& ); + virtual bool assertionEnded( AssertionStats const& assertionStats ); + virtual void sectionEnded( SectionStats const& sectionStats ); + virtual void testCaseEnded( TestCaseStats const& testCaseStats ); + virtual void testGroupEnded( TestGroupStats const& testGroupStats ); + virtual void testRunEnded( TestRunStats const& testRunStats ); + virtual void skipTest( TestCaseInfo const& ); + + private: + Ptr m_legacyReporter; + }; } -namespace Catch { -LegacyReporterAdapter::LegacyReporterAdapter(Ptr const& legacyReporter) - : m_legacyReporter(legacyReporter) +namespace Catch { -} -LegacyReporterAdapter::~LegacyReporterAdapter() {} + LegacyReporterAdapter::LegacyReporterAdapter( Ptr const& legacyReporter ) + : m_legacyReporter( legacyReporter ) + {} + LegacyReporterAdapter::~LegacyReporterAdapter() {} -ReporterPreferences LegacyReporterAdapter::getPreferences() const -{ - ReporterPreferences prefs; - prefs.shouldRedirectStdOut = m_legacyReporter->shouldRedirectStdout(); - return prefs; -} + ReporterPreferences LegacyReporterAdapter::getPreferences() const { + ReporterPreferences prefs; + prefs.shouldRedirectStdOut = m_legacyReporter->shouldRedirectStdout(); + return prefs; + } -void LegacyReporterAdapter::noMatchingTestCases(std::string const&) {} -void LegacyReporterAdapter::testRunStarting(TestRunInfo const&) -{ - m_legacyReporter->StartTesting(); -} -void LegacyReporterAdapter::testGroupStarting(GroupInfo const& groupInfo) -{ - m_legacyReporter->StartGroup(groupInfo.name); -} -void LegacyReporterAdapter::testCaseStarting(TestCaseInfo const& testInfo) -{ - m_legacyReporter->StartTestCase(testInfo); -} -void LegacyReporterAdapter::sectionStarting(SectionInfo const& sectionInfo) -{ - m_legacyReporter->StartSection(sectionInfo.name, sectionInfo.description); -} -void LegacyReporterAdapter::assertionStarting(AssertionInfo const&) -{ - // Not on legacy interface -} + void LegacyReporterAdapter::noMatchingTestCases( std::string const& ) {} + void LegacyReporterAdapter::testRunStarting( TestRunInfo const& ) { + m_legacyReporter->StartTesting(); + } + void LegacyReporterAdapter::testGroupStarting( GroupInfo const& groupInfo ) { + m_legacyReporter->StartGroup( groupInfo.name ); + } + void LegacyReporterAdapter::testCaseStarting( TestCaseInfo const& testInfo ) { + m_legacyReporter->StartTestCase( testInfo ); + } + void LegacyReporterAdapter::sectionStarting( SectionInfo const& sectionInfo ) { + m_legacyReporter->StartSection( sectionInfo.name, sectionInfo.description ); + } + void LegacyReporterAdapter::assertionStarting( AssertionInfo const& ) { + // Not on legacy interface + } -bool LegacyReporterAdapter::assertionEnded(AssertionStats const& assertionStats) -{ - if (assertionStats.assertionResult.getResultType() != ResultWas::Ok) - { - for (std::vector::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end(); - it != itEnd; - ++it) - { - if (it->type == ResultWas::Info) - { - ResultBuilder rb(it->macroName.c_str(), it->lineInfo, "", ResultDisposition::Normal); - rb << it->message; - rb.setResultType(ResultWas::Info); - AssertionResult result = rb.build(); - m_legacyReporter->Result(result); + bool LegacyReporterAdapter::assertionEnded( AssertionStats const& assertionStats ) { + if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) { + for( std::vector::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end(); + it != itEnd; + ++it ) { + if( it->type == ResultWas::Info ) { + ResultBuilder rb( it->macroName.c_str(), it->lineInfo, "", ResultDisposition::Normal ); + rb << it->message; + rb.setResultType( ResultWas::Info ); + AssertionResult result = rb.build(); + m_legacyReporter->Result( result ); + } } } + m_legacyReporter->Result( assertionStats.assertionResult ); + return true; + } + void LegacyReporterAdapter::sectionEnded( SectionStats const& sectionStats ) { + if( sectionStats.missingAssertions ) + m_legacyReporter->NoAssertionsInSection( sectionStats.sectionInfo.name ); + m_legacyReporter->EndSection( sectionStats.sectionInfo.name, sectionStats.assertions ); + } + void LegacyReporterAdapter::testCaseEnded( TestCaseStats const& testCaseStats ) { + m_legacyReporter->EndTestCase + ( testCaseStats.testInfo, + testCaseStats.totals, + testCaseStats.stdOut, + testCaseStats.stdErr ); + } + void LegacyReporterAdapter::testGroupEnded( TestGroupStats const& testGroupStats ) { + if( testGroupStats.aborting ) + m_legacyReporter->Aborted(); + m_legacyReporter->EndGroup( testGroupStats.groupInfo.name, testGroupStats.totals ); + } + void LegacyReporterAdapter::testRunEnded( TestRunStats const& testRunStats ) { + m_legacyReporter->EndTesting( testRunStats.totals ); + } + void LegacyReporterAdapter::skipTest( TestCaseInfo const& ) { } - m_legacyReporter->Result(assertionStats.assertionResult); - return true; -} -void LegacyReporterAdapter::sectionEnded(SectionStats const& sectionStats) -{ - if (sectionStats.missingAssertions) - m_legacyReporter->NoAssertionsInSection(sectionStats.sectionInfo.name); - m_legacyReporter->EndSection(sectionStats.sectionInfo.name, sectionStats.assertions); -} -void LegacyReporterAdapter::testCaseEnded(TestCaseStats const& testCaseStats) -{ - m_legacyReporter->EndTestCase(testCaseStats.testInfo, - testCaseStats.totals, - testCaseStats.stdOut, - testCaseStats.stdErr); -} -void LegacyReporterAdapter::testGroupEnded(TestGroupStats const& testGroupStats) -{ - if (testGroupStats.aborting) - m_legacyReporter->Aborted(); - m_legacyReporter->EndGroup(testGroupStats.groupInfo.name, testGroupStats.totals); -} -void LegacyReporterAdapter::testRunEnded(TestRunStats const& testRunStats) -{ - m_legacyReporter->EndTesting(testRunStats.totals); -} -void LegacyReporterAdapter::skipTest(TestCaseInfo const&) -{ -} } // #included from: catch_timer.hpp @@ -8496,53 +8409,48 @@ void LegacyReporterAdapter::skipTest(TestCaseInfo const&) #endif #ifdef CATCH_PLATFORM_WINDOWS -#include + #else + #include + #endif namespace Catch { -namespace { + namespace { #ifdef CATCH_PLATFORM_WINDOWS -uint64_t getCurrentTicks() -{ - static uint64_t hz = 0, hzo = 0; - if (!hz) - { - QueryPerformanceFrequency(reinterpret_cast(&hz)); - QueryPerformanceCounter(reinterpret_cast(&hzo)); - } - uint64_t t; - QueryPerformanceCounter(reinterpret_cast(&t)); - return ((t - hzo) * 1000000) / hz; -} + uint64_t getCurrentTicks() { + static uint64_t hz=0, hzo=0; + if (!hz) { + QueryPerformanceFrequency( reinterpret_cast( &hz ) ); + QueryPerformanceCounter( reinterpret_cast( &hzo ) ); + } + uint64_t t; + QueryPerformanceCounter( reinterpret_cast( &t ) ); + return ((t-hzo)*1000000)/hz; + } #else -uint64_t getCurrentTicks() -{ - timeval t; - gettimeofday(&t, CATCH_NULL); - return static_cast(t.tv_sec) * 1000000ull + static_cast(t.tv_usec); -} + uint64_t getCurrentTicks() { + timeval t; + gettimeofday(&t,CATCH_NULL); + return static_cast( t.tv_sec ) * 1000000ull + static_cast( t.tv_usec ); + } #endif -} + } -void Timer::start() -{ - m_ticks = getCurrentTicks(); -} -unsigned int Timer::getElapsedMicroseconds() const -{ - return static_cast(getCurrentTicks() - m_ticks); -} -unsigned int Timer::getElapsedMilliseconds() const -{ - return static_cast(getElapsedMicroseconds() / 1000); -} -double Timer::getElapsedSeconds() const -{ - return getElapsedMicroseconds() / 1000000.0; -} + void Timer::start() { + m_ticks = getCurrentTicks(); + } + unsigned int Timer::getElapsedMicroseconds() const { + return static_cast(getCurrentTicks() - m_ticks); + } + unsigned int Timer::getElapsedMilliseconds() const { + return static_cast(getElapsedMicroseconds()/1000); + } + double Timer::getElapsedSeconds() const { + return getElapsedMicroseconds()/1000000.0; + } } // namespace Catch @@ -8552,120 +8460,109 @@ double Timer::getElapsedSeconds() const // #included from: catch_common.hpp #define TWOBLUECUBES_CATCH_COMMON_HPP_INCLUDED +#include +#include + namespace Catch { -bool startsWith(std::string const& s, std::string const& prefix) -{ - return s.size() >= prefix.size() && s.substr(0, prefix.size()) == prefix; -} -bool endsWith(std::string const& s, std::string const& suffix) -{ - return s.size() >= suffix.size() && s.substr(s.size() - suffix.size(), suffix.size()) == suffix; -} -bool contains(std::string const& s, std::string const& infix) -{ - return s.find(infix) != std::string::npos; -} -void toLowerInPlace(std::string& s) -{ - std::transform(s.begin(), s.end(), s.begin(), ::tolower); -} -std::string toLower(std::string const& s) -{ - std::string lc = s; - toLowerInPlace(lc); - return lc; -} -std::string trim(std::string const& str) -{ - static char const* whitespaceChars = "\n\r\t "; - std::string::size_type start = str.find_first_not_of(whitespaceChars); - std::string::size_type end = str.find_last_not_of(whitespaceChars); + bool startsWith( std::string const& s, std::string const& prefix ) { + return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin()); + } + bool startsWith( std::string const& s, char prefix ) { + return !s.empty() && s[0] == prefix; + } + bool endsWith( std::string const& s, std::string const& suffix ) { + return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin()); + } + bool endsWith( std::string const& s, char suffix ) { + return !s.empty() && s[s.size()-1] == suffix; + } + bool contains( std::string const& s, std::string const& infix ) { + return s.find( infix ) != std::string::npos; + } + char toLowerCh(char c) { + return static_cast( std::tolower( c ) ); + } + void toLowerInPlace( std::string& s ) { + std::transform( s.begin(), s.end(), s.begin(), toLowerCh ); + } + std::string toLower( std::string const& s ) { + std::string lc = s; + toLowerInPlace( lc ); + return lc; + } + std::string trim( std::string const& str ) { + static char const* whitespaceChars = "\n\r\t "; + std::string::size_type start = str.find_first_not_of( whitespaceChars ); + std::string::size_type end = str.find_last_not_of( whitespaceChars ); - return start != std::string::npos ? str.substr(start, 1 + end - start) : ""; -} + return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string(); + } -bool replaceInPlace(std::string& str, std::string const& replaceThis, std::string const& withThis) -{ - bool replaced = false; - std::size_t i = str.find(replaceThis); - while (i != std::string::npos) - { - replaced = true; - str = str.substr(0, i) + withThis + str.substr(i + replaceThis.size()); - if (i < str.size() - withThis.size()) - i = str.find(replaceThis, i + withThis.size()); - else - i = std::string::npos; + bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) { + bool replaced = false; + std::size_t i = str.find( replaceThis ); + while( i != std::string::npos ) { + replaced = true; + str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() ); + if( i < str.size()-withThis.size() ) + i = str.find( replaceThis, i+withThis.size() ); + else + i = std::string::npos; + } + return replaced; } - return replaced; -} -pluralise::pluralise(std::size_t count, std::string const& label) - : m_count(count), - m_label(label) -{ -} + pluralise::pluralise( std::size_t count, std::string const& label ) + : m_count( count ), + m_label( label ) + {} -std::ostream& operator<<(std::ostream& os, pluralise const& pluraliser) -{ - os << pluraliser.m_count << " " << pluraliser.m_label; - if (pluraliser.m_count != 1) - os << "s"; - return os; -} + std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) { + os << pluraliser.m_count << ' ' << pluraliser.m_label; + if( pluraliser.m_count != 1 ) + os << 's'; + return os; + } -SourceLineInfo::SourceLineInfo() : line(0) {} -SourceLineInfo::SourceLineInfo(char const* _file, std::size_t _line) - : file(_file), - line(_line) -{ -} -SourceLineInfo::SourceLineInfo(SourceLineInfo const& other) - : file(other.file), - line(other.line) -{ -} -bool SourceLineInfo::empty() const -{ - return file.empty(); -} -bool SourceLineInfo::operator==(SourceLineInfo const& other) const -{ - return line == other.line && file == other.file; -} -bool SourceLineInfo::operator<(SourceLineInfo const& other) const -{ - return line < other.line || (line == other.line && file < other.file); -} + SourceLineInfo::SourceLineInfo() : file(""), line( 0 ){} + SourceLineInfo::SourceLineInfo( char const* _file, std::size_t _line ) + : file( _file ), + line( _line ) + {} + bool SourceLineInfo::empty() const { + return file[0] == '\0'; + } + bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const { + return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0); + } + bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const { + return line < other.line || ( line == other.line && (std::strcmp(file, other.file) < 0)); + } -void seedRng(IConfig const& config) -{ - if (config.rngSeed() != 0) - std::srand(config.rngSeed()); -} -unsigned int rngSeed() -{ - return getCurrentContext().getConfig()->rngSeed(); -} + void seedRng( IConfig const& config ) { + if( config.rngSeed() != 0 ) + std::srand( config.rngSeed() ); + } + unsigned int rngSeed() { + return getCurrentContext().getConfig()->rngSeed(); + } -std::ostream& operator<<(std::ostream& os, SourceLineInfo const& info) -{ + std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) { #ifndef __GNUG__ - os << info.file << "(" << info.line << ")"; + os << info.file << '(' << info.line << ')'; #else - os << info.file << ":" << info.line; + os << info.file << ':' << info.line; #endif - return os; -} + return os; + } -void throwLogicError(std::string const& message, SourceLineInfo const& locationInfo) -{ - std::ostringstream oss; - oss << locationInfo << ": Internal Catch error: '" << message << "'"; - if (alwaysTrue()) - throw std::logic_error(oss.str()); -} + void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ) { + std::ostringstream oss; + oss << locationInfo << ": Internal Catch error: '" << message << '\''; + if( alwaysTrue() ) + throw std::logic_error( oss.str() ); + } } // #included from: catch_section.hpp @@ -8673,136 +8570,154 @@ void throwLogicError(std::string const& message, SourceLineInfo const& locationI namespace Catch { -SectionInfo::SectionInfo(SourceLineInfo const& _lineInfo, - std::string const& _name, - std::string const& _description) - : name(_name), - description(_description), - lineInfo(_lineInfo) -{ -} - -Section::Section(SectionInfo const& info) - : m_info(info), - m_sectionIncluded(getResultCapture().sectionStarted(m_info, m_assertions)) -{ - m_timer.start(); -} + SectionInfo::SectionInfo + ( SourceLineInfo const& _lineInfo, + std::string const& _name, + std::string const& _description ) + : name( _name ), + description( _description ), + lineInfo( _lineInfo ) + {} -Section::~Section() -{ - if (m_sectionIncluded) + Section::Section( SectionInfo const& info ) + : m_info( info ), + m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) ) { - SectionEndInfo endInfo(m_info, m_assertions, m_timer.getElapsedSeconds()); - if (std::uncaught_exception()) - getResultCapture().sectionEndedEarly(endInfo); - else - getResultCapture().sectionEnded(endInfo); + m_timer.start(); } -} -// This indicates whether the section should be executed or not -Section::operator bool() const -{ - return m_sectionIncluded; -} + Section::~Section() { + if( m_sectionIncluded ) { + SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() ); + if( std::uncaught_exception() ) + getResultCapture().sectionEndedEarly( endInfo ); + else + getResultCapture().sectionEnded( endInfo ); + } + } + + // This indicates whether the section should be executed or not + Section::operator bool() const { + return m_sectionIncluded; + } } // end namespace Catch // #included from: catch_debugger.hpp #define TWOBLUECUBES_CATCH_DEBUGGER_HPP_INCLUDED -#include - #ifdef CATCH_PLATFORM_MAC -#include -#include -#include -#include -#include - -namespace Catch { + #include + #include + #include + #include + #include -// The following function is taken directly from the following technical note: -// http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html + namespace Catch{ -// Returns true if the current process is being debugged (either -// running under the debugger or has a debugger attached post facto). -bool isDebuggerActive() -{ + // The following function is taken directly from the following technical note: + // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html - int mib[4]; - struct kinfo_proc info; - size_t size; + // Returns true if the current process is being debugged (either + // running under the debugger or has a debugger attached post facto). + bool isDebuggerActive(){ - // Initialize the flags so that, if sysctl fails for some bizarre - // reason, we get a predictable result. + int mib[4]; + struct kinfo_proc info; + size_t size; - info.kp_proc.p_flag = 0; + // Initialize the flags so that, if sysctl fails for some bizarre + // reason, we get a predictable result. - // Initialize mib, which tells sysctl the info we want, in this case - // we're looking for information about a specific process ID. + info.kp_proc.p_flag = 0; - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_PID; - mib[3] = getpid(); + // Initialize mib, which tells sysctl the info we want, in this case + // we're looking for information about a specific process ID. - // Call sysctl. + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PID; + mib[3] = getpid(); - size = sizeof(info); - if (sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, CATCH_NULL, 0) != 0) - { - Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" - << std::endl; - return false; - } + // Call sysctl. - // We're being debugged if the P_TRACED flag is set. + size = sizeof(info); + if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, CATCH_NULL, 0) != 0 ) { + Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl; + return false; + } - return ((info.kp_proc.p_flag & P_TRACED) != 0); -} -} // namespace Catch + // We're being debugged if the P_TRACED flag is set. + + return ( (info.kp_proc.p_flag & P_TRACED) != 0 ); + } + } // namespace Catch + +#elif defined(CATCH_PLATFORM_LINUX) + #include + #include + + namespace Catch{ + // The standard POSIX way of detecting a debugger is to attempt to + // ptrace() the process, but this needs to be done from a child and not + // this process itself to still allow attaching to this process later + // if wanted, so is rather heavy. Under Linux we have the PID of the + // "debugger" (which doesn't need to be gdb, of course, it could also + // be strace, for example) in /proc/$PID/status, so just get it from + // there instead. + bool isDebuggerActive(){ + // Libstdc++ has a bug, where std::ifstream sets errno to 0 + // This way our users can properly assert over errno values + ErrnoGuard guard; + std::ifstream in("/proc/self/status"); + for( std::string line; std::getline(in, line); ) { + static const int PREFIX_LEN = 11; + if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) { + // We're traced if the PID is not 0 and no other PID starts + // with 0 digit, so it's enough to check for just a single + // character. + return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0'; + } + } + return false; + } + } // namespace Catch #elif defined(_MSC_VER) -extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); -namespace Catch { -bool isDebuggerActive() -{ - return IsDebuggerPresent() != 0; -} -} + extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); + namespace Catch { + bool isDebuggerActive() { + return IsDebuggerPresent() != 0; + } + } #elif defined(__MINGW32__) -extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); -namespace Catch { -bool isDebuggerActive() -{ - return IsDebuggerPresent() != 0; -} -} + extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); + namespace Catch { + bool isDebuggerActive() { + return IsDebuggerPresent() != 0; + } + } #else -namespace Catch { -inline bool isDebuggerActive() { return false; } -} + namespace Catch { + inline bool isDebuggerActive() { return false; } + } #endif // Platform #ifdef CATCH_PLATFORM_WINDOWS -extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char*); -namespace Catch { -void writeToDebugConsole(std::string const& text) -{ - ::OutputDebugStringA(text.c_str()); -} -} + + namespace Catch { + void writeToDebugConsole( std::string const& text ) { + ::OutputDebugStringA( text.c_str() ); + } + } #else -namespace Catch { -void writeToDebugConsole(std::string const& text) -{ - // !TBD: Need a version for Mac/ XCode and other IDEs - Catch::cout() << text; -} -} + namespace Catch { + void writeToDebugConsole( std::string const& text ) { + // !TBD: Need a version for Mac/ XCode and other IDEs + Catch::cout() << text; + } + } #endif // Platform // #included from: catch_tostring.hpp @@ -8812,225 +8727,197 @@ namespace Catch { namespace Detail { -const std::string unprintableString = "{?}"; + const std::string unprintableString = "{?}"; -namespace { -const int hexThreshold = 255; + namespace { + const int hexThreshold = 255; -struct Endianness -{ - enum Arch - { - Big, - Little - }; + struct Endianness { + enum Arch { Big, Little }; - static Arch which() - { - union _ - { - int asInt; - char asChar[sizeof(int)]; - } u; + static Arch which() { + union _{ + int asInt; + char asChar[sizeof (int)]; + } u; - u.asInt = 1; - return (u.asChar[sizeof(int) - 1] == 1) ? Big : Little; + u.asInt = 1; + return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little; + } + }; } -}; -} -std::string rawMemoryToString(const void* object, std::size_t size) -{ - // Reverse order for little endian architectures - int i = 0, end = static_cast(size), inc = 1; - if (Endianness::which() == Endianness::Little) + std::string rawMemoryToString( const void *object, std::size_t size ) { - i = end - 1; - end = inc = -1; - } + // Reverse order for little endian architectures + int i = 0, end = static_cast( size ), inc = 1; + if( Endianness::which() == Endianness::Little ) { + i = end-1; + end = inc = -1; + } - unsigned char const* bytes = static_cast(object); - std::ostringstream os; - os << "0x" << std::setfill('0') << std::hex; - for (; i != end; i += inc) - os << std::setw(2) << static_cast(bytes[i]); - return os.str(); -} + unsigned char const *bytes = static_cast(object); + std::ostringstream os; + os << "0x" << std::setfill('0') << std::hex; + for( ; i != end; i += inc ) + os << std::setw(2) << static_cast(bytes[i]); + return os.str(); + } } -std::string toString(std::string const& value) -{ +std::string toString( std::string const& value ) { std::string s = value; - if (getCurrentContext().getConfig()->showInvisibles()) - { - for (size_t i = 0; i < s.size(); ++i) - { + if( getCurrentContext().getConfig()->showInvisibles() ) { + for(size_t i = 0; i < s.size(); ++i ) { std::string subs; - switch (s[i]) - { - case '\n': - subs = "\\n"; - break; - case '\t': - subs = "\\t"; - break; - default: - break; + switch( s[i] ) { + case '\n': subs = "\\n"; break; + case '\t': subs = "\\t"; break; + default: break; } - if (!subs.empty()) - { - s = s.substr(0, i) + subs + s.substr(i + 1); + if( !subs.empty() ) { + s = s.substr( 0, i ) + subs + s.substr( i+1 ); ++i; } } } - return "\"" + s + "\""; + return '"' + s + '"'; } -std::string toString(std::wstring const& value) -{ +std::string toString( std::wstring const& value ) { std::string s; - s.reserve(value.size()); - for (size_t i = 0; i < value.size(); ++i) - s += value[i] <= 0xff ? static_cast(value[i]) : '?'; - return Catch::toString(s); + s.reserve( value.size() ); + for(size_t i = 0; i < value.size(); ++i ) + s += value[i] <= 0xff ? static_cast( value[i] ) : '?'; + return Catch::toString( s ); } -std::string toString(const char* const value) -{ - return value ? Catch::toString(std::string(value)) : std::string("{null string}"); +std::string toString( const char* const value ) { + return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" ); } -std::string toString(char* const value) -{ - return Catch::toString(static_cast(value)); +std::string toString( char* const value ) { + return Catch::toString( static_cast( value ) ); } -std::string toString(const wchar_t* const value) +std::string toString( const wchar_t* const value ) { - return value ? Catch::toString(std::wstring(value)) : std::string("{null string}"); + return value ? Catch::toString( std::wstring(value) ) : std::string( "{null string}" ); } -std::string toString(wchar_t* const value) +std::string toString( wchar_t* const value ) { - return Catch::toString(static_cast(value)); + return Catch::toString( static_cast( value ) ); } -std::string toString(int value) -{ +std::string toString( int value ) { std::ostringstream oss; oss << value; - if (value > Detail::hexThreshold) - oss << " (0x" << std::hex << value << ")"; + if( value > Detail::hexThreshold ) + oss << " (0x" << std::hex << value << ')'; return oss.str(); } -std::string toString(unsigned long value) -{ +std::string toString( unsigned long value ) { std::ostringstream oss; oss << value; - if (value > Detail::hexThreshold) - oss << " (0x" << std::hex << value << ")"; + if( value > Detail::hexThreshold ) + oss << " (0x" << std::hex << value << ')'; return oss.str(); } -std::string toString(unsigned int value) -{ - return Catch::toString(static_cast(value)); +std::string toString( unsigned int value ) { + return Catch::toString( static_cast( value ) ); } -template -std::string fpToString(T value, int precision) -{ +template +std::string fpToString( T value, int precision ) { std::ostringstream oss; - oss << std::setprecision(precision) + oss << std::setprecision( precision ) << std::fixed << value; std::string d = oss.str(); - std::size_t i = d.find_last_not_of('0'); - if (i != std::string::npos && i != d.size() - 1) - { - if (d[i] == '.') + std::size_t i = d.find_last_not_of( '0' ); + if( i != std::string::npos && i != d.size()-1 ) { + if( d[i] == '.' ) i++; - d = d.substr(0, i + 1); + d = d.substr( 0, i+1 ); } return d; } -std::string toString(const double value) -{ - return fpToString(value, 10); +std::string toString( const double value ) { + return fpToString( value, 10 ); } -std::string toString(const float value) -{ - return fpToString(value, 5) + "f"; +std::string toString( const float value ) { + return fpToString( value, 5 ) + 'f'; } -std::string toString(bool value) -{ +std::string toString( bool value ) { return value ? "true" : "false"; } -std::string toString(char value) -{ - return value < ' ' - ? toString(static_cast(value)) - : Detail::makeString(value); +std::string toString( char value ) { + if ( value == '\r' ) + return "'\\r'"; + if ( value == '\f' ) + return "'\\f'"; + if ( value == '\n' ) + return "'\\n'"; + if ( value == '\t' ) + return "'\\t'"; + if ( '\0' <= value && value < ' ' ) + return toString( static_cast( value ) ); + char chstr[] = "' '"; + chstr[1] = value; + return chstr; } -std::string toString(signed char value) -{ - return toString(static_cast(value)); +std::string toString( signed char value ) { + return toString( static_cast( value ) ); } -std::string toString(unsigned char value) -{ - return toString(static_cast(value)); +std::string toString( unsigned char value ) { + return toString( static_cast( value ) ); } #ifdef CATCH_CONFIG_CPP11_LONG_LONG -std::string toString(long long value) -{ +std::string toString( long long value ) { std::ostringstream oss; oss << value; - if (value > Detail::hexThreshold) - oss << " (0x" << std::hex << value << ")"; + if( value > Detail::hexThreshold ) + oss << " (0x" << std::hex << value << ')'; return oss.str(); } -std::string toString(unsigned long long value) -{ +std::string toString( unsigned long long value ) { std::ostringstream oss; oss << value; - if (value > Detail::hexThreshold) - oss << " (0x" << std::hex << value << ")"; + if( value > Detail::hexThreshold ) + oss << " (0x" << std::hex << value << ')'; return oss.str(); } #endif #ifdef CATCH_CONFIG_CPP11_NULLPTR -std::string toString(std::nullptr_t) -{ +std::string toString( std::nullptr_t ) { return "nullptr"; } #endif #ifdef __OBJC__ -std::string toString(NSString const* const& nsstring) -{ - if (!nsstring) - return "nil"; - return "@" + toString([nsstring UTF8String]); -} -std::string toString(NSString* CATCH_ARC_STRONG const& nsstring) -{ - if (!nsstring) - return "nil"; - return "@" + toString([nsstring UTF8String]); -} -std::string toString(NSObject* const& nsObject) -{ - return toString([nsObject description]); -} + std::string toString( NSString const * const& nsstring ) { + if( !nsstring ) + return "nil"; + return "@" + toString([nsstring UTF8String]); + } + std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) { + if( !nsstring ) + return "nil"; + return "@" + toString([nsstring UTF8String]); + } + std::string toString( NSObject* const& nsObject ) { + return toString( [nsObject description] ); + } #endif } // end namespace Catch @@ -9040,409 +8927,424 @@ std::string toString(NSObject* const& nsObject) namespace Catch { -std::string capturedExpressionWithSecondArgument(std::string const& capturedExpression, std::string const& secondArg) -{ - return secondArg.empty() || secondArg == "\"\"" - ? capturedExpression - : capturedExpression + ", " + secondArg; -} -ResultBuilder::ResultBuilder(char const* macroName, - SourceLineInfo const& lineInfo, - char const* capturedExpression, - ResultDisposition::Flags resultDisposition, - char const* secondArg) - : m_assertionInfo(macroName, lineInfo, capturedExpressionWithSecondArgument(capturedExpression, secondArg), resultDisposition), - m_shouldDebugBreak(false), - m_shouldThrow(false) -{ -} + std::string capturedExpressionWithSecondArgument( std::string const& capturedExpression, std::string const& secondArg ) { + return secondArg.empty() || secondArg == "\"\"" + ? capturedExpression + : capturedExpression + ", " + secondArg; + } + ResultBuilder::ResultBuilder( char const* macroName, + SourceLineInfo const& lineInfo, + char const* capturedExpression, + ResultDisposition::Flags resultDisposition, + char const* secondArg ) + : m_assertionInfo( macroName, lineInfo, capturedExpressionWithSecondArgument( capturedExpression, secondArg ), resultDisposition ), + m_shouldDebugBreak( false ), + m_shouldThrow( false ), + m_guardException( false ) + {} + + ResultBuilder::~ResultBuilder() { +#if defined(CATCH_CONFIG_FAST_COMPILE) + if ( m_guardException ) { + m_stream.oss << "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE"; + captureResult( ResultWas::ThrewException ); + getCurrentContext().getResultCapture()->exceptionEarlyReported(); + } +#endif + } -ResultBuilder& ResultBuilder::setResultType(ResultWas::OfType result) -{ - m_data.resultType = result; - return *this; -} -ResultBuilder& ResultBuilder::setResultType(bool result) -{ - m_data.resultType = result ? ResultWas::Ok : ResultWas::ExpressionFailed; - return *this; -} -ResultBuilder& ResultBuilder::setLhs(std::string const& lhs) -{ - m_exprComponents.lhs = lhs; - return *this; -} -ResultBuilder& ResultBuilder::setRhs(std::string const& rhs) -{ - m_exprComponents.rhs = rhs; - return *this; -} -ResultBuilder& ResultBuilder::setOp(std::string const& op) -{ - m_exprComponents.op = op; - return *this; -} + ResultBuilder& ResultBuilder::setResultType( ResultWas::OfType result ) { + m_data.resultType = result; + return *this; + } + ResultBuilder& ResultBuilder::setResultType( bool result ) { + m_data.resultType = result ? ResultWas::Ok : ResultWas::ExpressionFailed; + return *this; + } -void ResultBuilder::endExpression() -{ - m_exprComponents.testFalse = isFalseTest(m_assertionInfo.resultDisposition); - captureExpression(); -} + void ResultBuilder::endExpression( DecomposedExpression const& expr ) { + AssertionResult result = build( expr ); + handleResult( result ); + } -void ResultBuilder::useActiveException(ResultDisposition::Flags resultDisposition) -{ - m_assertionInfo.resultDisposition = resultDisposition; - m_stream.oss << Catch::translateActiveException(); - captureResult(ResultWas::ThrewException); -} + void ResultBuilder::useActiveException( ResultDisposition::Flags resultDisposition ) { + m_assertionInfo.resultDisposition = resultDisposition; + m_stream.oss << Catch::translateActiveException(); + captureResult( ResultWas::ThrewException ); + } -void ResultBuilder::captureResult(ResultWas::OfType resultType) -{ - setResultType(resultType); - captureExpression(); -} -void ResultBuilder::captureExpectedException(std::string const& expectedMessage) -{ - if (expectedMessage.empty()) - captureExpectedException(Matchers::Impl::Generic::AllOf()); - else - captureExpectedException(Matchers::Equals(expectedMessage)); -} + void ResultBuilder::captureResult( ResultWas::OfType resultType ) { + setResultType( resultType ); + captureExpression(); + } -void ResultBuilder::captureExpectedException(Matchers::Impl::Matcher const& matcher) -{ + void ResultBuilder::captureExpectedException( std::string const& expectedMessage ) { + if( expectedMessage.empty() ) + captureExpectedException( Matchers::Impl::MatchAllOf() ); + else + captureExpectedException( Matchers::Equals( expectedMessage ) ); + } - assert(m_exprComponents.testFalse == false); - AssertionResultData data = m_data; - data.resultType = ResultWas::Ok; - data.reconstructedExpression = m_assertionInfo.capturedExpression; + void ResultBuilder::captureExpectedException( Matchers::Impl::MatcherBase const& matcher ) { - std::string actualMessage = Catch::translateActiveException(); - if (!matcher.match(actualMessage)) - { - data.resultType = ResultWas::ExpressionFailed; - data.reconstructedExpression = actualMessage; + assert( !isFalseTest( m_assertionInfo.resultDisposition ) ); + AssertionResultData data = m_data; + data.resultType = ResultWas::Ok; + data.reconstructedExpression = m_assertionInfo.capturedExpression; + + std::string actualMessage = Catch::translateActiveException(); + if( !matcher.match( actualMessage ) ) { + data.resultType = ResultWas::ExpressionFailed; + data.reconstructedExpression = actualMessage; + } + AssertionResult result( m_assertionInfo, data ); + handleResult( result ); } - AssertionResult result(m_assertionInfo, data); - handleResult(result); -} -void ResultBuilder::captureExpression() -{ - AssertionResult result = build(); - handleResult(result); -} -void ResultBuilder::handleResult(AssertionResult const& result) -{ - getResultCapture().assertionEnded(result); + void ResultBuilder::captureExpression() { + AssertionResult result = build(); + handleResult( result ); + } - if (!result.isOk()) + void ResultBuilder::handleResult( AssertionResult const& result ) { - if (getCurrentContext().getConfig()->shouldDebugBreak()) - m_shouldDebugBreak = true; - if (getCurrentContext().getRunner()->aborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal)) - m_shouldThrow = true; - } -} -void ResultBuilder::react() -{ - if (m_shouldThrow) - throw Catch::TestFailureException(); -} + getResultCapture().assertionEnded( result ); -bool ResultBuilder::shouldDebugBreak() const { return m_shouldDebugBreak; } -bool ResultBuilder::allowThrows() const { return getCurrentContext().getConfig()->allowThrows(); } + if( !result.isOk() ) { + if( getCurrentContext().getConfig()->shouldDebugBreak() ) + m_shouldDebugBreak = true; + if( getCurrentContext().getRunner()->aborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) ) + m_shouldThrow = true; + } + } -AssertionResult ResultBuilder::build() const -{ - assert(m_data.resultType != ResultWas::Unknown); + void ResultBuilder::react() { +#if defined(CATCH_CONFIG_FAST_COMPILE) + if (m_shouldDebugBreak) { + /////////////////////////////////////////////////////////////////// + // To inspect the state during test, you need to go one level up the callstack + // To go back to the test and change execution, jump over the throw statement + /////////////////////////////////////////////////////////////////// + CATCH_BREAK_INTO_DEBUGGER(); + } +#endif + if( m_shouldThrow ) + throw Catch::TestFailureException(); + } - AssertionResultData data = m_data; + bool ResultBuilder::shouldDebugBreak() const { return m_shouldDebugBreak; } + bool ResultBuilder::allowThrows() const { return getCurrentContext().getConfig()->allowThrows(); } - // Flip bool results if testFalse is set - if (m_exprComponents.testFalse) + AssertionResult ResultBuilder::build() const { - if (data.resultType == ResultWas::Ok) - data.resultType = ResultWas::ExpressionFailed; - else if (data.resultType == ResultWas::ExpressionFailed) - data.resultType = ResultWas::Ok; + return build( *this ); } - data.message = m_stream.oss.str(); - data.reconstructedExpression = reconstructExpression(); - if (m_exprComponents.testFalse) + // CAVEAT: The returned AssertionResult stores a pointer to the argument expr, + // a temporary DecomposedExpression, which in turn holds references to + // operands, possibly temporary as well. + // It should immediately be passed to handleResult; if the expression + // needs to be reported, its string expansion must be composed before + // the temporaries are destroyed. + AssertionResult ResultBuilder::build( DecomposedExpression const& expr ) const { - if (m_exprComponents.op == "") - data.reconstructedExpression = "!" + data.reconstructedExpression; - else - data.reconstructedExpression = "!(" + data.reconstructedExpression + ")"; + assert( m_data.resultType != ResultWas::Unknown ); + AssertionResultData data = m_data; + + // Flip bool results if FalseTest flag is set + if( isFalseTest( m_assertionInfo.resultDisposition ) ) { + data.negate( expr.isBinaryExpression() ); + } + + data.message = m_stream.oss.str(); + data.decomposedExpression = &expr; // for lazy reconstruction + return AssertionResult( m_assertionInfo, data ); } - return AssertionResult(m_assertionInfo, data); -} -std::string ResultBuilder::reconstructExpression() const -{ - if (m_exprComponents.op == "") - return m_exprComponents.lhs.empty() ? m_assertionInfo.capturedExpression : m_exprComponents.op + m_exprComponents.lhs; - else if (m_exprComponents.op == "matches") - return m_exprComponents.lhs + " " + m_exprComponents.rhs; - else if (m_exprComponents.op != "!") - { - if (m_exprComponents.lhs.size() + m_exprComponents.rhs.size() < 40 && - m_exprComponents.lhs.find("\n") == std::string::npos && - m_exprComponents.rhs.find("\n") == std::string::npos) - return m_exprComponents.lhs + " " + m_exprComponents.op + " " + m_exprComponents.rhs; - else - return m_exprComponents.lhs + "\n" + m_exprComponents.op + "\n" + m_exprComponents.rhs; + + void ResultBuilder::reconstructExpression( std::string& dest ) const { + dest = m_assertionInfo.capturedExpression; + } + + void ResultBuilder::setExceptionGuard() { + m_guardException = true; + } + void ResultBuilder::unsetExceptionGuard() { + m_guardException = false; } - else - return "{can't expand - use " + m_assertionInfo.macroName + "_FALSE( " + m_assertionInfo.capturedExpression.substr(1) + " ) instead of " + m_assertionInfo.macroName + "( " + m_assertionInfo.capturedExpression + " ) for better diagnostics}"; -} } // end namespace Catch // #included from: catch_tag_alias_registry.hpp #define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED -// #included from: catch_tag_alias_registry.h -#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED +namespace Catch { -#include + TagAliasRegistry::~TagAliasRegistry() {} -namespace Catch { + Option TagAliasRegistry::find( std::string const& alias ) const { + std::map::const_iterator it = m_registry.find( alias ); + if( it != m_registry.end() ) + return it->second; + else + return Option(); + } + + std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const { + std::string expandedTestSpec = unexpandedTestSpec; + for( std::map::const_iterator it = m_registry.begin(), itEnd = m_registry.end(); + it != itEnd; + ++it ) { + std::size_t pos = expandedTestSpec.find( it->first ); + if( pos != std::string::npos ) { + expandedTestSpec = expandedTestSpec.substr( 0, pos ) + + it->second.tag + + expandedTestSpec.substr( pos + it->first.size() ); + } + } + return expandedTestSpec; + } -class TagAliasRegistry : public ITagAliasRegistry -{ - public: - virtual ~TagAliasRegistry(); - virtual Option find(std::string const& alias) const; - virtual std::string expandAliases(std::string const& unexpandedTestSpec) const; - void add(char const* alias, char const* tag, SourceLineInfo const& lineInfo); - static TagAliasRegistry& get(); - - private: - std::map m_registry; -}; + void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) { + + if( !startsWith( alias, "[@" ) || !endsWith( alias, ']' ) ) { + std::ostringstream oss; + oss << Colour( Colour::Red ) + << "error: tag alias, \"" << alias << "\" is not of the form [@alias name].\n" + << Colour( Colour::FileName ) + << lineInfo << '\n'; + throw std::domain_error( oss.str().c_str() ); + } + if( !m_registry.insert( std::make_pair( alias, TagAlias( tag, lineInfo ) ) ).second ) { + std::ostringstream oss; + oss << Colour( Colour::Red ) + << "error: tag alias, \"" << alias << "\" already registered.\n" + << "\tFirst seen at " + << Colour( Colour::Red ) << find(alias)->lineInfo << '\n' + << Colour( Colour::Red ) << "\tRedefined at " + << Colour( Colour::FileName) << lineInfo << '\n'; + throw std::domain_error( oss.str().c_str() ); + } + } + + ITagAliasRegistry::~ITagAliasRegistry() {} + + ITagAliasRegistry const& ITagAliasRegistry::get() { + return getRegistryHub().getTagAliasRegistry(); + } + + RegistrarForTagAliases::RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) { + getMutableRegistryHub().registerTagAlias( alias, tag, lineInfo ); + } } // end namespace Catch -#include -#include +// #included from: catch_matchers_string.hpp namespace Catch { +namespace Matchers { -TagAliasRegistry::~TagAliasRegistry() {} + namespace StdString { -Option TagAliasRegistry::find(std::string const& alias) const -{ - std::map::const_iterator it = m_registry.find(alias); - if (it != m_registry.end()) - return it->second; - else - return Option(); -} + CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity ) + : m_caseSensitivity( caseSensitivity ), + m_str( adjustString( str ) ) + {} + std::string CasedString::adjustString( std::string const& str ) const { + return m_caseSensitivity == CaseSensitive::No + ? toLower( str ) + : str; + } + std::string CasedString::caseSensitivitySuffix() const { + return m_caseSensitivity == CaseSensitive::No + ? " (case insensitive)" + : std::string(); + } -std::string TagAliasRegistry::expandAliases(std::string const& unexpandedTestSpec) const -{ - std::string expandedTestSpec = unexpandedTestSpec; - for (std::map::const_iterator it = m_registry.begin(), itEnd = m_registry.end(); - it != itEnd; - ++it) - { - std::size_t pos = expandedTestSpec.find(it->first); - if (pos != std::string::npos) - { - expandedTestSpec = expandedTestSpec.substr(0, pos) + - it->second.tag + - expandedTestSpec.substr(pos + it->first.size()); + StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator ) + : m_comparator( comparator ), + m_operation( operation ) { } - } - return expandedTestSpec; -} -void TagAliasRegistry::add(char const* alias, char const* tag, SourceLineInfo const& lineInfo) -{ + std::string StringMatcherBase::describe() const { + std::string description; + description.reserve(5 + m_operation.size() + m_comparator.m_str.size() + + m_comparator.caseSensitivitySuffix().size()); + description += m_operation; + description += ": \""; + description += m_comparator.m_str; + description += "\""; + description += m_comparator.caseSensitivitySuffix(); + return description; + } - if (!startsWith(alias, "[@") || !endsWith(alias, "]")) - { - std::ostringstream oss; - oss << "error: tag alias, \"" << alias << "\" is not of the form [@alias name].\n" - << lineInfo; - throw std::domain_error(oss.str().c_str()); - } - if (!m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second) - { - std::ostringstream oss; - oss << "error: tag alias, \"" << alias << "\" already registered.\n" - << "\tFirst seen at " << find(alias)->lineInfo << "\n" - << "\tRedefined at " << lineInfo; - throw std::domain_error(oss.str().c_str()); - } -} + EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {} -TagAliasRegistry& TagAliasRegistry::get() -{ - static TagAliasRegistry instance; - return instance; -} + bool EqualsMatcher::match( std::string const& source ) const { + return m_comparator.adjustString( source ) == m_comparator.m_str; + } -ITagAliasRegistry::~ITagAliasRegistry() {} -ITagAliasRegistry const& ITagAliasRegistry::get() { return TagAliasRegistry::get(); } + ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {} -RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) -{ - try - { - TagAliasRegistry::get().add(alias, tag, lineInfo); + bool ContainsMatcher::match( std::string const& source ) const { + return contains( m_comparator.adjustString( source ), m_comparator.m_str ); + } + + StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {} + + bool StartsWithMatcher::match( std::string const& source ) const { + return startsWith( m_comparator.adjustString( source ), m_comparator.m_str ); + } + + EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {} + + bool EndsWithMatcher::match( std::string const& source ) const { + return endsWith( m_comparator.adjustString( source ), m_comparator.m_str ); + } + + } // namespace StdString + + StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) { + return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) ); } - catch (std::exception& ex) - { - Colour colourGuard(Colour::Red); - Catch::cerr() << ex.what() << std::endl; - exit(1); + StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) { + return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) ); + } + StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) { + return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) ); + } + StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) { + return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) ); } -} - -} // end namespace Catch +} // namespace Matchers +} // namespace Catch // #included from: ../reporters/catch_reporter_multi.hpp #define TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED namespace Catch { -class MultipleReporters : public SharedImpl -{ - typedef std::vector> Reporters; +class MultipleReporters : public SharedImpl { + typedef std::vector > Reporters; Reporters m_reporters; - public: - void add(Ptr const& reporter) - { - m_reporters.push_back(reporter); +public: + void add( Ptr const& reporter ) { + m_reporters.push_back( reporter ); } - public: // IStreamingReporter - virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE - { +public: // IStreamingReporter + + virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE { return m_reporters[0]->getPreferences(); } - virtual void noMatchingTestCases(std::string const& spec) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->noMatchingTestCases(spec); + virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->noMatchingTestCases( spec ); } - virtual void testRunStarting(TestRunInfo const& testRunInfo) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->testRunStarting(testRunInfo); + virtual void testRunStarting( TestRunInfo const& testRunInfo ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->testRunStarting( testRunInfo ); } - virtual void testGroupStarting(GroupInfo const& groupInfo) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->testGroupStarting(groupInfo); + virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->testGroupStarting( groupInfo ); } - virtual void testCaseStarting(TestCaseInfo const& testInfo) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->testCaseStarting(testInfo); + virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->testCaseStarting( testInfo ); } - virtual void sectionStarting(SectionInfo const& sectionInfo) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->sectionStarting(sectionInfo); + virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->sectionStarting( sectionInfo ); } - virtual void assertionStarting(AssertionInfo const& assertionInfo) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->assertionStarting(assertionInfo); + virtual void assertionStarting( AssertionInfo const& assertionInfo ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->assertionStarting( assertionInfo ); } // The return value indicates if the messages buffer should be cleared: - virtual bool assertionEnded(AssertionStats const& assertionStats) CATCH_OVERRIDE - { + virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { bool clearBuffer = false; - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - clearBuffer |= (*it)->assertionEnded(assertionStats); + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + clearBuffer |= (*it)->assertionEnded( assertionStats ); return clearBuffer; } - virtual void sectionEnded(SectionStats const& sectionStats) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->sectionEnded(sectionStats); + virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->sectionEnded( sectionStats ); } - virtual void testCaseEnded(TestCaseStats const& testCaseStats) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->testCaseEnded(testCaseStats); + virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->testCaseEnded( testCaseStats ); } - virtual void testGroupEnded(TestGroupStats const& testGroupStats) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->testGroupEnded(testGroupStats); + virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->testGroupEnded( testGroupStats ); } - virtual void testRunEnded(TestRunStats const& testRunStats) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->testRunEnded(testRunStats); + virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->testRunEnded( testRunStats ); } - virtual void skipTest(TestCaseInfo const& testInfo) CATCH_OVERRIDE - { - for (Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it) - (*it)->skipTest(testInfo); + virtual void skipTest( TestCaseInfo const& testInfo ) CATCH_OVERRIDE { + for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); + it != itEnd; + ++it ) + (*it)->skipTest( testInfo ); } + + virtual MultipleReporters* tryAsMulti() CATCH_OVERRIDE { + return this; + } + }; -Ptr addReporter(Ptr const& existingReporter, Ptr const& additionalReporter) -{ +Ptr addReporter( Ptr const& existingReporter, Ptr const& additionalReporter ) { Ptr resultingReporter; - if (existingReporter) - { - MultipleReporters* multi = dynamic_cast(existingReporter.get()); - if (!multi) - { + if( existingReporter ) { + MultipleReporters* multi = existingReporter->tryAsMulti(); + if( !multi ) { multi = new MultipleReporters; - resultingReporter = Ptr(multi); - if (existingReporter) - multi->add(existingReporter); + resultingReporter = Ptr( multi ); + if( existingReporter ) + multi->add( existingReporter ); } else resultingReporter = existingReporter; - multi->add(additionalReporter); + multi->add( additionalReporter ); } else resultingReporter = additionalReporter; @@ -9458,268 +9360,273 @@ Ptr addReporter(Ptr const& existingRepor // #included from: catch_reporter_bases.hpp #define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED -#include - -namespace Catch { - -struct StreamingReporterBase : SharedImpl -{ - - StreamingReporterBase(ReporterConfig const& _config) - : m_config(_config.fullConfig()), - stream(_config.stream()) - { - m_reporterPrefs.shouldRedirectStdOut = false; - } - - virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE - { - return m_reporterPrefs; - } - - virtual ~StreamingReporterBase() CATCH_OVERRIDE; - - virtual void noMatchingTestCases(std::string const&) CATCH_OVERRIDE {} - - virtual void testRunStarting(TestRunInfo const& _testRunInfo) CATCH_OVERRIDE - { - currentTestRunInfo = _testRunInfo; - } - virtual void testGroupStarting(GroupInfo const& _groupInfo) CATCH_OVERRIDE - { - currentGroupInfo = _groupInfo; - } +#include +#include +#include +#include - virtual void testCaseStarting(TestCaseInfo const& _testInfo) CATCH_OVERRIDE - { - currentTestCaseInfo = _testInfo; - } - virtual void sectionStarting(SectionInfo const& _sectionInfo) CATCH_OVERRIDE - { - m_sectionStack.push_back(_sectionInfo); - } +namespace Catch { - virtual void sectionEnded(SectionStats const& /* _sectionStats */) CATCH_OVERRIDE - { - m_sectionStack.pop_back(); - } - virtual void testCaseEnded(TestCaseStats const& /* _testCaseStats */) CATCH_OVERRIDE - { - currentTestCaseInfo.reset(); - } - virtual void testGroupEnded(TestGroupStats const& /* _testGroupStats */) CATCH_OVERRIDE - { - currentGroupInfo.reset(); - } - virtual void testRunEnded(TestRunStats const& /* _testRunStats */) CATCH_OVERRIDE - { - currentTestCaseInfo.reset(); - currentGroupInfo.reset(); - currentTestRunInfo.reset(); + namespace { + // Because formatting using c++ streams is stateful, drop down to C is required + // Alternatively we could use stringstream, but its performance is... not good. + std::string getFormattedDuration( double duration ) { + // Max exponent + 1 is required to represent the whole part + // + 1 for decimal point + // + 3 for the 3 decimal places + // + 1 for null terminator + const size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1; + char buffer[maxDoubleSize]; + + // Save previous errno, to prevent sprintf from overwriting it + ErrnoGuard guard; +#ifdef _MSC_VER + sprintf_s(buffer, "%.3f", duration); +#else + sprintf(buffer, "%.3f", duration); +#endif + return std::string(buffer); + } } - virtual void skipTest(TestCaseInfo const&) CATCH_OVERRIDE - { - // Don't do anything with this by default. - // It can optionally be overridden in the derived class. - } + struct StreamingReporterBase : SharedImpl { - Ptr m_config; - std::ostream& stream; + StreamingReporterBase( ReporterConfig const& _config ) + : m_config( _config.fullConfig() ), + stream( _config.stream() ) + { + m_reporterPrefs.shouldRedirectStdOut = false; + } - LazyStat currentTestRunInfo; - LazyStat currentGroupInfo; - LazyStat currentTestCaseInfo; + virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE { + return m_reporterPrefs; + } - std::vector m_sectionStack; - ReporterPreferences m_reporterPrefs; -}; + virtual ~StreamingReporterBase() CATCH_OVERRIDE; -struct CumulativeReporterBase : SharedImpl -{ - template - struct Node : SharedImpl<> - { - explicit Node(T const& _value) : value(_value) {} - virtual ~Node() {} + virtual void noMatchingTestCases( std::string const& ) CATCH_OVERRIDE {} - typedef std::vector> ChildNodes; - T value; - ChildNodes children; - }; - struct SectionNode : SharedImpl<> - { - explicit SectionNode(SectionStats const& _stats) : stats(_stats) {} - virtual ~SectionNode(); + virtual void testRunStarting( TestRunInfo const& _testRunInfo ) CATCH_OVERRIDE { + currentTestRunInfo = _testRunInfo; + } + virtual void testGroupStarting( GroupInfo const& _groupInfo ) CATCH_OVERRIDE { + currentGroupInfo = _groupInfo; + } - bool operator==(SectionNode const& other) const - { - return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo; + virtual void testCaseStarting( TestCaseInfo const& _testInfo ) CATCH_OVERRIDE { + currentTestCaseInfo = _testInfo; } - bool operator==(Ptr const& other) const - { - return operator==(*other); + virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE { + m_sectionStack.push_back( _sectionInfo ); } - SectionStats stats; - typedef std::vector> ChildSections; - typedef std::vector Assertions; - ChildSections childSections; - Assertions assertions; - std::string stdOut; - std::string stdErr; - }; + virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) CATCH_OVERRIDE { + m_sectionStack.pop_back(); + } + virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) CATCH_OVERRIDE { + currentTestCaseInfo.reset(); + } + virtual void testGroupEnded( TestGroupStats const& /* _testGroupStats */ ) CATCH_OVERRIDE { + currentGroupInfo.reset(); + } + virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) CATCH_OVERRIDE { + currentTestCaseInfo.reset(); + currentGroupInfo.reset(); + currentTestRunInfo.reset(); + } - struct BySectionInfo - { - BySectionInfo(SectionInfo const& other) : m_other(other) {} - BySectionInfo(BySectionInfo const& other) : m_other(other.m_other) {} - bool operator()(Ptr const& node) const - { - return node->stats.sectionInfo.lineInfo == m_other.lineInfo; + virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE { + // Don't do anything with this by default. + // It can optionally be overridden in the derived class. } - private: - void operator=(BySectionInfo const&); - SectionInfo const& m_other; + Ptr m_config; + std::ostream& stream; + + LazyStat currentTestRunInfo; + LazyStat currentGroupInfo; + LazyStat currentTestCaseInfo; + + std::vector m_sectionStack; + ReporterPreferences m_reporterPrefs; }; - typedef Node TestCaseNode; - typedef Node TestGroupNode; - typedef Node TestRunNode; + struct CumulativeReporterBase : SharedImpl { + template + struct Node : SharedImpl<> { + explicit Node( T const& _value ) : value( _value ) {} + virtual ~Node() {} - CumulativeReporterBase(ReporterConfig const& _config) - : m_config(_config.fullConfig()), - stream(_config.stream()) - { - m_reporterPrefs.shouldRedirectStdOut = false; - } - ~CumulativeReporterBase(); + typedef std::vector > ChildNodes; + T value; + ChildNodes children; + }; + struct SectionNode : SharedImpl<> { + explicit SectionNode( SectionStats const& _stats ) : stats( _stats ) {} + virtual ~SectionNode(); - virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE - { - return m_reporterPrefs; - } + bool operator == ( SectionNode const& other ) const { + return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo; + } + bool operator == ( Ptr const& other ) const { + return operator==( *other ); + } - virtual void testRunStarting(TestRunInfo const&) CATCH_OVERRIDE {} - virtual void testGroupStarting(GroupInfo const&) CATCH_OVERRIDE {} + SectionStats stats; + typedef std::vector > ChildSections; + typedef std::vector Assertions; + ChildSections childSections; + Assertions assertions; + std::string stdOut; + std::string stdErr; + }; - virtual void testCaseStarting(TestCaseInfo const&) CATCH_OVERRIDE {} + struct BySectionInfo { + BySectionInfo( SectionInfo const& other ) : m_other( other ) {} + BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {} + bool operator() ( Ptr const& node ) const { + return node->stats.sectionInfo.lineInfo == m_other.lineInfo; + } + private: + void operator=( BySectionInfo const& ); + SectionInfo const& m_other; + }; - virtual void sectionStarting(SectionInfo const& sectionInfo) CATCH_OVERRIDE - { - SectionStats incompleteStats(sectionInfo, Counts(), 0, false); - Ptr node; - if (m_sectionStack.empty()) + typedef Node TestCaseNode; + typedef Node TestGroupNode; + typedef Node TestRunNode; + + CumulativeReporterBase( ReporterConfig const& _config ) + : m_config( _config.fullConfig() ), + stream( _config.stream() ) { - if (!m_rootSection) - m_rootSection = new SectionNode(incompleteStats); - node = m_rootSection; + m_reporterPrefs.shouldRedirectStdOut = false; } - else - { - SectionNode& parentNode = *m_sectionStack.back(); - SectionNode::ChildSections::const_iterator it = - std::find_if(parentNode.childSections.begin(), - parentNode.childSections.end(), - BySectionInfo(sectionInfo)); - if (it == parentNode.childSections.end()) - { - node = new SectionNode(incompleteStats); - parentNode.childSections.push_back(node); - } - else - node = *it; + ~CumulativeReporterBase(); + + virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE { + return m_reporterPrefs; } - m_sectionStack.push_back(node); - m_deepestSection = node; - } - virtual void assertionStarting(AssertionInfo const&) CATCH_OVERRIDE {} + virtual void testRunStarting( TestRunInfo const& ) CATCH_OVERRIDE {} + virtual void testGroupStarting( GroupInfo const& ) CATCH_OVERRIDE {} - virtual bool assertionEnded(AssertionStats const& assertionStats) - { - assert(!m_sectionStack.empty()); - SectionNode& sectionNode = *m_sectionStack.back(); - sectionNode.assertions.push_back(assertionStats); - return true; - } - virtual void sectionEnded(SectionStats const& sectionStats) CATCH_OVERRIDE - { - assert(!m_sectionStack.empty()); - SectionNode& node = *m_sectionStack.back(); - node.stats = sectionStats; - m_sectionStack.pop_back(); - } - virtual void testCaseEnded(TestCaseStats const& testCaseStats) CATCH_OVERRIDE - { - Ptr node = new TestCaseNode(testCaseStats); - assert(m_sectionStack.size() == 0); - node->children.push_back(m_rootSection); - m_testCases.push_back(node); - m_rootSection.reset(); + virtual void testCaseStarting( TestCaseInfo const& ) CATCH_OVERRIDE {} - assert(m_deepestSection); - m_deepestSection->stdOut = testCaseStats.stdOut; - m_deepestSection->stdErr = testCaseStats.stdErr; - } - virtual void testGroupEnded(TestGroupStats const& testGroupStats) CATCH_OVERRIDE - { - Ptr node = new TestGroupNode(testGroupStats); - node->children.swap(m_testCases); - m_testGroups.push_back(node); - } - virtual void testRunEnded(TestRunStats const& testRunStats) CATCH_OVERRIDE - { - Ptr node = new TestRunNode(testRunStats); - node->children.swap(m_testGroups); - m_testRuns.push_back(node); - testRunEndedCumulative(); - } - virtual void testRunEndedCumulative() = 0; + virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE { + SectionStats incompleteStats( sectionInfo, Counts(), 0, false ); + Ptr node; + if( m_sectionStack.empty() ) { + if( !m_rootSection ) + m_rootSection = new SectionNode( incompleteStats ); + node = m_rootSection; + } + else { + SectionNode& parentNode = *m_sectionStack.back(); + SectionNode::ChildSections::const_iterator it = + std::find_if( parentNode.childSections.begin(), + parentNode.childSections.end(), + BySectionInfo( sectionInfo ) ); + if( it == parentNode.childSections.end() ) { + node = new SectionNode( incompleteStats ); + parentNode.childSections.push_back( node ); + } + else + node = *it; + } + m_sectionStack.push_back( node ); + m_deepestSection = node; + } + + virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {} + + virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { + assert( !m_sectionStack.empty() ); + SectionNode& sectionNode = *m_sectionStack.back(); + sectionNode.assertions.push_back( assertionStats ); + // AssertionResult holds a pointer to a temporary DecomposedExpression, + // which getExpandedExpression() calls to build the expression string. + // Our section stack copy of the assertionResult will likely outlive the + // temporary, so it must be expanded or discarded now to avoid calling + // a destroyed object later. + prepareExpandedExpression( sectionNode.assertions.back().assertionResult ); + return true; + } + virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE { + assert( !m_sectionStack.empty() ); + SectionNode& node = *m_sectionStack.back(); + node.stats = sectionStats; + m_sectionStack.pop_back(); + } + virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { + Ptr node = new TestCaseNode( testCaseStats ); + assert( m_sectionStack.size() == 0 ); + node->children.push_back( m_rootSection ); + m_testCases.push_back( node ); + m_rootSection.reset(); + + assert( m_deepestSection ); + m_deepestSection->stdOut = testCaseStats.stdOut; + m_deepestSection->stdErr = testCaseStats.stdErr; + } + virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { + Ptr node = new TestGroupNode( testGroupStats ); + node->children.swap( m_testCases ); + m_testGroups.push_back( node ); + } + virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE { + Ptr node = new TestRunNode( testRunStats ); + node->children.swap( m_testGroups ); + m_testRuns.push_back( node ); + testRunEndedCumulative(); + } + virtual void testRunEndedCumulative() = 0; + + virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE {} + + virtual void prepareExpandedExpression( AssertionResult& result ) const { + if( result.isOk() ) + result.discardDecomposedExpression(); + else + result.expandDecomposedExpression(); + } - virtual void skipTest(TestCaseInfo const&) CATCH_OVERRIDE {} + Ptr m_config; + std::ostream& stream; + std::vector m_assertions; + std::vector > > m_sections; + std::vector > m_testCases; + std::vector > m_testGroups; - Ptr m_config; - std::ostream& stream; - std::vector m_assertions; - std::vector>> m_sections; - std::vector> m_testCases; - std::vector> m_testGroups; + std::vector > m_testRuns; - std::vector> m_testRuns; + Ptr m_rootSection; + Ptr m_deepestSection; + std::vector > m_sectionStack; + ReporterPreferences m_reporterPrefs; - Ptr m_rootSection; - Ptr m_deepestSection; - std::vector> m_sectionStack; - ReporterPreferences m_reporterPrefs; -}; + }; -template -char const* getLineOfChars() -{ - static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0}; - if (!*line) - { - memset(line, C, CATCH_CONFIG_CONSOLE_WIDTH - 1); - line[CATCH_CONFIG_CONSOLE_WIDTH - 1] = 0; + template + char const* getLineOfChars() { + static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0}; + if( !*line ) { + std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 ); + line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0; + } + return line; } - return line; -} -struct TestEventListenerBase : StreamingReporterBase -{ - TestEventListenerBase(ReporterConfig const& _config) - : StreamingReporterBase(_config) - { - } + struct TestEventListenerBase : StreamingReporterBase { + TestEventListenerBase( ReporterConfig const& _config ) + : StreamingReporterBase( _config ) + {} - virtual void assertionStarting(AssertionInfo const&) CATCH_OVERRIDE {} - virtual bool assertionEnded(AssertionStats const&) CATCH_OVERRIDE - { - return false; - } -}; + virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {} + virtual bool assertionEnded( AssertionStats const& ) CATCH_OVERRIDE { + return false; + } + }; } // end namespace Catch @@ -9728,581 +9635,548 @@ struct TestEventListenerBase : StreamingReporterBase namespace Catch { -template -class LegacyReporterRegistrar -{ + template + class LegacyReporterRegistrar { - class ReporterFactory : public IReporterFactory - { - virtual IStreamingReporter* create(ReporterConfig const& config) const - { - return new LegacyReporterAdapter(new T(config)); - } + class ReporterFactory : public IReporterFactory { + virtual IStreamingReporter* create( ReporterConfig const& config ) const { + return new LegacyReporterAdapter( new T( config ) ); + } - virtual std::string getDescription() const - { - return T::getDescription(); + virtual std::string getDescription() const { + return T::getDescription(); + } + }; + + public: + + LegacyReporterRegistrar( std::string const& name ) { + getMutableRegistryHub().registerReporter( name, new ReporterFactory() ); } }; - public: - LegacyReporterRegistrar(std::string const& name) - { - getMutableRegistryHub().registerReporter(name, new ReporterFactory()); - } -}; - -template -class ReporterRegistrar -{ + template + class ReporterRegistrar { + + class ReporterFactory : public SharedImpl { + + // *** Please Note ***: + // - If you end up here looking at a compiler error because it's trying to register + // your custom reporter class be aware that the native reporter interface has changed + // to IStreamingReporter. The "legacy" interface, IReporter, is still supported via + // an adapter. Just use REGISTER_LEGACY_REPORTER to take advantage of the adapter. + // However please consider updating to the new interface as the old one is now + // deprecated and will probably be removed quite soon! + // Please contact me via github if you have any questions at all about this. + // In fact, ideally, please contact me anyway to let me know you've hit this - as I have + // no idea who is actually using custom reporters at all (possibly no-one!). + // The new interface is designed to minimise exposure to interface changes in the future. + virtual IStreamingReporter* create( ReporterConfig const& config ) const { + return new T( config ); + } - class ReporterFactory : public SharedImpl - { + virtual std::string getDescription() const { + return T::getDescription(); + } + }; - // *** Please Note ***: - // - If you end up here looking at a compiler error because it's trying to register - // your custom reporter class be aware that the native reporter interface has changed - // to IStreamingReporter. The "legacy" interface, IReporter, is still supported via - // an adapter. Just use REGISTER_LEGACY_REPORTER to take advantage of the adapter. - // However please consider updating to the new interface as the old one is now - // deprecated and will probably be removed quite soon! - // Please contact me via github if you have any questions at all about this. - // In fact, ideally, please contact me anyway to let me know you've hit this - as I have - // no idea who is actually using custom reporters at all (possibly no-one!). - // The new interface is designed to minimise exposure to interface changes in the future. - virtual IStreamingReporter* create(ReporterConfig const& config) const - { - return new T(config); - } + public: - virtual std::string getDescription() const - { - return T::getDescription(); + ReporterRegistrar( std::string const& name ) { + getMutableRegistryHub().registerReporter( name, new ReporterFactory() ); } }; - public: - ReporterRegistrar(std::string const& name) - { - getMutableRegistryHub().registerReporter(name, new ReporterFactory()); - } -}; + template + class ListenerRegistrar { -template -class ListenerRegistrar -{ + class ListenerFactory : public SharedImpl { - class ListenerFactory : public SharedImpl - { + virtual IStreamingReporter* create( ReporterConfig const& config ) const { + return new T( config ); + } + virtual std::string getDescription() const { + return std::string(); + } + }; - virtual IStreamingReporter* create(ReporterConfig const& config) const - { - return new T(config); - } - virtual std::string getDescription() const - { - return ""; + public: + + ListenerRegistrar() { + getMutableRegistryHub().registerListener( new ListenerFactory() ); } }; - - public: - ListenerRegistrar() - { - getMutableRegistryHub().registerListener(new ListenerFactory()); - } -}; } -#define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER(name, reporterType) \ - namespace { \ - Catch::LegacyReporterRegistrar catch_internal_RegistrarFor##reporterType(name); \ - } +#define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) \ + namespace{ Catch::LegacyReporterRegistrar catch_internal_RegistrarFor##reporterType( name ); } -#define INTERNAL_CATCH_REGISTER_REPORTER(name, reporterType) \ - namespace { \ - Catch::ReporterRegistrar catch_internal_RegistrarFor##reporterType(name); \ - } +#define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \ + namespace{ Catch::ReporterRegistrar catch_internal_RegistrarFor##reporterType( name ); } -#define INTERNAL_CATCH_REGISTER_LISTENER(listenerType) \ - namespace { \ - Catch::ListenerRegistrar catch_internal_RegistrarFor##listenerType; \ - } +// Deprecated - use the form without INTERNAL_ +#define INTERNAL_CATCH_REGISTER_LISTENER( listenerType ) \ + namespace{ Catch::ListenerRegistrar catch_internal_RegistrarFor##listenerType; } + +#define CATCH_REGISTER_LISTENER( listenerType ) \ + namespace{ Catch::ListenerRegistrar catch_internal_RegistrarFor##listenerType; } // #included from: ../internal/catch_xmlwriter.hpp #define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED -#include #include #include #include +#include namespace Catch { -class XmlEncode -{ - public: - enum ForWhat - { - ForTextNodes, - ForAttributes - }; + class XmlEncode { + public: + enum ForWhat { ForTextNodes, ForAttributes }; - XmlEncode(std::string const& str, ForWhat forWhat = ForTextNodes) - : m_str(str), - m_forWhat(forWhat) - { - } + XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes ) + : m_str( str ), + m_forWhat( forWhat ) + {} - void encodeTo(std::ostream& os) const - { + void encodeTo( std::ostream& os ) const { - // Apostrophe escaping not necessary if we always use " to write attributes - // (see: http://www.w3.org/TR/xml/#syntax) + // Apostrophe escaping not necessary if we always use " to write attributes + // (see: http://www.w3.org/TR/xml/#syntax) - for (std::size_t i = 0; i < m_str.size(); ++i) - { - char c = m_str[i]; - switch (c) - { - case '<': - os << "<"; - break; - case '&': - os << "&"; - break; + for( std::size_t i = 0; i < m_str.size(); ++ i ) { + char c = m_str[i]; + switch( c ) { + case '<': os << "<"; break; + case '&': os << "&"; break; - case '>': - // See: http://www.w3.org/TR/xml/#syntax - if (i > 2 && m_str[i - 1] == ']' && m_str[i - 2] == ']') - os << ">"; - else - os << c; - break; + case '>': + // See: http://www.w3.org/TR/xml/#syntax + if( i > 2 && m_str[i-1] == ']' && m_str[i-2] == ']' ) + os << ">"; + else + os << c; + break; - case '\"': - if (m_forWhat == ForAttributes) - os << """; - else - os << c; - break; + case '\"': + if( m_forWhat == ForAttributes ) + os << """; + else + os << c; + break; - default: - // Escape control chars - based on contribution by @espenalb in PR #465 - if ((c < '\x09') || (c > '\x0D' && c < '\x20') || c == '\x7F') - os << "&#x" << std::uppercase << std::hex << static_cast(c); - else - os << c; + default: + // Escape control chars - based on contribution by @espenalb in PR #465 and + // by @mrpi PR #588 + if ( ( c >= 0 && c < '\x09' ) || ( c > '\x0D' && c < '\x20') || c=='\x7F' ) { + // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0 + os << "\\x" << std::uppercase << std::hex << std::setfill('0') << std::setw(2) + << static_cast( c ); + } + else + os << c; + } } } - } - friend std::ostream& operator<<(std::ostream& os, XmlEncode const& xmlEncode) - { - xmlEncode.encodeTo(os); - return os; - } + friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) { + xmlEncode.encodeTo( os ); + return os; + } - private: - std::string m_str; - ForWhat m_forWhat; -}; + private: + std::string m_str; + ForWhat m_forWhat; + }; -class XmlWriter -{ - public: - class ScopedElement - { - public: - ScopedElement(XmlWriter* writer) - : m_writer(writer) - { - } + class XmlWriter { + public: + + class ScopedElement { + public: + ScopedElement( XmlWriter* writer ) + : m_writer( writer ) + {} + + ScopedElement( ScopedElement const& other ) + : m_writer( other.m_writer ){ + other.m_writer = CATCH_NULL; + } + + ~ScopedElement() { + if( m_writer ) + m_writer->endElement(); + } + + ScopedElement& writeText( std::string const& text, bool indent = true ) { + m_writer->writeText( text, indent ); + return *this; + } + + template + ScopedElement& writeAttribute( std::string const& name, T const& attribute ) { + m_writer->writeAttribute( name, attribute ); + return *this; + } + + private: + mutable XmlWriter* m_writer; + }; - ScopedElement(ScopedElement const& other) - : m_writer(other.m_writer) + XmlWriter() + : m_tagIsOpen( false ), + m_needsNewline( false ), + m_os( Catch::cout() ) { - other.m_writer = CATCH_NULL; + writeDeclaration(); } - ~ScopedElement() + XmlWriter( std::ostream& os ) + : m_tagIsOpen( false ), + m_needsNewline( false ), + m_os( os ) { - if (m_writer) - m_writer->endElement(); + writeDeclaration(); } - ScopedElement& writeText(std::string const& text, bool indent = true) - { - m_writer->writeText(text, indent); - return *this; + ~XmlWriter() { + while( !m_tags.empty() ) + endElement(); } - template - ScopedElement& writeAttribute(std::string const& name, T const& attribute) - { - m_writer->writeAttribute(name, attribute); + XmlWriter& startElement( std::string const& name ) { + ensureTagClosed(); + newlineIfNecessary(); + m_os << m_indent << '<' << name; + m_tags.push_back( name ); + m_indent += " "; + m_tagIsOpen = true; return *this; } - private: - mutable XmlWriter* m_writer; - }; - - XmlWriter() - : m_tagIsOpen(false), - m_needsNewline(false), - m_os(&Catch::cout()) - { - } - - XmlWriter(std::ostream& os) - : m_tagIsOpen(false), - m_needsNewline(false), - m_os(&os) - { - } - - ~XmlWriter() - { - while (!m_tags.empty()) - endElement(); - } - - XmlWriter& startElement(std::string const& name) - { - ensureTagClosed(); - newlineIfNecessary(); - stream() << m_indent << "<" << name; - m_tags.push_back(name); - m_indent += " "; - m_tagIsOpen = true; - return *this; - } - - ScopedElement scopedElement(std::string const& name) - { - ScopedElement scoped(this); - startElement(name); - return scoped; - } - - XmlWriter& endElement() - { - newlineIfNecessary(); - m_indent = m_indent.substr(0, m_indent.size() - 2); - if (m_tagIsOpen) - { - stream() << "/>\n"; - m_tagIsOpen = false; + ScopedElement scopedElement( std::string const& name ) { + ScopedElement scoped( this ); + startElement( name ); + return scoped; } - else - { - stream() << m_indent << "\n"; + + XmlWriter& endElement() { + newlineIfNecessary(); + m_indent = m_indent.substr( 0, m_indent.size()-2 ); + if( m_tagIsOpen ) { + m_os << "/>"; + m_tagIsOpen = false; + } + else { + m_os << m_indent << ""; + } + m_os << std::endl; + m_tags.pop_back(); + return *this; } - m_tags.pop_back(); - return *this; - } - XmlWriter& writeAttribute(std::string const& name, std::string const& attribute) - { - if (!name.empty() && !attribute.empty()) - stream() << " " << name << "=\"" << XmlEncode(attribute, XmlEncode::ForAttributes) << "\""; - return *this; - } + XmlWriter& writeAttribute( std::string const& name, std::string const& attribute ) { + if( !name.empty() && !attribute.empty() ) + m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"'; + return *this; + } - XmlWriter& writeAttribute(std::string const& name, bool attribute) - { - stream() << " " << name << "=\"" << (attribute ? "true" : "false") << "\""; - return *this; - } + XmlWriter& writeAttribute( std::string const& name, bool attribute ) { + m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"'; + return *this; + } - template - XmlWriter& writeAttribute(std::string const& name, T const& attribute) - { - std::ostringstream oss; - oss << attribute; - return writeAttribute(name, oss.str()); - } + template + XmlWriter& writeAttribute( std::string const& name, T const& attribute ) { + std::ostringstream oss; + oss << attribute; + return writeAttribute( name, oss.str() ); + } + + XmlWriter& writeText( std::string const& text, bool indent = true ) { + if( !text.empty() ){ + bool tagWasOpen = m_tagIsOpen; + ensureTagClosed(); + if( tagWasOpen && indent ) + m_os << m_indent; + m_os << XmlEncode( text ); + m_needsNewline = true; + } + return *this; + } - XmlWriter& writeText(std::string const& text, bool indent = true) - { - if (!text.empty()) - { - bool tagWasOpen = m_tagIsOpen; + XmlWriter& writeComment( std::string const& text ) { ensureTagClosed(); - if (tagWasOpen && indent) - stream() << m_indent; - stream() << XmlEncode(text); + m_os << m_indent << ""; m_needsNewline = true; + return *this; } - return *this; - } - - XmlWriter& writeComment(std::string const& text) - { - ensureTagClosed(); - stream() << m_indent << ""; - m_needsNewline = true; - return *this; - } - XmlWriter& writeBlankLine() - { - ensureTagClosed(); - stream() << "\n"; - return *this; - } + void writeStylesheetRef( std::string const& url ) { + m_os << "\n"; + } - void setStream(std::ostream& os) - { - m_os = &os; - } + XmlWriter& writeBlankLine() { + ensureTagClosed(); + m_os << '\n'; + return *this; + } - private: - XmlWriter(XmlWriter const&); - void operator=(XmlWriter const&); + void ensureTagClosed() { + if( m_tagIsOpen ) { + m_os << ">" << std::endl; + m_tagIsOpen = false; + } + } - std::ostream& stream() - { - return *m_os; - } + private: + XmlWriter( XmlWriter const& ); + void operator=( XmlWriter const& ); - void ensureTagClosed() - { - if (m_tagIsOpen) - { - stream() << ">\n"; - m_tagIsOpen = false; + void writeDeclaration() { + m_os << "\n"; } - } - void newlineIfNecessary() - { - if (m_needsNewline) - { - stream() << "\n"; - m_needsNewline = false; + void newlineIfNecessary() { + if( m_needsNewline ) { + m_os << std::endl; + m_needsNewline = false; + } } - } - bool m_tagIsOpen; - bool m_needsNewline; - std::vector m_tags; - std::string m_indent; - std::ostream* m_os; -}; + bool m_tagIsOpen; + bool m_needsNewline; + std::vector m_tags; + std::string m_indent; + std::ostream& m_os; + }; + } // #included from: catch_reenable_warnings.h #define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED #ifdef __clang__ -#ifdef __ICC // icpc defines the __clang__ macro -#pragma warning(pop) -#else -#pragma clang diagnostic pop -#endif +# ifdef __ICC // icpc defines the __clang__ macro +# pragma warning(pop) +# else +# pragma clang diagnostic pop +# endif #elif defined __GNUC__ -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif + namespace Catch { -class XmlReporter : public StreamingReporterBase -{ - public: - XmlReporter(ReporterConfig const& _config) - : StreamingReporterBase(_config), - m_sectionDepth(0) - { - m_reporterPrefs.shouldRedirectStdOut = true; - } + class XmlReporter : public StreamingReporterBase { + public: + XmlReporter( ReporterConfig const& _config ) + : StreamingReporterBase( _config ), + m_xml(_config.stream()), + m_sectionDepth( 0 ) + { + m_reporterPrefs.shouldRedirectStdOut = true; + } - virtual ~XmlReporter() CATCH_OVERRIDE; + virtual ~XmlReporter() CATCH_OVERRIDE; - static std::string getDescription() - { - return "Reports test results as an XML document"; - } + static std::string getDescription() { + return "Reports test results as an XML document"; + } - public: // StreamingReporterBase - virtual void noMatchingTestCases(std::string const& s) CATCH_OVERRIDE - { - StreamingReporterBase::noMatchingTestCases(s); - } + virtual std::string getStylesheetRef() const { + return std::string(); + } - virtual void testRunStarting(TestRunInfo const& testInfo) CATCH_OVERRIDE - { - StreamingReporterBase::testRunStarting(testInfo); - m_xml.setStream(stream); - m_xml.startElement("Catch"); - if (!m_config->name().empty()) - m_xml.writeAttribute("name", m_config->name()); - } + void writeSourceInfo( SourceLineInfo const& sourceInfo ) { + m_xml + .writeAttribute( "filename", sourceInfo.file ) + .writeAttribute( "line", sourceInfo.line ); + } - virtual void testGroupStarting(GroupInfo const& groupInfo) CATCH_OVERRIDE - { - StreamingReporterBase::testGroupStarting(groupInfo); - m_xml.startElement("Group") - .writeAttribute("name", groupInfo.name); - } + public: // StreamingReporterBase - virtual void testCaseStarting(TestCaseInfo const& testInfo) CATCH_OVERRIDE - { - StreamingReporterBase::testCaseStarting(testInfo); - m_xml.startElement("TestCase").writeAttribute("name", trim(testInfo.name)); + virtual void noMatchingTestCases( std::string const& s ) CATCH_OVERRIDE { + StreamingReporterBase::noMatchingTestCases( s ); + } - if (m_config->showDurations() == ShowDurations::Always) - m_testCaseTimer.start(); - } + virtual void testRunStarting( TestRunInfo const& testInfo ) CATCH_OVERRIDE { + StreamingReporterBase::testRunStarting( testInfo ); + std::string stylesheetRef = getStylesheetRef(); + if( !stylesheetRef.empty() ) + m_xml.writeStylesheetRef( stylesheetRef ); + m_xml.startElement( "Catch" ); + if( !m_config->name().empty() ) + m_xml.writeAttribute( "name", m_config->name() ); + } - virtual void sectionStarting(SectionInfo const& sectionInfo) CATCH_OVERRIDE - { - StreamingReporterBase::sectionStarting(sectionInfo); - if (m_sectionDepth++ > 0) - { - m_xml.startElement("Section") - .writeAttribute("name", trim(sectionInfo.name)) - .writeAttribute("description", sectionInfo.description); + virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE { + StreamingReporterBase::testGroupStarting( groupInfo ); + m_xml.startElement( "Group" ) + .writeAttribute( "name", groupInfo.name ); } - } - virtual void assertionStarting(AssertionInfo const&) CATCH_OVERRIDE {} + virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE { + StreamingReporterBase::testCaseStarting(testInfo); + m_xml.startElement( "TestCase" ) + .writeAttribute( "name", trim( testInfo.name ) ) + .writeAttribute( "description", testInfo.description ) + .writeAttribute( "tags", testInfo.tagsAsString ); - virtual bool assertionEnded(AssertionStats const& assertionStats) CATCH_OVERRIDE - { - const AssertionResult& assertionResult = assertionStats.assertionResult; + writeSourceInfo( testInfo.lineInfo ); - // Print any info messages in tags. - if (assertionStats.assertionResult.getResultType() != ResultWas::Ok) - { - for (std::vector::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end(); - it != itEnd; - ++it) - { - if (it->type == ResultWas::Info) - { - m_xml.scopedElement("Info") - .writeText(it->message); - } - else if (it->type == ResultWas::Warning) - { - m_xml.scopedElement("Warning") - .writeText(it->message); - } + if ( m_config->showDurations() == ShowDurations::Always ) + m_testCaseTimer.start(); + m_xml.ensureTagClosed(); + } + + virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE { + StreamingReporterBase::sectionStarting( sectionInfo ); + if( m_sectionDepth++ > 0 ) { + m_xml.startElement( "Section" ) + .writeAttribute( "name", trim( sectionInfo.name ) ) + .writeAttribute( "description", sectionInfo.description ); + writeSourceInfo( sectionInfo.lineInfo ); + m_xml.ensureTagClosed(); } } - // Drop out if result was successful but we're not printing them. - if (!m_config->includeSuccessfulResults() && isOk(assertionResult.getResultType())) - return true; + virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE { } - // Print the expression if there is one. - if (assertionResult.hasExpression()) - { - m_xml.startElement("Expression") - .writeAttribute("success", assertionResult.succeeded()) - .writeAttribute("type", assertionResult.getTestMacroName()) - .writeAttribute("filename", assertionResult.getSourceInfo().file) - .writeAttribute("line", assertionResult.getSourceInfo().line); + virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { - m_xml.scopedElement("Original") - .writeText(assertionResult.getExpression()); - m_xml.scopedElement("Expanded") - .writeText(assertionResult.getExpandedExpression()); - } + AssertionResult const& result = assertionStats.assertionResult; - // And... Print a result applicable to each result type. - switch (assertionResult.getResultType()) - { - case ResultWas::ThrewException: - m_xml.scopedElement("Exception") - .writeAttribute("filename", assertionResult.getSourceInfo().file) - .writeAttribute("line", assertionResult.getSourceInfo().line) - .writeText(assertionResult.getMessage()); - break; - case ResultWas::FatalErrorCondition: - m_xml.scopedElement("Fatal Error Condition") - .writeAttribute("filename", assertionResult.getSourceInfo().file) - .writeAttribute("line", assertionResult.getSourceInfo().line) - .writeText(assertionResult.getMessage()); - break; - case ResultWas::Info: - m_xml.scopedElement("Info") - .writeText(assertionResult.getMessage()); - break; - case ResultWas::Warning: - // Warning will already have been written - break; - case ResultWas::ExplicitFailure: - m_xml.scopedElement("Failure") - .writeText(assertionResult.getMessage()); - break; - default: - break; - } - - if (assertionResult.hasExpression()) - m_xml.endElement(); + bool includeResults = m_config->includeSuccessfulResults() || !result.isOk(); - return true; - } + if( includeResults ) { + // Print any info messages in tags. + for( std::vector::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end(); + it != itEnd; + ++it ) { + if( it->type == ResultWas::Info ) { + m_xml.scopedElement( "Info" ) + .writeText( it->message ); + } else if ( it->type == ResultWas::Warning ) { + m_xml.scopedElement( "Warning" ) + .writeText( it->message ); + } + } + } - virtual void sectionEnded(SectionStats const& sectionStats) CATCH_OVERRIDE - { - StreamingReporterBase::sectionEnded(sectionStats); - if (--m_sectionDepth > 0) - { - XmlWriter::ScopedElement e = m_xml.scopedElement("OverallResults"); - e.writeAttribute("successes", sectionStats.assertions.passed); - e.writeAttribute("failures", sectionStats.assertions.failed); - e.writeAttribute("expectedFailures", sectionStats.assertions.failedButOk); + // Drop out if result was successful but we're not printing them. + if( !includeResults && result.getResultType() != ResultWas::Warning ) + return true; - if (m_config->showDurations() == ShowDurations::Always) - e.writeAttribute("durationInSeconds", sectionStats.durationInSeconds); + // Print the expression if there is one. + if( result.hasExpression() ) { + m_xml.startElement( "Expression" ) + .writeAttribute( "success", result.succeeded() ) + .writeAttribute( "type", result.getTestMacroName() ); - m_xml.endElement(); + writeSourceInfo( result.getSourceInfo() ); + + m_xml.scopedElement( "Original" ) + .writeText( result.getExpression() ); + m_xml.scopedElement( "Expanded" ) + .writeText( result.getExpandedExpression() ); + } + + // And... Print a result applicable to each result type. + switch( result.getResultType() ) { + case ResultWas::ThrewException: + m_xml.startElement( "Exception" ); + writeSourceInfo( result.getSourceInfo() ); + m_xml.writeText( result.getMessage() ); + m_xml.endElement(); + break; + case ResultWas::FatalErrorCondition: + m_xml.startElement( "FatalErrorCondition" ); + writeSourceInfo( result.getSourceInfo() ); + m_xml.writeText( result.getMessage() ); + m_xml.endElement(); + break; + case ResultWas::Info: + m_xml.scopedElement( "Info" ) + .writeText( result.getMessage() ); + break; + case ResultWas::Warning: + // Warning will already have been written + break; + case ResultWas::ExplicitFailure: + m_xml.startElement( "Failure" ); + writeSourceInfo( result.getSourceInfo() ); + m_xml.writeText( result.getMessage() ); + m_xml.endElement(); + break; + default: + break; + } + + if( result.hasExpression() ) + m_xml.endElement(); + + return true; } - } - virtual void testCaseEnded(TestCaseStats const& testCaseStats) CATCH_OVERRIDE - { - StreamingReporterBase::testCaseEnded(testCaseStats); - XmlWriter::ScopedElement e = m_xml.scopedElement("OverallResult"); - e.writeAttribute("success", testCaseStats.totals.assertions.allOk()); + virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE { + StreamingReporterBase::sectionEnded( sectionStats ); + if( --m_sectionDepth > 0 ) { + XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" ); + e.writeAttribute( "successes", sectionStats.assertions.passed ); + e.writeAttribute( "failures", sectionStats.assertions.failed ); + e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk ); - if (m_config->showDurations() == ShowDurations::Always) - e.writeAttribute("durationInSeconds", m_testCaseTimer.getElapsedSeconds()); + if ( m_config->showDurations() == ShowDurations::Always ) + e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds ); - m_xml.endElement(); - } + m_xml.endElement(); + } + } - virtual void testGroupEnded(TestGroupStats const& testGroupStats) CATCH_OVERRIDE - { - StreamingReporterBase::testGroupEnded(testGroupStats); - // TODO: Check testGroupStats.aborting and act accordingly. - m_xml.scopedElement("OverallResults") - .writeAttribute("successes", testGroupStats.totals.assertions.passed) - .writeAttribute("failures", testGroupStats.totals.assertions.failed) - .writeAttribute("expectedFailures", testGroupStats.totals.assertions.failedButOk); - m_xml.endElement(); - } + virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { + StreamingReporterBase::testCaseEnded( testCaseStats ); + XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" ); + e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() ); - virtual void testRunEnded(TestRunStats const& testRunStats) CATCH_OVERRIDE - { - StreamingReporterBase::testRunEnded(testRunStats); - m_xml.scopedElement("OverallResults") - .writeAttribute("successes", testRunStats.totals.assertions.passed) - .writeAttribute("failures", testRunStats.totals.assertions.failed) - .writeAttribute("expectedFailures", testRunStats.totals.assertions.failedButOk); - m_xml.endElement(); - } - - private: - Timer m_testCaseTimer; - XmlWriter m_xml; - int m_sectionDepth; -}; + if ( m_config->showDurations() == ShowDurations::Always ) + e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() ); + + if( !testCaseStats.stdOut.empty() ) + m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), false ); + if( !testCaseStats.stdErr.empty() ) + m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), false ); + + m_xml.endElement(); + } + + virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { + StreamingReporterBase::testGroupEnded( testGroupStats ); + // TODO: Check testGroupStats.aborting and act accordingly. + m_xml.scopedElement( "OverallResults" ) + .writeAttribute( "successes", testGroupStats.totals.assertions.passed ) + .writeAttribute( "failures", testGroupStats.totals.assertions.failed ) + .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk ); + m_xml.endElement(); + } + + virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE { + StreamingReporterBase::testRunEnded( testRunStats ); + m_xml.scopedElement( "OverallResults" ) + .writeAttribute( "successes", testRunStats.totals.assertions.passed ) + .writeAttribute( "failures", testRunStats.totals.assertions.failed ) + .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk ); + m_xml.endElement(); + } + + private: + Timer m_testCaseTimer; + XmlWriter m_xml; + int m_sectionDepth; + }; -INTERNAL_CATCH_REGISTER_REPORTER("xml", XmlReporter) + INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter ) } // end namespace Catch @@ -10313,724 +10187,667 @@ INTERNAL_CATCH_REGISTER_REPORTER("xml", XmlReporter) namespace Catch { -class JunitReporter : public CumulativeReporterBase -{ - public: - JunitReporter(ReporterConfig const& _config) - : CumulativeReporterBase(_config), - xml(_config.stream()) - { - m_reporterPrefs.shouldRedirectStdOut = true; - } + namespace { + std::string getCurrentTimestamp() { + // Beware, this is not reentrant because of backward compatibility issues + // Also, UTC only, again because of backward compatibility (%z is C++11) + time_t rawtime; + std::time(&rawtime); + const size_t timeStampSize = sizeof("2017-01-16T17:06:45Z"); - virtual ~JunitReporter() CATCH_OVERRIDE; +#ifdef _MSC_VER + std::tm timeInfo = {}; + gmtime_s(&timeInfo, &rawtime); +#else + std::tm* timeInfo; + timeInfo = std::gmtime(&rawtime); +#endif - static std::string getDescription() - { - return "Reports test results in an XML format that looks like Ant's junitreport target"; - } + char timeStamp[timeStampSize]; + const char * const fmt = "%Y-%m-%dT%H:%M:%SZ"; - virtual void noMatchingTestCases(std::string const& /*spec*/) CATCH_OVERRIDE {} +#ifdef _MSC_VER + std::strftime(timeStamp, timeStampSize, fmt, &timeInfo); +#else + std::strftime(timeStamp, timeStampSize, fmt, timeInfo); +#endif + return std::string(timeStamp); + } - virtual void testRunStarting(TestRunInfo const& runInfo) CATCH_OVERRIDE - { - CumulativeReporterBase::testRunStarting(runInfo); - xml.startElement("testsuites"); } - virtual void testGroupStarting(GroupInfo const& groupInfo) CATCH_OVERRIDE - { - suiteTimer.start(); - stdOutForSuite.str(""); - stdErrForSuite.str(""); - unexpectedExceptions = 0; - CumulativeReporterBase::testGroupStarting(groupInfo); - } + class JunitReporter : public CumulativeReporterBase { + public: + JunitReporter( ReporterConfig const& _config ) + : CumulativeReporterBase( _config ), + xml( _config.stream() ) + { + m_reporterPrefs.shouldRedirectStdOut = true; + } - virtual bool assertionEnded(AssertionStats const& assertionStats) CATCH_OVERRIDE - { - if (assertionStats.assertionResult.getResultType() == ResultWas::ThrewException) - unexpectedExceptions++; - return CumulativeReporterBase::assertionEnded(assertionStats); - } + virtual ~JunitReporter() CATCH_OVERRIDE; - virtual void testCaseEnded(TestCaseStats const& testCaseStats) CATCH_OVERRIDE - { - stdOutForSuite << testCaseStats.stdOut; - stdErrForSuite << testCaseStats.stdErr; - CumulativeReporterBase::testCaseEnded(testCaseStats); - } + static std::string getDescription() { + return "Reports test results in an XML format that looks like Ant's junitreport target"; + } - virtual void testGroupEnded(TestGroupStats const& testGroupStats) CATCH_OVERRIDE - { - double suiteTime = suiteTimer.getElapsedSeconds(); - CumulativeReporterBase::testGroupEnded(testGroupStats); - writeGroup(*m_testGroups.back(), suiteTime); - } + virtual void noMatchingTestCases( std::string const& /*spec*/ ) CATCH_OVERRIDE {} - virtual void testRunEndedCumulative() CATCH_OVERRIDE - { - xml.endElement(); - } + virtual void testRunStarting( TestRunInfo const& runInfo ) CATCH_OVERRIDE { + CumulativeReporterBase::testRunStarting( runInfo ); + xml.startElement( "testsuites" ); + } - void writeGroup(TestGroupNode const& groupNode, double suiteTime) - { - XmlWriter::ScopedElement e = xml.scopedElement("testsuite"); - TestGroupStats const& stats = groupNode.value; - xml.writeAttribute("name", stats.groupInfo.name); - xml.writeAttribute("errors", unexpectedExceptions); - xml.writeAttribute("failures", stats.totals.assertions.failed - unexpectedExceptions); - xml.writeAttribute("tests", stats.totals.assertions.total()); - xml.writeAttribute("hostname", "tbd"); // !TBD - if (m_config->showDurations() == ShowDurations::Never) - xml.writeAttribute("time", ""); - else - xml.writeAttribute("time", suiteTime); - xml.writeAttribute("timestamp", "tbd"); // !TBD + virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE { + suiteTimer.start(); + stdOutForSuite.str(""); + stdErrForSuite.str(""); + unexpectedExceptions = 0; + CumulativeReporterBase::testGroupStarting( groupInfo ); + } - // Write test cases - for (TestGroupNode::ChildNodes::const_iterator - it = groupNode.children.begin(), - itEnd = groupNode.children.end(); - it != itEnd; - ++it) - writeTestCase(**it); + virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { + if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException ) + unexpectedExceptions++; + return CumulativeReporterBase::assertionEnded( assertionStats ); + } - xml.scopedElement("system-out").writeText(trim(stdOutForSuite.str()), false); - xml.scopedElement("system-err").writeText(trim(stdErrForSuite.str()), false); - } + virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { + stdOutForSuite << testCaseStats.stdOut; + stdErrForSuite << testCaseStats.stdErr; + CumulativeReporterBase::testCaseEnded( testCaseStats ); + } - void writeTestCase(TestCaseNode const& testCaseNode) - { - TestCaseStats const& stats = testCaseNode.value; + virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { + double suiteTime = suiteTimer.getElapsedSeconds(); + CumulativeReporterBase::testGroupEnded( testGroupStats ); + writeGroup( *m_testGroups.back(), suiteTime ); + } + + virtual void testRunEndedCumulative() CATCH_OVERRIDE { + xml.endElement(); + } - // All test cases have exactly one section - which represents the - // test case itself. That section may have 0-n nested sections - assert(testCaseNode.children.size() == 1); - SectionNode const& rootSection = *testCaseNode.children.front(); + void writeGroup( TestGroupNode const& groupNode, double suiteTime ) { + XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" ); + TestGroupStats const& stats = groupNode.value; + xml.writeAttribute( "name", stats.groupInfo.name ); + xml.writeAttribute( "errors", unexpectedExceptions ); + xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions ); + xml.writeAttribute( "tests", stats.totals.assertions.total() ); + xml.writeAttribute( "hostname", "tbd" ); // !TBD + if( m_config->showDurations() == ShowDurations::Never ) + xml.writeAttribute( "time", "" ); + else + xml.writeAttribute( "time", suiteTime ); + xml.writeAttribute( "timestamp", getCurrentTimestamp() ); - std::string className = stats.testInfo.className; + // Write test cases + for( TestGroupNode::ChildNodes::const_iterator + it = groupNode.children.begin(), itEnd = groupNode.children.end(); + it != itEnd; + ++it ) + writeTestCase( **it ); - if (className.empty()) - { - if (rootSection.childSections.empty()) - className = "global"; + xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite.str() ), false ); + xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite.str() ), false ); } - writeSection(className, "", rootSection); - } - void writeSection(std::string const& className, - std::string const& rootName, - SectionNode const& sectionNode) - { - std::string name = trim(sectionNode.stats.sectionInfo.name); - if (!rootName.empty()) - name = rootName + "/" + name; + void writeTestCase( TestCaseNode const& testCaseNode ) { + TestCaseStats const& stats = testCaseNode.value; - if (!sectionNode.assertions.empty() || - !sectionNode.stdOut.empty() || - !sectionNode.stdErr.empty()) - { - XmlWriter::ScopedElement e = xml.scopedElement("testcase"); - if (className.empty()) - { - xml.writeAttribute("classname", name); - xml.writeAttribute("name", "root"); - } - else - { - xml.writeAttribute("classname", className); - xml.writeAttribute("name", name); - } - xml.writeAttribute("time", Catch::toString(sectionNode.stats.durationInSeconds)); + // All test cases have exactly one section - which represents the + // test case itself. That section may have 0-n nested sections + assert( testCaseNode.children.size() == 1 ); + SectionNode const& rootSection = *testCaseNode.children.front(); - writeAssertions(sectionNode); + std::string className = stats.testInfo.className; - if (!sectionNode.stdOut.empty()) - xml.scopedElement("system-out").writeText(trim(sectionNode.stdOut), false); - if (!sectionNode.stdErr.empty()) - xml.scopedElement("system-err").writeText(trim(sectionNode.stdErr), false); - } - for (SectionNode::ChildSections::const_iterator - it = sectionNode.childSections.begin(), - itEnd = sectionNode.childSections.end(); - it != itEnd; - ++it) - if (className.empty()) - writeSection(name, "", **it); - else - writeSection(className, name, **it); - } + if( className.empty() ) { + if( rootSection.childSections.empty() ) + className = "global"; + } + writeSection( className, "", rootSection ); + } + + void writeSection( std::string const& className, + std::string const& rootName, + SectionNode const& sectionNode ) { + std::string name = trim( sectionNode.stats.sectionInfo.name ); + if( !rootName.empty() ) + name = rootName + '/' + name; + + if( !sectionNode.assertions.empty() || + !sectionNode.stdOut.empty() || + !sectionNode.stdErr.empty() ) { + XmlWriter::ScopedElement e = xml.scopedElement( "testcase" ); + if( className.empty() ) { + xml.writeAttribute( "classname", name ); + xml.writeAttribute( "name", "root" ); + } + else { + xml.writeAttribute( "classname", className ); + xml.writeAttribute( "name", name ); + } + xml.writeAttribute( "time", Catch::toString( sectionNode.stats.durationInSeconds ) ); - void writeAssertions(SectionNode const& sectionNode) - { - for (SectionNode::Assertions::const_iterator - it = sectionNode.assertions.begin(), - itEnd = sectionNode.assertions.end(); - it != itEnd; - ++it) - writeAssertion(*it); - } - void writeAssertion(AssertionStats const& stats) - { - AssertionResult const& result = stats.assertionResult; - if (!result.isOk()) - { - std::string elementName; - switch (result.getResultType()) - { - case ResultWas::ThrewException: - case ResultWas::FatalErrorCondition: - elementName = "error"; - break; - case ResultWas::ExplicitFailure: - elementName = "failure"; - break; - case ResultWas::ExpressionFailed: - elementName = "failure"; - break; - case ResultWas::DidntThrowException: - elementName = "failure"; - break; + writeAssertions( sectionNode ); - // We should never see these here: - case ResultWas::Info: - case ResultWas::Warning: - case ResultWas::Ok: - case ResultWas::Unknown: - case ResultWas::FailureBit: - case ResultWas::Exception: - elementName = "internalError"; - break; + if( !sectionNode.stdOut.empty() ) + xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false ); + if( !sectionNode.stdErr.empty() ) + xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false ); } + for( SectionNode::ChildSections::const_iterator + it = sectionNode.childSections.begin(), + itEnd = sectionNode.childSections.end(); + it != itEnd; + ++it ) + if( className.empty() ) + writeSection( name, "", **it ); + else + writeSection( className, name, **it ); + } + + void writeAssertions( SectionNode const& sectionNode ) { + for( SectionNode::Assertions::const_iterator + it = sectionNode.assertions.begin(), itEnd = sectionNode.assertions.end(); + it != itEnd; + ++it ) + writeAssertion( *it ); + } + void writeAssertion( AssertionStats const& stats ) { + AssertionResult const& result = stats.assertionResult; + if( !result.isOk() ) { + std::string elementName; + switch( result.getResultType() ) { + case ResultWas::ThrewException: + case ResultWas::FatalErrorCondition: + elementName = "error"; + break; + case ResultWas::ExplicitFailure: + elementName = "failure"; + break; + case ResultWas::ExpressionFailed: + elementName = "failure"; + break; + case ResultWas::DidntThrowException: + elementName = "failure"; + break; + + // We should never see these here: + case ResultWas::Info: + case ResultWas::Warning: + case ResultWas::Ok: + case ResultWas::Unknown: + case ResultWas::FailureBit: + case ResultWas::Exception: + elementName = "internalError"; + break; + } - XmlWriter::ScopedElement e = xml.scopedElement(elementName); + XmlWriter::ScopedElement e = xml.scopedElement( elementName ); - xml.writeAttribute("message", result.getExpandedExpression()); - xml.writeAttribute("type", result.getTestMacroName()); + xml.writeAttribute( "message", result.getExpandedExpression() ); + xml.writeAttribute( "type", result.getTestMacroName() ); - std::ostringstream oss; - if (!result.getMessage().empty()) - oss << result.getMessage() << "\n"; - for (std::vector::const_iterator - it = stats.infoMessages.begin(), - itEnd = stats.infoMessages.end(); - it != itEnd; - ++it) - if (it->type == ResultWas::Info) - oss << it->message << "\n"; - - oss << "at " << result.getSourceInfo(); - xml.writeText(oss.str(), false); - } - } - - XmlWriter xml; - Timer suiteTimer; - std::ostringstream stdOutForSuite; - std::ostringstream stdErrForSuite; - unsigned int unexpectedExceptions; -}; + std::ostringstream oss; + if( !result.getMessage().empty() ) + oss << result.getMessage() << '\n'; + for( std::vector::const_iterator + it = stats.infoMessages.begin(), + itEnd = stats.infoMessages.end(); + it != itEnd; + ++it ) + if( it->type == ResultWas::Info ) + oss << it->message << '\n'; -INTERNAL_CATCH_REGISTER_REPORTER("junit", JunitReporter) + oss << "at " << result.getSourceInfo(); + xml.writeText( oss.str(), false ); + } + } + + XmlWriter xml; + Timer suiteTimer; + std::ostringstream stdOutForSuite; + std::ostringstream stdErrForSuite; + unsigned int unexpectedExceptions; + }; + + INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter ) } // end namespace Catch // #included from: ../reporters/catch_reporter_console.hpp #define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED +#include +#include + namespace Catch { -struct ConsoleReporter : StreamingReporterBase -{ - ConsoleReporter(ReporterConfig const& _config) - : StreamingReporterBase(_config), - m_headerPrinted(false) - { - } + struct ConsoleReporter : StreamingReporterBase { + ConsoleReporter( ReporterConfig const& _config ) + : StreamingReporterBase( _config ), + m_headerPrinted( false ) + {} - virtual ~ConsoleReporter() CATCH_OVERRIDE; - static std::string getDescription() - { - return "Reports test results as plain lines of text"; - } + virtual ~ConsoleReporter() CATCH_OVERRIDE; + static std::string getDescription() { + return "Reports test results as plain lines of text"; + } - virtual void noMatchingTestCases(std::string const& spec) CATCH_OVERRIDE - { - stream << "No test cases matched '" << spec << "'" << std::endl; - } + virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE { + stream << "No test cases matched '" << spec << '\'' << std::endl; + } - virtual void assertionStarting(AssertionInfo const&) CATCH_OVERRIDE - { - } + virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE { + } - virtual bool assertionEnded(AssertionStats const& _assertionStats) CATCH_OVERRIDE - { - AssertionResult const& result = _assertionStats.assertionResult; + virtual bool assertionEnded( AssertionStats const& _assertionStats ) CATCH_OVERRIDE { + AssertionResult const& result = _assertionStats.assertionResult; - bool printInfoMessages = true; + bool includeResults = m_config->includeSuccessfulResults() || !result.isOk(); - // Drop out if result was successful and we're not printing those - if (!m_config->includeSuccessfulResults() && result.isOk()) - { - if (result.getResultType() != ResultWas::Warning) + // Drop out if result was successful but we're not printing them. + if( !includeResults && result.getResultType() != ResultWas::Warning ) return false; - printInfoMessages = false; - } - - lazyPrint(); - - AssertionPrinter printer(stream, _assertionStats, printInfoMessages); - printer.print(); - stream << std::endl; - return true; - } - virtual void sectionStarting(SectionInfo const& _sectionInfo) CATCH_OVERRIDE - { - m_headerPrinted = false; - StreamingReporterBase::sectionStarting(_sectionInfo); - } - virtual void sectionEnded(SectionStats const& _sectionStats) CATCH_OVERRIDE - { - if (_sectionStats.missingAssertions) - { lazyPrint(); - Colour colour(Colour::ResultError); - if (m_sectionStack.size() > 1) - stream << "\nNo assertions in section"; - else - stream << "\nNo assertions in test case"; - stream << " '" << _sectionStats.sectionInfo.name << "'\n" - << std::endl; - } - if (m_headerPrinted) - { - if (m_config->showDurations() == ShowDurations::Always) - stream << "Completed in " << _sectionStats.durationInSeconds << "s" << std::endl; - m_headerPrinted = false; - } - else - { - if (m_config->showDurations() == ShowDurations::Always) - stream << _sectionStats.sectionInfo.name << " completed in " << _sectionStats.durationInSeconds << "s" << std::endl; - } - StreamingReporterBase::sectionEnded(_sectionStats); - } - virtual void testCaseEnded(TestCaseStats const& _testCaseStats) CATCH_OVERRIDE - { - StreamingReporterBase::testCaseEnded(_testCaseStats); - m_headerPrinted = false; - } - virtual void testGroupEnded(TestGroupStats const& _testGroupStats) CATCH_OVERRIDE - { - if (currentGroupInfo.used) - { - printSummaryDivider(); - stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n"; - printTotals(_testGroupStats.totals); - stream << "\n" - << std::endl; + AssertionPrinter printer( stream, _assertionStats, includeResults ); + printer.print(); + stream << std::endl; + return true; } - StreamingReporterBase::testGroupEnded(_testGroupStats); - } - virtual void testRunEnded(TestRunStats const& _testRunStats) CATCH_OVERRIDE - { - printTotalsDivider(_testRunStats.totals); - printTotals(_testRunStats.totals); - stream << std::endl; - StreamingReporterBase::testRunEnded(_testRunStats); - } - private: - class AssertionPrinter - { - void operator=(AssertionPrinter const&); - - public: - AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages) - : stream(_stream), - stats(_stats), - result(_stats.assertionResult), - colour(Colour::None), - message(result.getMessage()), - messages(_stats.infoMessages), - printInfoMessages(_printInfoMessages) - { - switch (result.getResultType()) - { - case ResultWas::Ok: - colour = Colour::Success; - passOrFail = "PASSED"; - //if( result.hasMessage() ) - if (_stats.infoMessages.size() == 1) - messageLabel = "with message"; - if (_stats.infoMessages.size() > 1) - messageLabel = "with messages"; - break; - case ResultWas::ExpressionFailed: - if (result.isOk()) - { - colour = Colour::Success; - passOrFail = "FAILED - but was ok"; - } + virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE { + m_headerPrinted = false; + StreamingReporterBase::sectionStarting( _sectionInfo ); + } + virtual void sectionEnded( SectionStats const& _sectionStats ) CATCH_OVERRIDE { + if( _sectionStats.missingAssertions ) { + lazyPrint(); + Colour colour( Colour::ResultError ); + if( m_sectionStack.size() > 1 ) + stream << "\nNo assertions in section"; else - { - colour = Colour::Error; - passOrFail = "FAILED"; - } - if (_stats.infoMessages.size() == 1) - messageLabel = "with message"; - if (_stats.infoMessages.size() > 1) - messageLabel = "with messages"; - break; - case ResultWas::ThrewException: - colour = Colour::Error; - passOrFail = "FAILED"; - messageLabel = "due to unexpected exception with message"; - break; - case ResultWas::FatalErrorCondition: - colour = Colour::Error; - passOrFail = "FAILED"; - messageLabel = "due to a fatal error condition"; - break; - case ResultWas::DidntThrowException: - colour = Colour::Error; - passOrFail = "FAILED"; - messageLabel = "because no exception was thrown where one was expected"; - break; - case ResultWas::Info: - messageLabel = "info"; - break; - case ResultWas::Warning: - messageLabel = "warning"; - break; - case ResultWas::ExplicitFailure: - passOrFail = "FAILED"; - colour = Colour::Error; - if (_stats.infoMessages.size() == 1) - messageLabel = "explicitly with message"; - if (_stats.infoMessages.size() > 1) - messageLabel = "explicitly with messages"; - break; - // These cases are here to prevent compiler warnings - case ResultWas::Unknown: - case ResultWas::FailureBit: - case ResultWas::Exception: - passOrFail = "** internal error **"; - colour = Colour::Error; - break; + stream << "\nNo assertions in test case"; + stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl; } + if( m_config->showDurations() == ShowDurations::Always ) { + stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl; + } + if( m_headerPrinted ) { + m_headerPrinted = false; + } + StreamingReporterBase::sectionEnded( _sectionStats ); } - void print() const - { - printSourceInfo(); - if (stats.totals.assertions.total() > 0) - { - if (result.isOk()) - stream << "\n"; - printResultType(); - printOriginalExpression(); - printReconstructedExpression(); + virtual void testCaseEnded( TestCaseStats const& _testCaseStats ) CATCH_OVERRIDE { + StreamingReporterBase::testCaseEnded( _testCaseStats ); + m_headerPrinted = false; + } + virtual void testGroupEnded( TestGroupStats const& _testGroupStats ) CATCH_OVERRIDE { + if( currentGroupInfo.used ) { + printSummaryDivider(); + stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n"; + printTotals( _testGroupStats.totals ); + stream << '\n' << std::endl; } - else + StreamingReporterBase::testGroupEnded( _testGroupStats ); + } + virtual void testRunEnded( TestRunStats const& _testRunStats ) CATCH_OVERRIDE { + printTotalsDivider( _testRunStats.totals ); + printTotals( _testRunStats.totals ); + stream << std::endl; + StreamingReporterBase::testRunEnded( _testRunStats ); + } + + private: + + class AssertionPrinter { + void operator= ( AssertionPrinter const& ); + public: + AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages ) + : stream( _stream ), + stats( _stats ), + result( _stats.assertionResult ), + colour( Colour::None ), + message( result.getMessage() ), + messages( _stats.infoMessages ), + printInfoMessages( _printInfoMessages ) { - stream << "\n"; + switch( result.getResultType() ) { + case ResultWas::Ok: + colour = Colour::Success; + passOrFail = "PASSED"; + //if( result.hasMessage() ) + if( _stats.infoMessages.size() == 1 ) + messageLabel = "with message"; + if( _stats.infoMessages.size() > 1 ) + messageLabel = "with messages"; + break; + case ResultWas::ExpressionFailed: + if( result.isOk() ) { + colour = Colour::Success; + passOrFail = "FAILED - but was ok"; + } + else { + colour = Colour::Error; + passOrFail = "FAILED"; + } + if( _stats.infoMessages.size() == 1 ) + messageLabel = "with message"; + if( _stats.infoMessages.size() > 1 ) + messageLabel = "with messages"; + break; + case ResultWas::ThrewException: + colour = Colour::Error; + passOrFail = "FAILED"; + messageLabel = "due to unexpected exception with "; + if (_stats.infoMessages.size() == 1) + messageLabel += "message"; + if (_stats.infoMessages.size() > 1) + messageLabel += "messages"; + break; + case ResultWas::FatalErrorCondition: + colour = Colour::Error; + passOrFail = "FAILED"; + messageLabel = "due to a fatal error condition"; + break; + case ResultWas::DidntThrowException: + colour = Colour::Error; + passOrFail = "FAILED"; + messageLabel = "because no exception was thrown where one was expected"; + break; + case ResultWas::Info: + messageLabel = "info"; + break; + case ResultWas::Warning: + messageLabel = "warning"; + break; + case ResultWas::ExplicitFailure: + passOrFail = "FAILED"; + colour = Colour::Error; + if( _stats.infoMessages.size() == 1 ) + messageLabel = "explicitly with message"; + if( _stats.infoMessages.size() > 1 ) + messageLabel = "explicitly with messages"; + break; + // These cases are here to prevent compiler warnings + case ResultWas::Unknown: + case ResultWas::FailureBit: + case ResultWas::Exception: + passOrFail = "** internal error **"; + colour = Colour::Error; + break; + } + } + + void print() const { + printSourceInfo(); + if( stats.totals.assertions.total() > 0 ) { + if( result.isOk() ) + stream << '\n'; + printResultType(); + printOriginalExpression(); + printReconstructedExpression(); + } + else { + stream << '\n'; + } + printMessage(); } - printMessage(); - } - private: - void printResultType() const - { - if (!passOrFail.empty()) - { - Colour colourGuard(colour); - stream << passOrFail << ":\n"; + private: + void printResultType() const { + if( !passOrFail.empty() ) { + Colour colourGuard( colour ); + stream << passOrFail << ":\n"; + } } - } - void printOriginalExpression() const - { - if (result.hasExpression()) - { - Colour colourGuard(Colour::OriginalExpression); - stream << " "; - stream << result.getExpressionInMacro(); - stream << "\n"; + void printOriginalExpression() const { + if( result.hasExpression() ) { + Colour colourGuard( Colour::OriginalExpression ); + stream << " "; + stream << result.getExpressionInMacro(); + stream << '\n'; + } } - } - void printReconstructedExpression() const - { - if (result.hasExpandedExpression()) - { - stream << "with expansion:\n"; - Colour colourGuard(Colour::ReconstructedExpression); - stream << Text(result.getExpandedExpression(), TextAttributes().setIndent(2)) << "\n"; + void printReconstructedExpression() const { + if( result.hasExpandedExpression() ) { + stream << "with expansion:\n"; + Colour colourGuard( Colour::ReconstructedExpression ); + stream << Text( result.getExpandedExpression(), TextAttributes().setIndent(2) ) << '\n'; + } } - } - void printMessage() const - { - if (!messageLabel.empty()) - stream << messageLabel << ":" - << "\n"; - for (std::vector::const_iterator it = messages.begin(), itEnd = messages.end(); - it != itEnd; - ++it) - { - // If this assertion is a warning ignore any INFO messages - if (printInfoMessages || it->type != ResultWas::Info) - stream << Text(it->message, TextAttributes().setIndent(2)) << "\n"; + void printMessage() const { + if( !messageLabel.empty() ) + stream << messageLabel << ':' << '\n'; + for( std::vector::const_iterator it = messages.begin(), itEnd = messages.end(); + it != itEnd; + ++it ) { + // If this assertion is a warning ignore any INFO messages + if( printInfoMessages || it->type != ResultWas::Info ) + stream << Text( it->message, TextAttributes().setIndent(2) ) << '\n'; + } + } + void printSourceInfo() const { + Colour colourGuard( Colour::FileName ); + stream << result.getSourceInfo() << ": "; } - } - void printSourceInfo() const - { - Colour colourGuard(Colour::FileName); - stream << result.getSourceInfo() << ": "; - } - std::ostream& stream; - AssertionStats const& stats; - AssertionResult const& result; - Colour::Code colour; - std::string passOrFail; - std::string messageLabel; - std::string message; - std::vector messages; - bool printInfoMessages; - }; + std::ostream& stream; + AssertionStats const& stats; + AssertionResult const& result; + Colour::Code colour; + std::string passOrFail; + std::string messageLabel; + std::string message; + std::vector messages; + bool printInfoMessages; + }; - void lazyPrint() - { + void lazyPrint() { - if (!currentTestRunInfo.used) - lazyPrintRunInfo(); - if (!currentGroupInfo.used) - lazyPrintGroupInfo(); + if( !currentTestRunInfo.used ) + lazyPrintRunInfo(); + if( !currentGroupInfo.used ) + lazyPrintGroupInfo(); - if (!m_headerPrinted) - { - printTestCaseAndSectionHeader(); - m_headerPrinted = true; + if( !m_headerPrinted ) { + printTestCaseAndSectionHeader(); + m_headerPrinted = true; + } } - } - void lazyPrintRunInfo() - { - stream << "\n" - << getLineOfChars<'~'>() << "\n"; - Colour colour(Colour::SecondaryText); - stream << currentTestRunInfo->name - << " is a Catch v" << libraryVersion << " host application.\n" - << "Run with -? for options\n\n"; + void lazyPrintRunInfo() { + stream << '\n' << getLineOfChars<'~'>() << '\n'; + Colour colour( Colour::SecondaryText ); + stream << currentTestRunInfo->name + << " is a Catch v" << libraryVersion() << " host application.\n" + << "Run with -? for options\n\n"; - if (m_config->rngSeed() != 0) - stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n"; + if( m_config->rngSeed() != 0 ) + stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n"; - currentTestRunInfo.used = true; - } - void lazyPrintGroupInfo() - { - if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) - { - printClosedHeader("Group: " + currentGroupInfo->name); - currentGroupInfo.used = true; + currentTestRunInfo.used = true; } - } - void printTestCaseAndSectionHeader() - { - assert(!m_sectionStack.empty()); - printOpenHeader(currentTestCaseInfo->name); - - if (m_sectionStack.size() > 1) - { - Colour colourGuard(Colour::Headers); - - std::vector::const_iterator - it = m_sectionStack.begin() + 1, // Skip first section (test case) - itEnd = m_sectionStack.end(); - for (; it != itEnd; ++it) - printHeaderString(it->name, 2); + void lazyPrintGroupInfo() { + if( !currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1 ) { + printClosedHeader( "Group: " + currentGroupInfo->name ); + currentGroupInfo.used = true; + } } + void printTestCaseAndSectionHeader() { + assert( !m_sectionStack.empty() ); + printOpenHeader( currentTestCaseInfo->name ); - SourceLineInfo lineInfo = m_sectionStack.front().lineInfo; - - if (!lineInfo.empty()) - { - stream << getLineOfChars<'-'>() << "\n"; - Colour colourGuard(Colour::FileName); - stream << lineInfo << "\n"; - } - stream << getLineOfChars<'.'>() << "\n" - << std::endl; - } + if( m_sectionStack.size() > 1 ) { + Colour colourGuard( Colour::Headers ); - void printClosedHeader(std::string const& _name) - { - printOpenHeader(_name); - stream << getLineOfChars<'.'>() << "\n"; - } - void printOpenHeader(std::string const& _name) - { - stream << getLineOfChars<'-'>() << "\n"; - { - Colour colourGuard(Colour::Headers); - printHeaderString(_name); - } - } + std::vector::const_iterator + it = m_sectionStack.begin()+1, // Skip first section (test case) + itEnd = m_sectionStack.end(); + for( ; it != itEnd; ++it ) + printHeaderString( it->name, 2 ); + } - // if string has a : in first line will set indent to follow it on - // subsequent lines - void printHeaderString(std::string const& _string, std::size_t indent = 0) - { - std::size_t i = _string.find(": "); - if (i != std::string::npos) - i += 2; - else - i = 0; - stream << Text(_string, TextAttributes() - .setIndent(indent + i) - .setInitialIndent(indent)) - << "\n"; - } + SourceLineInfo lineInfo = m_sectionStack.back().lineInfo; - struct SummaryColumn - { + if( !lineInfo.empty() ){ + stream << getLineOfChars<'-'>() << '\n'; + Colour colourGuard( Colour::FileName ); + stream << lineInfo << '\n'; + } + stream << getLineOfChars<'.'>() << '\n' << std::endl; + } - SummaryColumn(std::string const& _label, Colour::Code _colour) - : label(_label), - colour(_colour) - { + void printClosedHeader( std::string const& _name ) { + printOpenHeader( _name ); + stream << getLineOfChars<'.'>() << '\n'; } - SummaryColumn addRow(std::size_t count) - { - std::ostringstream oss; - oss << count; - std::string row = oss.str(); - for (std::vector::iterator it = rows.begin(); it != rows.end(); ++it) + void printOpenHeader( std::string const& _name ) { + stream << getLineOfChars<'-'>() << '\n'; { - while (it->size() < row.size()) - *it = " " + *it; - while (it->size() > row.size()) - row = " " + row; + Colour colourGuard( Colour::Headers ); + printHeaderString( _name ); } - rows.push_back(row); - return *this; } - std::string label; - Colour::Code colour; - std::vector rows; - }; + // if string has a : in first line will set indent to follow it on + // subsequent lines + void printHeaderString( std::string const& _string, std::size_t indent = 0 ) { + std::size_t i = _string.find( ": " ); + if( i != std::string::npos ) + i+=2; + else + i = 0; + stream << Text( _string, TextAttributes() + .setIndent( indent+i) + .setInitialIndent( indent ) ) << '\n'; + } + + struct SummaryColumn { + + SummaryColumn( std::string const& _label, Colour::Code _colour ) + : label( _label ), + colour( _colour ) + {} + SummaryColumn addRow( std::size_t count ) { + std::ostringstream oss; + oss << count; + std::string row = oss.str(); + for( std::vector::iterator it = rows.begin(); it != rows.end(); ++it ) { + while( it->size() < row.size() ) + *it = ' ' + *it; + while( it->size() > row.size() ) + row = ' ' + row; + } + rows.push_back( row ); + return *this; + } - void printTotals(Totals const& totals) - { - if (totals.testCases.total() == 0) - { - stream << Colour(Colour::Warning) << "No tests ran\n"; - } - else if (totals.assertions.total() > 0 && totals.assertions.allPassed()) - { - stream << Colour(Colour::ResultSuccess) << "All tests passed"; - stream << " (" - << pluralise(totals.assertions.passed, "assertion") << " in " - << pluralise(totals.testCases.passed, "test case") << ")" - << "\n"; - } - else - { + std::string label; + Colour::Code colour; + std::vector rows; - std::vector columns; - columns.push_back(SummaryColumn("", Colour::None) - .addRow(totals.testCases.total()) - .addRow(totals.assertions.total())); - columns.push_back(SummaryColumn("passed", Colour::Success) - .addRow(totals.testCases.passed) - .addRow(totals.assertions.passed)); - columns.push_back(SummaryColumn("failed", Colour::ResultError) - .addRow(totals.testCases.failed) - .addRow(totals.assertions.failed)); - columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure) - .addRow(totals.testCases.failedButOk) - .addRow(totals.assertions.failedButOk)); - - printSummaryRow("test cases", columns, 0); - printSummaryRow("assertions", columns, 1); - } - } - void printSummaryRow(std::string const& label, std::vector const& cols, std::size_t row) - { - for (std::vector::const_iterator it = cols.begin(); it != cols.end(); ++it) - { - std::string value = it->rows[row]; - if (it->label.empty()) - { - stream << label << ": "; - if (value != "0") - stream << value; - else - stream << Colour(Colour::Warning) << "- none -"; + }; + + void printTotals( Totals const& totals ) { + if( totals.testCases.total() == 0 ) { + stream << Colour( Colour::Warning ) << "No tests ran\n"; } - else if (value != "0") - { - stream << Colour(Colour::LightGrey) << " | "; - stream << Colour(it->colour) - << value << " " << it->label; + else if( totals.assertions.total() > 0 && totals.testCases.allPassed() ) { + stream << Colour( Colour::ResultSuccess ) << "All tests passed"; + stream << " (" + << pluralise( totals.assertions.passed, "assertion" ) << " in " + << pluralise( totals.testCases.passed, "test case" ) << ')' + << '\n'; + } + else { + + std::vector columns; + columns.push_back( SummaryColumn( "", Colour::None ) + .addRow( totals.testCases.total() ) + .addRow( totals.assertions.total() ) ); + columns.push_back( SummaryColumn( "passed", Colour::Success ) + .addRow( totals.testCases.passed ) + .addRow( totals.assertions.passed ) ); + columns.push_back( SummaryColumn( "failed", Colour::ResultError ) + .addRow( totals.testCases.failed ) + .addRow( totals.assertions.failed ) ); + columns.push_back( SummaryColumn( "failed as expected", Colour::ResultExpectedFailure ) + .addRow( totals.testCases.failedButOk ) + .addRow( totals.assertions.failedButOk ) ); + + printSummaryRow( "test cases", columns, 0 ); + printSummaryRow( "assertions", columns, 1 ); } } - stream << "\n"; - } - - static std::size_t makeRatio(std::size_t number, std::size_t total) - { - std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0; - return (ratio == 0 && number > 0) ? 1 : ratio; - } - static std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) - { - if (i > j && i > k) - return i; - else if (j > k) - return j; - else - return k; - } + void printSummaryRow( std::string const& label, std::vector const& cols, std::size_t row ) { + for( std::vector::const_iterator it = cols.begin(); it != cols.end(); ++it ) { + std::string value = it->rows[row]; + if( it->label.empty() ) { + stream << label << ": "; + if( value != "0" ) + stream << value; + else + stream << Colour( Colour::Warning ) << "- none -"; + } + else if( value != "0" ) { + stream << Colour( Colour::LightGrey ) << " | "; + stream << Colour( it->colour ) + << value << ' ' << it->label; + } + } + stream << '\n'; + } - void printTotalsDivider(Totals const& totals) - { - if (totals.testCases.total() > 0) - { - std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total()); - std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total()); - std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total()); - while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1) - findMax(failedRatio, failedButOkRatio, passedRatio)++; - while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1) - findMax(failedRatio, failedButOkRatio, passedRatio)--; - - stream << Colour(Colour::Error) << std::string(failedRatio, '='); - stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '='); - if (totals.testCases.allPassed()) - stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '='); + static std::size_t makeRatio( std::size_t number, std::size_t total ) { + std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number/ total : 0; + return ( ratio == 0 && number > 0 ) ? 1 : ratio; + } + static std::size_t& findMax( std::size_t& i, std::size_t& j, std::size_t& k ) { + if( i > j && i > k ) + return i; + else if( j > k ) + return j; else - stream << Colour(Colour::Success) << std::string(passedRatio, '='); + return k; + } + + void printTotalsDivider( Totals const& totals ) { + if( totals.testCases.total() > 0 ) { + std::size_t failedRatio = makeRatio( totals.testCases.failed, totals.testCases.total() ); + std::size_t failedButOkRatio = makeRatio( totals.testCases.failedButOk, totals.testCases.total() ); + std::size_t passedRatio = makeRatio( totals.testCases.passed, totals.testCases.total() ); + while( failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH-1 ) + findMax( failedRatio, failedButOkRatio, passedRatio )++; + while( failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH-1 ) + findMax( failedRatio, failedButOkRatio, passedRatio )--; + + stream << Colour( Colour::Error ) << std::string( failedRatio, '=' ); + stream << Colour( Colour::ResultExpectedFailure ) << std::string( failedButOkRatio, '=' ); + if( totals.testCases.allPassed() ) + stream << Colour( Colour::ResultSuccess ) << std::string( passedRatio, '=' ); + else + stream << Colour( Colour::Success ) << std::string( passedRatio, '=' ); + } + else { + stream << Colour( Colour::Warning ) << std::string( CATCH_CONFIG_CONSOLE_WIDTH-1, '=' ); + } + stream << '\n'; } - else - { - stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '='); + void printSummaryDivider() { + stream << getLineOfChars<'-'>() << '\n'; } - stream << "\n"; - } - void printSummaryDivider() - { - stream << getLineOfChars<'-'>() << "\n"; - } - private: - bool m_headerPrinted; -}; + private: + bool m_headerPrinted; + }; -INTERNAL_CATCH_REGISTER_REPORTER("console", ConsoleReporter) + INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter ) } // end namespace Catch @@ -11039,384 +10856,351 @@ INTERNAL_CATCH_REGISTER_REPORTER("console", ConsoleReporter) namespace Catch { -struct CompactReporter : StreamingReporterBase -{ - - CompactReporter(ReporterConfig const& _config) - : StreamingReporterBase(_config) - { - } - - virtual ~CompactReporter(); - - static std::string getDescription() - { - return "Reports test results on a single line, suitable for IDEs"; - } - - virtual ReporterPreferences getPreferences() const - { - ReporterPreferences prefs; - prefs.shouldRedirectStdOut = false; - return prefs; - } - - virtual void noMatchingTestCases(std::string const& spec) - { - stream << "No test cases matched '" << spec << "'" << std::endl; - } + struct CompactReporter : StreamingReporterBase { - virtual void assertionStarting(AssertionInfo const&) - { - } + CompactReporter( ReporterConfig const& _config ) + : StreamingReporterBase( _config ) + {} - virtual bool assertionEnded(AssertionStats const& _assertionStats) - { - AssertionResult const& result = _assertionStats.assertionResult; + virtual ~CompactReporter(); - bool printInfoMessages = true; + static std::string getDescription() { + return "Reports test results on a single line, suitable for IDEs"; + } - // Drop out if result was successful and we're not printing those - if (!m_config->includeSuccessfulResults() && result.isOk()) - { - if (result.getResultType() != ResultWas::Warning) - return false; - printInfoMessages = false; + virtual ReporterPreferences getPreferences() const { + ReporterPreferences prefs; + prefs.shouldRedirectStdOut = false; + return prefs; } - AssertionPrinter printer(stream, _assertionStats, printInfoMessages); - printer.print(); + virtual void noMatchingTestCases( std::string const& spec ) { + stream << "No test cases matched '" << spec << '\'' << std::endl; + } - stream << std::endl; - return true; - } + virtual void assertionStarting( AssertionInfo const& ) {} - virtual void testRunEnded(TestRunStats const& _testRunStats) - { - printTotals(_testRunStats.totals); - stream << "\n" - << std::endl; - StreamingReporterBase::testRunEnded(_testRunStats); - } + virtual bool assertionEnded( AssertionStats const& _assertionStats ) { + AssertionResult const& result = _assertionStats.assertionResult; - private: - class AssertionPrinter - { - void operator=(AssertionPrinter const&); + bool printInfoMessages = true; - public: - AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages) - : stream(_stream), stats(_stats), result(_stats.assertionResult), messages(_stats.infoMessages), itMessage(_stats.infoMessages.begin()), printInfoMessages(_printInfoMessages) - { - } + // Drop out if result was successful and we're not printing those + if( !m_config->includeSuccessfulResults() && result.isOk() ) { + if( result.getResultType() != ResultWas::Warning ) + return false; + printInfoMessages = false; + } - void print() - { - printSourceInfo(); + AssertionPrinter printer( stream, _assertionStats, printInfoMessages ); + printer.print(); - itMessage = messages.begin(); + stream << std::endl; + return true; + } - switch (result.getResultType()) - { - case ResultWas::Ok: - printResultType(Colour::ResultSuccess, passedString()); - printOriginalExpression(); - printReconstructedExpression(); - if (!result.hasExpression()) - printRemainingMessages(Colour::None); - else - printRemainingMessages(); - break; - case ResultWas::ExpressionFailed: - if (result.isOk()) - printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok")); - else - printResultType(Colour::Error, failedString()); - printOriginalExpression(); - printReconstructedExpression(); - printRemainingMessages(); - break; - case ResultWas::ThrewException: - printResultType(Colour::Error, failedString()); - printIssue("unexpected exception with message:"); - printMessage(); - printExpressionWas(); - printRemainingMessages(); - break; - case ResultWas::FatalErrorCondition: - printResultType(Colour::Error, failedString()); - printIssue("fatal error condition with message:"); - printMessage(); - printExpressionWas(); - printRemainingMessages(); - break; - case ResultWas::DidntThrowException: - printResultType(Colour::Error, failedString()); - printIssue("expected exception, got none"); - printExpressionWas(); - printRemainingMessages(); - break; - case ResultWas::Info: - printResultType(Colour::None, "info"); - printMessage(); - printRemainingMessages(); - break; - case ResultWas::Warning: - printResultType(Colour::None, "warning"); - printMessage(); - printRemainingMessages(); - break; - case ResultWas::ExplicitFailure: - printResultType(Colour::Error, failedString()); - printIssue("explicitly"); - printRemainingMessages(Colour::None); - break; - // These cases are here to prevent compiler warnings - case ResultWas::Unknown: - case ResultWas::FailureBit: - case ResultWas::Exception: - printResultType(Colour::Error, "** internal error **"); - break; + virtual void sectionEnded(SectionStats const& _sectionStats) CATCH_OVERRIDE { + if (m_config->showDurations() == ShowDurations::Always) { + stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl; } } - private: - // Colour::LightGrey + virtual void testRunEnded( TestRunStats const& _testRunStats ) { + printTotals( _testRunStats.totals ); + stream << '\n' << std::endl; + StreamingReporterBase::testRunEnded( _testRunStats ); + } + + private: + class AssertionPrinter { + void operator= ( AssertionPrinter const& ); + public: + AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages ) + : stream( _stream ) + , stats( _stats ) + , result( _stats.assertionResult ) + , messages( _stats.infoMessages ) + , itMessage( _stats.infoMessages.begin() ) + , printInfoMessages( _printInfoMessages ) + {} + + void print() { + printSourceInfo(); + + itMessage = messages.begin(); + + switch( result.getResultType() ) { + case ResultWas::Ok: + printResultType( Colour::ResultSuccess, passedString() ); + printOriginalExpression(); + printReconstructedExpression(); + if ( ! result.hasExpression() ) + printRemainingMessages( Colour::None ); + else + printRemainingMessages(); + break; + case ResultWas::ExpressionFailed: + if( result.isOk() ) + printResultType( Colour::ResultSuccess, failedString() + std::string( " - but was ok" ) ); + else + printResultType( Colour::Error, failedString() ); + printOriginalExpression(); + printReconstructedExpression(); + printRemainingMessages(); + break; + case ResultWas::ThrewException: + printResultType( Colour::Error, failedString() ); + printIssue( "unexpected exception with message:" ); + printMessage(); + printExpressionWas(); + printRemainingMessages(); + break; + case ResultWas::FatalErrorCondition: + printResultType( Colour::Error, failedString() ); + printIssue( "fatal error condition with message:" ); + printMessage(); + printExpressionWas(); + printRemainingMessages(); + break; + case ResultWas::DidntThrowException: + printResultType( Colour::Error, failedString() ); + printIssue( "expected exception, got none" ); + printExpressionWas(); + printRemainingMessages(); + break; + case ResultWas::Info: + printResultType( Colour::None, "info" ); + printMessage(); + printRemainingMessages(); + break; + case ResultWas::Warning: + printResultType( Colour::None, "warning" ); + printMessage(); + printRemainingMessages(); + break; + case ResultWas::ExplicitFailure: + printResultType( Colour::Error, failedString() ); + printIssue( "explicitly" ); + printRemainingMessages( Colour::None ); + break; + // These cases are here to prevent compiler warnings + case ResultWas::Unknown: + case ResultWas::FailureBit: + case ResultWas::Exception: + printResultType( Colour::Error, "** internal error **" ); + break; + } + } + + private: + // Colour::LightGrey - static Colour::Code dimColour() { return Colour::FileName; } + static Colour::Code dimColour() { return Colour::FileName; } #ifdef CATCH_PLATFORM_MAC - static const char* failedString() - { - return "FAILED"; - } - static const char* passedString() { return "PASSED"; } + static const char* failedString() { return "FAILED"; } + static const char* passedString() { return "PASSED"; } #else - static const char* failedString() - { - return "failed"; - } - static const char* passedString() { return "passed"; } + static const char* failedString() { return "failed"; } + static const char* passedString() { return "passed"; } #endif - void printSourceInfo() const - { - Colour colourGuard(Colour::FileName); - stream << result.getSourceInfo() << ":"; - } + void printSourceInfo() const { + Colour colourGuard( Colour::FileName ); + stream << result.getSourceInfo() << ':'; + } - void printResultType(Colour::Code colour, std::string passOrFail) const - { - if (!passOrFail.empty()) - { - { - Colour colourGuard(colour); - stream << " " << passOrFail; + void printResultType( Colour::Code colour, std::string const& passOrFail ) const { + if( !passOrFail.empty() ) { + { + Colour colourGuard( colour ); + stream << ' ' << passOrFail; + } + stream << ':'; } - stream << ":"; } - } - void printIssue(std::string issue) const - { - stream << " " << issue; - } + void printIssue( std::string const& issue ) const { + stream << ' ' << issue; + } - void printExpressionWas() - { - if (result.hasExpression()) - { - stream << ";"; - { - Colour colour(dimColour()); - stream << " expression was:"; + void printExpressionWas() { + if( result.hasExpression() ) { + stream << ';'; + { + Colour colour( dimColour() ); + stream << " expression was:"; + } + printOriginalExpression(); } - printOriginalExpression(); } - } - void printOriginalExpression() const - { - if (result.hasExpression()) - { - stream << " " << result.getExpression(); + void printOriginalExpression() const { + if( result.hasExpression() ) { + stream << ' ' << result.getExpression(); + } } - } - void printReconstructedExpression() const - { - if (result.hasExpandedExpression()) - { - { - Colour colour(dimColour()); - stream << " for: "; + void printReconstructedExpression() const { + if( result.hasExpandedExpression() ) { + { + Colour colour( dimColour() ); + stream << " for: "; + } + stream << result.getExpandedExpression(); } - stream << result.getExpandedExpression(); } - } - void printMessage() - { - if (itMessage != messages.end()) - { - stream << " '" << itMessage->message << "'"; - ++itMessage; + void printMessage() { + if ( itMessage != messages.end() ) { + stream << " '" << itMessage->message << '\''; + ++itMessage; + } } - } - - void printRemainingMessages(Colour::Code colour = dimColour()) - { - if (itMessage == messages.end()) - return; - // using messages.end() directly yields compilation error: - std::vector::const_iterator itEnd = messages.end(); - const std::size_t N = static_cast(std::distance(itMessage, itEnd)); + void printRemainingMessages( Colour::Code colour = dimColour() ) { + if ( itMessage == messages.end() ) + return; - { - Colour colourGuard(colour); - stream << " with " << pluralise(N, "message") << ":"; - } + // using messages.end() directly yields compilation error: + std::vector::const_iterator itEnd = messages.end(); + const std::size_t N = static_cast( std::distance( itMessage, itEnd ) ); - for (; itMessage != itEnd;) - { - // If this assertion is a warning ignore any INFO messages - if (printInfoMessages || itMessage->type != ResultWas::Info) { - stream << " '" << itMessage->message << "'"; - if (++itMessage != itEnd) - { - Colour colourGuard(dimColour()); - stream << " and"; + Colour colourGuard( colour ); + stream << " with " << pluralise( N, "message" ) << ':'; + } + + for(; itMessage != itEnd; ) { + // If this assertion is a warning ignore any INFO messages + if( printInfoMessages || itMessage->type != ResultWas::Info ) { + stream << " '" << itMessage->message << '\''; + if ( ++itMessage != itEnd ) { + Colour colourGuard( dimColour() ); + stream << " and"; + } } } } - } - - private: - std::ostream& stream; - AssertionStats const& stats; - AssertionResult const& result; - std::vector messages; - std::vector::const_iterator itMessage; - bool printInfoMessages; - }; - // Colour, message variants: - // - white: No tests ran. - // - red: Failed [both/all] N test cases, failed [both/all] M assertions. - // - white: Passed [both/all] N test cases (no assertions). - // - red: Failed N tests cases, failed M assertions. - // - green: Passed [both/all] N tests cases with M assertions. + private: + std::ostream& stream; + AssertionStats const& stats; + AssertionResult const& result; + std::vector messages; + std::vector::const_iterator itMessage; + bool printInfoMessages; + }; - std::string bothOrAll(std::size_t count) const - { - return count == 1 ? "" : count == 2 ? "both " : "all "; - } + // Colour, message variants: + // - white: No tests ran. + // - red: Failed [both/all] N test cases, failed [both/all] M assertions. + // - white: Passed [both/all] N test cases (no assertions). + // - red: Failed N tests cases, failed M assertions. + // - green: Passed [both/all] N tests cases with M assertions. - void printTotals(const Totals& totals) const - { - if (totals.testCases.total() == 0) - { - stream << "No tests ran."; - } - else if (totals.testCases.failed == totals.testCases.total()) - { - Colour colour(Colour::ResultError); - const std::string qualify_assertions_failed = - totals.assertions.failed == totals.assertions.total() ? bothOrAll(totals.assertions.failed) : ""; - stream << "Failed " << bothOrAll(totals.testCases.failed) - << pluralise(totals.testCases.failed, "test case") << ", " - "failed " - << qualify_assertions_failed << pluralise(totals.assertions.failed, "assertion") << "."; - } - else if (totals.assertions.total() == 0) - { - stream << "Passed " << bothOrAll(totals.testCases.total()) - << pluralise(totals.testCases.total(), "test case") - << " (no assertions)."; - } - else if (totals.assertions.failed) - { - Colour colour(Colour::ResultError); - stream << "Failed " << pluralise(totals.testCases.failed, "test case") << ", " - "failed " - << pluralise(totals.assertions.failed, "assertion") << "."; + std::string bothOrAll( std::size_t count ) const { + return count == 1 ? std::string() : count == 2 ? "both " : "all " ; } - else - { - Colour colour(Colour::ResultSuccess); - stream << "Passed " << bothOrAll(totals.testCases.passed) - << pluralise(totals.testCases.passed, "test case") << " with " << pluralise(totals.assertions.passed, "assertion") << "."; + + void printTotals( const Totals& totals ) const { + if( totals.testCases.total() == 0 ) { + stream << "No tests ran."; + } + else if( totals.testCases.failed == totals.testCases.total() ) { + Colour colour( Colour::ResultError ); + const std::string qualify_assertions_failed = + totals.assertions.failed == totals.assertions.total() ? + bothOrAll( totals.assertions.failed ) : std::string(); + stream << + "Failed " << bothOrAll( totals.testCases.failed ) + << pluralise( totals.testCases.failed, "test case" ) << ", " + "failed " << qualify_assertions_failed << + pluralise( totals.assertions.failed, "assertion" ) << '.'; + } + else if( totals.assertions.total() == 0 ) { + stream << + "Passed " << bothOrAll( totals.testCases.total() ) + << pluralise( totals.testCases.total(), "test case" ) + << " (no assertions)."; + } + else if( totals.assertions.failed ) { + Colour colour( Colour::ResultError ); + stream << + "Failed " << pluralise( totals.testCases.failed, "test case" ) << ", " + "failed " << pluralise( totals.assertions.failed, "assertion" ) << '.'; + } + else { + Colour colour( Colour::ResultSuccess ); + stream << + "Passed " << bothOrAll( totals.testCases.passed ) + << pluralise( totals.testCases.passed, "test case" ) << + " with " << pluralise( totals.assertions.passed, "assertion" ) << '.'; + } } - } -}; + }; -INTERNAL_CATCH_REGISTER_REPORTER("compact", CompactReporter) + INTERNAL_CATCH_REGISTER_REPORTER( "compact", CompactReporter ) } // end namespace Catch namespace Catch { -// These are all here to avoid warnings about not having any out of line -// virtual methods -NonCopyable::~NonCopyable() {} -IShared::~IShared() {} -IStream::~IStream() CATCH_NOEXCEPT {} -FileStream::~FileStream() CATCH_NOEXCEPT {} -CoutStream::~CoutStream() CATCH_NOEXCEPT {} -DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {} -StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {} -IContext::~IContext() {} -IResultCapture::~IResultCapture() {} -ITestCase::~ITestCase() {} -ITestCaseRegistry::~ITestCaseRegistry() {} -IRegistryHub::~IRegistryHub() {} -IMutableRegistryHub::~IMutableRegistryHub() {} -IExceptionTranslator::~IExceptionTranslator() {} -IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() {} -IReporter::~IReporter() {} -IReporterFactory::~IReporterFactory() {} -IReporterRegistry::~IReporterRegistry() {} -IStreamingReporter::~IStreamingReporter() {} -AssertionStats::~AssertionStats() {} -SectionStats::~SectionStats() {} -TestCaseStats::~TestCaseStats() {} -TestGroupStats::~TestGroupStats() {} -TestRunStats::~TestRunStats() {} -CumulativeReporterBase::SectionNode::~SectionNode() {} -CumulativeReporterBase::~CumulativeReporterBase() {} - -StreamingReporterBase::~StreamingReporterBase() {} -ConsoleReporter::~ConsoleReporter() {} -CompactReporter::~CompactReporter() {} -IRunner::~IRunner() {} -IMutableContext::~IMutableContext() {} -IConfig::~IConfig() {} -XmlReporter::~XmlReporter() {} -JunitReporter::~JunitReporter() {} -TestRegistry::~TestRegistry() {} -FreeFunctionTestCase::~FreeFunctionTestCase() {} -IGeneratorInfo::~IGeneratorInfo() {} -IGeneratorsForTest::~IGeneratorsForTest() {} -WildcardPattern::~WildcardPattern() {} -TestSpec::Pattern::~Pattern() {} -TestSpec::NamePattern::~NamePattern() {} -TestSpec::TagPattern::~TagPattern() {} -TestSpec::ExcludedPattern::~ExcludedPattern() {} - -Matchers::Impl::StdString::Equals::~Equals() {} -Matchers::Impl::StdString::Contains::~Contains() {} -Matchers::Impl::StdString::StartsWith::~StartsWith() {} -Matchers::Impl::StdString::EndsWith::~EndsWith() {} - -void Config::dummy() {} - -namespace TestCaseTracking { -ITracker::~ITracker() {} -TrackerBase::~TrackerBase() {} -SectionTracker::~SectionTracker() {} -IndexTracker::~IndexTracker() {} -} + // These are all here to avoid warnings about not having any out of line + // virtual methods + NonCopyable::~NonCopyable() {} + IShared::~IShared() {} + IStream::~IStream() CATCH_NOEXCEPT {} + FileStream::~FileStream() CATCH_NOEXCEPT {} + CoutStream::~CoutStream() CATCH_NOEXCEPT {} + DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {} + StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {} + IContext::~IContext() {} + IResultCapture::~IResultCapture() {} + ITestCase::~ITestCase() {} + ITestCaseRegistry::~ITestCaseRegistry() {} + IRegistryHub::~IRegistryHub() {} + IMutableRegistryHub::~IMutableRegistryHub() {} + IExceptionTranslator::~IExceptionTranslator() {} + IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() {} + IReporter::~IReporter() {} + IReporterFactory::~IReporterFactory() {} + IReporterRegistry::~IReporterRegistry() {} + IStreamingReporter::~IStreamingReporter() {} + AssertionStats::~AssertionStats() {} + SectionStats::~SectionStats() {} + TestCaseStats::~TestCaseStats() {} + TestGroupStats::~TestGroupStats() {} + TestRunStats::~TestRunStats() {} + CumulativeReporterBase::SectionNode::~SectionNode() {} + CumulativeReporterBase::~CumulativeReporterBase() {} + + StreamingReporterBase::~StreamingReporterBase() {} + ConsoleReporter::~ConsoleReporter() {} + CompactReporter::~CompactReporter() {} + IRunner::~IRunner() {} + IMutableContext::~IMutableContext() {} + IConfig::~IConfig() {} + XmlReporter::~XmlReporter() {} + JunitReporter::~JunitReporter() {} + TestRegistry::~TestRegistry() {} + FreeFunctionTestCase::~FreeFunctionTestCase() {} + IGeneratorInfo::~IGeneratorInfo() {} + IGeneratorsForTest::~IGeneratorsForTest() {} + WildcardPattern::~WildcardPattern() {} + TestSpec::Pattern::~Pattern() {} + TestSpec::NamePattern::~NamePattern() {} + TestSpec::TagPattern::~TagPattern() {} + TestSpec::ExcludedPattern::~ExcludedPattern() {} + Matchers::Impl::MatcherUntypedBase::~MatcherUntypedBase() {} + + void Config::dummy() {} + + namespace TestCaseTracking { + ITracker::~ITracker() {} + TrackerBase::~TrackerBase() {} + SectionTracker::~SectionTracker() {} + IndexTracker::~IndexTracker() {} + } } #ifdef __clang__ @@ -11432,28 +11216,27 @@ IndexTracker::~IndexTracker() {} #ifndef __OBJC__ // Standard C/C++ main entry point -int main(int argc, char* argv[]) -{ - return Catch::Session().run(argc, argv); +int main (int argc, char * argv[]) { + int result = Catch::Session().run( argc, argv ); + return ( result < 0xff ? result : 0xff ); } #else // __OBJC__ // Objective-C entry point -int main(int argc, char* const argv[]) -{ +int main (int argc, char * const argv[]) { #if !CATCH_ARC_ENABLED - NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; #endif Catch::registerTestMethods(); - int result = Catch::Session().run(argc, (char* const*)argv); + int result = Catch::Session().run( argc, (char* const*)argv ); #if !CATCH_ARC_ENABLED [pool drain]; #endif - return result; + return ( result < 0xff ? result : 0xff ); } #endif // __OBJC__ @@ -11461,7 +11244,7 @@ int main(int argc, char* const argv[]) #endif #ifdef CLARA_CONFIG_MAIN_NOT_DEFINED -#undef CLARA_CONFIG_MAIN +# undef CLARA_CONFIG_MAIN #endif ////// @@ -11469,145 +11252,171 @@ int main(int argc, char* const argv[]) // If this config identifier is defined then all CATCH macros are prefixed with CATCH_ #ifdef CATCH_CONFIG_PREFIX_ALL -#define CATCH_REQUIRE(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::Normal, "CATCH_REQUIRE") -#define CATCH_REQUIRE_FALSE(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, "CATCH_REQUIRE_FALSE") +#if defined(CATCH_CONFIG_FAST_COMPILE) +#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, expr ) +#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) +#else +#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, expr ) +#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) +#endif -#define CATCH_REQUIRE_THROWS(expr) INTERNAL_CATCH_THROWS(expr, Catch::ResultDisposition::Normal, "", "CATCH_REQUIRE_THROWS") -#define CATCH_REQUIRE_THROWS_AS(expr, exceptionType) INTERNAL_CATCH_THROWS_AS(expr, exceptionType, Catch::ResultDisposition::Normal, "CATCH_REQUIRE_THROWS_AS") -#define CATCH_REQUIRE_THROWS_WITH(expr, matcher) INTERNAL_CATCH_THROWS(expr, Catch::ResultDisposition::Normal, matcher, "CATCH_REQUIRE_THROWS_WITH") -#define CATCH_REQUIRE_NOTHROW(expr) INTERNAL_CATCH_NO_THROW(expr, Catch::ResultDisposition::Normal, "CATCH_REQUIRE_NOTHROW") +#define CATCH_REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", expr ) +#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr ) +#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr ) +#define CATCH_REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, expr ) -#define CATCH_CHECK(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK") -#define CATCH_CHECK_FALSE(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, "CATCH_CHECK_FALSE") -#define CATCH_CHECKED_IF(expr) INTERNAL_CATCH_IF(expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECKED_IF") -#define CATCH_CHECKED_ELSE(expr) INTERNAL_CATCH_ELSE(expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECKED_ELSE") -#define CATCH_CHECK_NOFAIL(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CATCH_CHECK_NOFAIL") +#define CATCH_CHECK( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, expr ) +#define CATCH_CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, expr ) +#define CATCH_CHECKED_IF( expr ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, expr ) +#define CATCH_CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, expr ) +#define CATCH_CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr ) -#define CATCH_CHECK_THROWS(expr) INTERNAL_CATCH_THROWS(expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_THROWS") -#define CATCH_CHECK_THROWS_AS(expr, exceptionType) INTERNAL_CATCH_THROWS_AS(expr, exceptionType, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_THROWS_AS") -#define CATCH_CHECK_THROWS_WITH(expr, matcher) INTERNAL_CATCH_THROWS(expr, Catch::ResultDisposition::ContinueOnFailure, matcher, "CATCH_CHECK_THROWS_WITH") -#define CATCH_CHECK_NOTHROW(expr) INTERNAL_CATCH_NO_THROW(expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_NOTHROW") +#define CATCH_CHECK_THROWS( expr ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", expr ) +#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr ) +#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr ) +#define CATCH_CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECK_THAT(arg, matcher) INTERNAL_CHECK_THAT(arg, matcher, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_THAT") -#define CATCH_REQUIRE_THAT(arg, matcher) INTERNAL_CHECK_THAT(arg, matcher, Catch::ResultDisposition::Normal, "CATCH_REQUIRE_THAT") +#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg ) + +#if defined(CATCH_CONFIG_FAST_COMPILE) +#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT_NO_TRY( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) +#else +#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) +#endif -#define CATCH_INFO(msg) INTERNAL_CATCH_INFO(msg, "CATCH_INFO") -#define CATCH_WARN(msg) INTERNAL_CATCH_MSG(Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "CATCH_WARN", msg) -#define CATCH_SCOPED_INFO(msg) INTERNAL_CATCH_INFO(msg, "CATCH_INFO") -#define CATCH_CAPTURE(msg) INTERNAL_CATCH_INFO(#msg " := " << msg, "CATCH_CAPTURE") -#define CATCH_SCOPED_CAPTURE(msg) INTERNAL_CATCH_INFO(#msg " := " << msg, "CATCH_CAPTURE") +#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg ) +#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg ) +#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg ) +#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << Catch::toString(msg) ) +#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << Catch::toString(msg) ) #ifdef CATCH_CONFIG_VARIADIC_MACROS -#define CATCH_TEST_CASE(...) INTERNAL_CATCH_TESTCASE(__VA_ARGS__) -#define CATCH_TEST_CASE_METHOD(className, ...) INTERNAL_CATCH_TEST_CASE_METHOD(className, __VA_ARGS__) -#define CATCH_METHOD_AS_TEST_CASE(method, ...) INTERNAL_CATCH_METHOD_AS_TEST_CASE(method, __VA_ARGS__) -#define CATCH_REGISTER_TEST_CASE(...) INTERNAL_CATCH_REGISTER_TESTCASE(__VA_ARGS__) -#define CATCH_SECTION(...) INTERNAL_CATCH_SECTION(__VA_ARGS__) -#define CATCH_FAIL(...) INTERNAL_CATCH_MSG(Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", __VA_ARGS__) -#define CATCH_SUCCEED(...) INTERNAL_CATCH_MSG(Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED", __VA_ARGS__) + #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ ) + #define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ ) + #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ ) + #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ ) + #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ ) + #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", __VA_ARGS__ ) + #define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) + #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) #else -#define CATCH_TEST_CASE(name, description) INTERNAL_CATCH_TESTCASE(name, description) -#define CATCH_TEST_CASE_METHOD(className, name, description) INTERNAL_CATCH_TEST_CASE_METHOD(className, name, description) -#define CATCH_METHOD_AS_TEST_CASE(method, name, description) INTERNAL_CATCH_METHOD_AS_TEST_CASE(method, name, description) -#define CATCH_REGISTER_TEST_CASE(function, name, description) INTERNAL_CATCH_REGISTER_TESTCASE(function, name, description) -#define CATCH_SECTION(name, description) INTERNAL_CATCH_SECTION(name, description) -#define CATCH_FAIL(msg) INTERNAL_CATCH_MSG(Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", msg) -#define CATCH_SUCCEED(msg) INTERNAL_CATCH_MSG(Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED", msg) + #define CATCH_TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description ) + #define CATCH_TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description ) + #define CATCH_METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description ) + #define CATCH_REGISTER_TEST_CASE( function, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( function, name, description ) + #define CATCH_SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description ) + #define CATCH_FAIL( msg ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, msg ) + #define CATCH_FAIL_CHECK( msg ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, msg ) + #define CATCH_SUCCEED( msg ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, msg ) #endif -#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE("", "") +#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" ) -#define CATCH_REGISTER_REPORTER(name, reporterType) INTERNAL_CATCH_REGISTER_REPORTER(name, reporterType) -#define CATCH_REGISTER_LEGACY_REPORTER(name, reporterType) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER(name, reporterType) +#define CATCH_REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) +#define CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) -#define CATCH_GENERATE(expr) INTERNAL_CATCH_GENERATE(expr) +#define CATCH_GENERATE( expr) INTERNAL_CATCH_GENERATE( expr ) // "BDD-style" convenience wrappers #ifdef CATCH_CONFIG_VARIADIC_MACROS -#define CATCH_SCENARIO(...) CATCH_TEST_CASE("Scenario: " __VA_ARGS__) -#define CATCH_SCENARIO_METHOD(className, ...) INTERNAL_CATCH_TEST_CASE_METHOD(className, "Scenario: " __VA_ARGS__) +#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ ) +#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ ) #else -#define CATCH_SCENARIO(name, tags) CATCH_TEST_CASE("Scenario: " name, tags) -#define CATCH_SCENARIO_METHOD(className, name, tags) INTERNAL_CATCH_TEST_CASE_METHOD(className, "Scenario: " name, tags) +#define CATCH_SCENARIO( name, tags ) CATCH_TEST_CASE( "Scenario: " name, tags ) +#define CATCH_SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags ) #endif -#define CATCH_GIVEN(desc) CATCH_SECTION(std::string("Given: ") + desc, "") -#define CATCH_WHEN(desc) CATCH_SECTION(std::string(" When: ") + desc, "") -#define CATCH_AND_WHEN(desc) CATCH_SECTION(std::string(" And: ") + desc, "") -#define CATCH_THEN(desc) CATCH_SECTION(std::string(" Then: ") + desc, "") -#define CATCH_AND_THEN(desc) CATCH_SECTION(std::string(" And: ") + desc, "") +#define CATCH_GIVEN( desc ) CATCH_SECTION( std::string( "Given: ") + desc, "" ) +#define CATCH_WHEN( desc ) CATCH_SECTION( std::string( " When: ") + desc, "" ) +#define CATCH_AND_WHEN( desc ) CATCH_SECTION( std::string( " And: ") + desc, "" ) +#define CATCH_THEN( desc ) CATCH_SECTION( std::string( " Then: ") + desc, "" ) +#define CATCH_AND_THEN( desc ) CATCH_SECTION( std::string( " And: ") + desc, "" ) // If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required #else -#define REQUIRE(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::Normal, "REQUIRE") -#define REQUIRE_FALSE(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, "REQUIRE_FALSE") +#if defined(CATCH_CONFIG_FAST_COMPILE) +#define REQUIRE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "REQUIRE", Catch::ResultDisposition::Normal, expr ) +#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) + +#else +#define REQUIRE( expr ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, expr ) +#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) +#endif + +#define REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", expr ) +#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr ) +#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr ) +#define REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, expr ) -#define REQUIRE_THROWS(expr) INTERNAL_CATCH_THROWS(expr, Catch::ResultDisposition::Normal, "", "REQUIRE_THROWS") -#define REQUIRE_THROWS_AS(expr, exceptionType) INTERNAL_CATCH_THROWS_AS(expr, exceptionType, Catch::ResultDisposition::Normal, "REQUIRE_THROWS_AS") -#define REQUIRE_THROWS_WITH(expr, matcher) INTERNAL_CATCH_THROWS(expr, Catch::ResultDisposition::Normal, matcher, "REQUIRE_THROWS_WITH") -#define REQUIRE_NOTHROW(expr) INTERNAL_CATCH_NO_THROW(expr, Catch::ResultDisposition::Normal, "REQUIRE_NOTHROW") +#define CHECK( expr ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, expr ) +#define CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, expr ) +#define CHECKED_IF( expr ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, expr ) +#define CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, expr ) +#define CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr ) -#define CHECK(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::ContinueOnFailure, "CHECK") -#define CHECK_FALSE(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, "CHECK_FALSE") -#define CHECKED_IF(expr) INTERNAL_CATCH_IF(expr, Catch::ResultDisposition::ContinueOnFailure, "CHECKED_IF") -#define CHECKED_ELSE(expr) INTERNAL_CATCH_ELSE(expr, Catch::ResultDisposition::ContinueOnFailure, "CHECKED_ELSE") -#define CHECK_NOFAIL(expr) INTERNAL_CATCH_TEST(expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CHECK_NOFAIL") +#define CHECK_THROWS( expr ) INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", expr ) +#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr ) +#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr ) +#define CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECK_THROWS(expr) INTERNAL_CATCH_THROWS(expr, Catch::ResultDisposition::ContinueOnFailure, "", "CHECK_THROWS") -#define CHECK_THROWS_AS(expr, exceptionType) INTERNAL_CATCH_THROWS_AS(expr, exceptionType, Catch::ResultDisposition::ContinueOnFailure, "CHECK_THROWS_AS") -#define CHECK_THROWS_WITH(expr, matcher) INTERNAL_CATCH_THROWS(expr, Catch::ResultDisposition::ContinueOnFailure, matcher, "CHECK_THROWS_WITH") -#define CHECK_NOTHROW(expr) INTERNAL_CATCH_NO_THROW(expr, Catch::ResultDisposition::ContinueOnFailure, "CHECK_NOTHROW") +#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg ) -#define CHECK_THAT(arg, matcher) INTERNAL_CHECK_THAT(arg, matcher, Catch::ResultDisposition::ContinueOnFailure, "CHECK_THAT") -#define REQUIRE_THAT(arg, matcher) INTERNAL_CHECK_THAT(arg, matcher, Catch::ResultDisposition::Normal, "REQUIRE_THAT") +#if defined(CATCH_CONFIG_FAST_COMPILE) +#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT_NO_TRY( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) +#else +#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) +#endif -#define INFO(msg) INTERNAL_CATCH_INFO(msg, "INFO") -#define WARN(msg) INTERNAL_CATCH_MSG(Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "WARN", msg) -#define SCOPED_INFO(msg) INTERNAL_CATCH_INFO(msg, "INFO") -#define CAPTURE(msg) INTERNAL_CATCH_INFO(#msg " := " << msg, "CAPTURE") -#define SCOPED_CAPTURE(msg) INTERNAL_CATCH_INFO(#msg " := " << msg, "CAPTURE") +#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg ) +#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg ) +#define SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg ) +#define CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << Catch::toString(msg) ) +#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << Catch::toString(msg) ) #ifdef CATCH_CONFIG_VARIADIC_MACROS -#define TEST_CASE(...) INTERNAL_CATCH_TESTCASE(__VA_ARGS__) -#define TEST_CASE_METHOD(className, ...) INTERNAL_CATCH_TEST_CASE_METHOD(className, __VA_ARGS__) -#define METHOD_AS_TEST_CASE(method, ...) INTERNAL_CATCH_METHOD_AS_TEST_CASE(method, __VA_ARGS__) -#define REGISTER_TEST_CASE(...) INTERNAL_CATCH_REGISTER_TESTCASE(__VA_ARGS__) -#define SECTION(...) INTERNAL_CATCH_SECTION(__VA_ARGS__) -#define FAIL(...) INTERNAL_CATCH_MSG(Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL", __VA_ARGS__) -#define SUCCEED(...) INTERNAL_CATCH_MSG(Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED", __VA_ARGS__) +#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ ) +#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ ) +#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ ) +#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ ) +#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ ) +#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ ) +#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) +#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) #else -#define TEST_CASE(name, description) INTERNAL_CATCH_TESTCASE(name, description) -#define TEST_CASE_METHOD(className, name, description) INTERNAL_CATCH_TEST_CASE_METHOD(className, name, description) -#define METHOD_AS_TEST_CASE(method, name, description) INTERNAL_CATCH_METHOD_AS_TEST_CASE(method, name, description) -#define REGISTER_TEST_CASE(method, name, description) INTERNAL_CATCH_REGISTER_TESTCASE(method, name, description) -#define SECTION(name, description) INTERNAL_CATCH_SECTION(name, description) -#define FAIL(msg) INTERNAL_CATCH_MSG(Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL", msg) -#define SUCCEED(msg) INTERNAL_CATCH_MSG(Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED", msg) +#define TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description ) + #define TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description ) + #define METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description ) + #define REGISTER_TEST_CASE( method, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( method, name, description ) + #define SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description ) + #define FAIL( msg ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, msg ) + #define FAIL_CHECK( msg ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, msg ) + #define SUCCEED( msg ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, msg ) #endif -#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE("", "") +#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" ) -#define REGISTER_REPORTER(name, reporterType) INTERNAL_CATCH_REGISTER_REPORTER(name, reporterType) -#define REGISTER_LEGACY_REPORTER(name, reporterType) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER(name, reporterType) +#define REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) +#define REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) -#define GENERATE(expr) INTERNAL_CATCH_GENERATE(expr) +#define GENERATE( expr) INTERNAL_CATCH_GENERATE( expr ) #endif -#define CATCH_TRANSLATE_EXCEPTION(signature) INTERNAL_CATCH_TRANSLATE_EXCEPTION(signature) +#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) // "BDD-style" convenience wrappers #ifdef CATCH_CONFIG_VARIADIC_MACROS -#define SCENARIO(...) TEST_CASE("Scenario: " __VA_ARGS__) -#define SCENARIO_METHOD(className, ...) INTERNAL_CATCH_TEST_CASE_METHOD(className, "Scenario: " __VA_ARGS__) +#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ ) +#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ ) #else -#define SCENARIO(name, tags) TEST_CASE("Scenario: " name, tags) -#define SCENARIO_METHOD(className, name, tags) INTERNAL_CATCH_TEST_CASE_METHOD(className, "Scenario: " name, tags) +#define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags ) +#define SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags ) #endif -#define GIVEN(desc) SECTION(std::string(" Given: ") + desc, "") -#define WHEN(desc) SECTION(std::string(" When: ") + desc, "") -#define AND_WHEN(desc) SECTION(std::string("And when: ") + desc, "") -#define THEN(desc) SECTION(std::string(" Then: ") + desc, "") -#define AND_THEN(desc) SECTION(std::string(" And: ") + desc, "") +#define GIVEN( desc ) SECTION( std::string(" Given: ") + desc, "" ) +#define WHEN( desc ) SECTION( std::string(" When: ") + desc, "" ) +#define AND_WHEN( desc ) SECTION( std::string("And when: ") + desc, "" ) +#define THEN( desc ) SECTION( std::string(" Then: ") + desc, "" ) +#define AND_THEN( desc ) SECTION( std::string(" And: ") + desc, "" ) using Catch::Detail::Approx; #endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED + diff --git a/test/lambda_overload_test.cpp b/test/lambda_overload_test.cpp new file mode 100644 index 00000000000..764921e638e --- /dev/null +++ b/test/lambda_overload_test.cpp @@ -0,0 +1,282 @@ +#include +#include + +#include +#include + +#if __cplusplus >= 201402L +#define HAS_CPP14_SUPPORT +#endif + +using namespace mapbox::util; + +template +struct tag +{ + static void dump(const char* prefix) + { + std::cout << prefix << ": " << typeid(tag).name() << std::endl; + } +}; + +template +using Either = mapbox::util::variant; + +struct Response +{ +}; + +struct Error +{ +}; + +void test_lambda_overloads() +{ + Either rv; + + rv = Response{}; + + auto visitor = make_visitor([](Response) { std::cout << "Response\n"; }, // + [](Error) { std::cout << "Error\n"; }); // + apply_visitor(visitor, rv); +} + +void test_lambda_overloads_capture() +{ + Either rv; + + rv = Error{}; + + int ok = 0; + int err = 0; + + auto visitor = make_visitor([&](Response) { ok += 1; }, // + [&](Error) { err += 1; }); // + apply_visitor(visitor, rv); + + std::cout << "Got " << ok << " ok, " << err << " err" << std::endl; +} + +void test_singleton_variant() +{ + + variant singleton; + apply_visitor(make_visitor([](int) {}), singleton); +} + +// See #180 +struct test_call_nonconst_member_visitor +{ + template + void operator() (T & obj) const + { + tag::dump("test_call_nonconst_member: visitor"); + obj.foo(); + } +}; + +void test_call_nonconst_member() +{ + struct object + { + void foo() { val = 42;} + int val = 0; + }; + + variant v = object{}; + apply_visitor(test_call_nonconst_member_visitor{}, v); + +#ifdef HAS_CPP14_SUPPORT + apply_visitor([](auto& obj) + { + tag::dump("test_call_nonconst_member: lambda"); + obj.foo(); + }, v); +#endif +} + +void test_lambda_overloads_sfinae() +#ifdef HAS_CPP14_SUPPORT +{ + variant> var; + + auto visitor = make_visitor([](auto range) -> decltype(std::begin(range), void()) { + for (auto each : range) + std::cout << each << ' '; }, + [](auto x) -> decltype(std::cout << x, void()) { + std::cout << x << std::endl; + }); + + var = 1; + apply_visitor(visitor, var); + + var = 2.f; + apply_visitor(visitor, var); + + var = std::vector{4, 5, 6}; + apply_visitor(visitor, var); +} +#else +{ +} +#endif + +void test_match_singleton() +{ + variant singleton = 5; + singleton.match([](int) {}); + + auto lambda = [](int) {}; + singleton.match(lambda); +} + +void test_match_overloads() +{ + Either rv; + + rv = Response{}; + + rv.match([](Response) { std::cout << "Response\n"; }, // + [](Error) { std::cout << "Error\n"; }); // +} + +void test_match_overloads_capture() +{ + Either rv; + + rv = Error{}; + + int ok = 0; + int err = 0; + + rv.match([&](Response) { ok += 1; }, // + [&](Error) { err += 1; }); // + + std::cout << "Got " << ok << " ok, " << err << " err" << std::endl; +} + +struct MovableOnly +{ + MovableOnly() = default; + + MovableOnly(MovableOnly&&) = default; + MovableOnly& operator=(MovableOnly&&) = default; +}; + +struct MovableCopyable +{ + MovableCopyable() = default; + + MovableCopyable(MovableCopyable&&) = default; + MovableCopyable& operator=(MovableCopyable&&) = default; + + MovableCopyable(const MovableCopyable&) = default; + MovableCopyable& operator=(const MovableCopyable&) = default; +}; + +void test_match_overloads_init_capture() +#ifdef HAS_CPP14_SUPPORT +{ + Either rv; + + rv = Error{}; + + rv.match([p = MovableOnly{}](auto&&) {}); + { + auto lambda = [p = MovableCopyable{}](auto&&) {}; + rv.match(lambda); + + rv.match([p = MovableOnly{}](Response) { std::cout << "Response\n"; }, + [p = MovableOnly{}](Error) { std::cout << "Error\n"; }); + } + { + auto lambda = [](Error) { std::cout << "Error\n"; }; + rv.match([p = MovableOnly{}](Response) { std::cout << "Response\n"; }, + lambda); + rv.match(lambda, + [p = MovableOnly{}](Response) { std::cout << "Response\n"; }); + } +} +#else +{ +} +#endif + +// See #140 +void test_match_overloads_otherwise() +#ifdef HAS_CPP14_SUPPORT +{ + + struct Center + { + }; + struct Indent + { + }; + struct Justify + { + }; + struct None + { + }; + + using Properties = mapbox::util::variant; + + Properties props = Justify{}; + + props.match([&](Center) { std::cout << "Center\n"; }, // + [&](Indent) { std::cout << "Indent\n"; }, // + [&](auto&&) { std::cout << "Otherwise\n"; }); // +} +#else +{ +} +#endif + +template +struct Moveable +{ + Moveable() = default; // Default constructible + + Moveable(const Moveable&) = delete; // Disable copy ctor + Moveable& operator=(const Moveable&) = delete; // Disable copy assign op + + Moveable(Moveable&&) = default; // Enable move ctor + Moveable& operator=(Moveable&&) = default; // Enable move assign op +}; + +void test_match_move_out_of_variant() +{ + // Distinguishable at type level + using T1 = Moveable; + using T2 = Moveable; + using T3 = mapbox::util::recursive_wrapper; + + mapbox::util::variant v = T1{}; + + std::move(v).match([](T1&&) {}, // Consume T1 by value + [](T2&&) {}); // Consume T2 by value + + mapbox::util::variant w = T2{}; + + std::move(w).match([](int&&) {}, // Consume unwrapped int + [](T2&&) {}); // Consume T2 by value +} + +int main() +{ + test_lambda_overloads(); + test_singleton_variant(); + test_call_nonconst_member(); + test_lambda_overloads_capture(); + test_lambda_overloads_sfinae(); + + test_match_singleton(); + test_match_overloads(); + test_match_overloads_capture(); + test_match_overloads_init_capture(); + test_match_overloads_otherwise(); + test_match_move_out_of_variant(); +} + +#undef HAS_CPP14_SUPPORT diff --git a/test/our_variant_hello_world.cpp b/test/our_variant_hello_world.cpp index be5996b59da..07aeb6241a2 100644 --- a/test/our_variant_hello_world.cpp +++ b/test/our_variant_hello_world.cpp @@ -1,4 +1,4 @@ -#include "variant.hpp" +#include #include diff --git a/test/recursive_wrapper_test.cpp b/test/recursive_wrapper_test.cpp index 0492af4c8e0..2d9f5f9d59e 100644 --- a/test/recursive_wrapper_test.cpp +++ b/test/recursive_wrapper_test.cpp @@ -1,13 +1,12 @@ - #include #include #include #include #include -#include +#include "auto_cpu_timer.hpp" -#include "variant.hpp" +#include using namespace mapbox; @@ -64,12 +63,12 @@ struct calculator int operator()(binary_op const& binary) const { - return util::apply_visitor(calculator(), binary.left) + util::apply_visitor(calculator(), binary.right); + return util::apply_visitor(*this, binary.left) + util::apply_visitor(*this, binary.right); } int operator()(binary_op const& binary) const { - return util::apply_visitor(calculator(), binary.left) - util::apply_visitor(calculator(), binary.right); + return util::apply_visitor(*this, binary.left) - util::apply_visitor(*this, binary.right); } }; @@ -83,12 +82,12 @@ struct to_string std::string operator()(binary_op const& binary) const { - return util::apply_visitor(to_string(), binary.left) + std::string("+") + util::apply_visitor(to_string(), binary.right); + return util::apply_visitor(*this, binary.left) + std::string("+") + util::apply_visitor(*this, binary.right); } std::string operator()(binary_op const& binary) const { - return util::apply_visitor(to_string(), binary.left) + std::string("-") + util::apply_visitor(to_string(), binary.right); + return util::apply_visitor(*this, binary.left) + std::string("-") + util::apply_visitor(*this, binary.right); } }; @@ -111,7 +110,7 @@ int main(int argc, char** argv) int total = 0; { - boost::timer::auto_cpu_timer t; + auto_cpu_timer t; for (std::size_t i = 0; i < NUM_ITER; ++i) { total += util::apply_visitor(test::calculator(), result); diff --git a/test/reference_wrapper_test.cpp b/test/reference_wrapper_test.cpp index dc1209fe62c..3b2085a7a04 100644 --- a/test/reference_wrapper_test.cpp +++ b/test/reference_wrapper_test.cpp @@ -6,7 +6,7 @@ #include #include -#include "variant.hpp" +#include using namespace mapbox; @@ -41,9 +41,12 @@ struct print void operator()(line_string const& line) const { std::cerr << "Line("; + bool first = true; for (auto const& pt : line) { - std::cerr << pt.x << " " << pt.y << ","; + if (!first) std::cerr << ","; + std::cerr << pt.x << " " << pt.y; + if (first) first = false; } std::cerr << ")" << std::endl; } diff --git a/test/t/binary_visitor_1.cpp b/test/t/binary_visitor_1.cpp index 298a40bc0af..357922675a5 100644 --- a/test/t/binary_visitor_1.cpp +++ b/test/t/binary_visitor_1.cpp @@ -1,5 +1,5 @@ -#include "variant.hpp" +#include #define NAME_EXT " i-d" using variant_type = mapbox::util::variant; diff --git a/test/t/binary_visitor_2.cpp b/test/t/binary_visitor_2.cpp index 33768b60175..9863ac5a81c 100644 --- a/test/t/binary_visitor_2.cpp +++ b/test/t/binary_visitor_2.cpp @@ -1,5 +1,5 @@ -#include "variant.hpp" +#include #define NAME_EXT " b-i-d" using variant_type = mapbox::util::variant; diff --git a/test/t/binary_visitor_3.cpp b/test/t/binary_visitor_3.cpp index d35af4e3395..a1c367eb0c4 100644 --- a/test/t/binary_visitor_3.cpp +++ b/test/t/binary_visitor_3.cpp @@ -1,5 +1,5 @@ -#include "variant.hpp" +#include #define NAME_EXT " i-d-b" using variant_type = mapbox::util::variant; diff --git a/test/t/binary_visitor_4.cpp b/test/t/binary_visitor_4.cpp index daacc1bb87e..8cc66ab5984 100644 --- a/test/t/binary_visitor_4.cpp +++ b/test/t/binary_visitor_4.cpp @@ -1,5 +1,5 @@ -#include "variant.hpp" +#include #define NAME_EXT " b-i-d-c" using variant_type = mapbox::util::variant; diff --git a/test/t/binary_visitor_5.cpp b/test/t/binary_visitor_5.cpp index 28669be07db..f6673c88784 100644 --- a/test/t/binary_visitor_5.cpp +++ b/test/t/binary_visitor_5.cpp @@ -1,5 +1,5 @@ -#include "variant.hpp" +#include #define NAME_EXT " b-i-c-d-i" using variant_type = mapbox::util::variant; diff --git a/test/t/binary_visitor_6.cpp b/test/t/binary_visitor_6.cpp index c881b0f361b..d259d739639 100644 --- a/test/t/binary_visitor_6.cpp +++ b/test/t/binary_visitor_6.cpp @@ -1,5 +1,5 @@ -#include "variant.hpp" +#include #define NAME_EXT " b-i-i-d-c-u" using variant_type = mapbox::util::variant; diff --git a/test/t/binary_visitor_impl.hpp b/test/t/binary_visitor_impl.hpp index 4d9a43fe8df..4ee1f08e770 100644 --- a/test/t/binary_visitor_impl.hpp +++ b/test/t/binary_visitor_impl.hpp @@ -3,7 +3,7 @@ #include "catch.hpp" -#include "variant_io.hpp" +#include struct add_visitor { @@ -160,8 +160,8 @@ struct swap_visitor { using T = typename std::common_type::type; T tmp = a; - a = b; - b = tmp; + a = static_cast(b); + b = static_cast(tmp); } }; diff --git a/test/t/issue122.cpp b/test/t/issue122.cpp new file mode 100644 index 00000000000..12de7d54e8f --- /dev/null +++ b/test/t/issue122.cpp @@ -0,0 +1,20 @@ +#include "catch.hpp" + +#include +#include + +// https://github.com/mapbox/variant/issues/122 + +struct X +{ + template + X(const ValueType&) {} +}; + + +TEST_CASE("Correctly choose appropriate constructor", "[variant]") +{ + mapbox::util::variant a{123}; + decltype(a) b(a); + REQUIRE(a.which() == b.which()); +} diff --git a/test/t/issue21.cpp b/test/t/issue21.cpp index b952313963d..4e6be8a6f7a 100644 --- a/test/t/issue21.cpp +++ b/test/t/issue21.cpp @@ -1,8 +1,7 @@ - #include "catch.hpp" -#include "variant.hpp" -#include "variant_io.hpp" +#include +#include // https://github.com/mapbox/variant/issues/21 @@ -11,6 +10,12 @@ static int count; struct t1 { int value; + + t1(t1 const& rhs) + : value(rhs.value) + { + ++count; + } t1(int v) : value(v) { ++count; @@ -37,12 +42,11 @@ TEST_CASE("set() works cleanly even if the constructor throws ", "[variant]") count = 0; { - variant_type v{42}; + t1 obj{42}; + variant_type v = obj; REQUIRE(v.is()); REQUIRE(v.get().value == 42); - REQUIRE_THROWS({ - v.set(13); - }); + REQUIRE_THROWS(v.set(13)); } REQUIRE(count == 0); } diff --git a/test/t/mutating_visitor.cpp b/test/t/mutating_visitor.cpp index f07afb82a90..cd4f162eb25 100644 --- a/test/t/mutating_visitor.cpp +++ b/test/t/mutating_visitor.cpp @@ -1,8 +1,8 @@ #include "catch.hpp" -#include "variant.hpp" -#include "variant_io.hpp" +#include +#include #include diff --git a/test/t/nothrow_move.cpp b/test/t/nothrow_move.cpp new file mode 100644 index 00000000000..b41c8fe9b28 --- /dev/null +++ b/test/t/nothrow_move.cpp @@ -0,0 +1,66 @@ +#include +#include + +#include + +using namespace mapbox; + +namespace test { + +struct t_noexcept_true_1 { + t_noexcept_true_1(t_noexcept_true_1&&) noexcept = default; + t_noexcept_true_1& operator=(t_noexcept_true_1&&) noexcept = default; +}; + +struct t_noexcept_true_2 { + t_noexcept_true_2(t_noexcept_true_2&&) noexcept = default; + t_noexcept_true_2& operator=(t_noexcept_true_2&&) noexcept = default; +}; + +struct t_noexcept_false_1 { + t_noexcept_false_1(t_noexcept_false_1&&) noexcept(false) {} + t_noexcept_false_1& operator=(t_noexcept_false_1&&) noexcept(false) { return *this; } +}; + +using should_be_no_throw_copyable = util::variant; +static_assert(std::is_nothrow_move_assignable::value, + "variants with no-throw move assignable types should be " + "no-throw move nothrow assignable"); + +using should_be_no_throw_assignable = util::variant; +static_assert(std::is_nothrow_move_constructible::value, + "variants with no-throw move assignable types should be " + "no-throw move nothrow assignable"); + +using should_not_be_no_throw_copyable = util::variant; +static_assert(not std::is_nothrow_move_assignable::value, + "variants with no-throw move assignable types should be " + "no-throw move nothrow assignable"); + +using should_not_be_no_throw_assignable = util::variant; +static_assert(not std::is_nothrow_move_constructible::value, + "variants with no-throw move assignable types should be " + "no-throw move nothrow assignable"); + + +// this type cannot be nothrow converted from either of its types, even the nothrow moveable one, +// because the conversion operator moves the whole variant. +using convertable_test_type = util::variant; + +// this type can be nothrow converted from either of its types. +using convertable_test_type_2 = util::variant; + +static_assert(not std::is_nothrow_assignable::value, + "variants with noexcept(true) move constructible types should be nothrow-convertible " + "from those types only IF the variant itself is nothrow_move_assignable"); + +static_assert(not std::is_nothrow_assignable::value, + "variants with noexcept(false) move constructible types should not be nothrow-convertible " + "from those types"); + +static_assert(std::is_nothrow_assignable::value, + "variants with noexcept(true) move constructible types should be nothrow-convertible " + "from those types only IF the variant itself is nothrow_move_assignable"); + + +} // namespace test diff --git a/test/t/optional.cpp b/test/t/optional.cpp index b77bedaa417..4f77a0af9c5 100644 --- a/test/t/optional.cpp +++ b/test/t/optional.cpp @@ -1,7 +1,6 @@ - #include "catch.hpp" -#include "optional.hpp" +#include struct dummy { @@ -97,6 +96,8 @@ TEST_CASE("self assignment", "[optional]") a = 1; REQUIRE(a.get() == 1); +#if !defined(__clang__) a = a; REQUIRE(a.get() == 1); +#endif } diff --git a/test/t/recursive_wrapper.cpp b/test/t/recursive_wrapper.cpp index b2dec455f54..0a6848da82a 100644 --- a/test/t/recursive_wrapper.cpp +++ b/test/t/recursive_wrapper.cpp @@ -1,7 +1,7 @@ - #include "catch.hpp" -#include "recursive_wrapper.hpp" +#include +#include #include #include @@ -153,6 +153,33 @@ TEST_CASE("recursive wrapper of pair") b = std::move(c); REQUIRE(b.get().first == 5); REQUIRE(b.get().second == 6); - // REQUIRE(c.get_pointer() == nullptr); + //REQUIRE(c.get_pointer() == nullptr); + } + + SECTION("Multiple recurssive wrappers of polymorphic types") + { + // https://github.com/mapbox/variant/issues/146 + // (Visual Studio 2015 update 3) + using namespace mapbox::util; + struct Base; + struct Derived; + using Variant = variant, recursive_wrapper>; + struct Base { }; + struct Derived : public Base { }; + { + Base base; + Derived derived; + Variant v; + v = base; + v = derived; // compile error prior https://github.com/mapbox/variant/pull/147 + CHECK(v.is()); + } + { + Derived derived; + Variant v(derived); // compile error prior https://github.com/mapbox/variant/pull/147 + CHECK(v.is()); + } + + } } diff --git a/test/t/sizeof.cpp b/test/t/sizeof.cpp index 0e74ce58e2f..72314e2b8ac 100644 --- a/test/t/sizeof.cpp +++ b/test/t/sizeof.cpp @@ -1,12 +1,11 @@ - #include #include #include #include "catch.hpp" -#include "variant.hpp" -#include "variant_io.hpp" +#include +#include struct some_struct { @@ -15,7 +14,7 @@ struct some_struct std::string c; }; -using variant_internal_index_type = size_t; +using variant_internal_index_type = mapbox::util::type_index_t; TEST_CASE("size of variants") { diff --git a/test/t/unary_visitor.cpp b/test/t/unary_visitor.cpp index 8df61104fd1..e447bfa42c9 100644 --- a/test/t/unary_visitor.cpp +++ b/test/t/unary_visitor.cpp @@ -1,8 +1,8 @@ #include "catch.hpp" -#include "variant.hpp" -#include "variant_io.hpp" +#include +#include #include diff --git a/test/t/variant.cpp b/test/t/variant.cpp index 36655a50153..2c6d6669d31 100644 --- a/test/t/variant.cpp +++ b/test/t/variant.cpp @@ -1,7 +1,7 @@ #include "catch.hpp" -#include "variant.hpp" -#include "variant_io.hpp" +#include +#include #include #include @@ -208,9 +208,7 @@ TEST_CASE("get with wrong type (here: double) should throw", "[variant]") REQUIRE(var.is()); REQUIRE_FALSE(var.is()); REQUIRE(var.get() == 5); - REQUIRE_THROWS_AS({ - var.get(); - }, + REQUIRE_THROWS_AS(var.get(), mapbox::util::bad_variant_access&); } @@ -222,13 +220,9 @@ TEST_CASE("get with wrong type (here: int) should throw", "[variant]") REQUIRE_FALSE(var.is()); REQUIRE(var.get() == 5.0); REQUIRE(mapbox::util::get(var) == 5.0); - REQUIRE_THROWS_AS({ - var.get(); - }, + REQUIRE_THROWS_AS(var.get(), mapbox::util::bad_variant_access&); - REQUIRE_THROWS_AS({ - mapbox::util::get(var); - }, + REQUIRE_THROWS_AS(mapbox::util::get(var), mapbox::util::bad_variant_access&); } @@ -240,26 +234,18 @@ TEST_CASE("get on const varint with wrong type (here: int) should throw", "[vari REQUIRE_FALSE(var.is()); REQUIRE(var.get() == 5.0); REQUIRE(mapbox::util::get(var) == 5.0); - REQUIRE_THROWS_AS({ - var.get(); - }, + REQUIRE_THROWS_AS(var.get(), mapbox::util::bad_variant_access&); - REQUIRE_THROWS_AS({ - mapbox::util::get(var); - }, + REQUIRE_THROWS_AS(mapbox::util::get(var), mapbox::util::bad_variant_access&); } TEST_CASE("get with any type should throw if not initialized", "[variant]") { mapbox::util::variant var{mapbox::util::no_init()}; - REQUIRE_THROWS_AS({ - var.get(); - }, + REQUIRE_THROWS_AS(var.get(), mapbox::util::bad_variant_access&); - REQUIRE_THROWS_AS({ - var.get(); - }, + REQUIRE_THROWS_AS(var.get(), mapbox::util::bad_variant_access&); } @@ -273,16 +259,12 @@ TEST_CASE("no_init variant can be copied and moved from", "[variant]") REQUIRE(v2.get() == 42); v2 = v1; - REQUIRE_THROWS_AS({ - v2.get(); - }, + REQUIRE_THROWS_AS(v2.get(), mapbox::util::bad_variant_access&); REQUIRE(v3.get() == 23); v3 = std::move(v1); - REQUIRE_THROWS_AS({ - v3.get(); - }, + REQUIRE_THROWS_AS(v3.get(), mapbox::util::bad_variant_access&); } @@ -294,9 +276,7 @@ TEST_CASE("no_init variant can be copied and moved to", "[variant]") variant_type v2{mapbox::util::no_init()}; variant_type v3{mapbox::util::no_init()}; - REQUIRE_THROWS_AS({ - v2.get(); - }, + REQUIRE_THROWS_AS(v2.get(), mapbox::util::bad_variant_access&); REQUIRE(v1.get() == 42); @@ -304,9 +284,7 @@ TEST_CASE("no_init variant can be copied and moved to", "[variant]") REQUIRE(v2.get() == 42); REQUIRE(v1.get() == 42); - REQUIRE_THROWS_AS({ - v3.get(); - }, + REQUIRE_THROWS_AS(v3.get(), mapbox::util::bad_variant_access&); v3 = std::move(v1); @@ -325,11 +303,9 @@ TEST_CASE("implicit conversion", "[variant][implicit conversion]") TEST_CASE("implicit conversion to first type in variant type list", "[variant][implicit conversion]") { using variant_type = mapbox::util::variant; - variant_type var = 5.0; // converted to long + variant_type var = 5l; // converted to long REQUIRE(var.get() == 5); - REQUIRE_THROWS_AS({ - var.get(); - }, + REQUIRE_THROWS_AS(var.get(), mapbox::util::bad_variant_access&); } @@ -498,13 +474,9 @@ TEST_CASE("storing reference wrappers works") variant_type v{std::ref(a)}; REQUIRE(v.get() == 1); REQUIRE(mapbox::util::get(v) == 1); - REQUIRE_THROWS_AS({ - v.get(); - }, + REQUIRE_THROWS_AS(v.get(), mapbox::util::bad_variant_access&); - REQUIRE_THROWS_AS({ - mapbox::util::get(v); - }, + REQUIRE_THROWS_AS(mapbox::util::get(v), mapbox::util::bad_variant_access&); a = 2; REQUIRE(v.get() == 2); @@ -515,13 +487,9 @@ TEST_CASE("storing reference wrappers works") v = std::ref(b); REQUIRE(v.get() == Approx(3.141)); REQUIRE(mapbox::util::get(v) == Approx(3.141)); - REQUIRE_THROWS_AS({ - v.get(); - }, + REQUIRE_THROWS_AS(v.get(), mapbox::util::bad_variant_access&); - REQUIRE_THROWS_AS({ - mapbox::util::get(v); - }, + REQUIRE_THROWS_AS(mapbox::util::get(v), mapbox::util::bad_variant_access&); b = 2.718; REQUIRE(v.get() == Approx(2.718)); @@ -530,9 +498,7 @@ TEST_CASE("storing reference wrappers works") v.get() = 4.1; REQUIRE(b == Approx(4.1)); - REQUIRE_THROWS_AS({ - v.get() = 4; - }, + REQUIRE_THROWS_AS(v.get() = 4, mapbox::util::bad_variant_access&); } @@ -543,28 +509,43 @@ TEST_CASE("storing reference wrappers to consts works") int a = 1; variant_type v{std::cref(a)}; REQUIRE(v.get() == 1); - REQUIRE(v.get() == 1); // this works (see #82) + REQUIRE(v.get() == 1); REQUIRE(mapbox::util::get(v) == 1); - // REQUIRE(mapbox::util::get(v) == 1); // this doesn't work (see #82) - REQUIRE_THROWS_AS({ - v.get(); - }, + REQUIRE(mapbox::util::get(v) == 1); + REQUIRE_THROWS_AS(v.get(), mapbox::util::bad_variant_access&); - REQUIRE_THROWS_AS({ - mapbox::util::get(v); - }, + REQUIRE_THROWS_AS(mapbox::util::get(v), mapbox::util::bad_variant_access&); double b = 3.141; v = std::cref(b); REQUIRE(v.get() == Approx(3.141)); REQUIRE(mapbox::util::get(v) == Approx(3.141)); - REQUIRE_THROWS_AS({ - v.get(); - }, + REQUIRE_THROWS_AS(v.get(), mapbox::util::bad_variant_access&); - REQUIRE_THROWS_AS({ - mapbox::util::get(v); - }, + REQUIRE_THROWS_AS(mapbox::util::get(v), mapbox::util::bad_variant_access&); } + +TEST_CASE("recursive wrapper") +{ + using variant_type = mapbox::util::variant>; + variant_type v(1); + REQUIRE(v.is()); + REQUIRE(v.get() == 1); +} + + +TEST_CASE("variant : direct_type helper should match T, references (T&) and const references (T const&) to the original type T)") +{ + using value = mapbox::util::variant; + + std::uint64_t u(1234); + REQUIRE(value(u).is()); // matches T + + std::uint64_t& ur(u); + REQUIRE(value(ur).is()); // matches T& + + std::uint64_t const& ucr(u); + REQUIRE(value(ucr).is()); // matches T const& +} diff --git a/test/t/variant_alternative.cpp b/test/t/variant_alternative.cpp new file mode 100644 index 00000000000..eedfe5cfc29 --- /dev/null +++ b/test/t/variant_alternative.cpp @@ -0,0 +1,31 @@ +#include "catch.hpp" + +#include +#include + +#include + +TEST_CASE("variant_alternative", "[types]") +{ + using variant_type = mapbox::util::variant; + using type_0 = mapbox::util::variant_alternative<0, variant_type>::type; + using type_1 = mapbox::util::variant_alternative<1, variant_type>::type; + using type_2 = mapbox::util::variant_alternative<2, variant_type>::type; + //using type_3 = mapbox::util::variant_alternative<3, variant_type>::type; // compile error + constexpr bool check_0 = std::is_same::value; + constexpr bool check_1 = std::is_same::value; + constexpr bool check_2 = std::is_same::value; + CHECK(check_0); + CHECK(check_1); + CHECK(check_2); +} + +TEST_CASE("variant_size", "[types]") +{ + constexpr auto value_0 = mapbox::util::variant_size>::value; + constexpr auto value_1 = mapbox::util::variant_size>::value; + constexpr auto value_2 = mapbox::util::variant_size>::value; + CHECK(value_0 == 0); + CHECK(value_1 == 1); + CHECK(value_2 == 2); +} diff --git a/test/t/visitor_result_type.cpp b/test/t/visitor_result_type.cpp new file mode 100644 index 00000000000..f673ae4cb4c --- /dev/null +++ b/test/t/visitor_result_type.cpp @@ -0,0 +1,52 @@ +#include + +using namespace mapbox::util; + +namespace { + +template +struct tag {}; + +struct deduced_result_visitor +{ + template + tag operator() (T); + + template + tag operator() (T) const; + + template + tag operator() (T, U); + + template + tag operator() (T, U) const; +}; + +struct explicit_result_visitor : deduced_result_visitor +{ + using result_type = tag; +}; + +// Doing this compile-time test via assignment to typed tag objects gives +// more useful error messages when something goes wrong, than std::is_same +// in a static_assert would. Here if result_of_unary_visit returns anything +// other than the expected type on the left hand side, the conversion error +// message will tell you exactly what it was. + +#ifdef __clang__ +# pragma clang diagnostic ignored "-Wunused-variable" +#endif + +tag d1m = detail::result_of_unary_visit{}; +tag d1c = detail::result_of_unary_visit{}; + +tag e1m = detail::result_of_unary_visit{}; +tag e1c = detail::result_of_unary_visit{}; + +tag d2m = detail::result_of_binary_visit{}; +tag d2c = detail::result_of_binary_visit{}; + +tag e2m = detail::result_of_binary_visit{}; +tag e2c = detail::result_of_binary_visit{}; + +} // namespace diff --git a/test/unique_ptr_test.cpp b/test/unique_ptr_test.cpp index 6578991ca4a..f0759000329 100644 --- a/test/unique_ptr_test.cpp +++ b/test/unique_ptr_test.cpp @@ -6,9 +6,9 @@ #include #include -#include +#include "auto_cpu_timer.hpp" -#include "variant.hpp" +#include using namespace mapbox; @@ -112,7 +112,7 @@ int main(int argc, char** argv) int total = 0; { - boost::timer::auto_cpu_timer t; + auto_cpu_timer t; for (std::size_t i = 0; i < NUM_ITER; ++i) { total += util::apply_visitor(test::calculator(), result); diff --git a/variant.gyp b/variant.gyp index b1f3801f2b5..7d7dca8df23 100644 --- a/variant.gyp +++ b/variant.gyp @@ -27,7 +27,7 @@ "SUPPORTED_PLATFORMS":["macosx"] }, "include_dirs": [ - "./", + "./include", "test/include" ] } diff --git a/variant.hpp b/variant.hpp deleted file mode 100644 index db5d3c86b58..00000000000 --- a/variant.hpp +++ /dev/null @@ -1,901 +0,0 @@ -#ifndef MAPBOX_UTIL_VARIANT_HPP -#define MAPBOX_UTIL_VARIANT_HPP - -#include -#include // size_t -#include // operator new -#include // runtime_error -#include -#include -#include -#include -#include - -#include "recursive_wrapper.hpp" - -// clang-format off -// [[deprecated]] is only available in C++14, use this for the time being -#if __cplusplus <= 201103L -# ifdef __GNUC__ -# define MAPBOX_VARIANT_DEPRECATED __attribute__((deprecated)) -# elif defined(_MSC_VER) -# define MAPBOX_VARIANT_DEPRECATED __declspec(deprecated) -# else -# define MAPBOX_VARIANT_DEPRECATED -# endif -#else -# define MAPBOX_VARIANT_DEPRECATED [[deprecated]] -#endif - - -#ifdef _MSC_VER - // https://msdn.microsoft.com/en-us/library/bw1hbe6y.aspx - #ifdef NDEBUG - #define VARIANT_INLINE __forceinline - #else - #define VARIANT_INLINE __declspec(noinline) - #endif -#else - #ifdef NDEBUG - #define VARIANT_INLINE inline __attribute__((always_inline)) - #else - #define VARIANT_INLINE __attribute__((noinline)) - #endif -#endif -// clang-format on - -#define VARIANT_MAJOR_VERSION 1 -#define VARIANT_MINOR_VERSION 1 -#define VARIANT_PATCH_VERSION 0 - -#define VARIANT_VERSION (VARIANT_MAJOR_VERSION * 100000) + (VARIANT_MINOR_VERSION * 100) + (VARIANT_PATCH_VERSION) - -namespace mapbox { -namespace util { - -// XXX This should derive from std::logic_error instead of std::runtime_error. -// See https://github.com/mapbox/variant/issues/48 for details. -class bad_variant_access : public std::runtime_error -{ - - public: - explicit bad_variant_access(const std::string& what_arg) - : runtime_error(what_arg) {} - - explicit bad_variant_access(const char* what_arg) - : runtime_error(what_arg) {} - -}; // class bad_variant_access - -template -struct MAPBOX_VARIANT_DEPRECATED static_visitor -{ - using result_type = R; - - protected: - static_visitor() {} - ~static_visitor() {} -}; - -namespace detail { - -static constexpr std::size_t invalid_value = std::size_t(-1); - -template -struct direct_type; - -template -struct direct_type -{ - static constexpr std::size_t index = std::is_same::value - ? sizeof...(Types) - : direct_type::index; -}; - -template -struct direct_type -{ - static constexpr std::size_t index = invalid_value; -}; - -template -struct convertible_type; - -template -struct convertible_type -{ - static constexpr std::size_t index = std::is_convertible::value - ? sizeof...(Types) - : convertible_type::index; -}; - -template -struct convertible_type -{ - static constexpr std::size_t index = invalid_value; -}; - -template -struct value_traits -{ - using value_type = typename std::remove_reference::type; - static constexpr std::size_t direct_index = direct_type::index; - static constexpr bool is_direct = direct_index != invalid_value; - static constexpr std::size_t index = is_direct ? direct_index : convertible_type::index; - static constexpr bool is_valid = index != invalid_value; - static constexpr std::size_t tindex = is_valid ? sizeof...(Types)-index : 0; - using target_type = typename std::tuple_element>::type; -}; - -// check if T is in Types... -template -struct has_type; - -template -struct has_type -{ - static constexpr bool value = std::is_same::value || has_type::value; -}; - -template -struct has_type : std::false_type -{ -}; - -template -struct is_valid_type; - -template -struct is_valid_type -{ - static constexpr bool value = std::is_convertible::value || is_valid_type::value; -}; - -template -struct is_valid_type : std::false_type -{ -}; - -template -struct enable_if_type -{ - using type = R; -}; - -template -struct result_of_unary_visit -{ - using type = typename std::result_of::type; -}; - -template -struct result_of_unary_visit::type> -{ - using type = typename F::result_type; -}; - -template -struct result_of_binary_visit -{ - using type = typename std::result_of::type; -}; - -template -struct result_of_binary_visit::type> -{ - using type = typename F::result_type; -}; - -template -struct static_max; - -template -struct static_max -{ - static const std::size_t value = arg; -}; - -template -struct static_max -{ - static const std::size_t value = arg1 >= arg2 ? static_max::value : static_max::value; -}; - -template -struct variant_helper; - -template -struct variant_helper -{ - VARIANT_INLINE static void destroy(const std::size_t type_index, void* data) - { - if (type_index == sizeof...(Types)) - { - reinterpret_cast(data)->~T(); - } - else - { - variant_helper::destroy(type_index, data); - } - } - - VARIANT_INLINE static void move(const std::size_t old_type_index, void* old_value, void* new_value) - { - if (old_type_index == sizeof...(Types)) - { - new (new_value) T(std::move(*reinterpret_cast(old_value))); - } - else - { - variant_helper::move(old_type_index, old_value, new_value); - } - } - - VARIANT_INLINE static void copy(const std::size_t old_type_index, const void* old_value, void* new_value) - { - if (old_type_index == sizeof...(Types)) - { - new (new_value) T(*reinterpret_cast(old_value)); - } - else - { - variant_helper::copy(old_type_index, old_value, new_value); - } - } -}; - -template <> -struct variant_helper<> -{ - VARIANT_INLINE static void destroy(const std::size_t, void*) {} - VARIANT_INLINE static void move(const std::size_t, void*, void*) {} - VARIANT_INLINE static void copy(const std::size_t, const void*, void*) {} -}; - -template -struct unwrapper -{ - static T const& apply_const(T const& obj) { return obj; } - static T& apply(T& obj) { return obj; } -}; - -template -struct unwrapper> -{ - static auto apply_const(recursive_wrapper const& obj) - -> typename recursive_wrapper::type const& - { - return obj.get(); - } - static auto apply(recursive_wrapper& obj) - -> typename recursive_wrapper::type& - { - return obj.get(); - } -}; - -template -struct unwrapper> -{ - static auto apply_const(std::reference_wrapper const& obj) - -> typename std::reference_wrapper::type const& - { - return obj.get(); - } - static auto apply(std::reference_wrapper& obj) - -> typename std::reference_wrapper::type& - { - return obj.get(); - } -}; - -template -struct dispatcher; - -template -struct dispatcher -{ - VARIANT_INLINE static R apply_const(V const& v, F&& f) - { - if (v.template is()) - { - return f(unwrapper::apply_const(v.template get())); - } - else - { - return dispatcher::apply_const(v, std::forward(f)); - } - } - - VARIANT_INLINE static R apply(V& v, F&& f) - { - if (v.template is()) - { - return f(unwrapper::apply(v.template get())); - } - else - { - return dispatcher::apply(v, std::forward(f)); - } - } -}; - -template -struct dispatcher -{ - VARIANT_INLINE static R apply_const(V const& v, F&& f) - { - return f(unwrapper::apply_const(v.template get())); - } - - VARIANT_INLINE static R apply(V& v, F&& f) - { - return f(unwrapper::apply(v.template get())); - } -}; - -template -struct binary_dispatcher_rhs; - -template -struct binary_dispatcher_rhs -{ - VARIANT_INLINE static R apply_const(V const& lhs, V const& rhs, F&& f) - { - if (rhs.template is()) // call binary functor - { - return f(unwrapper::apply_const(lhs.template get()), - unwrapper::apply_const(rhs.template get())); - } - else - { - return binary_dispatcher_rhs::apply_const(lhs, rhs, std::forward(f)); - } - } - - VARIANT_INLINE static R apply(V& lhs, V& rhs, F&& f) - { - if (rhs.template is()) // call binary functor - { - return f(unwrapper::apply(lhs.template get()), - unwrapper::apply(rhs.template get())); - } - else - { - return binary_dispatcher_rhs::apply(lhs, rhs, std::forward(f)); - } - } -}; - -template -struct binary_dispatcher_rhs -{ - VARIANT_INLINE static R apply_const(V const& lhs, V const& rhs, F&& f) - { - return f(unwrapper::apply_const(lhs.template get()), - unwrapper::apply_const(rhs.template get())); - } - - VARIANT_INLINE static R apply(V& lhs, V& rhs, F&& f) - { - return f(unwrapper::apply(lhs.template get()), - unwrapper::apply(rhs.template get())); - } -}; - -template -struct binary_dispatcher_lhs; - -template -struct binary_dispatcher_lhs -{ - VARIANT_INLINE static R apply_const(V const& lhs, V const& rhs, F&& f) - { - if (lhs.template is()) // call binary functor - { - return f(unwrapper::apply_const(lhs.template get()), - unwrapper::apply_const(rhs.template get())); - } - else - { - return binary_dispatcher_lhs::apply_const(lhs, rhs, std::forward(f)); - } - } - - VARIANT_INLINE static R apply(V& lhs, V& rhs, F&& f) - { - if (lhs.template is()) // call binary functor - { - return f(unwrapper::apply(lhs.template get()), - unwrapper::apply(rhs.template get())); - } - else - { - return binary_dispatcher_lhs::apply(lhs, rhs, std::forward(f)); - } - } -}; - -template -struct binary_dispatcher_lhs -{ - VARIANT_INLINE static R apply_const(V const& lhs, V const& rhs, F&& f) - { - return f(unwrapper::apply_const(lhs.template get()), - unwrapper::apply_const(rhs.template get())); - } - - VARIANT_INLINE static R apply(V& lhs, V& rhs, F&& f) - { - return f(unwrapper::apply(lhs.template get()), - unwrapper::apply(rhs.template get())); - } -}; - -template -struct binary_dispatcher; - -template -struct binary_dispatcher -{ - VARIANT_INLINE static R apply_const(V const& v0, V const& v1, F&& f) - { - if (v0.template is()) - { - if (v1.template is()) - { - return f(unwrapper::apply_const(v0.template get()), - unwrapper::apply_const(v1.template get())); // call binary functor - } - else - { - return binary_dispatcher_rhs::apply_const(v0, v1, std::forward(f)); - } - } - else if (v1.template is()) - { - return binary_dispatcher_lhs::apply_const(v0, v1, std::forward(f)); - } - return binary_dispatcher::apply_const(v0, v1, std::forward(f)); - } - - VARIANT_INLINE static R apply(V& v0, V& v1, F&& f) - { - if (v0.template is()) - { - if (v1.template is()) - { - return f(unwrapper::apply(v0.template get()), - unwrapper::apply(v1.template get())); // call binary functor - } - else - { - return binary_dispatcher_rhs::apply(v0, v1, std::forward(f)); - } - } - else if (v1.template is()) - { - return binary_dispatcher_lhs::apply(v0, v1, std::forward(f)); - } - return binary_dispatcher::apply(v0, v1, std::forward(f)); - } -}; - -template -struct binary_dispatcher -{ - VARIANT_INLINE static R apply_const(V const& v0, V const& v1, F&& f) - { - return f(unwrapper::apply_const(v0.template get()), - unwrapper::apply_const(v1.template get())); // call binary functor - } - - VARIANT_INLINE static R apply(V& v0, V& v1, F&& f) - { - return f(unwrapper::apply(v0.template get()), - unwrapper::apply(v1.template get())); // call binary functor - } -}; - -// comparator functors -struct equal_comp -{ - template - bool operator()(T const& lhs, T const& rhs) const - { - return lhs == rhs; - } -}; - -struct less_comp -{ - template - bool operator()(T const& lhs, T const& rhs) const - { - return lhs < rhs; - } -}; - -template -class comparer -{ - public: - explicit comparer(Variant const& lhs) noexcept - : lhs_(lhs) {} - comparer& operator=(comparer const&) = delete; - // visitor - template - bool operator()(T const& rhs_content) const - { - T const& lhs_content = lhs_.template get(); - return Comp()(lhs_content, rhs_content); - } - - private: - Variant const& lhs_; -}; - -// True if Predicate matches for all of the types Ts -template