|
@@ -13,9 +13,29 @@
|
|
|
|
|
|
namespace Web::DOM {
|
|
|
|
|
|
+#define ENUMERATE_SIMPLE_WEBIDL_EXCEPTION_TYPES(E) \
|
|
|
+ E(EvalError) \
|
|
|
+ E(RangeError) \
|
|
|
+ E(ReferenceError) \
|
|
|
+ E(TypeError) \
|
|
|
+ E(URIError)
|
|
|
+
|
|
|
+#define E(x) x,
|
|
|
+enum class SimpleExceptionType {
|
|
|
+ ENUMERATE_SIMPLE_WEBIDL_EXCEPTION_TYPES(E)
|
|
|
+};
|
|
|
+#undef E
|
|
|
+
|
|
|
+struct SimpleException {
|
|
|
+ SimpleExceptionType type;
|
|
|
+ String message;
|
|
|
+};
|
|
|
+
|
|
|
template<typename ValueType>
|
|
|
class ExceptionOr {
|
|
|
public:
|
|
|
+ ExceptionOr() requires(IsSame<ValueType, Empty>) = default;
|
|
|
+
|
|
|
ExceptionOr(const ValueType& result)
|
|
|
: m_result(result)
|
|
|
{
|
|
@@ -26,8 +46,18 @@ public:
|
|
|
{
|
|
|
}
|
|
|
|
|
|
- ExceptionOr(const NonnullRefPtr<DOMException> exception)
|
|
|
- : m_exception(exception)
|
|
|
+ ExceptionOr(NonnullRefPtr<DOMException> exception)
|
|
|
+ : m_exception(move(exception))
|
|
|
+ {
|
|
|
+ }
|
|
|
+
|
|
|
+ ExceptionOr(SimpleException exception)
|
|
|
+ : m_exception(move(exception))
|
|
|
+ {
|
|
|
+ }
|
|
|
+
|
|
|
+ ExceptionOr(Variant<SimpleException, NonnullRefPtr<DOMException>> exception)
|
|
|
+ : m_exception(move(exception).template downcast<Empty, SimpleException, NonnullRefPtr<DOMException>>())
|
|
|
{
|
|
|
}
|
|
|
|
|
@@ -35,56 +65,60 @@ public:
|
|
|
ExceptionOr(const ExceptionOr& other) = default;
|
|
|
~ExceptionOr() = default;
|
|
|
|
|
|
- ValueType& value()
|
|
|
+ ValueType& value() requires(!IsSame<ValueType, Empty>)
|
|
|
{
|
|
|
return m_result.value();
|
|
|
}
|
|
|
|
|
|
- ValueType release_value()
|
|
|
+ ValueType release_value() requires(!IsSame<ValueType, Empty>)
|
|
|
{
|
|
|
return m_result.release_value();
|
|
|
}
|
|
|
|
|
|
- const DOMException& exception() const
|
|
|
+ Variant<SimpleException, NonnullRefPtr<DOMException>> exception() const
|
|
|
{
|
|
|
- return *m_exception;
|
|
|
+ return m_exception.template downcast<SimpleException, NonnullRefPtr<DOMException>>();
|
|
|
+ }
|
|
|
+
|
|
|
+ auto materialized_exception(JS::GlobalObject& global_object) const
|
|
|
+ {
|
|
|
+#define E(x) JS::x*,
|
|
|
+ using ResultType = Variant<ENUMERATE_SIMPLE_WEBIDL_EXCEPTION_TYPES(E) NonnullRefPtr<DOMException>>;
|
|
|
+#undef E
|
|
|
+
|
|
|
+ return m_exception.visit(
|
|
|
+ [&](SimpleException& exception) -> ResultType {
|
|
|
+ switch (exception.type) {
|
|
|
+#define E(x) \
|
|
|
+ case SimpleExceptionType::x: \
|
|
|
+ return JS::x::create(global_object, exception.message);
|
|
|
+
|
|
|
+ ENUMERATE_SIMPLE_WEBIDL_EXCEPTION_TYPES(E)
|
|
|
+
|
|
|
+#undef E
|
|
|
+ default:
|
|
|
+ VERIFY_NOT_REACHED();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ [&](NonnullRefPtr<DOMException> const& exception) -> ResultType { return exception; },
|
|
|
+ [](Empty) -> ResultType { VERIFY_NOT_REACHED(); });
|
|
|
}
|
|
|
|
|
|
bool is_exception() const
|
|
|
{
|
|
|
- return m_exception;
|
|
|
+ return !m_exception.template has<Empty>();
|
|
|
}
|
|
|
|
|
|
private:
|
|
|
Optional<ValueType> m_result;
|
|
|
- RefPtr<DOMException> m_exception;
|
|
|
+ // https://heycam.github.io/webidl/#idl-exceptions
|
|
|
+ Variant<Empty, SimpleException, NonnullRefPtr<DOMException>> m_exception { Empty {} };
|
|
|
};
|
|
|
|
|
|
template<>
|
|
|
-class ExceptionOr<void> {
|
|
|
+class ExceptionOr<void> : public ExceptionOr<Empty> {
|
|
|
public:
|
|
|
- ExceptionOr(const NonnullRefPtr<DOMException> exception)
|
|
|
- : m_exception(exception)
|
|
|
- {
|
|
|
- }
|
|
|
-
|
|
|
- ExceptionOr() = default;
|
|
|
- ExceptionOr(ExceptionOr&& other) = default;
|
|
|
- ExceptionOr(const ExceptionOr& other) = default;
|
|
|
- ~ExceptionOr() = default;
|
|
|
-
|
|
|
- const DOMException& exception() const
|
|
|
- {
|
|
|
- return *m_exception;
|
|
|
- }
|
|
|
-
|
|
|
- bool is_exception() const
|
|
|
- {
|
|
|
- return m_exception;
|
|
|
- }
|
|
|
-
|
|
|
-private:
|
|
|
- RefPtr<DOMException> m_exception;
|
|
|
+ using ExceptionOr<Empty>::ExceptionOr;
|
|
|
};
|
|
|
|
|
|
}
|