diff options
| author | Phil Nash | 2013-12-23 10:24:06 +0000 |
|---|---|---|
| committer | Phil Nash | 2013-12-23 10:24:06 +0000 |
| commit | e45e3a139ad46de2a38549d877e2ec0b2be5bdab (patch) | |
| tree | 815e0133368107f434bf2097206219856e2f7035 | |
| parent | 91ef5f7d4024ea96b5bb8d0295443475527ea014 (diff) | |
| download | catch3-e45e3a139ad46de2a38549d877e2ec0b2be5bdab.tar.gz | |
Clara ignores anything after a lone — (double dash)
- this allows use within an environment that appends additional arguments that Clara will otherwise reject
- generated build 23
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | include/internal/catch_version.hpp | 2 | ||||
| -rw-r--r-- | include/internal/clara.h | 3 | ||||
| -rw-r--r-- | single_include/catch.hpp | 9 |
4 files changed, 9 insertions, 7 deletions
@@ -1,6 +1,6 @@  -*v1.0 build 22 (master branch)* +*v1.0 build 23 (master branch)* Build status (on Travis CI) [](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 8b232e99..f615b3ea 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 22, "master" ); + Version libraryVersion( 1, 0, 23, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/include/internal/clara.h b/include/internal/clara.h index 9f736e99..b44d129a 100644 --- a/include/internal/clara.h +++ b/include/internal/clara.h @@ -206,7 +206,8 @@ namespace Clara { }; void parseIntoTokens( int argc, char const * const * argv, std::vector<Parser::Token>& tokens ) const { - for( int i = 1; i < argc; ++i ) + 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<Parser::Token>& tokens ) const { diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 1acc3beb..770b3537 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 22 (master branch) - * Generated: 2013-12-20 19:06:10.591489 + * CATCH v1.0 build 23 (master branch) + * Generated: 2013-12-23 10:22:45.547645 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -3224,7 +3224,8 @@ namespace Clara { }; void parseIntoTokens( int argc, char const * const * argv, std::vector<Parser::Token>& tokens ) const { - for( int i = 1; i < argc; ++i ) + 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<Parser::Token>& tokens ) const { @@ -6178,7 +6179,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 22, "master" ); + Version libraryVersion( 1, 0, 23, "master" ); } // #included from: catch_text.hpp |