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

Improvements for ecma_op_general_object_define_own_property.

Browse Source 
List of improvements:
 - Get the [[Enumerable]] and [[Configurable]] attributes before removing a property.
 - Directly check the type of the property in asserts.

Related issues: #115 and #132

JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.u-szeged@partner.samsung.com
This commit is contained in:
Peter Gal
2015-06-02 16:39:25 +02:00
parent d6fb76416a
commit e4db5aa539
3 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/operations/ecma-objects-general.cpp
+11 -8
View File
@@ -747,6 +747,9 @@ ecma_op_general_object_define_own_property (ecma_object_t *obj_p, /**< the objec
return ecma_reject (is_throw);
}
bool was_enumerable = ecma_is_property_enumerable (current_p);
bool was_configurable = ecma_is_property_configurable (current_p);
ecma_delete_property (obj_p, current_p);
if (is_current_data_descriptor)
@@ -757,8 +760,8 @@ ecma_op_general_object_define_own_property (ecma_object_t *obj_p, /**< the objec
property_name_p,
NULL,
NULL,
ecma_is_property_enumerable (current_p),
ecma_is_property_configurable (current_p));
was_enumerable,
was_configurable);
}
else
{
@@ -767,8 +770,8 @@ ecma_op_general_object_define_own_property (ecma_object_t *obj_p, /**< the objec
current_p = ecma_create_named_data_property (obj_p,
property_name_p,
false,
ecma_is_property_enumerable (current_p),
ecma_is_property_configurable (current_p));
was_enumerable,
was_configurable);
}
}
else if (is_property_desc_data_descriptor && is_current_data_descriptor)
@@ -819,28 +822,28 @@ ecma_op_general_object_define_own_property (ecma_object_t *obj_p, /**< the objec
// 12.
if (property_desc_p->is_value_defined)
{
JERRY_ASSERT (is_current_data_descriptor);
JERRY_ASSERT (current_p->type == ECMA_PROPERTY_NAMEDDATA);
ecma_named_data_property_assign_value (obj_p, current_p, property_desc_p->value);
}
if (property_desc_p->is_writable_defined)
{
JERRY_ASSERT (is_current_data_descriptor);
JERRY_ASSERT (current_p->type == ECMA_PROPERTY_NAMEDDATA);
ecma_set_property_writable_attr (current_p, property_desc_p->is_writable);
}
if (property_desc_p->is_get_defined)
{
JERRY_ASSERT (is_current_accessor_descriptor);
JERRY_ASSERT (current_p->type == ECMA_PROPERTY_NAMEDACCESSOR);
ecma_set_named_accessor_property_getter (obj_p, current_p, property_desc_p->get_p);
}
if (property_desc_p->is_set_defined)
{
JERRY_ASSERT (is_current_accessor_descriptor);
JERRY_ASSERT (current_p->type == ECMA_PROPERTY_NAMEDACCESSOR);
ecma_set_named_accessor_property_setter (obj_p, current_p, property_desc_p->set_p);
}