New version of Clara

- Clara now built with new stitch script (based on generateSingleInclude)
- also fixed python scripts for python 3 (print now a function rather than a keyword)

README.md

@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.0 build 26 (master branch)*
+*v1.0 build 27 (master branch)*
 
 Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
 

include/internal/catch_clara.h

@@ -13,8 +13,8 @@
 
 
 // Declare Clara inside the Catch namespace
-#define CLICHE_CLARA_OUTER_NAMESPACE Catch
+#define STITCH_CLARA_OUTER_NAMESPACE Catch
 #include "clara.h"
-#undef CLICHE_CLARA_OUTER_NAMESPACE
+#undef STITCH_CLARA_OUTER_NAMESPACE
 
 #endif // TWOBLUECUBES_CATCH_CLARA_H_INCLUDED

include/internal/catch_option.hpp

@@ -29,9 +29,11 @@ namespace Catch {
         }
 
         Option& operator= ( Option const& _other ) {
-            reset();
+            if( &_other != this ) {
-            if( _other )
+                reset();
-                nullableValue = new( storage ) T( *_other );
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
             return *this;
         }
         Option& operator = ( T const& _value ) {

include/internal/catch_version.hpp

@@ -13,7 +13,7 @@
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 26, "master" );
+    Version libraryVersion( 1, 0, 27, "master" );
 }
 
 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

include/internal/clara.h

@@ -7,31 +7,177 @@
  */
 
 // Only use header guard if we are not using an outer namespace
-#ifndef CLICHE_CLARA_OUTER_NAMESPACE
+#if !defined(TWOBLUECUBES_CLARA_H_INCLUDED) || defined(STITCH_CLARA_OUTER_NAMESPACE)
-# ifdef TWOBLUECUBES_CLARA_H_INCLUDED
+#ifndef STITCH_CLARA_OUTER_NAMESPACE
-#  ifndef TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
+#define TWOBLUECUBES_CLARA_H_INCLUDED
-#   define TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
-#  endif
-# else
-#  define TWOBLUECUBES_CLARA_H_INCLUDED
-# endif
 #endif
-#ifndef TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
 
