Compare commits

...

15 Commits

Author SHA1 Message Date
Gennaro Prota
e9313dc331 Add an experimental basic_static_cstring template in example/
This introduces an alternative to basic_static_string designed for use
in POD types: Trivially copyable, having a sizeof == N + 1, with no
embedded NULs.

Placed in example/ to gather user feedback before committing to a public
API. See issue #23.
2025-12-19 19:32:30 +01:00
Gennaro Prota
0c5e5b8e58 Fix our deduction guide 2025-12-19 18:26:40 +01:00
Gennaro Prota
6f0c00b268 Work around a Clang 3.7 bug affecting constexpr insert()
The iterator-based insert(const_iterator, size_type, value_type)
function relies on traits_type::move() to shift the existing null
terminator to its new position. Clang 3.7's constexpr evaluator does not
handle this correctly, causing the following test to fail:

  static_string<3>{"ab"}.insert(2, 1, 'c') == "abc"

Add an explicit term() call, guarded by a preprocessor conditional for
Clang 3.7, to ensure proper null termination.
2025-12-19 18:23:33 +01:00
Gennaro Prota
2175496c55 Condition the NTTP tests on __cpp_nontype_template_args
They were conditioned on detection of C++20 via __cplusplus, but Clang
10 and 11 don't support class types as NTTP, even though they report
C++20 via __cplusplus when -std=c++20 is used.
2025-12-19 18:23:33 +01:00
Gennaro Prota
aee3c62957 Apply the workaround in the previous commit to Clang 3.7 and 9-19, too
Reason: They have the same issue as GCC 9.
2025-12-19 18:23:33 +01:00
Gennaro Prota
0e28b358dc Work around GCC 9 rejecting a legitimate pointer comparison in a constexpr context 2025-12-19 18:23:33 +01:00
Gennaro Prota
4dcfb39494 Replace the implementation of cxper_char_traits::move() with a simpler one
Reason: See the new code comment.
2025-12-19 18:23:33 +01:00
Gennaro Prota
4bf6461ca1 Work around a bug in GCC 5-10
GCC 5-10 incorrectly complain about our nested classes being private.
So, make them public.
2025-12-19 18:23:33 +01:00
Krystian Stasiowski
67efdf6a9b Make basic_static_string usable as a NTTP 2025-12-19 18:23:33 +01:00
Krystian Stasiowski
3a410b8472 Add build directory and CMake preset files to .gitignore 2025-12-19 18:23:33 +01:00
Gennaro Prota
bf988466f8 Work around GCC (libstdc++) bug #113200
See the previous commit. This simple fix avoids calling Traits::move(),
which is where the bug resides.

This closes issue #55.
2025-12-16 10:30:33 +01:00
Gennaro Prota
a526ebd1f6 Check that basic_static_string can be constructed and assigned from a C-style string in a constexpr context
This triggers a libstdc++ issue which was fixed in GCC 12.4 and 13.3:
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113200>. If our CI shows
we bump into that bug, we'll add a workaround.
2025-12-16 10:30:33 +01:00
Gennaro Prota
2f8c7a69ea Update the library metadata: Remove Krystian, add myself as a maintainer 2025-12-15 14:25:26 +01:00
Gennaro Prota
c915934529 Fix four occorrences of a typo ("arugment") in the Javadoc comments 2025-11-14 12:03:00 +01:00
Gennaro Prota
10b5491104 Avoid two C4244 warnings from MSVC 2025-11-05 11:30:41 +01:00
11 changed files with 1588 additions and 143 deletions

156
.github/workflows/example.yml vendored Normal file
View File

