Skip to content

AK: Allow Optional<T> to be used in constant expressions #4310

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

Merged
merged 11 commits into from
Apr 23, 2025
Merged

AK: Allow Optional<T> to be used in constant expressions #4310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
df29a78
LibWeb: Remove unuses variable in `PaintableBox.cpp`
yyny Apr 10, 2025
6eb23a3
AK: Add `IsOneOfIgnoringCVReference` to `StdLibExtraDetails.h`
yyny Apr 22, 2025
5da0322
AK: Allow `Optional<T>` to be used in constant expressions
yyny Apr 11, 2025
c4cf324
AK: Allow `Optional<{,Fly}String>` to be used in constant expressions
yyny Apr 10, 2025
030ddab
LibJS: Allow `Optional<Value>` to be used in constant expressions
yyny Apr 10, 2025
62d7f9d
LibJS: Allow `Optional<Completion>` to be used in constant expressions
yyny Apr 10, 2025
9b52069
Tests: Fix missing argument removed by `-cc1`
yyny Nov 20, 2024
66cc1ab
AK: Add `IsMemberPointer` to `StdLibExtraDetails.h`
yyny Apr 11, 2025
a0bae71
AK: Add `IsScalar` to `StdLibExtraDetails.h`
yyny Apr 11, 2025
e7a6e4a
AK: Loosen the restrictions on non-copyable/non-movable containers
yyny Apr 11, 2025
f6ac15b
AK: Allow the `Optional<T>` move assignment operator to be trivial
yyny Apr 11, 2025
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
4 changes: 4 additions & 0 deletions AK/Concepts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ concept OneOf = IsOneOf<U, Ts...>;
template<typename U, typename... Ts>
concept OneOfIgnoringCV = IsOneOfIgnoringCV<U, Ts...>;

template<typename U, typename... Ts>
concept OneOfIgnoringCVReference = IsOneOfIgnoringCVReference<U, Ts...>;

template<typename T, template<typename...> typename S>
concept SpecializationOf = IsSpecializationOf<T, S>;

Expand Down Expand Up @@ -185,6 +188,7 @@ using AK::Concepts::IteratorFunction;
using AK::Concepts::IteratorPairWith;
using AK::Concepts::OneOf;
using AK::Concepts::OneOfIgnoringCV;
using AK::Concepts::OneOfIgnoringCVReference;
using AK::Concepts::SameAs;
using AK::Concepts::Signed;
using AK::Concepts::SpecializationOf;
Expand Down
38 changes: 19 additions & 19 deletions AK/FlyString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@ class FlyString {
private:
friend class Optional<FlyString>;

explicit FlyString(nullptr_t)
explicit constexpr FlyString(nullptr_t)
: m_data(nullptr)
{
}

explicit FlyString(Detail::StringBase data)
explicit constexpr FlyString(Detail::StringBase data)
: m_data(move(data))
{
}

Detail::StringBase m_data;

bool is_invalid() const { return m_data.raw(Badge<FlyString> {}) == 0; }
constexpr bool is_invalid() const { return m_data.raw(Badge<FlyString> {}) == 0; }
};

