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

Little refactoring of control paths in general objects' [[DefineOwnProperty]] to satisfy cppcheck's requirements.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-09-17 15:37:12 +04:00
parent 5df12d2e04
commit 59ef3bf074
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libecmaoperations/ecma-objects-general.c
+26 -28
View File
@@ -599,39 +599,37 @@ ecma_op_general_object_define_own_property (ecma_object_t *obj_p, /**< the objec
{ {
return ecma_reject (is_throw); return ecma_reject (is_throw);
} }
// 4.
// a.
if (is_property_desc_generic_descriptor
|| is_property_desc_data_descriptor)
{
ecma_property_t *new_prop_p = ecma_create_named_data_property (obj_p,
property_name_p,
property_desc.writable,
property_desc.enumerable,
property_desc.configurable);
new_prop_p->u.named_data_property.value = ecma_copy_value (property_desc.value, false);
ecma_gc_update_may_ref_younger_object_flag_by_value (obj_p, new_prop_p->u.named_data_property.value);
}
else else
{ {
// 4. // b.
JERRY_ASSERT(is_property_desc_accessor_descriptor);
// a. ecma_create_named_accessor_property (obj_p,
if (is_property_desc_generic_descriptor property_name_p,
|| is_property_desc_data_descriptor) property_desc.get_p,
{ property_desc.set_p,
ecma_property_t *new_prop_p = ecma_create_named_data_property (obj_p, property_desc.enumerable,
property_name_p, property_desc.configurable);
property_desc.writable,
property_desc.enumerable,
property_desc.configurable);
new_prop_p->u.named_data_property.value = ecma_copy_value (property_desc.value, false);
ecma_gc_update_may_ref_younger_object_flag_by_value (obj_p, new_prop_p->u.named_data_property.value);
}
else
{
// b.
JERRY_ASSERT(is_property_desc_accessor_descriptor);
ecma_create_named_accessor_property (obj_p,
property_name_p,
property_desc.get_p,
property_desc.set_p,
property_desc.enumerable,
property_desc.configurable);
}
return ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE);
} }
return ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE);
} }
// 5. // 5.