Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: missing constructors and operators in substrate/console #75

Merged
merged 5 commits into from
Aug 21, 2023
Merged

Fix: missing constructors and operators in substrate/console #75

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f00c505
console: Added several missing default constructors and opertors for …
dragonmux Aug 21, 2023
2c13fe4
console: Added several missing default constructors and opertors for …
dragonmux Aug 21, 2023
85c26a5
console: Added several missing default constructors and opertors for …
dragonmux Aug 21, 2023
4c4e788
console: Further tweaked printable_t types while trying to protect fr…
dragonmux Aug 21, 2023
6483ea5
console: Fixed some missing nodiscard markings
dragonmux Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions substrate/console
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ namespace substrate

struct SUBSTRATE_CLS_API printable_t
{
printable_t() = default;
constexpr printable_t() = default;
virtual void operator()(const consoleStream_t &) const noexcept = 0;
virtual ~printable_t() noexcept = default;

printable_t(const printable_t &) = delete;
printable_t(printable_t &&) = delete;
printable_t &operator =(const printable_t &) = delete;
printable_t &operator =(printable_t &&) = delete;
protected:
constexpr printable_t(const printable_t &) = default;
constexpr printable_t(printable_t &&) = default;
printable_t &operator =(const printable_t &) = default;
printable_t &operator =(printable_t &&) = default;
};

struct SUBSTRATE_CLS_API consoleStream_t final
Expand All @@ -55,8 +56,8 @@ namespace substrate
public:
constexpr consoleStream_t() noexcept = default;
consoleStream_t(const int32_t desc) noexcept : fd{desc} { checkTTY(); }
constexpr bool valid() const noexcept { return fd != -1; }
constexpr bool isTTY() const noexcept { return _tty; }
SUBSTRATE_NO_DISCARD(constexpr bool valid() const noexcept) { return fd != -1; }
SUBSTRATE_NO_DISCARD(constexpr bool isTTY() const noexcept) { return _tty; }
#if defined(_WIN32)
void *handle() const noexcept { return reinterpret_cast<void *>(_get_osfhandle(fd)); }
#endif
Expand Down Expand Up @@ -225,6 +226,11 @@ namespace substrate

public:
constexpr asInt_t(const int_t value) noexcept : value_{value} { }
constexpr asInt_t(const asInt_t &) noexcept = default;
constexpr asInt_t(asInt_t &&) noexcept = default;
~asInt_t() noexcept final = default;
asInt_t &operator =(const asInt_t &) noexcept = default;
asInt_t &operator =(asInt_t &&) noexcept = default;
void operator()(const consoleStream_t &stream) const noexcept final
{ printTo<int_t>(stream); }
};
Expand Down Expand Up @@ -257,8 +263,13 @@ namespace substrate
constexpr asHex_t(const T value) noexcept : maxDigits{sizeof(T) * 2},
msbShift{uint8_t(4U * (maxDigits - 1U))}, _value(value) { }

SUBSTRATE_NOINLINE
void operator ()(const consoleStream_t &stream) const noexcept final
constexpr asHex_t(const asHex_t &) noexcept = default;
constexpr asHex_t(asHex_t &&) noexcept = default;
~asHex_t() noexcept final = default;
asHex_t &operator =(const asHex_t &) noexcept = default;
asHex_t &operator =(asHex_t &&) noexcept = default;

SUBSTRATE_NOINLINE void operator ()(const consoleStream_t &stream) const noexcept final
{
uintmax_t value{_value};
// If we've been asked to pad by more than the maximum possible length of the number
Expand Down Expand Up @@ -288,7 +299,7 @@ namespace substrate
stream.write(char(digit + 7));
else
stream.write(digit);
value <<= 4;
value <<= 4U;
}
}
};
Expand Down Expand Up @@ -330,6 +341,11 @@ namespace substrate

public:
constexpr asTime_t(const uint64_t _value) noexcept : value{_value} { }
constexpr asTime_t(const asTime_t &) noexcept = default;
constexpr asTime_t(asTime_t &&) noexcept = default;
~asTime_t() noexcept final = default;
asTime_t &operator =(const asTime_t &) noexcept = default;
asTime_t &operator =(asTime_t &&) noexcept = default;

void operator ()(const consoleStream_t &stream) const noexcept final
{
Expand Down
Loading