3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Store Opt/Arg hint and description as StringRef

Browse Source 
There is no good reason for these to be std::strings, as these
are just (optional) constants for nice user output. This ends up
reducing the allocations significantly.

When measuring allocations when running no tests, the changes are
`tests/SelfTest` 9213 -> 7705
`tests/ExtraTests/NoTests` 3723 -> 2215
This commit is contained in:
Martin Hořeňovský 2023-12-23 16:02:37 +01:00
parent 2b69a3e216
commit 2295d2c8cc
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/catch2/internal/catch_clara.cpp
View File

@ -185,7 +185,7 @@ namespace Catch {
} }
if (!m_hint.empty()) if (!m_hint.empty())
oss << " <" << m_hint << '>'; oss << " <" << m_hint << '>';
return { { oss.str(), m_description } }; return { { oss.str(), static_cast<std::string>(m_description) } };
} }
bool Opt::isMatch(std::string const& optToken) const { bool Opt::isMatch(std::string const& optToken) const {

21
src/catch2/internal/catch_clara.hpp
View File

@ -29,6 +29,7 @@
# endif # endif
#endif #endif
#include <catch2/internal/catch_stringref.hpp>
#include <catch2/internal/catch_move_and_forward.hpp> #include <catch2/internal/catch_move_and_forward.hpp>
#include <catch2/internal/catch_noncopyable.hpp> #include <catch2/internal/catch_noncopyable.hpp>
#include <catch2/internal/catch_void_type.hpp> #include <catch2/internal/catch_void_type.hpp>
@ -465,8 +466,8 @@ namespace Catch {
protected: protected:
Optionality m_optionality = Optionality::Optional; Optionality m_optionality = Optionality::Optional;
std::shared_ptr<BoundRef> m_ref; std::shared_ptr<BoundRef> m_ref;
std::string m_hint; StringRef m_hint;
std::string m_description; StringRef m_description;
explicit ParserRefImpl( std::shared_ptr<BoundRef> const& ref ): explicit ParserRefImpl( std::shared_ptr<BoundRef> const& ref ):
m_ref( ref ) {} m_ref( ref ) {}
@ -475,25 +476,25 @@ namespace Catch {
template <typename LambdaT> template <typename LambdaT>
ParserRefImpl( accept_many_t, ParserRefImpl( accept_many_t,
LambdaT const& ref, LambdaT const& ref,
std::string const& hint ): StringRef hint ):
m_ref( std::make_shared<BoundManyLambda<LambdaT>>( ref ) ), m_ref( std::make_shared<BoundManyLambda<LambdaT>>( ref ) ),
m_hint( hint ) {} m_hint( hint ) {}
template <typename T, template <typename T,
typename = typename std::enable_if_t< typename = typename std::enable_if_t<
!Detail::is_unary_function<T>::value>> !Detail::is_unary_function<T>::value>>
ParserRefImpl( T& ref, std::string const& hint ): ParserRefImpl( T& ref, StringRef hint ):
m_ref( std::make_shared<BoundValueRef<T>>( ref ) ), m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
m_hint( hint ) {} m_hint( hint ) {}
template <typename LambdaT, template <typename LambdaT,
typename = typename std::enable_if_t< typename = typename std::enable_if_t<
Detail::is_unary_function<LambdaT>::value>> Detail::is_unary_function<LambdaT>::value>>
ParserRefImpl( LambdaT const& ref, std::string const& hint ): ParserRefImpl( LambdaT const& ref, StringRef hint ):
m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ), m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
m_hint( hint ) {} m_hint( hint ) {}
auto operator()( std::string const& description ) -> DerivedT& { auto operator()( StringRef description ) -> DerivedT& {
m_description = description; m_description = description;
return static_cast<DerivedT&>( *this ); return static_cast<DerivedT&>( *this );
} }
@ -519,7 +520,7 @@ namespace Catch {
return 1; return 1;
} }
std::string const& hint() const { return m_hint; } StringRef hint() const { return m_hint; }
}; };
} // namespace detail } // namespace detail
@ -552,17 +553,17 @@ namespace Catch {
template <typename LambdaT, template <typename LambdaT,
typename = typename std::enable_if_t< typename = typename std::enable_if_t<
Detail::is_unary_function<LambdaT>::value>> Detail::is_unary_function<LambdaT>::value>>
Opt( LambdaT const& ref, std::string const& hint ): Opt( LambdaT const& ref, StringRef hint ):
ParserRefImpl( ref, hint ) {} ParserRefImpl( ref, hint ) {}
template <typename LambdaT> template <typename LambdaT>
Opt( accept_many_t, LambdaT const& ref, std::string const& hint ): Opt( accept_many_t, LambdaT const& ref, StringRef hint ):
ParserRefImpl( accept_many, ref, hint ) {} ParserRefImpl( accept_many, ref, hint ) {}
template <typename T, template <typename T,
typename = typename std::enable_if_t< typename = typename std::enable_if_t<
!Detail::is_unary_function<T>::value>> !Detail::is_unary_function<T>::value>>
Opt( T& ref, std::string const& hint ): Opt( T& ref, StringRef hint ):
ParserRefImpl( ref, hint ) {} ParserRefImpl( ref, hint ) {}
auto operator[](std::string const& optName) -> Opt& { auto operator[](std::string const& optName) -> Opt& {