diff options
author | Linus Groh <mail@linusgroh.de> | 2022-01-04 22:54:31 +0100 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2022-01-04 23:37:26 +0000 |
commit | 9e50bd91a6d7ceb9a00ce0d66443de578bb31023 (patch) | |
tree | bd6958e63bc850c2242044b54c008581155cb46e | |
parent | c4f0f1cc057f64eaff22680b48d9f24a7289085b (diff) | |
download | serenity-9e50bd91a6d7ceb9a00ce0d66443de578bb31023.zip |
js: Remove uses of TRY_OR_DISCARD()
Slightly more verbose, but that's the last user of TRY_OR_DISCARD gone!
-rw-r--r-- | Userland/Utilities/js.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Userland/Utilities/js.cpp b/Userland/Utilities/js.cpp index 8d65721270..7c91bb09d0 100644 --- a/Userland/Utilities/js.cpp +++ b/Userland/Utilities/js.cpp @@ -1426,12 +1426,15 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) switch (mode) { case CompleteProperty: { - Optional<JS::Value> maybe_value; - auto maybe_variable = TRY_OR_DISCARD(vm->resolve_binding(variable_name, &global_environment)); - maybe_value = TRY_OR_DISCARD(maybe_variable.get_value(interpreter->global_object())); - VERIFY(!maybe_value->is_empty()); + auto reference_or_error = vm->resolve_binding(variable_name, &global_environment); + if (reference_or_error.is_error()) + return {}; + auto value_or_error = reference_or_error.value().get_value(interpreter->global_object()); + if (value_or_error.is_error()) + return {}; + auto variable = value_or_error.value(); + VERIFY(!variable.is_empty()); - auto variable = *maybe_value; if (!variable.is_object()) break; |