Commit 74349bccedb3 ("checkpatch: add support for floating point constants") added an unnecessary match variable that caused tests that used a $Constant or $LvalOrFunc to have one too many matches. This causes problems with usleep_range, min/max and other extended tests. Avoid using match variables in $Float. Avoid using match variables in $Assignment too.
Showing the changes to scripts/checkpatch.pl (1 of 1 file). Show all
Unified · Split
| @@ -230,12 +230,12 @@ our $Inline = qr{inline|__always_inline|noinline}; · 229 unmodified lines | ||
| 230 | 230 | our $Member = qr{->$Ident|\.$Ident|\[[^]]*\]}; |
| 231 | 231 | our $Lval = qr{$Ident(?:$Member)*}; |
| 232 | 232 | |
| 233 | −our $Float_hex = qr{(?i:0x[0-9a-f]+p-?[0-9]+[fl]?)}; | |
| 234 | −our $Float_dec = qr{(?i:((?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?))}; | |
| 235 | −our $Float_int = qr{(?i:[0-9]+e-?[0-9]+[fl]?)}; | |
| 233 | +our $Float_hex = qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?}; | |
| 234 | +our $Float_dec = qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?}; | |
| 235 | +our $Float_int = qr{(?i)[0-9]+e-?[0-9]+[fl]?}; | |
| 236 | 236 | our $Float = qr{$Float_hex|$Float_dec|$Float_int}; |
| 237 | −our $Constant = qr{(?:$Float|(?i:(?:0x[0-9a-f]+|[0-9]+)[ul]*))}; | |
| 238 | −our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)}; | |
| 237 | +our $Constant = qr{$Float|(?i)(?:0x[0-9a-f]+|[0-9]+)[ul]*}; | |
| 238 | +our $Assignment = qr{\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=}; | |
| 239 | 239 | our $Compare = qr{<=|>=|==|!=|<|>}; |
| 240 | 240 | our $Operators = qr{ |
| 241 | 241 | <=|>=|==|!=| |