Fixed and simplified csview tokensizer call.

1 files changed, 6 insertions, 15 deletions

diff --git a/include/stc/csview.h b/include/stc/csview.h
index d0152c3d..69de5749 100644
--- a/include/stc/csview.h
+++ b/include/stc/csview.h
@@ -38,8 +38,7 @@ typedef                 char csview_value;
 

 STC_API csview          csview_substr(csview sv, intptr_t pos, size_t n);

 STC_API csview          csview_slice(csview sv, intptr_t p1, intptr_t p2);

-STC_API csview          csview_first_token(csview sv, csview sep);

-STC_API csview          csview_next_token(csview sv, csview sep, csview tok);

+STC_API csview          csview_token(csview sv, csview sep, size_t* start);

 

 #define                 csview_new(literal) \

                             c_make(csview){literal, sizeof c_make(c_strlit){literal} - 1}

@@ -141,19 +140,11 @@ csview_slice(csview sv, intptr_t p1, intptr_t p2) {
 }

 

 STC_DEF csview

-csview_first_token(csview sv, csview sep) {

-    const char* res = c_strnstrn(sv.str, sep.str, sv.size, sep.size);

-    return c_make(csview){sv.str, (res ? res - sv.str : sv.size)};

-}

-

-STC_DEF csview

-csview_next_token(csview sv, csview sep, csview tok) {

-    if (&tok.str[tok.size] == &sv.str[sv.size])

-        return c_make(csview){&sv.str[sv.size], 0};

-    tok.str += tok.size + sep.size;

-    size_t n = sv.size - (tok.str - sv.str);

-    const char* res = c_strnstrn(tok.str, sep.str, n, sep.size);

-    tok.size = res ? res - tok.str : n;

+csview_token(csview sv, csview sep, size_t* start) {

+    csview slice = {sv.str + *start, sv.size - *start};

+    const char* res = c_strnstrn(slice.str, sep.str, slice.size, sep.size);

+    csview tok = {slice.str, (res ? res - slice.str : slice.size)};

+    *start += tok.size + (res ? sep.size : 0);

     return tok;

 }