> -----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 23/30] docs: kdoc_parser: better > handle struct_group macros > > Instead of converting them on two steps, implement a single logic to > parse them using the new sub functionality of NestedMatch.sub(). > > Signed-off-by: Mauro Carvalho Chehab <[email protected]> > --- > tools/lib/python/kdoc/kdoc_parser.py | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/lib/python/kdoc/kdoc_parser.py > b/tools/lib/python/kdoc/kdoc_parser.py > index 3a5614106af7..d2eb93f9d489 100644 > --- a/tools/lib/python/kdoc/kdoc_parser.py > +++ b/tools/lib/python/kdoc/kdoc_parser.py > @@ -124,10 +124,11 @@ struct_xforms = [ > # matched. So, the implementation to drop STRUCT_GROUP() will be > # handled in separate. > # > - (KernRe(r'\bstruct_group\s*\(([^,]*,)', re.S), r'STRUCT_GROUP('), > - (KernRe(r'\bstruct_group_attr\s*\(([^,]*,){2}', re.S), > r'STRUCT_GROUP('), > - (KernRe(r'\bstruct_group_tagged\s*\(([^,]*),([^,]*),', re.S), > r'struct \1 \2; STRUCT_GROUP('), > - (KernRe(r'\b__struct_group\s*\(([^,]*,){3}', re.S), > r'STRUCT_GROUP('), > + (NestedMatch(r'\bstruct_group\s*\('), r'\2'), > + (NestedMatch(r'\bstruct_group_attr\s*\('), r'\3'), > + (NestedMatch(r'\bstruct_group_tagged\s*\('), r'struct \1 { \3 } > \2;'), > + (NestedMatch(r'\b__struct_group\s*\('), r'\4'), > + > # > # Replace macros > # > @@ -153,7 +154,6 @@ struct_xforms = [ > (KernRe(r'DEFINE_DMA_UNMAP_ADDR\s*\(' + struct_args_pattern + > r'\)', re.S), r'dma_addr_t \1'), > (KernRe(r'DEFINE_DMA_UNMAP_LEN\s*\(' + struct_args_pattern + > r'\)', re.S), r'__u32 \1'), > (KernRe(r'VIRTIO_DECLARE_FEATURES\(([\w_]+)\)'), r'union { u64 > \1; u64 \1_array[VIRTIO_FEATURES_U64S]; }'), > - (NestedMatch(r'\bSTRUCT_GROUP\('), r'\0'), > ] > > # > -- > 2.52.0
Reviewed-by: Aleksandr Loktionov <[email protected]>
