Skip to content

Add functions for iterating utf-8 strings #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 3, 2015
Merged

Add functions for iterating utf-8 strings #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions jerry-core/ecma/builtin-objects/ecma-builtin-global.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,10 +880,10 @@ ecma_builtin_global_object_encode_uri_helper (ecma_value_t uri, /**< uri argumen

lit_utf8_iterator_t iter = lit_utf8_iterator_create (input_start_p, input_size);
lit_utf8_size_t output_length = 1;
while (!lit_utf8_iterator_reached_buffer_end (&iter))
while (!lit_utf8_iterator_is_eos (&iter))
{
/* Input validation. */
lit_code_point_t character = lit_utf8_iterator_read_code_unit_and_increment (&iter);
lit_code_point_t character = lit_utf8_iterator_read_next (&iter);

if (character <= 0x7f)
{
Expand Down Expand Up @@ -931,10 +931,10 @@ ecma_builtin_global_object_encode_uri_helper (ecma_value_t uri, /**< uri argumen

lit_utf8_iterator_t iter = lit_utf8_iterator_create (input_start_p, input_size);
lit_utf8_byte_t *output_char_p = output_start_p;
while (!lit_utf8_iterator_reached_buffer_end (&iter))
while (!lit_utf8_iterator_is_eos (&iter))
{
/* Input decode. */
lit_code_point_t character = lit_utf8_iterator_read_code_unit_and_increment (&iter);
lit_code_point_t character = lit_utf8_iterator_read_next (&iter);

if (character <= 0x7f)
{
Expand Down
5 changes: 5 additions & 0 deletions jerry-core/lit/lit-globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ typedef ecma_char_t *ecma_char_ptr_t;
*/
#define LIT_UTF8_MAX_BYTES_IN_CODE_UNIT (3)

/**
* Max bytes needed to represent a code point (Unicode character) via utf-8 encoding
*/
#define LIT_UTF8_MAX_BYTES_IN_CODE_POINT (4)

/**
* A byte of utf-8 string
*/
Expand Down
Loading