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

Fixing collections' construction and iteration routines.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-08-15 17:21:21 +04:00
parent 2a199cc6a7
commit 8f08c1c70e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libecmaobjects/ecma-helpers-values-collection.c
+11 -6
View File
@@ -63,10 +63,11 @@ ecma_new_values_collection (ecma_value_t values_buffer[], /**< ecma-values */
JERRY_ASSERT (cur_value_buf_iter_p + 1 <= cur_value_buf_end_p); JERRY_ASSERT (cur_value_buf_iter_p + 1 <= cur_value_buf_end_p);
*cur_value_buf_iter_p = ecma_copy_value (values_buffer[value_index], do_ref_if_object); *cur_value_buf_iter_p++ = ecma_copy_value (values_buffer[value_index], do_ref_if_object);
cur_value_buf_iter_p++;
} }
*next_chunk_cp_p = ECMA_NULL_POINTER;
return header_p; return header_p;
} /* ecma_new_values_collection */ } /* ecma_new_values_collection */
@@ -171,14 +172,11 @@ ecma_collection_iterator_init (ecma_collection_iterator_t *iterator_p, /**< cont
bool bool
ecma_collection_iterator_next (ecma_collection_iterator_t *iterator_p) /**< context of iterator */ ecma_collection_iterator_next (ecma_collection_iterator_t *iterator_p) /**< context of iterator */
{ {
if (unlikely (iterator_p->header_p->unit_number == 0 if (unlikely (iterator_p->header_p->unit_number == 0))
|| iterator_p->current_index + 1 == iterator_p->header_p->unit_number))
{ {
return false; return false;
} }
JERRY_ASSERT (iterator_p->current_index + 1 < iterator_p->header_p->unit_number);
if (iterator_p->current_value_p == NULL) if (iterator_p->current_value_p == NULL)
{ {
JERRY_ASSERT (iterator_p->current_index == 0); JERRY_ASSERT (iterator_p->current_index == 0);
@@ -187,6 +185,13 @@ ecma_collection_iterator_next (ecma_collection_iterator_t *iterator_p) /**< cont
return true; return true;
} }
if (iterator_p->current_index + 1 == iterator_p->header_p->unit_number)
{
return false;
}
JERRY_ASSERT (iterator_p->current_index + 1 < iterator_p->header_p->unit_number);
iterator_p->current_index++; iterator_p->current_index++;
iterator_p->current_value_p++; iterator_p->current_value_p++;