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

Use stringbuilder in ecma_raise_standard_error_with_format (#3585)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu
This commit is contained in:
Szilagyi Adam
2020-03-04 18:05:08 +01:00
committed by GitHub
parent 76bbb088e9
commit 23974e2389
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/operations/ecma-exceptions.c
+10 -18
View File
@@ -257,7 +257,7 @@ ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, /**< er
{ {
JERRY_ASSERT (format != NULL); JERRY_ASSERT (format != NULL);
ecma_string_t *error_msg_p = ecma_get_magic_string (LIT_MAGIC_STRING__EMPTY); ecma_stringbuilder_t builder = ecma_stringbuilder_create ();
const char *start_p = format; const char *start_p = format;
const char *end_p = format; const char *end_p = format;
@@ -273,13 +273,7 @@ ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, /**< er
/* Concat template string. */ /* Concat template string. */
if (end_p > start_p) if (end_p > start_p)
{ {
const lit_utf8_byte_t *chars_p = (const lit_utf8_byte_t *) start_p; ecma_stringbuilder_append_raw (&builder, (lit_utf8_byte_t *) start_p, (lit_utf8_size_t) (end_p - start_p));
lit_utf8_size_t chars_size = (lit_utf8_size_t) (end_p - start_p);
error_msg_p = ecma_append_chars_to_string (error_msg_p,
chars_p,
chars_size,
lit_utf8_string_length (chars_p, chars_size));
} }
/* Convert an argument to string without side effects. */ /* Convert an argument to string without side effects. */
@@ -306,7 +300,8 @@ ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, /**< er
} }
/* Concat argument. */ /* Concat argument. */
error_msg_p = ecma_concat_ecma_strings (error_msg_p, arg_string_p); ecma_stringbuilder_append (&builder, arg_string_p);
ecma_deref_ecma_string (arg_string_p); ecma_deref_ecma_string (arg_string_p);
start_p = end_p + 1; start_p = end_p + 1;
@@ -320,17 +315,14 @@ ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, /**< er
/* Concat reset of template string. */ /* Concat reset of template string. */
if (start_p < end_p) if (start_p < end_p)
{ {
const lit_utf8_byte_t *chars_p = (const lit_utf8_byte_t *) start_p; ecma_stringbuilder_append_raw (&builder, (lit_utf8_byte_t *) start_p, (lit_utf8_size_t) (end_p - start_p));
lit_utf8_size_t chars_size = (lit_utf8_size_t) (end_p - start_p);
error_msg_p = ecma_append_chars_to_string (error_msg_p,
chars_p,
chars_size,
lit_utf8_string_length (chars_p, chars_size));
} }
ecma_object_t *error_obj_p = ecma_new_standard_error_with_message (error_type, error_msg_p); ecma_string_t *builder_str_p = ecma_stringbuilder_finalize (&builder);
ecma_deref_ecma_string (error_msg_p);
ecma_object_t *error_obj_p = ecma_new_standard_error_with_message (error_type, builder_str_p);
ecma_deref_ecma_string (builder_str_p);
jcontext_raise_exception (ecma_make_object_value (error_obj_p)); jcontext_raise_exception (ecma_make_object_value (error_obj_p));
return ECMA_VALUE_ERROR; return ECMA_VALUE_ERROR;