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

Add constant error messages (#4640)

Browse Source 
added two new file ecma-errors.h and ecma-erros.c

it contains the most used errors messages.

JerryScript-DCO-1.0-Signed-off-by: bence gabor kis kisbg@inf.u-szeged.hu
This commit is contained in:
kisbg
2021-04-07 12:46:12 +02:00
committed by GitHub
parent d85020f709
commit 2381078e80
26 changed files with 415 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c
+1 -1
View File
@@ -87,7 +87,7 @@ ecma_builtin_array_iterator_prototype_object_next (ecma_value_t this_val) /**< t
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (array_object_p);
if (ecma_arraybuffer_is_detached (arraybuffer_p))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
/* b. */
jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
+8 -8
View File
@@ -437,7 +437,7 @@ ecma_builtin_array_prototype_object_push (const ecma_value_t *argument_list_p, /
{
if ((ecma_number_t) (length + arguments_number) > UINT32_MAX)
{
return ecma_raise_range_error (ECMA_ERR_MSG ("Invalid Array length"));
return ecma_raise_range_error (ECMA_ERR_MSG (ecma_error_invalid_array_length));
}
if (arguments_number == 0)
@@ -1505,7 +1505,7 @@ ecma_builtin_array_prototype_object_unshift (const ecma_value_t args[], /**< arg
{
if (args_number > UINT32_MAX - len)
{
return ecma_raise_range_error (ECMA_ERR_MSG ("Invalid Array length"));
return ecma_raise_range_error (ECMA_ERR_MSG (ecma_error_invalid_array_length));
}
if (args_number == 0)
@@ -1849,7 +1849,7 @@ ecma_builtin_array_apply (ecma_value_t arg1, /**< callbackfn */
/* 4. */
if (!ecma_op_is_callable (arg1))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Callback function is not callable"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_callback_is_not_callable));
}
/* We already checked that arg1 is callable */
@@ -1932,7 +1932,7 @@ ecma_builtin_array_prototype_object_map (ecma_value_t arg1, /**< callbackfn */
/* 4. */
if (!ecma_op_is_callable (arg1))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Callback function is not callable"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_callback_is_not_callable));
}
/* 6. */
@@ -2026,7 +2026,7 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t arg1, /**< callbackfn *
/* 4. */
if (!ecma_op_is_callable (arg1))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Callback function is not callable"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_callback_is_not_callable));
}
/* 6. */
@@ -2134,7 +2134,7 @@ ecma_builtin_array_reduce_from (const ecma_value_t args_p[], /**< routine's argu
/* 4. */
if (!ecma_op_is_callable (args_p[0]))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Callback function is not callable"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_callback_is_not_callable));
}
/* 5. */
@@ -2352,7 +2352,7 @@ ecma_builtin_array_prototype_object_find (ecma_value_t predicate, /**< callback
/* 5. */
if (!ecma_op_is_callable (predicate))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Callback function is not callable"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_callback_is_not_callable));
}
/* We already checked that predicate is callable, so it will always be an object. */
@@ -2836,7 +2836,7 @@ ecma_builtin_array_prototype_object_flat_map (ecma_value_t callback, /**< callba
{
if (!ecma_op_is_callable (callback))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Callback function is not callable"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_callback_is_not_callable));
}
/* 4. */
jerry-core/ecma/builtin-objects/ecma-builtin-array.c
+4 -4
View File
@@ -96,7 +96,7 @@ ecma_builtin_array_object_from (ecma_value_t this_arg, /**< 'this' argument */
/* 3.a */
if (!ecma_op_is_callable (mapfn))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Callback function is not callable"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_callback_is_not_callable));
}
/* 3.b */
@@ -135,7 +135,7 @@ ecma_builtin_array_object_from (ecma_value_t this_arg, /**< 'this' argument */
if (ecma_is_value_undefined (array) || ecma_is_value_null (array))
{
ecma_free_value (using_iterator);
return ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert undefined or null to object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_cannot_convert_to_object));
}
/* 6.c */
@@ -298,7 +298,7 @@ iterator_cleanup:
if (ecma_is_value_undefined (array) || ecma_is_value_null (array))
{
ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert undefined or null to object"));
ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_cannot_convert_to_object));
goto cleanup;
}
@@ -493,7 +493,7 @@ ecma_builtin_array_dispatch_call (const ecma_value_t *arguments_list_p, /**< arg
if (num != ((ecma_number_t) num_uint32))
{
return ecma_raise_range_error (ECMA_ERR_MSG ("Invalid array length"));
return ecma_raise_range_error (ECMA_ERR_MSG (ecma_error_invalid_array_length));
}
return ecma_make_object_value (ecma_op_new_array_object (num_uint32));
jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c
+2 -2
View File
@@ -65,7 +65,7 @@ ecma_builtin_arraybuffer_prototype_bytelength_getter (ecma_value_t this_arg) /**
{
if (ecma_arraybuffer_is_detached (object_p))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
uint32_t len = ecma_arraybuffer_get_length (object_p);
@@ -108,7 +108,7 @@ ecma_builtin_arraybuffer_prototype_object_slice (ecma_value_t this_arg, /**< thi
/* 4. */
if (ecma_arraybuffer_is_detached (object_p))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
/* 5. */
jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c
+2 -2
View File
@@ -122,7 +122,7 @@ ecma_builtin_dataview_prototype_object_getters (ecma_value_t this_arg, /**< this
{
if (ecma_arraybuffer_is_detached (obj_p->buffer_p))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
return ecma_make_uint32_value (obj_p->header.u.cls.u3.length);
}
@@ -132,7 +132,7 @@ ecma_builtin_dataview_prototype_object_getters (ecma_value_t this_arg, /**< this
if (ecma_arraybuffer_is_detached (obj_p->buffer_p))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
return ecma_make_uint32_value (obj_p->byte_offset);
}
jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c
+1 -1
View File
@@ -107,7 +107,7 @@ ecma_builtin_function_prototype_object_apply (ecma_object_t *func_obj_p, /**< th
/* 3. */
if (!ecma_is_value_object (arg2))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_object));
}
ecma_object_t *obj_p = ecma_get_object_from_value (arg2);
jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c
+1 -1
View File
@@ -369,7 +369,7 @@ ecma_builtin_helper_array_concat_value (ecma_object_t *array_obj_p, /**< array *
/* 4 . */
if ((ecma_number_t) (*length_p + arg_len) > ECMA_NUMBER_MAX_SAFE_INTEGER)
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Invalid array length"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_invalid_array_length));
}
#else /* !JERRY_ESNEXT */
/* 5.b.ii */
jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c
+1 -1
View File
@@ -176,7 +176,7 @@ ecma_builtin_intrinsic_dispatch_routine (uint8_t builtin_routine_id, /**< built-
if (ecma_arraybuffer_is_detached (ecma_typedarray_get_arraybuffer (ecma_get_object_from_value (this_arg))))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
return ecma_typedarray_iterators_helper (this_arg, ECMA_ITERATOR_VALUES);
jerry-core/ecma/builtin-objects/ecma-builtin-object.c
+3 -3
View File
@@ -956,7 +956,7 @@ ecma_builtin_object_object_create (ecma_value_t arg1, /**< routine's first argum
/* 1. */
if (!ecma_is_value_object (arg1) && !ecma_is_value_null (arg1))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_object));
}
ecma_object_t *obj_p = NULL;
@@ -1415,7 +1415,7 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
#if !JERRY_ESNEXT
if (!ecma_is_value_object (arg1))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_object));
}
#endif /* !JERRY_ESNEXT */
@@ -1424,7 +1424,7 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
#if JERRY_ESNEXT
if (!ecma_is_value_object (arg1))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_object));
}
#endif /* JERRY_ESNEXT */
jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c
+5 -5
View File
@@ -91,7 +91,7 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
/* 1. */
if (arguments_number == 0 || !ecma_is_value_object (arguments_list[0]))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_object));
}
/* 2. */
@@ -159,7 +159,7 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
/* 1. */
if (arguments_number == 0 || !ecma_is_value_object (arguments_list[0]))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_object));
}
ecma_object_t *target_p = ecma_get_object_from_value (arguments_list[0]);
@@ -183,7 +183,7 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
/* 1. */
if (arguments_number < 1 || !ecma_is_constructor (arguments_list[0]))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Target is not a constructor"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_target_is_not_a_constructor));
}
ecma_object_t *target_p = ecma_get_object_from_value (arguments_list[0]);
@@ -196,7 +196,7 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
/* 3. */
if (!ecma_is_constructor (arguments_list[2]))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Target is not a constructor"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_target_is_not_a_constructor));
}
new_target_p = ecma_get_object_from_value (arguments_list[2]);
@@ -226,7 +226,7 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
if (!ecma_is_value_object (arguments_list[0]))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_object));
}
switch (builtin_routine_id)
jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c
+3 -3
View File
@@ -278,7 +278,7 @@ ecma_builtin_regexp_prototype_compile (ecma_value_t this_arg, /**< this */
#if !JERRY_ESNEXT
if (ecma_get_object_from_value (this_arg) == ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not a RegExp object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_regexp));
}
#endif /* !JERRY_ESNEXT */
@@ -745,7 +745,7 @@ ecma_builtin_regexp_prototype_dispatch_routine (uint8_t builtin_routine_id, /**<
return ecma_make_magic_string_value (LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP);
}
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not a RegExp object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_regexp));
}
ecma_extended_object_t *re_obj_p = (ecma_extended_object_t *) obj_p;
@@ -765,7 +765,7 @@ ecma_builtin_regexp_prototype_dispatch_routine (uint8_t builtin_routine_id, /**<
return ECMA_VALUE_UNDEFINED;
}
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not a RegExp object"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_regexp));
}
ecma_extended_object_t *re_obj_p = (ecma_extended_object_t *) obj_p;
jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c
+6 -6
View File
@@ -511,7 +511,7 @@ ecma_op_typedarray_set_with_typedarray (ecma_value_t this_arg, /**< this argumen
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (target_typedarray_p);
if (ecma_arraybuffer_is_detached (arraybuffer_p))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
ecma_typedarray_info_t target_info = ecma_typedarray_get_info (target_typedarray_p);
@@ -520,7 +520,7 @@ ecma_op_typedarray_set_with_typedarray (ecma_value_t this_arg, /**< this argumen
ecma_object_t *src_arraybuffer_p = ecma_typedarray_get_arraybuffer (src_typedarray_p);
if (ecma_arraybuffer_is_detached (src_arraybuffer_p))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
ecma_typedarray_info_t src_info = ecma_typedarray_get_info (src_typedarray_p);
@@ -614,7 +614,7 @@ ecma_builtin_typedarray_prototype_set (ecma_value_t this_arg, /**< this argument
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
if (ecma_arraybuffer_is_detached (arraybuffer_p))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
ecma_typedarray_info_t target_info = ecma_typedarray_get_info (typedarray_p);
@@ -1723,13 +1723,13 @@ ecma_builtin_typedarray_prototype_dispatch_routine (uint8_t builtin_routine_id,
if (ecma_arraybuffer_is_detached (info.array_buffer_p)
&& builtin_routine_id != ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_SUBARRAY)
{
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
}
if (builtin_routine_id < ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_INDEX_OF && !ecma_op_is_callable (arguments_list_p[0]))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Callback function is not callable"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_callback_is_not_callable));
}
switch (builtin_routine_id)
@@ -1796,7 +1796,7 @@ ecma_builtin_typedarray_prototype_dispatch_routine (uint8_t builtin_routine_id,
{
if (!ecma_is_value_undefined (arguments_list_p[0]) && !ecma_op_is_callable (arguments_list_p[0]))
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Callback function is not callable"));
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_callback_is_not_callable));
}
return ecma_builtin_typedarray_prototype_sort (this_arg, &info, arguments_list_p[0]);