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

Returning ecma_value_t instead of ecma_completion_value_t from ECMA_TRY_CATCH for case when completion value is normal.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2015-01-27 22:07:26 +03:00
parent f231b9a0d2
commit 0f487a0bb7
25 changed files with 236 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libecmaoperations/ecma-conversion.c
+24 -24
View File
@@ -269,13 +269,13 @@ ecma_op_to_number (const ecma_value_t& value) /**< ecma-value */
{
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH (completion_to_primitive,
ECMA_TRY_CATCH (primitive_value,
ecma_op_to_primitive (value, ECMA_PREFERRED_TYPE_NUMBER),
ret_value);
ret_value = ecma_op_to_number (ecma_get_completion_value_value (completion_to_primitive));
ret_value = ecma_op_to_number (primitive_value);
ECMA_FINALIZE (completion_to_primitive);
ECMA_FINALIZE (primitive_value);
return ret_value;
}
@@ -331,7 +331,7 @@ ecma_op_to_string (const ecma_value_t& value) /**< ecma-value */
ecma_op_to_primitive (value, ECMA_PREFERRED_TYPE_STRING),
ret_value);
ret_value = ecma_op_to_string (ecma_get_completion_value_value (prim_value));
ret_value = ecma_op_to_string (prim_value);
ECMA_FINALIZE (prim_value);
@@ -585,17 +585,17 @@ ecma_op_to_property_descriptor (const ecma_value_t& obj_value, /**< object value
ecma_op_object_get (obj_p, enumerable_magic_string_p),
ret_value);
ECMA_TRY_CATCH (boolean_enumerable_prop_value,
ecma_op_to_boolean (ecma_get_completion_value_value (enumerable_prop_value)),
ecma_op_to_boolean (enumerable_prop_value),
ret_value);
prop_desc.is_enumerable_defined = true;
if (ecma_is_completion_value_normal_true (boolean_enumerable_prop_value))
if (ecma_is_value_true (boolean_enumerable_prop_value))
{
prop_desc.is_enumerable = true;
}
else
{
JERRY_ASSERT (ecma_is_completion_value_normal_false (boolean_enumerable_prop_value));
JERRY_ASSERT (ecma_is_value_boolean (boolean_enumerable_prop_value));
prop_desc.is_enumerable = false;
}
@@ -619,17 +619,17 @@ ecma_op_to_property_descriptor (const ecma_value_t& obj_value, /**< object value
ecma_op_object_get (obj_p, configurable_magic_string_p),
ret_value);
ECMA_TRY_CATCH (boolean_configurable_prop_value,
ecma_op_to_boolean (ecma_get_completion_value_value (configurable_prop_value)),
ecma_op_to_boolean (configurable_prop_value),
ret_value);
prop_desc.is_configurable_defined = true;
if (ecma_is_completion_value_normal_true (boolean_configurable_prop_value))
if (ecma_is_value_true (boolean_configurable_prop_value))
{
prop_desc.is_configurable = true;
}
else
{
JERRY_ASSERT (ecma_is_completion_value_normal_false (boolean_configurable_prop_value));
JERRY_ASSERT (ecma_is_value_boolean (boolean_configurable_prop_value));
prop_desc.is_configurable = false;
}
@@ -655,7 +655,7 @@ ecma_op_to_property_descriptor (const ecma_value_t& obj_value, /**< object value
ret_value);
prop_desc.is_value_defined = true;
prop_desc.value = ecma_copy_value (ecma_get_completion_value_value (value_prop_value), true);
prop_desc.value = ecma_copy_value (value_prop_value, true);
ECMA_FINALIZE (value_prop_value);
}
@@ -676,17 +676,17 @@ ecma_op_to_property_descriptor (const ecma_value_t& obj_value, /**< object value
ecma_op_object_get (obj_p, writable_magic_string_p),
ret_value);
ECMA_TRY_CATCH (boolean_writable_prop_value,
ecma_op_to_boolean (ecma_get_completion_value_value (writable_prop_value)),
ecma_op_to_boolean (writable_prop_value),
ret_value);
prop_desc.is_writable_defined = true;
if (ecma_is_completion_value_normal_true (boolean_writable_prop_value))
if (ecma_is_value_true (boolean_writable_prop_value))
{
prop_desc.is_writable = true;
}
else
{
JERRY_ASSERT (ecma_is_completion_value_normal_false (boolean_writable_prop_value));
JERRY_ASSERT (ecma_is_value_boolean (boolean_writable_prop_value));
prop_desc.is_writable = false;
}
@@ -711,8 +711,8 @@ ecma_op_to_property_descriptor (const ecma_value_t& obj_value, /**< object value
ecma_op_object_get (obj_p, get_magic_string_p),
ret_value);
if (!ecma_op_is_callable (ecma_get_completion_value_value (get_prop_value))
&& !ecma_is_value_undefined (ecma_get_completion_value_value (get_prop_value)))
if (!ecma_op_is_callable (get_prop_value)
&& !ecma_is_value_undefined (get_prop_value))
{
ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE));
}
@@ -720,15 +720,15 @@ ecma_op_to_property_descriptor (const ecma_value_t& obj_value, /**< object value
{
prop_desc.is_get_defined = true;
if (ecma_is_value_undefined (ecma_get_completion_value_value (get_prop_value)))
if (ecma_is_value_undefined (get_prop_value))
{
prop_desc.get_p = NULL;
}
else
{
JERRY_ASSERT (ecma_is_value_object (ecma_get_completion_value_value (get_prop_value)));
JERRY_ASSERT (ecma_is_value_object (get_prop_value));
ecma_object_t *get_p = ecma_get_object_from_completion_value (get_prop_value);
ecma_object_t *get_p = ecma_get_object_from_value (get_prop_value);
ecma_ref_object (get_p);
prop_desc.get_p = get_p;
@@ -755,8 +755,8 @@ ecma_op_to_property_descriptor (const ecma_value_t& obj_value, /**< object value
ecma_op_object_get (obj_p, set_magic_string_p),
ret_value);
if (!ecma_op_is_callable (ecma_get_completion_value_value (set_prop_value))
&& !ecma_is_value_undefined (ecma_get_completion_value_value (set_prop_value)))
if (!ecma_op_is_callable (set_prop_value)
&& !ecma_is_value_undefined (set_prop_value))
{
ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE));
}
@@ -764,15 +764,15 @@ ecma_op_to_property_descriptor (const ecma_value_t& obj_value, /**< object value
{
prop_desc.is_set_defined = true;
if (ecma_is_value_undefined (ecma_get_completion_value_value (set_prop_value)))
if (ecma_is_value_undefined (set_prop_value))
{
prop_desc.set_p = NULL;
}
else
{
JERRY_ASSERT (ecma_is_value_object (ecma_get_completion_value_value (set_prop_value)));
JERRY_ASSERT (ecma_is_value_object (set_prop_value));
ecma_object_t *set_p = ecma_get_object_from_completion_value (set_prop_value);
ecma_object_t *set_p = ecma_get_object_from_value (set_prop_value);
ecma_ref_object (set_p);
prop_desc.set_p = set_p;