RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:27:35 +00:00
Code Issues Activity Actions

LibJS: Stop using Interpreter& in the iterator operations helpers

Browse source
This commit is contained in:
Andreas Kling 2020-09-27 20:19:53 +02:00
parent 2bc5bc64fb
commit 340d6b0ef7
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Libraries/LibJS/Runtime/IteratorOperations.cpp
View file

@ -24,7 +24,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <LibJS/Interpreter.h>
#include <LibJS/Runtime/Error.h> #include <LibJS/Runtime/Error.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/IteratorOperations.h> #include <LibJS/Runtime/IteratorOperations.h>
@ -33,7 +32,7 @@ namespace JS {
Object* get_iterator(GlobalObject& global_object, Value value, String hint, Value method) Object* get_iterator(GlobalObject& global_object, Value value, String hint, Value method)
{ {
auto& interpreter = global_object.interpreter(); auto& vm = global_object.vm();
ASSERT(hint == "sync" || hint == "async"); ASSERT(hint == "sync" || hint == "async");
if (method.is_empty()) { if (method.is_empty()) {
if (hint == "async") if (hint == "async")
@ -42,18 +41,18 @@ Object* get_iterator(GlobalObject& global_object, Value value, String hint, Valu
if (!object) if (!object)
return {}; return {};
method = object->get(global_object.vm().well_known_symbol_iterator()); method = object->get(global_object.vm().well_known_symbol_iterator());
if (interpreter.exception()) if (vm.exception())
return {}; return {};
} }
if (!method.is_function()) { if (!method.is_function()) {
interpreter.vm().throw_exception<TypeError>(global_object, ErrorType::NotIterable, value.to_string_without_side_effects().characters()); vm.throw_exception<TypeError>(global_object, ErrorType::NotIterable, value.to_string_without_side_effects().characters());
return nullptr; return nullptr;
} }
auto iterator = interpreter.call(method.as_function(), value); auto iterator = vm.call(method.as_function(), value);
if (interpreter.exception()) if (vm.exception())
return {}; return {};
if (!iterator.is_object()) { if (!iterator.is_object()) {
interpreter.vm().throw_exception<TypeError>(global_object, ErrorType::NotIterable, value.to_string_without_side_effects().characters()); vm.throw_exception<TypeError>(global_object, ErrorType::NotIterable, value.to_string_without_side_effects().characters());
return nullptr; return nullptr;
} }
return &iterator.as_object(); return &iterator.as_object();
@ -61,27 +60,27 @@ Object* get_iterator(GlobalObject& global_object, Value value, String hint, Valu
Object* iterator_next(Object& iterator, Value value) Object* iterator_next(Object& iterator, Value value)
{ {
auto& interpreter = iterator.interpreter(); auto& vm = iterator.vm();
auto& global_object = iterator.global_object(); auto& global_object = iterator.global_object();
auto next_method = iterator.get("next"); auto next_method = iterator.get("next");
if (interpreter.exception()) if (vm.exception())
return {}; return {};
if (!next_method.is_function()) { if (!next_method.is_function()) {
interpreter.vm().throw_exception<TypeError>(global_object, ErrorType::IterableNextNotAFunction); vm.throw_exception<TypeError>(global_object, ErrorType::IterableNextNotAFunction);
return nullptr; return nullptr;
} }
Value result; Value result;
if (value.is_empty()) if (value.is_empty())
result = interpreter.call(next_method.as_function(), &iterator); result = vm.call(next_method.as_function(), &iterator);
else else
result = interpreter.call(next_method.as_function(), &iterator, value); result = vm.call(next_method.as_function(), &iterator, value);
if (interpreter.exception()) if (vm.exception())
return {}; return {};
if (!result.is_object()) { if (!result.is_object()) {
interpreter.vm().throw_exception<TypeError>(global_object, ErrorType::IterableNextBadReturn); vm.throw_exception<TypeError>(global_object, ErrorType::IterableNextBadReturn);
return nullptr; return nullptr;
} }
@ -104,7 +103,7 @@ Value create_iterator_result_object(GlobalObject& global_object, Value value, bo
void get_iterator_values(GlobalObject& global_object, Value value, AK::Function<IterationDecision(Value)> callback) void get_iterator_values(GlobalObject& global_object, Value value, AK::Function<IterationDecision(Value)> callback)
{ {
auto& interpreter = global_object.interpreter(); auto& vm = global_object.vm();
auto iterator = get_iterator(global_object, value); auto iterator = get_iterator(global_object, value);
if (!iterator) if (!iterator)
@ -116,14 +115,14 @@ void get_iterator_values(GlobalObject& global_object, Value value, AK::Function<
return; return;
auto done_property = next_object->get("done"); auto done_property = next_object->get("done");
if (interpreter.exception()) if (vm.exception())
return; return;
if (!done_property.is_empty() && done_property.to_boolean()) if (!done_property.is_empty() && done_property.to_boolean())
return; return;
auto next_value = next_object->get("value"); auto next_value = next_object->get("value");
if (interpreter.exception()) if (vm.exception())
return; return;
auto result = callback(next_value); auto result = callback(next_value);