Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Fixed issue with different result types in Clara

Commit
e62b3beef431fcb000b07de84a98519d24250ab3
Author
Phil Nash ·
Parents
c41a45e79ced

Files · Download .tar.gz

Changes

 include/external/clara.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/external/clara.hpp b/include/external/clara.hpp
index 1c0a6884..f4ad627f 100644
--- a/include/external/clara.hpp
+++ b/include/external/clara.hpp
@@ -870,16 +870,16 @@ namespace detail {
         using ParserRefImpl::ParserRefImpl;
 
         auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto result = validate();
-            if (!result)
-                return InternalParseResult(result);
+            auto validationResult = validate();
+            if (!validationResult)
+                return InternalParseResult(validationResult);
 
             auto remainingTokens = tokens;
             auto const &token = *remainingTokens;
             if (token.type != TokenType::Argument)
                 return InternalParseResult::ok(ParseState(ParseResultType::NoMatch, remainingTokens));
 
-            result = m_ref->setValue(remainingTokens->token);
+            auto result = m_ref->setValue(remainingTokens->token);
             if (!result)
                 return InternalParseResult(result);
             else