-#define CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE Clara
+#define STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE Clara
-#include "tbc_text_format.h"
+
-#undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+// ----------- #included from tbc_text_format.h -----------
+
+/*
+ *  Created by Phil on 18/4/2013.
+ *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+// Only use header guard if we are not using an outer namespace
+#if !defined(TBC_TEXT_FORMAT_H_INCLUDED) || defined(STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE)
+#ifndef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+#define TBC_TEXT_FORMAT_H_INCLUDED
+#endif
 
 #include <string>
 #include <vector>
+#include <sstream>
+
+// Use optional outer namespace
+#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
+#endif
+
+namespace Tbc {
+
+#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH
+    const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH;
+#else
+    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 );
+                }
+
+                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 );
+                    }
+                    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 );
+        }
+
+        typedef std::vector<std::string>::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();
+        }
+
+        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;
+        }
+
+    private:
+        std::string str;
+        TextAttributes attr;
+        std::vector<std::string> lines;
+    };
+
+} // end namespace Tbc
+
+#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+} // end outer namespace
+#endif
+
+#endif // TBC_TEXT_FORMAT_H_INCLUDED
+
+// ----------- end of #include from tbc_text_format.h -----------
+// ........... back in /Users/philnash/Dev/OSS/Clara/srcs/clara.h
+
+#undef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+
 #include <map>
 #include <algorithm>
 #include <stdexcept>
 #include <memory>
 
 // Use optional outer namespace
-#ifdef CLICHE_CLARA_OUTER_NAMESPACE
+#ifdef STITCH_CLARA_OUTER_NAMESPACE
-namespace CLICHE_CLARA_OUTER_NAMESPACE {
+namespace STITCH_CLARA_OUTER_NAMESPACE {
 #endif
 
 namespace Clara {
@@ -308,7 +454,7 @@ namespace Clara {
             }
             void validate() const {
                 if( boundField.takesArg() && !takesArg() )
-                    throw std::logic_error( dbgName() + " must specify an arg name" );
+                    throw std::logic_error( "command line argument '" + dbgName() + "' must specify a hint" );
             }
             std::string commands() const {
                 std::ostringstream oss;
@@ -359,8 +505,10 @@ namespace Clara {
             {
                 other.m_cl = NULL;
             }
-            ~ArgBinder() {
+            // !TBD: Need to include workarounds to be able to declare this
-                if( m_cl ) {
+            // destructor as able to throw exceptions
+            ~ArgBinder() /* noexcept(false) */ {
+                if( m_cl && !std::uncaught_exception() ) {
                     m_arg.validate();
                     if( m_arg.isFixedPositional() ) {
                         m_cl->m_positionalArgs.insert( std::make_pair( m_arg.position, m_arg ) );
@@ -505,6 +653,12 @@ namespace Clara {
             return oss.str();
         }
 
+        ConfigT parseInto( int argc, char const * const * argv ) const {
+            ConfigT config;
+            parseInto( argc, argv, config );
+            return config;
+        }
+
         std::vector<Parser::Token> parseInto( int argc, char const * const * argv, ConfigT& config ) const {
             std::string processName = argv[0];
             std::size_t lastSlash = processName.find_last_of( "/\\" );
@@ -615,9 +769,8 @@ namespace Clara {
 
 } // end namespace Clara
 
-#ifdef CLICHE_CLARA_OUTER_NAMESPACE
+#ifdef STITCH_CLARA_OUTER_NAMESPACE
 } // end outer namespace
 #endif
 
-#endif // TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
+#endif // TWOBLUECUBES_CLARA_H_INCLUDED
-

scripts/generateSingleHeader.py

@@ -29,7 +29,7 @@ for arg in sys.argv[1:]:
     arg = string.lower(arg)
     if arg == "nobump":
         bumpVersion = False
-        print "Not bumping version number"
+        print( "Not bumping version number" )
     elif arg == "noimpl":
         includeImpl = False
         bumpVersion = False

single_include/catch.hpp

@@ -1,6 +1,6 @@
 /*
- *  CATCH v1.0 build 26 (master branch)
+ *  CATCH v1.0 build 27 (master branch)
- *  Generated: 2014-02-11 18:09:37.990814
+ *  Generated: 2014-03-01 10:36:25.999888
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -3008,41 +3008,32 @@ namespace Catch {
 #define CLARA_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH
 
 // Declare Clara inside the Catch namespace
-#define CLICHE_CLARA_OUTER_NAMESPACE Catch
+#define STITCH_CLARA_OUTER_NAMESPACE Catch
 // #included from: clara.h
 
 // Only use header guard if we are not using an outer namespace
-#ifndef CLICHE_CLARA_OUTER_NAMESPACE
+#if !defined(TWOBLUECUBES_CLARA_H_INCLUDED) || defined(STITCH_CLARA_OUTER_NAMESPACE)
-# ifdef TWOBLUECUBES_CLARA_H_INCLUDED
+#ifndef STITCH_CLARA_OUTER_NAMESPACE
-#  ifndef TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
+#define TWOBLUECUBES_CLARA_H_INCLUDED
-#   define TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
-#  endif
-# else
-#  define TWOBLUECUBES_CLARA_H_INCLUDED
-# endif
 #endif
-#ifndef TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
 
-#define CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE Clara
+#define STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE Clara
-// #included from: tbc_text_format.h
+
+// ----------- #included from tbc_text_format.h -----------
+
 // Only use header guard if we are not using an outer namespace
-#ifndef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+#if !defined(TBC_TEXT_FORMAT_H_INCLUDED) || defined(STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE)
-# ifdef TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED
+#ifndef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
-#  ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#define TBC_TEXT_FORMAT_H_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 <string>
 #include <vector>
 #include <sstream>
 
 // Use optional outer namespace
-#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
-namespace CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
+namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
 #endif
 
 namespace Tbc {
@@ -3166,23 +3157,25 @@ namespace Tbc {
 
 } // end namespace Tbc
 
-#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
 } // end outer namespace
 #endif
 
-#endif // TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#endif // TBC_TEXT_FORMAT_H_INCLUDED
-#undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+
+// ----------- end of #include from tbc_text_format.h -----------
+// ........... back in /Users/philnash/Dev/OSS/Clara/srcs/clara.h
+
+#undef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
 
-#include <string>
-#include <vector>
 #include <map>
 #include <algorithm>
 #include <stdexcept>
 #include <memory>
 
 // Use optional outer namespace
-#ifdef CLICHE_CLARA_OUTER_NAMESPACE
+#ifdef STITCH_CLARA_OUTER_NAMESPACE
-namespace CLICHE_CLARA_OUTER_NAMESPACE {
+namespace STITCH_CLARA_OUTER_NAMESPACE {
 #endif
 
 namespace Clara {
@@ -3458,7 +3451,7 @@ namespace Clara {
             }
             void validate() const {
                 if( boundField.takesArg() && !takesArg() )
-                    throw std::logic_error( dbgName() + " must specify an arg name" );
+                    throw std::logic_error( "command line argument '" + dbgName() + "' must specify a hint" );
             }
             std::string commands() const {
                 std::ostringstream oss;
@@ -3509,8 +3502,10 @@ namespace Clara {
             {
                 other.m_cl = NULL;
             }
-            ~ArgBinder() {
+            // !TBD: Need to include workarounds to be able to declare this
-                if( m_cl ) {
+            // destructor as able to throw exceptions
+            ~ArgBinder() /* noexcept(false) */ {
+                if( m_cl && !std::uncaught_exception() ) {
                     m_arg.validate();
                     if( m_arg.isFixedPositional() ) {
                         m_cl->m_positionalArgs.insert( std::make_pair( m_arg.position, m_arg ) );
@@ -3655,6 +3650,12 @@ namespace Clara {
             return oss.str();
         }
 
+        ConfigT parseInto( int argc, char const * const * argv ) const {
+            ConfigT config;
+            parseInto( argc, argv, config );
+            return config;
+        }
+
         std::vector<Parser::Token> parseInto( int argc, char const * const * argv, ConfigT& config ) const {
             std::string processName = argv[0];
             std::size_t lastSlash = processName.find_last_of( "/\\" );
@@ -3765,13 +3766,12 @@ namespace Clara {
 
 } // end namespace Clara
 
-#ifdef CLICHE_CLARA_OUTER_NAMESPACE
+#ifdef STITCH_CLARA_OUTER_NAMESPACE
 } // end outer namespace
 #endif
 
-#endif // TWOBLUECUBES_CLARA_H_ALREADY_INCLUDED
+#endif // TWOBLUECUBES_CLARA_H_INCLUDED
-
+#undef STITCH_CLARA_OUTER_NAMESPACE
-#undef CLICHE_CLARA_OUTER_NAMESPACE
 
 #include <fstream>
 
@@ -4167,9 +4167,11 @@ namespace Catch {
         }
 
         Option& operator= ( Option const& _other ) {
-            reset();
+            if( &_other != this ) {
-            if( _other )
+                reset();
-                nullableValue = new( storage ) T( *_other );
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
             return *this;
         }
         Option& operator = ( T const& _value ) {
@@ -6512,7 +6514,7 @@ namespace Catch {
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 26, "master" );
+    Version libraryVersion( 1, 0, 27, "master" );
 }
 
 // #included from: catch_message.hpp