Implement Object.prototype.{__defineGetter__, __defineSetter__} (#4032)
__defineGetter__ is based on ECMA-262 v11, B.2.2.2 __defineSetter__ is based on ECMA-262 v11, B.2.2.3 JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu
This commit is contained in:
@@ -51,7 +51,11 @@ enum
|
||||
ECMA_OBJECT_PROTOTYPE_IS_PROTOTYPE_OF,
|
||||
ECMA_OBJECT_PROTOTYPE_HAS_OWN_PROPERTY,
|
||||
ECMA_OBJECT_PROTOTYPE_PROPERTY_IS_ENUMERABLE,
|
||||
ECMA_OBJECT_PROTOTYPE_SET_PROTO
|
||||
ECMA_OBJECT_PROTOTYPE_SET_PROTO,
|
||||
#if ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB)
|
||||
ECMA_OBJECT_PROTOTYPE_DEFINE_GETTER,
|
||||
ECMA_OBJECT_PROTOTYPE_DEFINE_SETTER,
|
||||
#endif /* ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) */
|
||||
};
|
||||
|
||||
#define BUILTIN_INC_HEADER_NAME "ecma-builtin-object-prototype.inc.h"
|
||||
@@ -203,6 +207,63 @@ ecma_builtin_object_prototype_object_property_is_enumerable (ecma_object_t *obj_
|
||||
return ecma_make_boolean_value (is_enumerable);
|
||||
} /* ecma_builtin_object_prototype_object_property_is_enumerable */
|
||||
|
||||
#if ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB)
|
||||
/**
|
||||
* The Object.prototype object's '__defineGetter__' and '__defineSetter__' routine
|
||||
*
|
||||
* See also:
|
||||
* ECMA-262 v11, B.2.2.2
|
||||
* ECMA-262 v11, B.2.2.3
|
||||
*
|
||||
* @return ECMA_VALUE_ERROR - if the operation fails,
|
||||
* ECMA_VALUE_UNDEFINED - otherwise
|
||||
*/
|
||||
static ecma_value_t
|
||||
ecma_builtin_object_prototype_define_getter_setter (ecma_object_t *obj_p, /**< this argument */
|
||||
ecma_string_t *prop_name_p, /**< property name */
|
||||
ecma_value_t accessor, /**< getter/setter function */
|
||||
bool define_getter) /**< true - defineGetter method
|
||||
false - defineSetter method */
|
||||
{
|
||||
/* 2. */
|
||||
if (!ecma_op_is_callable (accessor))
|
||||
{
|
||||
return ecma_raise_type_error (ECMA_ERR_MSG ("Getter is not callable."));
|
||||
}
|
||||
|
||||
ecma_object_t *accessor_obj_p = ecma_get_object_from_value (accessor);
|
||||
|
||||
/* 3. */
|
||||
ecma_property_descriptor_t desc = ecma_make_empty_property_descriptor ();
|
||||
desc.flags |= (ECMA_PROP_IS_ENUMERABLE
|
||||
| ECMA_PROP_IS_CONFIGURABLE
|
||||
| ECMA_PROP_IS_ENUMERABLE_DEFINED
|
||||
| ECMA_PROP_IS_CONFIGURABLE_DEFINED);
|
||||
|
||||
if (define_getter)
|
||||
{
|
||||
desc.get_p = accessor_obj_p;
|
||||
desc.flags |= ECMA_PROP_IS_GET_DEFINED;
|
||||
}
|
||||
else
|
||||
{
|
||||
desc.set_p = accessor_obj_p;
|
||||
desc.flags |= ECMA_PROP_IS_SET_DEFINED;
|
||||
}
|
||||
|
||||
/* 5. */
|
||||
ecma_value_t define_prop = ecma_op_object_define_own_property (obj_p, prop_name_p, &desc);
|
||||
|
||||
if (ECMA_IS_VALUE_ERROR (define_prop))
|
||||
{
|
||||
return define_prop;
|
||||
}
|
||||
|
||||
/* 6. */
|
||||
return ECMA_VALUE_UNDEFINED;
|
||||
} /* ecma_builtin_object_prototype_define_getter_setter */
|
||||
#endif /* ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) */
|
||||
|
||||
/**
|
||||
* Dispatcher of the built-in's routines
|
||||
*
|
||||
@@ -307,6 +368,16 @@ ecma_builtin_object_prototype_dispatch_routine (uint16_t builtin_routine_id, /**
|
||||
{
|
||||
ret_value = ecma_builtin_object_prototype_object_has_own_property (obj_p, prop_name_p);
|
||||
}
|
||||
#if ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB)
|
||||
else if (builtin_routine_id == ECMA_OBJECT_PROTOTYPE_DEFINE_GETTER)
|
||||
{
|
||||
ret_value = ecma_builtin_object_prototype_define_getter_setter (obj_p, prop_name_p, arguments_list_p[1], true);
|
||||
}
|
||||
else if (builtin_routine_id == ECMA_OBJECT_PROTOTYPE_DEFINE_SETTER)
|
||||
{
|
||||
ret_value = ecma_builtin_object_prototype_define_getter_setter (obj_p, prop_name_p, arguments_list_p[1], false);
|
||||
}
|
||||
#endif /* ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) */
|
||||
else
|
||||
{
|
||||
ret_value = ecma_builtin_object_prototype_object_property_is_enumerable (obj_p, prop_name_p);
|
||||
|
||||
@@ -41,4 +41,9 @@ ROUTINE (LIT_MAGIC_STRING_HAS_OWN_PROPERTY_UL, ECMA_OBJECT_PROTOTYPE_HAS_OWN_PRO
|
||||
ROUTINE (LIT_MAGIC_STRING_IS_PROTOTYPE_OF_UL, ECMA_OBJECT_PROTOTYPE_IS_PROTOTYPE_OF, 1, 1)
|
||||
ROUTINE (LIT_MAGIC_STRING_PROPERTY_IS_ENUMERABLE_UL, ECMA_OBJECT_PROTOTYPE_PROPERTY_IS_ENUMERABLE, 1, 1)
|
||||
|
||||
#if ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB)
|
||||
ROUTINE (LIT_MAGIC_STRING_DEFINE_GETTER, ECMA_OBJECT_PROTOTYPE_DEFINE_GETTER, 2, 2)
|
||||
ROUTINE (LIT_MAGIC_STRING_DEFINE_SETTER, ECMA_OBJECT_PROTOTYPE_DEFINE_SETTER, 2, 2)
|
||||
#endif /* ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) */
|
||||
|
||||
#include "ecma-builtin-helpers-macro-undefs.inc.h"
|
||||
|
||||
@@ -879,6 +879,10 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_MILLISECONDS_UL, "setMilliseconds")
|
||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U, "MAX_SAFE_INTEGER")
|
||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MIN_SAFE_INTEGER_U, "MIN_SAFE_INTEGER")
|
||||
#endif
|
||||
#if ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB)
|
||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_GETTER, "__defineGetter__")
|
||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_SETTER, "__defineSetter__")
|
||||
#endif
|
||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL, "defineProperties")
|
||||
#if ENABLED (JERRY_BUILTIN_TYPEDARRAY)
|
||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U, "BYTES_PER_ELEMENT")
|
||||
@@ -1057,11 +1061,15 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_STRING_ITERATOR_UL
|
||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_GET_MILLISECONDS_UL)
|
||||
#elif ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT)
|
||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U)
|
||||
#elif ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB)
|
||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_DEFINE_GETTER)
|
||||
#else
|
||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL)
|
||||
#endif
|
||||
#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT)
|
||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (16, LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U)
|
||||
#elif ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB)
|
||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (16, LIT_MAGIC_STRING_DEFINE_GETTER)
|
||||
#else
|
||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (16, LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL)
|
||||
#endif
|
||||
|
||||
@@ -353,6 +353,8 @@ LIT_MAGIC_STRING_SET_MILLISECONDS_UL = "setMilliseconds"
|
||||
LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL = "defineProperties"
|
||||
LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U = "MAX_SAFE_INTEGER"
|
||||
LIT_MAGIC_STRING_MIN_SAFE_INTEGER_U = "MIN_SAFE_INTEGER"
|
||||
LIT_MAGIC_STRING_DEFINE_GETTER = "__defineGetter__"
|
||||
LIT_MAGIC_STRING_DEFINE_SETTER = "__defineSetter__"
|
||||
LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U = "BYTES_PER_ELEMENT"
|
||||
LIT_MAGIC_STRING_NEGATIVE_INFINITY_U = "NEGATIVE_INFINITY"
|
||||
LIT_MAGIC_STRING_POSITIVE_INFINITY_U = "POSITIVE_INFINITY"
|
||||
|
||||
Reference in New Issue
Block a user