Refactor JSON builtin methods (#3031)

JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
This commit is contained in:
Dániel Bátyai
2019-09-05 01:25:19 +02:00
committed by GitHub
parent 1088273bc3
commit 8bccbbf08f
6 changed files with 958 additions and 1284 deletions
+64 -1
View File
@@ -2568,6 +2568,56 @@ ecma_stringbuilder_grow (ecma_stringbuilder_t *builder_p, /**< string builder */
return ((lit_utf8_byte_t *) header_p) + header_p->current_size - required_size;
} /* ecma_stringbuilder_grow */
/**
* Get the current size of the string in a string builder
*
* @return the size of the string data
*/
lit_utf8_size_t
ecma_stringbuilder_get_size (ecma_stringbuilder_t *builder_p) /**< string builder */
{
ecma_stringbuilder_header_t *header_p = builder_p->header_p;
JERRY_ASSERT (header_p != NULL);
return ECMA_STRINGBUILDER_STRING_SIZE (header_p);
} /* ecma_stringbuilder_get_size */
/**
* Get pointer to the raw string data in a string builder
*
* @return pointer to the string data
*/
lit_utf8_byte_t *
ecma_stringbuilder_get_data (ecma_stringbuilder_t *builder_p) /**< string builder */
{
ecma_stringbuilder_header_t *header_p = builder_p->header_p;
JERRY_ASSERT (header_p != NULL);
return ECMA_STRINGBUILDER_STRING_PTR (header_p);
} /* ecma_stringbuilder_get_data */
/**
* Revert the string builder to a smaller size
*/
void
ecma_stringbuilder_revert (ecma_stringbuilder_t *builder_p, /**< string builder */
const lit_utf8_size_t size) /**< new size */
{
ecma_stringbuilder_header_t *header_p = builder_p->header_p;
JERRY_ASSERT (header_p != NULL);
const lit_utf8_size_t new_size = size + (lit_utf8_size_t) (sizeof (ecma_ascii_string_t));
JERRY_ASSERT (new_size <= header_p->current_size);
#if ENABLED (JERRY_MEM_STATS)
jmem_stats_free_string_bytes (header_p->current_size - new_size);
#endif /* ENABLED (JERRY_MEM_STATS) */
header_p = jmem_heap_realloc_block (header_p, header_p->current_size, new_size);
header_p->current_size = new_size;
builder_p->header_p = header_p;
} /* ecma_stringbuilder_revert */
/**
* Append an ecma_string_t to a string builder
*/
@@ -2623,6 +2673,17 @@ ecma_stringbuilder_append_char (ecma_stringbuilder_t *builder_p, /**< string bui
lit_char_to_utf8_bytes (dest_p, c);
} /* ecma_stringbuilder_append_char */
/**
* Append a single byte to a string builder
*/
void
ecma_stringbuilder_append_byte (ecma_stringbuilder_t *builder_p, /**< string builder */
const lit_utf8_byte_t byte) /**< byte */
{
lit_utf8_byte_t *dest_p = ecma_stringbuilder_grow (builder_p, 1);
*dest_p = byte;
} /* ecma_stringbuilder_append_byte */
/**
* Finalize a string builder, returning the created string, and releasing the underlying buffer.
*
@@ -2675,7 +2736,9 @@ ecma_stringbuilder_finalize (ecma_stringbuilder_t *builder_p) /**< string builde
const size_t utf8_string_size = string_size + container_size;
header_p = jmem_heap_realloc_block (header_p, header_p->current_size, utf8_string_size);
memmove (((lit_utf8_byte_t *) header_p + container_size), string_begin_p, string_size);
memmove (((lit_utf8_byte_t *) header_p + container_size),
ECMA_STRINGBUILDER_STRING_PTR (header_p),
string_size);
#if ENABLED (JERRY_MEM_STATS)
jmem_stats_allocate_string_bytes (container_size - sizeof (ecma_ascii_string_t));
+4
View File
@@ -319,12 +319,16 @@ ecma_string_t *ecma_string_trim (const ecma_string_t *string_p);
ecma_stringbuilder_t ecma_stringbuilder_create (void);
ecma_stringbuilder_t ecma_stringbuilder_create_from (ecma_string_t *string_p);
lit_utf8_size_t ecma_stringbuilder_get_size (ecma_stringbuilder_t *builder_p);
lit_utf8_byte_t *ecma_stringbuilder_get_data (ecma_stringbuilder_t *builder_p);
void ecma_stringbuilder_revert (ecma_stringbuilder_t *builder_p, const lit_utf8_size_t size);
void ecma_stringbuilder_append (ecma_stringbuilder_t *builder_p, const ecma_string_t *string_p);
void ecma_stringbuilder_append_magic (ecma_stringbuilder_t *builder_p, const lit_magic_string_id_t id);
void ecma_stringbuilder_append_raw (ecma_stringbuilder_t *builder_p,
const lit_utf8_byte_t *data_p,
const lit_utf8_size_t data_size);
void ecma_stringbuilder_append_char (ecma_stringbuilder_t *builder_p, const ecma_char_t c);
void ecma_stringbuilder_append_byte (ecma_stringbuilder_t *builder_p, const lit_utf8_byte_t);
ecma_string_t *ecma_stringbuilder_finalize (ecma_stringbuilder_t *builder_p);
void ecma_stringbuilder_destroy (ecma_stringbuilder_t *builder_p);