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

Make parseInt unicode tolerant.

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.u-szeged@partner.samsung.com
This commit is contained in:
Peter Gal
2015-07-24 14:43:08 +02:00
committed by Dániel Bátyai
parent 382b2b48b7
commit 3fbe54393f
2 changed files with 77 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-global.cpp
+71 -29
View File
@@ -121,17 +121,25 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
utf8_string_buff, utf8_string_buff,
(ssize_t) str_size); (ssize_t) str_size);
JERRY_ASSERT (bytes_copied >= 0); JERRY_ASSERT (bytes_copied >= 0);
utf8_string_buff[str_size] = LIT_BYTE_NULL; lit_utf8_iterator_t iter = lit_utf8_iterator_create (utf8_string_buff, str_size);
/* 2. Remove leading whitespace. */ /* 2. Remove leading whitespace. */
ecma_length_t start = str_size; lit_utf8_iterator_seek_eos (&iter);
ecma_length_t end = str_size;
for (ecma_length_t i = 0; i < end; i++) lit_utf8_iterator_pos_t start = lit_utf8_iterator_get_pos (&iter);
lit_utf8_iterator_pos_t end = lit_utf8_iterator_get_pos (&iter);
lit_utf8_iterator_seek_bos (&iter);
while (!lit_utf8_iterator_is_eos (&iter))
{ {
if (!lit_char_is_white_space (utf8_string_buff[i]) ecma_char_t current_char = lit_utf8_iterator_read_next (&iter);
&& !lit_char_is_line_terminator (utf8_string_buff[i]))
if (!lit_char_is_white_space (current_char)
&& !lit_char_is_line_terminator (current_char))
{ {
start = i; lit_utf8_iterator_read_prev (&iter);
start = lit_utf8_iterator_get_pos (&iter);
break; break;
} }
} }
@@ -140,15 +148,20 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
int sign = 1; int sign = 1;
/* 4. */ /* 4. */
if (utf8_string_buff[start] == LIT_CHAR_MINUS) ecma_char_t current = lit_utf8_iterator_read_next (&iter);
if (current == LIT_CHAR_MINUS)
{ {
sign = -1; sign = -1;
} }
/* 5. */ /* 5. */
if (utf8_string_buff[start] == LIT_CHAR_MINUS || utf8_string_buff[start] == LIT_CHAR_PLUS) if (current == LIT_CHAR_MINUS || current == LIT_CHAR_PLUS)
{ {
start++; start = lit_utf8_iterator_get_pos (&iter);
if (!lit_utf8_iterator_is_eos (&iter))
{
current = lit_utf8_iterator_read_next (&iter);
}
} }
/* 6. */ /* 6. */
@@ -185,47 +198,55 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
/* 10. */ /* 10. */
if (strip_prefix) if (strip_prefix)
{ {
if (end - start >= 2 if (end.offset - start.offset >= 2 && current == LIT_CHAR_0)
&& utf8_string_buff[start] == LIT_CHAR_0
&& (utf8_string_buff[start + 1] == LIT_CHAR_LOWERCASE_X
|| utf8_string_buff[start + 1] == LIT_CHAR_UPPERCASE_X))
{ {
start += 2; ecma_char_t next = lit_utf8_iterator_peek_next (&iter);
if (next == LIT_CHAR_LOWERCASE_X || next == LIT_CHAR_UPPERCASE_X)
{
/* Skip the 'x' or 'X' characters. */
lit_utf8_iterator_incr (&iter);
start = lit_utf8_iterator_get_pos (&iter);
rad = 16; rad = 16;
}
} }
} }
/* 11. Check if characters are in [0, Radix - 1]. We also convert them to number values in the process. */ /* 11. Check if characters are in [0, Radix - 1]. We also convert them to number values in the process. */
for (lit_utf8_size_t i = start; i < end; i++) lit_utf8_iterator_seek (&iter, start);
while (!lit_utf8_iterator_is_eos (&iter))
{ {
if ((utf8_string_buff[i]) >= LIT_CHAR_LOWERCASE_A && utf8_string_buff[i] <= LIT_CHAR_LOWERCASE_Z) ecma_char_t current_char = lit_utf8_iterator_read_next (&iter);
int32_t current_number;
if ((current_char >= LIT_CHAR_LOWERCASE_A && current_char <= LIT_CHAR_LOWERCASE_Z))
{ {
utf8_string_buff[i] = (lit_utf8_byte_t) (utf8_string_buff[i] - LIT_CHAR_LOWERCASE_A + 10); current_number = current_char - LIT_CHAR_LOWERCASE_A + 10;
} }
else if (utf8_string_buff[i] >= LIT_CHAR_UPPERCASE_A && utf8_string_buff[i] <= LIT_CHAR_UPPERCASE_Z) else if ((current_char >= LIT_CHAR_UPPERCASE_A && current_char <= LIT_CHAR_UPPERCASE_Z))
{ {
utf8_string_buff[i] = (lit_utf8_byte_t) (utf8_string_buff[i] - LIT_CHAR_UPPERCASE_A + 10); current_number = current_char - LIT_CHAR_UPPERCASE_A + 10;
} }
else if (lit_char_is_decimal_digit (utf8_string_buff[i])) else if (lit_char_is_decimal_digit (current_char))
{ {
utf8_string_buff[i] = (lit_utf8_byte_t) (utf8_string_buff[i] - LIT_CHAR_0); current_number = current_char - LIT_CHAR_0;
} }
else else
{ {
/* Not a valid number char, set value to radix so it fails to pass as a valid character. */ /* Not a valid number char, set value to radix so it fails to pass as a valid character. */
utf8_string_buff[i] = (lit_utf8_byte_t) rad; current_number = rad;
} }
if (!(utf8_string_buff[i] < rad)) if (!(current_number < rad))
{ {
end = i; lit_utf8_iterator_decr (&iter);
end = lit_utf8_iterator_get_pos (&iter);
break; break;
} }
} }
/* 12. */ /* 12. */
if (end - start == 0) if (end.offset - start.offset == 0)
{ {
ecma_number_t *ret_num_p = ecma_alloc_number (); ecma_number_t *ret_num_p = ecma_alloc_number ();
*ret_num_p = ecma_number_make_nan (); *ret_num_p = ecma_number_make_nan ();
@@ -240,9 +261,30 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
ecma_number_t multiplier = 1.0f; ecma_number_t multiplier = 1.0f;
/* 13. and 14. */ /* 13. and 14. */
for (int32_t i = (int32_t) end - 1; i >= (int32_t) start; i--) lit_utf8_iterator_seek (&iter, end);
while (lit_utf8_iterator_get_pos (&iter).offset > start.offset)
{ {
*value_p += (ecma_number_t) utf8_string_buff[i] * multiplier; ecma_char_t current_char = lit_utf8_iterator_read_prev (&iter);
ecma_number_t current_number;
if ((current_char >= LIT_CHAR_LOWERCASE_A && current_char <= LIT_CHAR_LOWERCASE_Z))
{
current_number = (ecma_number_t) current_char - LIT_CHAR_LOWERCASE_A + 10;
}
else if ((current_char >= LIT_CHAR_UPPERCASE_A && current_char <= LIT_CHAR_UPPERCASE_Z))
{
current_number = (ecma_number_t) current_char - LIT_CHAR_UPPERCASE_A + 10;
}
else if (lit_char_is_decimal_digit (current_char))
{
current_number = (ecma_number_t) current_char - LIT_CHAR_0;
}
else
{
JERRY_UNREACHABLE ();
}
*value_p += current_number * multiplier;
multiplier *= (ecma_number_t) rad; multiplier *= (ecma_number_t) rad;
} }
tests/jerry/global-parseint.js
+6
View File
@@ -28,6 +28,12 @@ assert(parseInt("12A3") === 12);
assert(parseInt("12.34") === 12); assert(parseInt("12.34") === 12);
assert(isNaN(parseInt("AB"))); assert(isNaN(parseInt("AB")));
assert(isNaN(parseInt(""))); assert(isNaN(parseInt("")));
assert(isNaN(parseInt("-")));
assert(isNaN(parseInt("-", 11)));
assert(parseInt("\u00a0123") === 123);
assert(parseInt("\u20291 123\u00D0") === 1);
assert(parseInt("\u00a0123", 13) === 198);
assert(parseInt("\u2029123 1\u00D0", 11) === 146);
var bool = true; var bool = true;
var obj = new Object(); var obj = new Object();