Change ecma_length_t and jerry_api_length_t from uint16_t to uint32_t.

JerryScript-DCO-1.0-Signed-off-by: Andrey Shitov a.shitov@samsung.com
This commit is contained in:
Andrey Shitov
2015-06-29 18:37:27 +03:00
parent a0c5974ab8
commit c4b0cd2196
23 changed files with 74 additions and 81 deletions
@@ -134,12 +134,12 @@ ecma_builtin_error_prototype_object_to_string (ecma_value_t this_arg) /**< this
const ecma_char_t *colon_zt_magic_string_p = lit_get_magic_string_zt (LIT_MAGIC_STRING_COLON_CHAR);
const ecma_char_t *space_zt_magic_string_p = lit_get_magic_string_zt (LIT_MAGIC_STRING_SPACE_CHAR);
const int32_t len = (ecma_string_get_length (name_string_p) +
ecma_string_get_length (msg_string_p) +
ecma_zt_string_length (colon_zt_magic_string_p) +
ecma_zt_string_length (space_zt_magic_string_p));
const ecma_length_t len = (ecma_string_get_length (name_string_p) +
ecma_string_get_length (msg_string_p) +
ecma_zt_string_length (colon_zt_magic_string_p) +
ecma_zt_string_length (space_zt_magic_string_p));
const ssize_t buffer_size = (len + 1) * (ssize_t) sizeof (ecma_char_t);
const ssize_t buffer_size = (ssize_t) ((len + 1) * sizeof (ecma_char_t));
ssize_t buffer_size_left = buffer_size;
MEM_DEFINE_LOCAL_ARRAY (ret_str_buffer, buffer_size, ecma_char_t);
@@ -108,7 +108,7 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
ECMA_TRY_CATCH (string_var, ecma_op_to_string (string), ret_value);
ecma_string_t *number_str_p = ecma_get_string_from_value (string_var);
int32_t string_len = ecma_string_get_length (number_str_p);
ecma_length_t string_len = ecma_string_get_length (number_str_p);
MEM_DEFINE_LOCAL_ARRAY (zt_string_buff, string_len + 1, ecma_char_t);
@@ -119,9 +119,9 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
JERRY_ASSERT (bytes_copied > 0);
/* 2. Remove leading whitespace. */
int32_t start = string_len;
int32_t end = string_len;
for (int i = 0; i < end; i++)
ecma_length_t start = string_len;
ecma_length_t end = string_len;
for (ecma_length_t i = 0; i < end; i++)
{
if (!(isspace (zt_string_buff[i])))
{
@@ -190,7 +190,7 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
}
/* 11. Check if characters are in [0, Radix - 1]. We also convert them to number values in the process. */
for (int i = start; i < end; i++)
for (ecma_length_t i = start; i < end; i++)
{
if ((zt_string_buff[i]) >= 'a' && zt_string_buff[i] <= 'z')
{
@@ -233,7 +233,7 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
ecma_number_t multiplier = 1.0f;
/* 13. and 14. */
for (int i = end - 1; i >= start; i--)
for (int32_t i = (int32_t) end - 1; i >= (int32_t) start; i--)
{
*value_p += (ecma_number_t) zt_string_buff[i] * multiplier;
multiplier *= (ecma_number_t) rad;
@@ -273,7 +273,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
ECMA_TRY_CATCH (string_var, ecma_op_to_string (string), ret_value);
ecma_string_t *number_str_p = ecma_get_string_from_value (string_var);
int32_t string_len = ecma_string_get_length (number_str_p);
ecma_length_t string_len = ecma_string_get_length (number_str_p);
MEM_DEFINE_LOCAL_ARRAY (zt_string_buff, string_len + 1, ecma_char_t);
@@ -284,8 +284,8 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
JERRY_ASSERT (bytes_copied > 0);
/* 2. Find first non whitespace char. */
int32_t start = 0;
for (int i = 0; i < string_len; i++)
ecma_length_t start = 0;
for (ecma_length_t i = 0; i < string_len; i++)
{
if (!isspace (zt_string_buff[i]))
{
@@ -312,7 +312,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
/* Check if string is equal to "Infinity". */
const ecma_char_t *infinity_zt_str_p = lit_get_magic_string_zt (LIT_MAGIC_STRING_INFINITY_UL);
for (int i = 0; infinity_zt_str_p[i] == zt_string_buff[start + i]; i++)
for (ecma_length_t i = 0; infinity_zt_str_p[i] == zt_string_buff[start + i]; i++)
{
if (infinity_zt_str_p[i + 1] == 0)
{
@@ -324,8 +324,8 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
if (ecma_is_completion_value_empty (ret_value))
{
int32_t current = start;
int32_t end = string_len;
ecma_length_t current = start;
ecma_length_t end = string_len;
bool has_whole_part = false;
bool has_fraction_part = false;
@@ -334,7 +334,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
has_whole_part = true;
/* Check digits of whole part. */
for (int i = current; i < string_len; i++, current++)
for (ecma_length_t i = current; i < string_len; i++, current++)
{
if (!isdigit (zt_string_buff[current]))
{
@@ -355,7 +355,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
has_fraction_part = true;
/* Check digits of fractional part. */
for (int i = current; i < string_len; i++, current++)
for (ecma_length_t i = current; i < string_len; i++, current++)
{
if (!isdigit (zt_string_buff[current]))
{
@@ -383,7 +383,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
{
/* Check digits of exponent part. */
for (int i = current; i < string_len; i++, current++)
for (ecma_length_t i = current; i < string_len; i++, current++)
{
if (!isdigit (zt_string_buff[current]))
{
@@ -77,11 +77,11 @@ ecma_builtin_regexp_prototype_exec (ecma_value_t this_arg, /**< this argument */
ecma_string_t *input_str_p = ecma_get_string_from_value (input_str_value);
/* Convert ecma_String_t *to regexp_bytecode_t* */
int32_t input_str_len = ecma_string_get_length (input_str_p);
ecma_length_t input_str_len = ecma_string_get_length (input_str_p);
MEM_DEFINE_LOCAL_ARRAY (input_zt_str_p, input_str_len + 1, ecma_char_t);
ssize_t zt_str_size = (ssize_t) sizeof (ecma_char_t) * (input_str_len + 1);
ssize_t zt_str_size = (ssize_t) (sizeof (ecma_char_t) * (input_str_len + 1));
ecma_string_to_zt_string (input_str_p, input_zt_str_p, zt_str_size);
ret_value = ecma_regexp_exec_helper (obj_p, bytecode_p, input_zt_str_p);
@@ -163,8 +163,6 @@ ecma_builtin_string_prototype_object_concat (ecma_value_t this_arg, /**< this ar
/* 4 */
ecma_string_t *string_to_return = ecma_copy_or_ref_ecma_string (ecma_get_string_from_value (to_string_val));
JERRY_ASSERT (ecma_string_get_length (string_to_return) >= 0);
/* 5 */
for (uint32_t arg_index = 0;
arg_index < arguments_number && ecma_is_completion_value_empty (ret_value);
@@ -329,8 +327,6 @@ ecma_builtin_string_prototype_object_slice (ecma_value_t this_arg, /**< this arg
/* 3. */
ecma_string_t *get_string_val = ecma_get_string_from_value (to_string_val);
JERRY_ASSERT (ecma_string_get_length (get_string_val) >= 0);
const uint32_t len = (uint32_t) ecma_string_get_length (get_string_val);
/* 4. 6. */
@@ -509,7 +505,6 @@ ecma_builtin_string_prototype_object_trim (ecma_value_t this_arg) /**< this argu
ret_value);
ecma_string_t *original_string_p = ecma_get_string_from_value (to_string_val);
JERRY_ASSERT (ecma_string_get_length (original_string_p) >= 0);
/* 3 */
const uint32_t len = (uint32_t) ecma_string_get_length (original_string_p);
@@ -601,7 +601,7 @@ ecma_builtin_bin_search_for_magic_string_id_in_array (const lit_magic_string_id_
#endif /* !JERRY_NDEBUG */
int32_t min = 0;
int32_t max = array_length - 1;
int32_t max = (int32_t) array_length - 1;
while (min <= max)
{