andy/mpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: mpc_sepby1 not applying fold correctly

Browse Source 
`mpc_sepby1` takes a single fold function but this doesn't apply to the
whole list of entries. Instead it applies the fold twice,
one for `mpc_and` and another for `mpc_many`.

Introduce a new repeat repeat parser type MPC_TYPE_SEPBY1 that combines
the results and applies the fold once for all entries.
This commit is contained in:
steve-chavez
2023-08-20 17:27:36 -05:00
parent b7ee5df355
commit b866236aad
2 changed files with 91 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/core.c
View File

@@ -8,6 +8,11 @@ static int int_eq(const void* x, const void* y) { return (*(int*)x == *(int*)y);
static void int_print(const void* x) { printf("'%i'", *((int*)x)); }
static int streq(const void* x, const void* y) { return (strcmp(x, y) == 0); }
static void strprint(const void* x) { printf("'%s'", (char*)x); }
static mpc_val_t *fold_vals(int n, mpc_val_t **xs) {
char** vals = malloc(sizeof(char*) * n);
memcpy(vals, xs, sizeof(char*) * n);
return vals;
}
void test_ident(void) {
@@ -252,6 +257,19 @@ void test_sepby(void) {
PT_ASSERT(mpc_test_pass(CommaSepIdent, "one,two,three", "onetwothree", streq, free, strprint));
mpc_delete(CommaSepIdent);
mpc_parser_t* CommaSepIdent1 = mpc_sepby1(fold_vals, mpc_char(','), mpc_ident());
mpc_result_t r;
mpc_parse("<test>", "uno,dos,tres,cuatro", CommaSepIdent1, &r);
char **vals = r.output;
PT_ASSERT(strcmp("uno", vals[0]) == 0);
PT_ASSERT(strcmp("dos", vals[1]) == 0);
PT_ASSERT(strcmp("tres", vals[2]) == 0);
PT_ASSERT(strcmp("cuatro", vals[3]) == 0);
free(vals);
mpc_delete(CommaSepIdent1);
}
void suite_core(void) {