fix: mpc_sepby1 not applying fold correctly #167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
To not cause naming conflicts as mentioned on orangeduck#166 (comment)
steve-chavez
force-pushed
the
sepby-repeat
branch
from
493506c
to
cfa7d43
Compare
`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.
steve-chavez
force-pushed
the
sepby-repeat
branch
from
cfa7d43
to
b866236
Compare
steve-chavez
commented
Aug 21, 2023
Comment on lines
+261
to
+269
| 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); |
There was a problem hiding this comment.
This is the main motivation, it wasn't possible to do this with the previous sepby1.
steve-chavez
commented
Aug 21, 2023
Comment on lines
+2819
to
+2827
| if (p->type == MPC_TYPE_SEPBY1) { | ||
| mpc_print_unretained(p->data.sepby1.x, 0); | ||
| printf(" ("); | ||
| mpc_print_unretained(p->data.sepby1.sep, 0); | ||
| printf(" "); | ||
| mpc_print_unretained(p->data.sepby1.x, 0); | ||
| printf(")"); | ||
| printf("*"); | ||
| } |
There was a problem hiding this comment.
I didn't see mpc_print being tested, but I manually confirmed that:
CommaSeparated = mpc_sepby1(mpcf_strfold, mpc_char(','), mpc_ident())
mpc_print(CommaSeparated);
// result
((letter | underscore) alphanumeric*) (',' ((letter | underscore) alphanumeric*))*
|
Great work! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
mpc_sepby1takes a single fold function but this doesn't apply to the whole list of entries. Instead it applies the fold twice, one formpc_andand another formpc_many. This makes it hard to build an array of structures.Previously discussed on #165 (comment)
Solution
Introduce a new repeat repeat parser type
MPC_TYPE_SEPBY1that combines the results and applies the fold once for all entries.