mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-22 04:25:13 +00:00
LibJS: Convert MapIterator.prototype to be a PrototypeObject
This commit is contained in:
parent
77efecadf7
commit
f5c988b3ce
Notes:
sideshowbarker
2024-07-18 04:12:49 +09:00
Author: https://github.com/trflynn89 Commit: https://github.com/SerenityOS/serenity/commit/f5c988b3ce6 Pull-request: https://github.com/SerenityOS/serenity/pull/9973 Reviewed-by: https://github.com/linusg ✅
2 changed files with 14 additions and 17 deletions
|
@ -9,13 +9,12 @@
|
|||
#include <LibJS/Runtime/Error.h>
|
||||
#include <LibJS/Runtime/GlobalObject.h>
|
||||
#include <LibJS/Runtime/IteratorOperations.h>
|
||||
#include <LibJS/Runtime/MapIterator.h>
|
||||
#include <LibJS/Runtime/MapIteratorPrototype.h>
|
||||
|
||||
namespace JS {
|
||||
|
||||
MapIteratorPrototype::MapIteratorPrototype(GlobalObject& global_object)
|
||||
: Object(*global_object.iterator_prototype())
|
||||
: PrototypeObject(*global_object.iterator_prototype())
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -35,26 +34,23 @@ MapIteratorPrototype::~MapIteratorPrototype()
|
|||
// 24.1.5.2.1 %MapIteratorPrototype%.next ( ), https://tc39.es/ecma262/#sec-%mapiteratorprototype%.next
|
||||
JS_DEFINE_NATIVE_FUNCTION(MapIteratorPrototype::next)
|
||||
{
|
||||
auto this_value = vm.this_value(global_object);
|
||||
if (!this_value.is_object() || !is<MapIterator>(this_value.as_object())) {
|
||||
vm.throw_exception<TypeError>(global_object, ErrorType::NotAnObjectOfType, "Map Iterator");
|
||||
auto* map_iterator = typed_this_value(global_object);
|
||||
if (vm.exception())
|
||||
return {};
|
||||
}
|
||||
|
||||
auto& map_iterator = static_cast<MapIterator&>(this_value.as_object());
|
||||
if (map_iterator.done())
|
||||
if (map_iterator->done())
|
||||
return create_iterator_result_object(global_object, js_undefined(), true);
|
||||
|
||||
auto& map = map_iterator.map();
|
||||
if (map_iterator.m_iterator == map.entries().end()) {
|
||||
map_iterator.m_done = true;
|
||||
auto& map = map_iterator->map();
|
||||
if (map_iterator->m_iterator == map.entries().end()) {
|
||||
map_iterator->m_done = true;
|
||||
return create_iterator_result_object(global_object, js_undefined(), true);
|
||||
}
|
||||
|
||||
auto iteration_kind = map_iterator.iteration_kind();
|
||||
auto iteration_kind = map_iterator->iteration_kind();
|
||||
|
||||
auto entry = *map_iterator.m_iterator;
|
||||
++map_iterator.m_iterator;
|
||||
auto entry = *map_iterator->m_iterator;
|
||||
++map_iterator->m_iterator;
|
||||
if (iteration_kind == Object::PropertyKind::Key)
|
||||
return create_iterator_result_object(global_object, entry.key, false);
|
||||
else if (iteration_kind == Object::PropertyKind::Value)
|
||||
|
|
|
@ -6,12 +6,13 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <LibJS/Runtime/Object.h>
|
||||
#include <LibJS/Runtime/MapIterator.h>
|
||||
#include <LibJS/Runtime/PrototypeObject.h>
|
||||
|
||||
namespace JS {
|
||||
|
||||
class MapIteratorPrototype final : public Object {
|
||||
JS_OBJECT(MapIteratorPrototype, Object)
|
||||
class MapIteratorPrototype final : public PrototypeObject<MapIteratorPrototype, MapIterator> {
|
||||
JS_PROTOTYPE_OBJECT(MapIteratorPrototype, MapIterator, MapIterator);
|
||||
|
||||
public:
|
||||
MapIteratorPrototype(GlobalObject&);
|
||||
|
|
Loading…
Add table
Reference in a new issue