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-comparison.c
+14 -26
View File
@@ -139,8 +139,7 @@ ecma_op_abstract_equality_compare (const ecma_value_t& x, /**< first operand */
ecma_op_to_number (y),
ret_value);
ret_value = ecma_op_abstract_equality_compare (x,
ecma_get_completion_value_value (y_num_value));
ret_value = ecma_op_abstract_equality_compare (x, y_num_value);
ECMA_FINALIZE (y_num_value);
}
@@ -151,8 +150,7 @@ ecma_op_abstract_equality_compare (const ecma_value_t& x, /**< first operand */
ecma_op_to_number (x),
ret_value);
ret_value = ecma_op_abstract_equality_compare (ecma_get_completion_value_value (x_num_value),
y);
ret_value = ecma_op_abstract_equality_compare (x_num_value, y);
ECMA_FINALIZE (x_num_value);
}
@@ -163,8 +161,7 @@ ecma_op_abstract_equality_compare (const ecma_value_t& x, /**< first operand */
ecma_op_to_number (x),
ret_value);
ret_value = ecma_op_abstract_equality_compare (ecma_get_completion_value_value (x_num_value),
y);
ret_value = ecma_op_abstract_equality_compare (x_num_value, y);
ECMA_FINALIZE (x_num_value);
}
@@ -175,8 +172,7 @@ ecma_op_abstract_equality_compare (const ecma_value_t& x, /**< first operand */
ecma_op_to_number (y),
ret_value);
ret_value = ecma_op_abstract_equality_compare (x,
ecma_get_completion_value_value (y_num_value));
ret_value = ecma_op_abstract_equality_compare (x, y_num_value);
ECMA_FINALIZE (y_num_value);
}
@@ -188,8 +184,7 @@ ecma_op_abstract_equality_compare (const ecma_value_t& x, /**< first operand */
ecma_op_to_primitive (y, ECMA_PREFERRED_TYPE_NO),
ret_value);
ret_value = ecma_op_abstract_equality_compare (x,
ecma_get_completion_value_value (y_prim_value));
ret_value = ecma_op_abstract_equality_compare (x, y_prim_value);
ECMA_FINALIZE (y_prim_value);
}
@@ -201,8 +196,7 @@ ecma_op_abstract_equality_compare (const ecma_value_t& x, /**< first operand */
ecma_op_to_primitive (x, ECMA_PREFERRED_TYPE_NO),
ret_value);
ret_value = ecma_op_abstract_equality_compare (ecma_get_completion_value_value (x_prim_value),
y);
ret_value = ecma_op_abstract_equality_compare (x_prim_value, y);
ECMA_FINALIZE (x_prim_value);
}
@@ -352,25 +346,19 @@ ecma_op_abstract_relational_compare (const ecma_value_t& x, /**< first operand *
ecma_op_to_primitive (second_converted_value, ECMA_PREFERRED_TYPE_NUMBER),
ret_value);
ecma_completion_value_t px, py;
const ecma_value_t &px = left_first ? prim_first_converted_value : prim_second_converted_value;
const ecma_value_t &py = left_first ? prim_second_converted_value : prim_first_converted_value;
px = left_first ? prim_first_converted_value : prim_second_converted_value;
py = left_first ? prim_second_converted_value : prim_first_converted_value;
const bool is_px_string = ecma_is_value_string (ecma_get_completion_value_value (px));
const bool is_py_string = ecma_is_value_string (ecma_get_completion_value_value (py));
const bool is_px_string = ecma_is_value_string (px);
const bool is_py_string = ecma_is_value_string (py);
if (!(is_px_string && is_py_string))
{
// 3.
// a.
ECMA_OP_TO_NUMBER_TRY_CATCH (nx,
ecma_get_completion_value_value (px),
ret_value);
ECMA_OP_TO_NUMBER_TRY_CATCH (ny,
ecma_get_completion_value_value (py),
ret_value);
ECMA_OP_TO_NUMBER_TRY_CATCH (nx, px, ret_value);
ECMA_OP_TO_NUMBER_TRY_CATCH (ny, py, ret_value);
// b.
if (ecma_number_is_nan (nx)
@@ -451,8 +439,8 @@ ecma_op_abstract_relational_compare (const ecma_value_t& x, /**< first operand *
{ // 4.
JERRY_ASSERT (is_px_string && is_py_string);
ecma_string_t *str_x_p = ecma_get_string_from_completion_value (px);
ecma_string_t *str_y_p = ecma_get_string_from_completion_value (py);
ecma_string_t *str_x_p = ecma_get_string_from_value (px);
ecma_string_t *str_y_p = ecma_get_string_from_value (py);
bool is_px_less = ecma_compare_ecma_strings_relational (str_x_p, str_y_p);
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;
src/libecmaoperations/ecma-function-object.c
+8 -8
View File
@@ -399,13 +399,13 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object *
ecma_op_object_get (func_obj_p, prototype_magic_string_p),
ret_value);
if (!ecma_is_value_object (ecma_get_completion_value_value (prototype_obj_value)))
if (!ecma_is_value_object (prototype_obj_value))
{
ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE));
}
else
{
ecma_object_t *prototype_obj_p = ecma_get_object_from_completion_value (prototype_obj_value);
ecma_object_t *prototype_obj_p = ecma_get_object_from_value (prototype_obj_value);
JERRY_ASSERT (prototype_obj_p != NULL);
do
@@ -513,7 +513,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
ecma_object_t *local_env_p = ecma_create_decl_lex_env (scope_p);
// 9.
ECMA_TRY_CATCH (args_var_declaration_completion,
ECMA_TRY_CATCH (args_var_declaration_ret,
ecma_function_call_setup_args_variables (func_obj_p,
local_env_p,
arguments_list_p,
@@ -535,7 +535,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
ret_value = completion;
}
ECMA_FINALIZE (args_var_declaration_completion);
ECMA_FINALIZE (args_var_declaration_ret);
ecma_deref_object (local_env_p);
ecma_free_value (this_binding, true);
@@ -591,9 +591,9 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */
// 6.
ecma_object_t *prototype_p;
if (ecma_is_value_object (ecma_get_completion_value_value (func_obj_prototype_prop_value)))
if (ecma_is_value_object (func_obj_prototype_prop_value))
{
prototype_p = ecma_get_object_from_completion_value (func_obj_prototype_prop_value);
prototype_p = ecma_get_object_from_value (func_obj_prototype_prop_value);
ecma_ref_object (prototype_p);
}
else
@@ -622,11 +622,11 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */
ecma_value_t obj_value;
// 9.
if (ecma_is_value_object (ecma_get_completion_value_value (call_completion)))
if (ecma_is_value_object (call_completion))
{
ecma_deref_object (obj_p);
obj_value = ecma_copy_value (ecma_get_completion_value_value (call_completion), true);
obj_value = ecma_copy_value (call_completion, true);
}
else
{
src/libecmaoperations/ecma-get-put-value.c
+6 -6
View File
@@ -108,7 +108,7 @@ ecma_op_get_value_object_base (ecma_reference_t ref) /**< ECMA-reference */
ECMA_TRY_CATCH (obj_base, ecma_op_to_object (base), ret_value);
ecma_object_t *obj_p = ecma_get_object_from_completion_value (obj_base);
ecma_object_t *obj_p = ecma_get_object_from_value (obj_base);
JERRY_ASSERT (obj_p != NULL
&& !ecma_is_lexical_environment (obj_p));
@@ -229,7 +229,7 @@ ecma_op_put_value_object_base (ecma_reference_t ref, /**< ECMA-reference */
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH (put_completion,
ECMA_TRY_CATCH (put_ret_value,
ecma_op_object_put (obj_p,
ECMA_GET_NON_NULL_POINTER (ecma_string_t,
ref.referenced_name_cp),
@@ -239,7 +239,7 @@ ecma_op_put_value_object_base (ecma_reference_t ref, /**< ECMA-reference */
ret_value = ecma_make_empty_completion_value ();
ECMA_FINALIZE (put_completion);
ECMA_FINALIZE (put_ret_value);
return ret_value;
}
@@ -251,7 +251,7 @@ ecma_op_put_value_object_base (ecma_reference_t ref, /**< ECMA-reference */
// sub_1.
ECMA_TRY_CATCH (obj_base, ecma_op_to_object (base), ret_value);
ecma_object_t *obj_p = ecma_get_object_from_completion_value (obj_base);
ecma_object_t *obj_p = ecma_get_object_from_value (obj_base);
JERRY_ASSERT (obj_p != NULL
&& !ecma_is_lexical_environment (obj_p));
@@ -288,13 +288,13 @@ ecma_op_put_value_object_base (ecma_reference_t ref, /**< ECMA-reference */
prop_p->u.named_accessor_property.set_p);
JERRY_ASSERT (setter_p != NULL);
ECMA_TRY_CATCH (call_completion,
ECMA_TRY_CATCH (call_ret,
ecma_op_function_call (setter_p, base, &value, 1),
ret_value);
ret_value = ecma_make_empty_completion_value ();
ECMA_FINALIZE (call_completion);
ECMA_FINALIZE (call_ret);
}
}
src/libecmaoperations/ecma-objects-arguments.c
+4 -4
View File
@@ -503,13 +503,13 @@ ecma_op_arguments_object_delete (ecma_object_t *obj_p, /**< the object */
// 3.
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH (delete_in_args_completion,
ECMA_TRY_CATCH (delete_in_args_ret,
ecma_op_general_object_delete (obj_p,
property_name_p,
is_throw),
ret_value);
if (ecma_is_completion_value_normal_true (delete_in_args_completion))
if (ecma_is_value_true (delete_in_args_ret))
{
if (mapped_prop_p != NULL)
{
@@ -523,12 +523,12 @@ ecma_op_arguments_object_delete (ecma_object_t *obj_p, /**< the object */
}
else
{
JERRY_ASSERT (ecma_is_completion_value_normal_false (delete_in_args_completion));
JERRY_ASSERT (ecma_is_value_boolean (delete_in_args_ret));
ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_FALSE);
}
ECMA_FINALIZE (delete_in_args_completion);
ECMA_FINALIZE (delete_in_args_ret);
return ret_value;
} /* ecma_op_arguments_object_delete */
src/libecmaoperations/ecma-objects-general.c
+2 -2
View File
@@ -292,7 +292,7 @@ ecma_op_general_object_put (ecma_object_t *obj_p, /**< the object */
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH (call_completion,
ECMA_TRY_CATCH (call_ret,
ecma_op_function_call (setter_p,
ecma_make_object_value (obj_p),
&value,
@@ -301,7 +301,7 @@ ecma_op_general_object_put (ecma_object_t *obj_p, /**< the object */
ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE);
ECMA_FINALIZE (call_completion);
ECMA_FINALIZE (call_ret);
return ret_value;
}
src/libecmaoperations/ecma-try-catch-macro.h
+10 -8
View File
@@ -30,14 +30,16 @@
* statement with same argument as corresponding ECMA_TRY_CATCH's first argument.
*/
#define ECMA_TRY_CATCH(var, op, return_value) \
ecma_completion_value_t var = op; \
if (unlikely (ecma_is_completion_value_throw (var))) \
ecma_completion_value_t var ## _completion = op; \
if (unlikely (ecma_is_completion_value_throw (var ## _completion))) \
{ \
return_value = var; \
return_value = var ## _completion; \
} \
else \
{ \
JERRY_ASSERT(ecma_is_completion_value_normal (var))
JERRY_ASSERT(ecma_is_completion_value_normal (var ## _completion)); \
\
ecma_value_t var __unused = ecma_get_completion_value_value (var ## _completion)
/**
* The macro marks end of code block that is defined by corresponding
@@ -47,7 +49,7 @@
* Each ECMA_TRY_CATCH should be followed by ECMA_FINALIZE with same argument
* as corresponding ECMA_TRY_CATCH's first argument.
*/
#define ECMA_FINALIZE(var) ecma_free_completion_value (var); \
#define ECMA_FINALIZE(var) ecma_free_completion_value (var ## _completion); \
}
/**
@@ -70,13 +72,13 @@
} \
else \
{ \
ECMA_TRY_CATCH (to_number_completion_value, \
ECMA_TRY_CATCH (to_number_value, \
ecma_op_to_number (value), \
return_value); \
\
num_var = *ecma_get_number_from_completion_value (to_number_completion_value); \
num_var = *ecma_get_number_from_value (to_number_value); \
\
ECMA_FINALIZE (to_number_completion_value); \
ECMA_FINALIZE (to_number_value); \
} \
\
if (ecma_is_completion_value_empty (return_value)) \