ソースを参照

LibWeb: Use ErrorType::NotAnObjectOfType instead of NotA

Timothy Flynn 3 年 前
コミット
c59b97043e

+ 5 - 5
Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator.cpp

@@ -579,7 +579,7 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter
     RefPtr<EventListener> @cpp_name@;
     if (!@js_name@@js_suffix@.is_nullish()) {
         if (!@js_name@@js_suffix@.is_function()) {
-            vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "Function");
+            vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "Function");
             @return_statement@
         }
         @cpp_name@ = adopt_ref(*new EventListener(JS::make_handle(&@js_name@@js_suffix@.as_function())));
@@ -588,7 +588,7 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter
         } else {
             scoped_generator.append(R"~~~(
     if (!@js_name@@js_suffix@.is_function()) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "Function");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "Function");
         @return_statement@
     }
     auto @cpp_name@ = adopt_ref(*new EventListener(JS::make_handle(&@js_name@@js_suffix@.as_function())));
@@ -602,7 +602,7 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter
         @return_statement@
 
     if (!is<@parameter.type.name@Wrapper>(@cpp_name@_object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "@parameter.type.name@");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "@parameter.type.name@");
         @return_statement@
     }
 
@@ -617,7 +617,7 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter
             @return_statement@
 
         if (!is<@parameter.type.name@Wrapper>(@cpp_name@_object)) {
-            vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "@parameter.type.name@");
+            vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "@parameter.type.name@");
             @return_statement@
         }
 
@@ -1568,7 +1568,7 @@ static @fully_qualified_name@* impl_from(JS::VM& vm, JS::GlobalObject& global_ob
 
         generator.append(R"~~~(
     if (!is<@wrapper_class@>(this_object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "@fully_qualified_name@");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "@fully_qualified_name@");
         return nullptr;
     }
 

+ 2 - 2
Tests/LibWeb/test-web.cpp

@@ -61,7 +61,7 @@ TESTJS_GLOBAL_FUNCTION(after_initial_page_load, afterInitialPageLoad)
     auto function = vm.argument(0);
     if (!function.is_function()) {
         dbgln("afterInitialPageLoad argument is not a function");
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "Function");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "Function");
         return {};
     }
 
@@ -76,7 +76,7 @@ TESTJS_GLOBAL_FUNCTION(before_initial_page_load, beforeInitialPageLoad)
     auto function = vm.argument(0);
     if (!function.is_function()) {
         dbgln("beforeInitialPageLoad argument is not a function");
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "Function");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "Function");
         return {};
     }
 

+ 2 - 2
Userland/Libraries/LibWeb/Bindings/WindowObject.cpp

@@ -133,7 +133,7 @@ static DOM::Window* impl_from(JS::VM& vm, JS::GlobalObject& global_object)
     VERIFY(this_object);
 
     if (StringView("WindowObject") != this_object->class_name()) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WindowObject");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "WindowObject");
         return nullptr;
     }
     return &static_cast<WindowObject*>(this_object)->impl();
@@ -463,7 +463,7 @@ JS_DEFINE_NATIVE_FUNCTION(WindowObject::get_computed_style)
         return {};
 
     if (!is<ElementWrapper>(object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "DOM element");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "DOM element");
         return {};
     }
 

+ 1 - 1
Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceConstructor.cpp

@@ -39,7 +39,7 @@ JS::Value WebAssemblyInstanceConstructor::construct(FunctionObject&)
         return {};
 
     if (!is<WebAssemblyModuleObject>(module_argument)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WebAssembly.Module");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Module");
         return {};
     }
 

+ 1 - 1
Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.cpp

@@ -23,7 +23,7 @@ JS_DEFINE_NATIVE_FUNCTION(WebAssemblyInstancePrototype::exports_getter)
     if (vm.exception())
         return {};
     if (!is<WebAssemblyInstanceObject>(this_object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WebAssembly.Instance");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Instance");
         return {};
     }
     auto object = static_cast<WebAssemblyInstanceObject*>(this_object);

+ 1 - 1
Userland/Libraries/LibWeb/WebAssembly/WebAssemblyMemoryConstructor.cpp

@@ -40,7 +40,7 @@ JS::Value WebAssemblyMemoryConstructor::construct(FunctionObject&)
     auto maximum_value = descriptor->get_without_side_effects("maximum");
 
     if (initial_value.is_empty()) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "Number");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "Number");
         return {};
     }
 

+ 2 - 2
Userland/Libraries/LibWeb/WebAssembly/WebAssemblyMemoryPrototype.cpp

@@ -24,7 +24,7 @@ JS_DEFINE_NATIVE_FUNCTION(WebAssemblyMemoryPrototype::grow)
         return {};
     auto* this_object = vm.this_value(global_object).to_object(global_object);
     if (!this_object || !is<WebAssemblyMemoryObject>(this_object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WebAssembly.Memory");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Memory");
         return {};
     }
     auto* memory_object = static_cast<WebAssemblyMemoryObject*>(this_object);
@@ -46,7 +46,7 @@ JS_DEFINE_NATIVE_FUNCTION(WebAssemblyMemoryPrototype::buffer_getter)
 {
     auto* this_object = vm.this_value(global_object).to_object(global_object);
     if (!this_object || !is<WebAssemblyMemoryObject>(this_object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WebAssembly.Memory");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Memory");
         return {};
     }
     auto* memory_object = static_cast<WebAssemblyMemoryObject*>(this_object);

+ 1 - 1
Userland/Libraries/LibWeb/WebAssembly/WebAssemblyObject.cpp

@@ -428,7 +428,7 @@ Optional<Wasm::Value> to_webassembly_value(JS::Value value, const Wasm::ValueTyp
             }
         }
 
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAn, "Exported function");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "Exported function");
         return {};
     }
     case Wasm::ValueType::ExternReference:

+ 4 - 4
Userland/Libraries/LibWeb/WebAssembly/WebAssemblyTablePrototype.cpp

@@ -26,7 +26,7 @@ JS_DEFINE_NATIVE_FUNCTION(WebAssemblyTablePrototype::grow)
         return {};
     auto* this_object = vm.this_value(global_object).to_object(global_object);
     if (!this_object || !is<WebAssemblyTableObject>(this_object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WebAssembly.Table");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Table");
         return {};
     }
     auto* table_object = static_cast<WebAssemblyTableObject*>(this_object);
@@ -65,7 +65,7 @@ JS_DEFINE_NATIVE_FUNCTION(WebAssemblyTablePrototype::get)
 
     auto* this_object = vm.this_value(global_object).to_object(global_object);
     if (!this_object || !is<WebAssemblyTableObject>(this_object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WebAssembly.Table");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Table");
         return {};
     }
     auto* table_object = static_cast<WebAssemblyTableObject*>(this_object);
@@ -95,7 +95,7 @@ JS_DEFINE_NATIVE_FUNCTION(WebAssemblyTablePrototype::set)
 
     auto* this_object = vm.this_value(global_object).to_object(global_object);
     if (!this_object || !is<WebAssemblyTableObject>(this_object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WebAssembly.Table");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Table");
         return {};
     }
     auto* table_object = static_cast<WebAssemblyTableObject*>(this_object);
@@ -130,7 +130,7 @@ JS_DEFINE_NATIVE_FUNCTION(WebAssemblyTablePrototype::length_getter)
 {
     auto* this_object = vm.this_value(global_object).to_object(global_object);
     if (!this_object || !is<WebAssemblyTableObject>(this_object)) {
-        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WebAssembly.Table");
+        vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Table");
         return {};
     }
     auto* table_object = static_cast<WebAssemblyTableObject*>(this_object);