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

Remove ecma_simple_value_t and refactor ecma_make_simple_value (#2135)

Browse Source 
This patch removes all ecma_make_simple_value calls to make the code more easy to understand.
Also removes the type ecma_simple_value_t which improves the performance in related code paths by calculating the value of new ecma_value_t is no longer needed.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2017-12-06 18:06:07 +01:00
committed by Dániel Bátyai
parent 1007b63024
commit e83de3accd
60 changed files with 470 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/operations/ecma-array-object.c
+3 -3
View File
@@ -202,7 +202,7 @@ ecma_op_array_object_set_length (ecma_object_t *object_p, /**< the array object
return ecma_reject (is_throw);
}
}
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
else if (!ecma_is_property_writable (ext_object_p->u.array.length_prop))
{
@@ -227,7 +227,7 @@ ecma_op_array_object_set_length (ecma_object_t *object_p, /**< the array object
if (current_len_uint32 == new_len_uint32)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
return ecma_reject (is_throw);
} /* ecma_op_array_object_set_length */
@@ -326,7 +326,7 @@ ecma_op_array_object_define_own_property (ecma_object_t *object_p, /**< the arra
ext_object_p->u.array.length = index + 1;
}
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
} /* ecma_op_array_object_define_own_property */
/**
jerry-core/ecma/operations/ecma-comparison.c
+7 -7
View File
@@ -40,13 +40,13 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */
{
if (x == y)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
if (ecma_are_values_integer_numbers (x, y))
{
/* Note: the (x == y) comparison captures the true case. */
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE);
return ECMA_VALUE_FALSE;
}
if (ecma_is_value_number (x))
@@ -131,7 +131,7 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */
{
/* 1., e. */
/* Note: the (x == y) comparison captures the true case. */
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE);
return ECMA_VALUE_FALSE;
}
/* 7. */
@@ -159,7 +159,7 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */
/* 1., f. */
/* Note: the (x == y) comparison captures the true case. */
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE);
return ECMA_VALUE_FALSE;
}
if (ecma_is_value_boolean (x))
@@ -178,7 +178,7 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */
return ecma_make_boolean_value (is_equal);
}
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE);
return ECMA_VALUE_FALSE;
} /* ecma_op_abstract_equality_compare */
/**
@@ -283,7 +283,7 @@ ecma_op_abstract_relational_compare (ecma_value_t x, /**< first operand */
ecma_value_t y, /**< second operand */
bool left_first) /**< 'LeftFirst' flag */
{
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
/* 1., 2. */
ECMA_TRY_CATCH (prim_first_converted_value,
@@ -312,7 +312,7 @@ ecma_op_abstract_relational_compare (ecma_value_t x, /**< first operand */
|| ecma_number_is_nan (ny))
{
/* c., d. */
ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
ret_value = ECMA_VALUE_UNDEFINED;
}
else
{
jerry-core/ecma/operations/ecma-conversion.c
+6 -6
View File
@@ -60,7 +60,7 @@ ecma_op_check_object_coercible (ecma_value_t value) /**< ecma value */
}
else
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
return ECMA_VALUE_EMPTY;
}
} /* ecma_op_check_object_coercible */
@@ -258,7 +258,7 @@ ecma_op_to_number (ecma_value_t value) /**< ecma value */
}
else if (ecma_is_value_object (value))
{
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
ECMA_TRY_CATCH (primitive_value,
ecma_op_to_primitive (value, ECMA_PREFERRED_TYPE_NUMBER),
@@ -316,7 +316,7 @@ ecma_op_to_string (ecma_value_t value) /**< ecma value */
if (unlikely (ecma_is_value_object (value)))
{
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
ECMA_TRY_CATCH (prim_value,
ecma_op_to_primitive (value, ECMA_PREFERRED_TYPE_STRING),
@@ -490,7 +490,7 @@ ecma_op_from_property_descriptor (const ecma_property_descriptor_t *src_prop_des
/* a. */
if (src_prop_desc_p->get_p == NULL)
{
prop_desc.value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
prop_desc.value = ECMA_VALUE_UNDEFINED;
}
else
{
@@ -508,7 +508,7 @@ ecma_op_from_property_descriptor (const ecma_property_descriptor_t *src_prop_des
/* b. */
if (src_prop_desc_p->set_p == NULL)
{
prop_desc.value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
prop_desc.value = ECMA_VALUE_UNDEFINED;
}
else
{
@@ -564,7 +564,7 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
if return value is normal
empty completion value */
{
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
/* 1. */
if (!ecma_is_value_object (obj_value))
jerry-core/ecma/operations/ecma-eval.c
+1 -1
View File
@@ -49,7 +49,7 @@ ecma_op_eval (ecma_string_t *code_p, /**< code string */
lit_utf8_size_t chars_num = ecma_string_get_size (code_p);
if (chars_num == 0)
{
ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
ret_value = ECMA_VALUE_UNDEFINED;
}
else
{
jerry-core/ecma/operations/ecma-exceptions.c
+2 -2
View File
@@ -157,7 +157,7 @@ ecma_raise_standard_error (ecma_standard_error_t error_type, /**< error type */
}
JERRY_CONTEXT (error_value) = ecma_make_object_value (error_obj_p);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_ERROR);
return ECMA_VALUE_ERROR;
} /* ecma_raise_standard_error */
#ifdef JERRY_ENABLE_ERROR_MESSAGES
@@ -246,7 +246,7 @@ ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, /**< er
ecma_deref_ecma_string (error_msg_p);
JERRY_CONTEXT (error_value) = ecma_make_object_value (error_obj_p);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_ERROR);
return ECMA_VALUE_ERROR;
} /* ecma_raise_standard_error_with_format */
#endif /* JERRY_ENABLE_ERROR_MESSAGES */
jerry-core/ecma/operations/ecma-function-object.c
+6 -6
View File
@@ -269,7 +269,7 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object *
if (!ecma_is_value_object (value))
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE);
return ECMA_VALUE_FALSE;
}
ecma_object_t *v_obj_p = ecma_get_object_from_value (value);
@@ -332,7 +332,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
&& !ecma_is_lexical_environment (func_obj_p));
JERRY_ASSERT (ecma_op_is_callable (ecma_make_object_value (func_obj_p)));
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION)
{
@@ -470,7 +470,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
if (unlikely (ecma_is_value_error_reference (ret_value)))
{
JERRY_CONTEXT (error_value) = ecma_clear_error_reference (ret_value);
ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_ERROR);
ret_value = ECMA_VALUE_ERROR;
}
}
else
@@ -554,7 +554,7 @@ ecma_op_function_construct_simple_or_external (ecma_object_t *func_obj_p, /**< F
JERRY_ASSERT (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION
|| ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION);
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
/* 5. */
ECMA_TRY_CATCH (func_obj_prototype_prop_value,
@@ -637,7 +637,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */
&& !ecma_is_lexical_environment (func_obj_p));
JERRY_ASSERT (ecma_is_constructor (ecma_make_object_value (func_obj_p)));
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION)
{
@@ -828,7 +828,7 @@ ecma_op_external_function_try_to_lazy_instantiate_property (ecma_object_t *objec
ECMA_PROPERTY_FLAG_WRITABLE,
&prototype_prop_p);
prototype_prop_value_p->value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
prototype_prop_value_p->value = ECMA_VALUE_UNDEFINED;
return prototype_prop_p;
}
jerry-core/ecma/operations/ecma-get-put-value.c
+3 -3
View File
@@ -98,7 +98,7 @@ ecma_op_get_value_object_base (ecma_value_t base_value, /**< base value */
|| ecma_is_value_number (base_value)
|| ecma_is_value_string (base_value));
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
ECMA_TRY_CATCH (object_base, ecma_op_to_object (base_value), ret_value);
@@ -106,7 +106,7 @@ ecma_op_get_value_object_base (ecma_value_t base_value, /**< base value */
JERRY_ASSERT (object_p != NULL
&& !ecma_is_lexical_environment (object_p));
ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
ret_value = ECMA_VALUE_UNDEFINED;
/* Circular reference is possible in JavaScript and testing it is complicated. */
int max_depth = ECMA_PROPERTY_SEARCH_DEPTH_LIMIT;
@@ -181,7 +181,7 @@ ecma_op_put_value_lex_env_base (ecma_object_t *ref_base_lex_env_p, /**< referenc
JERRY_ASSERT (ecma_is_value_boolean (completion));
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
return ECMA_VALUE_EMPTY;
}
}
jerry-core/ecma/operations/ecma-jobqueue.c
+5 -5
View File
@@ -168,7 +168,7 @@ ecma_process_promise_reaction_job (void *obj_p) /**< the job to be operated */
{
/* 6. */
handler_result = ecma_op_function_call (ecma_get_object_from_value (handler),
ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED),
ECMA_VALUE_UNDEFINED,
&(job_p->argument),
1);
}
@@ -188,7 +188,7 @@ ecma_process_promise_reaction_job (void *obj_p) /**< the job to be operated */
JERRY_ASSERT (ecma_op_is_callable (reject));
status = ecma_op_function_call (ecma_get_object_from_value (reject),
ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED),
ECMA_VALUE_UNDEFINED,
&handler_result,
1);
ecma_free_value (reject);
@@ -201,7 +201,7 @@ ecma_process_promise_reaction_job (void *obj_p) /**< the job to be operated */
JERRY_ASSERT (ecma_op_is_callable (resolve));
status = ecma_op_function_call (ecma_get_object_from_value (resolve),
ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED),
ECMA_VALUE_UNDEFINED,
&handler_result,
1);
ecma_free_value (resolve);
@@ -259,7 +259,7 @@ ecma_process_promise_resolve_thenable_job (void *obj_p) /**< the job to be opera
then_call_result = JERRY_CONTEXT (error_value);
ret = ecma_op_function_call (ecma_get_object_from_value (funcs->reject),
ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED),
ECMA_VALUE_UNDEFINED,
&then_call_result,
1);
@@ -331,7 +331,7 @@ ecma_enqueue_promise_resolve_thenable_job (ecma_value_t promise, /**< promise to
ecma_value_t
ecma_process_all_enqueued_jobs (void)
{
ecma_value_t ret = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
ecma_value_t ret = ECMA_VALUE_UNDEFINED;
while (JERRY_CONTEXT (job_queue_head_p) != NULL && !ECMA_IS_VALUE_ERROR (ret))
{
jerry-core/ecma/operations/ecma-lex-env.c
+12 -12
View File
@@ -148,12 +148,12 @@ ecma_op_create_mutable_binding (ecma_object_t *lex_env_p, /**< lexical environme
ecma_value_t completion;
if (!ecma_get_object_extensible (binding_obj_p))
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
return ECMA_VALUE_EMPTY;
}
completion = ecma_builtin_helper_def_prop (binding_obj_p,
name_p,
ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED),
ECMA_VALUE_UNDEFINED,
true, /* Writable */
true, /* Enumerable */
is_deletable, /* Configurable */
@@ -169,7 +169,7 @@ ecma_op_create_mutable_binding (ecma_object_t *lex_env_p, /**< lexical environme
}
}
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
return ECMA_VALUE_EMPTY;
} /* ecma_op_create_mutable_binding */
/**
@@ -228,7 +228,7 @@ ecma_op_set_mutable_binding (ecma_object_t *lex_env_p, /**< lexical environment
}
}
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
return ECMA_VALUE_EMPTY;
} /* ecma_op_set_mutable_binding */
/**
@@ -271,7 +271,7 @@ ecma_op_get_binding_value (ecma_object_t *lex_env_p, /**< lexical environment */
}
else
{
result = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
result = ECMA_VALUE_UNDEFINED;
}
}
@@ -300,11 +300,11 @@ ecma_op_delete_binding (ecma_object_t *lex_env_p, /**< lexical environment */
if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE)
{
ecma_property_t *prop_p = ecma_find_named_property (lex_env_p, name_p);
ecma_simple_value_t ret_val;
ecma_value_t ret_val;
if (prop_p == NULL)
{
ret_val = ECMA_SIMPLE_VALUE_TRUE;
ret_val = ECMA_VALUE_TRUE;
}
else
{
@@ -312,17 +312,17 @@ ecma_op_delete_binding (ecma_object_t *lex_env_p, /**< lexical environment */
if (!ecma_is_property_configurable (*prop_p))
{
ret_val = ECMA_SIMPLE_VALUE_FALSE;
ret_val = ECMA_VALUE_FALSE;
}
else
{
ecma_delete_property (lex_env_p, ECMA_PROPERTY_VALUE_PTR (prop_p));
ret_val = ECMA_SIMPLE_VALUE_TRUE;
ret_val = ECMA_VALUE_TRUE;
}
}
return ecma_make_simple_value (ret_val);
return ret_val;
}
else
{
@@ -351,7 +351,7 @@ ecma_op_implicit_this_value (ecma_object_t *lex_env_p) /**< lexical environment
if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
}
else
{
@@ -367,7 +367,7 @@ ecma_op_implicit_this_value (ecma_object_t *lex_env_p) /**< lexical environment
}
else
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
}
}
} /* ecma_op_implicit_this_value */
jerry-core/ecma/operations/ecma-objects-arguments.c
+1 -1
View File
@@ -358,7 +358,7 @@ ecma_op_arguments_object_delete (ecma_object_t *object_p, /**< the object */
}
}
ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
ret_value = ECMA_VALUE_TRUE;
}
return ret_value;
jerry-core/ecma/operations/ecma-objects-general.c
+9 -9
View File
@@ -45,7 +45,7 @@ ecma_reject (bool is_throw) /**< Throw flag */
}
else
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE);
return ECMA_VALUE_FALSE;
}
} /* ecma_reject */
@@ -157,7 +157,7 @@ ecma_op_general_object_delete (ecma_object_t *obj_p, /**< the object */
/* 2. */
if (property == ECMA_PROPERTY_TYPE_NOT_FOUND || property == ECMA_PROPERTY_TYPE_NOT_FOUND_AND_STOP)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
/* 3. */
@@ -167,7 +167,7 @@ ecma_op_general_object_delete (ecma_object_t *obj_p, /**< the object */
ecma_delete_property (obj_p, property_ref.value_p);
/* b. */
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
else if (is_throw)
{
@@ -177,7 +177,7 @@ ecma_op_general_object_delete (ecma_object_t *obj_p, /**< the object */
else
{
/* 5. */
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE);
return ECMA_VALUE_FALSE;
}
JERRY_UNREACHABLE ();
@@ -233,7 +233,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */
return function_value;
}
ecma_value_t call_completion = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t call_completion = ECMA_VALUE_EMPTY;
if (ecma_op_is_callable (function_value))
{
@@ -383,7 +383,7 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob
NULL);
}
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
/* 6. */
@@ -411,7 +411,7 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob
{
JERRY_ASSERT (!is_current_configurable && !ecma_is_property_writable (current_prop));
ecma_value_t result = ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
ecma_value_t result = ECMA_VALUE_TRUE;
if (property_desc_type == ECMA_PROPERTY_TYPE_NAMEDACCESSOR
|| property_desc_p->is_writable
@@ -502,7 +502,7 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob
value_p->getter_setter_pair_cp);
jmem_pools_free (getter_setter_pair_p, sizeof (ecma_getter_setter_pointers_t));
#endif /* JERRY_CPOINTER_32_BIT */
value_p->value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
value_p->value = ECMA_VALUE_UNDEFINED;
}
/* Update flags */
@@ -558,7 +558,7 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob
ecma_set_property_configurable_attr (ext_property_ref.property_p, property_desc_p->is_configurable);
}
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
} /* ecma_op_general_object_define_own_property */
#undef ECMA_PROPERTY_TYPE_GENERIC
jerry-core/ecma/operations/ecma-objects.c
+17 -17
View File
@@ -390,7 +390,7 @@ ecma_op_object_has_property (ecma_object_t *object_p, /**< the object */
* Note: search includes prototypes
*
* @return ecma value if property is found
* ECMA_SIMPLE_VALUE_NOT_FOUND if property is not found
* ECMA_VALUE_NOT_FOUND if property is not found
* Returned value must be freed with ecma_free_value
*/
ecma_value_t
@@ -496,7 +496,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */
{
ecma_deref_ecma_string (num_to_str);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
}
ecma_deref_ecma_string (num_to_str);
@@ -574,7 +574,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */
if (property_p == NULL)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_NOT_FOUND);
return ECMA_VALUE_NOT_FOUND;
}
}
@@ -591,7 +591,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */
if (getter_p == NULL)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
}
return ecma_op_function_call (getter_p, base_value, NULL, 0);
@@ -603,7 +603,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */
* Note: search includes prototypes
*
* @return ecma value if property is found
* ECMA_SIMPLE_VALUE_NOT_FOUND if property is not found
* ECMA_VALUE_NOT_FOUND if property is not found
* Returned value must be freed with ecma_free_value
*/
ecma_value_t
@@ -632,7 +632,7 @@ ecma_op_object_find (ecma_object_t *object_p, /**< the object */
}
while (object_p != NULL);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_NOT_FOUND);
return ECMA_VALUE_NOT_FOUND;
} /* ecma_op_object_find */
/**
@@ -705,7 +705,7 @@ ecma_op_object_get (ecma_object_t *object_p, /**< the object */
}
while (object_p != NULL);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
} /* ecma_op_object_get */
/**
@@ -751,7 +751,7 @@ ecma_op_object_get_by_magic_id (ecma_object_t *object_p, /**< the object */
}
while (object_p != NULL);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
} /* ecma_op_object_get_by_magic_id */
/**
@@ -765,9 +765,9 @@ ecma_op_object_get_by_magic_id (ecma_object_t *object_p, /**< the object */
* @return ecma value
* The returned value must be freed with ecma_free_value.
*
* Returns with ECMA_SIMPLE_VALUE_TRUE if the operation is
* Returns with ECMA_VALUE_TRUE if the operation is
* successful. Otherwise it returns with an error object
* or ECMA_SIMPLE_VALUE_FALSE.
* or ECMA_VALUE_FALSE.
*
* Note: even if is_throw is false, the setter can throw an
* error, and this function returns with that error.
@@ -828,7 +828,7 @@ ecma_op_object_put (ecma_object_t *object_p, /**< the object */
&& ecma_is_lexical_environment (lex_env_p));
ecma_op_set_mutable_binding (lex_env_p, arg_name_p, value, true);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
}
}
@@ -843,7 +843,7 @@ ecma_op_object_put (ecma_object_t *object_p, /**< the object */
if (set_status)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
return ecma_reject (is_throw);
@@ -930,7 +930,7 @@ ecma_op_object_put (ecma_object_t *object_p, /**< the object */
ecma_named_data_property_assign_value (object_p,
ECMA_PROPERTY_VALUE_PTR (property_p),
value);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
}
else
@@ -1016,7 +1016,7 @@ ecma_op_object_put (ecma_object_t *object_p, /**< the object */
JERRY_ASSERT (ecma_is_value_undefined (new_prop_value_p->value));
new_prop_value_p->value = ecma_copy_value_if_not_object (value);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
}
@@ -1033,7 +1033,7 @@ ecma_op_object_put (ecma_object_t *object_p, /**< the object */
if (!ECMA_IS_VALUE_ERROR (ret_value))
{
ecma_fast_free_value (ret_value);
ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
ret_value = ECMA_VALUE_TRUE;
}
return ret_value;
@@ -1187,7 +1187,7 @@ ecma_op_object_define_own_property (ecma_object_t *obj_p, /**< the object */
if (define_status)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
return ECMA_VALUE_TRUE;
}
return ecma_reject (is_throw);
@@ -1888,7 +1888,7 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
* Get value of an object if the class matches
*
* @return value of the object if the class matches
* ECMA_SIMPLE_VALUE_NOT_FOUND otherwise
* ECMA_VALUE_NOT_FOUND otherwise
*/
inline bool __attr_always_inline___
ecma_object_class_is (ecma_object_t *object_p, /**< object */
jerry-core/ecma/operations/ecma-promise-object.c
+14 -14
View File
@@ -74,7 +74,7 @@ ecma_promise_set_result (ecma_object_t *obj_p, /**< points to promise object */
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p;
JERRY_ASSERT (ext_object_p->u.class_prop.u.value == ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED));
JERRY_ASSERT (ext_object_p->u.class_prop.u.value == ECMA_VALUE_UNDEFINED);
ext_object_p->u.class_prop.u.value = result;
} /* ecma_promise_set_result */
@@ -237,18 +237,18 @@ ecma_promise_reject_handler (const ecma_value_t function, /**< the function itse
{
ecma_free_value (promise);
ecma_free_value (already_resolved);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
}
/* 5. */
ecma_set_already_resolved_value (already_resolved, true);
/* 6. */
ecma_value_t reject_value = (argc == 0) ? ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED) : argv[0];
ecma_value_t reject_value = (argc == 0) ? ECMA_VALUE_UNDEFINED : argv[0];
ecma_reject_promise (promise, reject_value);
ecma_free_value (promise);
ecma_free_value (already_resolved);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
} /* ecma_promise_reject_handler */
/**
@@ -290,7 +290,7 @@ ecma_promise_resolve_handler (const ecma_value_t function, /**< the function its
/* If the argc is 0, then fulfill the `undefined`. */
if (argc == 0)
{
ecma_fulfill_promise (promise, ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED));
ecma_fulfill_promise (promise, ECMA_VALUE_UNDEFINED);
goto end_of_resolve_function;
}
@@ -336,7 +336,7 @@ ecma_promise_resolve_handler (const ecma_value_t function, /**< the function its
end_of_resolve_function:
ecma_free_value (promise);
ecma_free_value (already_resolved);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
} /* ecma_promise_resolve_handler */
/**
@@ -361,7 +361,7 @@ ecma_call_builtin_executor (ecma_object_t *executor_p, /**< the executor object
/* 3. */
ecma_value_t resolve = ecma_op_object_get (ecma_get_object_from_value (capability), str_resolve);
if (resolve != ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED))
if (resolve != ECMA_VALUE_UNDEFINED)
{
ecma_free_value (resolve);
ecma_free_value (capability);
@@ -375,7 +375,7 @@ ecma_call_builtin_executor (ecma_object_t *executor_p, /**< the executor object
/* 4. */
ecma_value_t reject = ecma_op_object_get (ecma_get_object_from_value (capability), str_reject);
if (reject != ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED))
if (reject != ECMA_VALUE_UNDEFINED)
{
ecma_free_value (reject);
ecma_free_value (capability);
@@ -402,7 +402,7 @@ ecma_call_builtin_executor (ecma_object_t *executor_p, /**< the executor object
ecma_deref_ecma_string (str_resolve);
ecma_deref_ecma_string (str_reject);
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
} /* ecma_call_builtin_executor */
/**
@@ -491,7 +491,7 @@ ecma_op_create_promise_object (ecma_value_t executor, /**< the executor function
ecma_deref_object (prototype_obj_p);
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
ext_object_p->u.class_prop.class_id = LIT_MAGIC_STRING_PROMISE_UL;
ext_object_p->u.class_prop.u.value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
ext_object_p->u.class_prop.u.value = ECMA_VALUE_UNDEFINED;
ecma_promise_object_t *promise_object_p = (ecma_promise_object_t *) object_p;
promise_object_p->fulfill_reactions = NULL;
promise_object_p->reject_reactions = NULL;
@@ -517,7 +517,7 @@ ecma_op_create_promise_object (ecma_value_t executor, /**< the executor function
false);
/* 9. */
ecma_value_t completion = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
ecma_value_t completion = ECMA_VALUE_UNDEFINED;
if (type == ECMA_PROMISE_EXECUTOR_FUNCTION)
{
@@ -525,7 +525,7 @@ ecma_op_create_promise_object (ecma_value_t executor, /**< the executor function
ecma_value_t argv[] = { funcs->resolve, funcs->reject };
completion = ecma_op_function_call (ecma_get_object_from_value (executor),
ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED),
ECMA_VALUE_UNDEFINED,
argv,
2);
}
@@ -543,14 +543,14 @@ ecma_op_create_promise_object (ecma_value_t executor, /**< the executor function
JERRY_UNUSED (executor);
}
ecma_value_t status = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t status = ECMA_VALUE_EMPTY;
if (ECMA_IS_VALUE_ERROR (completion))
{
/* 10.a. */
completion = JERRY_CONTEXT (error_value);
status = ecma_op_function_call (ecma_get_object_from_value (funcs->reject),
ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED),
ECMA_VALUE_UNDEFINED,
&completion,
1);
}
jerry-core/ecma/operations/ecma-reference.c
+1 -1
View File
@@ -105,7 +105,7 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical
if (getter_p == NULL)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
}
ecma_value_t base_value = ecma_make_object_value (binding_obj_p);
jerry-core/ecma/operations/ecma-regexp-object.c
+32 -32
View File
@@ -73,7 +73,7 @@ ecma_value_t
re_parse_regexp_flags (ecma_string_t *flags_str_p, /**< Input string with flags */
uint16_t *flags_p) /**< [out] parsed flag bits */
{
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
ECMA_STRING_TO_UTF8_STRING (flags_str_p, flags_start_p, flags_start_size);
@@ -260,7 +260,7 @@ ecma_op_create_regexp_object (ecma_string_t *pattern_p, /**< input pattern */
ecma_string_t *flags_str_p) /**< flags */
{
JERRY_ASSERT (pattern_p != NULL);
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
uint16_t flags = 0;
if (flags_str_p != NULL)
@@ -372,7 +372,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
const lit_utf8_byte_t *str_p, /**< input string pointer */
const lit_utf8_byte_t **out_str_p) /**< [out] matching substring iterator */
{
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
re_opcode_t op;
const lit_utf8_byte_t *str_curr_p = str_p;
@@ -385,14 +385,14 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
{
JERRY_TRACE_MSG ("Execute RE_OP_MATCH: match\n");
*out_str_p = str_curr_p;
ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE);
ret_value = ECMA_VALUE_TRUE;
return ret_value; /* match */
}
case RE_OP_CHAR:
{
if (str_curr_p >= re_ctx_p->input_end_p)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
bool is_ignorecase = re_ctx_p->flags & RE_FLAG_IGNORE_CASE;
@@ -403,7 +403,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (ch1 != ch2)
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
JERRY_TRACE_MSG ("match\n");
@@ -414,7 +414,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
{
if (str_curr_p >= re_ctx_p->input_end_p)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
ecma_char_t ch = lit_utf8_read_next (&str_curr_p);
@@ -423,7 +423,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (lit_char_is_line_terminator (ch))
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
JERRY_TRACE_MSG ("match\n");
@@ -442,7 +442,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (!(re_ctx_p->flags & RE_FLAG_MULTILINE))
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
if (lit_char_is_line_terminator (lit_utf8_peek_prev (str_curr_p)))
@@ -452,7 +452,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
}
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
case RE_OP_ASSERT_END:
{
@@ -467,7 +467,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (!(re_ctx_p->flags & RE_FLAG_MULTILINE))
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
if (lit_char_is_line_terminator (lit_utf8_peek_next (str_curr_p)))
@@ -477,7 +477,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
}
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
case RE_OP_ASSERT_WORD_BOUNDARY:
case RE_OP_ASSERT_NOT_WORD_BOUNDARY:
@@ -508,7 +508,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (is_wordchar_left == is_wordchar_right)
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
}
else
@@ -519,7 +519,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (is_wordchar_left != is_wordchar_right)
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
}
@@ -529,7 +529,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
case RE_OP_LOOKAHEAD_POS:
case RE_OP_LOOKAHEAD_NEG:
{
ecma_value_t match_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t match_value = ECMA_VALUE_EMPTY;
const lit_utf8_byte_t *sub_str_p = NULL;
uint32_t array_size = re_ctx_p->num_of_captures + re_ctx_p->num_of_non_captures;
@@ -567,7 +567,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
else
{
JERRY_TRACE_MSG ("fail\n");
match_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
match_value = ECMA_VALUE_FALSE; /* fail */
}
}
@@ -598,7 +598,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (str_curr_p >= re_ctx_p->input_end_p)
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
bool is_ignorecase = re_ctx_p->flags & RE_FLAG_IGNORE_CASE;
@@ -628,7 +628,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (!is_match)
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
}
else
@@ -637,7 +637,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (is_match)
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
}
JERRY_TRACE_MSG ("match\n");
@@ -667,7 +667,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (str_curr_p >= re_ctx_p->input_end_p)
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
ch1 = lit_utf8_read_next (&sub_str_p);
@@ -676,7 +676,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (ch1 != ch2)
{
JERRY_TRACE_MSG ("fail\n");
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
}
JERRY_TRACE_MSG ("match\n");
@@ -713,14 +713,14 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
bc_p = old_bc_p;
re_ctx_p->saved_p[RE_GLOBAL_START_IDX] = old_start_p;
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
case RE_OP_SAVE_AND_MATCH:
{
JERRY_TRACE_MSG ("End of pattern is reached: match\n");
re_ctx_p->saved_p[RE_GLOBAL_END_IDX] = str_curr_p;
*out_str_p = str_curr_p;
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_TRUE); /* match */
return ECMA_VALUE_TRUE; /* match */
}
case RE_OP_ALTERNATIVE:
{
@@ -875,7 +875,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
}
re_ctx_p->saved_p[start_idx] = old_start_p;
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
case RE_OP_CAPTURE_NON_GREEDY_GROUP_END:
case RE_OP_NON_CAPTURE_NON_GREEDY_GROUP_END:
@@ -968,7 +968,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
if (re_ctx_p->num_of_iterations_p[iter_idx] >= min
&& str_curr_p== re_ctx_p->saved_p[start_idx])
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
re_ctx_p->num_of_iterations_p[iter_idx]++;
@@ -1045,7 +1045,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
/* restore if fails */
re_ctx_p->saved_p[end_idx] = old_end_p;
re_ctx_p->num_of_iterations_p[iter_idx]--;
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
case RE_OP_NON_GREEDY_ITERATOR:
{
@@ -1092,7 +1092,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
str_curr_p = sub_str_p;
num_of_iter++;
}
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
case RE_OP_GREEDY_ITERATOR:
{
@@ -1148,7 +1148,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
lit_utf8_read_prev (&str_curr_p);
num_of_iter--;
}
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
}
default:
{
@@ -1159,7 +1159,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
}
JERRY_UNREACHABLE ();
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_FALSE); /* fail */
return ECMA_VALUE_FALSE; /* fail */
} /* re_match_regexp */
/**
@@ -1231,7 +1231,7 @@ ecma_regexp_exec_helper (ecma_value_t regexp_value, /**< RegExp object */
ecma_value_t input_string, /**< input string */
bool ignore_global) /**< ignore global flag */
{
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
JERRY_ASSERT (ecma_is_value_object (regexp_value));
JERRY_ASSERT (ecma_is_value_string (input_string));
@@ -1402,7 +1402,7 @@ ecma_regexp_exec_helper (ecma_value_t regexp_value, /**< RegExp object */
for (uint32_t i = 0; i < re_ctx.num_of_captures; i += 2)
{
ecma_string_t *index_str_p = ecma_new_ecma_string_from_uint32 (i / 2);
ecma_value_t capture_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
ecma_value_t capture_value = ECMA_VALUE_UNDEFINED;
if (((re_ctx.saved_p[i] && re_ctx.saved_p[i + 1])
&& re_ctx.saved_p[i + 1] >= re_ctx.saved_p[i]))
@@ -1438,7 +1438,7 @@ ecma_regexp_exec_helper (ecma_value_t regexp_value, /**< RegExp object */
}
else
{
ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_NULL);
ret_value = ECMA_VALUE_NULL;
}
}
jerry-core/ecma/operations/ecma-try-catch-macro.h
+2 -2
View File
@@ -30,7 +30,7 @@
* statement with same argument as corresponding ECMA_TRY_CATCH's first argument.
*/
#define ECMA_TRY_CATCH(var, op, return_value) \
JERRY_ASSERT (return_value == ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY)); \
JERRY_ASSERT (return_value == ECMA_VALUE_EMPTY); \
ecma_value_t var ## _completion = op; \
if (ECMA_IS_VALUE_ERROR (var ## _completion)) \
{ \
@@ -65,7 +65,7 @@
* statement with same argument as corresponding ECMA_OP_TO_NUMBER_TRY_CATCH's first argument.
*/
#define ECMA_OP_TO_NUMBER_TRY_CATCH(num_var, value, return_value) \
JERRY_ASSERT (return_value == ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY)); \
JERRY_ASSERT (return_value == ECMA_VALUE_EMPTY); \
ecma_number_t num_var = ecma_number_make_nan (); \
if (ecma_is_value_number (value)) \
{ \
jerry-core/ecma/operations/ecma-typedarray-object.c
+7 -7
View File
@@ -379,7 +379,7 @@ ecma_op_typedarray_from (ecma_value_t items_val, /**< the source array-like obje
uint8_t element_size_shift, /**< the size shift of the element length */
lit_magic_string_id_t class_id) /**< class name of the typedarray */
{
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret_value = ECMA_VALUE_EMPTY;
/* 3 */
JERRY_ASSERT (ecma_op_is_callable (map_fn_val) || ecma_is_value_undefined (map_fn_val));
@@ -596,7 +596,7 @@ ecma_op_create_typedarray (const ecma_value_t *arguments_list_p, /**< the arg li
{
JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL);
ecma_value_t ret = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t ret = ECMA_VALUE_EMPTY;
if (arguments_list_len == 0)
{
@@ -645,10 +645,10 @@ ecma_op_create_typedarray (const ecma_value_t *arguments_list_p, /**< the arg li
/* 22.2.1.5 */
ecma_object_t *arraybuffer_p = ecma_get_object_from_value (arguments_list_p[0]);
ecma_value_t arg2 = ((arguments_list_len > 1) ? arguments_list_p[1]
: ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED));
: ECMA_VALUE_UNDEFINED);
ecma_value_t arg3 = ((arguments_list_len > 2) ? arguments_list_p[2]
: ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED));
: ECMA_VALUE_UNDEFINED);
ECMA_OP_TO_NUMBER_TRY_CATCH (num2, arg2, ret);
@@ -718,7 +718,7 @@ ecma_op_create_typedarray (const ecma_value_t *arguments_list_p, /**< the arg li
else
{
/* 22.2.1.4 */
ecma_value_t undef = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
ecma_value_t undef = ECMA_VALUE_UNDEFINED;
ret = ecma_op_typedarray_from (arguments_list_p[0],
undef,
undef,
@@ -800,7 +800,7 @@ ecma_op_typedarray_get_index_prop (ecma_object_t *obj_p, /**< a TypedArray objec
if (index >= array_length)
{
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
return ECMA_VALUE_UNDEFINED;
}
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (obj_p);
@@ -878,7 +878,7 @@ ecma_op_typedarray_set_index_prop (ecma_object_t *obj_p, /**< a TypedArray objec
return false;
}
ecma_value_t error = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
ecma_value_t error = ECMA_VALUE_EMPTY;
ECMA_OP_TO_NUMBER_TRY_CATCH (value_num, value, error);