> -----Original Message----- > From: Intel-wired-lan <[email protected]> On Behalf > Of Mauro Carvalho Chehab > Sent: Thursday, January 29, 2026 9:08 AM > To: Jonathan Corbet <[email protected]>; Linux Doc Mailing List <linux- > [email protected]> > Cc: Mauro Carvalho Chehab <[email protected]>; > [email protected]; [email protected]; linux- > [email protected]; [email protected]; > [email protected]; Mauro Carvalho Chehab <[email protected]>; > Randy Dunlap <[email protected]> > Subject: [Intel-wired-lan] [PATCH v3 11/30] docs: kdoc_parser: fix > parser to support multi-word types > > The regular expression currently expects a single word for the type, > but it may be something like "struct foo". > > Add support for it. > > Signed-off-by: Mauro Carvalho Chehab <[email protected]> > Acked-by: Randy Dunlap <[email protected]> > Tested-by: Randy Dunlap <[email protected]> > --- > tools/lib/python/kdoc/kdoc_parser.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/lib/python/kdoc/kdoc_parser.py > b/tools/lib/python/kdoc/kdoc_parser.py > index 0b6cba442d72..21cc4e19a1e8 100644 > --- a/tools/lib/python/kdoc/kdoc_parser.py > +++ b/tools/lib/python/kdoc/kdoc_parser.py > @@ -1026,7 +1026,7 @@ class KernelDoc: > > default_val = None > > - r= KernRe(OPTIONAL_VAR_ATTR + > r"[\w_]*\s+(?:\*+)?([\w_]+)\s*[\d\]\[]*\s*(=.*)?") > + r= KernRe(OPTIONAL_VAR_ATTR + > + r"\s*[\w_\s]*\s+(?:\*+)?([\w_]+)\s*[\d\]\[]*\s*(=.*)?") > if r.match(proto): > if not declaration_name: > declaration_name = r.group(1) @@ -1037,7 +1037,7 @@ > class KernelDoc: > r.groups(), proto) > > else: > - r= KernRe(OPTIONAL_VAR_ATTR + > r"(?:[\w_]*)?\s+(?:\*+)?(?:[\w_]+)\s*[\d\]\[]*\s*(=.*)?") > + r= KernRe(OPTIONAL_VAR_ATTR + > + r"(?:[\w_\s]*)?\s+(?:\*+)?(?:[\w_]+)\s*[\d\]\[]*\s*(=.*)?") > > if r.match(proto): > default_val = r.group(1) > -- > 2.52.0
Reviewed-by: Aleksandr Loktionov <[email protected]>
