Add an API function to calculate the UTF-8 encoded string size from Jerry string. (#1450)
JerryScript-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com
This commit is contained in:
@@ -1513,6 +1513,55 @@ ecma_string_get_size (const ecma_string_t *string_p) /**< ecma-string */
|
||||
}
|
||||
} /* ecma_string_get_size */
|
||||
|
||||
/**
|
||||
* Get the UTF-8 encoded string size from ecma-string
|
||||
*
|
||||
* @return number of bytes in the buffer needed to represent an UTF-8 encoded string
|
||||
*/
|
||||
lit_utf8_size_t
|
||||
ecma_string_get_utf8_size (const ecma_string_t *string_p) /**< ecma-string */
|
||||
{
|
||||
switch (ECMA_STRING_GET_CONTAINER (string_p))
|
||||
{
|
||||
case ECMA_STRING_CONTAINER_HEAP_UTF8_STRING:
|
||||
{
|
||||
if (string_p->u.utf8_string.size == (lit_utf8_size_t) string_p->u.utf8_string.length)
|
||||
{
|
||||
return (lit_utf8_size_t) string_p->u.utf8_string.size;
|
||||
}
|
||||
|
||||
return lit_get_utf8_size_of_cesu8_string ((const lit_utf8_byte_t *) (string_p + 1),
|
||||
(lit_utf8_size_t) string_p->u.utf8_string.size);
|
||||
}
|
||||
case ECMA_STRING_CONTAINER_HEAP_LONG_UTF8_STRING:
|
||||
{
|
||||
ecma_long_string_t *long_string_p = (ecma_long_string_t *) string_p;
|
||||
if (string_p->u.long_utf8_string_size == (lit_utf8_size_t) long_string_p->long_utf8_string_length)
|
||||
{
|
||||
return (lit_utf8_size_t) string_p->u.long_utf8_string_size;
|
||||
}
|
||||
|
||||
return lit_get_utf8_size_of_cesu8_string ((const lit_utf8_byte_t *) (string_p + 1),
|
||||
(lit_utf8_size_t) string_p->u.long_utf8_string_size);
|
||||
}
|
||||
case ECMA_STRING_CONTAINER_UINT32_IN_DESC:
|
||||
{
|
||||
return (lit_utf8_size_t) ecma_string_get_number_in_desc_size (string_p->u.uint32_number);
|
||||
}
|
||||
case ECMA_STRING_CONTAINER_MAGIC_STRING:
|
||||
{
|
||||
return lit_get_magic_string_size (string_p->u.magic_string_id);
|
||||
}
|
||||
default:
|
||||
{
|
||||
JERRY_ASSERT (ECMA_STRING_GET_CONTAINER (string_p) == ECMA_STRING_CONTAINER_MAGIC_STRING_EX);
|
||||
|
||||
return lit_get_utf8_size_of_cesu8_string (lit_get_magic_string_ex_utf8 (string_p->u.magic_string_ex_id),
|
||||
lit_get_magic_string_ex_size (string_p->u.magic_string_ex_id));
|
||||
}
|
||||
}
|
||||
} /* ecma_string_get_utf8_size */
|
||||
|
||||
/**
|
||||
* Get character from specified position in the ecma-string.
|
||||
*
|
||||
|
||||
@@ -196,6 +196,7 @@ extern bool ecma_compare_ecma_strings (const ecma_string_t *, const ecma_string_
|
||||
extern bool ecma_compare_ecma_strings_relational (const ecma_string_t *, const ecma_string_t *);
|
||||
extern ecma_length_t ecma_string_get_length (const ecma_string_t *);
|
||||
extern lit_utf8_size_t ecma_string_get_size (const ecma_string_t *);
|
||||
extern lit_utf8_size_t ecma_string_get_utf8_size (const ecma_string_t *);
|
||||
extern ecma_char_t ecma_string_get_char_at_pos (const ecma_string_t *, ecma_length_t);
|
||||
|
||||
extern ecma_string_t *ecma_get_magic_string (lit_magic_string_id_t);
|
||||
|
||||
@@ -208,6 +208,7 @@ double jerry_get_number_value (const jerry_value_t);
|
||||
* Functions for string values
|
||||
*/
|
||||
jerry_size_t jerry_get_string_size (const jerry_value_t);
|
||||
jerry_size_t jerry_get_utf8_string_size (const jerry_value_t);
|
||||
jerry_length_t jerry_get_string_length (const jerry_value_t);
|
||||
jerry_size_t jerry_string_to_char_buffer (const jerry_value_t, jerry_char_t *, jerry_size_t);
|
||||
|
||||
|
||||
@@ -1044,6 +1044,27 @@ jerry_get_string_size (const jerry_value_t value) /**< input string */
|
||||
return ecma_string_get_size (ecma_get_string_from_value (value));
|
||||
} /* jerry_get_string_size */
|
||||
|
||||
/**
|
||||
* Get UTF-8 encoded string size from Jerry string
|
||||
*
|
||||
* Note:
|
||||
* Returns 0, if the value parameter is not a string.
|
||||
*
|
||||
* @return number of bytes in the buffer needed to represent the UTF-8 encoded string
|
||||
*/
|
||||
jerry_size_t
|
||||
jerry_get_utf8_string_size (const jerry_value_t value)
|
||||
{
|
||||
jerry_assert_api_available ();
|
||||
|
||||
if (!ecma_is_value_string (value))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return ecma_string_get_utf8_size (ecma_get_string_from_value (value));
|
||||
} /* jerry_get_utf8_string_size */
|
||||
|
||||
/**
|
||||
* Get length of Jerry string
|
||||
*
|
||||
|
||||
@@ -281,6 +281,40 @@ lit_utf8_string_length (const lit_utf8_byte_t *utf8_buf_p, /**< utf-8 string */
|
||||
return length;
|
||||
} /* lit_utf8_string_length */
|
||||
|
||||
/**
|
||||
* Calculate the required size of an utf-8 encoded string from cesu-8 encoded string
|
||||
*
|
||||
* @return size of an utf-8 encoded string
|
||||
*/
|
||||
lit_utf8_size_t
|
||||
lit_get_utf8_size_of_cesu8_string (const lit_utf8_byte_t *cesu8_buf_p, /**< cesu-8 string */
|
||||
lit_utf8_size_t cesu8_buf_size) /**< string size */
|
||||
{
|
||||
lit_utf8_size_t offset = 0;
|
||||
lit_utf8_size_t utf8_buf_size = cesu8_buf_size;
|
||||
|
||||
while (offset < cesu8_buf_size)
|
||||
{
|
||||
ecma_char_t ch;
|
||||
offset += lit_read_code_unit_from_utf8 (cesu8_buf_p + offset, &ch);
|
||||
|
||||
if (lit_is_code_point_utf16_high_surrogate (ch) && (offset < cesu8_buf_size))
|
||||
{
|
||||
ecma_char_t next_ch;
|
||||
offset += lit_read_code_unit_from_utf8 (cesu8_buf_p + offset, &next_ch);
|
||||
|
||||
if (lit_is_code_point_utf16_low_surrogate (next_ch))
|
||||
{
|
||||
utf8_buf_size -= 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
JERRY_ASSERT (offset == cesu8_buf_size);
|
||||
|
||||
return utf8_buf_size;
|
||||
} /* lit_get_utf8_size_of_cesu8_string */
|
||||
|
||||
/**
|
||||
* Decodes a unicode code point from non-empty utf-8-encoded buffer
|
||||
*
|
||||
|
||||
@@ -95,6 +95,7 @@ bool lit_is_code_point_utf16_high_surrogate (lit_code_point_t);
|
||||
|
||||
/* size */
|
||||
lit_utf8_size_t lit_zt_utf8_string_size (const lit_utf8_byte_t *);
|
||||
lit_utf8_size_t lit_get_utf8_size_of_cesu8_string (const lit_utf8_byte_t *, lit_utf8_size_t);
|
||||
|
||||
/* length */
|
||||
ecma_length_t lit_utf8_string_length (const lit_utf8_byte_t *, lit_utf8_size_t);
|
||||
|
||||
Reference in New Issue
Block a user