forked from catchorg/Catch2
50cc14c94c
Now it no longer tries to be this weird hybrid between an owning and non-owning reference, and is only ever non-owning. This is also reflected in its interface, for example `StringRef::isNullTerminated` is now public, and `StringRef::c_str()` has the precondition that it is true. Overview of the changes: * The `StringRef::m_data` member has been completely removed, as it had no more uses. * `StringRef::isSubstring()` has been made public and renamed to `StringRef::isNullTerminated()`, so that the name reflects what the method actually does. * `StringRef::currentData()` has been renamed to `StringRef::data()`, to be in line with common C++ containers and container-alikes. * `StringRef::c_str()` will no longer silently make copies. It instead has a precondition that `isNullTerminated()` is true. * If the user needs a null-terminated string, they should use the `std::string` conversion operator and call `c_str()` on the resulting `std::string`. * Some small optimizations in various places. * Basic functionality is now `constexpr`.
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
/*
|
|
* Copyright 2016 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)
|
|
*/
|
|
|
|
#include "catch_enforce.h"
|
|
#include "catch_stringref.h"
|
|
|
|
#include <algorithm>
|
|
#include <ostream>
|
|
#include <cstring>
|
|
#include <cstdint>
|
|
|
|
namespace Catch {
|
|
StringRef::StringRef( char const* rawChars ) noexcept
|
|
: StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
|
|
{}
|
|
|
|
auto StringRef::c_str() const -> char const* {
|
|
CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
|
|
return m_start;
|
|
}
|
|
auto StringRef::data() const noexcept -> char const* {
|
|
return m_start;
|
|
}
|
|
|
|
auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
|
|
if (start < m_size) {
|
|
return StringRef(m_start + start, (std::min)(m_size - start, size));
|
|
} else {
|
|
return StringRef();
|
|
}
|
|
}
|
|
auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
|
|
return m_size == other.m_size
|
|
&& (std::memcmp( m_start, other.m_start, m_size ) == 0);
|
|
}
|
|
|
|
auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
|
|
return os.write(str.data(), str.size());
|
|
}
|
|
|
|
auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
|
|
lhs.append(rhs.data(), rhs.size());
|
|
return lhs;
|
|
}
|
|
|
|
} // namespace Catch
|