mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 14:37:46 +00:00
LibJS: Implement WeakMap changes from 'Symbol as WeakMap Keys Proposal'
This commit is contained in:
parent
22a78e8a2c
commit
a80d3fdf49
8 changed files with 39 additions and 18 deletions
|
@ -19,6 +19,7 @@
|
|||
M(CallStackSizeExceeded, "Call stack size limit exceeded") \
|
||||
M(CannotDeclareGlobalFunction, "Cannot declare global function of name '{}'") \
|
||||
M(CannotDeclareGlobalVariable, "Cannot declare global variable of name '{}'") \
|
||||
M(CannotBeHeldWeakly, "{} cannot be held weakly") \
|
||||
M(ClassConstructorWithoutNew, "Class constructor {} must be called with 'new'") \
|
||||
M(ClassExtendsValueNotAConstructorOrNull, "Class extends value {} is not a constructor or null") \
|
||||
M(ClassExtendsValueInvalidPrototype, "Class extends value has an invalid prototype {}") \
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Idan Horowitz <idan.horowitz@serenityos.org>
|
||||
* Copyright (c) 2021-2022, Idan Horowitz <idan.horowitz@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/HashTable.h>
|
||||
#include <AK/TypeCasts.h>
|
||||
#include <LibJS/Runtime/AbstractOperations.h>
|
||||
#include <LibJS/Runtime/WeakMapPrototype.h>
|
||||
|
||||
namespace JS {
|
||||
|
@ -35,9 +36,9 @@ JS_DEFINE_NATIVE_FUNCTION(WeakMapPrototype::delete_)
|
|||
{
|
||||
auto* weak_map = TRY(typed_this_object(global_object));
|
||||
auto value = vm.argument(0);
|
||||
if (!value.is_object())
|
||||
if (!can_be_held_weakly(value))
|
||||
return Value(false);
|
||||
return Value(weak_map->values().remove(&value.as_object()));
|
||||
return Value(weak_map->values().remove(&value.as_cell()));
|
||||
}
|
||||
|
||||
// 24.3.3.3 WeakMap.prototype.get ( key ), https://tc39.es/ecma262/#sec-weakmap.prototype.get
|
||||
|
@ -45,10 +46,10 @@ JS_DEFINE_NATIVE_FUNCTION(WeakMapPrototype::get)
|
|||
{
|
||||
auto* weak_map = TRY(typed_this_object(global_object));
|
||||
auto value = vm.argument(0);
|
||||
if (!value.is_object())
|
||||
if (!can_be_held_weakly(value))
|
||||
return js_undefined();
|
||||
auto& values = weak_map->values();
|
||||
auto result = values.find(&value.as_object());
|
||||
auto result = values.find(&value.as_cell());
|
||||
if (result == values.end())
|
||||
return js_undefined();
|
||||
return result->value;
|
||||
|
@ -59,10 +60,10 @@ JS_DEFINE_NATIVE_FUNCTION(WeakMapPrototype::has)
|
|||
{
|
||||
auto* weak_map = TRY(typed_this_object(global_object));
|
||||
auto value = vm.argument(0);
|
||||
if (!value.is_object())
|
||||
if (!can_be_held_weakly(value))
|
||||
return Value(false);
|
||||
auto& values = weak_map->values();
|
||||
return Value(values.find(&value.as_object()) != values.end());
|
||||
return Value(values.find(&value.as_cell()) != values.end());
|
||||
}
|
||||
|
||||
// 24.3.3.5 WeakMap.prototype.set ( key, value ), https://tc39.es/ecma262/#sec-weakmap.prototype.set
|
||||
|
@ -70,9 +71,9 @@ JS_DEFINE_NATIVE_FUNCTION(WeakMapPrototype::set)
|
|||
{
|
||||
auto* weak_map = TRY(typed_this_object(global_object));
|
||||
auto value = vm.argument(0);
|
||||
if (!value.is_object())
|
||||
return vm.throw_completion<TypeError>(global_object, ErrorType::NotAnObject, value.to_string_without_side_effects());
|
||||
weak_map->values().set(&value.as_object(), vm.argument(1));
|
||||
if (!can_be_held_weakly(value))
|
||||
return vm.throw_completion<TypeError>(global_object, ErrorType::CannotBeHeldWeakly, value.to_string_without_side_effects());
|
||||
weak_map->values().set(&value.as_cell(), vm.argument(1));
|
||||
return weak_map;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue