Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tok itr #12

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile-ccan
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ MODS_NORMAL_WITH_SRC := antithread \
tally \
tap \
time \
tok_itr \
ttxml

MODS_NORMAL:=$(MODS_NORMAL_WITH_SRC) $(MODS_NORMAL_NO_SRC)
Expand Down
1 change: 1 addition & 0 deletions ccan/tok_itr/LICENSE
43 changes: 43 additions & 0 deletions ccan/tok_itr/_info
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#include <string.h>
#include "config.h"

/**
* tok_itr - iterate over tokens in a string
*
* The tok_itr module iterates for tokens separated by
* a delimiter character in a null terminated string.
*
* Example:
* #include <stdio.h>
* #include <ccan/tok_itr/tok_itr.h>
*
* int main(int argc, char *argv[]) {
* size_t len;
* char *token;
* struct tok_itr itr;
* char str[] = "/bin:/usr/bin:/usr/local/sbin";
*
* for(tok_itr_init(&itr, str, ':'); !tok_itr_end(&itr); tok_itr_next(&itr) ) {
* len = (tok_itr_val_len(&itr) + 1);
* token = malloc(sizeof(char) * len);
* tok_itr_val(&itr, token, len);
* printf("token = %s\n", token);
* free(token);
* }
*
* return 0;
* }
* License: LGPL (v3 or any later version)
* Author: anthony cantor <[email protected]>
*/
int main(int argc, char *argv[])
{
if (argc != 2)
return 1;

if (strcmp(argv[1], "depends") == 0) {
return 0;
}

return 1;
}
40 changes: 40 additions & 0 deletions ccan/tok_itr/test/api-basic.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#include <ccan/tok_itr/tok_itr.h>
#include <ccan/tap/tap.h>

#include <string.h>

int main(int argc, char *argv[]) {
# define TOK1 "blah"
# define TOK2 "@#$%zlk"
# define TOK3 "(*aksjhdn$"
# define TOK4 "\"///\\zxkkkkkhs)(*&"
const char *arr[] = {TOK1, TOK2, TOK3, TOK4 };
char str[128];
char val[32];
struct tok_itr itr;
int i;

plan_tests(3*4 + 1 + 1);

diag("++++basic++++");
# define TOKALL TOK1 ":" TOK2 ":" TOK3 ":" TOK4
strncpy(str, TOKALL, 128);
/*diag("str: %s\n", str);*/
diag("test token iterator basics");

i = 0;
for(tok_itr_init(&itr, str, ':'); !tok_itr_end(&itr); tok_itr_next(&itr) ) {
ok1( tok_itr_val_len(&itr) == strlen(arr[i]) );
ok1( tok_itr_val(&itr, val, 32) == strlen(arr[i]) );
/*diag("%d: '%s'\t(%s) %d\n", i, val, str, strlen(arr[i]) );*/
ok1( strcmp(val, arr[i++]) == 0 );
}
ok1( tok_itr_partial_val(&itr) == true );

diag("test whether iterator modified the string it iterated over");
ok1( strcmp(str, TOKALL) == 0 );

diag("----basic----\n#");

return exit_status();
}
69 changes: 69 additions & 0 deletions ccan/tok_itr/test/api-big.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#include <ccan/tok_itr/tok_itr.h>
#include <ccan/tap/tap.h>

#include <string.h>

