summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIdan Horowitz <idan.horowitz@gmail.com>2021-10-29 00:28:04 +0300
committerIdan Horowitz <idan.horowitz@gmail.com>2021-10-29 21:29:24 +0300
commitd1d4ee699b2de4c4fe78b75ddc3a4fe3152b5b7f (patch)
treeaf55b12463a1502b8e28b71770cfe9f4abdf212c
parente7a134a346a82f30f4445e03a8c97352b088ca41 (diff)
downloadserenity-d1d4ee699b2de4c4fe78b75ddc3a4fe3152b5b7f.zip
LibJS: Convert ConsoleObject functions to ThrowCompletionOr
-rw-r--r--Userland/Libraries/LibJS/Runtime/ConsoleObject.cpp40
-rw-r--r--Userland/Libraries/LibJS/Runtime/ConsoleObject.h20
2 files changed, 30 insertions, 30 deletions
diff --git a/Userland/Libraries/LibJS/Runtime/ConsoleObject.cpp b/Userland/Libraries/LibJS/Runtime/ConsoleObject.cpp
index 739802f00e..06778dd99f 100644
--- a/Userland/Libraries/LibJS/Runtime/ConsoleObject.cpp
+++ b/Userland/Libraries/LibJS/Runtime/ConsoleObject.cpp
@@ -22,16 +22,16 @@ void ConsoleObject::initialize(GlobalObject& global_object)
auto& vm = this->vm();
Object::initialize(global_object);
u8 attr = Attribute::Writable | Attribute::Enumerable | Attribute::Configurable;
- define_old_native_function(vm.names.log, log, 0, attr);
- define_old_native_function(vm.names.debug, debug, 0, attr);
- define_old_native_function(vm.names.info, info, 0, attr);
- define_old_native_function(vm.names.warn, warn, 0, attr);
- define_old_native_function(vm.names.error, error, 0, attr);
- define_old_native_function(vm.names.trace, trace, 0, attr);
- define_old_native_function(vm.names.count, count, 0, attr);
- define_old_native_function(vm.names.countReset, count_reset, 0, attr);
- define_old_native_function(vm.names.clear, clear, 0, attr);
- define_old_native_function(vm.names.assert, assert_, 0, attr);
+ define_native_function(vm.names.log, log, 0, attr);
+ define_native_function(vm.names.debug, debug, 0, attr);
+ define_native_function(vm.names.info, info, 0, attr);
+ define_native_function(vm.names.warn, warn, 0, attr);
+ define_native_function(vm.names.error, error, 0, attr);
+ define_native_function(vm.names.trace, trace, 0, attr);
+ define_native_function(vm.names.count, count, 0, attr);
+ define_native_function(vm.names.countReset, count_reset, 0, attr);
+ define_native_function(vm.names.clear, clear, 0, attr);
+ define_native_function(vm.names.assert, assert_, 0, attr);
}
ConsoleObject::~ConsoleObject()
@@ -39,61 +39,61 @@ ConsoleObject::~ConsoleObject()
}
// 1.1.6. log(...data), https://console.spec.whatwg.org/#log
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::log)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::log)
{
return global_object.console().log();
}
// 1.1.3. debug(...data), https://console.spec.whatwg.org/#debug
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::debug)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::debug)
{
return global_object.console().debug();
}
// 1.1.5. info(...data), https://console.spec.whatwg.org/#info
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::info)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::info)
{
return global_object.console().info();
}
// 1.1.9. warn(...data), https://console.spec.whatwg.org/#warn
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::warn)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::warn)
{
return global_object.console().warn();
}
// 1.1.4. error(...data), https://console.spec.whatwg.org/#error
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::error)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::error)
{
return global_object.console().error();
}
// 1.1.8. trace(...data), https://console.spec.whatwg.org/#trace
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::trace)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::trace)
{
return global_object.console().trace();
}
// 1.2.1. count(label), https://console.spec.whatwg.org/#count
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::count)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::count)
{
return global_object.console().count();
}
// 1.2.2. countReset(label), https://console.spec.whatwg.org/#countreset
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::count_reset)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::count_reset)
{
return global_object.console().count_reset();
}
// 1.1.2. clear(), https://console.spec.whatwg.org/#clear
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::clear)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::clear)
{
return global_object.console().clear();
}
// 1.1.1. assert(condition, ...data), https://console.spec.whatwg.org/#assert
-JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleObject::assert_)
+JS_DEFINE_NATIVE_FUNCTION(ConsoleObject::assert_)
{
return global_object.console().assert_();
}
diff --git a/Userland/Libraries/LibJS/Runtime/ConsoleObject.h b/Userland/Libraries/LibJS/Runtime/ConsoleObject.h
index 71a34f2f3a..5f43c4eed9 100644
--- a/Userland/Libraries/LibJS/Runtime/ConsoleObject.h
+++ b/Userland/Libraries/LibJS/Runtime/ConsoleObject.h
@@ -19,16 +19,16 @@ public:
virtual ~ConsoleObject() override;
private:
- JS_DECLARE_OLD_NATIVE_FUNCTION(log);
- JS_DECLARE_OLD_NATIVE_FUNCTION(debug);
- JS_DECLARE_OLD_NATIVE_FUNCTION(info);
- JS_DECLARE_OLD_NATIVE_FUNCTION(warn);
- JS_DECLARE_OLD_NATIVE_FUNCTION(error);
- JS_DECLARE_OLD_NATIVE_FUNCTION(trace);
- JS_DECLARE_OLD_NATIVE_FUNCTION(count);
- JS_DECLARE_OLD_NATIVE_FUNCTION(count_reset);
- JS_DECLARE_OLD_NATIVE_FUNCTION(clear);
- JS_DECLARE_OLD_NATIVE_FUNCTION(assert_);
+ JS_DECLARE_NATIVE_FUNCTION(log);
+ JS_DECLARE_NATIVE_FUNCTION(debug);
+ JS_DECLARE_NATIVE_FUNCTION(info);
+ JS_DECLARE_NATIVE_FUNCTION(warn);
+ JS_DECLARE_NATIVE_FUNCTION(error);
+ JS_DECLARE_NATIVE_FUNCTION(trace);
+ JS_DECLARE_NATIVE_FUNCTION(count);
+ JS_DECLARE_NATIVE_FUNCTION(count_reset);
+ JS_DECLARE_NATIVE_FUNCTION(clear);
+ JS_DECLARE_NATIVE_FUNCTION(assert_);
};
}