Simplify ECMA_OP_TO_NUMBER_TRY_CATCH macro. (#2185)

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg
2018-02-01 11:31:17 +01:00
committed by yichoi
parent c935e4b7e2
commit 06ebfc52ed
3 changed files with 98 additions and 56 deletions
@@ -66,23 +66,10 @@
*/
#define ECMA_OP_TO_NUMBER_TRY_CATCH(num_var, value, return_value) \
JERRY_ASSERT (return_value == ECMA_VALUE_EMPTY); \
ecma_number_t num_var = ecma_number_make_nan (); \
if (ecma_is_value_number (value)) \
{ \
num_var = ecma_get_number_from_value (value); \
} \
else \
{ \
ECMA_TRY_CATCH (to_number_value, \
ecma_op_to_number (value), \
return_value); \
\
num_var = ecma_get_number_from_value (to_number_value); \
\
ECMA_FINALIZE (to_number_value); \
} \
ecma_number_t num_var; \
return_value = ecma_get_number (value, &num_var); \
\
if (ecma_is_value_empty (return_value)) \
if (likely (ecma_is_value_empty (return_value))) \
{
/**
@@ -92,10 +79,6 @@
* Each ECMA_OP_TO_NUMBER_TRY_CATCH should be followed by ECMA_OP_TO_NUMBER_FINALIZE
* with same argument as corresponding ECMA_OP_TO_NUMBER_TRY_CATCH's first argument.
*/
#define ECMA_OP_TO_NUMBER_FINALIZE(num_var) } \
else \
{ \
JERRY_ASSERT (ecma_number_is_nan (num_var)); \
}
#define ECMA_OP_TO_NUMBER_FINALIZE(num_var) }
#endif /* !ECMA_TRY_CATCH_MACRO_H */