mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-15 23:09:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibJS: Allow Optional<Completion> to be used in constant expressions

Browse source
This commit is contained in:
Jonne Ransijn 2025-04-10 15:10:42 +02:00 • committed by Andrew Kaster
commit ca33899370
Notes: github-actions[bot] 2025-04-23 03:21:16 +00:00
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Libraries/LibJS/Runtime/Completion.h
View file

@ -60,7 +60,7 @@ public:
Throw, Throw,
}; };
ALWAYS_INLINE Completion(Type type, Value value) ALWAYS_INLINE constexpr Completion(Type type, Value value)
: m_type(type) : m_type(type)
, m_value(value) , m_value(value)
{ {
@ -72,12 +72,12 @@ public:
// 5.2.3.1 Implicit Completion Values, https://tc39.es/ecma262/#sec-implicit-completion-values // 5.2.3.1 Implicit Completion Values, https://tc39.es/ecma262/#sec-implicit-completion-values
// Not `explicit` on purpose. // Not `explicit` on purpose.
ALWAYS_INLINE Completion(Value value) ALWAYS_INLINE constexpr Completion(Value value)
: Completion(Type::Normal, value) : Completion(Type::Normal, value)
{ {
} }
ALWAYS_INLINE Completion() ALWAYS_INLINE constexpr Completion()
: Completion(js_undefined()) : Completion(js_undefined())
{ {
} }
@ -87,21 +87,21 @@ public:
Completion(Completion&&) = default; Completion(Completion&&) = default;
Completion& operator=(Completion&&) = default; Completion& operator=(Completion&&) = default;
[[nodiscard]] Type type() const [[nodiscard]] constexpr Type type() const
{ {
VERIFY(m_type != Type::Empty); VERIFY(m_type != Type::Empty);
return m_type; return m_type;
} }
[[nodiscard]] Value& value() { return m_value; } [[nodiscard]] constexpr Value& value() { return m_value; }
[[nodiscard]] Value const& value() const { return m_value; } [[nodiscard]] constexpr Value const& value() const { return m_value; }
// "abrupt completion refers to any completion with a [[Type]] value other than normal" // "abrupt completion refers to any completion with a [[Type]] value other than normal"
[[nodiscard]] bool is_abrupt() const { return m_type != Type::Normal; } [[nodiscard]] constexpr bool is_abrupt() const { return m_type != Type::Normal; }
// These are for compatibility with the TRY() macro in AK. // These are for compatibility with the TRY() macro in AK.
[[nodiscard]] bool is_error() const { return m_type == Type::Throw; } [[nodiscard]] constexpr bool is_error() const { return m_type == Type::Throw; }
[[nodiscard]] Value release_value() { return m_value; } [[nodiscard]] constexpr Value release_value() { return m_value; }
Completion release_error() constexpr Completion release_error()
{ {
VERIFY(is_error()); VERIFY(is_error());
return { m_type, release_value() }; return { m_type, release_value() };
@ -112,12 +112,12 @@ private:
}; };
friend AK::Optional<Completion>; friend AK::Optional<Completion>;
Completion(EmptyTag) constexpr Completion(EmptyTag)
: m_type(Type::Empty) : m_type(Type::Empty)
{ {
} }
bool is_empty() const constexpr bool is_empty() const
{ {
return m_type == Type::Empty; return m_type == Type::Empty;
} }
@ -139,27 +139,27 @@ class Optional<JS::Completion> : public OptionalBase<JS::Completion> {
public: public:
using ValueType = JS::Completion; using ValueType = JS::Completion;
Optional() = default; constexpr Optional() = default;
Optional(Optional<JS::Completion> const& other) constexpr Optional(Optional<JS::Completion> const& other)
{ {
if (other.has_value()) if (other.has_value())
m_value = other.m_value; m_value = other.m_value;
} }
Optional(Optional&& other) constexpr Optional(Optional&& other)
: m_value(move(other.m_value)) : m_value(move(other.m_value))
{ {
} }
template<typename U = JS::Completion> template<typename U = JS::Completion>
explicit(!IsConvertible<U&&, JS::Completion>) Optional(U&& value) explicit(!IsConvertible<U&&, JS::Completion>) constexpr Optional(U&& value)
requires(!IsSame<RemoveCVReference<U>, Optional<JS::Completion>> && IsConstructible<JS::Completion, U &&>) requires(!IsSame<RemoveCVReference<U>, Optional<JS::Completion>> && IsConstructible<JS::Completion, U &&>)
: m_value(forward<U>(value)) : m_value(forward<U>(value))
{ {
} }
Optional& operator=(Optional const& other) constexpr Optional& operator=(Optional const& other)
{ {
if (this != &other) { if (this != &other) {
clear(); clear();
@ -168,7 +168,7 @@ public:
return *this; return *this;
} }
Optional& operator=(Optional&& other) constexpr Optional& operator=(Optional&& other)
{ {
if (this != &other) { if (this != &other) {
clear(); clear();
@ -177,34 +177,34 @@ public:
return *this; return *this;
} }
void clear() constexpr void clear()
{ {
m_value = JS::Completion(JS::Completion::EmptyTag {}); m_value = JS::Completion(JS::Completion::EmptyTag {});
} }
[[nodiscard]] bool has_value() const [[nodiscard]] constexpr bool has_value() const
{ {
return !m_value.is_empty(); return !m_value.is_empty();
} }
[[nodiscard]] JS::Completion& value() & [[nodiscard]] constexpr JS::Completion& value() &
{ {
VERIFY(has_value()); VERIFY(has_value());
return m_value; return m_value;
} }
[[nodiscard]] JS::Completion const& value() const& [[nodiscard]] constexpr JS::Completion const& value() const&
{ {
VERIFY(has_value()); VERIFY(has_value());
return m_value; return m_value;
} }
[[nodiscard]] JS::Completion value() && [[nodiscard]] constexpr JS::Completion value() &&
{ {
return release_value(); return release_value();
} }
[[nodiscard]] JS::Completion release_value() [[nodiscard]] constexpr JS::Completion release_value()
{ {
VERIFY(has_value()); VERIFY(has_value());
JS::Completion released_value = m_value; JS::Completion released_value = m_value;