extern/boxes
1
0
Fork 0
mirror of https://github.com/ascii-boxes/boxes.git synced 2024-12-04 22:11:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extract full_parse_required() in parsecode.c for maintainability

Browse Source
This commit is contained in:
Thomas Jensen 2021-04-07 21:00:18 +02:00
parent 04283eb697
commit f620c1b19b
No known key found for this signature in database
GPG Key ID: A4ACEE270D0FB7DB
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/parsecode.c
View File

@ -337,10 +337,24 @@ static int design_has_name(design_t *design, char *name)
static int full_parse_required()
{
int result = 0;
if (!opt.design_choice_by_user) {
result = opt.r || opt.l || (opt.query != NULL && !query_is_undoc());
}
#ifdef DEBUG
fprintf(stderr, "full_parse_required() -> %s\n", result ? "true" : "false");
#endif
return result;
}
/**
* Determine if the design currently being parsed is one that we will need.
* @param bison_args the bison state
* @return flag
* @return result flag
*/
static int design_needed(pass_to_bison *bison_args)
{
@ -348,10 +362,7 @@ static int design_needed(pass_to_bison *bison_args)
return design_has_name(&(curdes), (char *) opt.design);
}
else {
if (opt.r || opt.l || (opt.query != NULL && !query_is_undoc())) {
return 1;
}
if (bison_args->design_idx == 0) {
if (full_parse_required() || bison_args->design_idx == 0) {
return 1;
}
}
@ -748,9 +759,8 @@ int action_add_design(pass_to_bison *bison_args, char *design_primary_name, char
/*
* Check if we need to continue parsing. If not, return.
* The condition here must correspond to the function design_needed().
*/
if (opt.design_choice_by_user || (!opt.r && !opt.l && (opt.query == NULL || query_is_undoc()))) {
if (!full_parse_required()) {
bison_args->num_designs = bison_args->design_idx + 1;
return RC_ACCEPT;
}