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

std/lib: simplify String.{,r}index_of and improve speed for the index… (#907)

Browse Source 
* std/lib: simplify String.{,r}index_of and improve speed for the index_of one

Signed-off-by: Pierre Curto <pierre.curto@gmail.com>

* lib/std/collections: add EnumMap.get_ref

Signed-off-by: Pierre Curto <pierre.curto@gmail.com>

---------

Signed-off-by: Pierre Curto <pierre.curto@gmail.com>
This commit is contained in:
Pierre Curto
2023-08-02 11:43:58 +02:00
committed by GitHub
parent 09bb7d3525
commit 9b1c75d061
3 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/std/collections/enummap.c3
View File

@@ -7,7 +7,7 @@ struct EnumMap
fn void EnumMap.init(&self, ValueType init_value)
{
foreach(&a : self.values)
foreach (&a : self.values)
{
*a = init_value;
}
@@ -30,6 +30,22 @@ fn String EnumMap.to_string(&self, Allocator* using = mem::heap()) @dynamic
return string::printf("%s", *self);
}
fn uint EnumMap.len(&self) @operator(len) => self.values.len;
fn ValueType EnumMap.get(&self, Enum key) @operator([]) => self.values[key.ordinal];
fn void EnumMap.set(&self, Enum key, ValueType value) @operator([]=) => self.values[key.ordinal] = value;
fn usz EnumMap.len(&self) @operator(len) @inline
{
return self.values.len;
}
fn ValueType EnumMap.get(&self, Enum key) @operator([]) @inline
{
return self.values[key.ordinal];
}
fn ValueType* EnumMap.get_ref(&self, Enum key) @operator(&[]) @inline
{
return &self.values[key.ordinal];
}
fn void EnumMap.set(&self, Enum key, ValueType value) @operator([]=) @inline
{
self.values[key.ordinal] = value;
}

40
lib/std/core/string.c3
View File

@@ -252,24 +252,12 @@ fn usz! String.rindex_of_char(s, char needle)
fn usz! String.index_of(s, String needle)
{
usz needed = needle.len;
char search = needle[0];
if (needed == 1) return s.index_of_char(search);
usz match = 0;
usz index_start = 0;
foreach (usz i, char c : s)
if (needed > 0 && s.len >= needed)
{
if (c == search)
char first = needle[0];
foreach (i, c: s[..^needed])
{
if (!match) index_start = i;
match++;
if (match == needed) return index_start;
search = needle[match];
continue;
}
if (match)
{
match = 0;
search = needle[0];
if (c == first && s[i:needed] == needle) return i;
}
}
return SearchResult.MISSING?;
@@ -289,24 +277,12 @@ fn usz! String.index_of(s, String needle)
fn usz! String.rindex_of(s, String needle)
{
usz needed = needle.len;
char search = needle[^1];
if (needed == 1) return s.rindex_of_char(search);
usz match;
usz index_start;
foreach_r (usz i, char c : s)
if (needed > 0 && s.len >= needed)
{
if (c == search)
char first = needle[0];
foreach_r (i, c: s[..^needed])
{
if (!match) index_start = i;
match++;
if (match == needed) return index_start - needle.len + 1;
search = needle[^(match + 1)];
continue;
}
if (match)
{
match = 0;
search = needle[^1];
if (c == first && s[i:needed] == needle) return i;
}
}
return SearchResult.MISSING?;