tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

scripts: kernel-doc: fix parsing function-like typedefs (again)

Typedefs like

typedef struct phylink_pcs *(*pcs_xlate_t)(const u64 *args);

have a typedef_type that ends with a * and therefore has no word
boundary. Add an extra clause for the final group of the typedef_type so
we only require a word boundary if we match a word.

[mchehab: modify also kernel-doc.py, as we're deprecating the perl version]

Fixes: 7d2c6b1edf79 ("scripts: kernel-doc: fix parsing function-like typedefs")
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/e0abb103c73a96d76602d909f60ab8fd6e2fd0bd.1744106242.git.mchehab+huawei@kernel.org

authored by

Sean Anderson and committed by
Jonathan Corbet de258fa8 04a383ce

+2 -2
+1 -1
scripts/kernel-doc.pl
··· 1325 1325 } 1326 1326 } 1327 1327 1328 - my $typedef_type = qr { ((?:\s+[\w\*]+\b){1,8})\s* }x; 1328 + my $typedef_type = qr { ((?:\s+[\w\*]+\b){0,7}\s+(?:\w+\b|\*+))\s* }x; 1329 1329 my $typedef_ident = qr { \*?\s*(\w\S+)\s* }x; 1330 1330 my $typedef_args = qr { \s*\((.*)\); }x; 1331 1331
+1 -1
scripts/lib/kdoc/kdoc_parser.py
··· 1067 1067 Stores a typedef inside self.entries array. 1068 1068 """ 1069 1069 1070 - typedef_type = r'((?:\s+[\w\*]+\b){1,8})\s*' 1070 + typedef_type = r'((?:\s+[\w\*]+\b){0,7}\s+(?:\w+\b|\*+))\s*' 1071 1071 typedef_ident = r'\*?\s*(\w\S+)\s*' 1072 1072 typedef_args = r'\s*\((.*)\);' 1073 1073