mirror of https://github.com/catchorg/Catch2.git
Simplified StringWrapper
- by changing intoStream to << overload - and removing redundant ctor
This commit is contained in:
parent
b052bd729a
commit
9e8abc33e7
|
@ -161,7 +161,7 @@ namespace Catch {
|
|||
displayedSpecificOption = true;
|
||||
std::cout << "\n" << opt.optionNames() << " " << opt.argsSynopsis() << "\n\n"
|
||||
<< opt.optionSummary() << "\n\n"
|
||||
<< LineWrapper().setIndent( 2 ).wrap( opt.optionDescription() ).toString() << "\n" << std::endl;
|
||||
<< LineWrapper().setIndent( 2 ).wrap( opt.optionDescription() ) << "\n" << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ namespace Catch {
|
|||
|
||||
class LineWrapper {
|
||||
public:
|
||||
LineWrapper( std::size_t _indent, std::size_t _right );
|
||||
LineWrapper( std::size_t _right );
|
||||
LineWrapper();
|
||||
|
||||
|
@ -24,7 +23,6 @@ namespace Catch {
|
|||
|
||||
LineWrapper& wrap( std::string const& _str );
|
||||
|
||||
std::ostream& intoStream( std::ostream& stream ) const;
|
||||
std::string toString() const;
|
||||
|
||||
typedef std::vector<std::string>::const_iterator const_iterator;
|
||||
|
@ -32,6 +30,8 @@ namespace Catch {
|
|||
const_iterator begin() const { return lines.begin(); }
|
||||
const_iterator end() const { return lines.end(); }
|
||||
|
||||
friend std::ostream& operator << ( std::ostream& _stream, LineWrapper const& _lineWrapper );
|
||||
|
||||
private:
|
||||
void wrapInternal( std::string const& _str );
|
||||
void addLine( const std::string& _line );
|
||||
|
|
|
@ -12,13 +12,6 @@
|
|||
|
||||
namespace Catch {
|
||||
|
||||
|
||||
LineWrapper::LineWrapper( std::size_t _indent, std::size_t _right )
|
||||
: indent( _indent, ' ' ),
|
||||
right( _right ),
|
||||
nextTab( 0 ),
|
||||
tab( 0 )
|
||||
{}
|
||||
LineWrapper::LineWrapper( std::size_t _right )
|
||||
: right( _right ),
|
||||
nextTab( 0 ),
|
||||
|
@ -75,18 +68,18 @@ namespace Catch {
|
|||
addLine( _str );
|
||||
}
|
||||
|
||||
std::ostream& LineWrapper::intoStream( std::ostream& stream ) const {
|
||||
for( const_iterator it = begin(), itEnd = end();
|
||||
std::ostream& operator << ( std::ostream& _stream, LineWrapper const& _lineWrapper ) {
|
||||
for( LineWrapper::const_iterator it = _lineWrapper.begin(), itEnd = _lineWrapper.end();
|
||||
it != itEnd; ++it ) {
|
||||
if( it != begin() )
|
||||
stream << "\n";
|
||||
stream << *it;
|
||||
if( it != _lineWrapper.begin() )
|
||||
_stream << "\n";
|
||||
_stream << *it;
|
||||
}
|
||||
return stream;
|
||||
return _stream;
|
||||
}
|
||||
std::string LineWrapper::toString() const {
|
||||
std::ostringstream oss;
|
||||
intoStream( oss );
|
||||
oss << *this;
|
||||
return oss.str();
|
||||
}
|
||||
|
||||
|
|
|
@ -211,7 +211,7 @@ namespace Catch {
|
|||
if( result.hasExpandedExpression() ) {
|
||||
stream << "with expansion:\n";
|
||||
TextColour colourGuard( TextColour::ReconstructedExpression );
|
||||
stream << LineWrapper().setIndent(2).wrap( result.getExpandedExpression() ).toString() << "\n";
|
||||
stream << LineWrapper().setIndent(2).wrap( result.getExpandedExpression() ) << "\n";
|
||||
}
|
||||
}
|
||||
void printMessage() const {
|
||||
|
@ -220,8 +220,7 @@ namespace Catch {
|
|||
for( std::vector<MessageInfo>::const_iterator it = messages.begin(), itEnd = messages.end();
|
||||
it != itEnd;
|
||||
++it ) {
|
||||
LineWrapper().setIndent(2).wrap( it->message ).intoStream( stream );
|
||||
stream << "\n";
|
||||
stream << LineWrapper().setIndent(2).wrap( it->message ) << "\n";
|
||||
}
|
||||
}
|
||||
void printSourceInfo() const {
|
||||
|
|
Loading…
Reference in New Issue