int main(int argc, char *argv[]) {
char tok1[64];
char tok2[64];
char tok3[64];
char tok4[64];
char tok5[64];
const char *arr[] = {tok1, tok2, tok3, tok4, tok5, ""};
char str[512];
char val[32];
struct tok_itr itr;
int i;

plan_tests(3*6 + 1);

diag("++++big++++");

str[0] = '\0';

# define TOK_SET(_str, _chr, _amt) \
memset(_str, _chr, _amt); \
_str[_amt] = ':'; \
_str[_amt+1] = '\0';

TOK_SET(tok1, 'A', 29);
TOK_SET(tok2, 'B', 30);
TOK_SET(tok3, 'C', 31);
TOK_SET(tok4, 'D', 32);
TOK_SET(tok5, 'E', 33);

for(i = 0; i < 5; i++) {
/*diag("tok%d: %s\n", i+1, arr[i]);*/
strcat(str, arr[i]);
}

/*diag("str: %s\n", str);*/
diag("test token iterator with big tokens");

i = 0;
for(tok_itr_init(&itr, str, ':'); !tok_itr_end(&itr); tok_itr_next(&itr) ) {
size_t tlen = tok_itr_val_len(&itr);
int len = strlen(arr[i]);
int cmplen;

ok1(tok_itr_val(&itr, val, 32) == tlen);
if(arr[i][len-1] == ':')
len--;

cmplen = len;
if(len > 31) {
diag("tok4 and tok5 should be too big (size > 31)");
cmplen = 31;
}

ok1(tlen == len);

/*diag("%d: '%s'\t(%s) %d\n", i, val, str, strlen(arr[i]) );*/
ok1( strncmp(val, arr[i++], cmplen) == 0 );
}
ok1( tok_itr_partial_val(&itr) == false );

diag("----big----\n#");

return exit_status();
}
40 changes: 40 additions & 0 deletions ccan/tok_itr/test/api-empty.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#include <ccan/tok_itr/tok_itr.h>
#include <ccan/tap/tap.h>

#include <string.h>

int main(int argc, char *argv[]) {
# define TOK1 "blah"
# define TOK2 "@#$%zlk"
# define TOK3 "(*aksjhdn$"
# define TOK4 "\"///\\zxkkkkkhs)(*&"
const char *arr[] = {TOK1, "", TOK2, "", "", "", TOK3, "", TOK4 };
char str[128];
char val[32];
struct tok_itr itr;
int i;

plan_tests(3*9 + 1 + 1);

diag("++++empty++++");
# define TOKALL TOK1 "::" TOK2 "::::" TOK3 "::" TOK4
strncpy(str, TOKALL, 128);
/*diag("str: %s\n", str);*/
diag("test token iterator with empty tokens");

i = 0;
for(tok_itr_init(&itr, str, ':'); !tok_itr_end(&itr); tok_itr_next(&itr) ) {
ok1( tok_itr_val_len(&itr) == strlen(arr[i]) );
ok1( tok_itr_val(&itr, val, 32) == strlen(arr[i]) );
/*diag("%d: '%s'\t(%s) %d\n", i, val, str, strlen(arr[i]) );*/
ok1( strcmp(val, arr[i++]) == 0 );
}
ok1( tok_itr_partial_val(&itr) == true );

diag("test whether iterator modified the string it iterated over");
ok1( strcmp(str, TOKALL) == 0 );

diag("----empty----\n#");

return exit_status();
}
30 changes: 30 additions & 0 deletions ccan/tok_itr/test/api-example.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#include <ccan/tok_itr/tok_itr.h>
#include <ccan/tap/tap.h>

#include <string.h>

int main(int argc, char *argv[]) {
const char *arr[] = {"/bin", "/usr/bin", "/sbin", "/usr/local/bin" };
char val[32];
int i;
struct tok_itr itr;

plan_tests(2*4 + 1);
diag("++++example++++");
diag("test token iterator use case/example");

i = 0;
TOK_ITR_FOREACH(&itr, val, 32, "/bin:/usr/bin:/sbin:/usr/local/bin:", ':') {
diag("token = %s", val);
if(i > 3)
continue;

ok1( tok_itr_val_len(&itr) == strlen(arr[i]) );
ok1( strcmp(val, arr[i++]) == 0 );
}
ok1( tok_itr_partial_val(&itr) == false );

diag("----example----\n#");

return exit_status();
}
38 changes: 38 additions & 0 deletions ccan/tok_itr/test/api-foreach.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#include <ccan/tok_itr/tok_itr.h>
#include <ccan/tap/tap.h>

#include <string.h>

