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

Backed out dynamic stack array (use fixed size for now)

Commit
c1416d55cbca4f71056dd781fd22157ef7bde819
Author
Phil Nash ·
Parents
2a1f8ae684eb

Files · Download .tar.gz

Changes

 include/external/clara.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/external/clara.hpp b/include/external/clara.hpp
index e46574b4..b5947c8a 100644
--- a/include/external/clara.hpp
+++ b/include/external/clara.hpp
@@ -1142,7 +1142,9 @@ namespace detail {
                 size_t count = 0;
             };
             const size_t totalParsers = m_options.size() + m_args.size();
-            ParserInfo parseInfos[totalParsers];
+            assert( totalParsers < 512 );
+            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
+            ParserInfo parseInfos[512];
             size_t i = 0;
             for( auto const& opt : m_options ) parseInfos[i++].parser = &opt;
             for( auto const& arg : m_args ) parseInfos[i++].parser = &arg;
@@ -1153,7 +1155,8 @@ namespace detail {
             while( result.value().remainingTokens() ) {
                 bool tokenParsed = false;
 
-                for( auto& parseInfo : parseInfos ) {
+                for( size_t i = 0; i < totalParsers; ++i ) {
+                    auto&  parseInfo = parseInfos[i];
                     if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
                         result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
                         if (!result)