shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/std/collections: fix comments, List.remove_if() and List.retain_if() methods

Browse Source 
Signed-off-by: Pierre Curto <pierre.curto@gmail.com>
This commit is contained in:
Pierre Curto
2023-08-31 13:34:12 +02:00
committed by Christoffer Lerno
parent 770115abd1
commit cd950a0359
2 changed files with 87 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/std/collections/list.c3
View File

@@ -79,7 +79,7 @@ fn void List.append(&self, Type element)
/**
* @require self.size > 0
*/
**/
fn Type List.pop(&self)
{
return self.entries[--self.size];
@@ -92,7 +92,7 @@ fn void List.clear(&self)
/**
* @require self.size > 0
*/
**/
fn Type List.pop_first(&self)
{
Type value = self.entries[0];
@@ -100,6 +100,9 @@ fn Type List.pop_first(&self)
return value;
}
/**
* @require index < self.size
**/
fn void List.remove_at(&self, usz index)
{
for (usz i = index + 1; i < self.size; i++)
@@ -162,6 +165,9 @@ fn void List.push_front(&self, Type type) @inline
self.insert_at(0, type);
}
/**
* @require index < self.size
**/
fn void List.insert_at(&self, usz index, Type type)
{
self.ensure_capacity();
@@ -181,11 +187,17 @@ fn void List.set_at(&self, usz index, Type type)
self.entries[index] = type;
}
/**
* @require self.size > 0
**/
fn void List.remove_last(&self)
{
self.size--;
}
/**
* @require self.size > 0
**/
fn void List.remove_first(&self)
{
self.remove_at(0);
@@ -235,16 +247,26 @@ fn void List.swap(&self, usz i, usz j)
* @return "the number of deleted elements"
**/
fn usz List.remove_if(&self, ElementPredicate filter)
{
return self._remove_if({ filter }, &Filter.same);
}
macro usz List._remove_if(&self, Filter o, m) @private
{
usz size = self.size;
for (usz i = size; i > 0; i--)
usz i = size;
usz k = i;
while (k > 0)
{
if (filter(&self.entries[i - 1])) continue;
for (usz j = i; j < size; j++)
{
self.entries[j - 1] = self.entries[j];
}
self.size--;
// Find last index of item to be deleted.
while (i > 0 && m(o, &self.entries[i - 1])) i--;
// Remove the items from this index up to the one not to be deleted.
usz n = self.size - k;
self.entries[i:n] = self.entries[k:n];
self.size -= k - i;
// Find last index of item not to be deleted.
while (i > 0 && !m(o, &self.entries[i - 1])) i--;
k = i;
}
return size - self.size;
}
@@ -255,19 +277,15 @@ fn usz List.remove_if(&self, ElementPredicate filter)
**/
fn usz List.retain_if(&self, ElementPredicate selection)
{
usz size = self.size;
for (usz i = size; i > 0; i--)
{
if (!selection(&self.entries[i - 1])) continue;
for (usz j = i; j < size; j++)
{
self.entries[j - 1] = self.entries[j];
}
self.size--;
}
return size - self.size;
return self._remove_if({ selection }, &Filter.opposite);
}
struct Filter @private
{
ElementPredicate p;
}
fn bool Filter.same(self, Type* type) => self.p(type) @inline;
fn bool Filter.opposite(self, Type* type) => !self.p(type) @inline;
/**
* Reserve at least min_capacity