@@ -0,0 +1,156 @@
#
# Copyright (c) 2025 Gennaro Prota (gennaro dot prota at gmail dot com)
#
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
#
# Official repository: https://github.com/boostorg/static_string
#
name: Example (basic_static_cstring)
on:
pull_request:
push:
branches:
- master
- develop
- bugfix/**
- feature/**
- fix/**
- github/**
- pr/**
paths-ignore:
- LICENSE
- meta/**
- README.md
jobs:
linux:
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
include:
- { toolset: gcc-13, cxxstd: '20,23' }
- { toolset: gcc-14, cxxstd: '20,23,26' }
- { toolset: clang-17, cxxstd: '20,23' }
- { toolset: clang-18, cxxstd: '20,23,26' }
steps:
- name: Checkout Boost super-project
uses: actions/checkout@v4
with:
repository: boostorg/boost
ref: develop
fetch-depth: 0
- name: Checkout this library
uses: actions/checkout@v4
with:
path: libs/static_string
fetch-depth: 0
- name: Initialize Boost submodules
run: |
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args '--jobs 4' static_string
- name: Bootstrap b2
run: ./bootstrap.sh
- name: Generate Boost headers
run: ./b2 headers
- name: Build and run example tests
run: |
./b2 libs/static_string/example/static_cstring \
toolset=${{ matrix.toolset }} \
cxxstd=${{ matrix.cxxstd }} \
variant=debug,release \
-j$(nproc)
macos:
runs-on: macos-14
strategy:
fail-fast: false
matrix:
include:
- { toolset: clang, cxxstd: '20,23' }
steps:
- name: Checkout Boost super-project
uses: actions/checkout@v4
with:
repository: boostorg/boost
ref: develop
fetch-depth: 0
- name: Checkout this library
uses: actions/checkout@v4
with:
path: libs/static_string
fetch-depth: 0
- name: Initialize Boost submodules
run: |
git submodule update --init tools/boostdep
python3 tools/boostdep/depinst/depinst.py --git_args '--jobs 4' static_string
- name: Bootstrap b2
run: ./bootstrap.sh
- name: Generate Boost headers
run: ./b2 headers
- name: Build and run example tests
run: |
./b2 libs/static_string/example/static_cstring \
toolset=${{ matrix.toolset }} \
cxxstd=${{ matrix.cxxstd }} \
variant=debug,release \
-j$(sysctl -n hw.ncpu)
windows:
runs-on: windows-2022
strategy:
fail-fast: false
matrix:
include:
- { toolset: msvc-14.3, cxxstd: '20,latest' }
steps:
- name: Checkout Boost super-project
uses: actions/checkout@v4
with:
repository: boostorg/boost
ref: develop
fetch-depth: 0
- name: Checkout this library
uses: actions/checkout@v4
with:
path: libs/static_string
fetch-depth: 0
- name: Initialize Boost submodules
run: |
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args '--jobs 4' static_string
- name: Bootstrap b2
run: .\bootstrap.bat
shell: cmd
- name: Generate Boost headers
run: .\b2 headers
shell: cmd
- name: Build and run example tests
run: |
.\b2 libs/static_string/example/static_cstring ^
toolset=${{ matrix.toolset }} ^
cxxstd=${{ matrix.cxxstd }} ^
variant=debug,release ^
address-model=64
shell: cmd

9
.gitignore vendored
View File

@@ -1,8 +1,15 @@
bin/
bin64/
build/
# Because of CMake and VS2017
Win32/
x64/
.vs/
out/
out/
# VS CMake settings
/CMakeSettings.json
# CMake presets
/CMakePresets.json
/CMakeUserPresets.json

View File

@@ -0,0 +1,19 @@
#
# Copyright (c) 2025 Gennaro Prota (gennaro dot prota at gmail dot com)
#
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
#
# Official repository: https://github.com/boostorg/static_string
#
import testing ;
project
: requirements
<include>../../include
<warnings>extra
<cxxstd>20
;
run static_cstring_test.cpp ;

View File

@@ -0,0 +1,13 @@
This directory contains an experimental implementation of `basic_static_cstring`, which differs from `basic_static_string` in the following ways:
| | `basic_static_cstring` | `basic_static_string` |
|---------------------|------------------------|-----------------------|
| Layout | `sizeof == N + 1` | Has size member |
| Embedded NULs | Not supported | Supported |
| Trivially copyable | Yes | No |
Additionally, when `N <= UCHAR_MAX`, `basic_static_cstring` employs an optimization that avoids calling `std::strlen()` to compute the size.
This work stems from [boostorg/static_string#23](https://github.com/boostorg/static_string/issues/23).
If you believe `basic_static_cstring` should become part of the public API, please share your feedback on the Boost mailing list.

View File

@@ -0,0 +1,441 @@
//
// Copyright (c) 2025 Gennaro Prota (gennaro dot prota at gmail dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
//
// Official repository: https://github.com/boostorg/static_string
//
#ifndef BOOST_STATIC_STRING_STATIC_CSTRING_HPP
#define BOOST_STATIC_STRING_STATIC_CSTRING_HPP
#include <boost/static_string/config.hpp>
#include <algorithm>
#include <climits>
#include <cstddef>
#include <ostream>
#include <string>
#include <string_view>
#include <stdexcept>
#include <type_traits>
namespace boost {
namespace static_strings {
namespace detail {
// Primary template: No remaining-capacity trick; uses traits::length() for length.
template<std::size_t N, typename CharT, typename Traits, bool UseRemaining>
class static_cstring_base
{
public:
using traits_type = Traits;
using value_type = CharT;
using size_type = std::size_t;
value_type data_[N + 1]{};
constexpr size_type get_size() const noexcept
{
return traits_type::length(data_);
}
constexpr void set_size(size_type sz) noexcept
{
data_[sz] = value_type{};
}
// Defaulted comparisons for structural type support.
constexpr bool operator==(const static_cstring_base&) const noexcept = default;
constexpr auto operator<=>(const static_cstring_base&) const noexcept = default;
};
// Specialization for N <= UCHAR_MAX: Uses remaining-capacity trick.
template<std::size_t N, typename CharT, typename Traits>
class static_cstring_base<N, CharT, Traits, true>
{
public:
using traits_type = Traits;
using value_type = CharT;
using size_type = std::size_t;
value_type data_[N + 1]{};
constexpr size_type get_size() const noexcept
{
return N - static_cast<unsigned char>(data_[N]);
}
constexpr void set_size(size_type sz) noexcept
{
data_[sz] = value_type{};
data_[N] = static_cast<value_type>(N - sz);
}
// Defaulted comparisons for structural type support.
constexpr bool operator==(const static_cstring_base&) const noexcept = default;
constexpr auto operator<=>(const static_cstring_base&) const noexcept = default;
};
} // namespace detail
template<std::size_t N, typename CharT = char, typename Traits = std::char_traits<CharT>>
class basic_static_cstring
: public detail::static_cstring_base<N, CharT, Traits, (N <= UCHAR_MAX)>
{
public:
using base = detail::static_cstring_base<N, CharT, Traits, (N <= UCHAR_MAX)>;
using base::data_;
using base::get_size;
using base::set_size;
// Member types
using traits_type = Traits;
using value_type = CharT;
using size_type = std::size_t;
using difference_type = std::ptrdiff_t;
using reference = value_type&;
using const_reference = const value_type&;
using pointer = value_type*;
using const_pointer = const value_type*;
using iterator = pointer;
using const_iterator = const_pointer;
static constexpr size_type npos = static_cast<size_type>(-1);
static constexpr size_type static_capacity = N;
// Constructors.
constexpr basic_static_cstring() noexcept
{
set_size(0);
}
constexpr basic_static_cstring(const CharT* s)
{
assign(s);
}
constexpr basic_static_cstring(const CharT* s, size_type count)
{
assign(s, count);
}
constexpr basic_static_cstring(size_type count, CharT ch)
{
assign(count, ch);
}
template<std::size_t M>
constexpr basic_static_cstring(const CharT (&arr)[M])
{
static_assert(M <= N + 1, "String literal too long for static_cstring");
assign(arr, M - 1);
}
constexpr size_type size() const noexcept
{
return get_size();
}
constexpr size_type length() const noexcept
{
return size();
}
constexpr bool empty() const noexcept
{
return data_[0] == value_type{};
}
static constexpr size_type max_size() noexcept
{
return N;
}
static constexpr size_type capacity() noexcept
{
return N;
}
// Element access.
constexpr reference operator[](size_type pos) noexcept
{
return data_[pos];
}
constexpr const_reference operator[](size_type pos) const noexcept
{
return data_[pos];
}
constexpr reference at(size_type pos)
{
if (pos >= size())
{
throw std::out_of_range("static_cstring::at");
}
return data_[pos];
}
constexpr const_reference at(size_type pos) const
{
if (pos >= size())
{
throw std::out_of_range("static_cstring::at");
}
return data_[pos];
}
constexpr reference front() noexcept
{
BOOST_STATIC_STRING_ASSERT(!empty());
return data_[0];
}
constexpr const_reference front() const noexcept
{
BOOST_STATIC_STRING_ASSERT(!empty());
return data_[0];
}
constexpr reference back() noexcept
{
BOOST_STATIC_STRING_ASSERT(!empty());
return data_[size() - 1];
}
constexpr const_reference back() const noexcept
{
BOOST_STATIC_STRING_ASSERT(!empty());
return data_[size() - 1];
}
constexpr pointer data() noexcept
{
return data_;
}
constexpr const_pointer data() const noexcept
{
return data_;
}
constexpr const_pointer c_str() const noexcept
{
return data_;
}
// Iterators.
constexpr iterator begin() noexcept
{
return data_;
}
constexpr const_iterator begin() const noexcept
{
return data_;
}
constexpr const_iterator cbegin() const noexcept
{
return data_;
}
constexpr iterator end() noexcept
{
return data_ + size();
}
constexpr const_iterator end() const noexcept
{
return data_ + size();
}
constexpr const_iterator cend() const noexcept
{
return data_ + size();
}
// Modifiers.
constexpr void clear() noexcept
{
set_size(0);
}
constexpr basic_static_cstring& assign(const CharT* s)
{
return assign(s, traits_type::length(s));
}
constexpr basic_static_cstring& assign(const CharT* s, size_type count)
{
if (count > N)
{
throw std::length_error("static_cstring::assign");
}
traits_type::copy(data_, s, count);
set_size(count);
return *this;
}
constexpr basic_static_cstring& assign(size_type count, CharT ch)
{
if (count > N)
{
throw std::length_error("static_cstring::assign");
}
traits_type::assign(data_, count, ch);
set_size(count);
return *this;
}
constexpr basic_static_cstring& operator=(const CharT* s)
{
return assign(s);
}
constexpr void push_back(CharT ch)
{
const size_type sz = size();
if (sz >= N)
{
throw std::length_error("static_cstring::push_back");
}
data_[sz] = ch;
set_size(sz + 1);
}
constexpr void pop_back() noexcept
{
BOOST_STATIC_STRING_ASSERT(!empty());
set_size(size() - 1);
}
constexpr basic_static_cstring& append(const CharT* s)
{
return append(s, traits_type::length(s));
}
constexpr basic_static_cstring& append(const CharT* s, size_type count)
{
const size_type sz = size();
if (sz + count > N)
{
throw std::length_error("static_cstring::append");
}
traits_type::copy(data_ + sz, s, count);
set_size(sz + count);
return *this;
}
constexpr basic_static_cstring& append(size_type count, CharT ch)
{
const size_type sz = size();
if (sz + count > N)
{
throw std::length_error("static_cstring::append");
}
traits_type::assign(data_ + sz, count, ch);
set_size(sz + count);
return *this;
}
constexpr basic_static_cstring& operator+=(const CharT* s)
{
return append(s);
}
constexpr basic_static_cstring& operator+=(CharT ch)
{
push_back(ch);
return *this;
}
// Comparisons.
constexpr int compare(const basic_static_cstring& other) const noexcept
{
const size_type lhs_sz = size();
const size_type rhs_sz = other.size();
const int result = traits_type::compare(data_, other.data_, (std::min)(lhs_sz, rhs_sz));
return result != 0
? result
: lhs_sz < rhs_sz
? -1
: lhs_sz > rhs_sz
? 1
: 0;
}
constexpr int compare(const CharT* s) const noexcept
{
return compare(basic_static_cstring(s));
}
// Conversions.
constexpr operator std::basic_string_view<CharT, Traits>() const noexcept
{
return {data_, size()};
}
std::basic_string<CharT, Traits> str() const
{
return {data_, size()};
}
// Swap.
constexpr void swap(basic_static_cstring& other) noexcept
{
basic_static_cstring tmp = *this;
*this = other;
other = tmp;
}
// Defaulted comparisons for structural type (C++20).
constexpr bool operator==(const basic_static_cstring&) const noexcept = default;
constexpr auto operator<=>(const basic_static_cstring&) const noexcept = default;
};
#if defined(BOOST_STATIC_STRING_USE_DEDUCT)
// Deduction guide.
template<std::size_t N, typename CharT>
basic_static_cstring(const CharT(&)[N]) -> basic_static_cstring<N - 1, CharT>;
#endif
// Comparison with const CharT*.
template<std::size_t N, typename CharT, typename Traits>
constexpr bool operator==(const basic_static_cstring<N, CharT, Traits>& lhs,
const CharT* rhs) noexcept
{
return lhs.compare(rhs) == 0;
}
template<std::size_t N, typename CharT, typename Traits>
constexpr bool operator==(const CharT* lhs,
const basic_static_cstring<N, CharT, Traits>& rhs) noexcept
{
return rhs.compare(lhs) == 0;
}
// Stream output.
template<std::size_t N, typename CharT, typename Traits>
std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os,
const basic_static_cstring<N, CharT, Traits>& str)
{
return os << str.c_str();
}
// Alias templates.
template<std::size_t N>
using static_cstring = basic_static_cstring<N, char>;
template<std::size_t N>
using static_wcstring = basic_static_cstring<N, wchar_t>;
}
}
#endif

View File

@@ -0,0 +1,671 @@
//
// Copyright (c) 2025 Gennaro Prota (gennaro dot prota at gmail dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
//
// Official repository: https://github.com/boostorg/static_string
//
#include "static_cstring.hpp"
#include <boost/core/lightweight_test.hpp>
#include <climits>
#include <cstring>
#include <sstream>
#include <string>
#include <string_view>
#include <type_traits>
namespace boost {
namespace static_strings {
static
void
testCStringSizeGuarantee()
{
// Core guarantee: sizeof is exactly N + 1 (no size member).
static_assert(sizeof(static_cstring<0>) == 1, "");
static_assert(sizeof(static_cstring<1>) == 2, "");
static_assert(sizeof(static_cstring<10>) == 11, "");
static_assert(sizeof(static_cstring<63>) == 64, "");
static_assert(sizeof(static_cstring<64>) == 65, "");
static_assert(sizeof(static_cstring<127>) == 128, "");
static_assert(sizeof(static_cstring<UCHAR_MAX>) == (UCHAR_MAX + 1), "");
static_assert(sizeof(static_cstring<UCHAR_MAX + 1>) == (UCHAR_MAX + 2), "");
static_assert(sizeof(static_cstring<1000>) == 1001, "");
}
static
void
testCStringRemainingCapacityTrick()
{
// Test the remaining-capacity optimization for N <= UCHAR_MAX.
// Full capacity: Last byte is both null terminator AND remaining == 0.
{
static_cstring<5> full("12345");
BOOST_TEST(full.size() == 5);
BOOST_TEST(full.capacity() == 5);
BOOST_TEST(full.data()[5] == '\0');
BOOST_TEST(std::strcmp(full.c_str(), "12345") == 0);
}
// Partial fill: Null terminator at position size, remaining at position N.
{
static_cstring<10> partial("Hi");
BOOST_TEST(partial.size() == 2);
BOOST_TEST(partial.capacity() == 10);
BOOST_TEST(partial.data()[2] == '\0');
BOOST_TEST(static_cast<unsigned char>(partial.data()[10]) == 8);
}
// Empty string.
{
static_cstring<10> empty;
BOOST_TEST(empty.size() == 0);
BOOST_TEST(empty.capacity() == 10);
BOOST_TEST(empty.data()[0] == '\0');
BOOST_TEST(static_cast<unsigned char>(empty.data()[10]) == 10);
}
// Edge case: N == UCHAR_MAX (max for our trick).
{
static_cstring<UCHAR_MAX> large;
large.assign(100, 'x');
BOOST_TEST(large.size() == 100);
BOOST_TEST(large.capacity() == UCHAR_MAX);
BOOST_TEST(static_cast<unsigned char>(large.data()[UCHAR_MAX]) == (UCHAR_MAX - large.size()));
}
}
template<typename S>
struct CStringTypeTraits
{
static_assert(std::is_trivially_copyable<S>::value);
static_assert(std::is_trivially_copy_constructible<S>::value);
static_assert(std::is_trivially_move_constructible<S>::value);
static_assert(std::is_trivially_copy_assignable<S>::value);
static_assert(std::is_trivially_move_assignable<S>::value);
static_assert(std::is_trivially_destructible<S>::value);
};
static
void
testCStringTypeTraits()
{
{
using S = static_cstring<0>;
CStringTypeTraits< S > check;
static_cast<void>(check);
}
{
using S = static_cstring<63>;
CStringTypeTraits< S > check;
static_cast<void>(check);
}
{
using S = static_cstring<300>;
CStringTypeTraits< S > check;
static_cast<void>(check);
}
}
static
void
testCStringConstruct()
{
// Default construction.
{
static_cstring<1> s;
BOOST_TEST(s.empty());
BOOST_TEST(s.size() == 0);
BOOST_TEST(s == "");
BOOST_TEST(*s.end() == 0);
}
// Construct with count and char.
{
static_cstring<4> s1(3, 'x');
BOOST_TEST(!s1.empty());
BOOST_TEST(s1.size() == 3);
BOOST_TEST(s1 == "xxx");
BOOST_TEST(*s1.end() == 0);
BOOST_TEST_THROWS(
(static_cstring<2>(3, 'x')),
std::length_error);
}
// Construct from a C string.
{
static_cstring<5> s1("12345");
BOOST_TEST(s1.size() == 5);
BOOST_TEST(s1 == "12345");
BOOST_TEST(*s1.end() == 0);
BOOST_TEST_THROWS(
(static_cstring<4>("12345")),
std::length_error);
}
// Construct from a C string with count.
{
static_cstring<5> s1("UVXYZ", 3);
BOOST_TEST(s1 == "UVX");
BOOST_TEST(*s1.end() == 0);
}
// Copy construction.
{
static_cstring<5> s1("12345");
static_cstring<5> s2(s1);
BOOST_TEST(s2 == "12345");
BOOST_TEST(*s2.end() == 0);
}
}
static
void
testCStringAssignment()
{
// assign(size_type count, CharT ch).
BOOST_TEST(static_cstring<3>{}.assign(1, '*') == "*");
BOOST_TEST(static_cstring<3>{}.assign(3, '*') == "***");
BOOST_TEST(static_cstring<3>{"abc"}.assign(3, '*') == "***");
BOOST_TEST_THROWS(static_cstring<1>{"a"}.assign(2, '*'), std::length_error);
// assign(CharT const* s, size_type count).
BOOST_TEST(static_cstring<3>{}.assign("abc", 3) == "abc");
BOOST_TEST(static_cstring<3>{"*"}.assign("abc", 3) == "abc");
BOOST_TEST_THROWS(static_cstring<1>{}.assign("abc", 3), std::length_error);
// assign(CharT const* s).
BOOST_TEST(static_cstring<3>{}.assign("abc") == "abc");
BOOST_TEST(static_cstring<3>{"*"}.assign("abc") == "abc");
BOOST_TEST_THROWS(static_cstring<1>{}.assign("abc"), std::length_error);
// operator=(const CharT* s).
{
static_cstring<3> s1;
s1 = "123";
BOOST_TEST(s1 == "123");
BOOST_TEST(*s1.end() == 0);
static_cstring<1> s2;
BOOST_TEST_THROWS(
s2 = "123",
std::length_error);
}
// Copy assignment.
{
static_cstring<3> s1("123");
static_cstring<3> s2;
s2 = s1;
BOOST_TEST(s2 == "123");
BOOST_TEST(*s2.end() == 0);
}
}
static
void
testCStringElements()
{
using ccs3 = static_cstring<3> const;
// at(size_type pos).
BOOST_TEST(static_cstring<3>{"abc"}.at(0) == 'a');
BOOST_TEST(static_cstring<3>{"abc"}.at(2) == 'c');
BOOST_TEST_THROWS(static_cstring<3>{""}.at(0), std::out_of_range);
BOOST_TEST_THROWS(static_cstring<3>{"abc"}.at(4), std::out_of_range);
// at(size_type pos) const.
BOOST_TEST(ccs3{"abc"}.at(0) == 'a');
BOOST_TEST(ccs3{"abc"}.at(2) == 'c');
BOOST_TEST_THROWS(ccs3{""}.at(0), std::out_of_range);
// operator[](size_type pos).
BOOST_TEST(static_cstring<3>{"abc"}[0] == 'a');
BOOST_TEST(static_cstring<3>{"abc"}[2] == 'c');
BOOST_TEST(static_cstring<3>{"abc"}[3] == 0);
BOOST_TEST(static_cstring<3>{""}[0] == 0);
// front() / back().
BOOST_TEST(static_cstring<3>{"abc"}.front() == 'a');
BOOST_TEST(static_cstring<3>{"abc"}.back() == 'c');
// data() / c_str().
{
static_cstring<3> s("123");
BOOST_TEST(std::memcmp(s.data(), "123", 3) == 0);
BOOST_TEST(std::memcmp(s.c_str(), "123\0", 4) == 0);
}
// Modification through element access.
{
static_cstring<5> s("12345");
s[1] = '_';
BOOST_TEST(s == "1_345");
s.front() = 'A';
BOOST_TEST(s == "A_345");
s.back() = 'Z';
BOOST_TEST(s == "A_34Z");
}
}
static
void
testCStringIterators()
{
{
static_cstring<3> s;
BOOST_TEST(std::distance(s.begin(), s.end()) == 0);
s = "123";
BOOST_TEST(std::distance(s.begin(), s.end()) == 3);
}
{
static_cstring<3> const s("123");
BOOST_TEST(std::distance(s.begin(), s.end()) == 3);
BOOST_TEST(std::distance(s.cbegin(), s.cend()) == 3);
}
// Iteration.
{
static_cstring<5> s("hello");
std::string result;
for (const char c : s)
{
result += c;
}
BOOST_TEST(result == "hello");
}
}
static
void
testCStringCapacity()
{
// empty().
BOOST_TEST(static_cstring<0>{}.empty());
BOOST_TEST(static_cstring<1>{}.empty());
BOOST_TEST(!static_cstring<1>{"a"}.empty());
// size().
BOOST_TEST(static_cstring<0>{}.size() == 0);
BOOST_TEST(static_cstring<1>{"a"}.size() == 1);
BOOST_TEST(static_cstring<5>{"abc"}.size() == 3);
// length().
BOOST_TEST(static_cstring<0>{}.length() == 0);
BOOST_TEST(static_cstring<3>{"abc"}.length() == 3);
// max_size().
BOOST_TEST(static_cstring<0>{}.max_size() == 0);
BOOST_TEST(static_cstring<5>{"abc"}.max_size() == 5);
// capacity().
BOOST_TEST(static_cstring<0>{}.capacity() == 0);
BOOST_TEST(static_cstring<5>{"abc"}.capacity() == 5);
}
static
void
testCStringClear()
{
static_cstring<3> s("123");
BOOST_TEST(!s.empty());
s.clear();
BOOST_TEST(s.empty());
BOOST_TEST(s.size() == 0);
BOOST_TEST(*s.end() == 0);
BOOST_TEST(s == "");
}
static
void
testCStringPushPop()
{
// push_back().
{
static_cstring<5> s("abc");
s.push_back('d');
BOOST_TEST(s == "abcd");
BOOST_TEST(s.size() == 4);
BOOST_TEST(*s.end() == 0);
s.push_back('e');
BOOST_TEST(s == "abcde");
BOOST_TEST(s.size() == 5);
BOOST_TEST_THROWS(s.push_back('f'), std::length_error);
}
// pop_back().
{
static_cstring<5> s("abcde");
s.pop_back();
BOOST_TEST(s == "abcd");
BOOST_TEST(s.size() == 4);
BOOST_TEST(*s.end() == 0);
s.pop_back();
s.pop_back();
s.pop_back();
s.pop_back();
BOOST_TEST(s.empty());
}
}
static
void
testCStringAppend()
{
// append(const CharT* s).
{
static_cstring<12> s("Hello");
s.append(", World");
BOOST_TEST(s == "Hello, World");
BOOST_TEST(*s.end() == 0);
}
{
static_cstring<5> s("abc");
BOOST_TEST_THROWS(s.append("def"), std::length_error);
}
// append(const CharT* s, size_type count)
{
static_cstring<10> s("abc");
s.append("defgh", 3);
BOOST_TEST(s == "abcdef");
BOOST_TEST(*s.end() == 0);
}
// append(size_type count, CharT ch)
{
static_cstring<10> s("abc");
s.append(3, 'x');
BOOST_TEST(s == "abcxxx");
BOOST_TEST(*s.end() == 0);
BOOST_TEST_THROWS(s.append(5, 'y'), std::length_error);
}
// operator+=()
{
static_cstring<10> s("abc");
s += "def";
BOOST_TEST(s == "abcdef");
s += 'g';
BOOST_TEST(s == "abcdefg");
BOOST_TEST(*s.end() == 0);
}
}
static
void
testCStringComparison()
{
// operator==() / operator!=().
{
static_cstring<10> a("abc");
static_cstring<10> b("abc");
static_cstring<10> c("abd");
BOOST_TEST(a == b);
BOOST_TEST(!(a == c));
BOOST_TEST(a != c);
BOOST_TEST(!(a != b));
}
// operator<(), <=(), >(), >=().
{
static_cstring<10> a("abc");
static_cstring<10> b("abd");
BOOST_TEST(a < b);
BOOST_TEST(a <= b);
BOOST_TEST(a <= a);
BOOST_TEST(b > a);
BOOST_TEST(b >= a);
BOOST_TEST(b >= b);
}
// Comparison with CharT const*.
{
static_cstring<10> s("hello");
BOOST_TEST(s == "hello");
BOOST_TEST("hello" == s);
BOOST_TEST(s != "world");
BOOST_TEST("world" != s);
}
// compare().
{
static_cstring<10> s("abc");
BOOST_TEST(s.compare("abc") == 0);
BOOST_TEST(s.compare("abd") < 0);
BOOST_TEST(s.compare("abb") > 0);
}
}
static
void
testCStringConversion()
{
// operator string_view().
{
static_cstring<10> s("hello");
std::string_view sv = s;
BOOST_TEST(sv == "hello");
BOOST_TEST(sv.size() == 5);
}
// str().
{
static_cstring<10> s("hello");
std::string str = s.str();
BOOST_TEST(str == "hello");
BOOST_TEST(str.size() == 5);
}
}
static
void
testCStringStream()
{
static_cstring<10> s("hello");
std::ostringstream oss;
oss << s;
BOOST_TEST(oss.str() == "hello");
}
static
void
testCStringSwap()
{
static_cstring<10> a("hello");
static_cstring<10> b("world");
a.swap(b);
BOOST_TEST(a == "world");
BOOST_TEST(b == "hello");
}
static
void
testCStringConstexpr()
{
// constexpr construction and operations.
constexpr static_cstring<10> ce("test");
static_assert(ce.size() == 4, "");
static_assert(ce[0] == 't', "");
static_assert(ce[1] == 'e', "");
static_assert(ce[2] == 's', "");
static_assert(ce[3] == 't', "");
static_assert(!ce.empty(), "");
static_assert(ce.max_size() == 10, "");
static_assert(ce.capacity() == 10, "");
constexpr static_cstring<5> ce_empty;
static_assert(ce_empty.empty(), "");
static_assert(ce_empty.size() == 0, "");
}
// Helper struct to test NTTP.
template<basic_static_cstring S>
struct NTTPHelper
{
static constexpr std::size_t size() noexcept
{
return S.size();
}
static constexpr const char* c_str() noexcept
{
return S.c_str();
}
};
static
void
testCStringNTTP()
{
// Test non-type template parameter usage (C++20).
// Test size deduction from string literals.
BOOST_TEST(NTTPHelper<"hello">::size() == 5);
BOOST_TEST(NTTPHelper<"">::size() == 0);
BOOST_TEST(NTTPHelper<"test">::size() == 4);
// Test that different strings create different types
constexpr bool same_type = std::is_same_v<
NTTPHelper<"hello">,
NTTPHelper<"hello">>;
BOOST_TEST(same_type);
constexpr bool different_type = !std::is_same_v<
NTTPHelper<"hello">,
NTTPHelper<"world">>;
BOOST_TEST(different_type);
// Test constexpr access.
constexpr std::size_t len = NTTPHelper<"constexpr">::size();
static_assert(len == 9, "");
}
static
void
testCStringPODUsage()
{
// Test usage in POD types (the original motivation).
struct UserRecord
{
int id;
static_cstring<63> name;
unsigned int flags;
};
static_assert(sizeof(static_cstring<63>) == 64, "");
static_assert(std::is_trivially_copyable<UserRecord>::value, "");
UserRecord user{};
user.id = 42;
user.name = "Alice";
user.flags = 0xFF;
BOOST_TEST(user.id == 42);
BOOST_TEST(user.name.size() == 5);
BOOST_TEST(user.name == "Alice");
BOOST_TEST(user.flags == 0xFF);
// Copy the struct.
UserRecord copy = user;
BOOST_TEST(copy.name == "Alice");
// memcpy() should work.
UserRecord memcpy_dest;
std::memcpy(&memcpy_dest, &user, sizeof(UserRecord));
BOOST_TEST(memcpy_dest.name == "Alice");
}
static
void
testCStringLargeCapacity()
{
// Test strings with N > UCHAR_MAX (no remaining-capacity trick).
{
static_cstring<300> s;
BOOST_TEST(s.empty());
BOOST_TEST(s.size() == 0);
s = "This is a test string";
BOOST_TEST(s.size() == 21);
BOOST_TEST(s == "This is a test string");
s.clear();
BOOST_TEST(s.empty());
}
// Large string operations.
{
static_cstring<500> s;
s.assign(400, 'x');
BOOST_TEST(s.size() == 400);
BOOST_TEST(s[0] == 'x');
BOOST_TEST(s[399] == 'x');
BOOST_TEST(*s.end() == 0);
}
}
static
void
testCStringWideChar()
{
// Test with wchar_t.
{
static_wcstring<10> ws;
BOOST_TEST(ws.empty());
BOOST_TEST(ws.size() == 0);
}
{
static_wcstring<10> ws(L"hello");
BOOST_TEST(ws.size() == 5);
BOOST_TEST(ws[0] == L'h');
BOOST_TEST(ws[4] == L'o');
BOOST_TEST(*ws.end() == 0);
}
}
int
runTests()
{
testCStringSizeGuarantee();
testCStringRemainingCapacityTrick();
testCStringTypeTraits();
testCStringConstruct();
testCStringAssignment();
testCStringElements();
testCStringIterators();
testCStringCapacity();
testCStringClear();
testCStringPushPop();
testCStringAppend();
testCStringComparison();
testCStringConversion();
testCStringStream();
testCStringSwap();
testCStringConstexpr();
testCStringNTTP();
testCStringPODUsage();
testCStringLargeCapacity();
testCStringWideChar();
return report_errors();
}
}
}
int
main()
{
return boost::static_strings::runTests();
}

View File

@@ -279,4 +279,21 @@ using basic_string_view =
#define BOOST_STATIC_STRING_USE_STD_FORMAT
#endif
#if defined(__GNUC__) && (__GNUC__ >= 5) && (__GNUC__ <= 10) && !defined(__clang__)
// Workaround for GCC complaining about nested classes being private.
#define BOOST_STATIC_STRING_GCC_NESTED_CLASS_WORKAROUND public:
#else
#define BOOST_STATIC_STRING_GCC_NESTED_CLASS_WORKAROUND
#endif
// GCC 9 incorrectly rejects the pointer equality comparison in
// ptr_in_range() in constant expressions. GCC 10 and later handle
// it correctly.
//
// Clang 3.7 and 9-19 have the same issue.
#if (defined(__GNUC__) && !defined(__clang__) && (__GNUC__ == 9)) \
|| (defined(__clang__) && ((__clang_major__ == 3 && __clang_minor__ == 7) || ((__clang_major__ >= 9) && (__clang_major__ <= 19))))
#define BOOST_STATIC_STRING_CONSTEXPR_PTR_CMP_BROKEN
#endif
#endif

View File

@@ -314,103 +314,129 @@ copy_with_traits(
template<std::size_t N, typename CharT, typename Traits>
class static_string_base
{
private:
using derived_type = basic_static_string<N, CharT, Traits>;
friend derived_type;
using size_type = smallest_width<N>;
using value_type = typename Traits::char_type;
using pointer = value_type*;
using const_pointer = const value_type*;
public:
BOOST_STATIC_STRING_CPP11_CONSTEXPR
static_string_base() noexcept { };
BOOST_STATIC_STRING_CPP14_CONSTEXPR
pointer
data_impl() noexcept
BOOST_STATIC_STRING_GCC_NESTED_CLASS_WORKAROUND
struct size
{
return data_;
}
class basic_static_string
{
friend derived_type;
BOOST_STATIC_STRING_CPP14_CONSTEXPR
const_pointer
data_impl() const noexcept
BOOST_STATIC_STRING_CPP11_CONSTEXPR
size_type
size_impl() const noexcept
{
return size;
}
BOOST_STATIC_STRING_CPP14_CONSTEXPR
size_type
size_impl(std::size_t n) noexcept
{
// Functions that set size will throw
// if the new size would exceed max_size()
// therefore we can guarantee that this will
// not lose data.
return size = static_cast<size_type>(n);
}
public:
size_type size = 0;
};
};
struct data
{
return data_;
}
class basic_static_string
{
friend derived_type;
BOOST_STATIC_STRING_CPP11_CONSTEXPR
std::size_t
size_impl() const noexcept
{
return size_;
}
BOOST_STATIC_STRING_CPP14_CONSTEXPR
pointer
data_impl() noexcept
{
return data;
}
BOOST_STATIC_STRING_CPP14_CONSTEXPR
std::size_t
set_size(std::size_t n) noexcept
{
// Functions that set size will throw
// if the new size would exceed max_size()
// therefore we can guarantee that this will
// not lose data.
return size_ = size_type(n);
}
BOOST_STATIC_STRING_CPP11_CONSTEXPR
const_pointer
data_impl() const noexcept
{
return data;
}
BOOST_STATIC_STRING_CPP14_CONSTEXPR
void
term_impl() noexcept
{
Traits::assign(data_[size_], value_type());
}
size_type size_ = 0;
value_type data_[N + 1]{};
public:
value_type data[N + 1]{};
};
};
};
// Optimization for when the size is 0
template<typename CharT, typename Traits>
class static_string_base<0, CharT, Traits>
{
private:
using derived_type = basic_static_string<0, CharT, Traits>;
friend derived_type;
using size_type = std::size_t;
using value_type = typename Traits::char_type;
using pointer = value_type*;
public:
BOOST_STATIC_STRING_CPP11_CONSTEXPR
static_string_base() noexcept { }
// Modifying the null terminator is UB
BOOST_STATIC_STRING_CPP11_CONSTEXPR
pointer
data_impl() const noexcept
BOOST_STATIC_STRING_GCC_NESTED_CLASS_WORKAROUND
struct size
{
return const_cast<pointer>(&null_);
}
class basic_static_string
{
friend derived_type;
BOOST_STATIC_STRING_CPP11_CONSTEXPR
std::size_t
size_impl() const noexcept
BOOST_STATIC_STRING_CPP11_CONSTEXPR
size_type
size_impl() const noexcept
{
return 0;
}
BOOST_STATIC_STRING_CPP11_CONSTEXPR
size_type
size_impl(std::size_t) const noexcept
{
return 0;
}
};
};
struct data
{
return 0;
}
class basic_static_string
{
friend derived_type;
BOOST_STATIC_STRING_CPP11_CONSTEXPR
std::size_t
set_size(std::size_t) const noexcept
{
return 0;
}
BOOST_STATIC_STRING_CPP11_CONSTEXPR
pointer
data_impl() const noexcept
{
return const_cast<pointer>(&data);
}
BOOST_STATIC_STRING_CPP14_CONSTEXPR
void
term_impl() const noexcept { }
private:
static constexpr const value_type null_{};
public:
static constexpr value_type data{};
};
};
};
// This is only needed in C++14 and lower.
// see http://eel.is/c++draft/depr.static.constexpr
#ifndef BOOST_STATIC_STRING_CPP17
#if 0
template<typename CharT, typename Traits>
constexpr
const
@@ -419,6 +445,13 @@ static_string_base<0, CharT, Traits>::
null_;
#endif
template<typename CharT, typename Traits>
constexpr
typename static_string_base<0, CharT, Traits>::value_type
static_string_base<0, CharT, Traits>::data::basic_static_string::data;
#endif
template<typename CharT, typename Traits>
BOOST_STATIC_STRING_CPP14_CONSTEXPR
inline
@@ -775,7 +808,7 @@ to_static_wstring_float_impl(double value) noexcept
// circuit evaluation will ensure that the
// second operand is not evaluated on conforming
// implementations.
long long num_written =
int num_written =
std::swprintf(buffer, N + 1, L"%f", value);
if (num_written < 0 ||
num_written > narrow)
@@ -834,7 +867,7 @@ to_static_wstring_float_impl(long double value) noexcept
// circuit evaluation will ensure that the
// second operand is not evaluated on conforming
// implementations.
long long num_written =
int num_written =
std::swprintf(buffer, N + 1, L"%Lf", value);
if (num_written < 0 ||
num_written > narrow)
@@ -1054,7 +1087,11 @@ template<std::size_t N, typename CharT,
typename Traits = std::char_traits<CharT>>
class basic_static_string
#ifndef BOOST_STATIC_STRING_DOCS
: private detail::static_string_base<N, CharT, Traits>
// : public detail::static_string_base<N, CharT, Traits>
: public detail::static_string_base<
N, CharT, Traits>::size::basic_static_string
, public detail::static_string_base<
N, CharT, Traits>::data::basic_static_string
#endif
{
private:
@@ -1202,7 +1239,7 @@ public:
BOOST_STATIC_STRING_CPP14_CONSTEXPR
basic_static_string(const_pointer s)
{
assign(s);
assign(s, s + traits_type::length(s));
}
/** Constructor.
@@ -1373,7 +1410,7 @@ public:
basic_static_string&
operator=(const_pointer s)
{
return assign(s);
return assign(s, s + traits_type::length(s));
}
/** Assign to the string.
@@ -2339,7 +2376,7 @@ public:
void
clear() noexcept
{
this->set_size(0);
this->size_impl(0);
term();
}
@@ -2931,7 +2968,7 @@ public:
pop_back() noexcept
{
BOOST_STATIC_STRING_ASSERT(!empty());
this->set_size(size() - 1);
this->size_impl(size() - 1);
term();
}
@@ -3107,7 +3144,7 @@ public:
InputIterator first,
InputIterator last)
{
this->set_size(size() + read_back(true, first, last));
this->size_impl(size() + read_back(true, first, last));
return term();
}
@@ -3733,8 +3770,8 @@ public:
`{data() + pos, std::min(count, size() - pos))`.
@param pos The index to being the substring at. The
default arugment for this parameter is `0`.
@param count The length of the substring. The default arugment
default argument for this parameter is `0`.
@param count The length of the substring. The default argument
for this parameter is @ref npos.
@throw std::out_of_range `pos > size()`
@@ -3764,8 +3801,8 @@ public:
to `{data() + pos, std::min(count, size() - pos))`.
@param pos The index to being the substring at. The
default arugment for this parameter is `0`.
@param count The length of the substring. The default arugment
default argument for this parameter is `0`.
@param count The length of the substring. The default argument
for this parameter is @ref npos.
@throw std::out_of_range `pos > size()`
@@ -5584,11 +5621,22 @@ public:
}
private:
BOOST_STATIC_STRING_CPP14_CONSTEXPR
void term_impl(std::true_type) noexcept
{
traits_type::assign(data()[size()], value_type());
}
BOOST_STATIC_STRING_CPP14_CONSTEXPR
void term_impl(std::false_type) noexcept
{
}
BOOST_STATIC_STRING_CPP14_CONSTEXPR
basic_static_string&
term() noexcept
{
this->term_impl();
term_impl(std::integral_constant<bool, N != 0>());
return *this;
}
@@ -5596,7 +5644,7 @@ private:
basic_static_string&
assign_char(value_type ch, std::true_type) noexcept
{
this->set_size(1);
this->size_impl(1);
traits_type::assign(data()[0], ch);
return term();
}
@@ -5670,7 +5718,7 @@ private:
const_pointer s,
size_type count) noexcept
{
this->set_size(count);
this->size_impl(count);
traits_type::copy(data(), s, size() + 1);
return *this;
}
@@ -6481,7 +6529,7 @@ to_static_wstring(long double value) noexcept
#ifdef BOOST_STATIC_STRING_USE_DEDUCT
template<std::size_t N, typename CharT>
basic_static_string(const CharT(&)[N]) ->
basic_static_string<N, CharT, std::char_traits<CharT>>;
basic_static_string<N - 1, CharT, std::char_traits<CharT>>;
#endif
//------------------------------------------------------------------------------
@@ -6591,7 +6639,7 @@ assign(
if (count > max_size())
detail::throw_exception<std::length_error>(
"count > max_size()");
this->set_size(count);
this->size_impl(count);
traits_type::assign(data(), size(), ch);
return term();
}
@@ -6608,7 +6656,7 @@ assign(
if (count > max_size())
detail::throw_exception<std::length_error>(
"count > max_size()");
this->set_size(count);
this->size_impl(count);
traits_type::move(data(), s, size());
return term();
}
@@ -6630,13 +6678,13 @@ assign(
{
if (i >= max_size())
{
this->set_size(i);
this->size_impl(i);
term();
detail::throw_exception<std::length_error>("n > max_size()");
}
traits_type::assign(*ptr, *first);
}
this->set_size(ptr - data());
this->size_impl(ptr - data());
return term();
}
@@ -6658,7 +6706,10 @@ insert(
const auto index = pos - curr_data;
traits_type::move(&curr_data[index + count], &curr_data[index], curr_size - index + 1);
traits_type::assign(&curr_data[index], count, ch);
this->set_size(curr_size + count);
this->size_impl(curr_size + count);
#if defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 7
term();
#endif
return &curr_data[index];
}
@@ -6711,7 +6762,7 @@ insert(
traits_type::copy(dest, src, count);
}
}
this->set_size(curr_size + count);
this->size_impl(curr_size + count);
return curr_data + index;
}
@@ -6735,7 +6786,7 @@ insert(
const auto count = read_back(false, first, last);
const std::size_t index = pos - curr_data;
std::rotate(&curr_data[index], &curr_data[curr_size + 1], &curr_data[curr_size + count + 1]);
this->set_size(curr_size + count);
this->size_impl(curr_size + count);
return curr_data + index;
}
@@ -6751,7 +6802,7 @@ erase(
const auto curr_data = data();
const std::size_t index = first - curr_data;
traits_type::move(&curr_data[index], last, (end() - last) + 1);
this->set_size(size() - std::size_t(last - first));
this->size_impl(size() - std::size_t(last - first));
return curr_data + index;
}
@@ -6767,7 +6818,7 @@ push_back(
detail::throw_exception<std::length_error>(
"curr_size >= max_size()");
traits_type::assign(data()[curr_size], ch);
this->set_size(curr_size + 1);
this->size_impl(curr_size + 1);
term();
}
@@ -6785,7 +6836,7 @@ append(
detail::throw_exception<std::length_error>(
"count > max_size() - size()");
traits_type::assign(end(), count, ch);
this->set_size(curr_size + count);
this->size_impl(curr_size + count);
return term();
}
@@ -6803,7 +6854,7 @@ append(
detail::throw_exception<std::length_error>(
"count > max_size() - size()");
traits_type::copy(end(), s, count);
this->set_size(curr_size + count);
this->size_impl(curr_size + count);
return term();
}
@@ -6819,7 +6870,7 @@ resize(size_type n, value_type c)
const auto curr_size = size();
if(n > curr_size)
traits_type::assign(data() + curr_size, n - curr_size, c);
this->set_size(n);
this->size_impl(n);
term();
}
@@ -6839,7 +6890,7 @@ resize_and_overwrite(
CharT* p = data();
const auto new_size = std::move(op)(p, n);
BOOST_STATIC_STRING_ASSERT(new_size >= 0 && size_type(new_size) <= n);
this->set_size(size_type(new_size));
this->size_impl(size_type(new_size));
term();
}
@@ -6851,9 +6902,9 @@ swap(basic_static_string& s) noexcept
{
const auto curr_size = size();
basic_static_string tmp(s);
s.set_size(curr_size);
s.size_impl(curr_size);
traits_type::copy(&s.data()[0], data(), curr_size + 1);
this->set_size(tmp.size());
this->size_impl(tmp.size());
traits_type::copy(data(), tmp.data(), size() + 1);
}
@@ -6872,10 +6923,8 @@ swap(basic_static_string<M, CharT, Traits>& s)
detail::throw_exception<std::length_error>(
"s.size() > max_size()");
basic_static_string tmp(s);
s.set_size(curr_size);
traits_type::copy(&s.data()[0], data(), curr_size + 1);
this->set_size(tmp.size());
traits_type::copy(data(), &tmp.data()[0], size() + 1);
s.assign_unchecked(data(), curr_size);
assign_unchecked(tmp.data(), tmp.size());
}
template<std::size_t N, typename CharT, typename Traits>
@@ -6898,7 +6947,7 @@ replace(
const auto pos = i1 - curr_data;
traits_type::move(&curr_data[pos + n], i2, (end() - i2) + 1);
traits_type::assign(&curr_data[pos], n, c);
this->set_size((curr_size - n1) + n);
this->size_impl((curr_size - n1) + n);
return *this;
}
@@ -6959,7 +7008,7 @@ replace(
traits_type::move(&curr_data[pos + n2], &curr_data[pos + n1], curr_size - pos - n1 + 1);
}
}
this->set_size((curr_size - n1) + n2);
this->size_impl((curr_size - n1) + n2);
return *this;
}
@@ -6991,7 +7040,7 @@ replace(
// Move everything from the end of the splice point to the end of the rotated string to
// the begining of the splice point
traits_type::move(&curr_data[pos + n2], &curr_data[pos + n2 + n1], ((curr_size - n1) + n2) - pos);
this->set_size((curr_size - n1) + n2);
this->size_impl((curr_size - n1) + n2);
return *this;
}
@@ -7163,7 +7212,7 @@ replace_unchecked(
"replaced string exceeds max_size()");
traits_type::move(&curr_data[pos + n2], i2, (end() - i2) + 1);
traits_type::copy(&curr_data[pos], s, n2);
this->set_size((curr_size - n1) + n2);
this->size_impl((curr_size - n1) + n2);
return *this;
}
@@ -7185,7 +7234,7 @@ insert_unchecked(
const std::size_t index = pos - curr_data;
traits_type::move(&curr_data[index + count], pos, (end() - pos) + 1);
traits_type::copy(&curr_data[index], s, count);
this->set_size(curr_size + count);
this->size_impl(curr_size + count);
return curr_data + index;
}

View File

@@ -11,9 +11,9 @@
"String"
],
"maintainers": [
"Krystian Stasiowski <sdkrystian@gmail.com>",
"Alan de Freitas <alandefreitas@gmail.com>",
"Vinnie Falco <vinnie.falco@gmail.com>"
"Vinnie Falco <vinnie.falco@gmail.com>",
"Gennaro Prota <gennaro.prota@gmail.com>"
],
"cxxstd": "11"
}

View File

@@ -4,16 +4,6 @@
namespace boost {
namespace static_strings {
static_assert(std::is_base_of<
detail::static_string_base<0, char, std::char_traits<char>>,
static_string<0>>::value,
"the zero size optimization shall be used for N = 0");
static_assert(std::is_base_of<
detail::static_string_base<(std::numeric_limits<char>::max)() + 1, char, std::char_traits<char>>,
static_string<(std::numeric_limits<char>::max)() + 1>>::value,
"the minimum size type optimization shall be used for N > 0");
static_assert(!detail::is_input_iterator<int>::value, "is_input_iterator is incorrect");
static_assert(!detail::is_input_iterator<double>::value, "is_input_iterator is incorrect");
static_assert(detail::is_input_iterator<int*>::value, "is_input_iterator is incorrect");

View File

@@ -22,38 +22,77 @@ struct cxper_char_traits
using int_type = int;
using state_type = std::mbstate_t;
static constexpr void assign(char_type& a, const char_type& b) noexcept { a = b; }
static constexpr bool eq(char_type a, char_type b) noexcept { return a == b; }
static constexpr bool lt(char_type a, char_type b) noexcept { return a < b; }
static constexpr void assign(char_type& a, const char_type& b) noexcept
{
a = b;
}
static constexpr bool eq(char_type a, char_type b) noexcept
{
return a == b;
}
static constexpr bool lt(char_type a, char_type b) noexcept
{
return a < b;
}
static constexpr int compare(const char_type* a, const char_type* b, std::size_t n)
{
for (; n--; ++a, ++b)
{
if(lt(*a, *b))
return 1;
else if(lt(*b, *a))
return -1;
}
return 0;
}
static constexpr int compare(const char_type*, const char_type*, std::size_t) { return 0; }
static constexpr std::size_t length(const char_type* s)
{
std::size_t n = 0;
while (*(s++));
return n;
auto ptr = s;
while (!eq(*ptr, char_type()))
++ptr;
return ptr - s;
}
static constexpr const char_type* find(const char_type*, std::size_t, const char_type&){ return 0; }
static constexpr const char_type* find(const char_type* s, std::size_t n, const char_type& ch)
{
for (; n--; ++s)
{
if (eq(*s, ch))
return s;
}
return nullptr;
}
static constexpr char_type* move(char_type* dest, const char_type* src, std::size_t n)
{
const auto temp = dest;
while (n--)
*(dest++) = *(src++);
return temp;
// This implementation does not handle overlapping ranges where
// dest > src. A correct implementation would need to detect this
// case and copy backwards, but detecting overlap requires pointer
// comparisons that many of the tested compiles (incorrectly) refuse
// in constant expressions.
//
// Since cxper_char_traits is only used for testing constexpr
// functionality and the tests do not exercise overlapping moves
// where dest > src, this simple forward copy is sufficient.
return copy(dest, src, n);
}
static constexpr char_type* copy(char_type* dest, const char_type* src, std::size_t n)
{
const auto temp = dest;
while (n--)
*(dest++) = *(src++);
return temp;
for (auto ptr = dest; n--;)
assign(*ptr++, *src++);
return dest;
}
static constexpr char_type* assign(char_type* dest, std::size_t n, char_type ch)
{
const auto temp = dest;
while (n--)
*(dest++) = ch;
return temp;
for (auto ptr = dest; n--;)
assign(*ptr++, ch);
return dest;
}
};
#else
@@ -67,6 +106,23 @@ bool
testConstantEvaluation()
{
#ifdef BOOST_STATIC_STRING_CPP20
// Check construction in a constexpr context
constexpr basic_static_string s("hello");
static_assert(s.size() == 5);
static_assert(s.static_capacity == 5);
static_assert(s == "hello");
// Check assignment in a constexpr context
constexpr auto s2 =
[]()
{
basic_static_string s("hello");
s = "world";
return s;
}();
static_assert(s2 == "world");
// c++20 constexpr tests
cstatic_string a;
cstatic_string b(1, 'a');
@@ -200,7 +256,8 @@ testConstantEvaluation()
a.replace(a.begin(), a.end(), a.begin(), a.end());
a.replace(a.begin(), a.end(), {'a'});
#ifdef BOOST_STATIC_STRING_IS_CONST_EVAL
#if defined(BOOST_STATIC_STRING_IS_CONST_EVAL) \
&& !defined(BOOST_STATIC_STRING_CONSTEXPR_PTR_CMP_BROKEN)
a.clear();
a.replace(a.begin(), a.end(), "a");
a.replace(a.begin(), a.end(), "a", 1);
@@ -388,7 +445,8 @@ testConstantEvaluation()
a.replace(a.begin(), a.end(), a.begin(), a.end());
a.replace(a.begin(), a.end(), {'a'});
#ifdef BOOST_STATIC_STRING_IS_CONST_EVAL
#if defined(BOOST_STATIC_STRING_IS_CONST_EVAL) \
&& !defined(BOOST_STATIC_STRING_CONSTEXPR_PTR_CMP_BROKEN)
a.clear();
a.replace(a.begin(), a.end(), "a");
a.replace(a.begin(), a.end(), "a", 1);
@@ -560,7 +618,8 @@ testConstantEvaluation()
a.replace(a.begin(), a.end(), a.begin(), a.end());
a.replace(a.begin(), a.end(), {'a'});
#ifdef BOOST_STATIC_STRING_IS_CONST_EVAL
#if defined(BOOST_STATIC_STRING_IS_CONST_EVAL) \
&& !defined(BOOST_STATIC_STRING_CONSTEXPR_PTR_CMP_BROKEN)
a.clear();
a.replace(a.begin(), a.end(), "a");
a.replace(a.begin(), a.end(), "a", 1);
@@ -607,5 +666,28 @@ testConstantEvaluation()
cstatic_string().empty();
#endif
}
#if __cpp_nontype_template_args >= 201911L
template<basic_static_string<32, char, cxper_char_traits> X>
struct nttp_primary
{
static constexpr bool value = false;
};
template<>
struct nttp_primary<"test string">
{
static constexpr bool value = true;
};
static_assert(!nttp_primary<"random string">::value,
"structural equality broken");
static_assert(nttp_primary<"test string">::value,
"structural equality broken");
#endif
} // static_strings
} // boost