YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement Object.getOwnPropertyDescriptors built-in method (#3921)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Roland Takacs rtakacs@inf.u-szeged.hu
This commit is contained in:
Roland Takacs
2020-06-25 12:08:46 +02:00
committed by GitHub
parent 5d8c5f3e92
commit ae17c1184c
6 changed files with 210 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-object.c
+78
View File
@@ -53,6 +53,7 @@ enum
/* These should be in this order. */
ECMA_OBJECT_ROUTINE_ASSIGN,
ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTOR,
ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTORS,
ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_NAMES,
ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_SYMBOLS,
ECMA_OBJECT_ROUTINE_GET_PROTOTYPE_OF,
@@ -746,6 +747,76 @@ ecma_builtin_object_object_get_own_property_descriptor (ecma_object_t *obj_p, /*
return ECMA_VALUE_UNDEFINED;
} /* ecma_builtin_object_object_get_own_property_descriptor */
#if ENABLED (JERRY_ESNEXT)
/**
* The Object object's 'getOwnPropertyDescriptors' routine
*
* See also:
* ECMA-262 v11, 19.1.2.9
*
* @return ecma value
* Returned value must be freed with ecma_free_value.
*/
static ecma_value_t
ecma_builtin_object_object_get_own_property_descriptors (ecma_object_t *obj_p) /**< routine's first argument */
{
/* 2 */
ecma_collection_t *prop_names_p = ecma_op_object_get_property_names (obj_p, ECMA_LIST_SYMBOLS);
#if ENABLED (JERRY_BUILTIN_PROXY)
if (prop_names_p == NULL)
{
return ECMA_VALUE_ERROR;
}
#endif /* ENABLED (JERRY_BUILTIN_PROXY) */
ecma_value_t *names_buffer_p = prop_names_p->buffer_p;
/* 3 */
ecma_object_t *object_prototype_p = ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT_PROTOTYPE);
ecma_object_t *descriptors_p = ecma_create_object (object_prototype_p, 0, ECMA_OBJECT_TYPE_GENERAL);
/* 4 */
for (uint32_t i = 0; i < prop_names_p->item_count; i++)
{
ecma_string_t *property_name_p = ecma_get_prop_name_from_value (names_buffer_p[i]);
/* 4.a */
ecma_property_descriptor_t prop_desc;
ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, property_name_p, &prop_desc);
#if ENABLED (JERRY_BUILTIN_PROXY)
if (ECMA_IS_VALUE_ERROR (status))
{
ecma_deref_object (descriptors_p);
ecma_collection_free (prop_names_p);
return status;
}
#endif /* ENABLED (JERRY_BUILTIN_PROXY) */
if (ecma_is_value_true (status))
{
/* 4.b */
ecma_object_t *desc_obj_p = ecma_op_from_property_descriptor (&prop_desc);
/* 4.c */
ecma_property_value_t *value_p = ecma_create_named_data_property (descriptors_p,
property_name_p,
ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE,
NULL);
value_p->value = ecma_make_object_value (desc_obj_p);
ecma_deref_object (desc_obj_p);
ecma_free_property_descriptor (&prop_desc);
}
}
ecma_collection_free (prop_names_p);
return ecma_make_object_value (descriptors_p);
} /* ecma_builtin_object_object_get_own_property_descriptors */
#endif /* ENABLED (JERRY_ESNEXT) */
/**
* The Object object's 'defineProperties' routine
*
@@ -1213,6 +1284,13 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in
ecma_deref_ecma_string (prop_name_p);
break;
}
#if ENABLED (JERRY_ESNEXT)
case ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTORS:
{
result = ecma_builtin_object_object_get_own_property_descriptors (obj_p);
break;
}
#endif /* ENABLED (JERRY_ESNEXT) */
default:
{
JERRY_UNREACHABLE ();
jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h
+3
View File
@@ -55,6 +55,9 @@ ROUTINE (LIT_MAGIC_STRING_IS_FROZEN_UL, ECMA_OBJECT_ROUTINE_IS_FROZEN, 1, 1)
ROUTINE (LIT_MAGIC_STRING_IS_EXTENSIBLE, ECMA_OBJECT_ROUTINE_IS_EXTENSIBLE, 1, 1)
ROUTINE (LIT_MAGIC_STRING_KEYS, ECMA_OBJECT_ROUTINE_KEYS, 1, 1)
ROUTINE (LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL, ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTOR, 2, 2)
#if ENABLED (JERRY_ESNEXT)
ROUTINE (LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTORS_UL, ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTORS, 1, 1)
#endif /* ENABLED (JERRY_ESNEXT) */
ROUTINE (LIT_MAGIC_STRING_CREATE, ECMA_OBJECT_ROUTINE_CREATE, 2, 2)
ROUTINE (LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL, ECMA_OBJECT_ROUTINE_DEFINE_PROPERTIES, 2, 2)
ROUTINE (LIT_MAGIC_STRING_DEFINE_PROPERTY_UL, ECMA_OBJECT_ROUTINE_DEFINE_PROPERTY, 3, 3)
jerry-core/ecma/operations/ecma-objects.c
+2 -2
View File
@@ -1860,8 +1860,8 @@ ecma_op_object_define_own_property (ecma_object_t *obj_p, /**< the object */
*
* The output property descriptor will always be initialized to an empty descriptor.
*
* @return true - if property found
* false - otherwise
* @return ECMA_VALUE_ERROR - if the Proxy.[[GetOwnProperty]] operation raises error
* ECMA_VALUE_{TRUE, FALSE} - if property found or not
*/
ecma_value_t
ecma_op_object_get_own_property_descriptor (ecma_object_t *object_p, /**< the object */
jerry-core/lit/lit-magic-strings.inc.h
+7
View File
@@ -889,6 +889,9 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_SYMBOLS_UL, "getOwnPrope
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASYNC_GENERATOR_FUNCTION_UL, "AsyncGeneratorFunction")
#endif
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL, "getOwnPropertyDescriptor")
#if ENABLED (JERRY_ESNEXT)
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTORS_UL, "getOwnPropertyDescriptors")
#endif
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING__FUNCTION_TO_STRING, "function(){/* ecmascript */}")
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (0, LIT_MAGIC_STRING__EMPTY)
@@ -1050,7 +1053,11 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (22, LIT_MAGIC_STRING_GET_OWN_PROPERTY_D
#endif
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (23, LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL)
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (24, LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL)
#if ENABLED (JERRY_ESNEXT)
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (25, LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTORS_UL)
#else
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (25, LIT_MAGIC_STRING__FUNCTION_TO_STRING)
#endif
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (26, LIT_MAGIC_STRING__FUNCTION_TO_STRING)
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (27, LIT_MAGIC_STRING__FUNCTION_TO_STRING)
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (28, LIT_MAGIC_STRING__FUNCTION_TO_STRING)
jerry-core/lit/lit-magic-strings.ini
+1
View File
@@ -365,4 +365,5 @@ LIT_MAGIC_STRING_PROPERTY_IS_ENUMERABLE_UL = "propertyIsEnumerable"
LIT_MAGIC_STRING_GET_OWN_PROPERTY_SYMBOLS_UL = "getOwnPropertySymbols"
LIT_MAGIC_STRING_ASYNC_GENERATOR_FUNCTION_UL = "AsyncGeneratorFunction"
LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL = "getOwnPropertyDescriptor"
LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTORS_UL = "getOwnPropertyDescriptors"
LIT_MAGIC_STRING__FUNCTION_TO_STRING = "function(){/* ecmascript */}"