Implement ToPropertyKey operation (#3966)
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:
@@ -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))
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
+4
-4
@@ -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))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user