Skip to content

Commit e70e986

Browse files
Spartan322Spartan322
authored
Merge pull request #576 from OpenVicProject/add/stack-string
Add StackString
2 parents ddfabed + 95de343 commit e70e986

4 files changed

Lines changed: 83 additions & 154 deletions

File tree

‎src/openvic-simulation/types/Colour.hpp‎

Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
#include <range/v3/algorithm/rotate.hpp>
2525

26-
#include "openvic-simulation/utility/Utility.hpp"
26+
#include "openvic-simulation/types/StackString.hpp"
2727
#include "openvic-simulation/utility/StringUtils.hpp"
28-
#include "openvic-simulation/utility/Containers.hpp"
28+
#include "openvic-simulation/utility/Utility.hpp"
2929

3030
namespace OpenVic {
3131
template<typename ValueT, typename IntT, bool HasAlpha = true>
@@ -472,61 +472,17 @@ namespace OpenVic {
472472
return result;
473473
}
474474

475-
struct stack_string {
476-
static constexpr size_t bits_per_digit = 4;
477-
static constexpr size_t array_length = colour_traits::component_bit_size / bits_per_digit * 4;
478-
479-
private:
480-
std::array<char, array_length> array {};
481-
uint8_t string_size = 0;
482-
483-
constexpr stack_string() {};
484-
475+
struct stack_string final : StackString<colour_traits::component_bit_size / /*bits_per_digit*/ 4 * 4> {
476+
protected:
477+
using StackString<colour_traits::component_bit_size / /*bits_per_digit*/ 4 * 4>::StackString;
485478
friend inline constexpr stack_string basic_colour_t::to_hex_array(bool alpha) const;
486479
friend inline constexpr stack_string basic_colour_t::to_argb_hex_array() const;
487-
488-
public:
489-
constexpr const char* data() const {
490-
return array.data();
491-
}
492-
493-
constexpr size_t size() const {
494-
return string_size;
495-
}
496-
497-
constexpr size_t length() const {
498-
return string_size;
499-
}
500-
501-
constexpr decltype(array)::const_iterator begin() const {
502-
return array.begin();
503-
}
504-
505-
constexpr decltype(array)::const_iterator end() const {
506-
return begin() + size();
507-
}
508-
509-
constexpr decltype(array)::const_reference operator[](size_t index) const {
510-
return array[index];
511-
}
512-
513-
constexpr bool empty() const {
514-
return size() == 0;
515-
}
516-
517-
constexpr operator std::string_view() const {
518-
return std::string_view { data(), data() + size() };
519-
}
520-
521-
operator memory::string() const {
522-
return memory::string { data(), size() };
523-
}
524480
};
525481

526482
inline constexpr stack_string to_hex_array(bool alpha = colour_traits::has_alpha) const {
527483
stack_string str {};
528-
std::to_chars_result result = to_hex_chars(str.array.data(), str.array.data() + str.array.size(), alpha);
529-
str.string_size = result.ptr - str.data();
484+
std::to_chars_result result = to_hex_chars(str._array.data(), str._array.data() + str._array.size(), alpha);
485+
str._string_size = result.ptr - str.data();
530486
return str;
531487
}
532488

@@ -555,8 +511,8 @@ namespace OpenVic {
555511

556512
inline constexpr stack_string to_argb_hex_array() const {
557513
stack_string str {};
558-
std::to_chars_result result = to_argb_hex_chars(str.array.data(), str.array.data() + str.array.size());
559-
str.string_size = result.ptr - str.data();
514+
std::to_chars_result result = to_argb_hex_chars(str._array.data(), str._array.data() + str._array.size());
515+
str._string_size = result.ptr - str.data();
560516
return str;
561517
}
562518

‎src/openvic-simulation/types/Date.hpp‎

Lines changed: 10 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
#include <range/v3/algorithm/max_element.hpp>
1919

20+
#include "openvic-simulation/types/StackString.hpp"
2021
#include "openvic-simulation/utility/ErrorMacros.hpp"
2122
#include "openvic-simulation/utility/Getters.hpp"
22-
#include "openvic-simulation/utility/Utility.hpp"
2323
#include "openvic-simulation/utility/StringUtils.hpp"
24-
#include "openvic-simulation/utility/Containers.hpp"
24+
#include "openvic-simulation/utility/Utility.hpp"
2525

2626
namespace OpenVic {
2727
// A relative period between points in time, measured in days
@@ -322,56 +322,13 @@ namespace OpenVic {
322322
struct stack_string;
323323
inline constexpr stack_string to_array(bool pad_year = false, bool pad_month = true, bool pad_day = true) const;
324324

325-
struct stack_string {
326-
static constexpr size_t array_length = //
327-
fmt::detail::count_digits(uint64_t(std::numeric_limits<year_t>::max())) +
328-
fmt::detail::count_digits(uint64_t(MONTHS_IN_YEAR)) + fmt::detail::count_digits(uint64_t(MAX_DAYS_IN_MONTH)) +
329-
4;
330-
331-
private:
332-
std::array<char, array_length> array {};
333-
uint8_t string_size = 0;
334-
335-
constexpr stack_string() {};
336-
325+
struct stack_string final : StackString<
326+
fmt::detail::count_digits(uint64_t(std::numeric_limits<year_t>::max())) +
327+
fmt::detail::count_digits(uint64_t(MONTHS_IN_YEAR)) +
328+
fmt::detail::count_digits(uint64_t(MAX_DAYS_IN_MONTH)) + 4> {
329+
protected:
330+
using StackString::StackString;
337331
friend inline constexpr stack_string Date::to_array(bool pad_year, bool pad_month, bool pad_day) const;
338-
339-
public:
340-
constexpr const char* data() const {
341-
return array.data();
342-
}
343-
344-
constexpr size_t size() const {
345-
return string_size;
346-
}
347-
348-
constexpr size_t length() const {
349-
return string_size;
350-
}
351-
352-
constexpr decltype(array)::const_iterator begin() const {
353-
return array.begin();
354-
}
355-
356-
constexpr decltype(array)::const_iterator end() const {
357-
return begin() + size();
358-
}
359-
360-
constexpr decltype(array)::const_reference operator[](size_t index) const {
361-
return array[index];
362-
}
363-
364-
constexpr bool empty() const {
365-
return size() == 0;
366-
}
367-
368-
constexpr operator std::string_view() const {
369-
return std::string_view { data(), data() + size() };
370-
}
371-
372-
operator memory::string() const {
373-
return memory::string { data(), size() };
374-
}
375332
};
376333

377334
memory::string to_string(bool pad_year = false, bool pad_month = true, bool pad_day = true) const;
@@ -620,8 +577,8 @@ namespace OpenVic {
620577
inline constexpr Date::stack_string Date::to_array(bool pad_year, bool pad_month, bool pad_day) const {
621578
stack_string str {};
622579
std::to_chars_result result =
623-
to_chars(str.array.data(), str.array.data() + str.array.size(), pad_year, pad_month, pad_day);
624-
str.string_size = result.ptr - str.data();
580+
to_chars(str._array.data(), str._array.data() + str._array.size(), pad_year, pad_month, pad_day);
581+
str._string_size = result.ptr - str.data();
625582
return str;
626583
}
627584
}

‎src/openvic-simulation/types/StackString.hpp‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#pragma once
2+
3+
#include <array>
4+
#include <cstddef>
5+
#include <cstdint>
6+
#include <string_view>
7+
8+
#include "openvic-simulation/utility/Containers.hpp"
9+
10+
namespace OpenVic {
11+
template<size_t Size>
12+
struct StackString {
13+
static constexpr size_t array_length = Size;
14+
15+
protected:
16+
std::array<char, array_length> _array {};
17+
uint8_t _string_size = 0;
18+
19+
constexpr StackString() {}
20+
21+
public:
22+
constexpr const char* data() const {
23+
return _array.data();
24+
}
25+
26+
constexpr size_t size() const {
27+
return _string_size;
28+
}
29+
30+
constexpr size_t length() const {
31+
return _string_size;
32+
}
33+
34+
constexpr decltype(_array)::const_iterator begin() const {
35+
return _array.begin();
36+
}
37+
38+
constexpr decltype(_array)::const_iterator end() const {
39+
return begin() + size();
40+
}
41+
42+
constexpr decltype(_array)::const_reference operator[](size_t index) const {
43+
return _array[index];
44+
}
45+
46+
constexpr bool empty() const {
47+
return size() == 0;
48+
}
49+
50+
constexpr operator std::string_view() const {
51+
return std::string_view { data(), data() + size() };
52+
}
53+
54+
operator memory::string() const {
55+
return memory::string { data(), size() };
56+
}
57+
};
58+
}

‎src/openvic-simulation/types/fixed_point/FixedPoint.hpp‎

Lines changed: 6 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include <fmt/core.h>
1414

15+
#include "openvic-simulation/types/StackString.hpp"
1516
#include "openvic-simulation/utility/Getters.hpp"
1617
#include "openvic-simulation/utility/Logger.hpp"
1718
#include "openvic-simulation/utility/NumberUtils.hpp"
@@ -311,53 +312,10 @@ namespace OpenVic {
311312
struct stack_string;
312313
inline constexpr stack_string to_array(size_t decimal_places = -1) const;
313314

314-
struct stack_string {
315-
static constexpr size_t array_length = 25;
316-
317-
private:
318-
std::array<char, array_length> array {};
319-
uint8_t string_size = 0;
320-
321-
constexpr stack_string() {};
322-
315+
struct stack_string final : StackString<25> {
316+
protected:
317+
using StackString::StackString;
323318
friend inline constexpr stack_string fixed_point_t::to_array(size_t decimal_places) const;
324-
325-
public:
326-
constexpr const char* data() const {
327-
return array.data();
328-
}
329-
330-
constexpr size_t size() const {
331-
return string_size;
332-
}
333-
334-
constexpr size_t length() const {
335-
return string_size;
336-
}
337-
338-
constexpr decltype(array)::const_iterator begin() const {
339-
return array.begin();
340-
}
341-
342-
constexpr decltype(array)::const_iterator end() const {
343-
return begin() + size();
344-
}
345-
346-
constexpr decltype(array)::const_reference operator[](size_t index) const {
347-
return array[index];
348-
}
349-
350-
constexpr bool empty() const {
351-
return size() == 0;
352-
}
353-
354-
constexpr operator std::string_view() const {
355-
return std::string_view { data(), data() + size() };
356-
}
357-
358-
operator memory::string() const {
359-
return memory::string { data(), size() };
360-
}
361319
};
362320

363321
memory::string to_string(size_t decimal_places = -1) const {
@@ -751,8 +709,8 @@ namespace OpenVic {
751709

752710
inline constexpr fixed_point_t::stack_string fixed_point_t::to_array(size_t decimal_places) const {
753711
stack_string str {};
754-
std::to_chars_result result = to_chars(str.array.data(), str.array.data() + str.array.size(), decimal_places);
755-
str.string_size = result.ptr - str.data();
712+
std::to_chars_result result = to_chars(str._array.data(), str._array.data() + str._array.size(), decimal_places);
713+
str._string_size = result.ptr - str.data();
756714
return str;
757715
}
758716

0 commit comments

Comments
 (0)