diff options
| author | rillig <rillig@NetBSD.org> | 2020-07-20 19:53:40 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2020-07-20 19:53:40 +0000 |
| commit | bb47f6adc16ad33cb8301c67cfc4e8ea50e9b9bd (patch) | |
| tree | 9be3d23831c56a592d4e9e31cb0bc562741df87d /usr.bin/make/unit-tests/modmisc.exp | |
| parent | 72ffba0321f9534e097b7ff3055e4f3f817b83e0 (diff) | |
make(1): fix edge cases with $ at the end of the :@ modifier
In both parts of the :@ modifier, by passing &pflags to
ParseModifierPart, a final $ was interpreted as an anchor, which only
makes sense in the :S and :C modifiers.
This edge case is neither used by src nor by pkgsrc, except for the unit
tests that have been adjusted.
Diffstat (limited to 'usr.bin/make/unit-tests/modmisc.exp')
| -rw-r--r-- | usr.bin/make/unit-tests/modmisc.exp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/make/unit-tests/modmisc.exp b/usr.bin/make/unit-tests/modmisc.exp index 7bde6c69f22..a37e7bc0cac 100644 --- a/usr.bin/make/unit-tests/modmisc.exp +++ b/usr.bin/make/unit-tests/modmisc.exp @@ -33,7 +33,7 @@ make: Unclosed substitution for (, missing) :+one+ +two+ +three+: mod-at-resolve:w1d2d3w w2i3w w1i2d3 2i${RES3}w w1d2d3 2i${RES3} 1i${RES2}w: mod-at-dollar:(1) (2) (3). -mod-at-dollar:(1) (2) (3). +mod-at-dollar:() () (). mod-at-dollar:() () (). mod-subst-dollar:$1: mod-subst-dollar:$2: @@ -46,11 +46,11 @@ mod-subst-dollar:$8: mod-subst-dollar:U8: mod-subst-dollar:$$$$: mod-loop-dollar:1: -mod-loop-dollar:${word}: +mod-loop-dollar:${word}$: mod-loop-dollar:$3$: -mod-loop-dollar:$${word}$: +mod-loop-dollar:$${word}$$: mod-loop-dollar:$$5$$: -mod-loop-dollar:$$${word}$$: +mod-loop-dollar:$$${word}$$$: mod-C-limits:00-ok:1 2323 45456 make: No subexpression \1 make: No subexpression \1 |
