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

Implement ToPropertyKey operation (#3966)

Browse Source 
From ES 6 the ToPropertyKey operation is used to convert elements to a valid property key.
This "new" method uses the ToPrimitive operation which can call the `@@ToPrimitive`
well-known symbol to convert the given element to a key.

JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.usz@partner.samsung.com
This commit is contained in:
Péter Gál
2020-07-06 15:17:18 +02:00
committed by GitHub
parent ed9e3eccf9
commit ae5cfae3e7
10 changed files with 174 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c
+1 -1
View File
@@ -284,7 +284,7 @@ ecma_builtin_object_prototype_dispatch_routine (uint16_t builtin_routine_id, /**
}
#endif /* ENABLED (JERRY_ESNEXT)*/
ecma_string_t *prop_name_p = ecma_op_to_prop_name (arguments_list_p[0]);
ecma_string_t *prop_name_p = ecma_op_to_property_key (arguments_list_p[0]);
if (prop_name_p == NULL)
{
jerry-core/ecma/builtin-objects/ecma-builtin-object.c
+2 -2
View File
@@ -1213,7 +1213,7 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in
if (builtin_routine_id == ECMA_OBJECT_ROUTINE_DEFINE_PROPERTY)
{
ecma_string_t *prop_name_p = ecma_op_to_prop_name (arg2);
ecma_string_t *prop_name_p = ecma_op_to_property_key (arg2);
if (prop_name_p == NULL)
{
@@ -1275,7 +1275,7 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in
}
case ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTOR:
{
ecma_string_t *prop_name_p = ecma_op_to_prop_name (arg2);
ecma_string_t *prop_name_p = ecma_op_to_property_key (arg2);
if (prop_name_p == NULL)
{
jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c
+4 -4
View File
@@ -96,8 +96,8 @@ ecma_builtin_reflect_dispatch_routine (uint16_t builtin_routine_id, /**< built-i
}
/* 2. */
ecma_string_t *name_str_p = ecma_op_to_prop_name (((arguments_number > 1) ? arguments_list[1]
: ECMA_VALUE_UNDEFINED));
ecma_string_t *name_str_p = ecma_op_to_property_key (((arguments_number > 1) ? arguments_list[1]
: ECMA_VALUE_UNDEFINED));
/* 3. */
if (name_str_p == NULL)
@@ -262,7 +262,7 @@ ecma_builtin_reflect_dispatch_routine (uint16_t builtin_routine_id, /**< built-i
case ECMA_REFLECT_OBJECT_DEFINE_PROPERTY:
{
ecma_object_t *obj_p = ecma_get_object_from_value (arguments_list[0]);
ecma_string_t *name_str_p = ecma_op_to_prop_name (arguments_list[1]);
ecma_string_t *name_str_p = ecma_op_to_property_key (arguments_list[1]);
if (name_str_p == NULL)
{
@@ -297,7 +297,7 @@ ecma_builtin_reflect_dispatch_routine (uint16_t builtin_routine_id, /**< built-i
case ECMA_REFLECT_OBJECT_GET_OWN_PROPERTY_DESCRIPTOR:
{
ecma_object_t *obj_p = ecma_get_object_from_value (arguments_list[0]);
ecma_string_t *name_str_p = ecma_op_to_prop_name (arguments_list[1]);
ecma_string_t *name_str_p = ecma_op_to_property_key (arguments_list[1]);
if (name_str_p == NULL)
{
jerry-core/ecma/operations/ecma-conversion.c
+32 -8
View File
@@ -489,27 +489,51 @@ ecma_op_to_string (ecma_value_t value) /**< ecma value */
} /* ecma_op_to_string */
/**
* ToPropertyName operation.
* ToPropertyKey operation.
*
* See also:
* ECMA 262 v6, 7.1.14
* ECMA 262 v10, 7.1.14
* ECMA 262 v11, 7.1.19
*
* @return NULL - if the conversion fails
* ecma-string - otherwise
*/
ecma_string_t *
ecma_op_to_prop_name (ecma_value_t value) /**< ecma value */
ecma_op_to_property_key (ecma_value_t value) /**< ecma value */
{
ecma_check_value_type_is_spec_defined (value);
/* Fast path for strings and symbols */
if (JERRY_LIKELY (ecma_is_value_prop_name (value)))
{
ecma_string_t *key_p = ecma_get_prop_name_from_value (value);
ecma_ref_ecma_string (key_p);
return key_p;
}
#if ENABLED (JERRY_ESNEXT)
if (ecma_is_value_symbol (value))
ecma_value_t key = ecma_op_to_primitive (value, ECMA_PREFERRED_TYPE_STRING);
if (ECMA_IS_VALUE_ERROR (key))
{
ecma_string_t *symbol_p = ecma_get_symbol_from_value (value);
ecma_ref_ecma_string (symbol_p);
return NULL;
}
if (ecma_is_value_symbol (key))
{
ecma_string_t *symbol_p = ecma_get_symbol_from_value (key);
return symbol_p;
}
#endif /* ENABLED (JERRY_ESNEXT) */
ecma_string_t *result = ecma_op_to_string (key);
ecma_free_value (key);
return result;
#else /* !ENABLED (JERRY_ESNEXT) */
ecma_check_value_type_is_spec_defined (value);
return ecma_op_to_string (value);
} /* ecma_op_to_prop_name */
#endif /* ENABLED (JERRY_ESNEXT) */
} /* ecma_op_to_property_key */
/**
* ToObject operation.
jerry-core/ecma/operations/ecma-conversion.h
+1 -1
View File
@@ -47,7 +47,7 @@ bool ecma_op_to_boolean (ecma_value_t value);
ecma_value_t ecma_op_to_number (ecma_value_t value);
ecma_value_t ecma_get_number (ecma_value_t value, ecma_number_t *number_p);
ecma_string_t *ecma_op_to_string (ecma_value_t value);
ecma_string_t *ecma_op_to_prop_name (ecma_value_t value);
ecma_string_t *ecma_op_to_property_key (ecma_value_t value);
ecma_value_t ecma_op_to_object (ecma_value_t value);
ecma_value_t ecma_op_to_integer (ecma_value_t value, ecma_number_t *number_p);
ecma_value_t ecma_op_to_length (ecma_value_t value, uint32_t *length);
jerry-core/vm/opcodes-ecma-relational-equality.c
+1 -1
View File
@@ -159,7 +159,7 @@ opfunc_in (ecma_value_t left_value, /**< left value */
return ecma_raise_type_error (ECMA_ERR_MSG ("Expected an object in 'in' check."));
}
ecma_string_t *property_name_p = ecma_op_to_prop_name (left_value);
ecma_string_t *property_name_p = ecma_op_to_property_key (left_value);
if (JERRY_UNLIKELY (property_name_p == NULL))
{
jerry-core/vm/opcodes.c
+3 -3
View File
@@ -262,7 +262,7 @@ vm_op_delete_prop (ecma_value_t object, /**< base object */
}
JERRY_ASSERT (check_coercible == ECMA_VALUE_EMPTY);
ecma_string_t *name_string_p = ecma_op_to_prop_name (property);
ecma_string_t *name_string_p = ecma_op_to_property_key (property);
if (JERRY_UNLIKELY (name_string_p == NULL))
{
@@ -1398,7 +1398,7 @@ opfunc_form_super_reference (ecma_value_t **vm_stack_top_p, /**< current vm stac
}
ecma_object_t *parent_p = ecma_get_object_from_value (parent);
ecma_string_t *prop_name_p = ecma_op_to_prop_name (prop_name);
ecma_string_t *prop_name_p = ecma_op_to_property_key (prop_name);
if (prop_name_p == NULL)
{
@@ -1448,7 +1448,7 @@ opfunc_assign_super_reference (ecma_value_t **vm_stack_top_p, /**< vm stack top
}
ecma_object_t *base_obj_p = ecma_get_object_from_value (base_obj);
ecma_string_t *prop_name_p = ecma_op_to_prop_name (stack_top_p[-2]);
ecma_string_t *prop_name_p = ecma_op_to_property_key (stack_top_p[-2]);
if (prop_name_p == NULL)
{
jerry-core/vm/vm.c
+4 -4
View File
@@ -132,7 +132,7 @@ vm_op_get_value (ecma_value_t object, /**< base object */
return error_value;
}
ecma_string_t *property_name_p = ecma_op_to_prop_name (property);
ecma_string_t *property_name_p = ecma_op_to_property_key (property);
if (property_name_p == NULL)
{
@@ -1816,7 +1816,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
JERRY_ASSERT ((opcode_data >> VM_OC_NON_STATIC_SHIFT) <= 0x1);
ecma_string_t *prop_name_p = ecma_op_to_prop_name (right_value);
ecma_string_t *prop_name_p = ecma_op_to_property_key (right_value);
if (JERRY_UNLIKELY (prop_name_p == NULL))
{
@@ -1849,7 +1849,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
{
JERRY_ASSERT ((opcode_data >> VM_OC_NON_STATIC_SHIFT) <= 0x1);
ecma_string_t *prop_name_p = ecma_op_to_prop_name (left_value);
ecma_string_t *prop_name_p = ecma_op_to_property_key (left_value);
if (JERRY_UNLIKELY (prop_name_p == NULL))
{
@@ -2029,7 +2029,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
prop_name_value = stack_top_p[-2];
}
ecma_string_t *prop_name_p = ecma_op_to_prop_name (prop_name_value);
ecma_string_t *prop_name_p = ecma_op_to_property_key (prop_name_value);
if (JERRY_UNLIKELY (prop_name_p == NULL))
{