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

Handle Unicode characters in parseFloat()

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai.u-szeged@partner.samsung.com
This commit is contained in:
Dániel Bátyai
2015-07-27 17:01:57 +02:00
parent 7aacb8fc01
commit c17197dcab
2 changed files with 205 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-global.cpp
+124 -42
View File
@@ -424,128 +424,195 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
ecma_string_t *number_str_p = ecma_get_string_from_value (string_var); ecma_string_t *number_str_p = ecma_get_string_from_value (string_var);
lit_utf8_size_t str_size = ecma_string_get_size (number_str_p); lit_utf8_size_t str_size = ecma_string_get_size (number_str_p);
MEM_DEFINE_LOCAL_ARRAY (utf8_string_buff, str_size + 1, lit_utf8_byte_t); if (str_size > 0)
{
MEM_DEFINE_LOCAL_ARRAY (utf8_string_buff, str_size, lit_utf8_byte_t);
ssize_t bytes_copied = ecma_string_to_utf8_string (number_str_p, ssize_t bytes_copied = ecma_string_to_utf8_string (number_str_p,
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. Find first non whitespace char. */ lit_utf8_iterator_seek_eos (&iter);
lit_utf8_size_t start = 0;
for (lit_utf8_size_t i = 0; i < str_size; 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);
/* 2. Find first non whitespace char and set starting position. */
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_decr (&iter);
start = lit_utf8_iterator_get_pos (&iter);
break; break;
} }
} }
bool sign = false; bool sign = false;
ecma_char_t current;
if (!lit_utf8_iterator_is_eos (&iter))
{
/* Check if sign is present. */ /* Check if sign is present. */
if (utf8_string_buff[start] == '-') current = lit_utf8_iterator_read_next (&iter);
if (current == LIT_CHAR_MINUS)
{ {
sign = true; sign = true;
start++;
} }
else if (utf8_string_buff[start] == '+')
if (current == LIT_CHAR_MINUS || current == LIT_CHAR_PLUS)
{ {
start++; /* Set starting position to be after the sign character. */
start = lit_utf8_iterator_get_pos (&iter);
}
else
{
lit_utf8_iterator_decr (&iter);
}
} }
ecma_number_t *ret_num_p = ecma_alloc_number (); ecma_number_t *ret_num_p = ecma_alloc_number ();
/* Check if string is equal to "Infinity". */
const lit_utf8_byte_t *infinity_utf8_str_p = lit_get_magic_string_utf8 (LIT_MAGIC_STRING_INFINITY_UL); const lit_utf8_byte_t *infinity_utf8_str_p = lit_get_magic_string_utf8 (LIT_MAGIC_STRING_INFINITY_UL);
lit_utf8_iterator_t infinity_iter = lit_utf8_iterator_create (infinity_utf8_str_p,
sizeof (*infinity_utf8_str_p));
for (lit_utf8_size_t i = 0; infinity_utf8_str_p[i] == utf8_string_buff[start + i]; i++) JERRY_ASSERT (!lit_utf8_iterator_is_eos (&infinity_iter));
/* Check if string is equal to "Infinity". */
while (!lit_utf8_iterator_is_eos (&iter)
&& (lit_utf8_iterator_read_next (&iter) == lit_utf8_iterator_read_next (&infinity_iter)))
{ {
if (infinity_utf8_str_p[i + 1] == 0) if (lit_utf8_iterator_is_eos (&infinity_iter))
{ {
/* String matched Infinity. */
*ret_num_p = ecma_number_make_infinity (sign); *ret_num_p = ecma_number_make_infinity (sign);
ret_value = ecma_make_normal_completion_value (ecma_make_number_value (ret_num_p)); ret_value = ecma_make_normal_completion_value (ecma_make_number_value (ret_num_p));
break; break;
} }
} }
if (ecma_is_completion_value_empty (ret_value)) /* Reset to starting position. */
lit_utf8_iterator_seek (&iter, start);
if (ecma_is_completion_value_empty (ret_value) && !lit_utf8_iterator_is_eos (&iter))
{ {
lit_utf8_size_t current = start; current = lit_utf8_iterator_read_next (&iter);
lit_utf8_size_t end = str_size;
bool has_whole_part = false; bool has_whole_part = false;
bool has_fraction_part = false; bool has_fraction_part = false;
if (lit_char_is_decimal_digit (utf8_string_buff[current])) /* Check digits of whole part. */
if (lit_char_is_decimal_digit (current))
{ {
has_whole_part = true; has_whole_part = true;
/* Check digits of whole part. */ while (!lit_utf8_iterator_is_eos (&iter))
for (lit_utf8_size_t i = current; i < str_size; i++, current++)
{ {
if (!lit_char_is_decimal_digit (utf8_string_buff[current])) current = lit_utf8_iterator_read_next (&iter);
if (!lit_char_is_decimal_digit (current))
{ {
lit_utf8_iterator_decr (&iter);
break; break;
} }
} }
} }
else
{
lit_utf8_iterator_decr (&iter);
}
end = current; /* Set end position to the end of whole part. */
end = lit_utf8_iterator_get_pos (&iter);
if (!lit_utf8_iterator_is_eos (&iter))
{
current = lit_utf8_iterator_read_next (&iter);
}
/* Check decimal point. */ /* Check decimal point. */
if (utf8_string_buff[current] == '.') if (current == LIT_CHAR_DOT && !lit_utf8_iterator_is_eos (&iter))
{ {
current++; current = lit_utf8_iterator_read_next (&iter);
if (lit_char_is_decimal_digit (utf8_string_buff[current])) if (lit_char_is_decimal_digit (current))
{ {
has_fraction_part = true; has_fraction_part = true;
/* Check digits of fractional part. */ /* Check digits of fractional part. */
for (lit_utf8_size_t i = current; i < str_size; i++, current++) while (!lit_utf8_iterator_is_eos (&iter))
{ {
if (!lit_char_is_decimal_digit (utf8_string_buff[current])) current = lit_utf8_iterator_read_next (&iter);
if (!lit_char_is_decimal_digit (current))
{ {
lit_utf8_iterator_decr (&iter);
break; break;
} }
} }
end = current; /* Set end position to end of fraction part. */
end = lit_utf8_iterator_get_pos (&iter);
} }
else
{
lit_utf8_iterator_decr (&iter);
}
}
else
{
lit_utf8_iterator_decr (&iter);
}
if (!lit_utf8_iterator_is_eos (&iter))
{
current = lit_utf8_iterator_read_next (&iter);
} }
/* Check exponent. */ /* Check exponent. */
if ((utf8_string_buff[current] == 'e' || utf8_string_buff[current] == 'E') if ((current == LIT_CHAR_LOWERCASE_E || current == LIT_CHAR_UPPERCASE_E)
&& (has_whole_part || has_fraction_part)) && (has_whole_part || has_fraction_part)
&& !lit_utf8_iterator_is_eos (&iter))
{ {
current++; current = lit_utf8_iterator_read_next (&iter);
/* Check sign of exponent. */ /* Check sign of exponent. */
if (utf8_string_buff[current] == '-' || utf8_string_buff[current] == '+') if ((current == LIT_CHAR_PLUS || current == LIT_CHAR_MINUS)
&& !lit_utf8_iterator_is_eos (&iter))
{ {
current++; current = lit_utf8_iterator_read_next (&iter);
} }
if (lit_char_is_decimal_digit (utf8_string_buff[current])) if (lit_char_is_decimal_digit (current))
{ {
/* Check digits of exponent part. */ /* Check digits of exponent part. */
for (lit_utf8_size_t i = current; i < str_size; i++, current++) while (!lit_utf8_iterator_is_eos (&iter))
{ {
if (!lit_char_is_decimal_digit (utf8_string_buff[current])) current = lit_utf8_iterator_read_next (&iter);
if (!lit_char_is_decimal_digit (current))
{ {
lit_utf8_iterator_decr (&iter);
break; break;
} }
} }
end = current; /* Set end position to end of exponent part. */
end = lit_utf8_iterator_get_pos (&iter);
} }
} }
else
{
lit_utf8_iterator_decr (&iter);
}
if (start == end) /* String did not contain a valid number. */
if (start.offset == end.offset)
{ {
*ret_num_p = ecma_number_make_nan (); *ret_num_p = ecma_number_make_nan ();
ret_value = ecma_make_normal_completion_value (ecma_make_number_value (ret_num_p)); ret_value = ecma_make_normal_completion_value (ecma_make_number_value (ret_num_p));
@@ -553,7 +620,8 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
else else
{ {
/* 5. */ /* 5. */
*ret_num_p = ecma_utf8_string_to_number (utf8_string_buff + start, end - start); *ret_num_p = ecma_utf8_string_to_number (utf8_string_buff + start.offset,
(lit_utf8_size_t) (end.offset - start.offset));
if (sign) if (sign)
{ {
@@ -563,8 +631,22 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
ret_value = ecma_make_normal_completion_value (ecma_make_number_value (ret_num_p)); ret_value = ecma_make_normal_completion_value (ecma_make_number_value (ret_num_p));
} }
} }
/* String ended after sign character, or was empty after removing leading whitespace. */
else if (ecma_is_completion_value_empty (ret_value))
{
*ret_num_p = ecma_number_make_nan ();
ret_value = ecma_make_normal_completion_value (ecma_make_number_value (ret_num_p));
}
MEM_FINALIZE_LOCAL_ARRAY (utf8_string_buff); MEM_FINALIZE_LOCAL_ARRAY (utf8_string_buff);
}
/* String length is zero. */
else
{
ecma_number_t *ret_num_p = ecma_alloc_number ();
*ret_num_p = ecma_number_make_nan ();
ret_value = ecma_make_normal_completion_value (ecma_make_number_value (ret_num_p));
}
ECMA_FINALIZE (string_var); ECMA_FINALIZE (string_var);
return ret_value; return ret_value;
tests/jerry/global-parsefloat.js
+19
View File
@@ -38,12 +38,31 @@ assert(parseFloat("Infinityfoo") === Infinity);
assert(parseFloat("-Infinityfoo") === -Infinity); assert(parseFloat("-Infinityfoo") === -Infinity);
assert(isNaN(parseFloat(""))); assert(isNaN(parseFloat("")));
assert(isNaN(parseFloat("."))); assert(isNaN(parseFloat(".")));
assert(isNaN(parseFloat("..")));
assert(isNaN(parseFloat("+")));
assert(isNaN(parseFloat("-")));
assert(isNaN(parseFloat("e")));
assert(isNaN(parseFloat("a")));
assert(isNaN(parseFloat("e+")));
assert(isNaN(parseFloat("+e-")));
assert(isNaN(parseFloat(".e")));
assert(isNaN(parseFloat(".a")));
assert(isNaN(parseFloat("e3"))); assert(isNaN(parseFloat("e3")));
assert(isNaN(parseFloat(".e3"))); assert(isNaN(parseFloat(".e3")));
assert(parseFloat("1..2") === 1);
assert(parseFloat("1.2.3") === 1.2);
assert(parseFloat("1.2ee3") === 1.2);
assert(parseFloat("0") === 0); assert(parseFloat("0") === 0);
assert(parseFloat(".0") === 0); assert(parseFloat(".0") === 0);
assert(parseFloat("0.e3") === 0); assert(parseFloat("0.e3") === 0);
assert(parseFloat("0.0e3") === 0); assert(parseFloat("0.0e3") === 0);
assert(parseFloat("1.2eA") === 1.2);
assert(parseFloat("1.ae3") === 1);
assert(parseFloat("\u00a0\u00a01.2e3") === 1200);
assert(parseFloat("\u2029\u2029\u00a01.2e\u00D0") === 1.2);
assert(isNaN(parseFloat("\u2029\u2029\u00a0\u00D01.2e3")));
assert(parseFloat("\u2029\u2029\u00a01.\u20292e\u00D0") === 1);
assert(isNaN(parseFloat("\u2029\u2029")));
var obj = new Object(); var obj = new Object();
var arr = [3,4,5]; var arr = [3,4,5];