void did_destroy_fly_string_data(Badge<Detail::StringData>, Detail::StringData const&);
Expand All @@ -110,38 +110,38 @@ class Optional<FlyString> : public OptionalBase<FlyString> {
public:
using ValueType = FlyString;

Optional() = default;
constexpr Optional() = default;

template<SameAs<OptionalNone> V>
Optional(V) { }
constexpr Optional(V) { }

Optional(Optional<FlyString> const& other)
constexpr Optional(Optional<FlyString> const& other)
{
if (other.has_value())
m_value = other.m_value;
}

Optional(Optional&& other)
: m_value(other.m_value)
constexpr Optional(Optional&& other)
: m_value(move(other.m_value))
{
}

template<typename U = FlyString>
requires(!IsSame<OptionalNone, RemoveCVReference<U>>)
explicit(!IsConvertible<U&&, FlyString>) Optional(U&& value)
explicit(!IsConvertible<U&&, FlyString>) constexpr Optional(U&& value)
requires(!IsSame<RemoveCVReference<U>, Optional<FlyString>> && IsConstructible<FlyString, U &&>)
: m_value(forward<U>(value))
{
}

template<SameAs<OptionalNone> V>
Optional& operator=(V)
constexpr Optional& operator=(V)
{
clear();
return *this;
}

Optional& operator=(Optional const& other)
constexpr Optional& operator=(Optional const& other)
{
if (this != &other) {
clear();
Expand All @@ -150,7 +150,7 @@ class Optional<FlyString> : public OptionalBase<FlyString> {
return *this;
}

Optional& operator=(Optional&& other)
constexpr Optional& operator=(Optional&& other)
{
if (this != &other) {
clear();
Expand All @@ -159,37 +159,37 @@ class Optional<FlyString> : public OptionalBase<FlyString> {
return *this;
}

void clear()
constexpr void clear()
{
m_value = FlyString(nullptr);
}

[[nodiscard]] bool has_value() const
[[nodiscard]] constexpr bool has_value() const
{
return !m_value.is_invalid();
}

[[nodiscard]] FlyString& value() &
[[nodiscard]] constexpr FlyString& value() &
{
VERIFY(has_value());
return m_value;
}

[[nodiscard]] FlyString const& value() const&
[[nodiscard]] constexpr FlyString const& value() const&
{
VERIFY(has_value());
return m_value;
}

[[nodiscard]] FlyString value() &&
[[nodiscard]] constexpr FlyString value() &&
{
return release_value();
}

[[nodiscard]] FlyString release_value()
[[nodiscard]] constexpr FlyString release_value()
{
VERIFY(has_value());
FlyString released_value = m_value;
FlyString released_value = move(m_value);
clear();
return released_value;
}
Expand Down
32 changes: 16 additions & 16 deletions AK/Noncopyable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,29 @@ public: \
c(c const&) = default; \
c& operator=(c const&) = default

#define AK_MAKE_CONDITIONALLY_NONMOVABLE(c, ...) \
public: \
c(c&&) \
requires(!(AK::Detail::IsMoveConstructible __VA_ARGS__)) \
= delete; \
c& operator=(c&&) \
requires(!(AK::Detail::IsMoveConstructible __VA_ARGS__) \
|| !(AK::Detail::IsDestructible __VA_ARGS__)) \
#define AK_MAKE_CONDITIONALLY_NONMOVABLE(c, ...) \
public: \
c(c&&) \
requires(!(AK::Detail::IsMoveConstructible __VA_ARGS__)) \
= delete; \
c& operator=(c&&) \
requires(!((AK::Detail::IsMoveConstructible __VA_ARGS__) || (AK::Detail::IsMoveAssignable __VA_ARGS__)) \
|| !(AK::Detail::IsDestructible __VA_ARGS__)) \
= delete

#define AK_MAKE_CONDITIONALLY_MOVABLE(c, T) \
AK_MAKE_CONDITIONALLY_NONMOVABLE(c, T); \
c(c&&) = default; \
c& operator=(c&&) = default

#define AK_MAKE_CONDITIONALLY_NONCOPYABLE(c, ...) \
public: \
c(c const&) \
requires(!(AK::Detail::IsCopyConstructible __VA_ARGS__)) \
= delete; \
c& operator=(c const&) \
requires(!(AK::Detail::IsCopyConstructible __VA_ARGS__) \
|| !(AK::Detail::IsDestructible __VA_ARGS__)) \
#define AK_MAKE_CONDITIONALLY_NONCOPYABLE(c, ...) \
public: \
c(c const&) \
requires(!(AK::Detail::IsCopyConstructible __VA_ARGS__)) \
= delete; \
c& operator=(c const&) \
requires(!((AK::Detail::IsCopyConstructible __VA_ARGS__) || (AK::Detail::IsCopyAssignable __VA_ARGS__)) \
|| !(AK::Detail::IsDestructible __VA_ARGS__)) \
= delete

#define AK_MAKE_CONDITIONALLY_COPYABLE(c, ...) \
Expand Down
Loading
Loading