Bruce/bp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: upto patterns should not accept an empty string as a target,

Browse Source 
which fixes an issue where `echo "hello@" | bp '{..}{"@"}'` would fail
to match properly.
This commit is contained in:
Bruce Hill 2024-06-07 13:30:25 -04:00
parent a8ae09fb89
commit 6d0e4fd1d2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pattern.c
View File

@ -160,6 +160,9 @@ public bp_pat_t *chain_together(bp_pat_t *first, bp_pat_t *second)
if (first == NULL) return second;
if (second == NULL) return first;
if (first->type == BP_STRING && first->max_matchlen == 0) return second;
if (second->type == BP_STRING && second->max_matchlen == 0) return first;
if (first->type == BP_DEFINITIONS && second->type == BP_DEFINITIONS) {
return Pattern(BP_CHAIN, first->start, second->end, second->min_matchlen, second->max_matchlen, .first=first, .second=second);
}
@ -244,6 +247,10 @@ static bp_pat_t *_bp_simplepattern(const char *str, const char *end, bool inside
target = NULL;
} else {
target = bp_simplepattern(str, end);
// Bugfix: `echo "foo@" | bp '{..}{"@"}'` should be parsed as `.."@"`
// not '(.."") "@"'
while (target && target->type == BP_STRING && target->max_matchlen == 0)
target = bp_simplepattern(target->end, end);
}
return type == BP_UPTO ?
Pattern(BP_UPTO, start, str, 0, -1, .target=target, .skip=extra_arg)