Commit 326b1ffc authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

checkpatch: fix $Float creation of match variables 



Commit 74349bcc ("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.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Andy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 91c777d8

scripts/checkpatch.pl

+5 −5
Original line number Diff line number Diff line
@@ -230,12 +230,12 @@ our $Inline = qr{inline|__always_inline|noinline}; 
our $Member	= qr{->$Ident|\.$Ident|\[[^]]*\]};

our $Lval	= qr{$Ident(?:$Member)*};



our $Float_hex	= qr{(?i:0x[0-9a-f]+p-?[0-9]+[fl]?)};

our $Float_dec	= qr{(?i:((?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?))};

our $Float_int	= qr{(?i:[0-9]+e-?[0-9]+[fl]?)};

our $Float_hex	= qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?};

our $Float_dec	= qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?};

our $Float_int	= qr{(?i)[0-9]+e-?[0-9]+[fl]?};

our $Float	= qr{$Float_hex|$Float_dec|$Float_int};

our $Constant	= qr{(?:$Float|(?i:(?:0x[0-9a-f]+|[0-9]+)[ul]*))};

our $Assignment	= qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};

our $Constant	= qr{$Float|(?i)(?:0x[0-9a-f]+|[0-9]+)[ul]*};

our $Assignment	= qr{\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=};

our $Compare    = qr{<=|>=|==|!=|<|>};

our $Operators	= qr{

			<=|>=|==|!=|

CRA Git | Maintained and supported by SUSTech CRA and CCSE