diff options
Diffstat (limited to 'jerry-core/ecma/builtin-objects')
218 files changed, 1455 insertions, 2584 deletions
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.c index 3fe7ff1b..84956daf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.c @@ -22,6 +22,7 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jrt.h" #if JERRY_ESNEXT @@ -30,7 +31,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-aggregateerror-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID aggregate_error_prototype +#define BUILTIN_UNDERSCORED_ID aggregate_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.inc.h index e5fa5d49..f03cb638 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.inc.h @@ -25,19 +25,13 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.7.8 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_AGGREGATE_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_AGGREGATE_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.9 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_AGGREGATE_ERROR_UL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_AGGREGATE_ERROR_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.10 */ -STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.c index c2df08bf..e1c25618 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.c @@ -14,19 +14,20 @@ */ #include "ecma-alloc.h" +#include "ecma-array-object.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" -#include "ecma-objects.h" -#include "ecma-function-object.h" #include "ecma-iterator-object.h" -#include "ecma-array-object.h" -#include "jrt.h" +#include "ecma-objects.h" + #include "jcontext.h" +#include "jrt.h" #if JERRY_ESNEXT @@ -34,7 +35,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-aggregateerror.inc.h" -#define BUILTIN_UNDERSCORED_ID aggregate_error +#define BUILTIN_UNDERSCORED_ID aggregate_error #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.inc.h index 475efac0..c343b41d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.inc.h @@ -24,21 +24,15 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 2, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 2, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_AGGREGATE_ERROR_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_AGGREGATE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_AGGREGATE_ERROR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_AGGREGATE_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c index 203a826c..3c0c49bd 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c @@ -13,11 +13,11 @@ * limitations under the License. */ +#include "ecma-arraybuffer-object.h" #include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-iterator-object.h" #include "ecma-typedarray-object.h" -#include "ecma-arraybuffer-object.h" #if JERRY_ESNEXT @@ -39,7 +39,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-array-iterator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID array_iterator_prototype +#define BUILTIN_UNDERSCORED_ID array_iterator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -130,10 +130,7 @@ ecma_builtin_array_iterator_prototype_object_next (ecma_value_t this_val) /**< t index = (ecma_length_t) (ecma_get_number_from_value (index_value) + 1); } - ecma_value_t put_result = ecma_op_object_put (obj_p, - prop_name_p, - ecma_make_length_value (index), - true); + ecma_value_t put_result = ecma_op_object_put (obj_p, prop_name_p, ecma_make_length_value (index), true); JERRY_ASSERT (ecma_is_value_true (put_result)); @@ -183,8 +180,7 @@ ecma_builtin_array_iterator_prototype_object_next (ecma_value_t this_val) /**< t /* 17.b */ ecma_value_t entry_array_value; - entry_array_value = ecma_create_array_from_iter_element (get_value, - ecma_make_length_value (index)); + entry_array_value = ecma_create_array_from_iter_element (get_value, ecma_make_length_value (index)); result = ecma_create_iter_result_object (entry_array_value, ECMA_VALUE_FALSE); ecma_free_value (entry_array_value); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h index aa4f4179..1338fb44 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h @@ -21,9 +21,7 @@ #if JERRY_ESNEXT -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_ARRAY_ITERATOR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ARRAY_ITERATOR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c index ff99558f..2caad899 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c @@ -22,7 +22,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-array-prototype-unscopables.inc.h" -#define BUILTIN_UNDERSCORED_ID array_prototype_unscopables +#define BUILTIN_UNDERSCORED_ID array_prototype_unscopables #include "ecma-builtin-internal-routines-template.inc.h" #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h index 932c3d4c..d4d79db8 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h @@ -21,49 +21,27 @@ #if JERRY_ESNEXT -SIMPLE_VALUE (LIT_MAGIC_STRING_AT, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_AT, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_COPY_WITHIN, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_COPY_WITHIN, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_ENTRIES, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_ENTRIES, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_FILL, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_FILL, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_FIND, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_FIND, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_FIND_INDEX, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_FIND_INDEX, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_FLAT, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_FLAT, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_FLATMAP, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_FLATMAP, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_INCLUDES, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_INCLUDES, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_KEYS, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_KEYS, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -SIMPLE_VALUE (LIT_MAGIC_STRING_VALUES, - ECMA_VALUE_TRUE, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_VALUES, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c index cc064f76..70cad898 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c @@ -26,8 +26,9 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" -#include "lit-char-helpers.h" + #include "jrt.h" +#include "lit-char-helpers.h" #if JERRY_BUILTIN_ARRAY @@ -45,7 +46,7 @@ enum { ECMA_ARRAY_PROTOTYPE_ROUTINE_START = 0, - /* Note: these 2 routine ids must be in this order */ +/* Note: these 2 routine ids must be in this order */ #if !JERRY_ESNEXT ECMA_ARRAY_PROTOTYPE_TO_STRING, #endif /* !JERRY_ESNEXT */ @@ -85,7 +86,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID array_prototype +#define BUILTIN_UNDERSCORED_ID array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -109,15 +110,12 @@ ecma_builtin_array_prototype_helper_set_length (ecma_object_t *object, /**< obje ecma_number_t length) /**< new length */ { ecma_value_t length_value = ecma_make_number_value (length); - ecma_value_t ret_value = ecma_op_object_put (object, - ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), - length_value, - true); + ecma_value_t ret_value = + ecma_op_object_put (object, ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), length_value, true); ecma_free_value (length_value); - JERRY_ASSERT (ecma_is_value_boolean (ret_value) - || ecma_is_value_empty (ret_value) + JERRY_ASSERT (ecma_is_value_boolean (ret_value) || ecma_is_value_empty (ret_value) || ECMA_IS_VALUE_ERROR (ret_value)); return ret_value; } /* ecma_builtin_array_prototype_helper_set_length */ @@ -202,9 +200,8 @@ ecma_builtin_array_prototype_object_concat (const ecma_value_t args[], /**< argu ecma_length_t new_length = 0; /* 5.b - 5.c for this_arg */ - ecma_value_t concat_this_value = ecma_builtin_helper_array_concat_value (new_array_p, - &new_length, - ecma_make_object_value (obj_p)); + ecma_value_t concat_this_value = + ecma_builtin_helper_array_concat_value (new_array_p, &new_length, ecma_make_object_value (obj_p)); if (ECMA_IS_VALUE_ERROR (concat_this_value)) { ecma_deref_object (new_array_p); @@ -227,8 +224,8 @@ ecma_builtin_array_prototype_object_concat (const ecma_value_t args[], /**< argu JERRY_ASSERT (ecma_is_value_empty (concat_value)); } - ecma_value_t set_length_value = ecma_builtin_array_prototype_helper_set_length (new_array_p, - ((ecma_number_t) new_length)); + ecma_value_t set_length_value = + ecma_builtin_array_prototype_helper_set_length (new_array_p, ((ecma_number_t) new_length)); if (ECMA_IS_VALUE_ERROR (set_length_value)) { ecma_deref_object (new_array_p); @@ -279,8 +276,7 @@ ecma_op_array_get_to_string_at_index (ecma_object_t *obj_p, /**< this object */ return NULL; } - if (ecma_is_value_undefined (index_value) - || ecma_is_value_null (index_value)) + if (ecma_is_value_undefined (index_value) || ecma_is_value_null (index_value)) { return ecma_get_magic_string (LIT_MAGIC_STRING__EMPTY); } @@ -370,7 +366,7 @@ static ecma_value_t ecma_builtin_array_prototype_object_pop (ecma_object_t *obj_p, /**< object */ ecma_length_t len) /**< object's length */ { - /* 4. */ + /* 4. */ if (len == 0) { /* 4.a */ @@ -523,14 +519,12 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar ecma_object_t *obj_p, /**< object */ ecma_length_t len) /**< object's length */ { - if (ecma_op_object_is_fast_array (obj_p)) { uint32_t middle = (uint32_t) len / 2; ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) obj_p; - if (ext_obj_p->u.array.length_prop_and_hole_count < ECMA_FAST_ARRAY_HOLE_ONE - && len != 0) + if (ext_obj_p->u.array.length_prop_and_hole_count < ECMA_FAST_ARRAY_HOLE_ONE && len != 0) { ecma_value_t *buffer_p = ECMA_GET_NON_NULL_POINTER (ecma_value_t, obj_p->u1.property_list_cp); @@ -674,7 +668,7 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar ret_value = ECMA_VALUE_EMPTY; -clean_up: + clean_up: ecma_free_value (upper_value); ecma_free_value (lower_value); ecma_deref_ecma_string (lower_str_p); @@ -714,8 +708,7 @@ ecma_builtin_array_prototype_object_shift (ecma_object_t *obj_p, /**< object */ { ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) obj_p; - if (ext_obj_p->u.array.length_prop_and_hole_count < ECMA_FAST_ARRAY_HOLE_ONE - && len != 0) + if (ext_obj_p->u.array.length_prop_and_hole_count < ECMA_FAST_ARRAY_HOLE_ONE && len != 0) { ecma_value_t *buffer_p = ECMA_GET_NON_NULL_POINTER (ecma_value_t, obj_p->u1.property_list_cp); ecma_value_t ret_value = buffer_p[0]; @@ -817,9 +810,7 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ ecma_length_t start = 0, end = len; /* 5. 6.*/ - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (arg1, - len, - &start))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (arg1, len, &start))) { return ECMA_VALUE_ERROR; } @@ -832,9 +823,7 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ else { /* 7. part 2, 8.*/ - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (arg2, - len, - &end))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (arg2, len, &end))) { return ECMA_VALUE_ERROR; } @@ -946,10 +935,7 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ #else /* !JERRY_ESNEXT */ const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE; #endif /* JERRY_ESNEXT */ - put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, - n, - get_value, - prop_flags); + put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, n, get_value, prop_flags); ecma_free_value (get_value); #if JERRY_ESNEXT @@ -1057,10 +1043,7 @@ ecma_builtin_array_prototype_object_sort_compare_helper (ecma_value_t lhs, /**< ecma_value_t compare_args[] = { lhs, rhs }; - ecma_value_t call_value = ecma_op_function_call (comparefn_obj_p, - ECMA_VALUE_UNDEFINED, - compare_args, - 2); + ecma_value_t call_value = ecma_op_function_call (comparefn_obj_p, ECMA_VALUE_UNDEFINED, compare_args, 2); if (ECMA_IS_VALUE_ERROR (call_value)) { return call_value; @@ -1178,11 +1161,8 @@ ecma_builtin_array_prototype_object_sort (ecma_value_t this_arg, /**< this argum if (copied_num > 1) { const ecma_builtin_helper_sort_compare_fn_t sort_cb = &ecma_builtin_array_prototype_object_sort_compare_helper; - ecma_value_t sort_value = ecma_builtin_helper_array_merge_sort_helper (values_buffer, - (uint32_t) (copied_num), - arg1, - sort_cb, - NULL); + ecma_value_t sort_value = + ecma_builtin_helper_array_merge_sort_helper (values_buffer, (uint32_t) (copied_num), arg1, sort_cb, NULL); if (ECMA_IS_VALUE_ERROR (sort_value)) { goto clean_up; @@ -1271,9 +1251,7 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu if (args_number > 0) { /* ES5.1: 6, ES11: 4. */ - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (args[0], - len, - &actual_start))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (args[0], len, &actual_start))) { return ECMA_VALUE_ERROR; } @@ -1295,8 +1273,8 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu } /* ES5.1: 7 */ - actual_delete_count = (ecma_length_t) (JERRY_MIN (JERRY_MAX (delete_num, 0), - (ecma_number_t) (len - actual_start))); + actual_delete_count = + (ecma_length_t) (JERRY_MIN (JERRY_MAX (delete_num, 0), (ecma_number_t) (len - actual_start))); } } @@ -1344,10 +1322,7 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE; #endif /* JERRY_ESNEXT */ - ecma_value_t put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, - k, - from_present, - prop_flags); + ecma_value_t put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, k, from_present, prop_flags); ecma_free_value (from_present); #if JERRY_ESNEXT @@ -1364,8 +1339,8 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu #if JERRY_ESNEXT /* ES11: 12. */ - ecma_value_t set_length = ecma_builtin_array_prototype_helper_set_length (new_array_p, - ((ecma_number_t) actual_delete_count)); + ecma_value_t set_length = + ecma_builtin_array_prototype_helper_set_length (new_array_p, ((ecma_number_t) actual_delete_count)); if (ECMA_IS_VALUE_ERROR (set_length)) { @@ -1465,10 +1440,7 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu uint32_t idx = 0; for (uint32_t arg_index = 2; arg_index < args_number; arg_index++, idx++) { - ecma_value_t put_value = ecma_op_object_put_by_index (obj_p, - actual_start + idx, - args[arg_index], - true); + ecma_value_t put_value = ecma_op_object_put_by_index (obj_p, actual_start + idx, args[arg_index], true); if (ECMA_IS_VALUE_ERROR (put_value)) { @@ -1506,13 +1478,11 @@ ecma_builtin_array_prototype_object_unshift (const ecma_value_t args[], /**< arg ecma_object_t *obj_p, /**< object */ ecma_length_t len) /**< object's length */ { - if (ecma_op_object_is_fast_array (obj_p)) { ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) obj_p; - if (ext_obj_p->u.array.length_prop_and_hole_count < ECMA_FAST_ARRAY_HOLE_ONE - && len != 0) + if (ext_obj_p->u.array.length_prop_and_hole_count < ECMA_FAST_ARRAY_HOLE_ONE && len != 0) { if (args_number > UINT32_MAX - len) { @@ -1730,8 +1700,7 @@ ecma_builtin_array_prototype_object_index_of (const ecma_value_t args[], /**< ar } /* 9.b.i, 9.b.ii */ - if (ecma_is_value_found (get_value) - && ecma_op_strict_equality_compare (args[0], get_value)) + if (ecma_is_value_found (get_value) && ecma_op_strict_equality_compare (args[0], get_value)) { ecma_free_value (get_value); return ecma_make_length_value (from_idx); @@ -1822,7 +1791,7 @@ ecma_builtin_array_prototype_object_last_index_of (const ecma_value_t args[], /* } } - /* 8. */ + /* 8. */ while (from_idx < len) { /* 8.a */ @@ -1834,8 +1803,7 @@ ecma_builtin_array_prototype_object_last_index_of (const ecma_value_t args[], /* } /* 8.b.i, 8.b.ii */ - if (ecma_is_value_found (get_value) - && ecma_op_strict_equality_compare (search_element, get_value)) + if (ecma_is_value_found (get_value) && ecma_op_strict_equality_compare (search_element, get_value)) { ecma_free_value (get_value); return ecma_make_length_value (from_idx); @@ -2023,10 +1991,7 @@ ecma_builtin_array_prototype_object_map (ecma_value_t arg1, /**< callbackfn */ #else /* !JERRY_ESNEXT */ const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE; #endif /* JERRY_ESNEXT */ - put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, - index, - mapped_value, - prop_flags); + put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, index, mapped_value, prop_flags); ecma_free_value (mapped_value); ecma_free_value (current_value); @@ -2124,10 +2089,7 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t arg1, /**< callbackfn * if (ecma_op_to_boolean (call_value)) { ecma_value_t put_comp; - put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, - new_array_index, - get_value, - prop_flags); + put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, new_array_index, get_value, prop_flags); #if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (put_comp)) { @@ -2206,8 +2168,7 @@ ecma_builtin_array_reduce_from (const ecma_value_t args_p[], /**< routine's argu k_present = true; /* 8.b.ii-iii */ - ecma_value_t current_value = ecma_op_object_find_by_index (obj_p, start_from_left ? index - : last_index - index); + ecma_value_t current_value = ecma_op_object_find_by_index (obj_p, start_from_left ? index : last_index - index); if (ECMA_IS_VALUE_ERROR (current_value)) { @@ -2253,12 +2214,9 @@ ecma_builtin_array_reduce_from (const ecma_value_t args_p[], /**< routine's argu { /* 9.c.i, 9.c.ii */ current_index = ecma_make_length_value (corrected_index); - ecma_value_t call_args[] = {accumulator, current_value, current_index, ecma_make_object_value (obj_p)}; + ecma_value_t call_args[] = { accumulator, current_value, current_index, ecma_make_object_value (obj_p) }; - ecma_value_t call_value = ecma_op_function_call (func_object_p, - ECMA_VALUE_UNDEFINED, - call_args, - 4); + ecma_value_t call_value = ecma_op_function_call (func_object_p, ECMA_VALUE_UNDEFINED, call_args, 4); ecma_free_value (current_index); ecma_free_value (accumulator); ecma_free_value (current_value); @@ -2298,9 +2256,7 @@ ecma_builtin_array_prototype_fill (ecma_value_t value, /**< value */ ecma_length_t k, final; /* 5. 6. 7. */ - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (start_val, - len, - &k))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (start_val, len, &k))) { return ECMA_VALUE_ERROR; } @@ -2313,9 +2269,7 @@ ecma_builtin_array_prototype_fill (ecma_value_t value, /**< value */ else { /* 8 part 2, 9, 10 */ - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (end_val, - len, - &final))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_array_index_normalize (end_val, len, &final))) { return ECMA_VALUE_ERROR; } @@ -2728,7 +2682,7 @@ ecma_builtin_array_flatten_into_array (ecma_value_t target, /**< target will con { /* i-ii. */ ecma_value_t source_val = ecma_make_length_value (source_index); - ecma_value_t args[] = {element, source_val, ecma_make_object_value (source)}; + ecma_value_t args[] = { element, source_val, ecma_make_object_value (source) }; ecma_value_t temp_element = ecma_op_function_call (ecma_get_object_from_value (mapped_value), thisArg, args, 3); ecma_free_value (element); @@ -2787,10 +2741,8 @@ ecma_builtin_array_flatten_into_array (ecma_value_t target, /**< target will con /* vi. */ const uint32_t flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE | JERRY_PROP_SHOULD_THROW; - ecma_value_t element_temp = ecma_builtin_helper_def_prop_by_index (ecma_get_object_from_value (target), - target_index, - element, - flags); + ecma_value_t element_temp = + ecma_builtin_helper_def_prop_by_index (ecma_get_object_from_value (target), target_index, element, flags); ecma_free_value (element); @@ -2885,13 +2837,8 @@ ecma_builtin_array_prototype_object_flat_map (ecma_value_t callback, /**< callba } /* 5. */ - ecma_value_t flatten_val = ecma_builtin_array_flatten_into_array (ecma_make_object_value (new_array_p), - obj_p, - len, - 0, - 1, - callback, - this_arg); + ecma_value_t flatten_val = + ecma_builtin_array_flatten_into_array (ecma_make_object_value (new_array_p), obj_p, len, 0, 1, callback, this_arg); if (ECMA_IS_VALUE_ERROR (flatten_val)) { ecma_deref_object (new_array_p); @@ -2937,16 +2884,11 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< #endif /* !JERRY_ESNEXT */ if (builtin_routine_id == ECMA_ARRAY_PROTOTYPE_SORT) { - ret_value = ecma_builtin_array_prototype_object_sort (this_arg, - arguments_list_p[0], - obj_p); - + ret_value = ecma_builtin_array_prototype_object_sort (this_arg, arguments_list_p[0], obj_p); } else if (builtin_routine_id == ECMA_ARRAY_PROTOTYPE_CONCAT) { - ret_value = ecma_builtin_array_prototype_object_concat (arguments_list_p, - arguments_number, - obj_p); + ret_value = ecma_builtin_array_prototype_object_concat (arguments_list_p, arguments_number, obj_p); } ecma_deref_object (obj_p); @@ -3004,10 +2946,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< } case ECMA_ARRAY_PROTOTYPE_PUSH: { - ret_value = ecma_builtin_array_prototype_object_push (arguments_list_p, - arguments_number, - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_push (arguments_list_p, arguments_number, obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_REVERSE: @@ -3022,49 +2961,32 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< } case ECMA_ARRAY_PROTOTYPE_SLICE: { - ret_value = ecma_builtin_array_prototype_object_slice (arguments_list_p[0], - arguments_list_p[1], - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_slice (arguments_list_p[0], arguments_list_p[1], obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_SPLICE: { - ret_value = ecma_builtin_array_prototype_object_splice (arguments_list_p, - arguments_number, - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_splice (arguments_list_p, arguments_number, obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_UNSHIFT: { - ret_value = ecma_builtin_array_prototype_object_unshift (arguments_list_p, - arguments_number, - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_unshift (arguments_list_p, arguments_number, obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_AT: { - ret_value = ecma_builtin_array_prototype_object_at (arguments_list_p[0], - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_at (arguments_list_p[0], obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_INDEX_OF: { - ret_value = ecma_builtin_array_prototype_object_index_of (arguments_list_p, - arguments_number, - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_index_of (arguments_list_p, arguments_number, obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_LAST_INDEX_OF: { - ret_value = ecma_builtin_array_prototype_object_last_index_of (arguments_list_p, - arguments_number, - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_last_index_of (arguments_list_p, arguments_number, obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_EVERY: @@ -3080,10 +3002,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< } case ECMA_ARRAY_PROTOTYPE_MAP: { - ret_value = ecma_builtin_array_prototype_object_map (arguments_list_p[0], - arguments_list_p[1], - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_map (arguments_list_p[0], arguments_list_p[1], obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_REDUCE: @@ -3099,10 +3018,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< #if JERRY_ESNEXT case ECMA_ARRAY_PROTOTYPE_COPY_WITHIN: { - ret_value = ecma_builtin_array_prototype_object_copy_within (arguments_list_p, - arguments_number, - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_copy_within (arguments_list_p, arguments_number, obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_FIND: @@ -3126,26 +3042,18 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< } case ECMA_ARRAY_PROTOTYPE_INCLUDES: { - ret_value = ecma_builtin_array_prototype_includes (arguments_list_p, - arguments_number, - obj_p, - length); + ret_value = ecma_builtin_array_prototype_includes (arguments_list_p, arguments_number, obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_FLAT: { - ret_value = ecma_builtin_array_prototype_object_flat (arguments_list_p, - arguments_number, - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_flat (arguments_list_p, arguments_number, obj_p, length); break; } case ECMA_ARRAY_PROTOTYPE_FLATMAP: { - ret_value = ecma_builtin_array_prototype_object_flat_map (arguments_list_p[0], - arguments_list_p[1], - obj_p, - length); + ret_value = + ecma_builtin_array_prototype_object_flat_map (arguments_list_p[0], arguments_list_p[1], obj_p, length); break; } #endif /* JERRY_ESNEXT */ @@ -3153,10 +3061,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< { JERRY_ASSERT (builtin_routine_id == ECMA_ARRAY_PROTOTYPE_FILTER); - ret_value = ecma_builtin_array_prototype_object_filter (arguments_list_p[0], - arguments_list_p[1], - obj_p, - length); + ret_value = ecma_builtin_array_prototype_object_filter (arguments_list_p[0], arguments_list_p[1], obj_p, length); break; } } diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h index 387c3a48..4ca296af 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h @@ -25,9 +25,7 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.4.4.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #if JERRY_ESNEXT /* ECMA-262 v6, 22.1.3.31 */ @@ -40,9 +38,7 @@ OBJECT_VALUE (LIT_GLOBAL_SYMBOL_UNSCOPABLES, * (property name, object pointer getter) */ /* ECMA-262 v5, 15.4.4 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FLAG_WRITABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_WRITABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -82,11 +78,12 @@ ROUTINE (LIT_MAGIC_STRING_KEYS, ECMA_ARRAY_PROTOTYPE_KEYS, 0, 0) ROUTINE (LIT_MAGIC_STRING_INCLUDES, ECMA_ARRAY_PROTOTYPE_INCLUDES, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_FLAT, ECMA_ARRAY_PROTOTYPE_FLAT, 1, 0) ROUTINE (LIT_MAGIC_STRING_FLATMAP, ECMA_ARRAY_PROTOTYPE_FLATMAP, 2, 1) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_STRING_UL, LIT_MAGIC_STRING_TO_STRING_UL, +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_STRING_UL, LIT_MAGIC_STRING_TO_STRING_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_VALUES, + LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_VALUES, LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES, +INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, + LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array.c index 399c88d0..469ad114 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array.c @@ -14,8 +14,9 @@ */ #include "ecma-alloc.h" -#include "ecma-builtins.h" +#include "ecma-array-object.h" #include "ecma-builtin-helpers.h" +#include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" #include "ecma-function-object.h" @@ -24,7 +25,7 @@ #include "ecma-helpers.h" #include "ecma-iterator-object.h" #include "ecma-objects.h" -#include "ecma-array-object.h" + #include "jcontext.h" #include "jrt.h" @@ -53,7 +54,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-array.inc.h" -#define BUILTIN_UNDERSCORED_ID array +#define BUILTIN_UNDERSCORED_ID array #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -185,10 +186,8 @@ ecma_builtin_array_object_from (ecma_value_t this_arg, /**< 'this' argument */ { /* 6.g.iv.1 */ ecma_value_t len_value = ecma_make_uint32_value (k); - ecma_value_t set_status = ecma_op_object_put (array_obj_p, - ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), - len_value, - true); + ecma_value_t set_status = + ecma_op_object_put (array_obj_p, ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), len_value, true); ecma_free_value (len_value); /* 6.g.iv.2 */ @@ -255,7 +254,7 @@ ecma_builtin_array_object_from (ecma_value_t this_arg, /**< 'this' argument */ k++; } -iterator_cleanup: + iterator_cleanup: ecma_free_value (iterator); ecma_free_value (next_method); ecma_deref_object (array_obj_p); @@ -376,10 +375,8 @@ iterator_cleanup: /* 17. */ len_value = ecma_make_length_value (k); - ecma_value_t set_status = ecma_op_object_put (array_obj_p, - ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), - len_value, - true); + ecma_value_t set_status = + ecma_op_object_put (array_obj_p, ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), len_value, true); ecma_free_value (len_value); /* 18. */ @@ -420,10 +417,8 @@ ecma_builtin_array_object_of (ecma_value_t this_arg, /**< 'this' argument */ ecma_value_t len = ecma_make_uint32_value (arguments_list_len); - ecma_value_t ret_val = ecma_op_function_construct (ecma_get_object_from_value (this_arg), - ecma_get_object_from_value (this_arg), - &len, - 1); + ecma_value_t ret_val = + ecma_op_function_construct (ecma_get_object_from_value (this_arg), ecma_get_object_from_value (this_arg), &len, 1); if (ECMA_IS_VALUE_ERROR (ret_val)) { @@ -437,10 +432,8 @@ ecma_builtin_array_object_of (ecma_value_t this_arg, /**< 'this' argument */ while (k < arguments_list_len) { - ecma_value_t define_status = ecma_builtin_helper_def_prop_by_index (obj_p, - k, - arguments_list_p[k], - prop_status_flags); + ecma_value_t define_status = + ecma_builtin_helper_def_prop_by_index (obj_p, k, arguments_list_p[k], prop_status_flags); if (ECMA_IS_VALUE_ERROR (define_status)) { @@ -452,10 +445,7 @@ ecma_builtin_array_object_of (ecma_value_t this_arg, /**< 'this' argument */ k++; } - ret_val = ecma_op_object_put (obj_p, - ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), - len, - true); + ret_val = ecma_op_object_put (obj_p, ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), len, true); ecma_free_value (len); @@ -482,8 +472,7 @@ ecma_builtin_array_dispatch_call (const ecma_value_t *arguments_list_p, /**< arg { JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); - if (arguments_list_len != 1 - || !ecma_is_value_number (arguments_list_p[0])) + if (arguments_list_len != 1 || !ecma_is_value_number (arguments_list_p[0])) { return ecma_op_new_array_object_from_buffer (arguments_list_p, arguments_list_len); } @@ -514,8 +503,8 @@ ecma_builtin_array_dispatch_construct (const ecma_value_t *arguments_list_p, /** #if !JERRY_ESNEXT return ecma_builtin_array_dispatch_call (arguments_list_p, arguments_list_len); #else /* JERRY_ESNEXT */ - ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), - ECMA_BUILTIN_ID_ARRAY_PROTOTYPE); + ecma_object_t *proto_p = + ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_ARRAY_PROTOTYPE); if (proto_p == NULL) { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h index 5a031fab..19f8b731 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h @@ -25,21 +25,15 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.4.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_ARRAY_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_ARRAY_PROTOTYPE, ECMA_PROPERTY_FIXED) /* Number properties: * (property name, object pointer getter) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_ARRAY_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ARRAY_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ /* Routine properties: @@ -50,9 +44,7 @@ ROUTINE (LIT_MAGIC_STRING_FROM, ECMA_ARRAY_ROUTINE_FROM, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_OF, ECMA_ARRAY_ROUTINE_OF, NON_FIXED, 0) /* ECMA-262 v6, 22.1.2.5 */ -ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, - ECMA_ARRAY_ROUTINE_SPECIES_GET, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ECMA_ARRAY_ROUTINE_SPECIES_GET, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* !(JERRY_BUILTIN_ARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c index 1ce2a1a6..d1aee322 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c @@ -13,6 +13,7 @@ * limitations under the License. */ +#include "ecma-arraybuffer-object.h" #include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" @@ -22,9 +23,9 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-objects.h" -#include "ecma-arraybuffer-object.h" -#include "jrt.h" + #include "jrt-libc-includes.h" +#include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -32,7 +33,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-arraybuffer-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID arraybuffer_prototype +#define BUILTIN_UNDERSCORED_ID arraybuffer_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h index 6d77ed25..80463446 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h @@ -24,9 +24,7 @@ /* Object properties: * (property name, object pointer getter) */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_ARRAYBUFFER, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_ARRAYBUFFER, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* Readonly accessor properties */ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_LENGTH_UL, @@ -34,9 +32,7 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_LENGTH_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 24.1.4.4 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_ARRAY_BUFFER_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ARRAY_BUFFER_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c index 0cc315f5..1ad9d9bf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c @@ -13,14 +13,15 @@ * limitations under the License. */ +#include "ecma-arraybuffer-object.h" #include "ecma-builtins.h" +#include "ecma-dataview-object.h" #include "ecma-exceptions.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-arraybuffer-object.h" -#include "ecma-dataview-object.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -29,7 +30,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-arraybuffer.inc.h" -#define BUILTIN_UNDERSCORED_ID arraybuffer +#define BUILTIN_UNDERSCORED_ID arraybuffer #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h index 0c05b869..6fe1a936 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h @@ -24,20 +24,14 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE, ECMA_PROPERTY_FIXED) -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_ARRAY_BUFFER_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ARRAY_BUFFER_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -46,9 +40,7 @@ STRING_VALUE (LIT_MAGIC_STRING_NAME, ROUTINE (LIT_MAGIC_STRING_IS_VIEW_UL, ecma_builtin_arraybuffer_object_is_view, 1, 1) /* ES2015 24.1.3.3 */ -ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, - ecma_builtin_arraybuffer_species_get, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_arraybuffer_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-from-sync-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-from-sync-iterator-prototype.c index 1c25e172..0f2c5552 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-from-sync-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-from-sync-iterator-prototype.c @@ -13,6 +13,8 @@ * limitations under the License. */ +#include "jerryscript-types.h" + #include "ecma-builtin-handlers.h" #include "ecma-builtins.h" #include "ecma-exceptions.h" @@ -23,8 +25,8 @@ #include "ecma-iterator-object.h" #include "ecma-objects.h" #include "ecma-promise-object.h" + #include "jcontext.h" -#include "jerryscript-types.h" #include "jrt.h" #include "lit-magic-strings.h" #include "lit-strings.h" @@ -37,8 +39,8 @@ #include "ecma-builtins-internal.h" /** - * This object has a custom dispatch function. - */ + * This object has a custom dispatch function. + */ #define BUILTIN_CUSTOM_DISPATCH /** @@ -53,7 +55,7 @@ enum } ecma_async_from_sync_iterator_operation_type_t; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-async-from-sync-iterator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID async_from_sync_iterator_prototype +#define BUILTIN_UNDERSCORED_ID async_from_sync_iterator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -146,9 +148,8 @@ ecma_builtin_async_from_sync_iterator_prototype_next (ecma_async_from_sync_itera ecma_value_t value) /**< routine's 'value' argument */ { /* 5. */ - ecma_value_t next_result = ecma_op_iterator_next (iter_p->header.u.cls.u3.sync_iterator, - iter_p->sync_next_method, - value); + ecma_value_t next_result = + ecma_op_iterator_next (iter_p->header.u.cls.u3.sync_iterator, iter_p->sync_next_method, value); /* 6. */ if (ECMA_IS_VALUE_ERROR (ecma_op_if_abrupt_reject_promise (&next_result, capability_p))) @@ -224,10 +225,8 @@ ecma_builtin_async_from_sync_iterator_prototype_do (ecma_async_from_sync_iterato } /* 7.b. */ - ecma_value_t resolve = ecma_op_function_call (ecma_get_object_from_value (func_obj), - ECMA_VALUE_UNDEFINED, - &call_arg, - arg_size); + ecma_value_t resolve = + ecma_op_function_call (ecma_get_object_from_value (func_obj), ECMA_VALUE_UNDEFINED, &call_arg, arg_size); JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (resolve)); ecma_free_value (resolve); @@ -273,10 +272,8 @@ ecma_builtin_async_from_sync_iterator_prototype_do (ecma_async_from_sync_iterato ecma_value_t type_error = ecma_make_object_value (type_error_obj_p); /* 10.a. */ - ecma_value_t reject = ecma_op_function_call (ecma_get_object_from_value (capability_p->reject), - ECMA_VALUE_UNDEFINED, - &type_error, - 1); + ecma_value_t reject = + ecma_op_function_call (ecma_get_object_from_value (capability_p->reject), ECMA_VALUE_UNDEFINED, &type_error, 1); JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (reject)); ecma_deref_object (type_error_obj_p); ecma_free_value (reject); @@ -292,11 +289,11 @@ ecma_builtin_async_from_sync_iterator_prototype_do (ecma_async_from_sync_iterato } /* ecma_builtin_async_from_sync_iterator_prototype_do */ /** - * Dispatcher of the %AsyncFromSyncIteratorPrototype% built-in's routines - * - * @return ecma value - * Returned value must be freed with ecma_free_value. - */ + * Dispatcher of the %AsyncFromSyncIteratorPrototype% built-in's routines + * + * @return ecma value + * Returned value must be freed with ecma_free_value. + */ ecma_value_t ecma_builtin_async_from_sync_iterator_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide * routine diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.c index 68f2a012..150bb953 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-async-function-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID async_function_prototype +#define BUILTIN_UNDERSCORED_ID async_function_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h index 5ff638c7..32e3cfae 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h @@ -22,14 +22,10 @@ #if JERRY_ESNEXT /* ECMA-262 v11, 25.7.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_ASYNC_FUNCTION, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_ASYNC_FUNCTION, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v11, 25.7.3.2 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_ASYNC_FUNCTION_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ASYNC_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.c index bb26e4e3..115af43c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.c @@ -22,7 +22,7 @@ #include "ecma-function-object.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-async-function.inc.h" -#define BUILTIN_UNDERSCORED_ID async_function +#define BUILTIN_UNDERSCORED_ID async_function #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -47,9 +47,7 @@ ecma_builtin_async_function_dispatch_call (const ecma_value_t *arguments_list_p, { JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); - return ecma_op_create_dynamic_function (arguments_list_p, - arguments_list_len, - ECMA_PARSE_ASYNC_FUNCTION); + return ecma_op_create_dynamic_function (arguments_list_p, arguments_list_len, ECMA_PARSE_ASYNC_FUNCTION); } /* ecma_builtin_async_function_dispatch_call */ /** diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.inc.h index e304ff17..fb96a002 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.inc.h @@ -22,24 +22,16 @@ #if JERRY_ESNEXT /* ECMA-262 v11, 25.7.2 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_ASYNC_FUNCTION_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ASYNC_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v11, 25.7.2.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v10, 25.7.2.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_ASYNC_FUNCTION_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_ASYNC_FUNCTION_PROTOTYPE, ECMA_PROPERTY_FIXED) /* ECMA-262 v11, 25.7.3.2 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_ASYNC_FUNCTION_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ASYNC_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.c index 26091097..ad2fcd67 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.c @@ -22,7 +22,7 @@ #include "ecma-function-object.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-async-generator-function.inc.h" -#define BUILTIN_UNDERSCORED_ID async_generator_function +#define BUILTIN_UNDERSCORED_ID async_generator_function #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h index acafd42b..40914c49 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h @@ -22,19 +22,13 @@ #if JERRY_ESNEXT /* ECMA-262 v10, 25.3.2 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_ASYNC_GENERATOR_FUNCTION_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ASYNC_GENERATOR_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v10, 25.3.2.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 25.3.2.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_ASYNC_GENERATOR, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_ASYNC_GENERATOR, ECMA_PROPERTY_FIXED) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.c index 72a49491..0d710f26 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.c @@ -21,6 +21,7 @@ #include "ecma-helpers.h" #include "ecma-iterator-object.h" #include "ecma-promise-object.h" + #include "jcontext.h" #include "opcodes.h" #include "vm-defines.h" @@ -31,8 +32,8 @@ #include "ecma-builtins-internal.h" /** - * This object has a custom dispatch function. - */ + * This object has a custom dispatch function. + */ #define BUILTIN_CUSTOM_DISPATCH /** @@ -47,7 +48,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-async-generator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID async_generator_prototype +#define BUILTIN_UNDERSCORED_ID async_generator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -64,26 +65,26 @@ enum * Convert routine type to operation type.. */ #define ECMA_ASYNC_GENERATOR_ROUTINE_TO_OPERATION(type) \ - ((ecma_async_generator_operation_type_t) ((type) - ECMA_ASYNC_GENERATOR_PROTOTYPE_ROUTINE_NEXT)) + ((ecma_async_generator_operation_type_t) ((type) -ECMA_ASYNC_GENERATOR_PROTOTYPE_ROUTINE_NEXT)) JERRY_STATIC_ASSERT (ECMA_ASYNC_GENERATOR_ROUTINE_TO_OPERATION (ECMA_ASYNC_GENERATOR_PROTOTYPE_ROUTINE_NEXT) - == ECMA_ASYNC_GENERATOR_DO_NEXT, + == ECMA_ASYNC_GENERATOR_DO_NEXT, convert_ecma_async_generator_routine_next_to_ecma_async_generator_do_next_failed); JERRY_STATIC_ASSERT (ECMA_ASYNC_GENERATOR_ROUTINE_TO_OPERATION (ECMA_ASYNC_GENERATOR_PROTOTYPE_ROUTINE_THROW) - == ECMA_ASYNC_GENERATOR_DO_THROW, + == ECMA_ASYNC_GENERATOR_DO_THROW, convert_ecma_async_generator_routine_throw_to_ecma_async_generator_do_throw_failed); JERRY_STATIC_ASSERT (ECMA_ASYNC_GENERATOR_ROUTINE_TO_OPERATION (ECMA_ASYNC_GENERATOR_PROTOTYPE_ROUTINE_RETURN) - == ECMA_ASYNC_GENERATOR_DO_RETURN, + == ECMA_ASYNC_GENERATOR_DO_RETURN, convert_ecma_async_generator_routine_return_to_ecma_async_generator_do_return_failed); /** - * Dispatcher of the Generator built-in's routines - * - * @return ecma value - * Returned value must be freed with ecma_free_value. - */ + * Dispatcher of the Generator built-in's routines + * + * @return ecma value + * Returned value must be freed with ecma_free_value. + */ ecma_value_t ecma_builtin_async_generator_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide routine * identifier */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h index f96a2e26..481c097d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h @@ -25,14 +25,10 @@ * (property name, object pointer getter) */ /* ECMA-262 v6, 25.3.1.5 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_ASYNC_GENERATOR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ASYNC_GENERATOR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 25.2.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_ASYNC_GENERATOR, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_ASYNC_GENERATOR, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.c index 51e095d5..2f5651b1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-async-generator.inc.h" -#define BUILTIN_UNDERSCORED_ID async_generator +#define BUILTIN_UNDERSCORED_ID async_generator #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.inc.h index 0b6162d5..076e42cc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.inc.h @@ -22,14 +22,10 @@ #if JERRY_ESNEXT /* ECMA-262 v6, 25.3.2.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_ASYNC_GENERATOR_FUNCTION, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_ASYNC_GENERATOR_FUNCTION, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 25.3.2.3.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_ASYNC_GENERATOR_PROTOTYPE, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_ASYNC_GENERATOR_PROTOTYPE, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 25.3.2.3.3 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.c index aaefa492..ec65c765 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.c @@ -37,7 +37,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-async-iterator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID async_iterator_prototype +#define BUILTIN_UNDERSCORED_ID async_iterator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-atomics.c b/jerry-core/ecma/builtin-objects/ecma-builtin-atomics.c index a73850b1..c7d1847c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-atomics.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-atomics.c @@ -17,6 +17,7 @@ #include "ecma-builtins.h" #include "ecma-globals.h" #include "ecma-helpers.h" + #include "jrt.h" #if JERRY_BUILTIN_ATOMICS @@ -51,7 +52,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-atomics.inc.h" -#define BUILTIN_UNDERSCORED_ID atomics +#define BUILTIN_UNDERSCORED_ID atomics #include "ecma-builtin-internal-routines-template.inc.h" @@ -76,7 +77,7 @@ enum static ecma_value_t ecma_builtin_atomics_compare_exchange (ecma_value_t typedarray, /**< typedArray argument */ ecma_value_t index, /**< index argument */ - ecma_value_t expected_value, /**< expectedValue argument */ + ecma_value_t expected_value, /**< expectedValue argument */ ecma_value_t replacement_value) /**< replacementValue argument*/ { JERRY_UNUSED (typedarray); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-atomics.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-atomics.inc.h index 7eab2372..a11b4518 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-atomics.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-atomics.inc.h @@ -22,9 +22,7 @@ #if JERRY_BUILTIN_ATOMICS /* ECMA-262 v11, 24.4.14 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_ATOMICS_U, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ATOMICS_U, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.c index 7eee8cc6..3c32e724 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.c @@ -38,7 +38,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-bigint-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID bigint_prototype +#define BUILTIN_UNDERSCORED_ID bigint_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h index 91f637fb..1dc916b0 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h @@ -25,14 +25,10 @@ * (property name, object pointer getter) */ /* ECMA-262 v11, 20.2.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_BIGINT, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_BIGINT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v11, 20.2.3.5 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_BIGINT_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_BIGINT_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.c b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.c index 08f0dacb..1c7e9f0c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.c @@ -23,7 +23,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-bigint.inc.h" -#define BUILTIN_UNDERSCORED_ID bigint +#define BUILTIN_UNDERSCORED_ID bigint #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.inc.h index a19f9acd..d8b216ab 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.inc.h @@ -25,22 +25,16 @@ * (property name, number value, writable, enumerable, configurable) */ /* ECMA-262 v11, 20.2.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v11, 20.2.1 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_BIGINT_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_BIGINT_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v11, 20.2.2.3 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_BIGINT_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_BIGINT_PROTOTYPE, ECMA_PROPERTY_FIXED) #endif /* JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c index cefa45cd..cd175dd4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c @@ -22,6 +22,7 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jrt.h" #if JERRY_BUILTIN_BOOLEAN @@ -45,7 +46,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-boolean-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID boolean_prototype +#define BUILTIN_UNDERSCORED_ID boolean_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h index d9dba92b..82ef75f9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h @@ -25,14 +25,12 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.6.4.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_BOOLEAN, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_BOOLEAN, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_TO_STRING_UL, ECMA_BOOLEAN_PROTOTYPE_ROUTINE_TO_STRING, 0, 0) -ROUTINE (LIT_MAGIC_STRING_VALUE_OF_UL, ECMA_BOOLEAN_PROTOTYPE_ROUTINE_VALUE_OF, 0, 0) +ROUTINE (LIT_MAGIC_STRING_VALUE_OF_UL, ECMA_BOOLEAN_PROTOTYPE_ROUTINE_VALUE_OF, 0, 0) #endif /* JERRY_BUILTIN_BOOLEAN */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c index 3883317a..603d6104 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c @@ -22,6 +22,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-objects.h" + #include "jrt.h" #if JERRY_BUILTIN_BOOLEAN @@ -30,7 +31,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-boolean.inc.h" -#define BUILTIN_UNDERSCORED_ID boolean +#define BUILTIN_UNDERSCORED_ID boolean #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h index b52478aa..51e0c298 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h @@ -25,21 +25,15 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.6.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE, ECMA_PROPERTY_FIXED) /* Number properties: * (property name, object pointer getter) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_BOOLEAN_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_BOOLEAN_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_BOOLEAN */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c index b0edf012..edebf7b7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c @@ -14,8 +14,8 @@ */ #include "ecma-arraybuffer-object.h" -#include "ecma-exceptions.h" #include "ecma-dataview-object.h" +#include "ecma-exceptions.h" #include "ecma-gc.h" #if JERRY_BUILTIN_DATAVIEW @@ -74,7 +74,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-dataview-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID dataview_prototype +#define BUILTIN_UNDERSCORED_ID dataview_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -179,7 +179,8 @@ ecma_builtin_dataview_prototype_dispatch_routine (uint8_t builtin_routine_id, /* return ecma_op_dataview_get_set_view_value (this_arg, arguments_list_p[0], arguments_list_p[1], - ECMA_VALUE_EMPTY, id); + ECMA_VALUE_EMPTY, + id); } case ECMA_DATAVIEW_PROTOTYPE_SET_FLOAT32: #if JERRY_NUMBER_TYPE_FLOAT64 diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h index 2f2e245f..82ef26b1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h @@ -25,14 +25,10 @@ * (property name, object pointer getter) */ /* ECMA-262 v6, 24.2.3 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_DATAVIEW, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_DATAVIEW, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 23.2.4.21 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_DATAVIEW_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_DATAVIEW_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -64,9 +60,7 @@ ROUTINE (LIT_MAGIC_STRING_SET_BIGUINT64, ECMA_DATAVIEW_PROTOTYPE_SET_BIGUINT64, #endif /* JERRY_BUILTIN_BIGINT */ /* ECMA-262 v6, 24.2.4.1 */ -ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BUFFER, - ECMA_DATAVIEW_PROTOTYPE_BUFFER_GETTER, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BUFFER, ECMA_DATAVIEW_PROTOTYPE_BUFFER_GETTER, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 24.2.4.2 */ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_LENGTH_UL, diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c index 94d73784..6e86c6dc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c @@ -14,8 +14,8 @@ */ #include "ecma-builtins.h" -#include "ecma-exceptions.h" #include "ecma-dataview-object.h" +#include "ecma-exceptions.h" #if JERRY_BUILTIN_DATAVIEW @@ -23,7 +23,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-dataview.inc.h" -#define BUILTIN_UNDERSCORED_ID dataview +#define BUILTIN_UNDERSCORED_ID dataview #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h index 009cca18..9b1027cc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h @@ -25,22 +25,16 @@ * (property name, number value, writable, enumerable, configurable) */ /* ECMA-262 v6, 23.1.2 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 23.1 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_DATAVIEW_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_DATAVIEW_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v6, 23.1.2.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE, ECMA_PROPERTY_FIXED) #endif /* JERRY_BUILTIN_DATAVIEW */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c index b02de1bf..2a3120bc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c @@ -22,8 +22,8 @@ #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-objects.h" #include "ecma-objects-general.h" +#include "ecma-objects.h" #if JERRY_BUILTIN_DATE @@ -39,7 +39,7 @@ * Checks whether the function uses UTC time zone. */ #define BUILTIN_DATE_FUNCTION_IS_UTC(builtin_routine_id) \ - (((builtin_routine_id) - ECMA_DATE_PROTOTYPE_GET_FULL_YEAR) & 0x1) + (((builtin_routine_id) -ECMA_DATE_PROTOTYPE_GET_FULL_YEAR) & 0x1) /** * List of built-in routine identifiers. @@ -108,7 +108,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-date-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID date_prototype +#define BUILTIN_UNDERSCORED_ID date_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -311,7 +311,7 @@ ecma_builtin_date_prototype_dispatch_get (uint16_t builtin_routine_id, /**< buil * Returns true, if the built-in id sets a year. */ #define ECMA_DATE_PROTOTYPE_IS_SET_YEAR_ROUTINE(builtin_routine_id) \ - ((builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_FULL_YEAR \ + ((builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_FULL_YEAR \ || (builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_UTC_FULL_YEAR \ || (builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_YEAR) @@ -321,7 +321,7 @@ ecma_builtin_date_prototype_dispatch_get (uint16_t builtin_routine_id, /**< buil * Returns true, if the built-in id sets a year. */ #define ECMA_DATE_PROTOTYPE_IS_SET_YEAR_ROUTINE(builtin_routine_id) \ - ((builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_FULL_YEAR \ + ((builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_FULL_YEAR \ || (builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_UTC_FULL_YEAR) #endif /* JERRY_BUILTIN_ANNEXB */ @@ -677,7 +677,6 @@ ecma_builtin_date_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< b if (builtin_routine_id <= ECMA_DATE_PROTOTYPE_SET_UTC_MILLISECONDS) { - if (builtin_routine_id <= ECMA_DATE_PROTOTYPE_GET_UTC_TIMEZONE_OFFSET) { if (!BUILTIN_DATE_FUNCTION_IS_UTC (builtin_routine_id)) @@ -706,10 +705,7 @@ ecma_builtin_date_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< b return ecma_builtin_date_prototype_dispatch_get (builtin_routine_id, date_value); } - return ecma_builtin_date_prototype_dispatch_set (builtin_routine_id, - this_obj_p, - arguments_list, - arguments_number); + return ecma_builtin_date_prototype_dispatch_set (builtin_routine_id, this_obj_p, arguments_list, arguments_number); } if (builtin_routine_id == ECMA_DATE_PROTOTYPE_TO_ISO_STRING) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h index 1c80040a..ff4f9a20 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h @@ -21,9 +21,7 @@ #if JERRY_BUILTIN_DATE -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_DATE, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_DATE, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) ROUTINE (LIT_MAGIC_STRING_TO_STRING_UL, ECMA_DATE_PROTOTYPE_TO_STRING, 0, 0) ROUTINE (LIT_MAGIC_STRING_TO_DATE_STRING_UL, ECMA_DATE_PROTOTYPE_TO_DATE_STRING, 0, 0) @@ -69,10 +67,12 @@ ROUTINE (LIT_MAGIC_STRING_TO_ISO_STRING_UL, ECMA_DATE_PROTOTYPE_TO_ISO_STRING, 0 ROUTINE (LIT_MAGIC_STRING_TO_JSON_UL, ECMA_DATE_PROTOTYPE_TO_JSON, 1, 1) #if JERRY_ESNEXT ROUTINE_CONFIGURABLE_ONLY (LIT_GLOBAL_SYMBOL_TO_PRIMITIVE, ECMA_DATE_PROTOTYPE_TO_PRIMITIVE, 1, 1) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_UTC_STRING_UL, LIT_MAGIC_STRING_TO_UTC_STRING_UL, +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_UTC_STRING_UL, + LIT_MAGIC_STRING_TO_UTC_STRING_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #if JERRY_BUILTIN_ANNEXB -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_GMT_STRING_UL, LIT_MAGIC_STRING_TO_UTC_STRING_UL, +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_GMT_STRING_UL, + LIT_MAGIC_STRING_TO_UTC_STRING_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ANNEXB */ #else /* !JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c index a16b6c1b..cad9534c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c @@ -15,15 +15,16 @@ #include <math.h> -#include "jcontext.h" -#include "ecma-function-object.h" #include "ecma-alloc.h" #include "ecma-builtin-helpers.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" + +#include "jcontext.h" #include "lit-char-helpers.h" #if JERRY_BUILTIN_DATE @@ -48,7 +49,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-date.inc.h" -#define BUILTIN_UNDERSCORED_ID date +#define BUILTIN_UNDERSCORED_ID date #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -148,8 +149,7 @@ ecma_date_check_two_chars (const lit_utf8_byte_t *str_p, /**< pointer to the ces ecma_char_t expected_char1, /**< first expected character */ ecma_char_t expected_char2) /**< second expected character */ { - return (str_p < str_end_p - && (*str_p == expected_char1 || *str_p == expected_char2)); + return (str_p < str_end_p && (*str_p == expected_char1 || *str_p == expected_char2)); } /* ecma_date_check_two_chars */ /** @@ -236,21 +236,20 @@ ecma_date_parse_month_name (const lit_utf8_byte_t **str_p, /**< pointer to the c } /* ecma_date_parse_month_name */ /** - * Calculate MakeDate(MakeDay(yr, m, dt), MakeTime(h, min, s, milli)) for Date constructor and UTC - * - * See also: - * ECMA-262 v11, 20.4.3.4 - * - * @return false - if the operation fails - * true - otherwise - */ + * Calculate MakeDate(MakeDay(yr, m, dt), MakeTime(h, min, s, milli)) for Date constructor and UTC + * + * See also: + * ECMA-262 v11, 20.4.3.4 + * + * @return false - if the operation fails + * true - otherwise + */ static bool ecma_date_construct_helper (const ecma_value_t *args, /**< arguments passed to the Date constructor */ uint32_t args_len, /**< number of arguments */ ecma_number_t *tv_p) /**< [out] time value */ { - ecma_number_t date_nums[7] = - { + ecma_number_t date_nums[7] = { ECMA_NUMBER_ZERO, /* year */ ECMA_NUMBER_ZERO, /* month */ ECMA_NUMBER_ONE, /* date */ @@ -287,13 +286,8 @@ ecma_date_construct_helper (const ecma_value_t *args, /**< arguments passed to t } /* 10. */ - *tv_p = ecma_date_make_date (ecma_date_make_day (date_nums[0], - date_nums[1], - date_nums[2]), - ecma_date_make_time (date_nums[3], - date_nums[4], - date_nums[5], - date_nums[6])); + *tv_p = ecma_date_make_date (ecma_date_make_day (date_nums[0], date_nums[1], date_nums[2]), + ecma_date_make_time (date_nums[3], date_nums[4], date_nums[5], date_nums[6])); return true; } /* ecma_date_construct_helper */ @@ -324,10 +318,8 @@ ecma_builtin_date_parse_basic (const lit_utf8_byte_t *date_str_curr_p, /**< date year_limit = 999999; } - ecma_number_t year = ecma_date_parse_date_chars (&date_str_curr_p, - date_str_end_p, - year_digits, - ECMA_DATE_LIMIT (0, year_limit)); + ecma_number_t year = + ecma_date_parse_date_chars (&date_str_curr_p, date_str_end_p, year_digits, ECMA_DATE_LIMIT (0, year_limit)); if (is_year_sign_negative) { year = -year; @@ -466,8 +458,7 @@ ecma_builtin_date_parse_basic (const lit_utf8_byte_t *date_str_curr_p, /**< date * @return the parsed date as ecma_number_t or NaN otherwise */ static ecma_number_t -ecma_builtin_date_parse_toString_formats (const lit_utf8_byte_t *date_str_curr_p, - const lit_utf8_byte_t *date_str_end_p) +ecma_builtin_date_parse_toString_formats (const lit_utf8_byte_t *date_str_curr_p, const lit_utf8_byte_t *date_str_end_p) { const ecma_number_t nan = ecma_number_make_nan (); @@ -582,8 +573,7 @@ ecma_builtin_date_parse_toString_formats (const lit_utf8_byte_t *date_str_curr_p } const char gmt_p[] = " GMT"; - if (date_str_end_p - date_str_curr_p < 4 - || memcmp (date_str_curr_p, gmt_p, 4) != 0) + if (date_str_end_p - date_str_curr_p < 4 || memcmp (date_str_curr_p, gmt_p, 4) != 0) { return nan; } @@ -725,8 +715,8 @@ ecma_builtin_date_create (ecma_number_t tv) #if JERRY_ESNEXT JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p) != NULL); - ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), - ECMA_BUILTIN_ID_DATE_PROTOTYPE); + ecma_object_t *prototype_obj_p = + ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_DATE_PROTOTYPE); if (JERRY_UNLIKELY (prototype_obj_p == NULL)) { @@ -787,7 +777,6 @@ ecma_value_t ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - /* 20.4.2.3 */ if (arguments_list_len == 0) { @@ -804,7 +793,6 @@ ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**< if (ecma_is_value_object (argument) && ecma_object_class_is (ecma_get_object_from_value (argument), ECMA_OBJECT_CLASS_DATE)) { - #if JERRY_ESNEXT tv = ((ecma_date_object_t *) ecma_get_object_from_value (argument))->date_value; #else /* !JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h index 7e675c97..f390e0dd 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h @@ -22,22 +22,16 @@ #if JERRY_BUILTIN_DATE /* ECMA-262 v5, 15.9.4.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_DATE_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_DATE_PROTOTYPE, ECMA_PROPERTY_FIXED) -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 7, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 7, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) ROUTINE (LIT_MAGIC_STRING_PARSE, ECMA_DATE_ROUTINE_PARSE, 1, 1) ROUTINE (LIT_MAGIC_STRING_UTC_U, ECMA_DATE_ROUTINE_UTC, NON_FIXED, 7) ROUTINE (LIT_MAGIC_STRING_NOW, ECMA_DATE_ROUTINE_NOW, 0, 0) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_DATE_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_DATE_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_DATE */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.c index 5f4f5650..861d8226 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.c @@ -20,18 +20,19 @@ #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "lit-char-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jrt.h" +#include "lit-char-helpers.h" #include "lit-magic-strings.h" #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" /** - * This object has a custom dispatch function. - */ + * This object has a custom dispatch function. + */ #define BUILTIN_CUSTOM_DISPATCH /** @@ -44,7 +45,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-error-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID error_prototype +#define BUILTIN_UNDERSCORED_ID error_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -105,18 +106,16 @@ ecma_builtin_error_prototype_object_to_string (ecma_value_t this_arg) /**< this ecma_object_t *obj_p = ecma_get_object_from_value (this_arg); - ecma_string_t *name_string_p = ecma_builtin_error_prototype_object_to_string_helper (obj_p, - LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_ERROR_UL); + ecma_string_t *name_string_p = + ecma_builtin_error_prototype_object_to_string_helper (obj_p, LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ERROR_UL); if (JERRY_UNLIKELY (name_string_p == NULL)) { return ECMA_VALUE_ERROR; } - ecma_string_t *msg_string_p = ecma_builtin_error_prototype_object_to_string_helper (obj_p, - LIT_MAGIC_STRING_MESSAGE, - LIT_MAGIC_STRING__EMPTY); + ecma_string_t *msg_string_p = + ecma_builtin_error_prototype_object_to_string_helper (obj_p, LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY); if (JERRY_UNLIKELY (msg_string_p == NULL)) { @@ -136,7 +135,7 @@ ecma_builtin_error_prototype_object_to_string (ecma_value_t this_arg) /**< this ecma_stringbuilder_t builder = ecma_stringbuilder_create_from (name_string_p); - ecma_stringbuilder_append_raw (&builder, (const lit_utf8_byte_t *)": ", 2); + ecma_stringbuilder_append_raw (&builder, (const lit_utf8_byte_t *) ": ", 2); ecma_stringbuilder_append (&builder, msg_string_p); ecma_deref_ecma_string (name_string_p); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.inc.h index 5e02b20c..751094ca 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.inc.h @@ -23,19 +23,13 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.4.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.4.2 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_ERROR_UL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ERROR_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.4.3 */ -STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-error.c b/jerry-core/ecma/builtin-objects/ecma-builtin-error.c index 17693f2e..1f8dedda 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-error.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-error.c @@ -14,23 +14,24 @@ */ #include "ecma-alloc.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" #include "ecma-objects.h" -#include "ecma-function-object.h" -#include "jrt.h" + #include "jcontext.h" +#include "jrt.h" #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-error.inc.h" -#define BUILTIN_UNDERSCORED_ID error +#define BUILTIN_UNDERSCORED_ID error #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -67,8 +68,8 @@ ecma_builtin_error_dispatch_construct (const ecma_value_t *arguments_list_p, /** #if !JERRY_ESNEXT return ecma_builtin_error_dispatch_call (arguments_list_p, arguments_list_len); #else /* JERRY_ESNEXT */ - ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), - ECMA_BUILTIN_ID_ERROR_PROTOTYPE); + ecma_object_t *proto_p = + ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_ERROR_PROTOTYPE); if (proto_p == NULL) { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h index c3df1a7c..7098dd95 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h @@ -22,22 +22,16 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.7.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_ERROR_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_ERROR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c index a755b166..37588033 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c @@ -22,6 +22,7 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -30,7 +31,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-evalerror-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID eval_error_prototype +#define BUILTIN_UNDERSCORED_ID eval_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h index f131641f..1f13dd2f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h @@ -25,19 +25,13 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.7.8 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_EVAL_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_EVAL_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.9 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_EVAL_ERROR_UL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_EVAL_ERROR_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.10 */ -STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c index 29e71ecb..3804420d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c @@ -14,17 +14,18 @@ */ #include "ecma-alloc.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" #include "ecma-objects.h" -#include "ecma-function-object.h" -#include "jrt.h" + #include "jcontext.h" +#include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -32,7 +33,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-evalerror.inc.h" -#define BUILTIN_UNDERSCORED_ID eval_error +#define BUILTIN_UNDERSCORED_ID eval_error #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -69,8 +70,8 @@ ecma_builtin_eval_error_dispatch_construct (const ecma_value_t *arguments_list_p #if !JERRY_ESNEXT return ecma_builtin_eval_error_dispatch_call (arguments_list_p, arguments_list_len); #else /* JERRY_ESNEXT */ - ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), - ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE); + ecma_object_t *proto_p = + ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE); if (proto_p == NULL) { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h index 64887c8d..9efa35f6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h @@ -24,22 +24,16 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_EVAL_ERROR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_EVAL_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c index d1d71ea2..44e30347 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c @@ -13,20 +13,22 @@ * limitations under the License. */ +#include "ecma-builtin-function-prototype.h" + #include "ecma-alloc.h" #include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" #include "ecma-extended-info.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-function-object.h" #include "ecma-objects.h" #include "ecma-proxy-object.h" + #include "jrt.h" -#include "ecma-builtin-function-prototype.h" #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -52,7 +54,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-function-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID function_prototype +#define BUILTIN_UNDERSCORED_ID function_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -209,7 +211,7 @@ ecma_builtin_function_prototype_object_apply (ecma_object_t *func_obj_p, /**< th /* 2. */ if (ecma_is_value_null (arg2) || ecma_is_value_undefined (arg2)) { - return ecma_op_function_call (func_obj_p, arg1, NULL, 0); + return ecma_op_function_call (func_obj_p, arg1, NULL, 0); } /* 3. */ @@ -256,10 +258,7 @@ ecma_builtin_function_prototype_object_apply (ecma_object_t *func_obj_p, /**< th if (ecma_is_value_empty (ret_value)) { JERRY_ASSERT (index == length); - ret_value = ecma_op_function_call (func_obj_p, - arg1, - arguments_list_p, - (uint32_t) length); + ret_value = ecma_op_function_call (func_obj_p, arg1, arguments_list_p, (uint32_t) length); } for (uint32_t remove_index = 0; remove_index < index; remove_index++) @@ -282,17 +281,14 @@ ecma_builtin_function_prototype_object_apply (ecma_object_t *func_obj_p, /**< th * Returned value must be freed with ecma_free_value. */ static ecma_value_t -ecma_builtin_function_prototype_object_call (ecma_object_t *func_obj_p , /**< this argument object */ +ecma_builtin_function_prototype_object_call (ecma_object_t *func_obj_p, /**< this argument object */ const ecma_value_t *arguments_list_p, /**< list of arguments */ uint32_t arguments_number) /**< number of arguments */ { if (arguments_number == 0) { /* Even a 'this' argument is missing. */ - return ecma_op_function_call (func_obj_p, - ECMA_VALUE_UNDEFINED, - NULL, - 0); + return ecma_op_function_call (func_obj_p, ECMA_VALUE_UNDEFINED, NULL, 0); } return ecma_op_function_call (func_obj_p, @@ -311,7 +307,7 @@ ecma_builtin_function_prototype_object_call (ecma_object_t *func_obj_p , /**< th * Returned value must be freed with ecma_free_value. */ static ecma_value_t -ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /**< this argument object */ +ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p, /**< this argument object */ const ecma_value_t *arguments_list_p, /**< list of arguments */ uint32_t arguments_number) /**< number of arguments */ { @@ -353,18 +349,13 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** ecma_object_t *function_p; ecma_bound_function_t *bound_func_p; - if (arguments_number == 0 - || (arguments_number == 1 && !ecma_is_value_integer_number (arguments_list_p[0]))) + if (arguments_number == 0 || (arguments_number == 1 && !ecma_is_value_integer_number (arguments_list_p[0]))) { - function_p = ecma_create_object (prototype_obj_p, - sizeof (ecma_bound_function_t), - ECMA_OBJECT_TYPE_BOUND_FUNCTION); + function_p = ecma_create_object (prototype_obj_p, sizeof (ecma_bound_function_t), ECMA_OBJECT_TYPE_BOUND_FUNCTION); /* 8. */ bound_func_p = (ecma_bound_function_t *) function_p; - ECMA_SET_NON_NULL_POINTER_TAG (bound_func_p->header.u.bound_function.target_function, - this_arg_obj_p, - 0); + ECMA_SET_NON_NULL_POINTER_TAG (bound_func_p->header.u.bound_function.target_function, this_arg_obj_p, 0); bound_func_p->header.u.bound_function.args_len_or_this = ECMA_VALUE_UNDEFINED; @@ -379,15 +370,11 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** size_t obj_size = sizeof (ecma_bound_function_t) + (arguments_number * sizeof (ecma_value_t)); - function_p = ecma_create_object (prototype_obj_p, - obj_size, - ECMA_OBJECT_TYPE_BOUND_FUNCTION); + function_p = ecma_create_object (prototype_obj_p, obj_size, ECMA_OBJECT_TYPE_BOUND_FUNCTION); /* 8. */ bound_func_p = (ecma_bound_function_t *) function_p; - ECMA_SET_NON_NULL_POINTER_TAG (bound_func_p->header.u.bound_function.target_function, - this_arg_obj_p, - 0); + ECMA_SET_NON_NULL_POINTER_TAG (bound_func_p->header.u.bound_function.target_function, this_arg_obj_p, 0); /* NOTE: This solution provides temporary false data about the object's size but prevents GC from freeing it until it's not fully initialized. */ @@ -413,9 +400,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** ecma_string_t *len_string = ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH); ecma_property_descriptor_t prop_desc; - ecma_value_t status = ecma_op_object_get_own_property_descriptor (this_arg_obj_p, - len_string, - &prop_desc); + ecma_value_t status = ecma_op_object_get_own_property_descriptor (this_arg_obj_p, len_string, &prop_desc); #if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) @@ -428,8 +413,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** if (ecma_is_value_true (status)) { ecma_free_property_descriptor (&prop_desc); - ecma_value_t len_value = ecma_op_object_get (this_arg_obj_p, - len_string); + ecma_value_t len_value = ecma_op_object_get (this_arg_obj_p, len_string); if (ECMA_IS_VALUE_ERROR (len_value)) { @@ -552,9 +536,7 @@ ecma_builtin_function_prototype_dispatch_routine (uint8_t builtin_routine_id, /* } case ECMA_FUNCTION_PROTOTYPE_APPLY: { - return ecma_builtin_function_prototype_object_apply (func_obj_p, - arguments_list_p[0], - arguments_list_p[1]); + return ecma_builtin_function_prototype_object_apply (func_obj_p, arguments_list_p[0], arguments_list_p[1]); } case ECMA_FUNCTION_PROTOTYPE_CALL: { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.h b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.h index 97ba3137..363681f5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.h @@ -16,8 +16,9 @@ #ifndef ECMA_BUILTIN_FUNCTION_PROTOTYPE_H #define ECMA_BUILTIN_FUNCTION_PROTOTYPE_H -ecma_value_t ecma_builtin_function_prototype_object_apply (ecma_object_t *func_obj_p, - ecma_value_t arg1, - ecma_value_t arg2); +#include "ecma-globals.h" + +ecma_value_t +ecma_builtin_function_prototype_object_apply (ecma_object_t *func_obj_p, ecma_value_t arg1, ecma_value_t arg2); #endif /* !ECMA_BUILTIN_FUNCTION_PROTOTYPE_H */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h index 1c61dfab..46261d2d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h @@ -23,21 +23,15 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.3.4.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_FUNCTION, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_FUNCTION, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* Number properties: * (property name, object pointer getter) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ /* Routine properties: diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function.c b/jerry-core/ecma/builtin-objects/ecma-builtin-function.c index 562fab2f..7c8e1dfd 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function.c @@ -15,11 +15,12 @@ #include "ecma-alloc.h" #include "ecma-conversion.h" -#include "ecma-exceptions.h" #include "ecma-eval.h" -#include "ecma-gc.h" +#include "ecma-exceptions.h" #include "ecma-function-object.h" +#include "ecma-gc.h" #include "ecma-lex-env.h" + #include "js-parser.h" #include "lit-magic-strings.h" @@ -27,7 +28,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-function.inc.h" -#define BUILTIN_UNDERSCORED_ID function +#define BUILTIN_UNDERSCORED_ID function #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h index 68f9edbd..388755de 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h @@ -23,21 +23,15 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.3.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, ECMA_PROPERTY_FIXED) /* Number properties: * (property name, object pointer getter) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_FUNCTION_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c index 05ee6cc8..14907dd1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c @@ -22,7 +22,7 @@ #include "ecma-function-object.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-generator-function.inc.h" -#define BUILTIN_UNDERSCORED_ID generator_function +#define BUILTIN_UNDERSCORED_ID generator_function #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -53,7 +53,7 @@ ecma_builtin_generator_function_dispatch_call (const ecma_value_t *arguments_lis /** * Handle calling [[Construct]] of built-in GeneratorFunction object * -* @return constructed generator function object - if success + * @return constructed generator function object - if success * raised error otherwise */ ecma_value_t diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h index 842f70a9..a6d60bdc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h @@ -22,19 +22,13 @@ #if JERRY_ESNEXT /* ECMA-262 v6, 25.2.2 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 25.2.2.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 25.2.2.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_GENERATOR, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_GENERATOR, ECMA_PROPERTY_FIXED) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c index 6ce574ea..815e9393 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-iterator-object.h" + #include "jcontext.h" #include "opcodes.h" #include "vm-defines.h" @@ -29,8 +30,8 @@ #include "ecma-builtins-internal.h" /** - * This object has a custom dispatch function. - */ + * This object has a custom dispatch function. + */ #define BUILTIN_CUSTOM_DISPATCH /** @@ -45,7 +46,7 @@ enum } ecma_generator_operation_type_t; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-generator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID generator_prototype +#define BUILTIN_UNDERSCORED_ID generator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -62,18 +63,17 @@ enum * Convert routine type to operation type.. */ #define ECMA_GENERATOR_ROUTINE_TO_OPERATION(type) \ - ((ecma_iterator_command_type_t) ((type) - ECMA_GENERATOR_PROTOTYPE_ROUTINE_NEXT)) + ((ecma_iterator_command_type_t) ((type) -ECMA_GENERATOR_PROTOTYPE_ROUTINE_NEXT)) -JERRY_STATIC_ASSERT (ECMA_GENERATOR_ROUTINE_TO_OPERATION (ECMA_GENERATOR_PROTOTYPE_ROUTINE_NEXT) - == ECMA_ITERATOR_NEXT, +JERRY_STATIC_ASSERT (ECMA_GENERATOR_ROUTINE_TO_OPERATION (ECMA_GENERATOR_PROTOTYPE_ROUTINE_NEXT) == ECMA_ITERATOR_NEXT, convert_ecma_generator_routine_next_to_ecma_iterator_next_failed); JERRY_STATIC_ASSERT (ECMA_GENERATOR_ROUTINE_TO_OPERATION (ECMA_GENERATOR_PROTOTYPE_ROUTINE_THROW) - == ECMA_ITERATOR_THROW, + == ECMA_ITERATOR_THROW, convert_ecma_generator_routine_throw_to_ecma_iterator_throw_failed); JERRY_STATIC_ASSERT (ECMA_GENERATOR_ROUTINE_TO_OPERATION (ECMA_GENERATOR_PROTOTYPE_ROUTINE_RETURN) - == ECMA_ITERATOR_RETURN, + == ECMA_ITERATOR_RETURN, convert_ecma_generator_routine_return_to_ecma_iterator_return_failed); /** @@ -161,9 +161,8 @@ ecma_builtin_generator_prototype_object_do (vm_executable_object_t *generator_ob if (byte_code_p[-1] == CBC_EXT_YIELD_ITERATOR) { - ecma_value_t iterator = ecma_op_get_iterator (value, - ECMA_VALUE_SYNC_ITERATOR, - generator_object_p->frame_ctx.stack_top_p); + ecma_value_t iterator = + ecma_op_get_iterator (value, ECMA_VALUE_SYNC_ITERATOR, generator_object_p->frame_ctx.stack_top_p); ecma_free_value (value); if (ECMA_IS_VALUE_ERROR (iterator)) @@ -195,11 +194,11 @@ ecma_builtin_generator_prototype_object_do (vm_executable_object_t *generator_ob } /* ecma_builtin_generator_prototype_object_do */ /** - * Dispatcher of the Generator built-in's routines - * - * @return ecma value - * Returned value must be freed with ecma_free_value. - */ + * Dispatcher of the Generator built-in's routines + * + * @return ecma value + * Returned value must be freed with ecma_free_value. + */ ecma_value_t ecma_builtin_generator_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide routine * identifier */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h index e774f0fb..4028b4e8 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h @@ -25,14 +25,10 @@ * (property name, object pointer getter) */ /* ECMA-262 v6, 25.3.1.5 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_GENERATOR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_GENERATOR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 25.2.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_GENERATOR, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_GENERATOR, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c index 7cb11537..29045609 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-generator.inc.h" -#define BUILTIN_UNDERSCORED_ID generator +#define BUILTIN_UNDERSCORED_ID generator #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h index 235593ba..bf3fc2f5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h @@ -22,19 +22,13 @@ #if JERRY_ESNEXT /* ECMA-262 v6, 25.3.2.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_GENERATOR_FUNCTION, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_GENERATOR_FUNCTION, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 25.3.2.3.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_GENERATOR_PROTOTYPE, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_GENERATOR_PROTOTYPE, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 25.3.2.3.3 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.c b/jerry-core/ecma/builtin-objects/ecma-builtin-global.c index 34570ecb..f0230384 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-global.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-global.c @@ -21,14 +21,15 @@ #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" + +#include "jcontext.h" +#include "jrt-bit-fields.h" +#include "jrt-libc-includes.h" #include "jrt.h" #include "lit-char-helpers.h" #include "lit-magic-strings.h" #include "lit-strings.h" #include "vm.h" -#include "jcontext.h" -#include "jrt-libc-includes.h" -#include "jrt-bit-fields.h" #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -59,7 +60,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-global.inc.h" -#define BUILTIN_UNDERSCORED_ID global +#define BUILTIN_UNDERSCORED_ID global #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -137,8 +138,7 @@ ecma_builtin_global_object_is_nan (ecma_number_t arg_num) /**< routine's first a static ecma_value_t ecma_builtin_global_object_is_finite (ecma_number_t arg_num) /**< routine's first argument */ { - bool is_finite = !(ecma_number_is_nan (arg_num) - || ecma_number_is_infinity (arg_num)); + bool is_finite = !(ecma_number_is_nan (arg_num) || ecma_number_is_infinity (arg_num)); return ecma_make_boolean_value (is_finite); } /* ecma_builtin_global_object_is_finite */ @@ -161,22 +161,16 @@ ecma_builtin_global_object_character_is_in (uint32_t character, /**< character * * One bit for each character between 0 - 127. * Bit is set if the character is in the unescaped URI set. */ -static const uint8_t unescaped_uri_set[16] = -{ - 0x0, 0x0, 0x0, 0x0, 0xda, 0xff, 0xff, 0xaf, - 0xff, 0xff, 0xff, 0x87, 0xfe, 0xff, 0xff, 0x47 -}; +static const uint8_t unescaped_uri_set[16] = { 0x0, 0x0, 0x0, 0x0, 0xda, 0xff, 0xff, 0xaf, + 0xff, 0xff, 0xff, 0x87, 0xfe, 0xff, 0xff, 0x47 }; /** * Unescaped URI component characters bitset: * One bit for each character between 0 - 127. * Bit is set if the character is in the unescaped component URI set. */ -static const uint8_t unescaped_uri_component_set[16] = -{ - 0x0, 0x0, 0x0, 0x0, 0x82, 0x67, 0xff, 0x3, - 0xfe, 0xff, 0xff, 0x87, 0xfe, 0xff, 0xff, 0x47 -}; +static const uint8_t unescaped_uri_component_set[16] = { 0x0, 0x0, 0x0, 0x0, 0x82, 0x67, 0xff, 0x3, + 0xfe, 0xff, 0xff, 0x87, 0xfe, 0xff, 0xff, 0x47 }; /** * Format is a percent sign followed by two hex digits. @@ -283,8 +277,7 @@ ecma_builtin_global_object_decode_uri_helper (lit_utf8_byte_t *input_start_p, /* } } - if (!is_valid - || !lit_is_valid_utf8_string (octets, bytes_count, true)) + if (!is_valid || !lit_is_valid_utf8_string (octets, bytes_count, true)) { ecma_stringbuilder_destroy (&builder); return ecma_raise_uri_error (ECMA_ERR_MSG ("Invalid UTF8 string")); @@ -293,8 +286,7 @@ ecma_builtin_global_object_decode_uri_helper (lit_utf8_byte_t *input_start_p, /* lit_code_point_t cp; lit_read_code_point_from_utf8 (octets, bytes_count, &cp); - if (lit_is_code_point_utf16_high_surrogate (cp) - || lit_is_code_point_utf16_low_surrogate (cp)) + if (lit_is_code_point_utf16_high_surrogate (cp) || lit_is_code_point_utf16_low_surrogate (cp)) { ecma_stringbuilder_destroy (&builder); return ecma_raise_uri_error (ECMA_ERR_MSG ("Invalid UTF8 codepoint")); @@ -431,11 +423,8 @@ ecma_builtin_global_object_encode_uri_helper (lit_utf8_byte_t *input_start_p, /* * Bit is set if the character does not need to be converted to %xx form. * These characters are: a-z A-Z 0-9 @ * _ + - . / */ -static const uint8_t ecma_escape_set[16] = -{ - 0x0, 0x0, 0x0, 0x0, 0x0, 0xec, 0xff, 0x3, - 0xff, 0xff, 0xff, 0x87, 0xfe, 0xff, 0xff, 0x7 -}; +static const uint8_t ecma_escape_set[16] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0xec, 0xff, 0x3, + 0xff, 0xff, 0xff, 0x87, 0xfe, 0xff, 0xff, 0x7 }; /** * The Global object's 'escape' routine @@ -502,7 +491,7 @@ ecma_builtin_global_object_escape (lit_utf8_byte_t *input_start_p, /**< routine' * @return number of characters processed during the escape resolve */ static uint8_t -ecma_builtin_global_object_unescape_resolve_escape (const lit_utf8_byte_t *buffer_p, /**< character buffer */ +ecma_builtin_global_object_unescape_resolve_escape (const lit_utf8_byte_t *buffer_p, /**< character buffer */ bool unicode_sequence, /**< true if unescaping unicode sequence */ ecma_char_t *out_result_p) /**< [out] resolved character */ { @@ -643,15 +632,12 @@ ecma_builtin_global_dispatch_routine (uint8_t builtin_routine_id, /**< built-in if (builtin_routine_id == ECMA_GLOBAL_PARSE_INT) { - ret_value = ecma_number_parse_int (string_buff, - string_buff_size, - arguments_list_p[1]); + ret_value = ecma_number_parse_int (string_buff, string_buff_size, arguments_list_p[1]); } else { JERRY_ASSERT (builtin_routine_id == ECMA_GLOBAL_PARSE_FLOAT); - ret_value = ecma_number_parse_float (string_buff, - string_buff_size); + ret_value = ecma_number_parse_float (string_buff, string_buff_size); } ECMA_FINALIZE_UTF8_STRING (string_buff, string_buff_size); @@ -661,9 +647,7 @@ ecma_builtin_global_dispatch_routine (uint8_t builtin_routine_id, /**< built-in lit_utf8_size_t input_size = ecma_string_get_size (str_p); - JMEM_DEFINE_LOCAL_ARRAY (input_start_p, - input_size + 1, - lit_utf8_byte_t); + JMEM_DEFINE_LOCAL_ARRAY (input_start_p, input_size + 1, lit_utf8_byte_t); ecma_string_to_utf8_bytes (str_p, input_start_p, input_size); @@ -686,8 +670,8 @@ ecma_builtin_global_dispatch_routine (uint8_t builtin_routine_id, /**< built-in case ECMA_GLOBAL_DECODE_URI: case ECMA_GLOBAL_DECODE_URI_COMPONENT: { - const uint8_t *uri_set = (builtin_routine_id == ECMA_GLOBAL_DECODE_URI ? unescaped_uri_set - : unescaped_uri_component_set); + const uint8_t *uri_set = + (builtin_routine_id == ECMA_GLOBAL_DECODE_URI ? unescaped_uri_set : unescaped_uri_component_set); ret_value = ecma_builtin_global_object_decode_uri_helper (input_start_p, input_size, uri_set); break; @@ -697,8 +681,8 @@ ecma_builtin_global_dispatch_routine (uint8_t builtin_routine_id, /**< built-in JERRY_ASSERT (builtin_routine_id == ECMA_GLOBAL_ENCODE_URI || builtin_routine_id == ECMA_GLOBAL_ENCODE_URI_COMPONENT); - const uint8_t *uri_set = (builtin_routine_id == ECMA_GLOBAL_ENCODE_URI ? unescaped_uri_set - : unescaped_uri_component_set); + const uint8_t *uri_set = + (builtin_routine_id == ECMA_GLOBAL_ENCODE_URI ? unescaped_uri_set : unescaped_uri_component_set); ret_value = ecma_builtin_global_object_encode_uri_helper (input_start_p, input_size, uri_set); break; diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h index 88007be2..6048dfd4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h @@ -23,147 +23,101 @@ * (property name, simple value, writable, enumerable, configurable) */ /* ECMA-262 v5, 15.1.1.3 */ -SIMPLE_VALUE (LIT_MAGIC_STRING_UNDEFINED, - ECMA_VALUE_UNDEFINED, - ECMA_PROPERTY_FIXED) +SIMPLE_VALUE (LIT_MAGIC_STRING_UNDEFINED, ECMA_VALUE_UNDEFINED, ECMA_PROPERTY_FIXED) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ /* ECMA-262 v5, 15.1.1.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_NAN, - ECMA_BUILTIN_NUMBER_NAN, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_NAN, ECMA_BUILTIN_NUMBER_NAN, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.1.1.2 */ -NUMBER_VALUE (LIT_MAGIC_STRING_INFINITY_UL, - ECMA_BUILTIN_NUMBER_POSITIVE_INFINITY, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_INFINITY_UL, ECMA_BUILTIN_NUMBER_POSITIVE_INFINITY, ECMA_PROPERTY_FIXED) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.1.4.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_OBJECT_UL, - ECMA_BUILTIN_ID_OBJECT, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_OBJECT_UL, ECMA_BUILTIN_ID_OBJECT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.1.4.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_FUNCTION_UL, - ECMA_BUILTIN_ID_FUNCTION, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_FUNCTION_UL, ECMA_BUILTIN_ID_FUNCTION, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.1.4.3 */ #if JERRY_BUILTIN_ARRAY -OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_UL, - ECMA_BUILTIN_ID_ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_UL, ECMA_BUILTIN_ID_ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ARRAY */ #if JERRY_BUILTIN_STRING /* ECMA-262 v5, 15.1.4.4 */ -OBJECT_VALUE (LIT_MAGIC_STRING_STRING_UL, - ECMA_BUILTIN_ID_STRING, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_STRING_UL, ECMA_BUILTIN_ID_STRING, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_STRING */ #if JERRY_BUILTIN_BOOLEAN /* ECMA-262 v5, 15.1.4.5 */ -OBJECT_VALUE (LIT_MAGIC_STRING_BOOLEAN_UL, - ECMA_BUILTIN_ID_BOOLEAN, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_BOOLEAN_UL, ECMA_BUILTIN_ID_BOOLEAN, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_BOOLEAN */ #if JERRY_BUILTIN_NUMBER /* ECMA-262 v5, 15.1.4.6 */ -OBJECT_VALUE (LIT_MAGIC_STRING_NUMBER_UL, - ECMA_BUILTIN_ID_NUMBER, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_NUMBER_UL, ECMA_BUILTIN_ID_NUMBER, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_NUMBER */ #if JERRY_BUILTIN_DATE /* ECMA-262 v5, 15.1.4.7 */ -OBJECT_VALUE (LIT_MAGIC_STRING_DATE_UL, - ECMA_BUILTIN_ID_DATE, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_DATE_UL, ECMA_BUILTIN_ID_DATE, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_DATE */ #if JERRY_BUILTIN_REGEXP /* ECMA-262 v5, 15.1.4.8 */ -OBJECT_VALUE (LIT_MAGIC_STRING_REGEXP_UL, - ECMA_BUILTIN_ID_REGEXP, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_REGEXP_UL, ECMA_BUILTIN_ID_REGEXP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_REGEXP */ /* ECMA-262 v5, 15.1.4.9 */ -OBJECT_VALUE (LIT_MAGIC_STRING_ERROR_UL, - ECMA_BUILTIN_ID_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_ERROR_UL, ECMA_BUILTIN_ID_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #if JERRY_BUILTIN_ERRORS /* ECMA-262 v5, 15.1.4.10 */ -OBJECT_VALUE (LIT_MAGIC_STRING_EVAL_ERROR_UL, - ECMA_BUILTIN_ID_EVAL_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_EVAL_ERROR_UL, ECMA_BUILTIN_ID_EVAL_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.1.4.11 */ -OBJECT_VALUE (LIT_MAGIC_STRING_RANGE_ERROR_UL, - ECMA_BUILTIN_ID_RANGE_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_RANGE_ERROR_UL, ECMA_BUILTIN_ID_RANGE_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.1.4.12 */ -OBJECT_VALUE (LIT_MAGIC_STRING_REFERENCE_ERROR_UL, - ECMA_BUILTIN_ID_REFERENCE_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_REFERENCE_ERROR_UL, ECMA_BUILTIN_ID_REFERENCE_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.1.4.13 */ -OBJECT_VALUE (LIT_MAGIC_STRING_SYNTAX_ERROR_UL, - ECMA_BUILTIN_ID_SYNTAX_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_SYNTAX_ERROR_UL, ECMA_BUILTIN_ID_SYNTAX_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.1.4.14 */ -OBJECT_VALUE (LIT_MAGIC_STRING_TYPE_ERROR_UL, - ECMA_BUILTIN_ID_TYPE_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_TYPE_ERROR_UL, ECMA_BUILTIN_ID_TYPE_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.1.4.15 */ -OBJECT_VALUE (LIT_MAGIC_STRING_URI_ERROR_UL, - ECMA_BUILTIN_ID_URI_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_URI_ERROR_UL, ECMA_BUILTIN_ID_URI_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ERRORS */ #if JERRY_BUILTIN_MATH /* ECMA-262 v5, 15.1.5.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_MATH_UL, - ECMA_BUILTIN_ID_MATH, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_MATH_UL, ECMA_BUILTIN_ID_MATH, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_MATH */ #if JERRY_BUILTIN_REFLECT /* ECMA-262 v6, 26.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_REFLECT_UL, - ECMA_BUILTIN_ID_REFLECT, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_REFLECT_UL, ECMA_BUILTIN_ID_REFLECT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_REFLECT */ #if JERRY_BUILTIN_JSON /* ECMA-262 v5, 15.1.5.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_JSON_U, - ECMA_BUILTIN_ID_JSON, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_JSON_U, ECMA_BUILTIN_ID_JSON, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_JSON */ #if JERRY_BUILTIN_ATOMICS /* ECMA-262 v5, 15.1.5.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_ATOMICS_U, - ECMA_BUILTIN_ID_ATOMICS, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_ATOMICS_U, ECMA_BUILTIN_ID_ATOMICS, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ATOMICS */ #if JERRY_BUILTIN_TYPEDARRAY -OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_BUFFER_UL, - ECMA_BUILTIN_ID_ARRAYBUFFER, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_BUFFER_UL, ECMA_BUILTIN_ID_ARRAYBUFFER, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #if JERRY_BUILTIN_SHAREDARRAYBUFFER OBJECT_VALUE (LIT_MAGIC_STRING_SHARED_ARRAY_BUFFER_UL, @@ -171,48 +125,28 @@ OBJECT_VALUE (LIT_MAGIC_STRING_SHARED_ARRAY_BUFFER_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_SHAREDARRAYBUFFER */ -OBJECT_VALUE (LIT_MAGIC_STRING_INT8_ARRAY_UL, - ECMA_BUILTIN_ID_INT8ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_INT8_ARRAY_UL, ECMA_BUILTIN_ID_INT8ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_ARRAY_UL, - ECMA_BUILTIN_ID_UINT8ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_ARRAY_UL, ECMA_BUILTIN_ID_UINT8ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -OBJECT_VALUE (LIT_MAGIC_STRING_INT16_ARRAY_UL, - ECMA_BUILTIN_ID_INT16ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_INT16_ARRAY_UL, ECMA_BUILTIN_ID_INT16ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -OBJECT_VALUE (LIT_MAGIC_STRING_UINT16_ARRAY_UL, - ECMA_BUILTIN_ID_UINT16ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_UINT16_ARRAY_UL, ECMA_BUILTIN_ID_UINT16ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -OBJECT_VALUE (LIT_MAGIC_STRING_INT32_ARRAY_UL, - ECMA_BUILTIN_ID_INT32ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_INT32_ARRAY_UL, ECMA_BUILTIN_ID_INT32ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -OBJECT_VALUE (LIT_MAGIC_STRING_UINT32_ARRAY_UL, - ECMA_BUILTIN_ID_UINT32ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_UINT32_ARRAY_UL, ECMA_BUILTIN_ID_UINT32ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -OBJECT_VALUE (LIT_MAGIC_STRING_FLOAT32_ARRAY_UL, - ECMA_BUILTIN_ID_FLOAT32ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_FLOAT32_ARRAY_UL, ECMA_BUILTIN_ID_FLOAT32ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #if JERRY_NUMBER_TYPE_FLOAT64 -OBJECT_VALUE (LIT_MAGIC_STRING_FLOAT64_ARRAY_UL, - ECMA_BUILTIN_ID_FLOAT64ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_FLOAT64_ARRAY_UL, ECMA_BUILTIN_ID_FLOAT64ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_NUMBER_TYPE_FLOAT64 */ #if JERRY_BUILTIN_BIGINT -OBJECT_VALUE (LIT_MAGIC_STRING_BIGINT64_ARRAY_UL, - ECMA_BUILTIN_ID_BIGINT64ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_BIGINT64_ARRAY_UL, ECMA_BUILTIN_ID_BIGINT64ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -OBJECT_VALUE (LIT_MAGIC_STRING_BIGUINT64_ARRAY_UL, - ECMA_BUILTIN_ID_BIGUINT64ARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_BIGUINT64_ARRAY_UL, ECMA_BUILTIN_ID_BIGUINT64ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_BIGINT */ OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL, @@ -223,73 +157,49 @@ OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL, #if JERRY_BUILTIN_CONTAINER /* ECMA-262 v6, 23.1.1.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_WEAKSET_UL, - ECMA_BUILTIN_ID_WEAKSET, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_WEAKSET_UL, ECMA_BUILTIN_ID_WEAKSET, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 23.1.1.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_MAP_UL, - ECMA_BUILTIN_ID_MAP, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_MAP_UL, ECMA_BUILTIN_ID_MAP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 23.1.1.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_SET_UL, - ECMA_BUILTIN_ID_SET, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_SET_UL, ECMA_BUILTIN_ID_SET, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 23.1.1.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_WEAKMAP_UL, - ECMA_BUILTIN_ID_WEAKMAP, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_WEAKMAP_UL, ECMA_BUILTIN_ID_WEAKMAP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_CONTAINER */ #if JERRY_BUILTIN_WEAKREF -OBJECT_VALUE (LIT_MAGIC_STRING_WEAKREF_UL, - ECMA_BUILTIN_ID_WEAKREF, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_WEAKREF_UL, ECMA_BUILTIN_ID_WEAKREF, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_WEAKREF */ #if JERRY_ESNEXT -OBJECT_VALUE (LIT_MAGIC_STRING_AGGREGATE_ERROR_UL, - ECMA_BUILTIN_ID_AGGREGATE_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_AGGREGATE_ERROR_UL, ECMA_BUILTIN_ID_AGGREGATE_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -OBJECT_VALUE (LIT_MAGIC_STRING_PROMISE_UL, - ECMA_BUILTIN_ID_PROMISE, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_PROMISE_UL, ECMA_BUILTIN_ID_PROMISE, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 19.4.1.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_SYMBOL_UL, - ECMA_BUILTIN_ID_SYMBOL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_SYMBOL_UL, ECMA_BUILTIN_ID_SYMBOL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_ESNEXT */ #if JERRY_BUILTIN_GLOBAL_THIS /* ECMA-262 v11, 18.1.1 */ -SIMPLE_VALUE (LIT_MAGIC_STRING_GLOBAL_THIS_UL, - ECMA_VALUE_GLOBAL_THIS, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +SIMPLE_VALUE (LIT_MAGIC_STRING_GLOBAL_THIS_UL, ECMA_VALUE_GLOBAL_THIS, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_GLOBAL_THIS */ #if JERRY_BUILTIN_DATAVIEW /* ECMA-262 v6, 23.1.1.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_DATAVIEW_UL, - ECMA_BUILTIN_ID_DATAVIEW, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_DATAVIEW_UL, ECMA_BUILTIN_ID_DATAVIEW, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_DATAVIEW */ #if JERRY_BUILTIN_PROXY /* ECMA-262 v6, 26.2.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROXY_UL, - ECMA_BUILTIN_ID_PROXY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_PROXY_UL, ECMA_BUILTIN_ID_PROXY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_PROXY */ #if JERRY_BUILTIN_BIGINT /* ECMA-262 v11, 20.2.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_BIGINT_UL, - ECMA_BUILTIN_ID_BIGINT, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_BIGINT_UL, ECMA_BUILTIN_ID_BIGINT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_BIGINT */ /* Routine properties: diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.c b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.c index 984e9823..d727f026 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.c @@ -18,18 +18,16 @@ #if JERRY_ESNEXT #include "ecma-builtin-handlers.h" -#include "ecma-promise-object.h" #include "ecma-iterator-object.h" +#include "ecma-promise-object.h" -static const ecma_builtin_handler_t ecma_native_handlers[] = -{ +static const ecma_builtin_handler_t ecma_native_handlers[] = { #define ECMA_NATIVE_HANDLER(id, handler, length) handler, #include "ecma-builtin-handlers.inc.h" #undef ECMA_NATIVE_HANDLER }; -static const uint8_t ecma_native_handler_lengths[] = -{ +static const uint8_t ecma_native_handler_lengths[] = { #define ECMA_NATIVE_HANDLER(id, handler, length) length, #include "ecma-builtin-handlers.inc.h" #undef ECMA_NATIVE_HANDLER diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.h b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.h index de582adc..21e96311 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.h @@ -20,8 +20,8 @@ #if JERRY_ESNEXT -#include "ecma-helpers.h" #include "ecma-builtins.h" +#include "ecma-helpers.h" #include "ecma-promise-object.h" #include "ecma-proxy-object.h" @@ -46,10 +46,8 @@ typedef enum */ #define ECMA_NATIVE_HANDLER_COMMON_FLAGS_SHIFT 2 -ecma_builtin_handler_t -ecma_builtin_handler_get (ecma_native_handler_id_t id); -uint8_t -ecma_builtin_handler_get_length (ecma_native_handler_id_t id); +ecma_builtin_handler_t ecma_builtin_handler_get (ecma_native_handler_id_t id); +uint8_t ecma_builtin_handler_get_length (ecma_native_handler_id_t id); #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c index 36a96923..f9e697ff 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c @@ -21,6 +21,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-objects.h" + #include "lit-char-helpers.h" #if JERRY_BUILTIN_DATE @@ -35,16 +36,12 @@ /** * Day names */ -const char day_names_p[7][3] = -{ - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" -}; +const char day_names_p[7][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; /** * Month names */ -const char month_names_p[12][3] = -{ +const char month_names_p[12][3] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; @@ -79,15 +76,10 @@ ecma_date_day_from_year (int32_t year) /**< year value */ { if (JERRY_LIKELY (year >= 1970)) { - return (int32_t) (365 * (year - 1970) - + ((year - 1969) / 4) - - ((year - 1901) / 100) - + ((year - 1601) / 400)); + return (int32_t) (365 * (year - 1970) + ((year - 1969) / 4) - ((year - 1901) / 100) + ((year - 1601) / 400)); } - return (int32_t) (365 * (year - 1970) - + floor ((year - 1969) / 4.0) - - floor ((year - 1901) / 100.0) + return (int32_t) (365 * (year - 1970) + floor ((year - 1969) / 4.0) - floor ((year - 1901) / 100.0) + floor ((year - 1601) / 400.0)); } /* ecma_date_day_from_year */ @@ -102,8 +94,7 @@ ecma_date_day_from_year (int32_t year) /**< year value */ static int ecma_date_days_in_year (int32_t year) /**< year */ { - if (year % 4 != 0 - || (year % 100 == 0 && (year % 400 != 0))) + if (year % 4 != 0 || (year % 100 == 0 && (year % 400 != 0))) { return ECMA_DATE_DAYS_IN_YEAR; } @@ -129,16 +120,34 @@ ecma_date_in_leap_year (int32_t year) /**< time value */ /** * First days of months in normal and leap years */ -static const uint16_t first_day_in_month[2][12] = -{ - { - 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, /* normal year */ - } - , - { - 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 /* leap year */ - } -}; +static const uint16_t first_day_in_month[2][12] = { { + 0, + 31, + 59, + 90, + 120, + 151, + 181, + 212, + 243, + 273, + 304, + 334, /* normal year */ + }, + { + 0, + 31, + 60, + 91, + 121, + 152, + 182, + 213, + 244, + 274, + 305, + 335 /* leap year */ + } }; /** * Abstract operation: YearFromTime @@ -383,9 +392,7 @@ ecma_date_make_time (ecma_number_t hour, /**< hour value */ ecma_number_t sec, /**< second value */ ecma_number_t ms) /**< millisecond value */ { - if (!ecma_number_is_finite (hour) - || !ecma_number_is_finite (min) - || !ecma_number_is_finite (sec) + if (!ecma_number_is_finite (hour) || !ecma_number_is_finite (min) || !ecma_number_is_finite (sec) || !ecma_number_is_finite (ms)) { return ecma_number_make_nan (); @@ -396,10 +403,7 @@ ecma_date_make_time (ecma_number_t hour, /**< hour value */ ecma_number_t s = ecma_number_trunc (sec); ecma_number_t milli = ecma_number_trunc (ms); - return (ecma_number_t) ((h * ECMA_DATE_MS_PER_HOUR - + m * ECMA_DATE_MS_PER_MINUTE - + s * ECMA_DATE_MS_PER_SECOND - + milli)); + return h * ECMA_DATE_MS_PER_HOUR + m * ECMA_DATE_MS_PER_MINUTE + s * ECMA_DATE_MS_PER_SECOND + milli; } /* ecma_date_make_time */ /** @@ -416,9 +420,7 @@ ecma_date_make_day (ecma_number_t year, /**< year value */ ecma_number_t date) /**< date value */ { /* 1. */ - if (!ecma_number_is_finite (year) - || !ecma_number_is_finite (month) - || !ecma_number_is_finite (date) + if (!ecma_number_is_finite (year) || !ecma_number_is_finite (month) || !ecma_number_is_finite (date) || fabs (year) > INT32_MAX) { return ecma_number_make_nan (); @@ -441,9 +443,7 @@ ecma_date_make_day (ecma_number_t year, /**< year value */ } /* 7. */ - ecma_number_t days = (ecma_date_day_from_year (ym) - + first_day_in_month[ecma_date_in_leap_year (ym)][mn] - + (dt - 1)); + ecma_number_t days = (ecma_date_day_from_year (ym) + first_day_in_month[ecma_date_in_leap_year (ym)][mn] + (dt - 1)); return days * ECMA_DATE_MS_PER_DAY; } /* ecma_date_make_day */ @@ -459,8 +459,7 @@ ecma_number_t ecma_date_make_date (ecma_number_t day, /**< day value */ ecma_number_t time) /**< time value */ { - if (!ecma_number_is_finite (day) - || !ecma_number_is_finite (time)) + if (!ecma_number_is_finite (day) || !ecma_number_is_finite (time)) { return ecma_number_make_nan (); } @@ -479,8 +478,7 @@ ecma_date_make_date (ecma_number_t day, /**< day value */ ecma_number_t ecma_date_time_clip (ecma_number_t time) /**< time value */ { - if (!ecma_number_is_finite (time) - || fabs (time) > ECMA_DATE_MAX_VALUE) + if (!ecma_number_is_finite (time) || fabs (time) > ECMA_DATE_MAX_VALUE) { return ecma_number_make_nan (); } @@ -674,14 +672,13 @@ ecma_date_to_string_format (ecma_number_t datetime_number, /**< datetime */ buffer_p--; *buffer_p = (lit_utf8_byte_t) ((number % 10) + (int32_t) LIT_CHAR_0); number /= 10; - } - while (--number_length); + } while (--number_length); } JERRY_ASSERT (dest_p <= date_buffer + date_buffer_length); - return ecma_make_string_value (ecma_new_ecma_string_from_ascii (date_buffer, - (lit_utf8_size_t) (dest_p - date_buffer))); + return ecma_make_string_value ( + ecma_new_ecma_string_from_ascii (date_buffer, (lit_utf8_size_t) (dest_p - date_buffer))); } /* ecma_date_to_string_format */ /** diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-error.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-error.c index 74715b20..67f91c1f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-error.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-error.c @@ -14,14 +14,15 @@ */ #include "ecma-alloc.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" #include "ecma-objects.h" + #include "jrt.h" /** \addtogroup ecma ECMA @@ -43,8 +44,7 @@ ecma_builtin_helper_error_dispatch_call (jerry_error_t error_type, /**< native e { JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); - if (arguments_list_len != 0 - && !ecma_is_value_undefined (arguments_list_p[0])) + if (arguments_list_len != 0 && !ecma_is_value_undefined (arguments_list_p[0])) { ecma_string_t *message_string_p = ecma_op_to_string (arguments_list_p[0]); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-json.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-json.c index 2f1fa927..7b926c7a 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-json.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-json.c @@ -14,8 +14,9 @@ */ #include "ecma-alloc.h" -#include "ecma-helpers.h" #include "ecma-builtin-helpers.h" +#include "ecma-helpers.h" + #include "lit-char-helpers.h" #if JERRY_BUILTIN_JSON diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c index d00f202c..3edab6f2 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c @@ -19,14 +19,15 @@ #include "ecma-array-object.h" #include "ecma-builtins.h" #include "ecma-conversion.h" -#include "ecma-function-object.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-helpers.h" -#include "jmem.h" #include "ecma-objects.h" -#include "lit-magic-strings.h" + +#include "jmem.h" #include "lit-char-helpers.h" +#include "lit-magic-strings.h" /** \addtogroup ecma ECMA * @{ @@ -61,8 +62,7 @@ ecma_builtin_helper_object_to_string_tag_helper (ecma_value_t tag_value) /**< st lit_utf8_byte_t *buffer_ptr = str_buffer; - const lit_magic_string_id_t magic_string_ids[] = - { + const lit_magic_string_id_t magic_string_ids[] = { LIT_MAGIC_STRING_LEFT_SQUARE_CHAR, LIT_MAGIC_STRING_OBJECT, LIT_MAGIC_STRING_SPACE_CHAR, @@ -71,20 +71,23 @@ ecma_builtin_helper_object_to_string_tag_helper (ecma_value_t tag_value) /**< st /* Copy to buffer the "[object " string */ for (uint32_t i = 0; i < sizeof (magic_string_ids) / sizeof (lit_magic_string_id_t); ++i) { - buffer_ptr = lit_copy_magic_string_to_buffer (magic_string_ids[i], buffer_ptr, + buffer_ptr = lit_copy_magic_string_to_buffer (magic_string_ids[i], + buffer_ptr, (lit_utf8_size_t) ((str_buffer + buffer_size) - buffer_ptr)); JERRY_ASSERT (buffer_ptr <= str_buffer + buffer_size); } /* Copy to buffer the #@@toStringTag# string */ - buffer_ptr += ecma_string_copy_to_cesu8_buffer (tag_str_p, buffer_ptr, + buffer_ptr += ecma_string_copy_to_cesu8_buffer (tag_str_p, + buffer_ptr, (lit_utf8_size_t) ((str_buffer + buffer_size) - buffer_ptr)); JERRY_ASSERT (buffer_ptr <= str_buffer + buffer_size); /* Copy to buffer the "]" string */ - buffer_ptr = lit_copy_magic_string_to_buffer (LIT_MAGIC_STRING_RIGHT_SQUARE_CHAR, buffer_ptr, + buffer_ptr = lit_copy_magic_string_to_buffer (LIT_MAGIC_STRING_RIGHT_SQUARE_CHAR, + buffer_ptr, (lit_utf8_size_t) ((str_buffer + buffer_size) - buffer_ptr)); JERRY_ASSERT (buffer_ptr <= str_buffer + buffer_size); @@ -167,14 +170,10 @@ ecma_builtin_helper_object_to_string (const ecma_value_t this_arg) /**< this arg ecma_deref_object (obj_p); return ecma_builtin_helper_object_to_string_tag_helper (tag); } - else if (builtin_tag != LIT_MAGIC_STRING_ARGUMENTS_UL - && builtin_tag != LIT_MAGIC_STRING_FUNCTION_UL - && builtin_tag != LIT_MAGIC_STRING_ERROR_UL - && builtin_tag != LIT_MAGIC_STRING_BOOLEAN_UL - && builtin_tag != LIT_MAGIC_STRING_NUMBER_UL - && builtin_tag != LIT_MAGIC_STRING_STRING_UL - && builtin_tag != LIT_MAGIC_STRING_DATE_UL - && builtin_tag != LIT_MAGIC_STRING_REGEXP_UL + else if (builtin_tag != LIT_MAGIC_STRING_ARGUMENTS_UL && builtin_tag != LIT_MAGIC_STRING_FUNCTION_UL + && builtin_tag != LIT_MAGIC_STRING_ERROR_UL && builtin_tag != LIT_MAGIC_STRING_BOOLEAN_UL + && builtin_tag != LIT_MAGIC_STRING_NUMBER_UL && builtin_tag != LIT_MAGIC_STRING_STRING_UL + && builtin_tag != LIT_MAGIC_STRING_DATE_UL && builtin_tag != LIT_MAGIC_STRING_REGEXP_UL && builtin_tag != LIT_MAGIC_STRING_ARRAY_UL) { builtin_tag = LIT_MAGIC_STRING_OBJECT_UL; @@ -393,10 +392,8 @@ ecma_builtin_helper_array_concat_value (ecma_object_t *array_obj_p, /**< array * /* 5.b.iii.3.b */ /* This will always be a simple value since 'is_throw' is false, so no need to free. */ - ecma_value_t put_comp = ecma_builtin_helper_def_prop_by_index (array_obj_p, - *length_p + array_index, - get_value, - prop_flags); + ecma_value_t put_comp = + ecma_builtin_helper_def_prop_by_index (array_obj_p, *length_p + array_index, get_value, prop_flags); ecma_free_value (get_value); #if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (put_comp)) @@ -414,10 +411,7 @@ ecma_builtin_helper_array_concat_value (ecma_object_t *array_obj_p, /**< array * /* 5.c.i */ /* This will always be a simple value since 'is_throw' is false, so no need to free. */ - ecma_value_t put_comp = ecma_builtin_helper_def_prop_by_index (array_obj_p, - (*length_p)++, - value, - prop_flags); + ecma_value_t put_comp = ecma_builtin_helper_def_prop_by_index (array_obj_p, (*length_p)++, value, prop_flags); #if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (put_comp)) @@ -686,10 +680,8 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st { break; } - uint32_t index = ecma_builtin_helper_string_find_index (original_str_p, - search_str_p, - (uint32_t) start_ends_with); - ret_value = ecma_make_boolean_value (index == (uint32_t) start_ends_with); + uint32_t index = ecma_builtin_helper_string_find_index (original_str_p, search_str_p, (uint32_t) start_ends_with); + ret_value = ecma_make_boolean_value (index == (uint32_t) start_ends_with); break; } #endif /* JERRY_ESNEXT */ @@ -772,7 +764,7 @@ ecma_builtin_helper_string_find_index (ecma_string_t *original_str_p, /**< index while (!((size_t) (original_end_p - str_current_p) < search_str_size)) { - if (memcmp (str_current_p , search_str_utf8_p, search_str_size) == 0) + if (memcmp (str_current_p, search_str_utf8_p, search_str_size) == 0) { match_found = start_pos; break; @@ -804,10 +796,7 @@ ecma_builtin_helper_def_prop_by_index (ecma_object_t *obj_p, /**< object */ { if (JERRY_LIKELY (index <= ECMA_DIRECT_STRING_MAX_IMM)) { - return ecma_builtin_helper_def_prop (obj_p, - ECMA_CREATE_DIRECT_UINT32_STRING (index), - value, - opts); + return ecma_builtin_helper_def_prop (obj_p, ECMA_CREATE_DIRECT_UINT32_STRING (index), value, opts); } ecma_string_t *index_str_p = ecma_new_ecma_string_from_length (index); @@ -842,7 +831,7 @@ ecma_builtin_helper_calculate_index (ecma_value_t index, /**< relative index arg ecma_number_t relative_index; ecma_value_t conversion_result = ecma_op_to_integer (index, &relative_index); - /* 4. */ + /* 4. */ if (ECMA_IS_VALUE_ERROR (conversion_result)) { return ECMA_VALUE_ERROR; @@ -893,9 +882,7 @@ ecma_builtin_helper_def_prop (ecma_object_t *obj_p, /**< object */ prop_desc.value = value; - return ecma_op_object_define_own_property (obj_p, - name_p, - &prop_desc); + return ecma_op_object_define_own_property (obj_p, name_p, &prop_desc); } /* ecma_builtin_helper_def_prop */ /** @@ -909,16 +896,12 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con { JERRY_ASSERT (ctx_p->string_p != NULL); JERRY_ASSERT (ctx_p->matched_p == NULL - || (ctx_p->matched_p >= ctx_p->string_p - && ctx_p->matched_p <= ctx_p->string_p + ctx_p->string_size)); + || (ctx_p->matched_p >= ctx_p->string_p && ctx_p->matched_p <= ctx_p->string_p + ctx_p->string_size)); lit_utf8_size_t replace_size; uint8_t replace_flags = ECMA_STRING_FLAG_IS_ASCII; - const lit_utf8_byte_t *replace_buf_p = ecma_string_get_chars (ctx_p->replace_str_p, - &replace_size, - NULL, - NULL, - &replace_flags); + const lit_utf8_byte_t *replace_buf_p = + ecma_string_get_chars (ctx_p->replace_str_p, &replace_size, NULL, NULL, &replace_flags); const lit_utf8_byte_t *const replace_end_p = replace_buf_p + replace_size; const lit_utf8_byte_t *curr_p = replace_buf_p; @@ -1016,7 +999,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con uint8_t idx = (uint8_t) (c - LIT_CHAR_0); if (curr_p < replace_end_p && lit_char_is_decimal_digit (*(curr_p))) { - uint8_t two_digit_index = (uint8_t) (idx * 10 + (uint8_t) (*(curr_p) - LIT_CHAR_0)); + uint8_t two_digit_index = (uint8_t) (idx * 10 + (uint8_t) (*(curr_p) -LIT_CHAR_0)); if (two_digit_index < capture_count) { idx = two_digit_index; diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h index 08440fb4..1cf50c15 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h @@ -16,8 +16,8 @@ #ifndef ECMA_BUILTIN_HELPERS_H #define ECMA_BUILTIN_HELPERS_H -#include "ecma-globals.h" #include "ecma-exceptions.h" +#include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-regexp-object.h" @@ -41,45 +41,38 @@ typedef enum ECMA_STRING_ENDS_WITH /**< String.includes: ECMA-262 v6, 21.1.3.6 */ } ecma_string_index_of_mode_t; -ecma_value_t -ecma_builtin_helper_object_to_string (const ecma_value_t this_arg); -ecma_string_t * -ecma_builtin_helper_get_to_locale_string_at_index (ecma_object_t *obj_p, ecma_length_t index); -ecma_value_t -ecma_builtin_helper_array_concat_value (ecma_object_t *obj_p, ecma_length_t *length_p, ecma_value_t value); -ecma_value_t -ecma_builtin_helper_uint32_index_normalize (ecma_value_t arg, uint32_t length, uint32_t *number_p); +ecma_value_t ecma_builtin_helper_object_to_string (const ecma_value_t this_arg); +ecma_string_t *ecma_builtin_helper_get_to_locale_string_at_index (ecma_object_t *obj_p, ecma_length_t index); +ecma_value_t ecma_builtin_helper_array_concat_value (ecma_object_t *obj_p, ecma_length_t *length_p, ecma_value_t value); +ecma_value_t ecma_builtin_helper_uint32_index_normalize (ecma_value_t arg, uint32_t length, uint32_t *number_p); ecma_value_t ecma_builtin_helper_array_index_normalize (ecma_value_t arg, ecma_length_t length, ecma_length_t *number_p); -ecma_value_t -ecma_builtin_helper_string_index_normalize (ecma_number_t index, uint32_t length, bool nan_to_zero); -ecma_value_t -ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_str_p, ecma_value_t arg1, - ecma_value_t arg2, ecma_string_index_of_mode_t mode); +ecma_value_t ecma_builtin_helper_string_index_normalize (ecma_number_t index, uint32_t length, bool nan_to_zero); +ecma_value_t ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_str_p, + ecma_value_t arg1, + ecma_value_t arg2, + ecma_string_index_of_mode_t mode); uint32_t -ecma_builtin_helper_string_find_index (ecma_string_t *original_str_p, ecma_string_t *search_str_p, - uint32_t start_pos); +ecma_builtin_helper_string_find_index (ecma_string_t *original_str_p, ecma_string_t *search_str_p, uint32_t start_pos); ecma_value_t ecma_builtin_helper_def_prop (ecma_object_t *obj_p, ecma_string_t *name_p, ecma_value_t value, uint32_t opts); ecma_value_t -ecma_builtin_helper_def_prop_by_index (ecma_object_t *obj_p, ecma_length_t index, ecma_value_t value, - uint32_t opts); -ecma_value_t -ecma_builtin_helper_calculate_index (ecma_value_t index, ecma_length_t length, ecma_length_t *out_index); +ecma_builtin_helper_def_prop_by_index (ecma_object_t *obj_p, ecma_length_t index, ecma_value_t value, uint32_t opts); +ecma_value_t ecma_builtin_helper_calculate_index (ecma_value_t index, ecma_length_t length, ecma_length_t *out_index); /** * Context for replace substitutions */ typedef struct { - ecma_stringbuilder_t builder; /**< result string builder */ - const lit_utf8_byte_t *string_p; /**< source string */ - lit_utf8_size_t string_size; /**< source string size */ - const lit_utf8_byte_t *matched_p; /**< matched string */ - lit_utf8_size_t matched_size; /**< matcehd string size */ - lit_utf8_size_t match_byte_pos; /**< byte position of the match in the source string */ - uint16_t flags; /**< replace flags */ + ecma_stringbuilder_t builder; /**< result string builder */ + const lit_utf8_byte_t *string_p; /**< source string */ + lit_utf8_size_t string_size; /**< source string size */ + const lit_utf8_byte_t *matched_p; /**< matched string */ + lit_utf8_size_t matched_size; /**< matcehd string size */ + lit_utf8_size_t match_byte_pos; /**< byte position of the match in the source string */ + uint16_t flags; /**< replace flags */ /** * Capture results @@ -89,19 +82,17 @@ typedef struct #if JERRY_BUILTIN_REGEXP const ecma_regexp_capture_t *captures_p; /**< array of regexp capturing groups */ #endif /* JERRY_BUILTIN_REGEXP */ - const ecma_collection_t *collection_p; /**< collection of captured substrings */ + const ecma_collection_t *collection_p; /**< collection of captured substrings */ } u; - uint32_t capture_count; /**< number of captures in the capturing group array */ - ecma_string_t *replace_str_p; /**< replacement string */ + uint32_t capture_count; /**< number of captures in the capturing group array */ + ecma_string_t *replace_str_p; /**< replacement string */ } ecma_replace_context_t; -void -ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p); +void ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p); #if JERRY_ESNEXT -bool -ecma_builtin_is_regexp_exec (ecma_extended_object_t *obj_p); +bool ecma_builtin_is_regexp_exec (ecma_extended_object_t *obj_p); #endif /* JERRY_ESNEXT */ #if JERRY_BUILTIN_DATE @@ -114,35 +105,35 @@ ecma_builtin_is_regexp_exec (ecma_extended_object_t *obj_p); */ /** Hours in a day. */ -#define ECMA_DATE_HOURS_PER_DAY (24) +#define ECMA_DATE_HOURS_PER_DAY (24) /** Minutes in an hour. */ -#define ECMA_DATE_MINUTES_PER_HOUR (60) +#define ECMA_DATE_MINUTES_PER_HOUR (60) /** Seconds in a minute. */ -#define ECMA_DATE_SECONDS_PER_MINUTE (60) +#define ECMA_DATE_SECONDS_PER_MINUTE (60) /** Milliseconds in a second. */ -#define ECMA_DATE_MS_PER_SECOND (1000) +#define ECMA_DATE_MS_PER_SECOND (1000) /** ECMA_DATE_MS_PER_MINUTE == 60000 */ -#define ECMA_DATE_MS_PER_MINUTE (ECMA_DATE_MS_PER_SECOND * ECMA_DATE_SECONDS_PER_MINUTE) +#define ECMA_DATE_MS_PER_MINUTE (ECMA_DATE_MS_PER_SECOND * ECMA_DATE_SECONDS_PER_MINUTE) /** ECMA_DATE_MS_PER_HOUR == 3600000 */ -#define ECMA_DATE_MS_PER_HOUR (ECMA_DATE_MS_PER_MINUTE * ECMA_DATE_MINUTES_PER_HOUR) +#define ECMA_DATE_MS_PER_HOUR (ECMA_DATE_MS_PER_MINUTE * ECMA_DATE_MINUTES_PER_HOUR) /** ECMA_DATE_MS_PER_DAY == 86400000 */ -#define ECMA_DATE_MS_PER_DAY ((ECMA_DATE_MS_PER_HOUR * ECMA_DATE_HOURS_PER_DAY)) +#define ECMA_DATE_MS_PER_DAY ((ECMA_DATE_MS_PER_HOUR * ECMA_DATE_HOURS_PER_DAY)) -#define ECMA_DATE_DAYS_IN_YEAR (365) +#define ECMA_DATE_DAYS_IN_YEAR (365) -#define ECMA_DATE_DAYS_IN_LEAP_YEAR (366) +#define ECMA_DATE_DAYS_IN_LEAP_YEAR (366) /** * This gives a range of 8,640,000,000,000,000 milliseconds * to either side of 01 January, 1970 UTC. */ -#define ECMA_DATE_MAX_VALUE 8.64e15 +#define ECMA_DATE_MAX_VALUE 8.64e15 /** * Timezone type. @@ -219,21 +210,20 @@ typedef struct ecma_stringbuilder_t result_builder; } ecma_json_stringify_context_t; -ecma_value_t ecma_builtin_json_parse_buffer (const lit_utf8_byte_t * str_start_p, - lit_utf8_size_t string_size); +ecma_value_t ecma_builtin_json_parse_buffer (const lit_utf8_byte_t *str_start_p, lit_utf8_size_t string_size); ecma_value_t ecma_builtin_json_stringify_no_opts (const ecma_value_t value); bool ecma_json_has_object_in_stack (ecma_json_occurrence_stack_item_t *stack_p, ecma_object_t *object_p); -ecma_value_t -ecma_builtin_helper_json_create_non_formatted_json (lit_utf8_byte_t left_bracket, lit_utf8_byte_t right_bracket, - ecma_collection_t *partial_p); +ecma_value_t ecma_builtin_helper_json_create_non_formatted_json (lit_utf8_byte_t left_bracket, + lit_utf8_byte_t right_bracket, + ecma_collection_t *partial_p); #endif /* JERRY_BUILTIN_JSON */ /* ecma-builtin-helper-error.c */ -ecma_value_t -ecma_builtin_helper_error_dispatch_call (jerry_error_t error_type, const ecma_value_t *arguments_list_p, - uint32_t arguments_list_len); +ecma_value_t ecma_builtin_helper_error_dispatch_call (jerry_error_t error_type, + const ecma_value_t *arguments_list_p, + uint32_t arguments_list_len); /* ecma-builtin-helpers-sort.c */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h index 28bea6fc..be175c23 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h @@ -14,41 +14,38 @@ */ #ifndef BUILTIN_UNDERSCORED_ID -# error "Please, define BUILTIN_UNDERSCORED_ID" +#error "Please, define BUILTIN_UNDERSCORED_ID" #endif /* !BUILTIN_UNDERSCORED_ID */ #ifndef BUILTIN_INC_HEADER_NAME -# error "Please, define BUILTIN_INC_HEADER_NAME" +#error "Please, define BUILTIN_INC_HEADER_NAME" #endif /* !BUILTIN_INC_HEADER_NAME */ #include "ecma-objects.h" -#define PASTE__(x, y) x ## y -#define PASTE_(x, y) PASTE__ (x, y) -#define PASTE(x, y) PASTE_ (x, y) +#define PASTE__(x, y) x##y +#define PASTE_(x, y) PASTE__ (x, y) +#define PASTE(x, y) PASTE_ (x, y) -#define PROPERTY_DESCRIPTOR_LIST_NAME \ - PASTE (PASTE (ecma_builtin_, BUILTIN_UNDERSCORED_ID), _property_descriptor_list) -#define DISPATCH_ROUTINE_ROUTINE_NAME \ - PASTE (PASTE (ecma_builtin_, BUILTIN_UNDERSCORED_ID), _dispatch_routine) +#define PROPERTY_DESCRIPTOR_LIST_NAME PASTE (PASTE (ecma_builtin_, BUILTIN_UNDERSCORED_ID), _property_descriptor_list) +#define DISPATCH_ROUTINE_ROUTINE_NAME PASTE (PASTE (ecma_builtin_, BUILTIN_UNDERSCORED_ID), _dispatch_routine) #ifndef BUILTIN_CUSTOM_DISPATCH -#define ROUTINE_ARG(n) , ecma_value_t arg ## n -#define ROUTINE_ARG_LIST_0 ecma_value_t this_arg -#define ROUTINE_ARG_LIST_1 ROUTINE_ARG_LIST_0 ROUTINE_ARG(1) -#define ROUTINE_ARG_LIST_2 ROUTINE_ARG_LIST_1 ROUTINE_ARG(2) -#define ROUTINE_ARG_LIST_3 ROUTINE_ARG_LIST_2 ROUTINE_ARG(3) -#define ROUTINE_ARG_LIST_NON_FIXED ROUTINE_ARG_LIST_0, \ - const ecma_value_t *arguments_list_p, uint32_t arguments_list_len +#define ROUTINE_ARG(n) , ecma_value_t arg##n +#define ROUTINE_ARG_LIST_0 ecma_value_t this_arg +#define ROUTINE_ARG_LIST_1 ROUTINE_ARG_LIST_0 ROUTINE_ARG (1) +#define ROUTINE_ARG_LIST_2 ROUTINE_ARG_LIST_1 ROUTINE_ARG (2) +#define ROUTINE_ARG_LIST_3 ROUTINE_ARG_LIST_2 ROUTINE_ARG (3) +#define ROUTINE_ARG_LIST_NON_FIXED ROUTINE_ARG_LIST_0, const ecma_value_t *arguments_list_p, uint32_t arguments_list_len #define ROUTINE(name, c_function_name, args_number, length_prop_value) \ - static ecma_value_t c_function_name (ROUTINE_ARG_LIST_ ## args_number); + static ecma_value_t c_function_name (ROUTINE_ARG_LIST_##args_number); #define ROUTINE_CONFIGURABLE_ONLY(name, c_function_name, args_number, length_prop_value) \ - static ecma_value_t c_function_name (ROUTINE_ARG_LIST_ ## args_number); + static ecma_value_t c_function_name (ROUTINE_ARG_LIST_##args_number); #define ROUTINE_WITH_FLAGS(name, c_function_name, args_number, length_prop_value, flags) \ - static ecma_value_t c_function_name (ROUTINE_ARG_LIST_ ## args_number); + static ecma_value_t c_function_name (ROUTINE_ARG_LIST_##args_number); #define ACCESSOR_READ_WRITE(name, c_getter_func_name, c_setter_func_name, prop_attributes) \ - static ecma_value_t c_getter_func_name (ROUTINE_ARG_LIST_0); \ + static ecma_value_t c_getter_func_name (ROUTINE_ARG_LIST_0); \ static ecma_value_t c_setter_func_name (ROUTINE_ARG_LIST_1); #define ACCESSOR_READ_ONLY(name, c_getter_func_name, prop_attributes) \ static ecma_value_t c_getter_func_name (ROUTINE_ARG_LIST_0); @@ -66,17 +63,14 @@ enum { PASTE (ECMA_ROUTINE_START_, BUILTIN_UNDERSCORED_ID) = 0, -#define ROUTINE(name, c_function_name, args_number, length_prop_value) \ - ECMA_ROUTINE_ ## name ## c_function_name, +#define ROUTINE(name, c_function_name, args_number, length_prop_value) ECMA_ROUTINE_##name##c_function_name, #define ROUTINE_CONFIGURABLE_ONLY(name, c_function_name, args_number, length_prop_value) \ - ECMA_ROUTINE_ ## name ## c_function_name, + ECMA_ROUTINE_##name##c_function_name, #define ROUTINE_WITH_FLAGS(name, c_function_name, args_number, length_prop_value, flags) \ - ECMA_ROUTINE_ ## name ## c_function_name, + ECMA_ROUTINE_##name##c_function_name, #define ACCESSOR_READ_WRITE(name, c_getter_func_name, c_setter_func_name, prop_attributes) \ - ECMA_ACCESSOR_ ## name ## c_getter_func_name, \ - ECMA_ACCESSOR_ ## name ## c_setter_func_name, -#define ACCESSOR_READ_ONLY(name, c_getter_func_name, prop_attributes) \ - ECMA_ACCESSOR_ ## name ## c_getter_func_name, + ECMA_ACCESSOR_##name##c_getter_func_name, ECMA_ACCESSOR_##name##c_setter_func_name, +#define ACCESSOR_READ_ONLY(name, c_getter_func_name, prop_attributes) ECMA_ACCESSOR_##name##c_getter_func_name, #include BUILTIN_INC_HEADER_NAME }; @@ -85,140 +79,80 @@ enum /** * Built-in property list of the built-in object. */ -const ecma_builtin_property_descriptor_t PROPERTY_DESCRIPTOR_LIST_NAME[] = -{ +const ecma_builtin_property_descriptor_t PROPERTY_DESCRIPTOR_LIST_NAME[] = { #ifndef BUILTIN_CUSTOM_DISPATCH #define ROUTINE(name, c_function_name, args_number, length_prop_value) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ROUTINE, \ - ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE, \ - ECMA_ROUTINE_VALUE (ECMA_ROUTINE_ ## name ## c_function_name, length_prop_value) \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ROUTINE, \ + ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE, \ + ECMA_ROUTINE_VALUE (ECMA_ROUTINE_##name##c_function_name, length_prop_value) }, #define ROUTINE_CONFIGURABLE_ONLY(name, c_function_name, args_number, length_prop_value) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ROUTINE, \ - ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, \ - ECMA_ROUTINE_VALUE (ECMA_ROUTINE_ ## name ## c_function_name, length_prop_value) \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ROUTINE, \ + ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, \ + ECMA_ROUTINE_VALUE (ECMA_ROUTINE_##name##c_function_name, length_prop_value) }, #define ROUTINE_WITH_FLAGS(name, c_function_name, args_number, length_prop_value, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ROUTINE, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - ECMA_ROUTINE_VALUE (ECMA_ROUTINE_ ## name ## c_function_name, length_prop_value) \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ROUTINE, \ + (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ + ECMA_ROUTINE_VALUE (ECMA_ROUTINE_##name##c_function_name, length_prop_value) }, #define ACCESSOR_READ_ONLY(name, c_getter_func_name, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_ONLY, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - ECMA_ACCESSOR_ ## name ## c_getter_func_name \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_ONLY, \ + (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ + ECMA_ACCESSOR_##name##c_getter_func_name }, #define ACCESSOR_READ_WRITE(name, c_getter_func_name, c_setter_func_name, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_WRITE, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - ECMA_ACCESSOR_READ_WRITE (ECMA_ACCESSOR_ ## name ## c_getter_func_name, \ - ECMA_ACCESSOR_ ## name ## c_setter_func_name) \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_WRITE, \ + (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ + ECMA_ACCESSOR_READ_WRITE (ECMA_ACCESSOR_##name##c_getter_func_name, ECMA_ACCESSOR_##name##c_setter_func_name) }, #else /* BUILTIN_CUSTOM_DISPATCH */ #define ROUTINE(name, c_function_name, args_number, length_prop_value) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ROUTINE, \ - ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE, \ - ECMA_ROUTINE_VALUE (c_function_name, length_prop_value) \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ROUTINE, \ + ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE, \ + ECMA_ROUTINE_VALUE (c_function_name, length_prop_value) }, #define ROUTINE_CONFIGURABLE_ONLY(name, c_function_name, args_number, length_prop_value) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ROUTINE, \ - ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, \ - ECMA_ROUTINE_VALUE (c_function_name, length_prop_value) \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ROUTINE, \ + ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, \ + ECMA_ROUTINE_VALUE (c_function_name, length_prop_value) }, #define ROUTINE_WITH_FLAGS(name, c_function_name, args_number, length_prop_value, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ROUTINE, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - ECMA_ROUTINE_VALUE (c_function_name, length_prop_value) \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ROUTINE, \ + (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ + ECMA_ROUTINE_VALUE (c_function_name, length_prop_value) }, #define ACCESSOR_READ_ONLY(name, c_getter_func_name, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_ONLY, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - c_getter_func_name \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_ONLY, \ + (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ + c_getter_func_name }, #define ACCESSOR_READ_WRITE(name, c_getter_func_name, c_setter_func_name, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_WRITE, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - ECMA_ACCESSOR_READ_WRITE (c_getter_func_name, c_setter_func_name) \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_WRITE, \ + (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ + ECMA_ACCESSOR_READ_WRITE (c_getter_func_name, c_setter_func_name) }, #endif /* !BUILTIN_CUSTOM_DISPATCH */ #define OBJECT_VALUE(name, obj_builtin_id, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_OBJECT, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - obj_builtin_id \ - }, + { name, ECMA_BUILTIN_PROPERTY_OBJECT, (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, obj_builtin_id }, #define SIMPLE_VALUE(name, simple_value, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_SIMPLE, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - simple_value \ - }, + { name, ECMA_BUILTIN_PROPERTY_SIMPLE, (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, simple_value }, #define NUMBER_VALUE(name, number_value, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_NUMBER, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - number_value \ - }, + { name, ECMA_BUILTIN_PROPERTY_NUMBER, (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, number_value }, #define STRING_VALUE(name, magic_string_id, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_STRING, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - magic_string_id \ - }, + { name, ECMA_BUILTIN_PROPERTY_STRING, (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, magic_string_id }, #if JERRY_ESNEXT -#define SYMBOL_VALUE(name, symbol) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_SYMBOL, \ - ECMA_PROPERTY_BUILT_IN_FIXED, \ - symbol \ - }, +#define SYMBOL_VALUE(name, symbol) { name, ECMA_BUILTIN_PROPERTY_SYMBOL, ECMA_PROPERTY_BUILT_IN_FIXED, symbol }, #define INTRINSIC_PROPERTY(name, magic_string_id, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_INTRINSIC_PROPERTY, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - magic_string_id \ - }, + { name, ECMA_BUILTIN_PROPERTY_INTRINSIC_PROPERTY, (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, magic_string_id }, #define ACCESSOR_BUILTIN_FUNCTION(name, getter_builtin_id, setter_builtin_id, prop_attributes) \ - { \ - name, \ - ECMA_BUILTIN_PROPERTY_ACCESSOR_BUILTIN_FUNCTION, \ - (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ - ECMA_ACCESSOR_READ_WRITE (getter_builtin_id, setter_builtin_id) \ - }, + { name, \ + ECMA_BUILTIN_PROPERTY_ACCESSOR_BUILTIN_FUNCTION, \ + (prop_attributes) | ECMA_PROPERTY_FLAG_BUILT_IN, \ + ECMA_ACCESSOR_READ_WRITE (getter_builtin_id, setter_builtin_id) }, #endif /* JERRY_ESNEXT */ #include BUILTIN_INC_HEADER_NAME - { - LIT_MAGIC_STRING__COUNT, - ECMA_BUILTIN_PROPERTY_END, - 0, - 0 - } + { LIT_MAGIC_STRING__COUNT, ECMA_BUILTIN_PROPERTY_END, 0, 0 } }; #ifndef BUILTIN_CUSTOM_DISPATCH @@ -248,39 +182,39 @@ DISPATCH_ROUTINE_ROUTINE_NAME (uint8_t builtin_routine_id, /**< built-in wide ro { #define ROUTINE_ARG(n) (arguments_list[n - 1]) #define ROUTINE_ARG_LIST_0 -#define ROUTINE_ARG_LIST_1 , ROUTINE_ARG(1) -#define ROUTINE_ARG_LIST_2 ROUTINE_ARG_LIST_1, ROUTINE_ARG(2) -#define ROUTINE_ARG_LIST_3 ROUTINE_ARG_LIST_2, ROUTINE_ARG(3) +#define ROUTINE_ARG_LIST_1 , ROUTINE_ARG (1) +#define ROUTINE_ARG_LIST_2 ROUTINE_ARG_LIST_1, ROUTINE_ARG (2) +#define ROUTINE_ARG_LIST_3 ROUTINE_ARG_LIST_2, ROUTINE_ARG (3) #define ROUTINE_ARG_LIST_NON_FIXED , arguments_list, arguments_number -#define ROUTINE(name, c_function_name, args_number, length_prop_value) \ - case ECMA_ROUTINE_ ## name ## c_function_name: \ - { \ - return c_function_name (this_arg_value ROUTINE_ARG_LIST_ ## args_number); \ - } +#define ROUTINE(name, c_function_name, args_number, length_prop_value) \ + case ECMA_ROUTINE_##name##c_function_name: \ + { \ + return c_function_name (this_arg_value ROUTINE_ARG_LIST_##args_number); \ + } #define ROUTINE_CONFIGURABLE_ONLY(name, c_function_name, args_number, length_prop_value) \ - case ECMA_ROUTINE_ ## name ## c_function_name: \ - { \ - return c_function_name (this_arg_value ROUTINE_ARG_LIST_ ## args_number); \ - } + case ECMA_ROUTINE_##name##c_function_name: \ + { \ + return c_function_name (this_arg_value ROUTINE_ARG_LIST_##args_number); \ + } #define ROUTINE_WITH_FLAGS(name, c_function_name, args_number, length_prop_value, flags) \ - case ECMA_ROUTINE_ ## name ## c_function_name: \ - { \ - return c_function_name (this_arg_value ROUTINE_ARG_LIST_ ## args_number); \ - } + case ECMA_ROUTINE_##name##c_function_name: \ + { \ + return c_function_name (this_arg_value ROUTINE_ARG_LIST_##args_number); \ + } #define ACCESSOR_READ_WRITE(name, c_getter_func_name, c_setter_func_name, prop_attributes) \ - case ECMA_ACCESSOR_ ## name ## c_getter_func_name: \ - { \ - return c_getter_func_name(this_arg_value); \ - } \ - case ECMA_ACCESSOR_ ## name ## c_setter_func_name: \ - { \ - return c_setter_func_name(this_arg_value ROUTINE_ARG_LIST_1); \ - } + case ECMA_ACCESSOR_##name##c_getter_func_name: \ + { \ + return c_getter_func_name (this_arg_value); \ + } \ + case ECMA_ACCESSOR_##name##c_setter_func_name: \ + { \ + return c_setter_func_name (this_arg_value ROUTINE_ARG_LIST_1); \ + } #define ACCESSOR_READ_ONLY(name, c_getter_func_name, prop_attributes) \ - case ECMA_ACCESSOR_ ## name ## c_getter_func_name: \ - { \ - return c_getter_func_name(this_arg_value); \ - } + case ECMA_ACCESSOR_##name##c_getter_func_name: \ + { \ + return c_getter_func_name (this_arg_value); \ + } #include BUILTIN_INC_HEADER_NAME #undef ROUTINE_ARG #undef ROUTINE_ARG_LIST_0 diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c index 1dc65d63..fc11a6be 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c @@ -13,15 +13,16 @@ * limitations under the License. */ -#include "ecma-builtins.h" -#include "ecma-builtin-helpers.h" -#include "ecma-container-object.h" #include "ecma-array-object.h" #include "ecma-arraybuffer-object.h" -#include "ecma-typedarray-object.h" -#include "ecma-string-object.h" +#include "ecma-builtin-helpers.h" +#include "ecma-builtins.h" +#include "ecma-container-object.h" #include "ecma-gc.h" #include "ecma-helpers.h" +#include "ecma-string-object.h" +#include "ecma-typedarray-object.h" + #include "lit-char-helpers.h" #if JERRY_ESNEXT @@ -53,7 +54,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-intrinsic.inc.h" -#define BUILTIN_UNDERSCORED_ID intrinsic +#define BUILTIN_UNDERSCORED_ID intrinsic #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -214,8 +215,8 @@ ecma_builtin_intrinsic_dispatch_routine (uint8_t builtin_routine_id, /**< built- ecma_number_t *date_value_p = &((ecma_date_object_t *) ecma_get_object_from_value (this_arg))->date_value; #else /* !JERRY_ESNEXT */ ecma_extended_object_t *arg_ext_object_p = (ecma_extended_object_t *) ecma_get_object_from_value (argument); - ecma_number_t *date_value_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t, - arg_ext_object_p->u.class_prop.u.date); + ecma_number_t *date_value_p = + ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t, arg_ext_object_p->u.class_prop.u.date); #endif /* JERRY_ESNEXT */ if (ecma_number_is_nan (*date_value_p)) @@ -263,12 +264,10 @@ ecma_builtin_intrinsic_dispatch_routine (uint8_t builtin_routine_id, /**< built- ecma_value_t result = ecma_make_string_value (ret_str_p); ecma_deref_ecma_string (to_str_p); return result; - } default: { - JERRY_ASSERT (builtin_routine_id == ECMA_INTRINSIC_PARSE_INT - || builtin_routine_id == ECMA_INTRINSIC_PARSE_FLOAT); + JERRY_ASSERT (builtin_routine_id == ECMA_INTRINSIC_PARSE_INT || builtin_routine_id == ECMA_INTRINSIC_PARSE_FLOAT); ecma_string_t *str_p = ecma_op_to_string (arguments_list_p[0]); @@ -282,15 +281,12 @@ ecma_builtin_intrinsic_dispatch_routine (uint8_t builtin_routine_id, /**< built- if (builtin_routine_id == ECMA_INTRINSIC_PARSE_INT) { - result = ecma_number_parse_int (string_buff, - string_buff_size, - arguments_list_p[1]); + result = ecma_number_parse_int (string_buff, string_buff_size, arguments_list_p[1]); } else { JERRY_ASSERT (builtin_routine_id == ECMA_INTRINSIC_PARSE_FLOAT); - result = ecma_number_parse_float (string_buff, - string_buff_size); + result = ecma_number_parse_float (string_buff, string_buff_size); } ECMA_FINALIZE_UTF8_STRING (string_buff, string_buff_size); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c index 19ead319..1bcc9166 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c @@ -37,7 +37,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-iterator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID iterator_prototype +#define BUILTIN_UNDERSCORED_ID iterator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-json.c b/jerry-core/ecma/builtin-objects/ecma-builtin-json.c index ba71461a..ef2a7dbd 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-json.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-json.c @@ -15,6 +15,7 @@ #include "ecma-alloc.h" #include "ecma-array-object.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" @@ -22,11 +23,11 @@ #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" -#include "ecma-objects.h" #include "ecma-objects-general.h" -#include "jrt.h" +#include "ecma-objects.h" + #include "jrt-libc-includes.h" +#include "jrt.h" #include "lit-char-helpers.h" #include "lit-globals.h" @@ -51,7 +52,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-json.inc.h" -#define BUILTIN_UNDERSCORED_ID json +#define BUILTIN_UNDERSCORED_ID json #include "ecma-builtin-internal-routines-template.inc.h" /** @@ -134,9 +135,7 @@ ecma_builtin_json_parse_string (ecma_json_token_t *token_p) /**< token argument if (*current_p == LIT_CHAR_BACKSLASH) { - ecma_stringbuilder_append_raw (&result_builder, - unappended_p, - (lit_utf8_size_t) (current_p - unappended_p)); + ecma_stringbuilder_append_raw (&result_builder, unappended_p, (lit_utf8_size_t) (current_p - unappended_p)); current_p++; @@ -212,9 +211,7 @@ ecma_builtin_json_parse_string (ecma_json_token_t *token_p) /**< token argument current_p++; } - ecma_stringbuilder_append_raw (&result_builder, - unappended_p, - (lit_utf8_size_t) (current_p - unappended_p)); + ecma_stringbuilder_append_raw (&result_builder, unappended_p, (lit_utf8_size_t) (current_p - unappended_p)); token_p->u.string_p = ecma_stringbuilder_finalize (&result_builder); token_p->current_p = current_p + 1; token_p->type = TOKEN_STRING; @@ -260,8 +257,7 @@ ecma_builtin_json_parse_number (ecma_json_token_t *token_p) /**< token argument do { current_p++; - } - while (current_p < end_p && lit_char_is_decimal_digit (*current_p)); + } while (current_p < end_p && lit_char_is_decimal_digit (*current_p)); } if (current_p < end_p && *current_p == LIT_CHAR_DOT) @@ -276,8 +272,7 @@ ecma_builtin_json_parse_number (ecma_json_token_t *token_p) /**< token argument do { current_p++; - } - while (current_p < end_p && lit_char_is_decimal_digit (*current_p)); + } while (current_p < end_p && lit_char_is_decimal_digit (*current_p)); } if (current_p < end_p && (*current_p == LIT_CHAR_LOWERCASE_E || *current_p == LIT_CHAR_UPPERCASE_E)) @@ -297,8 +292,7 @@ ecma_builtin_json_parse_number (ecma_json_token_t *token_p) /**< token argument do { current_p++; - } - while (current_p < end_p && lit_char_is_decimal_digit (*current_p)); + } while (current_p < end_p && lit_char_is_decimal_digit (*current_p)); } token_p->type = TOKEN_NUMBER; @@ -322,9 +316,7 @@ ecma_builtin_json_parse_next_token (ecma_json_token_t *token_p, /**< token argum token_p->type = TOKEN_INVALID; while (current_p < end_p - && (*current_p == LIT_CHAR_SP - || *current_p == LIT_CHAR_CR - || *current_p == LIT_CHAR_LF + && (*current_p == LIT_CHAR_SP || *current_p == LIT_CHAR_CR || *current_p == LIT_CHAR_LF || *current_p == LIT_CHAR_TAB)) { current_p++; @@ -388,9 +380,7 @@ ecma_builtin_json_parse_next_token (ecma_json_token_t *token_p, /**< token argum lit_utf8_size_t size = lit_get_magic_string_size (LIT_MAGIC_STRING_NULL); if (current_p + size <= end_p) { - if (!memcmp (lit_get_magic_string_utf8 (LIT_MAGIC_STRING_NULL), - current_p, - size)) + if (!memcmp (lit_get_magic_string_utf8 (LIT_MAGIC_STRING_NULL), current_p, size)) { token_p->type = TOKEN_NULL; token_p->current_p = current_p + size; @@ -404,9 +394,7 @@ ecma_builtin_json_parse_next_token (ecma_json_token_t *token_p, /**< token argum lit_utf8_size_t size = lit_get_magic_string_size (LIT_MAGIC_STRING_TRUE); if (current_p + size <= end_p) { - if (!memcmp (lit_get_magic_string_utf8 (LIT_MAGIC_STRING_TRUE), - current_p, - size)) + if (!memcmp (lit_get_magic_string_utf8 (LIT_MAGIC_STRING_TRUE), current_p, size)) { token_p->type = TOKEN_TRUE; token_p->current_p = current_p + size; @@ -420,9 +408,7 @@ ecma_builtin_json_parse_next_token (ecma_json_token_t *token_p, /**< token argum lit_utf8_size_t size = lit_get_magic_string_size (LIT_MAGIC_STRING_FALSE); if (current_p + size <= end_p) { - if (!memcmp (lit_get_magic_string_utf8 (LIT_MAGIC_STRING_FALSE), - current_p, - size)) + if (!memcmp (lit_get_magic_string_utf8 (LIT_MAGIC_STRING_FALSE), current_p, size)) { token_p->type = TOKEN_FALSE; token_p->current_p = current_p + size; @@ -454,10 +440,8 @@ ecma_builtin_json_define_value_property (ecma_object_t *obj_p, /**< this object ecma_string_t *property_name_p, /**< property name */ ecma_value_t value) /**< value */ { - ecma_value_t completion_value = ecma_builtin_helper_def_prop (obj_p, - property_name_p, - value, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); + ecma_value_t completion_value = + ecma_builtin_helper_def_prop (obj_p, property_name_p, value, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); JERRY_ASSERT (ecma_is_value_boolean (completion_value)); } /* ecma_builtin_json_define_value_property */ @@ -612,10 +596,9 @@ ecma_builtin_json_parse_value (ecma_json_token_t *token_p) /**< token argument * } } /* ecma_builtin_json_parse_value */ -static ecma_value_t -ecma_builtin_json_internalize_process_property (ecma_object_t *reviver_p, - ecma_object_t *object_p, - ecma_string_t *prop_name); +static ecma_value_t ecma_builtin_json_internalize_process_property (ecma_object_t *reviver_p, + ecma_object_t *object_p, + ecma_string_t *prop_name); /** * Abstract operation InternalizeJSONProperty @@ -698,8 +681,8 @@ ecma_builtin_json_internalize_property (ecma_object_t *reviver_p, /**< reviver f /* 3.d */ else { - ecma_collection_t *props_p = ecma_op_object_get_enumerable_property_names (object_p, - ECMA_ENUMERABLE_PROPERTY_KEYS); + ecma_collection_t *props_p = + ecma_op_object_get_enumerable_property_names (object_p, ECMA_ENUMERABLE_PROPERTY_KEYS); #if JERRY_ESNEXT if (JERRY_UNLIKELY (props_p == NULL)) { @@ -737,10 +720,7 @@ ecma_builtin_json_internalize_property (ecma_object_t *reviver_p, /**< reviver f arguments_list[1] = value; /* 4. */ - ecma_value_t ret_value = ecma_op_function_call (reviver_p, - ecma_make_object_value (holder_p), - arguments_list, - 2); + ecma_value_t ret_value = ecma_op_function_call (reviver_p, ecma_make_object_value (holder_p), arguments_list, 2); ecma_free_value (value); return ret_value; } /* ecma_builtin_json_internalize_property */ @@ -755,10 +735,10 @@ ecma_builtin_json_internalize_property (ecma_object_t *reviver_p, /**< reviver f * @return ECMA_VALUE_TRUE - if no error occurred. * error if one of the operation failed. */ -static -ecma_value_t ecma_builtin_json_internalize_process_property (ecma_object_t *reviver_p, /**< reviver function */ - ecma_object_t *object_p, /**< holder object */ - ecma_string_t *prop_name) /**< property name */ +static ecma_value_t +ecma_builtin_json_internalize_process_property (ecma_object_t *reviver_p, /**< reviver function */ + ecma_object_t *object_p, /**< holder object */ + ecma_string_t *prop_name) /**< property name */ { /* ES11: 2.b.iii.1 / 2.c.ii.1 */ ecma_value_t new_element = ecma_builtin_json_internalize_property (reviver_p, object_p, prop_name); @@ -786,10 +766,8 @@ ecma_value_t ecma_builtin_json_internalize_process_property (ecma_object_t *revi else { /* ES11: 2.b.iii.3.a / 2.c.ii.3.a */ - ecma_value_t def_value = ecma_builtin_helper_def_prop (object_p, - prop_name, - new_element, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); + ecma_value_t def_value = + ecma_builtin_helper_def_prop (object_p, prop_name, new_element, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); ecma_free_value (new_element); #if JERRY_ESNEXT @@ -812,7 +790,7 @@ ecma_value_t ecma_builtin_json_internalize_process_property (ecma_object_t *revi * Returned value must be freed with ecma_free_value. */ ecma_value_t -ecma_builtin_json_parse_buffer (const lit_utf8_byte_t * str_start_p, /**< String to parse */ +ecma_builtin_json_parse_buffer (const lit_utf8_byte_t *str_start_p, /**< String to parse */ lit_utf8_size_t string_size) /**< size of the string */ { ecma_json_token_t token; @@ -834,7 +812,7 @@ ecma_builtin_json_parse_buffer (const lit_utf8_byte_t * str_start_p, /**< String } return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid JSON format")); -} /*ecma_builtin_json_parse_buffer*/ +} /* ecma_builtin_json_parse_buffer */ /** * The JSON object's 'parse' routine @@ -939,9 +917,9 @@ ecma_builtin_json_quote (ecma_stringbuilder_t *builder_p, /**< builder for the r else if (c < LIT_CHAR_SP || should_escape) { /** - * In ES10 we should escape high or low surrogate characters, - * so we shouldn't append the unescaped character to the stringbuilder - */ + * In ES10 we should escape high or low surrogate characters, + * so we shouldn't append the unescaped character to the stringbuilder + */ uint8_t offset = should_escape ? LIT_UTF8_MAX_BYTES_IN_CODE_UNIT : 1; ecma_stringbuilder_append_raw (builder_p, @@ -986,18 +964,15 @@ ecma_builtin_json_quote (ecma_stringbuilder_t *builder_p, /**< builder for the r } } - ecma_stringbuilder_append_raw (builder_p, - regular_str_start_p, - (lit_utf8_size_t) (str_end_p - regular_str_start_p)); + ecma_stringbuilder_append_raw (builder_p, regular_str_start_p, (lit_utf8_size_t) (str_end_p - regular_str_start_p)); ecma_stringbuilder_append_byte (builder_p, LIT_CHAR_DOUBLE_QUOTE); ECMA_FINALIZE_UTF8_STRING (string_buff, string_buff_size); } /* ecma_builtin_json_quote */ -static ecma_value_t -ecma_builtin_json_serialize_property (ecma_json_stringify_context_t *context_p, - ecma_object_t *holder_p, - ecma_string_t *key_p); +static ecma_value_t ecma_builtin_json_serialize_property (ecma_json_stringify_context_t *context_p, + ecma_object_t *holder_p, + ecma_string_t *key_p); /** * Abstract operation 'SerializeJSONObject' defined in 24.3.2.3 @@ -1272,9 +1247,8 @@ ecma_builtin_json_serialize_property (ecma_json_stringify_context_t *context_p, } ecma_object_t *value_obj_p = ecma_get_object_from_value (to_object_value); - ecma_value_t to_json = ecma_op_object_get_with_receiver (value_obj_p, - ecma_get_magic_string (LIT_MAGIC_STRING_TO_JSON_UL), - value); + ecma_value_t to_json = + ecma_op_object_get_with_receiver (value_obj_p, ecma_get_magic_string (LIT_MAGIC_STRING_TO_JSON_UL), value); ecma_deref_object (value_obj_p); @@ -1487,16 +1461,15 @@ ecma_builtin_json_serialize_property (ecma_json_stringify_context_t *context_p, * Returned value must be freed with ecma_free_value. * */ -static ecma_value_t ecma_builtin_json_str_helper (ecma_json_stringify_context_t *context_p, /**< context argument */ - const ecma_value_t arg1) /**< object argument */ +static ecma_value_t +ecma_builtin_json_str_helper (ecma_json_stringify_context_t *context_p, /**< context argument */ + const ecma_value_t arg1) /**< object argument */ { ecma_value_t ret_value = ECMA_VALUE_EMPTY; ecma_object_t *obj_wrapper_p = ecma_op_create_object_object_noarg (); ecma_string_t *empty_str_p = ecma_get_magic_string (LIT_MAGIC_STRING__EMPTY); - ecma_value_t put_comp_val = ecma_builtin_helper_def_prop (obj_wrapper_p, - empty_str_p, - arg1, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); + ecma_value_t put_comp_val = + ecma_builtin_helper_def_prop (obj_wrapper_p, empty_str_p, arg1, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); JERRY_ASSERT (ecma_is_value_true (put_comp_val)); @@ -1556,9 +1529,9 @@ ecma_builtin_json_stringify_no_opts (const ecma_value_t value) /**< value to str * Returned value must be freed with ecma_free_value. */ static ecma_value_t -ecma_builtin_json_stringify (ecma_value_t arg1, /**< value */ - ecma_value_t arg2, /**< replacer */ - ecma_value_t arg3) /**< space */ +ecma_builtin_json_stringify (ecma_value_t arg1, /**< value */ + ecma_value_t arg2, /**< replacer */ + ecma_value_t arg3) /**< space */ { ecma_json_stringify_context_t context; context.replacer_function_p = NULL; @@ -1750,8 +1723,8 @@ ecma_builtin_json_stringify (ecma_value_t arg1, /**< value */ JMEM_DEFINE_LOCAL_ARRAY (space_buff, num_of_spaces, char); memset (space_buff, LIT_CHAR_SP, (size_t) num_of_spaces); - context.gap_str_p = ecma_new_ecma_string_from_utf8 ((lit_utf8_byte_t *) space_buff, - (lit_utf8_size_t) num_of_spaces); + context.gap_str_p = + ecma_new_ecma_string_from_utf8 ((lit_utf8_byte_t *) space_buff, (lit_utf8_size_t) num_of_spaces); JMEM_FINALIZE_LOCAL_ARRAY (space_buff); } diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h index e83345f8..21776999 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h @@ -23,9 +23,7 @@ #if JERRY_ESNEXT /* ECMA-262 v6, 24.3.3 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_JSON_U, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_JSON_U, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ /* Routine properties: diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c index 15f61a77..9471a450 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c @@ -37,7 +37,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-map-iterator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID map_iterator_prototype +#define BUILTIN_UNDERSCORED_ID map_iterator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h index 67348f54..fe2b8187 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h @@ -21,9 +21,7 @@ #if JERRY_BUILTIN_CONTAINER -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_MAP_ITERATOR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_MAP_ITERATOR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c index 45d9329d..d7a10cc9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c @@ -25,7 +25,7 @@ */ #define BUILTIN_CUSTOM_DISPATCH #define BUILTIN_INC_HEADER_NAME "ecma-builtin-map-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID map_prototype +#define BUILTIN_UNDERSCORED_ID map_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h index 6d99f667..65d91d69 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h @@ -25,14 +25,10 @@ * (property name, object pointer getter) */ /* ECMA-262 v6, 23.1.3.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_MAP, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_MAP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 23.1.3.13 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_MAP_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_MAP_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -44,15 +40,15 @@ ROUTINE (LIT_MAGIC_STRING_HAS, ECMA_CONTAINER_ROUTINE_HAS, 1, 1) ROUTINE (LIT_MAGIC_STRING_SET, ECMA_CONTAINER_ROUTINE_SET, 2, 2) ROUTINE (LIT_MAGIC_STRING_VALUES, ECMA_CONTAINER_ROUTINE_VALUES, 0, 0) ROUTINE (LIT_MAGIC_STRING_KEYS, ECMA_CONTAINER_ROUTINE_KEYS, 0, 0) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_ENTRIES, LIT_INTERNAL_MAGIC_STRING_MAP_PROTOTYPE_ENTRIES, +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_ENTRIES, + LIT_INTERNAL_MAGIC_STRING_MAP_PROTOTYPE_ENTRIES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, LIT_INTERNAL_MAGIC_STRING_MAP_PROTOTYPE_ENTRIES, +INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, + LIT_INTERNAL_MAGIC_STRING_MAP_PROTOTYPE_ENTRIES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 23.1.3.10 */ -ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE, - ECMA_CONTAINER_ROUTINE_SIZE_GETTER, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE, ECMA_CONTAINER_ROUTINE_SIZE_GETTER, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_BUILTIN_CONTAINER */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map.c index 215e2cc4..f79cccd5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map.c @@ -14,8 +14,8 @@ */ #include "ecma-builtins.h" -#include "ecma-exceptions.h" #include "ecma-container-object.h" +#include "ecma-exceptions.h" #if JERRY_BUILTIN_CONTAINER @@ -23,7 +23,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-map.inc.h" -#define BUILTIN_UNDERSCORED_ID map +#define BUILTIN_UNDERSCORED_ID map #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h index 5cf091d4..e1ff9c00 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h @@ -25,27 +25,19 @@ * (property name, number value, writable, enumerable, configurable) */ /* ECMA-262 v6, 23.1.2 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 23.1 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_MAP_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_MAP_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v6, 23.1.2.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_MAP_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_MAP_PROTOTYPE, ECMA_PROPERTY_FIXED) /* ECMA-262 v6, 23.1.2.2 */ -ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, - ecma_builtin_map_species_get, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_map_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_BUILTIN_CONTAINER */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-math.c b/jerry-core/ecma/builtin-objects/ecma-builtin-math.c index be8656c9..a9e737ec 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-math.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-math.c @@ -23,14 +23,15 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-number-arithmetic.h" -#include "ecma-objects.h" #include "ecma-objects-general.h" -#include "jrt.h" +#include "ecma-objects.h" + #include "jrt-libc-includes.h" +#include "jrt.h" -#if defined (_WIN32) +#if defined(_WIN32) #include <intrin.h> -#endif +#endif /* defined(_WIN32) */ #if JERRY_BUILTIN_MATH @@ -79,11 +80,13 @@ enum ECMA_MATH_OBJECT_TANH, /* ECMA-262 v6, 20.2.2.34 */ ECMA_MATH_OBJECT_TRUNC, /* ECMA-262 v6, 20.2.2.35 */ #endif /* JERRY_ESNEXT */ - ECMA_MATH_OBJECT_ATAN2, /* ECMA-262 v5, 15.8.2.5 */ /* first routine with 2 arguments */ + ECMA_MATH_OBJECT_ATAN2, +/* ECMA-262 v5, 15.8.2.5 */ /* first routine with 2 arguments */ #if JERRY_ESNEXT ECMA_MATH_OBJECT_IMUL, /* ECMA-262 v6, 20.2.2.19 */ #endif /* JERRY_ESNEXT */ - ECMA_MATH_OBJECT_POW, /* ECMA-262 v5, 15.8.2.13 */ /* last routine with 1 or 2 arguments*/ + ECMA_MATH_OBJECT_POW, + /* ECMA-262 v5, 15.8.2.13 */ /* last routine with 1 or 2 arguments*/ ECMA_MATH_OBJECT_MAX, /* ECMA-262 v5, 15.8.2.11 */ ECMA_MATH_OBJECT_MIN, /* ECMA-262 v5, 15.8.2.12 */ #if JERRY_ESNEXT @@ -93,7 +96,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-math.inc.h" -#define BUILTIN_UNDERSCORED_ID math +#define BUILTIN_UNDERSCORED_ID math #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -151,8 +154,7 @@ ecma_builtin_math_object_max_min (bool is_max, /**< 'max' or 'min' operation */ continue; } - if (ecma_number_is_zero (arg_num) - && ecma_number_is_zero (result_num)) + if (ecma_number_is_zero (arg_num) && ecma_number_is_zero (result_num)) { bool is_negative = ecma_number_is_negative (arg_num); @@ -358,8 +360,7 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi } } - if (builtin_routine_id >= ECMA_MATH_OBJECT_ATAN2 - && arguments_number >= 2) + if (builtin_routine_id >= ECMA_MATH_OBJECT_ATAN2 && arguments_number >= 2) { if (ecma_is_value_number (arguments_list[1])) { @@ -437,15 +438,11 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi #endif /* JERRY_ESNEXT */ case ECMA_MATH_OBJECT_ROUND: { - if (ecma_number_is_nan (x) - || ecma_number_is_zero (x) - || ecma_number_is_infinity (x) - || fmod (x, 1.0) == 0) + if (ecma_number_is_nan (x) || ecma_number_is_zero (x) || ecma_number_is_infinity (x) || fmod (x, 1.0) == 0) { /* Do nothing. */ } - else if (ecma_number_is_negative (x) - && x >= -ECMA_NUMBER_HALF) + else if (ecma_number_is_negative (x) && x >= -ECMA_NUMBER_HALF) { x = -ECMA_NUMBER_ZERO; } @@ -551,12 +548,12 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi case ECMA_MATH_OBJECT_CLZ32: { uint32_t n = ecma_number_to_uint32 (x); -#if defined (__GNUC__) || defined (__clang__) +#if defined(__GNUC__) || defined(__clang__) x = n ? __builtin_clz (n) : 32; -#elif defined (_WIN32) +#elif defined(_WIN32) unsigned long ret; x = _BitScanReverse (&ret, n) ? 31 - ret : 32; -#else +#else /* !(defined(__GNUC__) || defined(__clang__) || defined(_WIN32)) */ x = 32; for (int i = 31; i >= 0; i--) { @@ -566,7 +563,7 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi break; } } -#endif +#endif /* defined (__GNUC__) || defined (__clang__) */ break; } case ECMA_MATH_OBJECT_FROUND: diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h index 4c663356..16d24d5e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h @@ -25,50 +25,32 @@ * (property name, number value, writable, enumerable, configurable) */ /* ECMA-262 v5, 15.8.1.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_E_U, - ECMA_BUILTIN_NUMBER_E, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_E_U, ECMA_BUILTIN_NUMBER_E, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.8.1.2 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LN10_U, - ECMA_BUILTIN_NUMBER_LN10, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_LN10_U, ECMA_BUILTIN_NUMBER_LN10, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.8.1.3 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LN2_U, - ECMA_BUILTIN_NUMBER_LN2, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_LN2_U, ECMA_BUILTIN_NUMBER_LN2, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.8.1.4 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LOG2E_U, - ECMA_BUILTIN_NUMBER_LOG2E, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_LOG2E_U, ECMA_BUILTIN_NUMBER_LOG2E, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.8.1.5 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LOG10E_U, - ECMA_BUILTIN_NUMBER_LOG10E, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_LOG10E_U, ECMA_BUILTIN_NUMBER_LOG10E, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.8.1.6 */ -NUMBER_VALUE (LIT_MAGIC_STRING_PI_U, - ECMA_BUILTIN_NUMBER_PI, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_PI_U, ECMA_BUILTIN_NUMBER_PI, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.8.1.7 */ -NUMBER_VALUE (LIT_MAGIC_STRING_SQRT1_2_U, - ECMA_BUILTIN_NUMBER_SQRT_1_2, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_SQRT1_2_U, ECMA_BUILTIN_NUMBER_SQRT_1_2, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.8.1.8 */ -NUMBER_VALUE (LIT_MAGIC_STRING_SQRT2_U, - ECMA_BUILTIN_NUMBER_SQRT2, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_SQRT2_U, ECMA_BUILTIN_NUMBER_SQRT2, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT /* ECMA-262 v6, 20.2.1.9 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_MATH_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_MATH_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ /* Routine properties: diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c index c27aecb3..6b2bdd52 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c @@ -24,8 +24,9 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" -#include "jrt.h" + #include "jrt-libc-includes.h" +#include "jrt.h" #include "lit-char-helpers.h" #if JERRY_BUILTIN_NUMBER @@ -53,7 +54,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-number-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID number_prototype +#define BUILTIN_UNDERSCORED_ID number_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -146,13 +147,9 @@ ecma_builtin_number_prototype_object_to_string (ecma_number_t this_arg_number, / const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - static const lit_utf8_byte_t digit_chars[36] = - { - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', - 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', - 'u', 'v', 'w', 'x', 'y', 'z' - }; + static const lit_utf8_byte_t digit_chars[36] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', + 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' }; uint32_t radix = 10; if (arguments_list_len > 0 && !ecma_is_value_undefined (arguments_list_p[0])) @@ -172,10 +169,8 @@ ecma_builtin_number_prototype_object_to_string (ecma_number_t this_arg_number, / } } - if (ecma_number_is_nan (this_arg_number) - || ecma_number_is_infinity (this_arg_number) - || ecma_number_is_zero (this_arg_number) - || radix == 10) + if (ecma_number_is_nan (this_arg_number) || ecma_number_is_infinity (this_arg_number) + || ecma_number_is_zero (this_arg_number) || radix == 10) { ecma_string_t *ret_str_p = ecma_new_ecma_string_from_number (this_arg_number); return ecma_make_string_value (ret_str_p); @@ -319,7 +314,7 @@ ecma_builtin_number_prototype_object_to_string (ecma_number_t this_arg_number, / * Calculate where we have to put the radix point relative to the beginning of * the new digits. If the exponent is non-negative this will be right after the number. */ - int point = exponent >= 0 ? magnitude + 1: buff_index - magnitude; + int point = exponent >= 0 ? magnitude + 1 : buff_index - magnitude; if (point < 0) { @@ -464,10 +459,10 @@ ecma_builtin_number_prototype_object_value_of (ecma_value_t this_arg) /**< this */ typedef enum { - NUMBER_ROUTINE_TO_FIXED, /**< Number.prototype.toFixed: ECMA-262 v11, 20.1.3.3 */ + NUMBER_ROUTINE_TO_FIXED, /**< Number.prototype.toFixed: ECMA-262 v11, 20.1.3.3 */ NUMBER_ROUTINE_TO_EXPONENTIAL, /**< Number.prototype.toExponential: ECMA-262 v11, 20.1.3.2 */ - NUMBER_ROUTINE_TO_PRECISION, /**< Number.prototype.toPrecision: ECMA-262 v11, 20.1.3.5 */ - NUMBER_ROUTINE__COUNT, /**< count of the modes */ + NUMBER_ROUTINE_TO_PRECISION, /**< Number.prototype.toPrecision: ECMA-262 v11, 20.1.3.5 */ + NUMBER_ROUTINE__COUNT, /**< count of the modes */ } number_routine_mode_t; /** @@ -478,8 +473,7 @@ ecma_builtin_number_prototype_object_to_number_convert (ecma_number_t this_num, ecma_value_t arg, /**< routine's argument */ number_routine_mode_t mode) /**< number routine mode */ { - if (ecma_is_value_undefined (arg) - && mode == NUMBER_ROUTINE_TO_PRECISION) + if (ecma_is_value_undefined (arg) && mode == NUMBER_ROUTINE_TO_PRECISION) { return ecma_builtin_number_prototype_object_to_string (this_num, NULL, 0); } @@ -493,8 +487,7 @@ ecma_builtin_number_prototype_object_to_number_convert (ecma_number_t this_num, } /* Argument boundary check for toFixed method */ - if (mode == NUMBER_ROUTINE_TO_FIXED - && (arg_num <= -1 || arg_num >= 101)) + if (mode == NUMBER_ROUTINE_TO_FIXED && (arg_num <= -1 || arg_num >= 101)) { return ecma_raise_range_error (ECMA_ERR_MSG ("Fraction digits must be between 0 and 100")); } @@ -561,14 +554,12 @@ ecma_builtin_number_prototype_object_to_number_convert (ecma_number_t this_num, } /* Argument boundary check for toExponential and toPrecision methods */ - if (mode == NUMBER_ROUTINE_TO_EXPONENTIAL - && (arg_num <= -1 || arg_num >= 101)) + if (mode == NUMBER_ROUTINE_TO_EXPONENTIAL && (arg_num <= -1 || arg_num >= 101)) { ecma_stringbuilder_destroy (&builder); return ecma_raise_range_error (ECMA_ERR_MSG ("Fraction digits must be between 0 and 100")); } - else if (mode == NUMBER_ROUTINE_TO_PRECISION - && (arg_num < 1 || arg_num > 100)) + else if (mode == NUMBER_ROUTINE_TO_PRECISION && (arg_num < 1 || arg_num > 100)) { ecma_stringbuilder_destroy (&builder); return ecma_raise_range_error (ECMA_ERR_MSG ("Precision digits must be between 1 and 100")); @@ -582,8 +573,7 @@ ecma_builtin_number_prototype_object_to_number_convert (ecma_number_t this_num, arg_int = (int32_t) num_of_digits - 1; } - if (mode == NUMBER_ROUTINE_TO_FIXED - && exponent > 21) + if (mode == NUMBER_ROUTINE_TO_FIXED && exponent > 21) { ecma_stringbuilder_destroy (&builder); @@ -606,16 +596,11 @@ ecma_builtin_number_prototype_object_to_number_convert (ecma_number_t this_num, digits_to_keep += 1; } - num_of_digits = ecma_builtin_number_prototype_helper_round (digits, - num_of_digits, - digits_to_keep, - &exponent, - false); + num_of_digits = ecma_builtin_number_prototype_helper_round (digits, num_of_digits, digits_to_keep, &exponent, false); /* toExponent routine and toPrecision cases where the exponent > precision or exponent < -5 */ if (mode == NUMBER_ROUTINE_TO_EXPONENTIAL - || (mode == NUMBER_ROUTINE_TO_PRECISION - && (exponent < -5 || exponent > arg_int))) + || (mode == NUMBER_ROUTINE_TO_PRECISION && (exponent < -5 || exponent > arg_int))) { /* Append first digit */ ecma_stringbuilder_append_byte (&builder, *digits); @@ -664,13 +649,11 @@ ecma_builtin_number_prototype_object_to_number_convert (ecma_number_t this_num, if (mode == NUMBER_ROUTINE_TO_FIXED) { - result_digits = ((exponent > 0) ? (lit_utf8_size_t) (exponent + arg_int) - : (lit_utf8_size_t) (arg_int + 1)); + result_digits = ((exponent > 0) ? (lit_utf8_size_t) (exponent + arg_int) : (lit_utf8_size_t) (arg_int + 1)); } else { - result_digits = ((exponent <= 0) ? (lit_utf8_size_t) (1 - exponent + arg_int) - : (lit_utf8_size_t) arg_int); + result_digits = ((exponent <= 0) ? (lit_utf8_size_t) (1 - exponent + arg_int) : (lit_utf8_size_t) arg_int); } /* Number of digits we copied from digits array */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.inc.h index 530616eb..e5ac7dd1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.inc.h @@ -25,9 +25,7 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.7.4.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_NUMBER, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_NUMBER, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number.c b/jerry-core/ecma/builtin-objects/ecma-builtin-number.c index c36fbd94..6626368c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number.c @@ -25,6 +25,7 @@ #include "ecma-helpers.h" #include "ecma-number-object.h" #include "ecma-objects.h" + #include "jrt.h" #if JERRY_BUILTIN_NUMBER @@ -52,7 +53,7 @@ enum #endif /* JERRY_ESNEXT */ #define BUILTIN_INC_HEADER_NAME "ecma-builtin-number.inc.h" -#define BUILTIN_UNDERSCORED_ID number +#define BUILTIN_UNDERSCORED_ID number #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h index 9f84069b..c586aa07 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h @@ -24,64 +24,42 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* ECMA-262 v5, 15.7.3.4 */ -NUMBER_VALUE (LIT_MAGIC_STRING_NAN, - ECMA_BUILTIN_NUMBER_NAN, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_NAN, ECMA_BUILTIN_NUMBER_NAN, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.7.3.2 */ -NUMBER_VALUE (LIT_MAGIC_STRING_MAX_VALUE_U, - ECMA_BUILTIN_NUMBER_MAX, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_MAX_VALUE_U, ECMA_BUILTIN_NUMBER_MAX, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.7.3.3 */ -NUMBER_VALUE (LIT_MAGIC_STRING_MIN_VALUE_U, - ECMA_BUILTIN_NUMBER_MIN, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_MIN_VALUE_U, ECMA_BUILTIN_NUMBER_MIN, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.7.3.5 */ -NUMBER_VALUE (LIT_MAGIC_STRING_POSITIVE_INFINITY_U, - ECMA_BUILTIN_NUMBER_POSITIVE_INFINITY, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_POSITIVE_INFINITY_U, ECMA_BUILTIN_NUMBER_POSITIVE_INFINITY, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.7.3.6 */ -NUMBER_VALUE (LIT_MAGIC_STRING_NEGATIVE_INFINITY_U, - ECMA_BUILTIN_NUMBER_NEGATIVE_INFINITY, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_NEGATIVE_INFINITY_U, ECMA_BUILTIN_NUMBER_NEGATIVE_INFINITY, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT /* ECMA-262 v6, 20.1.2.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_EPSILON_U, - ECMA_BUILTIN_NUMBER_EPSILON, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_EPSILON_U, ECMA_BUILTIN_NUMBER_EPSILON, ECMA_PROPERTY_FIXED) /* ECMA-262 v6, 20.1.2.6 */ -NUMBER_VALUE (LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U, - ECMA_BUILTIN_NUMBER_MAX_SAFE_INTEGER, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U, ECMA_BUILTIN_NUMBER_MAX_SAFE_INTEGER, ECMA_PROPERTY_FIXED) /* ECMA-262 v6, 20.1.2.8 */ -NUMBER_VALUE (LIT_MAGIC_STRING_MIN_SAFE_INTEGER_U, - ECMA_BUILTIN_NUMBER_MIN_SAFE_INTEGER, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_MIN_SAFE_INTEGER_U, ECMA_BUILTIN_NUMBER_MIN_SAFE_INTEGER, ECMA_PROPERTY_FIXED) -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_NUMBER_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_NUMBER_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.7.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_NUMBER_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_NUMBER_PROTOTYPE, ECMA_PROPERTY_FIXED) #endif /* JERRY_BUILTIN_NUMBER */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c index 95e06156..7bdf27da 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c @@ -15,8 +15,8 @@ #include "ecma-alloc.h" #include "ecma-builtin-helpers.h" -#include "ecma-builtins.h" #include "ecma-builtin-object.h" +#include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" #include "ecma-function-object.h" @@ -26,6 +26,7 @@ #include "ecma-objects.h" #include "ecma-proxy-object.h" #include "ecma-string-object.h" + #include "jrt.h" #define ECMA_BUILTINS_INTERNAL @@ -60,7 +61,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-object-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID object_prototype +#define BUILTIN_UNDERSCORED_ID object_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -247,11 +248,8 @@ ecma_builtin_object_prototype_define_getter_setter (ecma_value_t this_arg, /**< /* 3. */ ecma_property_descriptor_t desc = ecma_make_empty_property_descriptor (); - desc.flags |= (JERRY_PROP_IS_ENUMERABLE - | JERRY_PROP_IS_CONFIGURABLE - | JERRY_PROP_IS_ENUMERABLE_DEFINED - | JERRY_PROP_IS_CONFIGURABLE_DEFINED - | JERRY_PROP_SHOULD_THROW); + desc.flags |= (JERRY_PROP_IS_ENUMERABLE | JERRY_PROP_IS_CONFIGURABLE | JERRY_PROP_IS_ENUMERABLE_DEFINED + | JERRY_PROP_IS_CONFIGURABLE_DEFINED | JERRY_PROP_SHOULD_THROW); if (define_getter) { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.inc.h index a9c9d33b..47d2b8b4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.inc.h @@ -23,9 +23,7 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.2.4.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_OBJECT, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_OBJECT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) ACCESSOR_READ_WRITE (LIT_MAGIC_STRING__PROTO__, ECMA_OBJECT_PROTOTYPE_GET_PROTO, diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.c b/jerry-core/ecma/builtin-objects/ecma-builtin-object.c index 7d8a08a9..6f7da099 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object.c @@ -13,6 +13,8 @@ * limitations under the License. */ +#include "ecma-builtin-object.h" + #include "ecma-alloc.h" #include "ecma-array-object.h" #include "ecma-builtin-helpers.h" @@ -22,14 +24,15 @@ #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" +#include "ecma-objects-general.h" #include "ecma-objects.h" #include "ecma-proxy-object.h" -#include "ecma-objects-general.h" + #include "jrt.h" -#include "ecma-builtin-object.h" #if JERRY_ESNEXT -#include "ecma-iterator-object.h" #include "ecma-function-object.h" +#include "ecma-iterator-object.h" + #include "jcontext.h" #endif /* JERRY_ESNEXT */ @@ -82,7 +85,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-object.inc.h" -#define BUILTIN_UNDERSCORED_ID object +#define BUILTIN_UNDERSCORED_ID object #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -104,8 +107,7 @@ ecma_value_t ecma_builtin_object_dispatch_call (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - if (arguments_list_len == 0 - || ecma_is_value_undefined (arguments_list_p[0]) + if (arguments_list_len == 0 || ecma_is_value_undefined (arguments_list_p[0]) || ecma_is_value_null (arguments_list_p[0])) { return ecma_make_object_value (ecma_op_create_object_object_noarg ()); @@ -126,16 +128,14 @@ ecma_builtin_object_dispatch_construct (const ecma_value_t *arguments_list_p, /* #if JERRY_ESNEXT if (JERRY_CONTEXT (current_new_target_p) != ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT)) { - ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), - ECMA_BUILTIN_ID_OBJECT_PROTOTYPE); + ecma_object_t *prototype_obj_p = + ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_OBJECT_PROTOTYPE); if (JERRY_UNLIKELY (prototype_obj_p == NULL)) { return ECMA_VALUE_ERROR; } - ecma_object_t *object_p = ecma_create_object (prototype_obj_p, - 0, - ECMA_OBJECT_TYPE_GENERAL); + ecma_object_t *object_p = ecma_create_object (prototype_obj_p, 0, ECMA_OBJECT_TYPE_GENERAL); ecma_deref_object (prototype_obj_p); return ecma_make_object_value (object_p); @@ -374,9 +374,7 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ prop_desc.flags |= JERRY_PROP_SHOULD_THROW; /* 8.a.i */ - ecma_value_t define_own_prop_ret = ecma_op_object_define_own_property (obj_p, - property_name_p, - &prop_desc); + ecma_value_t define_own_prop_ret = ecma_op_object_define_own_property (obj_p, property_name_p, &prop_desc); ecma_free_property_descriptor (&prop_desc); @@ -425,9 +423,7 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ prop_desc.flags |= JERRY_PROP_SHOULD_THROW; /* 9.3 */ - ecma_value_t define_own_prop_ret = ecma_op_object_define_own_property (obj_p, - property_name_p, - &prop_desc); + ecma_value_t define_own_prop_ret = ecma_op_object_define_own_property (obj_p, property_name_p, &prop_desc); ecma_free_property_descriptor (&prop_desc); @@ -440,7 +436,6 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ ecma_free_value (define_own_prop_ret); } - } ecma_collection_free (props_p); @@ -636,8 +631,7 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a /* 2.b for isFrozen */ /* 2.b for isSealed, 2.c for isFrozen */ - if ((mode == ECMA_OBJECT_ROUTINE_IS_FROZEN && is_writable_data) - || is_configurable) + if ((mode == ECMA_OBJECT_ROUTINE_IS_FROZEN && is_writable_data) || is_configurable) { ret_value = ECMA_VALUE_FALSE; break; @@ -855,9 +849,7 @@ ecma_builtin_object_object_define_properties (ecma_object_t *obj_p, /**< routine ecma_string_t *prop_name_p = ecma_get_prop_name_from_value (buffer_p[i]); ecma_property_descriptor_t prop_desc; - ecma_value_t get_desc = ecma_op_object_get_own_property_descriptor (props_p, - prop_name_p, - &prop_desc); + ecma_value_t get_desc = ecma_op_object_get_own_property_descriptor (props_p, prop_name_p, &prop_desc); #if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (get_desc)) @@ -878,8 +870,8 @@ ecma_builtin_object_object_define_properties (ecma_object_t *obj_p, /**< routine goto cleanup; } - ecma_value_t conv_result = ecma_op_to_property_descriptor (desc_obj, - &property_descriptors[property_descriptor_number]); + ecma_value_t conv_result = + ecma_op_to_property_descriptor (desc_obj, &property_descriptors[property_descriptor_number]); property_descriptors[property_descriptor_number].flags |= JERRY_PROP_SHOULD_THROW; @@ -906,9 +898,8 @@ ecma_builtin_object_object_define_properties (ecma_object_t *obj_p, /**< routine { ecma_string_t *prop_name_p = ecma_get_prop_name_from_value (enum_prop_names->buffer_p[i]); - ecma_value_t define_own_prop_ret = ecma_op_object_define_own_property (obj_p, - prop_name_p, - &property_descriptors[i]); + ecma_value_t define_own_prop_ret = + ecma_op_object_define_own_property (obj_p, prop_name_p, &property_descriptors[i]); if (ECMA_IS_VALUE_ERROR (define_own_prop_ret)) { goto cleanup; @@ -922,9 +913,7 @@ ecma_builtin_object_object_define_properties (ecma_object_t *obj_p, /**< routine cleanup: /* Clean up. */ - for (uint32_t index = 0; - index < property_descriptor_number; - index++) + for (uint32_t index = 0; index < property_descriptor_number; index++) { ecma_free_property_descriptor (&property_descriptors[index]); } @@ -1011,9 +1000,7 @@ ecma_builtin_object_object_define_property (ecma_object_t *obj_p, /**< routine's prop_desc.flags |= JERRY_PROP_SHOULD_THROW; - ecma_value_t define_own_prop_ret = ecma_op_object_define_own_property (obj_p, - name_str_p, - &prop_desc); + ecma_value_t define_own_prop_ret = ecma_op_object_define_own_property (obj_p, name_str_p, &prop_desc); ecma_free_property_descriptor (&prop_desc); ecma_free_value (conv_result); @@ -1272,10 +1259,8 @@ ecma_builtin_object_from_entries (ecma_value_t iterator) /**< object's iterator if (property_p == NULL) { ecma_property_value_t *prop; - prop = ecma_create_named_data_property (obj_p, - property_key, - ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE, - NULL); + prop = + ecma_create_named_data_property (obj_p, property_key, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE, NULL); prop->value = ecma_copy_value_if_not_object (value); } else @@ -1331,8 +1316,7 @@ ecma_op_object_get_own_property_keys (ecma_value_t this_arg, /**< this argument if (type == ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_SYMBOLS) { - filter = (JERRY_PROPERTY_FILTER_EXCLUDE_STRINGS - | JERRY_PROPERTY_FILTER_EXCLUDE_INTEGER_INDICES); + filter = (JERRY_PROPERTY_FILTER_EXCLUDE_STRINGS | JERRY_PROPERTY_FILTER_EXCLUDE_INTEGER_INDICES); } ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p, filter); @@ -1488,8 +1472,8 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in JERRY_ASSERT (builtin_routine_id - ECMA_OBJECT_ROUTINE_KEYS < ECMA_ENUMERABLE_PROPERTY__COUNT); const int option = builtin_routine_id - ECMA_OBJECT_ROUTINE_KEYS; - result = ecma_builtin_object_object_keys_values_helper (obj_p, - (ecma_enumerable_property_names_options_t) option); + result = + ecma_builtin_object_object_keys_values_helper (obj_p, (ecma_enumerable_property_names_options_t) option); break; } case ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTOR: diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.h b/jerry-core/ecma/builtin-objects/ecma-builtin-object.h index 489e9831..f31b2617 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object.h @@ -15,22 +15,20 @@ #ifndef ECMA_BUILTIN_OBJECT_H #define ECMA_BUILTIN_OBJECT_H +#include "ecma-globals.h" + ecma_value_t ecma_builtin_object_object_get_prototype_of (ecma_object_t *obj_p); -ecma_value_t ecma_builtin_object_object_set_prototype_of (ecma_value_t arg1, - ecma_value_t arg2); +ecma_value_t ecma_builtin_object_object_set_prototype_of (ecma_value_t arg1, ecma_value_t arg2); -ecma_value_t ecma_builtin_object_object_set_proto (ecma_value_t arg1, - ecma_value_t arg2); +ecma_value_t ecma_builtin_object_object_set_proto (ecma_value_t arg1, ecma_value_t arg2); ecma_value_t ecma_builtin_object_object_prevent_extensions (ecma_object_t *obj_p); ecma_value_t ecma_builtin_object_object_is_extensible (ecma_object_t *obj_p); -ecma_value_t ecma_builtin_object_object_get_own_property_descriptor (ecma_object_t *obj_p, - ecma_string_t *name_str_p); -ecma_value_t ecma_builtin_object_object_define_property (ecma_object_t *obj_p, - ecma_string_t *name_str_p, - ecma_value_t arg3); +ecma_value_t ecma_builtin_object_object_get_own_property_descriptor (ecma_object_t *obj_p, ecma_string_t *name_str_p); +ecma_value_t +ecma_builtin_object_object_define_property (ecma_object_t *obj_p, ecma_string_t *name_str_p, ecma_value_t arg3); #endif /* !ECMA_BUILTIN_OBJECT_H */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h index 546e57b9..7f79d4e5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h @@ -22,22 +22,16 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.2.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_OBJECT_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_OBJECT_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ /* Routine properties: diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c index 7021b9bb..252512d6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c @@ -38,7 +38,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-promise-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID promise_prototype +#define BUILTIN_UNDERSCORED_ID promise_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -74,7 +74,7 @@ ecma_builtin_promise_prototype_dispatch_routine (uint8_t builtin_routine_id, /** } case ECMA_PROMISE_PROTOTYPE_ROUTINE_CATCH: { - ecma_value_t args[] = {ECMA_VALUE_UNDEFINED, arguments_list_p[0]}; + ecma_value_t args[] = { ECMA_VALUE_UNDEFINED, arguments_list_p[0] }; return ecma_op_invoke_by_magic_id (this_arg, LIT_MAGIC_STRING_THEN, args, 2); } case ECMA_PROMISE_PROTOTYPE_ROUTINE_FINALLY: diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h index 2ffcc1b1..2f741624 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h @@ -20,14 +20,10 @@ /* Object properties: * (property name, object pointer getter) */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_PROMISE, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_PROMISE, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 25.4.5.4 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_PROMISE_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_PROMISE_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) ROUTINE (LIT_MAGIC_STRING_THEN, ECMA_PROMISE_PROTOTYPE_ROUTINE_THEN, 2, 2) ROUTINE (LIT_MAGIC_STRING_CATCH, ECMA_PROMISE_PROTOTYPE_ROUTINE_CATCH, 1, 1) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c index 55afaa34..4de450bf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c @@ -15,8 +15,8 @@ #include "ecma-alloc.h" #include "ecma-array-object.h" -#include "ecma-builtin-helpers.h" #include "ecma-builtin-handlers.h" +#include "ecma-builtin-helpers.h" #include "ecma-exceptions.h" #include "ecma-function-object.h" #include "ecma-gc.h" @@ -24,6 +24,7 @@ #include "ecma-iterator-object.h" #include "ecma-number-object.h" #include "ecma-promise-object.h" + #include "jcontext.h" #if JERRY_ESNEXT @@ -52,7 +53,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-promise.inc.h" -#define BUILTIN_UNDERSCORED_ID promise +#define BUILTIN_UNDERSCORED_ID promise #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -87,8 +88,7 @@ ecma_builtin_promise_perform_race (ecma_value_t iterator, /**< the iterator for ecma_promise_capabality_t *capability_p = (ecma_promise_capabality_t *) capability_obj_p; - ecma_value_t resolve = ecma_op_object_get_by_magic_id (ecma_get_object_from_value (ctor), - LIT_MAGIC_STRING_RESOLVE); + ecma_value_t resolve = ecma_op_object_get_by_magic_id (ecma_get_object_from_value (ctor), LIT_MAGIC_STRING_RESOLVE); if (ECMA_IS_VALUE_ERROR (resolve)) { @@ -143,7 +143,7 @@ ecma_builtin_promise_perform_race (ecma_value_t iterator, /**< the iterator for } /* i. */ - ecma_value_t args[2] = {capability_p->resolve, capability_p->reject}; + ecma_value_t args[2] = { capability_p->resolve, capability_p->reject }; ecma_value_t result = ecma_op_invoke_by_magic_id (next_promise, LIT_MAGIC_STRING_THEN, args, 2); ecma_free_value (next_promise); @@ -175,7 +175,7 @@ exit: static inline ecma_value_t ecma_builtin_promise_perform (ecma_value_t iterator, /**< iteratorRecord */ ecma_value_t next_method, /**< next method */ - ecma_object_t *capability_obj_p, /**< PromiseCapability record */ + ecma_object_t *capability_obj_p, /**< PromiseCapability record */ ecma_value_t ctor, /**< the caller of Promise.all */ uint8_t builtin_routine_id, /**< built-in wide routine identifier */ bool *done_p) /**< [out] iteratorRecord[[done]] */ @@ -186,8 +186,7 @@ ecma_builtin_promise_perform (ecma_value_t iterator, /**< iteratorRecord */ ecma_promise_capabality_t *capability_p = (ecma_promise_capabality_t *) capability_obj_p; - ecma_value_t resolve = ecma_op_object_get_by_magic_id (ecma_get_object_from_value (ctor), - LIT_MAGIC_STRING_RESOLVE); + ecma_value_t resolve = ecma_op_object_get_by_magic_id (ecma_get_object_from_value (ctor), LIT_MAGIC_STRING_RESOLVE); if (ECMA_IS_VALUE_ERROR (resolve)) { @@ -293,8 +292,8 @@ ecma_builtin_promise_perform (ecma_value_t iterator, /**< iteratorRecord */ if (builtin_routine_id != ECMA_PROMISE_ROUTINE_ANY) { /* k. */ - executor_func_p = ecma_op_create_native_handler (ECMA_NATIVE_HANDLER_PROMISE_ALL_HELPER, - sizeof (ecma_promise_all_executor_t)); + executor_func_p = + ecma_op_create_native_handler (ECMA_NATIVE_HANDLER_PROMISE_ALL_HELPER, sizeof (ecma_promise_all_executor_t)); ecma_promise_all_executor_t *executor_p = (ecma_promise_all_executor_t *) executor_func_p; @@ -339,8 +338,8 @@ ecma_builtin_promise_perform (ecma_value_t iterator, /**< iteratorRecord */ executor_type = ECMA_PROMISE_ANY_REJECT << ECMA_NATIVE_HANDLER_COMMON_FLAGS_SHIFT; } - ecma_object_t *reject_func_p = ecma_op_create_native_handler (ECMA_NATIVE_HANDLER_PROMISE_ALL_HELPER, - sizeof (ecma_promise_all_executor_t)); + ecma_object_t *reject_func_p = + ecma_op_create_native_handler (ECMA_NATIVE_HANDLER_PROMISE_ALL_HELPER, sizeof (ecma_promise_all_executor_t)); ecma_promise_all_executor_t *reject_p = (ecma_promise_all_executor_t *) reject_func_p; reject_p->index = idx; @@ -421,12 +420,8 @@ ecma_builtin_promise_helper (ecma_value_t this_arg, /**< 'this' argument */ } else { - ret = ecma_builtin_promise_perform (iterator, - next_method, - capability_obj_p, - this_arg, - builtin_routine_id, - &is_done); + ret = + ecma_builtin_promise_perform (iterator, next_method, capability_obj_p, this_arg, builtin_routine_id, &is_done); } if (ECMA_IS_VALUE_ERROR (ret)) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h index 03c6439c..52a63aa4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h @@ -24,20 +24,14 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_PROMISE_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_PROMISE_PROTOTYPE, ECMA_PROPERTY_FIXED) -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_PROMISE_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_PROMISE_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -49,9 +43,7 @@ ROUTINE (LIT_MAGIC_STRING_ALLSETTLED, ECMA_PROMISE_ROUTINE_ALLSETTLED, 1, 1) ROUTINE (LIT_MAGIC_STRING_ANY, ECMA_PROMISE_ROUTINE_ANY, 1, 1) /* ES2015 25.4.4.6 */ -ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, - ECMA_PROMISE_ROUTINE_SPECIES_GET, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ECMA_PROMISE_ROUTINE_SPECIES_GET, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c index 5844a872..1fe6ac23 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-proxy-object.h" + #include "jrt.h" #if JERRY_BUILTIN_PROXY @@ -41,7 +42,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-proxy.inc.h" -#define BUILTIN_UNDERSCORED_ID proxy +#define BUILTIN_UNDERSCORED_ID proxy #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h index 82fedd00..32670616 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h @@ -24,13 +24,9 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 2, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 2, ECMA_PROPERTY_FLAG_CONFIGURABLE) -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_PROXY_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_PROXY_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c index 21565971..f72ac2c2 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c @@ -22,6 +22,7 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -30,7 +31,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-rangeerror-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID range_error_prototype +#define BUILTIN_UNDERSCORED_ID range_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h index ce8406b1..1307e4a0 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h @@ -25,19 +25,13 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.7.8 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_RANGE_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_RANGE_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.9 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_RANGE_ERROR_UL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_RANGE_ERROR_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.10 */ -STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c index cadbfc34..83ae4feb 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c @@ -14,17 +14,18 @@ */ #include "ecma-alloc.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" #include "ecma-objects.h" -#include "ecma-function-object.h" -#include "jrt.h" + #include "jcontext.h" +#include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -32,7 +33,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-rangeerror.inc.h" -#define BUILTIN_UNDERSCORED_ID range_error +#define BUILTIN_UNDERSCORED_ID range_error #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h index 008acd08..042c13a3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h @@ -24,22 +24,16 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_RANGE_ERROR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_RANGE_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c index f1d4c593..5212d6bf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c @@ -22,6 +22,7 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -30,7 +31,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-referenceerror-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID reference_error_prototype +#define BUILTIN_UNDERSCORED_ID reference_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h index d03e8a65..caa9e0e3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h @@ -25,19 +25,13 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.7.8 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_REFERENCE_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_REFERENCE_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.9 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_REFERENCE_ERROR_UL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_REFERENCE_ERROR_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.10 */ -STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c index a3b6fbaa..5c983555 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c @@ -14,17 +14,18 @@ */ #include "ecma-alloc.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" #include "ecma-objects.h" -#include "ecma-function-object.h" -#include "jrt.h" + #include "jcontext.h" +#include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -32,7 +33,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-referenceerror.inc.h" -#define BUILTIN_UNDERSCORED_ID reference_error +#define BUILTIN_UNDERSCORED_ID reference_error #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h index 4cb17bae..fa268dbc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h @@ -24,22 +24,16 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_REFERENCE_ERROR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_REFERENCE_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c index 3f921f04..32c32dc7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c @@ -14,15 +14,16 @@ */ #include "ecma-array-object.h" -#include "ecma-builtins.h" #include "ecma-builtin-function-prototype.h" -#include "ecma-iterator-object.h" #include "ecma-builtin-helpers.h" #include "ecma-builtin-object.h" +#include "ecma-builtins.h" #include "ecma-exceptions.h" #include "ecma-function-object.h" #include "ecma-gc.h" +#include "ecma-iterator-object.h" #include "ecma-proxy-object.h" + #include "jcontext.h" #if JERRY_BUILTIN_REFLECT @@ -57,7 +58,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-reflect.inc.h" -#define BUILTIN_UNDERSCORED_ID reflect +#define BUILTIN_UNDERSCORED_ID reflect #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -213,10 +214,7 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in return ECMA_VALUE_ERROR; } - ecma_value_t ret_value = ecma_op_function_construct (target_p, - new_target_p, - coll_p->buffer_p, - coll_p->item_count); + ecma_value_t ret_value = ecma_op_function_construct (target_p, new_target_p, coll_p->buffer_p, coll_p->item_count); ecma_collection_free (coll_p); return ret_value; @@ -285,9 +283,7 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in return conv_result; } - ecma_value_t result = ecma_op_object_define_own_property (obj_p, - name_str_p, - &prop_desc); + ecma_value_t result = ecma_op_object_define_own_property (obj_p, name_str_p, &prop_desc); ecma_deref_ecma_string (name_str_p); ecma_free_property_descriptor (&prop_desc); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c index 41ad961d..12b3b08e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c @@ -15,20 +15,22 @@ #include "ecma-alloc.h" #include "ecma-array-object.h" -#include "ecma-builtins.h" #include "ecma-builtin-helpers.h" +#include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" #include "ecma-function-object.h" -#include "ecma-globals.h" #include "ecma-gc.h" +#include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-regexp-object.h" + #include "lit-char-helpers.h" #if JERRY_BUILTIN_REGEXP #include "ecma-regexp-object.h" + #include "re-compiler.h" #define ECMA_BUILTINS_INTERNAL @@ -37,7 +39,7 @@ /** * This object has a custom dispatch function. */ - #define BUILTIN_CUSTOM_DISPATCH +#define BUILTIN_CUSTOM_DISPATCH /** * List of built-in routine identifiers. @@ -73,7 +75,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-regexp-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID regexp_prototype +#define BUILTIN_UNDERSCORED_ID regexp_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -100,14 +102,8 @@ ecma_builtin_regexp_prototype_flags_helper (ecma_extended_object_t *re_obj_p, /* uint16_t flags = bc_p->header.status_flags; - static const uint8_t re_flags[] = - { - RE_FLAG_GLOBAL, - RE_FLAG_IGNORE_CASE, - RE_FLAG_MULTILINE, - RE_FLAG_STICKY, - RE_FLAG_UNICODE, - RE_FLAG_DOTALL, + static const uint8_t re_flags[] = { + RE_FLAG_GLOBAL, RE_FLAG_IGNORE_CASE, RE_FLAG_MULTILINE, RE_FLAG_STICKY, RE_FLAG_UNICODE, RE_FLAG_DOTALL, }; uint16_t offset = (uint16_t) (builtin_routine_id - ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_GLOBAL); @@ -128,25 +124,12 @@ ecma_builtin_regexp_prototype_flags_helper (ecma_extended_object_t *re_obj_p, /* static ecma_value_t ecma_builtin_regexp_prototype_get_flags (ecma_object_t *object_p) /**< this object */ { - static const lit_magic_string_id_t flag_lit_ids[] = - { - LIT_MAGIC_STRING_GLOBAL, - LIT_MAGIC_STRING_IGNORECASE_UL, - LIT_MAGIC_STRING_MULTILINE, - LIT_MAGIC_STRING_DOTALL, - LIT_MAGIC_STRING_UNICODE, - LIT_MAGIC_STRING_STICKY - }; + static const lit_magic_string_id_t flag_lit_ids[] = { LIT_MAGIC_STRING_GLOBAL, LIT_MAGIC_STRING_IGNORECASE_UL, + LIT_MAGIC_STRING_MULTILINE, LIT_MAGIC_STRING_DOTALL, + LIT_MAGIC_STRING_UNICODE, LIT_MAGIC_STRING_STICKY }; - static const lit_utf8_byte_t flag_chars[] = - { - LIT_CHAR_LOWERCASE_G, - LIT_CHAR_LOWERCASE_I, - LIT_CHAR_LOWERCASE_M, - LIT_CHAR_LOWERCASE_S, - LIT_CHAR_LOWERCASE_U, - LIT_CHAR_LOWERCASE_Y - }; + static const lit_utf8_byte_t flag_chars[] = { LIT_CHAR_LOWERCASE_G, LIT_CHAR_LOWERCASE_I, LIT_CHAR_LOWERCASE_M, + LIT_CHAR_LOWERCASE_S, LIT_CHAR_LOWERCASE_U, LIT_CHAR_LOWERCASE_Y }; ecma_stringbuilder_t builder = ecma_stringbuilder_create (); for (uint32_t i = 0; i < sizeof (flag_lit_ids) / sizeof (lit_magic_string_id_t); i++) @@ -466,8 +449,7 @@ ecma_builtin_regexp_prototype_to_string (ecma_object_t *object_p) /**< this obje #else /* !JERRY_ESNEXT */ ecma_extended_object_t *re_obj_p = (ecma_extended_object_t *) object_p; - re_compiled_code_t *bc_p = ECMA_GET_INTERNAL_VALUE_POINTER (re_compiled_code_t, - re_obj_p->u.cls.u3.value); + re_compiled_code_t *bc_p = ECMA_GET_INTERNAL_VALUE_POINTER (re_compiled_code_t, re_obj_p->u.cls.u3.value); ecma_string_t *source_p = ecma_get_string_from_value (bc_p->source); uint16_t flags = bc_p->header.status_flags; @@ -565,7 +547,7 @@ ecma_builtin_regexp_prototype_match_all (ecma_object_t *regexp_obj_p, /**< this /* 6. */ ecma_object_t *constructor_obj_p = ecma_get_object_from_value (constructor); ecma_value_t flags_value = ecma_make_string_value (flags); - ecma_value_t match_args[] = { ecma_make_object_value (regexp_obj_p), flags_value}; + ecma_value_t match_args[] = { ecma_make_object_value (regexp_obj_p), flags_value }; ecma_value_t matcher = ecma_op_function_construct (constructor_obj_p, constructor_obj_p, match_args, 2); ecma_deref_object (constructor_obj_p); @@ -604,10 +586,8 @@ ecma_builtin_regexp_prototype_match_all (ecma_object_t *regexp_obj_p, /**< this /* 8. */ ecma_object_t *matcher_obj_p = ecma_get_object_from_value (matcher); ecma_value_t last_index_value = ecma_make_length_value (last_index); - ecma_value_t set = ecma_op_object_put (matcher_obj_p, - ecma_get_magic_string (LIT_MAGIC_STRING_LASTINDEX_UL), - last_index_value, - true); + ecma_value_t set = + ecma_op_object_put (matcher_obj_p, ecma_get_magic_string (LIT_MAGIC_STRING_LASTINDEX_UL), last_index_value, true); ecma_free_value (last_index_value); @@ -633,9 +613,7 @@ ecma_builtin_regexp_prototype_match_all (ecma_object_t *regexp_obj_p, /**< this /* 13. */ ecma_object_t *result_obj; ecma_object_t *proto_p = ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP_STRING_ITERATOR_PROTOTYPE); - result_obj = ecma_create_object (proto_p, - sizeof (ecma_regexp_string_iterator_t), - ECMA_OBJECT_TYPE_CLASS); + result_obj = ecma_create_object (proto_p, sizeof (ecma_regexp_string_iterator_t), ECMA_OBJECT_TYPE_CLASS); ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) result_obj; ext_obj_p->u.cls.type = ECMA_OBJECT_CLASS_REGEXP_STRING_ITERATOR; diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h index 320b4bf0..9b60457e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h @@ -22,30 +22,20 @@ #if JERRY_BUILTIN_REGEXP /* ECMA-262 v5, 15.10.6.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_REGEXP, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_REGEXP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #if JERRY_ESNEXT -ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_FLAGS, - ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_FLAGS, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_FLAGS, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_FLAGS, ECMA_PROPERTY_FLAG_CONFIGURABLE) -ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SOURCE, - ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_SOURCE, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SOURCE, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_SOURCE, ECMA_PROPERTY_FLAG_CONFIGURABLE) -ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_GLOBAL, - ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_GLOBAL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_GLOBAL, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_GLOBAL, ECMA_PROPERTY_FLAG_CONFIGURABLE) ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_IGNORECASE_UL, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_IGNORE_CASE, ECMA_PROPERTY_FLAG_CONFIGURABLE) -ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_DOTALL, - ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_DOT_ALL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_DOTALL, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_DOT_ALL, ECMA_PROPERTY_FLAG_CONFIGURABLE) ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_MULTILINE, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_MULTILINE, @@ -55,9 +45,7 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_UNICODE, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_UNICODE, ECMA_PROPERTY_FLAG_CONFIGURABLE) -ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_STICKY, - ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_STICKY, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_STICKY, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_STICKY, ECMA_PROPERTY_FLAG_CONFIGURABLE) ROUTINE (LIT_GLOBAL_SYMBOL_REPLACE, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_REPLACE, 2, 2) ROUTINE (LIT_GLOBAL_SYMBOL_SEARCH, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_SEARCH, 1, 1) @@ -66,29 +54,19 @@ ROUTINE (LIT_GLOBAL_SYMBOL_MATCH, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_MATCH, 1, ROUTINE (LIT_GLOBAL_SYMBOL_MATCH_ALL, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_MATCH_ALL, 1, 1) #else /* !JERRY_ESNEXT */ /* ECMA-262 v5, 15.10.7.1 */ -STRING_VALUE (LIT_MAGIC_STRING_SOURCE, - LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP, - ECMA_PROPERTY_FIXED) +STRING_VALUE (LIT_MAGIC_STRING_SOURCE, LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.10.7.2 */ -SIMPLE_VALUE (LIT_MAGIC_STRING_GLOBAL, - ECMA_VALUE_FALSE, - ECMA_PROPERTY_FIXED) +SIMPLE_VALUE (LIT_MAGIC_STRING_GLOBAL, ECMA_VALUE_FALSE, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.10.7.3 */ -SIMPLE_VALUE (LIT_MAGIC_STRING_IGNORECASE_UL, - ECMA_VALUE_FALSE, - ECMA_PROPERTY_FIXED) +SIMPLE_VALUE (LIT_MAGIC_STRING_IGNORECASE_UL, ECMA_VALUE_FALSE, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.10.7.4 */ -SIMPLE_VALUE (LIT_MAGIC_STRING_MULTILINE, - ECMA_VALUE_FALSE, - ECMA_PROPERTY_FIXED) +SIMPLE_VALUE (LIT_MAGIC_STRING_MULTILINE, ECMA_VALUE_FALSE, ECMA_PROPERTY_FIXED) /* ECMA-262 v5, 15.10.7.5 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LASTINDEX_UL, - 0, - ECMA_PROPERTY_FLAG_WRITABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LASTINDEX_UL, 0, ECMA_PROPERTY_FLAG_WRITABLE) #endif /* JERRY_ESNEXT */ #if JERRY_BUILTIN_ANNEXB diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.c index 9d3ab15f..d2d0d56e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.c @@ -26,7 +26,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-regexp-string-iterator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID regexp_string_iterator_prototype +#define BUILTIN_UNDERSCORED_ID regexp_string_iterator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -144,9 +144,8 @@ ecma_builtin_regexp_string_iterator_prototype_object_next (ecma_value_t this_val } uint8_t flags = regexp_string_iterator_obj->header.u.cls.u1.regexp_string_iterator_flags; - ecma_length_t next_index = ecma_op_advance_string_index (matcher_str_p, - this_index, - (flags & RE_FLAG_UNICODE) != 0); + ecma_length_t next_index = + ecma_op_advance_string_index (matcher_str_p, this_index, (flags & RE_FLAG_UNICODE) != 0); ecma_value_t next_index_value = ecma_make_length_value (next_index); ecma_value_t set = ecma_op_object_put (regexp_obj_p, diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c index e2274301..e9990429 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c @@ -19,17 +19,18 @@ #include "ecma-exceptions.h" #include "ecma-gc.h" #include "ecma-helpers.h" -#include "jcontext.h" #include "ecma-objects.h" #include "ecma-regexp-object.h" +#include "jcontext.h" + #if JERRY_BUILTIN_REGEXP #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-regexp.inc.h" -#define BUILTIN_UNDERSCORED_ID regexp +#define BUILTIN_UNDERSCORED_ID regexp #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -199,8 +200,7 @@ ecma_value_t ecma_builtin_regexp_dispatch_call (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_builtin_regexp_dispatch_helper (arguments_list_p, - arguments_list_len); + return ecma_builtin_regexp_dispatch_helper (arguments_list_p, arguments_list_len); } /* ecma_builtin_regexp_dispatch_call */ /** @@ -213,8 +213,7 @@ ecma_value_t ecma_builtin_regexp_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_builtin_regexp_dispatch_helper (arguments_list_p, - arguments_list_len); + return ecma_builtin_regexp_dispatch_helper (arguments_list_p, arguments_list_len); } /* ecma_builtin_regexp_dispatch_construct */ #if JERRY_ESNEXT diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h index f64cea94..882e42ca 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h @@ -21,24 +21,16 @@ #if JERRY_BUILTIN_REGEXP -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 2, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 2, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* ECMA-262 v5, 15.10.5.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_REGEXP_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_REGEXP_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 21.2.4.2 */ -ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, - ecma_builtin_regexp_species_get, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_regexp_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_REGEXP */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c index 38bf75b2..e435626b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c @@ -37,7 +37,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-set-iterator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID set_iterator_prototype +#define BUILTIN_UNDERSCORED_ID set_iterator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h index 471f5ccf..4704236a 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h @@ -21,9 +21,7 @@ #if JERRY_BUILTIN_CONTAINER -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_SET_ITERATOR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_SET_ITERATOR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c index 3f596bda..8ff2687c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c @@ -25,7 +25,7 @@ */ #define BUILTIN_CUSTOM_DISPATCH #define BUILTIN_INC_HEADER_NAME "ecma-builtin-set-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID set_prototype +#define BUILTIN_UNDERSCORED_ID set_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h index 1c819a13..8c6f874b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h @@ -25,14 +25,10 @@ * (property name, object pointer getter) */ /* ECMA-262 v6, 23.2.3.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_SET, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_SET, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 23.1.3.13 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_SET_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_SET_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -42,16 +38,17 @@ ROUTINE (LIT_MAGIC_STRING_DELETE, ECMA_CONTAINER_ROUTINE_DELETE, 1, 1) ROUTINE (LIT_MAGIC_STRING_FOR_EACH_UL, ECMA_CONTAINER_ROUTINE_FOREACH, 2, 1) ROUTINE (LIT_MAGIC_STRING_HAS, ECMA_CONTAINER_ROUTINE_HAS, 1, 1) ROUTINE (LIT_MAGIC_STRING_ENTRIES, ECMA_CONTAINER_ROUTINE_ENTRIES, 0, 0) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_VALUES, LIT_INTERNAL_MAGIC_STRING_SET_PROTOTYPE_VALUES, +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_VALUES, + LIT_INTERNAL_MAGIC_STRING_SET_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, LIT_INTERNAL_MAGIC_STRING_SET_PROTOTYPE_VALUES, +INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, + LIT_INTERNAL_MAGIC_STRING_SET_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_KEYS, LIT_INTERNAL_MAGIC_STRING_SET_PROTOTYPE_VALUES, +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_KEYS, + LIT_INTERNAL_MAGIC_STRING_SET_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE, - ECMA_CONTAINER_ROUTINE_SIZE_GETTER, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE, ECMA_CONTAINER_ROUTINE_SIZE_GETTER, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_BUILTIN_CONTAINER */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set.c index 5bc8fcc0..8210cc94 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set.c @@ -14,8 +14,8 @@ */ #include "ecma-builtins.h" -#include "ecma-exceptions.h" #include "ecma-container-object.h" +#include "ecma-exceptions.h" #if JERRY_BUILTIN_CONTAINER @@ -23,7 +23,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-set.inc.h" -#define BUILTIN_UNDERSCORED_ID set +#define BUILTIN_UNDERSCORED_ID set #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h index 0d2a7d71..559b4ccb 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h @@ -25,27 +25,19 @@ * (property name, number value, writable, enumerable, configurable) */ /* ECMA-262 v6, 23.2.2 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 23.1 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_SET_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_SET_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v6, 23.2.2.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_SET_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_SET_PROTOTYPE, ECMA_PROPERTY_FIXED) /* ECMA-262 v6, 23.2.2.2 */ -ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, - ecma_builtin_set_species_get, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_set_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_BUILTIN_CONTAINER */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer-prototype.c index aea79461..dc6fc22f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer-prototype.c @@ -13,6 +13,7 @@ * limitations under the License. */ +#include "ecma-arraybuffer-object.h" #include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" @@ -23,9 +24,9 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-shared-arraybuffer-object.h" -#include "ecma-arraybuffer-object.h" -#include "jrt.h" + #include "jrt-libc-includes.h" +#include "jrt.h" #if JERRY_BUILTIN_SHAREDARRAYBUFFER @@ -33,7 +34,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-shared-arraybuffer-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID shared_arraybuffer_prototype +#define BUILTIN_UNDERSCORED_ID shared_arraybuffer_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer-prototype.inc.h index 4008dee7..c7b0b9eb 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer-prototype.inc.h @@ -24,9 +24,7 @@ /* Object properties: * (property name, object pointer getter) */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_SHARED_ARRAYBUFFER, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_SHARED_ARRAYBUFFER, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* Readonly accessor properties */ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_LENGTH_UL, @@ -34,9 +32,7 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_LENGTH_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v11, 24.2.4.4 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_SHARED_ARRAY_BUFFER_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_SHARED_ARRAY_BUFFER_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer.c b/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer.c index e5b7ba00..473287ec 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer.c @@ -14,13 +14,14 @@ */ #include "ecma-builtins.h" +#include "ecma-dataview-object.h" #include "ecma-exceptions.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-shared-arraybuffer-object.h" -#include "ecma-dataview-object.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_SHAREDARRAYBUFFER @@ -29,7 +30,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-shared-arraybuffer.inc.h" -#define BUILTIN_UNDERSCORED_ID shared_arraybuffer +#define BUILTIN_UNDERSCORED_ID shared_arraybuffer #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer.inc.h index 35eafcf2..8a7c73a7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-shared-arraybuffer.inc.h @@ -24,20 +24,14 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_SHARED_ARRAYBUFFER_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_SHARED_ARRAYBUFFER_PROTOTYPE, ECMA_PROPERTY_FIXED) -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_SHARED_ARRAY_BUFFER_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_SHARED_ARRAY_BUFFER_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c index 639fecae..a939a888 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c @@ -37,7 +37,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-string-iterator-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID string_iterator_prototype +#define BUILTIN_UNDERSCORED_ID string_iterator_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -157,10 +157,8 @@ ecma_builtin_string_iterator_prototype_object_next (ecma_value_t this_val) /**< ext_obj_p->u.cls.u2.iterator_index = ECMA_ITERATOR_INDEX_LIMIT; ecma_string_t *prop_name_p = ecma_get_magic_string (LIT_INTERNAL_MAGIC_STRING_ITERATOR_NEXT_INDEX); - ecma_value_t put_result = ecma_op_object_put (obj_p, - prop_name_p, - ecma_make_length_value (position + result_size), - true); + ecma_value_t put_result = + ecma_op_object_put (obj_p, prop_name_p, ecma_make_length_value (position + result_size), true); JERRY_ASSERT (ecma_is_value_true (put_result)); } diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h index 1597c5b2..e5d043d1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h @@ -21,9 +21,7 @@ #if JERRY_ESNEXT -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_STRING_ITERATOR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_STRING_ITERATOR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c index c1c09d65..dafde43e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c @@ -16,8 +16,8 @@ #include "ecma-alloc.h" #include "ecma-array-object.h" #include "ecma-builtin-helpers.h" -#include "ecma-builtins.h" #include "ecma-builtin-regexp.inc.h" +#include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" #include "ecma-function-object.h" @@ -27,9 +27,10 @@ #include "ecma-iterator-object.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jcontext.h" -#include "jrt.h" #include "jrt-libc-includes.h" +#include "jrt.h" #include "lit-char-helpers.h" #include "lit-strings.h" @@ -96,7 +97,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-string-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID string_prototype +#define BUILTIN_UNDERSCORED_ID string_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -179,8 +180,7 @@ ecma_builtin_string_prototype_char_at_helper (ecma_value_t this_arg, /**< this a if (index_num < 0 || index_num >= len || (ecma_number_is_nan (index_num) && len == 0)) { ecma_deref_ecma_string (original_string_p); - return (charcode_mode ? ecma_make_nan_value () - : ecma_make_magic_string_value (LIT_MAGIC_STRING__EMPTY)); + return (charcode_mode ? ecma_make_nan_value () : ecma_make_magic_string_value (LIT_MAGIC_STRING__EMPTY)); } /* 6 */ @@ -338,7 +338,6 @@ ecma_builtin_string_prototype_object_match (ecma_value_t this_argument, /**< thi /* 7. */ if (ECMA_IS_VALUE_ERROR (new_regexp)) { - ecma_deref_object (regexp_obj_p); ecma_deref_ecma_string (this_str_p); return new_regexp; @@ -629,20 +628,13 @@ ecma_builtin_string_prototype_object_replace_helper (ecma_value_t this_value, /* } uint8_t input_flags = ECMA_STRING_FLAG_IS_ASCII; - replace_ctx.string_p = ecma_string_get_chars (input_str_p, - &(replace_ctx.string_size), - NULL, - NULL, - &input_flags); + replace_ctx.string_p = ecma_string_get_chars (input_str_p, &(replace_ctx.string_size), NULL, NULL, &input_flags); lit_utf8_size_t search_size; lit_utf8_size_t search_length; uint8_t search_flags = ECMA_STRING_FLAG_IS_ASCII; - const lit_utf8_byte_t *search_buf_p = ecma_string_get_chars (search_str_p, - &search_size, - &search_length, - NULL, - &search_flags); + const lit_utf8_byte_t *search_buf_p = + ecma_string_get_chars (search_str_p, &search_size, &search_length, NULL, &search_flags); ecma_string_t *result_string_p = NULL; @@ -669,17 +661,11 @@ ecma_builtin_string_prototype_object_replace_helper (ecma_value_t this_value, /* { ecma_object_t *function_p = ecma_get_object_from_value (replace_value); - ecma_value_t args[] = - { - ecma_make_string_value (search_str_p), - ecma_make_uint32_value (pos), - ecma_make_string_value (input_str_p) - }; + ecma_value_t args[] = { ecma_make_string_value (search_str_p), + ecma_make_uint32_value (pos), + ecma_make_string_value (input_str_p) }; - result = ecma_op_function_call (function_p, - ECMA_VALUE_UNDEFINED, - args, - 3); + result = ecma_op_function_call (function_p, ECMA_VALUE_UNDEFINED, args, 3); if (ECMA_IS_VALUE_ERROR (result)) { @@ -708,8 +694,7 @@ ecma_builtin_string_prototype_object_replace_helper (ecma_value_t this_value, /* ecma_builtin_replace_substitute (&replace_ctx); } - if (!replace_all - || last_match_end_p == input_end_p) + if (!replace_all || last_match_end_p == input_end_p) { break; } @@ -727,10 +712,9 @@ ecma_builtin_string_prototype_object_replace_helper (ecma_value_t this_value, /* } ecma_stringbuilder_append_raw (&replace_ctx.builder, - last_match_end_p, - (lit_utf8_size_t) (input_end_p - last_match_end_p)); + last_match_end_p, + (lit_utf8_size_t) (input_end_p - last_match_end_p)); result_string_p = ecma_stringbuilder_finalize (&replace_ctx.builder); - } if (result_string_p == NULL) @@ -827,9 +811,8 @@ ecma_builtin_string_prototype_object_search (ecma_value_t this_value, /**< this return ECMA_VALUE_ERROR; } - ecma_value_t new_regexp = ecma_op_create_regexp_from_pattern (new_regexp_obj_p, - ecma_make_string_value (pattern_p), - ECMA_VALUE_UNDEFINED); + ecma_value_t new_regexp = + ecma_op_create_regexp_from_pattern (new_regexp_obj_p, ecma_make_string_value (pattern_p), ECMA_VALUE_UNDEFINED); ecma_deref_ecma_string (pattern_p); @@ -875,9 +858,7 @@ ecma_builtin_string_prototype_object_slice (ecma_string_t *get_string_val, /**< /* 4. 6. */ lit_utf8_size_t start = 0, end = len; - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (arg1, - len, - &start))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (arg1, len, &start))) { return ECMA_VALUE_ERROR; } @@ -889,9 +870,7 @@ ecma_builtin_string_prototype_object_slice (ecma_string_t *get_string_val, /**< } else { - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (arg2, - len, - &end))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (arg2, len, &end))) { return ECMA_VALUE_ERROR; } @@ -1046,32 +1025,23 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_value, /**< this a lit_utf8_size_t string_size; uint8_t string_flags = ECMA_STRING_FLAG_IS_ASCII; - const lit_utf8_byte_t *string_buffer_p = ecma_string_get_chars (string_p, - &string_size, - NULL, - NULL, - &string_flags); + const lit_utf8_byte_t *string_buffer_p = ecma_string_get_chars (string_p, &string_size, NULL, NULL, &string_flags); lit_utf8_size_t separator_size; uint8_t separator_flags = ECMA_STRING_FLAG_IS_ASCII; - const lit_utf8_byte_t *separator_buffer_p = ecma_string_get_chars (separator_p, - &separator_size, - NULL, - NULL, - &separator_flags); + const lit_utf8_byte_t *separator_buffer_p = + ecma_string_get_chars (separator_p, &separator_size, NULL, NULL, &separator_flags); const lit_utf8_byte_t *const string_end_p = string_buffer_p + string_size; - const lit_utf8_byte_t *const compare_end_p = JERRY_MIN (string_end_p - separator_size + 1, - string_end_p); + const lit_utf8_byte_t *const compare_end_p = JERRY_MIN (string_end_p - separator_size + 1, string_end_p); const lit_utf8_byte_t *current_p = string_buffer_p; const lit_utf8_byte_t *last_str_begin_p = string_buffer_p; while (current_p < compare_end_p) { - if (!memcmp (current_p, separator_buffer_p, separator_size) - && (last_str_begin_p != current_p + separator_size)) + if (!memcmp (current_p, separator_buffer_p, separator_size) && (last_str_begin_p != current_p + separator_size)) { - ecma_string_t *substr_p = ecma_new_ecma_string_from_utf8 (last_str_begin_p, - (lit_utf8_size_t) (current_p - last_str_begin_p)); + ecma_string_t *substr_p = + ecma_new_ecma_string_from_utf8 (last_str_begin_p, (lit_utf8_size_t) (current_p - last_str_begin_p)); ecma_value_t put_result = ecma_builtin_helper_def_prop_by_index (array_p, array_length++, ecma_make_string_value (substr_p), @@ -1092,8 +1062,8 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_value, /**< this a lit_utf8_incr (¤t_p); } - ecma_string_t *end_substr_p = ecma_new_ecma_string_from_utf8 (last_str_begin_p, - (lit_utf8_size_t) (string_end_p - last_str_begin_p)); + ecma_string_t *end_substr_p = + ecma_new_ecma_string_from_utf8 (last_str_begin_p, (lit_utf8_size_t) (string_end_p - last_str_begin_p)); ecma_value_t put_result = ecma_builtin_helper_def_prop_by_index (array_p, array_length, ecma_make_string_value (end_substr_p), @@ -1211,8 +1181,7 @@ ecma_builtin_string_prototype_object_conversion_helper (ecma_string_t *input_str lit_code_point_t cp = lit_cesu8_read_next (&input_curr_p); #if JERRY_ESNEXT - if (lit_is_code_point_utf16_high_surrogate (cp) - && input_curr_p < input_str_end_p) + if (lit_is_code_point_utf16_high_surrogate (cp) && input_curr_p < input_str_end_p) { const ecma_char_t next_ch = lit_cesu8_peek_next (input_curr_p); if (lit_is_code_point_utf16_low_surrogate (next_ch)) @@ -1312,8 +1281,7 @@ ecma_builtin_string_prototype_object_repeat (ecma_string_t *original_string_p, / for (int32_t n = 0; n < repeat_count; n++) { - buffer_ptr += ecma_string_copy_to_cesu8_buffer (original_string_p, buffer_ptr, - (lit_utf8_size_t) (size)); + buffer_ptr += ecma_string_copy_to_cesu8_buffer (original_string_p, buffer_ptr, (lit_utf8_size_t) (size)); } ret_string_p = ecma_new_ecma_string_from_utf8 (str_buffer, (lit_utf8_size_t) (buffer_ptr - str_buffer)); @@ -1353,17 +1321,14 @@ ecma_builtin_string_prototype_object_code_point_at (ecma_string_t *this_string_p ecma_char_t first = ecma_string_get_char_at_pos (this_string_p, index); - if (first < LIT_UTF16_HIGH_SURROGATE_MIN - || first > LIT_UTF16_HIGH_SURROGATE_MAX - || index + 1 == length) + if (first < LIT_UTF16_HIGH_SURROGATE_MIN || first > LIT_UTF16_HIGH_SURROGATE_MAX || index + 1 == length) { return ecma_make_uint32_value (first); } ecma_char_t second = ecma_string_get_char_at_pos (this_string_p, index + 1); - if (second < LIT_UTF16_LOW_SURROGATE_MARKER - || second > LIT_UTF16_LOW_SURROGATE_MAX) + if (second < LIT_UTF16_LOW_SURROGATE_MARKER || second > LIT_UTF16_LOW_SURROGATE_MAX) { return ecma_make_uint32_value (first); } diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h index 5e78ffed..ba3278f1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h @@ -25,17 +25,13 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.5.4.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_STRING, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_STRING, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* Number properties: * (property name, number value) */ /* ECMA-262 v5, 15.5.4 (String.prototype is itself a String object whose value is an empty String), 15.5.5.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FIXED) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -77,19 +73,15 @@ ROUTINE (LIT_MAGIC_STRING_STARTS_WITH, ECMA_STRING_PROTOTYPE_STARTS_WITH, 2, 1) ROUTINE (LIT_MAGIC_STRING_INCLUDES, ECMA_STRING_PROTOTYPE_INCLUDES, 2, 1) ROUTINE (LIT_MAGIC_STRING_ENDS_WITH, ECMA_STRING_PROTOTYPE_ENDS_WITH, 2, 1) ROUTINE (LIT_MAGIC_STRING_CODE_POINT_AT, ECMA_STRING_PROTOTYPE_CODE_POINT_AT, 1, 1) -ROUTINE (LIT_MAGIC_STRING_PAD_START, ECMA_STRING_PROTOTYPE_PAD_START, 2, 1) -ROUTINE (LIT_MAGIC_STRING_PAD_END, ECMA_STRING_PROTOTYPE_PAD_END, 2, 1) +ROUTINE (LIT_MAGIC_STRING_PAD_START, ECMA_STRING_PROTOTYPE_PAD_START, 2, 1) +ROUTINE (LIT_MAGIC_STRING_PAD_END, ECMA_STRING_PROTOTYPE_PAD_END, 2, 1) ROUTINE (LIT_GLOBAL_SYMBOL_ITERATOR, ECMA_STRING_PROTOTYPE_ITERATOR, 0, 0) ROUTINE (LIT_MAGIC_STRING_MATCH_ALL, ECMA_STRING_PROTOTYPE_MATCH_ALL, 1, 1) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_START, LIT_MAGIC_STRING_TRIM_START, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_LEFT, LIT_MAGIC_STRING_TRIM_START, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_END, LIT_MAGIC_STRING_TRIM_END, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_RIGHT, LIT_MAGIC_STRING_TRIM_END, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_START, LIT_MAGIC_STRING_TRIM_START, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_LEFT, LIT_MAGIC_STRING_TRIM_START, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_END, LIT_MAGIC_STRING_TRIM_END, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_RIGHT, LIT_MAGIC_STRING_TRIM_END, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_STRING */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string.c index db4ca8a6..206889ba 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string.c @@ -13,7 +13,6 @@ * limitations under the License. */ -#include "lit-strings.h" #include "ecma-alloc.h" #include "ecma-builtins.h" #include "ecma-conversion.h" @@ -23,6 +22,8 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + +#include "lit-strings.h" #if JERRY_ESNEXT #include "ecma-symbol-object.h" #endif /* JERRY_ESNEXT */ @@ -50,7 +51,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-string.inc.h" -#define BUILTIN_UNDERSCORED_ID string +#define BUILTIN_UNDERSCORED_ID string #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -85,15 +86,11 @@ ecma_builtin_string_object_from_char_code (const ecma_value_t args[], /**< argum ecma_string_t *ret_string_p = NULL; bool isError = false; - JMEM_DEFINE_LOCAL_ARRAY (utf8_buf_p, - utf8_buf_size, - lit_utf8_byte_t); + JMEM_DEFINE_LOCAL_ARRAY (utf8_buf_p, utf8_buf_size, lit_utf8_byte_t); lit_utf8_size_t utf8_buf_used = 0; - for (uint32_t arg_index = 0; - arg_index < args_number; - arg_index++) + for (uint32_t arg_index = 0; arg_index < args_number; arg_index++) { ecma_number_t arg_num; @@ -411,7 +408,7 @@ ecma_builtin_string_dispatch_routine (uint8_t builtin_routine_id, /**< built-in switch (builtin_routine_id) { - case ECMA_BUILTIN_STRING_OBJECT_FROM_CHAR_CODE: + case ECMA_BUILTIN_STRING_OBJECT_FROM_CHAR_CODE: { return ecma_builtin_string_object_from_char_code (arguments_list_p, arguments_number); } diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h index 0d08ace2..8bc41343 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h @@ -24,22 +24,16 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.7.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_STRING_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_STRING_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_STRING_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_STRING_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ /* Routine properties: diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c index 9bd30dce..c508148b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c @@ -13,16 +13,17 @@ * limitations under the License. */ - #include "ecma-alloc.h" - #include "ecma-builtins.h" - #include "ecma-conversion.h" - #include "ecma-exceptions.h" - #include "ecma-gc.h" - #include "ecma-globals.h" - #include "ecma-helpers.h" - #include "ecma-objects.h" - #include "ecma-symbol-object.h" - #include "jrt.h" +#include "ecma-alloc.h" +#include "ecma-builtins.h" +#include "ecma-conversion.h" +#include "ecma-exceptions.h" +#include "ecma-gc.h" +#include "ecma-globals.h" +#include "ecma-helpers.h" +#include "ecma-objects.h" +#include "ecma-symbol-object.h" + +#include "jrt.h" #if JERRY_ESNEXT @@ -47,7 +48,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-symbol-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID symbol_prototype +#define BUILTIN_UNDERSCORED_ID symbol_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h index 15ff82a0..585b86b6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h @@ -24,26 +24,17 @@ /* Object properties: * (property name, object pointer getter) */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_SYMBOL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_SYMBOL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) ROUTINE (LIT_MAGIC_STRING_TO_STRING_UL, ECMA_SYMBOL_PROTOTYPE_TO_STRING, 0, 0) ROUTINE (LIT_MAGIC_STRING_VALUE_OF_UL, ECMA_SYMBOL_PROTOTYPE_VALUE_OF, 0, 0) -ROUTINE_CONFIGURABLE_ONLY (LIT_GLOBAL_SYMBOL_TO_PRIMITIVE, - ECMA_SYMBOL_PROTOTYPE_TO_PRIMITIVE, - 0, - 1) +ROUTINE_CONFIGURABLE_ONLY (LIT_GLOBAL_SYMBOL_TO_PRIMITIVE, ECMA_SYMBOL_PROTOTYPE_TO_PRIMITIVE, 0, 1) /* ECMA-262 v6, 19.4.3.4 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_SYMBOL_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_SYMBOL_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262, v11, 19.4.3.2 */ -ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_DESCRIPTION, - ECMA_SYMBOL_PROTOTYPE_DESCRIPTION, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_DESCRIPTION, ECMA_SYMBOL_PROTOTYPE_DESCRIPTION, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c index 5cec6a05..646a4daa 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c @@ -13,18 +13,19 @@ * limitations under the License. */ - #include "ecma-alloc.h" - #include "ecma-builtins.h" - #include "ecma-conversion.h" - #include "ecma-exceptions.h" - #include "ecma-gc.h" - #include "ecma-globals.h" - #include "ecma-helpers.h" - #include "ecma-objects.h" - #include "ecma-symbol-object.h" - #include "ecma-literal-storage.h" - #include "jcontext.h" - #include "jrt.h" +#include "ecma-alloc.h" +#include "ecma-builtins.h" +#include "ecma-conversion.h" +#include "ecma-exceptions.h" +#include "ecma-gc.h" +#include "ecma-globals.h" +#include "ecma-helpers.h" +#include "ecma-literal-storage.h" +#include "ecma-objects.h" +#include "ecma-symbol-object.h" + +#include "jcontext.h" +#include "jrt.h" #if JERRY_ESNEXT @@ -32,7 +33,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-symbol.inc.h" -#define BUILTIN_UNDERSCORED_ID symbol +#define BUILTIN_UNDERSCORED_ID symbol #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -106,15 +107,13 @@ ecma_builtin_symbol_for_helper (ecma_value_t value_to_find) /**< symbol or ecma- while (symbol_list_cp != JMEM_CP_NULL) { - ecma_lit_storage_item_t *symbol_list_p = JMEM_CP_GET_NON_NULL_POINTER (ecma_lit_storage_item_t, - symbol_list_cp); + ecma_lit_storage_item_t *symbol_list_p = JMEM_CP_GET_NON_NULL_POINTER (ecma_lit_storage_item_t, symbol_list_cp); for (int i = 0; i < ECMA_LIT_STORAGE_VALUE_COUNT; i++) { if (symbol_list_p->values[i] != JMEM_CP_NULL) { - ecma_string_t *value_p = JMEM_CP_GET_NON_NULL_POINTER (ecma_string_t, - symbol_list_p->values[i]); + ecma_string_t *value_p = JMEM_CP_GET_NON_NULL_POINTER (ecma_string_t, symbol_list_p->values[i]); if (is_for) { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h index a2037c82..1d34b3a4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h @@ -25,73 +25,54 @@ * (property name, number value, writable, enumerable, configurable) */ /* ECMA-262 v6, 19.4.2 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_CONFIGURABLE) -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_SYMBOL_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_SYMBOL_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v6, 19.4.2.7 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_SYMBOL_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_SYMBOL_PROTOTYPE, ECMA_PROPERTY_FIXED) /* ECMA-262 v10, 19.4.2.1 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_ASYNC_ITERATOR, - LIT_GLOBAL_SYMBOL_ASYNC_ITERATOR) +SYMBOL_VALUE (LIT_MAGIC_STRING_ASYNC_ITERATOR, LIT_GLOBAL_SYMBOL_ASYNC_ITERATOR) /* ECMA-262 v6, 19.4.2.2 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_HAS_INSTANCE, - LIT_GLOBAL_SYMBOL_HAS_INSTANCE) +SYMBOL_VALUE (LIT_MAGIC_STRING_HAS_INSTANCE, LIT_GLOBAL_SYMBOL_HAS_INSTANCE) /* ECMA-262 v6, 19.4.2.3 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_IS_CONCAT_SPREADABLE, - LIT_GLOBAL_SYMBOL_IS_CONCAT_SPREADABLE) +SYMBOL_VALUE (LIT_MAGIC_STRING_IS_CONCAT_SPREADABLE, LIT_GLOBAL_SYMBOL_IS_CONCAT_SPREADABLE) /* ECMA-262 v6, 19.4.2.4 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_ITERATOR, - LIT_GLOBAL_SYMBOL_ITERATOR) +SYMBOL_VALUE (LIT_MAGIC_STRING_ITERATOR, LIT_GLOBAL_SYMBOL_ITERATOR) /* ECMA-262 v6, 19.4.2.6 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_MATCH, - LIT_GLOBAL_SYMBOL_MATCH) +SYMBOL_VALUE (LIT_MAGIC_STRING_MATCH, LIT_GLOBAL_SYMBOL_MATCH) /* ECMA-262 v6, 19.4.2.8 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_REPLACE, - LIT_GLOBAL_SYMBOL_REPLACE) +SYMBOL_VALUE (LIT_MAGIC_STRING_REPLACE, LIT_GLOBAL_SYMBOL_REPLACE) /* ECMA-262 v6, 19.4.2.9 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_SEARCH, - LIT_GLOBAL_SYMBOL_SEARCH) +SYMBOL_VALUE (LIT_MAGIC_STRING_SEARCH, LIT_GLOBAL_SYMBOL_SEARCH) /* ECMA-262 v6, 19.4.2.10 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_SPECIES, - LIT_GLOBAL_SYMBOL_SPECIES) +SYMBOL_VALUE (LIT_MAGIC_STRING_SPECIES, LIT_GLOBAL_SYMBOL_SPECIES) /* ECMA-262 v6, 19.4.2.11 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_SPLIT, - LIT_GLOBAL_SYMBOL_SPLIT) +SYMBOL_VALUE (LIT_MAGIC_STRING_SPLIT, LIT_GLOBAL_SYMBOL_SPLIT) /* ECMA-262 v6, 19.4.2.12 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_TO_PRIMITIVE, - LIT_GLOBAL_SYMBOL_TO_PRIMITIVE) +SYMBOL_VALUE (LIT_MAGIC_STRING_TO_PRIMITIVE, LIT_GLOBAL_SYMBOL_TO_PRIMITIVE) /* ECMA-262 v6, 19.4.2.13 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_TO_STRING_TAG, - LIT_GLOBAL_SYMBOL_TO_STRING_TAG) +SYMBOL_VALUE (LIT_MAGIC_STRING_TO_STRING_TAG, LIT_GLOBAL_SYMBOL_TO_STRING_TAG) /* ECMA-262 v6, 19.4.2.14 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_UNSCOPABLES, - LIT_GLOBAL_SYMBOL_UNSCOPABLES) +SYMBOL_VALUE (LIT_MAGIC_STRING_UNSCOPABLES, LIT_GLOBAL_SYMBOL_UNSCOPABLES) /* ECMA-262 v11, 19.4.2.8 */ -SYMBOL_VALUE (LIT_MAGIC_STRING_MATCH_ALL, - LIT_GLOBAL_SYMBOL_MATCH_ALL) +SYMBOL_VALUE (LIT_MAGIC_STRING_MATCH_ALL, LIT_GLOBAL_SYMBOL_MATCH_ALL) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c index 915c586f..2e5e7b8c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c @@ -22,6 +22,7 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -30,7 +31,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-syntaxerror-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID syntax_error_prototype +#define BUILTIN_UNDERSCORED_ID syntax_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h index abaf5a4f..670efc1d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h @@ -25,19 +25,13 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.7.8 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_SYNTAX_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_SYNTAX_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.9 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_SYNTAX_ERROR_UL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_SYNTAX_ERROR_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.10 */ -STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c index 29d2ce6c..6227ef60 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c @@ -14,17 +14,18 @@ */ #include "ecma-alloc.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" #include "ecma-objects.h" -#include "ecma-function-object.h" -#include "jrt.h" + #include "jcontext.h" +#include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -32,7 +33,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-syntaxerror.inc.h" -#define BUILTIN_UNDERSCORED_ID syntax_error +#define BUILTIN_UNDERSCORED_ID syntax_error #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h index 88e12d51..18df8255 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h @@ -24,22 +24,16 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_SYNTAX_ERROR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_SYNTAX_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.c b/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.c index 98a68f03..3e2f9df3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.c @@ -21,13 +21,14 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-objects.h" + #include "jrt.h" #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-type-error-thrower.inc.h" -#define BUILTIN_UNDERSCORED_ID type_error_thrower +#define BUILTIN_UNDERSCORED_ID type_error_thrower #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.inc.h index 4833a075..e44c8aba 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.inc.h @@ -24,12 +24,8 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FIXED) -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_FIXED) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_FIXED) #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c index 45ad8210..9e9971a1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c @@ -22,6 +22,7 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -30,7 +31,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-typeerror-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID type_error_prototype +#define BUILTIN_UNDERSCORED_ID type_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h index b34fb39e..4d0b4f28 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h @@ -25,19 +25,13 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.7.8 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_TYPE_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_TYPE_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.9 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_TYPE_ERROR_UL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_TYPE_ERROR_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.10 */ -STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c index 608f241f..a16fce50 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c @@ -14,17 +14,18 @@ */ #include "ecma-alloc.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" #include "ecma-objects.h" -#include "ecma-function-object.h" -#include "jrt.h" + #include "jcontext.h" +#include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -32,7 +33,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-typeerror.inc.h" -#define BUILTIN_UNDERSCORED_ID type_error +#define BUILTIN_UNDERSCORED_ID type_error #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -69,8 +70,8 @@ ecma_builtin_type_error_dispatch_construct (const ecma_value_t *arguments_list_p #if !JERRY_ESNEXT return ecma_builtin_type_error_dispatch_call (arguments_list_p, arguments_list_len); #else /* JERRY_ESNEXT */ - ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), - ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE); + ecma_object_t *proto_p = + ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE); if (proto_p == NULL) { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h index bcd735b1..a4508f91 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h @@ -24,22 +24,16 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_TYPE_ERROR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_TYPE_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c index 068ec26a..26acbaba 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c @@ -22,6 +22,7 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" + #include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -30,7 +31,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-urierror-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID uri_error_prototype +#define BUILTIN_UNDERSCORED_ID uri_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h index caa932cd..2b6fd89c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h @@ -25,19 +25,13 @@ * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.7.8 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_URI_ERROR, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_URI_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.9 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_URI_ERROR_UL, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_URI_ERROR_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.11.7.10 */ -STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, - LIT_MAGIC_STRING__EMPTY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c index fed1838e..52d7a2b6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c @@ -14,17 +14,18 @@ */ #include "ecma-alloc.h" +#include "ecma-builtin-helpers.h" #include "ecma-builtins.h" #include "ecma-conversion.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-builtin-helpers.h" #include "ecma-objects.h" -#include "ecma-function-object.h" -#include "jrt.h" + #include "jcontext.h" +#include "jrt.h" #if JERRY_BUILTIN_ERRORS @@ -32,7 +33,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-urierror.inc.h" -#define BUILTIN_UNDERSCORED_ID uri_error +#define BUILTIN_UNDERSCORED_ID uri_error #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -69,8 +70,8 @@ ecma_builtin_uri_error_dispatch_construct (const ecma_value_t *arguments_list_p, #if !JERRY_ESNEXT return ecma_builtin_uri_error_dispatch_call (arguments_list_p, arguments_list_len); #else /* JERRY_ESNEXT */ - ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), - ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE); + ecma_object_t *proto_p = + ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE); if (proto_p == NULL) { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h index 08259451..fd98a1d7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h @@ -24,22 +24,16 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v5, 15.11.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) #if JERRY_ESNEXT -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_URI_ERROR_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_URI_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_ESNEXT */ #endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c index d522e9da..2a8d6768 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c @@ -25,7 +25,7 @@ */ #define BUILTIN_CUSTOM_DISPATCH #define BUILTIN_INC_HEADER_NAME "ecma-builtin-weakmap-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID weakmap_prototype +#define BUILTIN_UNDERSCORED_ID weakmap_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h index d2c1acc6..75d61770 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h @@ -25,14 +25,10 @@ * (property name, object pointer getter) */ /* ECMA-262 v6, 23.3.3.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_WEAKMAP, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_WEAKMAP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 23.3.3.6 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_WEAKMAP_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_WEAKMAP_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c index 7496e335..76dcfedf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c @@ -14,8 +14,8 @@ */ #include "ecma-builtins.h" -#include "ecma-exceptions.h" #include "ecma-container-object.h" +#include "ecma-exceptions.h" #if JERRY_BUILTIN_CONTAINER @@ -23,7 +23,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-weakmap.inc.h" -#define BUILTIN_UNDERSCORED_ID weakmap +#define BUILTIN_UNDERSCORED_ID weakmap #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h index 141b1824..8bf9843f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h @@ -25,22 +25,16 @@ * (property name, number value, writable, enumerable, configurable) */ /* ECMA-262 v6, 23.3.2 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 23.1 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_WEAKMAP_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_WEAKMAP_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v6, 23.3.2.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE, ECMA_PROPERTY_FIXED) #endif /* JERRY_BUILTIN_CONTAINER */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakref-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakref-prototype.c index b5a93fea..be72d066 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakref-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakref-prototype.c @@ -39,7 +39,7 @@ enum * This object has a custom dispatch function. */ #define BUILTIN_INC_HEADER_NAME "ecma-builtin-weakref-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID weakref_prototype +#define BUILTIN_UNDERSCORED_ID weakref_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -52,12 +52,12 @@ enum * @{ */ - /** - * Deref checks weakRef target - * - * @return weakRef target - * error - otherwise - */ +/** + * Deref checks weakRef target + * + * @return weakRef target + * error - otherwise + */ static ecma_value_t ecma_builtin_weakref_prototype_object_deref (ecma_value_t this_arg) /**< this argument */ { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakref-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakref-prototype.inc.h index cf05cf43..533d3956 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakref-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakref-prototype.inc.h @@ -24,13 +24,9 @@ /* Object properties: * (property name, object pointer getter) */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_WEAKREF, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_WEAKREF, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_WEAKREF_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_WEAKREF_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakref.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakref.c index 381888f4..286c76e8 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakref.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakref.c @@ -15,17 +15,18 @@ #include "ecma-builtins.h" #include "ecma-exceptions.h" -#include "jcontext.h" #include "ecma-function-object.h" #include "ecma-gc.h" +#include "jcontext.h" + #if JERRY_BUILTIN_WEAKREF #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-weakref.inc.h" -#define BUILTIN_UNDERSCORED_ID weakref +#define BUILTIN_UNDERSCORED_ID weakref #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -68,17 +69,15 @@ ecma_builtin_weakref_dispatch_construct (const ecma_value_t *arguments_list_p, / JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p) != NULL); - ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), - ECMA_BUILTIN_ID_WEAKREF_PROTOTYPE); + ecma_object_t *proto_p = + ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_WEAKREF_PROTOTYPE); if (JERRY_UNLIKELY (proto_p == NULL)) { return ECMA_VALUE_ERROR; } - ecma_object_t *object_p = ecma_create_object (proto_p, - sizeof (ecma_extended_object_t), - ECMA_OBJECT_TYPE_CLASS); + ecma_object_t *object_p = ecma_create_object (proto_p, sizeof (ecma_extended_object_t), ECMA_OBJECT_TYPE_CLASS); ecma_deref_object (proto_p); ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) object_p; ext_obj_p->u.cls.type = ECMA_OBJECT_CLASS_WEAKREF; diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakref.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakref.inc.h index 6a2109ba..d4e6e5b5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakref.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakref.inc.h @@ -24,20 +24,14 @@ /* Number properties: * (property name, number value, writable, enumerable, configurable) */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 1, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_CONFIGURABLE) -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_WEAKREF_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_WEAKREF_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_WEAKREF_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_WEAKREF_PROTOTYPE, ECMA_PROPERTY_FIXED) #endif /* JERRY_BUILTIN_WEAKREF */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c index c1232d42..370c5047 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c @@ -25,7 +25,7 @@ */ #define BUILTIN_CUSTOM_DISPATCH #define BUILTIN_INC_HEADER_NAME "ecma-builtin-weakset-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID weakset_prototype +#define BUILTIN_UNDERSCORED_ID weakset_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h index 6c203333..6221f895 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h @@ -25,14 +25,10 @@ * (property name, object pointer getter) */ /* ECMA-262 v6, 23.4.3.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_WEAKSET, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_WEAKSET, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v6, 23.4.3.5 */ -STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, - LIT_MAGIC_STRING_WEAKSET_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_WEAKSET_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c index d96790dd..1bd04ec4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c @@ -14,8 +14,8 @@ */ #include "ecma-builtins.h" -#include "ecma-exceptions.h" #include "ecma-container-object.h" +#include "ecma-exceptions.h" #if JERRY_BUILTIN_CONTAINER @@ -23,7 +23,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-weakset.inc.h" -#define BUILTIN_UNDERSCORED_ID weakset +#define BUILTIN_UNDERSCORED_ID weakset #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h index d9331786..8aa16c84 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h @@ -25,22 +25,16 @@ * (property name, number value, writable, enumerable, configurable) */ /* ECMA-262 v6, 23.4.2 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ECMA-262 v6, 23.4 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_WEAKSET_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_WEAKSET_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* Object properties: * (property name, object pointer getter) */ /* ECMA-262 v6, 23.4.2.1 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE, ECMA_PROPERTY_FIXED) #endif /* JERRY_BUILTIN_CONTAINER */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h b/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h index a158c0f0..c8030b6b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h @@ -17,7 +17,7 @@ #define ECMA_BUILTINS_INTERNAL_H #ifndef ECMA_BUILTINS_INTERNAL -# error "!ECMA_BUILTINS_INTERNAL" +#error "!ECMA_BUILTINS_INTERNAL" #endif /* !ECMA_BUILTINS_INTERNAL */ #include "ecma-builtins.h" @@ -80,36 +80,20 @@ typedef struct uint16_t value; /**< value of the property */ } ecma_builtin_property_descriptor_t; -#define BUILTIN_ROUTINE(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ -extern const ecma_builtin_property_descriptor_t \ -ecma_builtin_ ## lowercase_name ## _property_descriptor_list[]; \ -ecma_value_t \ -ecma_builtin_ ## lowercase_name ## _dispatch_call (const ecma_value_t *, \ - uint32_t); \ -ecma_value_t \ -ecma_builtin_ ## lowercase_name ## _dispatch_construct (const ecma_value_t *, \ - uint32_t); \ -ecma_value_t \ -ecma_builtin_ ## lowercase_name ## _dispatch_routine (uint8_t builtin_routine_id, \ - ecma_value_t this_arg_value, \ - const ecma_value_t [], \ - uint32_t); -#define BUILTIN(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ -extern const ecma_builtin_property_descriptor_t \ -ecma_builtin_ ## lowercase_name ## _property_descriptor_list[]; \ -ecma_value_t \ -ecma_builtin_ ## lowercase_name ## _dispatch_routine (uint8_t builtin_routine_id, \ - ecma_value_t this_arg_value, \ - const ecma_value_t [], \ - uint32_t); +#define BUILTIN_ROUTINE(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ + extern const ecma_builtin_property_descriptor_t ecma_builtin_##lowercase_name##_property_descriptor_list[]; \ + ecma_value_t ecma_builtin_##lowercase_name##_dispatch_call (const ecma_value_t *, uint32_t); \ + ecma_value_t ecma_builtin_##lowercase_name##_dispatch_construct (const ecma_value_t *, uint32_t); \ + ecma_value_t ecma_builtin_##lowercase_name##_dispatch_routine (uint8_t builtin_routine_id, \ + ecma_value_t this_arg_value, \ + const ecma_value_t[], \ + uint32_t); +#define BUILTIN(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ + extern const ecma_builtin_property_descriptor_t ecma_builtin_##lowercase_name##_property_descriptor_list[]; \ + ecma_value_t ecma_builtin_##lowercase_name##_dispatch_routine (uint8_t builtin_routine_id, \ + ecma_value_t this_arg_value, \ + const ecma_value_t[], \ + uint32_t); #include "ecma-builtins.inc.h" #undef BUILTIN_ROUTINE diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.c b/jerry-core/ecma/builtin-objects/ecma-builtins.c index d95c111f..b2473bef 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.c @@ -13,14 +13,16 @@ * limitations under the License. */ -#include "ecma-alloc.h" #include "ecma-builtins.h" + +#include "ecma-alloc.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" -#include "ecma-function-object.h" #include "ecma-objects.h" + #include "jcontext.h" #include "jrt-bit-fields.h" @@ -58,8 +60,7 @@ typedef ecma_value_t (*ecma_builtin_dispatch_routine_t) (uint8_t builtin_routine /** * Definition of built-in dispatch call function pointer. */ -typedef ecma_value_t (*ecma_builtin_dispatch_call_t) (const ecma_value_t arguments_list[], - uint32_t arguments_number); +typedef ecma_value_t (*ecma_builtin_dispatch_call_t) (const ecma_value_t arguments_list[], uint32_t arguments_number); /** * Definition of a builtin descriptor which contains the builtin object's: * - prototype objects's id (13-bits) @@ -85,36 +86,26 @@ typedef uint16_t ecma_builtin_descriptor_t; /** * Create a builtin descriptor value */ -#define ECMA_MAKE_BUILTIN_DESCRIPTOR(type, proto_id) \ - (((proto_id) << ECMA_BUILTIN_PROTOTYPE_ID_SHIFT) | (type)) +#define ECMA_MAKE_BUILTIN_DESCRIPTOR(type, proto_id) (((proto_id) << ECMA_BUILTIN_PROTOTYPE_ID_SHIFT) | (type)) /** * List of the built-in descriptors. */ -static const ecma_builtin_descriptor_t ecma_builtin_descriptors[] = -{ +static const ecma_builtin_descriptor_t ecma_builtin_descriptors[] = { /** @cond doxygen_suppress */ #define BUILTIN(a, b, c, d, e) -#define BUILTIN_ROUTINE(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ +#define BUILTIN_ROUTINE(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ ECMA_MAKE_BUILTIN_DESCRIPTOR (object_type, object_prototype_builtin_id), #include "ecma-builtins.inc.h" #undef BUILTIN #undef BUILTIN_ROUTINE #define BUILTIN_ROUTINE(a, b, c, d, e) -#define BUILTIN(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ +#define BUILTIN(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ ECMA_MAKE_BUILTIN_DESCRIPTOR (object_type, object_prototype_builtin_id), #include "ecma-builtins.inc.h" #undef BUILTIN #undef BUILTIN_ROUTINE -/** @endcond */ + /** @endcond */ }; #ifndef JERRY_NDEBUG @@ -123,26 +114,18 @@ enum { ECMA_BUILTIN_EXTENSIBLE_CHECK = #define BUILTIN(a, b, c, d, e) -#define BUILTIN_ROUTINE(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ +#define BUILTIN_ROUTINE(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ (is_extensible != 0 || builtin_id == ECMA_BUILTIN_ID_TYPE_ERROR_THROWER) && #include "ecma-builtins.inc.h" #undef BUILTIN #undef BUILTIN_ROUTINE #define BUILTIN_ROUTINE(a, b, c, d, e) -#define BUILTIN(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ +#define BUILTIN(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ (is_extensible != 0 || builtin_id == ECMA_BUILTIN_ID_TYPE_ERROR_THROWER) && #include "ecma-builtins.inc.h" #undef BUILTIN #undef BUILTIN_ROUTINE - true + true }; /** @endcond */ @@ -156,97 +139,69 @@ JERRY_STATIC_ASSERT (ECMA_BUILTIN_EXTENSIBLE_CHECK == true, /** * List of the built-in routines. */ -static const ecma_builtin_dispatch_routine_t ecma_builtin_routines[] = -{ +static const ecma_builtin_dispatch_routine_t ecma_builtin_routines[] = { /** @cond doxygen_suppress */ #define BUILTIN(a, b, c, d, e) -#define BUILTIN_ROUTINE(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ - ecma_builtin_ ## lowercase_name ## _dispatch_routine, +#define BUILTIN_ROUTINE(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ + ecma_builtin_##lowercase_name##_dispatch_routine, #include "ecma-builtins.inc.h" #undef BUILTIN #undef BUILTIN_ROUTINE #define BUILTIN_ROUTINE(a, b, c, d, e) -#define BUILTIN(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ - ecma_builtin_ ## lowercase_name ## _dispatch_routine, +#define BUILTIN(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ + ecma_builtin_##lowercase_name##_dispatch_routine, #include "ecma-builtins.inc.h" #undef BUILTIN #undef BUILTIN_ROUTINE -/** @endcond */ + /** @endcond */ }; /** * List of the built-in call functions. */ -static const ecma_builtin_dispatch_call_t ecma_builtin_call_functions[] = -{ +static const ecma_builtin_dispatch_call_t ecma_builtin_call_functions[] = { /** @cond doxygen_suppress */ #define BUILTIN(a, b, c, d, e) -#define BUILTIN_ROUTINE(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ - ecma_builtin_ ## lowercase_name ## _dispatch_call, +#define BUILTIN_ROUTINE(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ + ecma_builtin_##lowercase_name##_dispatch_call, #include "ecma-builtins.inc.h" #undef BUILTIN_ROUTINE #undef BUILTIN -/** @endcond */ + /** @endcond */ }; /** * List of the built-in construct functions. */ -static const ecma_builtin_dispatch_call_t ecma_builtin_construct_functions[] = -{ +static const ecma_builtin_dispatch_call_t ecma_builtin_construct_functions[] = { /** @cond doxygen_suppress */ #define BUILTIN(a, b, c, d, e) -#define BUILTIN_ROUTINE(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ - ecma_builtin_ ## lowercase_name ## _dispatch_construct, +#define BUILTIN_ROUTINE(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ + ecma_builtin_##lowercase_name##_dispatch_construct, #include "ecma-builtins.inc.h" #undef BUILTIN_ROUTINE #undef BUILTIN -/** @endcond */ + /** @endcond */ }; /** * Property descriptor lists for all built-ins. */ -static const ecma_builtin_property_list_reference_t ecma_builtin_property_list_references[] = -{ +static const ecma_builtin_property_list_reference_t ecma_builtin_property_list_references[] = { /** @cond doxygen_suppress */ #define BUILTIN(a, b, c, d, e) -#define BUILTIN_ROUTINE(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ - ecma_builtin_ ## lowercase_name ## _property_descriptor_list, +#define BUILTIN_ROUTINE(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ + ecma_builtin_##lowercase_name##_property_descriptor_list, #include "ecma-builtins.inc.h" #undef BUILTIN #undef BUILTIN_ROUTINE #define BUILTIN_ROUTINE(a, b, c, d, e) -#define BUILTIN(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ - ecma_builtin_ ## lowercase_name ## _property_descriptor_list, +#define BUILTIN(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) \ + ecma_builtin_##lowercase_name##_property_descriptor_list, #include "ecma-builtins.inc.h" #undef BUILTIN_ROUTINE #undef BUILTIN -/** @endcond */ + /** @endcond */ }; /** @@ -291,7 +246,7 @@ ecma_builtin_is_global (ecma_object_t *object_p) /**< pointer to an object */ * * @return pointer to the global object */ -extern inline ecma_object_t * JERRY_ATTR_ALWAYS_INLINE +extern inline ecma_object_t *JERRY_ATTR_ALWAYS_INLINE ecma_builtin_get_global (void) { JERRY_ASSERT (JERRY_CONTEXT (global_object_p) != NULL); @@ -330,10 +285,8 @@ ecma_builtin_get_realm (ecma_object_t *builtin_object_p) /**< built-in object */ ecma_object_type_t object_type = ecma_get_object_type (builtin_object_p); ecma_value_t realm_value; - JERRY_ASSERT (object_type == ECMA_OBJECT_TYPE_BUILT_IN_GENERAL - || object_type == ECMA_OBJECT_TYPE_BUILT_IN_CLASS - || object_type == ECMA_OBJECT_TYPE_BUILT_IN_ARRAY - || object_type == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION); + JERRY_ASSERT (object_type == ECMA_OBJECT_TYPE_BUILT_IN_GENERAL || object_type == ECMA_OBJECT_TYPE_BUILT_IN_CLASS + || object_type == ECMA_OBJECT_TYPE_BUILT_IN_ARRAY || object_type == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION); if (ECMA_BUILTIN_IS_EXTENDED_BUILT_IN (object_type)) { @@ -384,15 +337,13 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj ecma_object_type_t obj_type = (ecma_object_type_t) (builtin_desc & ECMA_BUILTIN_OBJECT_TYPE_MASK); - JERRY_ASSERT (obj_type == ECMA_OBJECT_TYPE_BUILT_IN_GENERAL - || obj_type == ECMA_OBJECT_TYPE_BUILT_IN_CLASS - || obj_type == ECMA_OBJECT_TYPE_BUILT_IN_ARRAY - || obj_type == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION); + JERRY_ASSERT (obj_type == ECMA_OBJECT_TYPE_BUILT_IN_GENERAL || obj_type == ECMA_OBJECT_TYPE_BUILT_IN_CLASS + || obj_type == ECMA_OBJECT_TYPE_BUILT_IN_ARRAY || obj_type == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION); bool is_extended_built_in = ECMA_BUILTIN_IS_EXTENDED_BUILT_IN (obj_type); - size_t ext_object_size = (is_extended_built_in ? sizeof (ecma_extended_built_in_object_t) - : sizeof (ecma_extended_object_t)); + size_t ext_object_size = + (is_extended_built_in ? sizeof (ecma_extended_built_in_object_t) : sizeof (ecma_extended_object_t)); size_t property_count = ecma_builtin_get_property_count (obj_builtin_id); @@ -527,8 +478,8 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj ext_object_p->u.cls.type = ECMA_OBJECT_CLASS_REGEXP; - re_compiled_code_t *bc_p = re_compile_bytecode (ecma_get_magic_string (LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP), - RE_FLAG_EMPTY); + re_compiled_code_t *bc_p = + re_compile_bytecode (ecma_get_magic_string (LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP), RE_FLAG_EMPTY); JERRY_ASSERT (bc_p != NULL); @@ -678,7 +629,7 @@ ecma_builtin_get_from_realm (ecma_global_object_t *global_object_p, /**< global * * @return pointer to the object's instance */ -static inline ecma_object_t * JERRY_ATTR_ALWAYS_INLINE +static inline ecma_object_t *JERRY_ATTR_ALWAYS_INLINE ecma_builtin_get_from_builtin (ecma_object_t *builtin_object_p, /**< built-in object */ ecma_builtin_id_t builtin_id) /**< id of built-in to check on */ { @@ -706,14 +657,11 @@ ecma_builtin_make_function_object_for_routine (ecma_object_t *builtin_object_p, uint32_t routine_index, /**< property descriptor index of routine */ uint8_t flags) /**< see also: ecma_builtin_routine_flags */ { - ecma_object_t *prototype_obj_p = ecma_builtin_get_from_builtin (builtin_object_p, - ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE); + ecma_object_t *prototype_obj_p = ecma_builtin_get_from_builtin (builtin_object_p, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE); size_t ext_object_size = sizeof (ecma_extended_object_t); - ecma_object_t *func_obj_p = ecma_create_object (prototype_obj_p, - ext_object_size, - ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION); + ecma_object_t *func_obj_p = ecma_create_object (prototype_obj_p, ext_object_size, ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION); JERRY_ASSERT (routine_id > 0); JERRY_ASSERT (routine_index <= UINT8_MAX); @@ -799,10 +747,8 @@ ecma_builtin_native_handler_try_to_instantiate_property (ecma_object_t *object_p { if ((ext_obj_p->u.built_in.u2.routine_flags & ECMA_NATIVE_HANDLER_FLAGS_NAME_INITIALIZED) == 0) { - ecma_property_value_t *value_p = ecma_create_named_data_property (object_p, - property_name_p, - ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, - &prop_p); + ecma_property_value_t *value_p = + ecma_create_named_data_property (object_p, property_name_p, ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, &prop_p); value_p->value = ecma_make_magic_string_value (LIT_MAGIC_STRING__EMPTY); } @@ -811,10 +757,8 @@ ecma_builtin_native_handler_try_to_instantiate_property (ecma_object_t *object_p { if ((ext_obj_p->u.built_in.u2.routine_flags & ECMA_NATIVE_HANDLER_FLAGS_LENGTH_INITIALIZED) == 0) { - ecma_property_value_t *value_p = ecma_create_named_data_property (object_p, - property_name_p, - ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, - &prop_p); + ecma_property_value_t *value_p = + ecma_create_named_data_property (object_p, property_name_p, ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, &prop_p); const uint8_t length = ecma_builtin_handler_get_length (ext_obj_p->u.built_in.routine_id); value_p->value = ecma_make_integer_value (length); @@ -869,17 +813,13 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< /* We mark that the property was lazily instantiated, * as it is configurable and so can be deleted (ECMA-262 v6, 19.2.4.1) */ - ecma_property_value_t *len_prop_value_p = ecma_create_named_data_property (object_p, - property_name_p, - ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, - &len_prop_p); + ecma_property_value_t *len_prop_value_p = + ecma_create_named_data_property (object_p, property_name_p, ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, &len_prop_p); #else /* !JERRY_ESNEXT */ /* We don't need to mark that the property was already lazy instantiated, * as it is non-configurable and so can't be deleted (ECMA-262 v5, 13.2.5) */ - ecma_property_value_t *len_prop_value_p = ecma_create_named_data_property (object_p, - property_name_p, - ECMA_PROPERTY_BUILT_IN_FIXED, - &len_prop_p); + ecma_property_value_t *len_prop_value_p = + ecma_create_named_data_property (object_p, property_name_p, ECMA_PROPERTY_BUILT_IN_FIXED, &len_prop_p); #endif /* JERRY_ESNEXT */ uint8_t length = 0; @@ -920,10 +860,8 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< /* We mark that the property was lazily instantiated */ ecma_property_t *name_prop_p; - ecma_property_value_t *name_prop_value_p = ecma_create_named_data_property (object_p, - property_name_p, - ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, - &name_prop_p); + ecma_property_value_t *name_prop_value_p = + ecma_create_named_data_property (object_p, property_name_p, ECMA_PROPERTY_BUILT_IN_CONFIGURABLE, &name_prop_p); uint8_t routine_index = ext_func_p->u.built_in.u.routine_index; const ecma_builtin_property_descriptor_t *property_list_p; @@ -999,8 +937,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * lit_magic_string_id_t magic_string_id = ecma_get_string_magic (property_name_p); #if JERRY_ESNEXT - if (JERRY_UNLIKELY (ecma_prop_name_is_symbol (property_name_p)) - && property_name_p->u.hash & ECMA_GLOBAL_SYMBOL_FLAG) + if (JERRY_UNLIKELY (ecma_prop_name_is_symbol (property_name_p)) && property_name_p->u.hash & ECMA_GLOBAL_SYMBOL_FLAG) { magic_string_id = (property_name_p->u.hash >> ECMA_GLOBAL_SYMBOL_SHIFT); } @@ -1014,11 +951,9 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * ecma_built_in_props_t *built_in_props_p; ecma_object_type_t object_type = ecma_get_object_type (object_p); - JERRY_ASSERT (object_type == ECMA_OBJECT_TYPE_BUILT_IN_GENERAL - || object_type == ECMA_OBJECT_TYPE_BUILT_IN_CLASS + JERRY_ASSERT (object_type == ECMA_OBJECT_TYPE_BUILT_IN_GENERAL || object_type == ECMA_OBJECT_TYPE_BUILT_IN_CLASS || object_type == ECMA_OBJECT_TYPE_BUILT_IN_ARRAY - || (object_type == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION - && !ecma_builtin_function_is_routine (object_p))); + || (object_type == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION && !ecma_builtin_function_is_routine (object_p))); if (ECMA_BUILTIN_IS_EXTENDED_BUILT_IN (object_type)) { @@ -1095,8 +1030,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * } else if (curr_property_p->value < ECMA_BUILTIN_NUMBER_NAN) { - static const ecma_number_t builtin_number_list[] = - { + static const ecma_number_t builtin_number_list[] = { ECMA_NUMBER_MAX_VALUE, ECMA_NUMBER_MIN_VALUE, #if JERRY_ESNEXT @@ -1236,10 +1170,8 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * } else { - ecma_property_value_t *prop_value_p = ecma_create_named_data_property (object_p, - property_name_p, - curr_property_p->attributes, - &prop_p); + ecma_property_value_t *prop_value_p = + ecma_create_named_data_property (object_p, property_name_p, curr_property_p->attributes, &prop_p); prop_value_p->value = value; /* Reference count of objects must be decreased. */ @@ -1332,11 +1264,9 @@ ecma_builtin_delete_built_in_property (ecma_object_t *object_p, /**< object */ ecma_built_in_props_t *built_in_props_p; ecma_object_type_t object_type = ecma_get_object_type (object_p); - JERRY_ASSERT (object_type == ECMA_OBJECT_TYPE_BUILT_IN_GENERAL - || object_type == ECMA_OBJECT_TYPE_BUILT_IN_CLASS + JERRY_ASSERT (object_type == ECMA_OBJECT_TYPE_BUILT_IN_GENERAL || object_type == ECMA_OBJECT_TYPE_BUILT_IN_CLASS || object_type == ECMA_OBJECT_TYPE_BUILT_IN_ARRAY - || (object_type == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION - && !ecma_builtin_function_is_routine (object_p))); + || (object_type == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION && !ecma_builtin_function_is_routine (object_p))); if (ECMA_BUILTIN_IS_EXTENDED_BUILT_IN (object_type)) { @@ -1385,7 +1315,7 @@ ecma_builtin_delete_built_in_property (ecma_object_t *object_p, /**< object */ static void ecma_builtin_native_handler_list_lazy_property_names (ecma_object_t *object_p, /**< function object */ ecma_collection_t *prop_names_p, /**< prop name collection */ - ecma_property_counter_t *prop_counter_p) /**< prop counter */ + ecma_property_counter_t *prop_counter_p) /**< prop counter */ { JERRY_ASSERT (ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION); ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) object_p; @@ -1413,7 +1343,7 @@ ecma_builtin_native_handler_list_lazy_property_names (ecma_object_t *object_p, / */ void ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in object */ - ecma_collection_t *prop_names_p, /**< prop name collection */ + ecma_collection_t *prop_names_p, /**< prop name collection */ ecma_property_counter_t *prop_counter_p, /**< property counters */ jerry_property_filter_t filter) /**< name filters */ { @@ -1556,8 +1486,7 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in uint32_t bit_for_index = (uint32_t) 1u << index; - if (curr_property_p->magic_string_id > LIT_NON_INTERNAL_MAGIC_STRING__COUNT - && !(bitset & bit_for_index)) + if (curr_property_p->magic_string_id > LIT_NON_INTERNAL_MAGIC_STRING__COUNT && !(bitset & bit_for_index)) { ecma_string_t *name_p = ecma_op_get_global_symbol (curr_property_p->magic_string_id); ecma_collection_push_back (prop_names_p, ecma_make_symbol_value (name_p)); @@ -1610,10 +1539,10 @@ ecma_builtin_dispatch_routine (ecma_extended_object_t *func_obj_p, /**< builtin arguments_list_p = padded_arguments_list_p; } - return ecma_builtin_routines[func_obj_p->u.built_in.id] (func_obj_p->u.built_in.routine_id, - this_arg_value, - arguments_list_p, - arguments_list_len); + return ecma_builtin_routines[func_obj_p->u.built_in.id](func_obj_p->u.built_in.routine_id, + this_arg_value, + arguments_list_p, + arguments_list_len); } /* ecma_builtin_dispatch_routine */ /** @@ -1641,15 +1570,12 @@ ecma_builtin_dispatch_call (ecma_object_t *obj_p, /**< built-in object */ } #endif /* !JERRY_ESNEXT */ - return ecma_builtin_dispatch_routine (ext_obj_p, - this_arg_value, - arguments_list_p, - arguments_list_len); + return ecma_builtin_dispatch_routine (ext_obj_p, this_arg_value, arguments_list_p, arguments_list_len); } ecma_builtin_id_t builtin_object_id = ext_obj_p->u.built_in.id; JERRY_ASSERT (builtin_object_id < sizeof (ecma_builtin_call_functions) / sizeof (ecma_builtin_dispatch_call_t)); - return ecma_builtin_call_functions[builtin_object_id] (arguments_list_p, arguments_list_len); + return ecma_builtin_call_functions[builtin_object_id](arguments_list_p, arguments_list_len); } /* ecma_builtin_dispatch_call */ /** @@ -1673,7 +1599,7 @@ ecma_builtin_dispatch_construct (ecma_object_t *obj_p, /**< built-in object */ ecma_builtin_id_t builtin_object_id = ext_obj_p->u.built_in.id; JERRY_ASSERT (builtin_object_id < sizeof (ecma_builtin_construct_functions) / sizeof (ecma_builtin_dispatch_call_t)); - return ecma_builtin_construct_functions[builtin_object_id] (arguments_list_p, arguments_list_len); + return ecma_builtin_construct_functions[builtin_object_id](arguments_list_p, arguments_list_len); } /* ecma_builtin_dispatch_construct */ /** diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.h b/jerry-core/ecma/builtin-objects/ecma-builtins.h index 22578fa1..96040de7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.h @@ -25,26 +25,16 @@ typedef enum { /** @cond doxygen_suppress */ #define BUILTIN(a, b, c, d, e) -#define BUILTIN_ROUTINE(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ - builtin_id, +#define BUILTIN_ROUTINE(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) builtin_id, #include "ecma-builtins.inc.h" #undef BUILTIN #undef BUILTIN_ROUTINE #define BUILTIN_ROUTINE(a, b, c, d, e) -#define BUILTIN(builtin_id, \ - object_type, \ - object_prototype_builtin_id, \ - is_extensible, \ - lowercase_name) \ - builtin_id, +#define BUILTIN(builtin_id, object_type, object_prototype_builtin_id, is_extensible, lowercase_name) builtin_id, #include "ecma-builtins.inc.h" #undef BUILTIN #undef BUILTIN_ROUTINE -/** @endcond */ + /** @endcond */ ECMA_BUILTIN_ID__COUNT /**< number of built-in objects */ } ecma_builtin_id_t; @@ -59,8 +49,7 @@ typedef enum /** * Number of global symbols */ -#define ECMA_BUILTIN_GLOBAL_SYMBOL_COUNT \ - (LIT_GLOBAL_SYMBOL__LAST - LIT_GLOBAL_SYMBOL__FIRST + 1) +#define ECMA_BUILTIN_GLOBAL_SYMBOL_COUNT (LIT_GLOBAL_SYMBOL__LAST - LIT_GLOBAL_SYMBOL__FIRST + 1) #endif /* JERRY_ESNEXT */ @@ -72,7 +61,7 @@ typedef enum /** * Get routine length */ -#define ECMA_GET_ROUTINE_LENGTH(value) ((uint8_t) ((value) & 0xf)) +#define ECMA_GET_ROUTINE_LENGTH(value) ((uint8_t) ((value) &0xf)) /** * Get routine ID @@ -87,7 +76,7 @@ typedef enum /** * Get accessor setter ID */ -#define ECMA_ACCESSOR_READ_WRITE_GET_SETTER_ID(value) ((uint8_t) ((value) & 0xff)) +#define ECMA_ACCESSOR_READ_WRITE_GET_SETTER_ID(value) ((uint8_t) ((value) &0xff)) /** * Get accessor getter ID @@ -121,42 +110,35 @@ typedef struct ecma_global_object_t *ecma_builtin_create_global_object (void); -ecma_value_t -ecma_builtin_dispatch_call (ecma_object_t *obj_p, ecma_value_t this_arg_value, - const ecma_value_t *arguments_list_p, uint32_t arguments_list_len); -ecma_value_t -ecma_builtin_dispatch_construct (ecma_object_t *obj_p, const ecma_value_t *arguments_list_p, - uint32_t arguments_list_len); -ecma_property_t * -ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, ecma_string_t *property_name_p); -ecma_property_t * -ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, ecma_string_t *property_name_p); +ecma_value_t ecma_builtin_dispatch_call (ecma_object_t *obj_p, + ecma_value_t this_arg_value, + const ecma_value_t *arguments_list_p, + uint32_t arguments_list_len); +ecma_value_t ecma_builtin_dispatch_construct (ecma_object_t *obj_p, + const ecma_value_t *arguments_list_p, + uint32_t arguments_list_len); +ecma_property_t *ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, + ecma_string_t *property_name_p); +ecma_property_t *ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, ecma_string_t *property_name_p); #if JERRY_ESNEXT -void -ecma_builtin_routine_delete_built_in_property (ecma_object_t *object_p, ecma_string_t *property_name_p); +void ecma_builtin_routine_delete_built_in_property (ecma_object_t *object_p, ecma_string_t *property_name_p); #endif /* JERRY_ESNEXT */ -void -ecma_builtin_delete_built_in_property (ecma_object_t *object_p, ecma_string_t *property_name_p); -void -ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, ecma_collection_t *prop_names_p, - ecma_property_counter_t *prop_counter_p, - jerry_property_filter_t filter); -void -ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, ecma_collection_t *prop_names_p, - ecma_property_counter_t *prop_counter_p, - jerry_property_filter_t filter); -bool -ecma_builtin_is_global (ecma_object_t *object_p); -ecma_object_t * -ecma_builtin_get (ecma_builtin_id_t builtin_id); -ecma_object_t * -ecma_builtin_get_global (void); -bool -ecma_builtin_function_is_routine (ecma_object_t *func_obj_p); +void ecma_builtin_delete_built_in_property (ecma_object_t *object_p, ecma_string_t *property_name_p); +void ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, + ecma_collection_t *prop_names_p, + ecma_property_counter_t *prop_counter_p, + jerry_property_filter_t filter); +void ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, + ecma_collection_t *prop_names_p, + ecma_property_counter_t *prop_counter_p, + jerry_property_filter_t filter); +bool ecma_builtin_is_global (ecma_object_t *object_p); +ecma_object_t *ecma_builtin_get (ecma_builtin_id_t builtin_id); +ecma_object_t *ecma_builtin_get_global (void); +bool ecma_builtin_function_is_routine (ecma_object_t *func_obj_p); #if JERRY_BUILTIN_REALMS -ecma_object_t * -ecma_builtin_get_from_realm (ecma_global_object_t *global_object_p, ecma_builtin_id_t builtin_id); +ecma_object_t *ecma_builtin_get_from_realm (ecma_global_object_t *global_object_p, ecma_builtin_id_t builtin_id); #endif /* JERRY_BUILTIN_REALMS */ #endif /* !ECMA_BUILTINS_H */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h index d03868d1..48cae1ca 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h @@ -47,50 +47,50 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_ARRAY, #endif /* JERRY_BUILTIN_ARRAY */ #if JERRY_ESNEXT -# if JERRY_BUILTIN_DATE +#if JERRY_BUILTIN_DATE /* The Date.prototype object (20.3.4) */ BUILTIN (ECMA_BUILTIN_ID_DATE_PROTOTYPE, ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, date_prototype) -# endif /* JERRY_BUILTIN_DATE */ +#endif /* JERRY_BUILTIN_DATE */ -# if JERRY_BUILTIN_REGEXP +#if JERRY_BUILTIN_REGEXP /* The RegExp.prototype object (21.2.5) */ BUILTIN (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, regexp_prototype) -# endif /* JERRY_BUILTIN_REGEXP */ +#endif /* JERRY_BUILTIN_REGEXP */ #else /* !JERRY_ESNEXT */ -# if JERRY_BUILTIN_DATE +#if JERRY_BUILTIN_DATE /* The Date.prototype object (15.9.4) */ BUILTIN (ECMA_BUILTIN_ID_DATE_PROTOTYPE, ECMA_OBJECT_TYPE_BUILT_IN_CLASS, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, date_prototype) -# endif /* JERRY_BUILTIN_DATE */ +#endif /* JERRY_BUILTIN_DATE */ -# if JERRY_BUILTIN_REGEXP +#if JERRY_BUILTIN_REGEXP /* The RegExp.prototype object (15.10.6) */ BUILTIN (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, ECMA_OBJECT_TYPE_BUILT_IN_CLASS, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, regexp_prototype) -# endif /* JERRY_BUILTIN_REGEXP */ +#endif /* JERRY_BUILTIN_REGEXP */ #endif /* !JERRY_ESNEXT */ #if JERRY_BUILTIN_STRING /* The String.prototype object (15.5.4) */ BUILTIN (ECMA_BUILTIN_ID_STRING_PROTOTYPE, - ECMA_OBJECT_TYPE_BUILT_IN_CLASS, - ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, - true, - string_prototype) + ECMA_OBJECT_TYPE_BUILT_IN_CLASS, + ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, + true, + string_prototype) /* The String object (15.5.1) */ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_STRING, @@ -148,39 +148,23 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_FUNCTION, #if JERRY_BUILTIN_MATH /* The Math object (15.8) */ -BUILTIN (ECMA_BUILTIN_ID_MATH, - ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, - ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, - true, - math) +BUILTIN (ECMA_BUILTIN_ID_MATH, ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, math) #endif /* JERRY_BUILTIN_MATH */ #if JERRY_BUILTIN_REFLECT /* The Reflect object (26.1) */ -BUILTIN (ECMA_BUILTIN_ID_REFLECT, - ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, - ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, - true, - reflect) +BUILTIN (ECMA_BUILTIN_ID_REFLECT, ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, reflect) #endif /* JERRY_BUILTIN_REFLECT */ #if JERRY_BUILTIN_JSON /* The JSON object (15.12) */ -BUILTIN (ECMA_BUILTIN_ID_JSON, - ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, - ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, - true, - json) +BUILTIN (ECMA_BUILTIN_ID_JSON, ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, json) #endif /* JERRY_BUILTIN_JSON */ #if JERRY_BUILTIN_ATOMICS /* The Atomics object (24.4) */ -BUILTIN (ECMA_BUILTIN_ID_ATOMICS, - ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, - ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, - true, - atomics) +BUILTIN (ECMA_BUILTIN_ID_ATOMICS, ECMA_OBJECT_TYPE_BUILT_IN_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, atomics) #endif /* JERRY_BUILTIN_ATOMICS */ #if JERRY_BUILTIN_DATE @@ -545,11 +529,7 @@ BUILTIN (ECMA_BUILTIN_ID_MAP_PROTOTYPE, map_prototype) /* The Map routine (ECMA-262 v6, 23.1.1.1) */ -BUILTIN_ROUTINE (ECMA_BUILTIN_ID_MAP, - ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION, - ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, - true, - map) +BUILTIN_ROUTINE (ECMA_BUILTIN_ID_MAP, ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, map) /* The Set prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_SET_PROTOTYPE, @@ -559,11 +539,7 @@ BUILTIN (ECMA_BUILTIN_ID_SET_PROTOTYPE, set_prototype) /* The Set routine (ECMA-262 v6, 23.1.1.1) */ -BUILTIN_ROUTINE (ECMA_BUILTIN_ID_SET, - ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION, - ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, - true, - set) +BUILTIN_ROUTINE (ECMA_BUILTIN_ID_SET, ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, set) /* The WeakMap prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE, diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.c index 373b0580..3b33e033 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.c @@ -22,7 +22,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-bigint64array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID bigint64array_prototype +#define BUILTIN_UNDERSCORED_ID bigint64array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.inc.h index e6822117..5e1087bf 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.inc.h @@ -21,7 +21,7 @@ #if JERRY_BUILTIN_BIGINT #define TYPEDARRAY_BYTES_PER_ELEMENT 8 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGINT64ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGINT64ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.c index da4f3c8d..1f8b29f6 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -28,9 +29,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-bigint64array.inc.h" -#define BUILTIN_UNDERSCORED_ID bigint64array +#define BUILTIN_UNDERSCORED_ID bigint64array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -50,7 +50,7 @@ */ ecma_value_t ecma_builtin_bigint64array_dispatch_call (const ecma_value_t *arguments_list_p, /**< arguments list */ - uint32_t arguments_list_len) /**< number of arguments */ + uint32_t arguments_list_len) /**< number of arguments */ { JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); @@ -64,17 +64,16 @@ ecma_builtin_bigint64array_dispatch_call (const ecma_value_t *arguments_list_p, */ ecma_value_t ecma_builtin_bigint64array_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ - uint32_t arguments_list_len) /**< number of arguments */ + uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_BIGINT64_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_BIGINT64_ARRAY); } /* ecma_builtin_bigint64array_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_BUILTIN_BIGINT */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.inc.h index b68f3581..176fc26b 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.inc.h @@ -20,8 +20,8 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 8 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_BIGINT64_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGINT64ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_BIGINT64_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGINT64ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.c index 3cc4006d..9844fbd5 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.c @@ -22,7 +22,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-biguint64array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID biguint64array_prototype +#define BUILTIN_UNDERSCORED_ID biguint64array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.inc.h index 6c0da05b..03626442 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.inc.h @@ -21,7 +21,7 @@ #if JERRY_BUILTIN_BIGINT #define TYPEDARRAY_BYTES_PER_ELEMENT 8 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGUINT64ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGUINT64ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.c index 6037d081..214fa716 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -28,9 +29,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-biguint64array.inc.h" -#define BUILTIN_UNDERSCORED_ID biguint64array +#define BUILTIN_UNDERSCORED_ID biguint64array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -50,7 +50,7 @@ */ ecma_value_t ecma_builtin_biguint64array_dispatch_call (const ecma_value_t *arguments_list_p, /**< arguments list */ - uint32_t arguments_list_len) /**< number of arguments */ + uint32_t arguments_list_len) /**< number of arguments */ { JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); @@ -64,17 +64,16 @@ ecma_builtin_biguint64array_dispatch_call (const ecma_value_t *arguments_list_p, */ ecma_value_t ecma_builtin_biguint64array_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ - uint32_t arguments_list_len) /**< number of arguments */ + uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_BIGUINT64_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_BIGUINT64_ARRAY); } /* ecma_builtin_biguint64array_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_BUILTIN_BIGINT */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.inc.h index f9ba3338..ea38782a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.inc.h @@ -21,8 +21,8 @@ #if JERRY_BUILTIN_BIGINT #define TYPEDARRAY_BYTES_PER_ELEMENT 8 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_BIGUINT64_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGUINT64ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_BIGUINT64_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGUINT64ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c index 3179f97c..1e6a6041 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-float32array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID float32array_prototype +#define BUILTIN_UNDERSCORED_ID float32array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h index 6bba9b67..56bfeeae 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h @@ -20,7 +20,7 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT32ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT32ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c index 1998e189..b69cc4c0 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -27,9 +28,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-float32array.inc.h" -#define BUILTIN_UNDERSCORED_ID float32array +#define BUILTIN_UNDERSCORED_ID float32array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -65,14 +65,13 @@ ecma_value_t ecma_builtin_float32array_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_FLOAT32_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_FLOAT32_ARRAY); } /* ecma_builtin_float32array_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h index 0cc3d738..832b5119 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h @@ -20,8 +20,8 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_FLOAT32_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT32ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_FLOAT32_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT32ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c index 4f6f8a2d..205d23a7 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c @@ -22,7 +22,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-float64array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID float64array_prototype +#define BUILTIN_UNDERSCORED_ID float64array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h index 68fce0d4..815be714 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h @@ -21,7 +21,7 @@ #if JERRY_NUMBER_TYPE_FLOAT64 #define TYPEDARRAY_BYTES_PER_ELEMENT 8 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT64ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT64ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_NUMBER_TYPE_FLOAT64 */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c index ed857e0a..997fb5a7 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -28,9 +29,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-float64array.inc.h" -#define BUILTIN_UNDERSCORED_ID float64array +#define BUILTIN_UNDERSCORED_ID float64array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -66,15 +66,14 @@ ecma_value_t ecma_builtin_float64array_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_FLOAT64_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_FLOAT64_ARRAY); } /* ecma_builtin_float64array_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_NUMBER_TYPE_FLOAT64 */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h index e7b053dd..ea8bd422 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h @@ -21,8 +21,8 @@ #if JERRY_NUMBER_TYPE_FLOAT64 #define TYPEDARRAY_BYTES_PER_ELEMENT 8 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_FLOAT64_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT64ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_FLOAT64_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT64ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_NUMBER_TYPE_FLOAT64 */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c index 0d4e1675..1b9c435b 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-int16array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID int16array_prototype +#define BUILTIN_UNDERSCORED_ID int16array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h index d9a0ef94..7815d9a5 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h @@ -20,7 +20,7 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 2 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT16ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT16ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c index 99fd2a8c..6945114a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -27,9 +28,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-int16array.inc.h" -#define BUILTIN_UNDERSCORED_ID int16array +#define BUILTIN_UNDERSCORED_ID int16array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -65,14 +65,13 @@ ecma_value_t ecma_builtin_int16array_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_INT16_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_INT16_ARRAY); } /* ecma_builtin_int16array_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h index 3427207b..f744ed77 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h @@ -20,8 +20,8 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 2 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT16_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT16ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT16_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT16ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c index 0253bc0a..36fc8470 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-int32array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID int32array_prototype +#define BUILTIN_UNDERSCORED_ID int32array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h index ea2f3326..9a31a062 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h @@ -20,7 +20,7 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT32ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT32ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c index 06170fbe..d3d899c1 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -27,9 +28,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-int32array.inc.h" -#define BUILTIN_UNDERSCORED_ID int32array +#define BUILTIN_UNDERSCORED_ID int32array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -65,14 +65,13 @@ ecma_value_t ecma_builtin_int32array_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_INT32_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_INT32_ARRAY); } /* ecma_builtin_int32array_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h index bdc667fb..ac786a0b 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h @@ -20,8 +20,8 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT32_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT32ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT32_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT32ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c index a7b0b156..8221f309 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-int8array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID int8array_prototype +#define BUILTIN_UNDERSCORED_ID int8array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h index 4cb7e582..99d072b1 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h @@ -20,7 +20,7 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT8ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT8ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c index 03522f0b..87ea168c 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -27,9 +28,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-int8array.inc.h" -#define BUILTIN_UNDERSCORED_ID int8array +#define BUILTIN_UNDERSCORED_ID int8array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -65,8 +65,7 @@ ecma_value_t ecma_builtin_int8array_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_INT8_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_INT8_ARRAY); } /* ecma_builtin_int8array_dispatch_construct */ /** diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h index 2e3146fb..25c84de2 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h @@ -20,8 +20,8 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT8_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT8_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c index 565a48a1..23681ddb 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c @@ -18,10 +18,11 @@ #if JERRY_BUILTIN_TYPEDARRAY #include "ecma-builtins.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-objects.h" #include "ecma-typedarray-object.h" -#include "ecma-function-object.h" + #include "jcontext.h" #define ECMA_BUILTINS_INTERNAL diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h index 54972bd9..d4064374 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h @@ -26,10 +26,9 @@ * @{ */ -ecma_value_t -ecma_typedarray_helper_dispatch_construct (const ecma_value_t *arguments_list_p, - uint32_t arguments_list_len, - ecma_typedarray_type_t typedarray_id); +ecma_value_t ecma_typedarray_helper_dispatch_construct (const ecma_value_t *arguments_list_p, + uint32_t arguments_list_len, + ecma_typedarray_type_t typedarray_id); /** * @} diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h index 8715d0d9..beb63352 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h @@ -16,24 +16,20 @@ #if JERRY_BUILTIN_TYPEDARRAY #ifndef TYPEDARRAY_BYTES_PER_ELEMENT -# error "Please define TYPEDARRAY_BYTES_PER_ELEMENT" +#error "Please define TYPEDARRAY_BYTES_PER_ELEMENT" #endif /* !TYPEDARRAY_BYTES_PER_ELEMENT */ #ifndef TYPEDARRAY_BUILTIN_ID -# error "Please define TYPEDARRAY_BUILTIN_ID" +#error "Please define TYPEDARRAY_BUILTIN_ID" #endif /* !TYPEDARRAY_BUILTIN_ID */ #include "ecma-builtin-helpers-macro-defines.inc.h" /* ES2015 22.2.3.4 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - TYPEDARRAY_BUILTIN_ID, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, TYPEDARRAY_BUILTIN_ID, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ES2015 22.2.6.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U, - TYPEDARRAY_BYTES_PER_ELEMENT, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U, TYPEDARRAY_BYTES_PER_ELEMENT, ECMA_PROPERTY_FIXED) #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c index 0be71d15..b93c429c 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c @@ -31,6 +31,7 @@ #include "ecma-number-object.h" #include "ecma-objects.h" #include "ecma-typedarray-object.h" + #include "jcontext.h" #include "jmem.h" #include "jrt-libc-includes.h" @@ -89,7 +90,7 @@ enum }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-typedarray-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID typedarray_prototype +#define BUILTIN_UNDERSCORED_ID typedarray_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA @@ -168,8 +169,7 @@ ecma_builtin_typedarray_prototype_exec_routine (ecma_value_t this_arg, /**< this return ECMA_VALUE_FALSE; } } - else if (mode == TYPEDARRAY_ROUTINE_SOME - && to_bool_result) + else if (mode == TYPEDARRAY_ROUTINE_SOME && to_bool_result) { return ECMA_VALUE_TRUE; } @@ -354,10 +354,7 @@ ecma_builtin_typedarray_prototype_reduce_with_direction (ecma_value_t this_arg, JERRY_ASSERT (ecma_is_value_number (get_value) || ecma_is_value_bigint (get_value)); - ecma_value_t call_value = ecma_op_function_call (func_object_p, - ECMA_VALUE_UNDEFINED, - call_args, - 4); + ecma_value_t call_value = ecma_op_function_call (func_object_p, ECMA_VALUE_UNDEFINED, call_args, 4); ecma_fast_free_value (accumulator); ecma_fast_free_value (get_value); @@ -492,8 +489,7 @@ ecma_builtin_typedarray_prototype_filter (ecma_value_t this_arg, /**< this objec for (uint32_t idx = 0; idx < collected_p->item_count; idx++) { - ecma_value_t set_element = target_typedarray_setter_cb (target_buffer_p, - collected_p->buffer_p[idx]); + ecma_value_t set_element = target_typedarray_setter_cb (target_buffer_p, collected_p->buffer_p[idx]); if (ECMA_IS_VALUE_ERROR (set_element)) { @@ -802,8 +798,7 @@ ecma_op_typedarray_get_to_string_at_index (ecma_object_t *obj_p, /**< this objec return NULL; } - if (ecma_is_value_undefined (index_value) - || ecma_is_value_null (index_value)) + if (ecma_is_value_undefined (index_value) || ecma_is_value_null (index_value)) { ecma_free_value (index_value); return ecma_get_magic_string (LIT_MAGIC_STRING__EMPTY); @@ -922,9 +917,7 @@ ecma_builtin_typedarray_prototype_subarray (ecma_value_t this_arg, /**< this obj uint32_t begin_index_uint32 = 0, end_index_uint32 = 0; /* 7. relativeBegin */ - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (begin, - info_p->length, - &begin_index_uint32))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (begin, info_p->length, &begin_index_uint32))) { return ECMA_VALUE_ERROR; } @@ -936,9 +929,7 @@ ecma_builtin_typedarray_prototype_subarray (ecma_value_t this_arg, /**< this obj else { /* 10. relativeEnd */ - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (end, - info_p->length, - &end_index_uint32))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (end, info_p->length, &end_index_uint32))) { return ECMA_VALUE_ERROR; } @@ -955,12 +946,9 @@ ecma_builtin_typedarray_prototype_subarray (ecma_value_t this_arg, /**< this obj /* 17. beginByteOffset */ uint32_t begin_byte_offset = info_p->offset + (begin_index_uint32 << info_p->shift); - ecma_value_t arguments_p[3] = - { - ecma_make_object_value (info_p->array_buffer_p), - ecma_make_uint32_value (begin_byte_offset), - ecma_make_uint32_value (subarray_length) - }; + ecma_value_t arguments_p[3] = { ecma_make_object_value (info_p->array_buffer_p), + ecma_make_uint32_value (begin_byte_offset), + ecma_make_uint32_value (subarray_length) }; ret_value = ecma_typedarray_species_create (this_arg, arguments_p, 3); @@ -1013,9 +1001,7 @@ ecma_builtin_typedarray_prototype_fill (ecma_value_t this_arg, /**< this object uint32_t begin_index_uint32 = 0, end_index_uint32 = 0; - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (begin, - info_p->length, - &begin_index_uint32))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (begin, info_p->length, &begin_index_uint32))) { ecma_free_value (value_to_set); return ECMA_VALUE_ERROR; @@ -1027,9 +1013,7 @@ ecma_builtin_typedarray_prototype_fill (ecma_value_t this_arg, /**< this object } else { - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (end, - info_p->length, - &end_index_uint32))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (end, info_p->length, &end_index_uint32))) { ecma_free_value (value_to_set); return ECMA_VALUE_ERROR; @@ -1138,10 +1122,7 @@ ecma_builtin_typedarray_prototype_sort_compare_helper (ecma_value_t lhs, /**< le ecma_value_t compare_args[] = { lhs, rhs }; - ecma_value_t call_value = ecma_op_function_call (comparefn_obj_p, - ECMA_VALUE_UNDEFINED, - compare_args, - 2); + ecma_value_t call_value = ecma_op_function_call (comparefn_obj_p, ECMA_VALUE_UNDEFINED, compare_args, 2); if (ECMA_IS_VALUE_ERROR (call_value) || ecma_is_value_number (call_value)) { @@ -1391,10 +1372,8 @@ ecma_builtin_typedarray_prototype_index_of (ecma_typedarray_info_t *info_p, /**< uint32_t from_index; - /* 5. */ - if (args_number == 0 - || (!ecma_is_value_number (args[0]) && !is_bigint) - || info_p->length == 0) + /* 5. */ + if (args_number == 0 || (!ecma_is_value_number (args[0]) && !is_bigint) || info_p->length == 0) { return ecma_make_integer_value (-1); } @@ -1404,9 +1383,7 @@ ecma_builtin_typedarray_prototype_index_of (ecma_typedarray_info_t *info_p, /**< } else { - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[1], - info_p->length, - &from_index))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[1], info_p->length, &from_index))) { return ECMA_VALUE_ERROR; } @@ -1455,8 +1432,8 @@ ecma_builtin_typedarray_prototype_index_of (ecma_typedarray_info_t *info_p, /**< */ static ecma_value_t ecma_builtin_typedarray_prototype_last_index_of (ecma_typedarray_info_t *info_p, /**< object info */ - const ecma_value_t args[], /**< arguments list */ - uint32_t args_number) /**< number of arguments */ + const ecma_value_t args[], /**< arguments list */ + uint32_t args_number) /**< number of arguments */ { #if JERRY_BUILTIN_BIGINT bool is_bigint = ECMA_TYPEDARRAY_IS_BIGINT_TYPE (info_p->id); @@ -1467,9 +1444,7 @@ ecma_builtin_typedarray_prototype_last_index_of (ecma_typedarray_info_t *info_p, uint32_t from_index; /* 5. */ - if (args_number == 0 - || (!ecma_is_value_number (args[0]) && !is_bigint) - || info_p->length == 0) + if (args_number == 0 || (!ecma_is_value_number (args[0]) && !is_bigint) || info_p->length == 0) { return ecma_make_integer_value (-1); } @@ -1480,9 +1455,7 @@ ecma_builtin_typedarray_prototype_last_index_of (ecma_typedarray_info_t *info_p, } else { - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[1], - info_p->length, - &from_index))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[1], info_p->length, &from_index))) { return ECMA_VALUE_ERROR; } @@ -1547,27 +1520,21 @@ ecma_builtin_typedarray_prototype_copy_within (ecma_value_t this_arg, /**< this if (args_number > 0) { - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[0], - info_p->length, - &relative_target))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[0], info_p->length, &relative_target))) { return ECMA_VALUE_ERROR; } if (args_number > 1) { - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[1], - info_p->length, - &relative_start))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[1], info_p->length, &relative_start))) { return ECMA_VALUE_ERROR; } if (args_number > 2 && args[2] != ECMA_VALUE_UNDEFINED) { - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[2], - info_p->length, - &relative_end))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[2], info_p->length, &relative_end))) { return ECMA_VALUE_ERROR; } @@ -1618,18 +1585,13 @@ ecma_builtin_typedarray_prototype_slice (ecma_value_t this_arg, /**< this argume if (args_number > 0) { - if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[0], - info_p->length, - &relative_start))) + if (ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[0], info_p->length, &relative_start))) { return ECMA_VALUE_ERROR; } - if (args_number > 1 - && args[1] != ECMA_VALUE_UNDEFINED - && ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[1], - info_p->length, - &relative_end))) + if (args_number > 1 && args[1] != ECMA_VALUE_UNDEFINED + && ECMA_IS_VALUE_ERROR (ecma_builtin_helper_uint32_index_normalize (args[1], info_p->length, &relative_end))) { return ECMA_VALUE_ERROR; } @@ -1709,7 +1671,7 @@ ecma_builtin_typedarray_prototype_slice (ecma_value_t this_arg, /**< this argume * * @return ecma value * Returned value must be freed with ecma_free_value. -*/ + */ static ecma_value_t ecma_builtin_typedarray_prototype_to_locale_string_helper (ecma_typedarray_info_t *info_p, /**< object info */ uint32_t index) /** array index */ @@ -1801,9 +1763,7 @@ ecma_builtin_typedarray_prototype_includes (ecma_typedarray_info_t *info_p, /**< bool is_bigint = false; #endif /* JERRRY_BUILTIN_BIGINT */ - if (args_number == 0 - || (!ecma_is_value_number (args[0]) && !is_bigint) - || info_p->length == 0) + if (args_number == 0 || (!ecma_is_value_number (args[0]) && !is_bigint) || info_p->length == 0) { return ECMA_VALUE_FALSE; } @@ -1918,7 +1878,7 @@ ecma_builtin_typedarray_prototype_dispatch_routine (uint8_t builtin_routine_id, case ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_REDUCE: case ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_REDUCE_RIGHT: { - bool is_reduce = builtin_routine_id == ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_REDUCE_RIGHT; + bool is_reduce = builtin_routine_id == ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_REDUCE_RIGHT; return ecma_builtin_typedarray_prototype_reduce_with_direction (this_arg, &info, arguments_list_p, @@ -1957,7 +1917,6 @@ ecma_builtin_typedarray_prototype_dispatch_routine (uint8_t builtin_routine_id, } return ecma_builtin_typedarray_prototype_sort (this_arg, &info, arguments_list_p[0]); - } case ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_FIND: case ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_FIND_INDEX: @@ -1996,8 +1955,8 @@ ecma_builtin_typedarray_prototype_dispatch_routine (uint8_t builtin_routine_id, case ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_KEYS: case ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_ENTRIES: { - ecma_iterator_kind_t iter_id = (builtin_routine_id == ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_KEYS) - ? ECMA_ITERATOR_KEYS : ECMA_ITERATOR_ENTRIES; + ecma_iterator_kind_t iter_id = + (builtin_routine_id == ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_KEYS) ? ECMA_ITERATOR_KEYS : ECMA_ITERATOR_ENTRIES; return ecma_typedarray_iterators_helper (this_arg, iter_id); } diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h index a5bf4cfd..9cace683 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h @@ -22,9 +22,7 @@ #if JERRY_BUILTIN_TYPEDARRAY /* ES2015 22.2.3.4 */ -OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, - ECMA_BUILTIN_ID_TYPEDARRAY, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_TYPEDARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* Readonly accessor properties */ /* ES2015 22.2.3.1 */ @@ -63,7 +61,7 @@ ROUTINE (LIT_MAGIC_STRING_FOR_EACH_UL, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_FOR_EAC ROUTINE (LIT_MAGIC_STRING_INCLUDES, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_INCLUDES, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_AT, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_AT, 1, 1) ROUTINE (LIT_MAGIC_STRING_INDEX_OF_UL, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_INDEX_OF, NON_FIXED, 1) -ROUTINE (LIT_MAGIC_STRING_JOIN, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_JOIN, 1, 1) +ROUTINE (LIT_MAGIC_STRING_JOIN, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_JOIN, 1, 1) ROUTINE (LIT_MAGIC_STRING_KEYS, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_KEYS, 0, 0) ROUTINE (LIT_MAGIC_STRING_LAST_INDEX_OF_UL, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_LAST_INDEX_OF, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_MAP, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_MAP, 2, 1) @@ -76,11 +74,12 @@ ROUTINE (LIT_MAGIC_STRING_SOME, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_SOME, 2, 1) ROUTINE (LIT_MAGIC_STRING_SORT, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_SORT, 1, 1) ROUTINE (LIT_MAGIC_STRING_SUBARRAY, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_SUBARRAY, 2, 2) ROUTINE (LIT_MAGIC_STRING_TO_LOCALE_STRING_UL, ECMA_TYPEDARRAY_PROTOTYPE_ROUTINE_TO_LOCALE_STRING, 0, 0) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_STRING_UL, LIT_MAGIC_STRING_TO_STRING_UL, +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_STRING_UL, LIT_MAGIC_STRING_TO_STRING_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) +INTRINSIC_PROPERTY (LIT_MAGIC_STRING_VALUES, + LIT_INTERNAL_MAGIC_STRING_TYPEDARRAY_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_MAGIC_STRING_VALUES, LIT_INTERNAL_MAGIC_STRING_TYPEDARRAY_PROTOTYPE_VALUES, - ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, LIT_INTERNAL_MAGIC_STRING_TYPEDARRAY_PROTOTYPE_VALUES, +INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, + LIT_INTERNAL_MAGIC_STRING_TYPEDARRAY_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h index 23c4ce6f..7c9313fc 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h @@ -16,38 +16,30 @@ #if JERRY_BUILTIN_TYPEDARRAY #ifndef TYPEDARRAY_BYTES_PER_ELEMENT -# error "Please define TYPEDARRAY_BYTES_PER_ELEMENT" +#error "Please define TYPEDARRAY_BYTES_PER_ELEMENT" #endif /* !TYPEDARRAY_BYTES_PER_ELEMENT */ #ifndef TYPEDARRAY_MAGIC_STRING_ID -# error "Please define TYPEDARRAY_MAGIC_STRING_ID" +#error "Please define TYPEDARRAY_MAGIC_STRING_ID" #endif /* !TYPEDARRAY_MAGIC_STRING_ID */ #ifndef TYPEDARRAY_BUILTIN_ID -# error "Please define TYPEDARRAY_BUILTIN_ID" +#error "Please define TYPEDARRAY_BUILTIN_ID" #endif /* !TYPEDARRAY_BUILTIN_ID */ #include "ecma-builtin-helpers-macro-defines.inc.h" /* ES2015 22.2.5 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 3, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 3, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ES2015 22.2.5.1 */ -NUMBER_VALUE (LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U, - TYPEDARRAY_BYTES_PER_ELEMENT, - ECMA_PROPERTY_FIXED) +NUMBER_VALUE (LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U, TYPEDARRAY_BYTES_PER_ELEMENT, ECMA_PROPERTY_FIXED) /* ES2015 22.2.5 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - TYPEDARRAY_MAGIC_STRING_ID, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, TYPEDARRAY_MAGIC_STRING_ID, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ES2015 22.2.5.2 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - TYPEDARRAY_BUILTIN_ID, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, TYPEDARRAY_BUILTIN_ID, ECMA_PROPERTY_FIXED) #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c index 2631f4db..898492fa 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c @@ -13,14 +13,14 @@ * limitations under the License. */ -#include "ecma-typedarray-object.h" #include "ecma-builtins.h" #include "ecma-exceptions.h" +#include "ecma-function-object.h" #include "ecma-gc.h" #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" -#include "ecma-function-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -29,9 +29,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-typedarray.inc.h" -#define BUILTIN_UNDERSCORED_ID typedarray +#define BUILTIN_UNDERSCORED_ID typedarray #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -91,10 +90,7 @@ ecma_builtin_typedarray_from (ecma_value_t this_arg, /**< 'this' argument */ } } - return ecma_op_typedarray_from (this_arg, - source, - map_fn, - this_in_fn); + return ecma_op_typedarray_from (this_arg, source, map_fn, this_in_fn); } /* ecma_builtin_typedarray_from */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h index d362f817..bc8ab47d 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h @@ -23,19 +23,13 @@ /* ES2015 22.2.2 */ /* ES11 22.2.1.1 - value of length changed to 0 */ -NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, - 0, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ES2015 22.2.2 */ -STRING_VALUE (LIT_MAGIC_STRING_NAME, - LIT_MAGIC_STRING_TYPED_ARRAY_UL, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_TYPED_ARRAY_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) /* ES2015 22.2.2.3 */ -OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, - ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE, - ECMA_PROPERTY_FIXED) +OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE, ECMA_PROPERTY_FIXED) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -47,9 +41,7 @@ ROUTINE (LIT_MAGIC_STRING_FROM, ecma_builtin_typedarray_from, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_OF, ecma_builtin_typedarray_of, NON_FIXED, 0) /* ES2015 22.2.2.4 */ -ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, - ecma_builtin_typedarray_species_get, - ECMA_PROPERTY_FLAG_CONFIGURABLE) +ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_typedarray_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c index 5e980625..691da4ba 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-uint16array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID uint16array_prototype +#define BUILTIN_UNDERSCORED_ID uint16array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h index 6d0fef96..ec055f66 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h @@ -20,7 +20,7 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 2 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT16ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT16ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c index 5b3d33ad..db0367dd 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -27,9 +28,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-uint16array.inc.h" -#define BUILTIN_UNDERSCORED_ID uint16array +#define BUILTIN_UNDERSCORED_ID uint16array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -65,14 +65,13 @@ ecma_value_t ecma_builtin_uint16array_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_UINT16_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_UINT16_ARRAY); } /* ecma_builtin_uint16array_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h index 8a21218f..2c0af1f0 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h @@ -20,8 +20,8 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 2 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT16_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT16ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT16_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT16ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c index ff721dcd..4b5e3842 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-uint32array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID uint32array_prototype +#define BUILTIN_UNDERSCORED_ID uint32array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h index b4142cb1..a04098a3 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h @@ -20,7 +20,7 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT32ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT32ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c index 17b6d390..51abd555 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -27,9 +28,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-uint32array.inc.h" -#define BUILTIN_UNDERSCORED_ID uint32array +#define BUILTIN_UNDERSCORED_ID uint32array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -67,14 +67,13 @@ ecma_builtin_uint32array_dispatch_construct (const ecma_value_t *arguments_list_ { JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_UINT32_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_UINT32_ARRAY); } /* ecma_builtin_uint32array_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h index c3812083..fd0389a4 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h @@ -20,8 +20,8 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT32_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT32ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT32_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT32ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c index 67347067..8a8edb4a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-uint8array-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID uint8array_prototype +#define BUILTIN_UNDERSCORED_ID uint8array_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h index c047d6c9..07f94b0b 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h @@ -20,7 +20,7 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8ARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c index c451327c..d646611c 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -27,9 +28,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-uint8array.inc.h" -#define BUILTIN_UNDERSCORED_ID uint8array +#define BUILTIN_UNDERSCORED_ID uint8array #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -65,14 +65,13 @@ ecma_value_t ecma_builtin_uint8array_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_UINT8_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_UINT8_ARRAY); } /* ecma_builtin_uint8array_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h index b108370d..d0259e9b 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h @@ -20,8 +20,8 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT8_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8ARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT8_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c index b7526a92..534014b1 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c @@ -21,7 +21,7 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-uint8clampedarray-prototype.inc.h" -#define BUILTIN_UNDERSCORED_ID uint8clampedarray_prototype +#define BUILTIN_UNDERSCORED_ID uint8clampedarray_prototype #include "ecma-builtin-internal-routines-template.inc.h" /** \addtogroup ecma ECMA diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h index 3d8f96d1..8564828a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h @@ -20,7 +20,7 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c index 0d6fe212..f3678f47 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c @@ -19,6 +19,7 @@ #include "ecma-globals.h" #include "ecma-helpers.h" #include "ecma-typedarray-object.h" + #include "jrt.h" #if JERRY_BUILTIN_TYPEDARRAY @@ -27,9 +28,8 @@ #include "ecma-builtins-internal.h" #define BUILTIN_INC_HEADER_NAME "ecma-builtin-uint8clampedarray.inc.h" -#define BUILTIN_UNDERSCORED_ID uint8clampedarray +#define BUILTIN_UNDERSCORED_ID uint8clampedarray #include "ecma-builtin-internal-routines-template.inc.h" - #include "ecma-builtin-typedarray-helpers.h" /** \addtogroup ecma ECMA @@ -67,14 +67,13 @@ ecma_builtin_uint8clampedarray_dispatch_construct (const ecma_value_t *arguments { JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); - return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, - ECMA_UINT8_CLAMPED_ARRAY); + return ecma_typedarray_helper_dispatch_construct (arguments_list_p, arguments_list_len, ECMA_UINT8_CLAMPED_ARRAY); } /* ecma_builtin_uint8clampedarray_dispatch_construct */ /** - * @} - * @} - * @} - */ + * @} + * @} + * @} + */ #endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h index 16d21454..d3f0eb1f 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h @@ -20,8 +20,8 @@ #if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 -#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL -#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY_PROTOTYPE +#define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL +#define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" #endif /* JERRY_BUILTIN_TYPEDARRAY */ |