Continue replacing duplicate ecma definitions (#4644)

JerryScript-DCO-1.0-Signed-off-by: Bela Toth tbela@inf.u-szeged.hu
This commit is contained in:
Tóth Béla
2021-04-19 13:44:01 +02:00
committed by GitHub
parent 1f2a8d4ac1
commit cc1a263657
19 changed files with 231 additions and 262 deletions
+23 -23
View File
@@ -1000,10 +1000,10 @@ ecma_op_array_object_set_length (ecma_object_t *object_p, /**< the array object
}
/* Only the writable and data properties can be modified. */
if (flags & (ECMA_PROP_IS_CONFIGURABLE
| ECMA_PROP_IS_ENUMERABLE
| ECMA_PROP_IS_GET_DEFINED
| ECMA_PROP_IS_SET_DEFINED))
if (flags & (JERRY_PROP_IS_CONFIGURABLE
| JERRY_PROP_IS_ENUMERABLE
| JERRY_PROP_IS_GET_DEFINED
| JERRY_PROP_IS_SET_DEFINED))
{
return ecma_raise_property_redefinition (ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), flags);
}
@@ -1015,9 +1015,9 @@ ecma_op_array_object_set_length (ecma_object_t *object_p, /**< the array object
if (new_len_num == old_len_uint32)
{
/* Only the writable flag must be updated. */
if (flags & ECMA_PROP_IS_WRITABLE_DEFINED)
if (flags & JERRY_PROP_IS_WRITABLE_DEFINED)
{
if (!(flags & ECMA_PROP_IS_WRITABLE))
if (!(flags & JERRY_PROP_IS_WRITABLE))
{
if (ecma_op_array_is_fast_array (ext_object_p))
{
@@ -1051,8 +1051,8 @@ ecma_op_array_object_set_length (ecma_object_t *object_p, /**< the array object
ext_object_p->u.array.length = current_len_uint32;
if ((flags & ECMA_PROP_IS_WRITABLE_DEFINED)
&& !(flags & ECMA_PROP_IS_WRITABLE))
if ((flags & JERRY_PROP_IS_WRITABLE_DEFINED)
&& !(flags & JERRY_PROP_IS_WRITABLE))
{
if (ecma_op_array_is_fast_array (ext_object_p))
{
@@ -1075,13 +1075,13 @@ ecma_op_array_object_set_length (ecma_object_t *object_p, /**< the array object
* If the property desciptor fields contains all the flags below
* attempt to stay fast access array during [[DefineOwnProperty]] operation.
*/
#define ECMA_FAST_ARRAY_DATA_PROP_FLAGS (ECMA_PROP_IS_VALUE_DEFINED \
| ECMA_PROP_IS_ENUMERABLE_DEFINED \
| ECMA_PROP_IS_ENUMERABLE \
| ECMA_PROP_IS_CONFIGURABLE_DEFINED \
| ECMA_PROP_IS_CONFIGURABLE \
| ECMA_PROP_IS_WRITABLE_DEFINED \
| ECMA_PROP_IS_WRITABLE)
#define ECMA_FAST_ARRAY_DATA_PROP_FLAGS (JERRY_PROP_IS_VALUE_DEFINED \
| JERRY_PROP_IS_ENUMERABLE_DEFINED \
| JERRY_PROP_IS_ENUMERABLE \
| JERRY_PROP_IS_CONFIGURABLE_DEFINED \
| JERRY_PROP_IS_CONFIGURABLE \
| JERRY_PROP_IS_WRITABLE_DEFINED \
| JERRY_PROP_IS_WRITABLE)
/**
* [[DefineOwnProperty]] ecma array object's operation
@@ -1100,14 +1100,14 @@ ecma_op_array_object_define_own_property (ecma_object_t *object_p, /**< the arra
{
if (ecma_string_is_length (property_name_p))
{
JERRY_ASSERT ((property_desc_p->flags & ECMA_PROP_IS_CONFIGURABLE_DEFINED)
|| !(property_desc_p->flags & ECMA_PROP_IS_CONFIGURABLE));
JERRY_ASSERT ((property_desc_p->flags & ECMA_PROP_IS_ENUMERABLE_DEFINED)
|| !(property_desc_p->flags & ECMA_PROP_IS_ENUMERABLE));
JERRY_ASSERT ((property_desc_p->flags & ECMA_PROP_IS_WRITABLE_DEFINED)
|| !(property_desc_p->flags & ECMA_PROP_IS_WRITABLE));
JERRY_ASSERT ((property_desc_p->flags & JERRY_PROP_IS_CONFIGURABLE_DEFINED)
|| !(property_desc_p->flags & JERRY_PROP_IS_CONFIGURABLE));
JERRY_ASSERT ((property_desc_p->flags & JERRY_PROP_IS_ENUMERABLE_DEFINED)
|| !(property_desc_p->flags & JERRY_PROP_IS_ENUMERABLE));
JERRY_ASSERT ((property_desc_p->flags & JERRY_PROP_IS_WRITABLE_DEFINED)
|| !(property_desc_p->flags & JERRY_PROP_IS_WRITABLE));
if (property_desc_p->flags & ECMA_PROP_IS_VALUE_DEFINED)
if (property_desc_p->flags & JERRY_PROP_IS_VALUE_DEFINED)
{
return ecma_op_array_object_set_length (object_p, property_desc_p->value, property_desc_p->flags);
}
@@ -1165,7 +1165,7 @@ ecma_op_array_object_define_own_property (ecma_object_t *object_p, /**< the arra
ecma_property_descriptor_t prop_desc;
prop_desc = *property_desc_p;
prop_desc.flags &= (uint16_t) ~ECMA_PROP_SHOULD_THROW;
prop_desc.flags &= (uint16_t) ~JERRY_PROP_SHOULD_THROW;
ecma_value_t completition = ecma_op_general_object_define_own_property (object_p,
property_name_p,