int main(int argc, char *argv[]) {
# define TOK1 "blah"
# define TOK2 "@#$%zlk"
# define TOK3 "(*aksjhdn$"
# define TOK4 "\"///\\zxkkkkkhs)(*&"
const char *arr[] = {TOK1, TOK2, TOK3, TOK4 };
char str[128];
char val[32];
int i;
struct tok_itr itr;

plan_tests(2*4 + 1 + 1);

diag("++++foreach++++");
# define TOKALL TOK1 ":" TOK2 ":" TOK3 ":" TOK4
strncpy(str, TOKALL, 128);
/*diag("str: %s\n", str);*/
diag("test token iterator FOREACH basics");

i = 0;
TOK_ITR_FOREACH(&itr, val, 32, str, ':') {
ok1( tok_itr_val_len(&itr) == strlen(arr[i]) );
ok1( strcmp(val, arr[i++]) == 0 );
}
ok1( tok_itr_partial_val(&itr) == true );

diag("test whether iterator modified the string it iterated over");
ok1( strcmp(str, TOKALL) == 0 );

diag("----foreach----\n#");

return exit_status();
}
40 changes: 40 additions & 0 deletions ccan/tok_itr/test/api-lead_trail.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#include <ccan/tok_itr/tok_itr.h>
#include <ccan/tap/tap.h>

#include <string.h>

int main(int argc, char *argv[]) {
# define TOK1 "blah"
# define TOK2 "@#$%zlk"
# define TOK3 "(*aksjhdn$"
# define TOK4 "\"///\\zxkkkkkhs)(*&"
const char *arr[] = {"", "", TOK1, "", TOK2, "", "", "", TOK3, "", TOK4, "", "", ""};
char str[128];
char val[32];
struct tok_itr itr;
int i;

plan_tests( 3*14 + 1 + 1 );

diag("++++lead_trail++++");
#define TOKALL "::" TOK1 "::" TOK2 "::::" TOK3 "::" TOK4 ":::"
strncpy(str, TOKALL, 128);
/*diag("str: %s\n", str);*/
diag("test token iterator with leading and trailing empty tokens");

i = 0;
for(tok_itr_init(&itr, str, ':'); !tok_itr_end(&itr); tok_itr_next(&itr) ) {
ok1( tok_itr_val_len(&itr) == strlen(arr[i]) );
ok1( tok_itr_val(&itr, val, 32) == strlen(arr[i]) );
/*diag("%d: '%s'\t(%s) %d\n", i, val, str, strlen(arr[i]) );*/
ok1( strcmp(val, arr[i++]) == 0 );
}
ok1( tok_itr_partial_val(&itr) == false );

diag("test whether iterator modified the string it iterated over");
ok1( strcmp(str, TOKALL) == 0 );

diag("----lead_trail----\n#");

return exit_status();
}
71 changes: 71 additions & 0 deletions ccan/tok_itr/test/api-rand.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
#include <ccan/tok_itr/tok_itr.h>
#include <ccan/tap/tap.h>

#include <stdlib.h>
#include <assert.h>
#include <time.h>
#include <string.h>


int main(int argc, char *argv[]) {
# define NUM_DELIMS 48
# define NUM_TOKENS (NUM_DELIMS + 1)
char arr[NUM_TOKENS][1024];;
char str[1024];
char val[1024];
struct tok_itr itr;
int i;
char delim = ':';
char *cptr;

plan_tests(3*NUM_TOKENS);

srand(time(NULL));

diag("++++rand++++");

for(i = 0; i < 1023; i++) {
char chr;
do {
chr = (rand() % 256);
} while(chr == delim || chr == '\0');
str[i] = chr;
}
str[i] = '\0';

for(i = 0; i < NUM_DELIMS; i++) {
int pos;
do {
pos = rand() % 1023;
} while(str[pos] == '\0');
str[pos] = '\0';
}

i = 0;
for(cptr = str; cptr < (str+1024); cptr += (strlen(cptr)+1) ) {
assert(i < NUM_TOKENS);
strcpy(arr[i], cptr);
/*diag("%d: %s\n", i, arr[i]);*/
i++;
}

for(i = 0; i < 1023; i++)
if(str[i] == '\0')
str[i] = delim;

/*diag("str: %s\n", str);*/
diag("test token iterator with random token string");

i = 0;
for(tok_itr_init(&itr, str, delim); !tok_itr_end(&itr); tok_itr_next(&itr) ) {
ok1( tok_itr_val_len(&itr) == strlen(arr[i]) );
ok1( tok_itr_val(&itr, val, 1024) == strlen(arr[i]) );
ok1( strcmp(val, arr[i++]) == 0 );
/*diag("val: %s\n", val);*/
}


diag("----rand----\n#");

return exit_status();
}
Loading