From: Jonathan Corbet <corbet@lwn.net>
To: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Akira Yokosawa <akiyks@gmail.com>,
Jonathan Corbet <corbet@lwn.net>
Subject: [PATCH v2 09/12] docs: kdoc: Some rewrite_struct_members() commenting
Date: Thu, 7 Aug 2025 15:16:36 -0600 [thread overview]
Message-ID: <20250807211639.47286-10-corbet@lwn.net> (raw)
In-Reply-To: <20250807211639.47286-1-corbet@lwn.net>
Add comments to rewrite_struct_members() describing what it is actually
doing, and reformat/comment the main struct_members regex so that it is
(more) comprehensible to humans.
Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
scripts/lib/kdoc/kdoc_parser.py | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/scripts/lib/kdoc/kdoc_parser.py b/scripts/lib/kdoc/kdoc_parser.py
index 0c279aa802a0..e3d0270b1a19 100644
--- a/scripts/lib/kdoc/kdoc_parser.py
+++ b/scripts/lib/kdoc/kdoc_parser.py
@@ -647,22 +647,28 @@ class KernelDoc:
return (r.group(1), r.group(3), r.group(2))
return None
+ #
+ # Rewrite the members of a structure or union for easier formatting later on.
+ # Among other things, this function will turn a member like:
+ #
+ # struct { inner_members; } foo;
+ #
+ # into:
+ #
+ # struct foo; inner_members;
+ #
def rewrite_struct_members(self, members):
- # Split nested struct/union elements
- #
- # This loop was simpler at the original kernel-doc perl version, as
- # while ($members =~ m/$struct_members/) { ... }
- # reads 'members' string on each interaction.
#
- # Python behavior is different: it parses 'members' only once,
- # creating a list of tuples from the first interaction.
+ # Process struct/union members from the most deeply nested outward. The
+ # trick is in the ^{ below - it prevents a match of an outer struct/union
+ # until the inner one has been munged (removing the "{" in the process).
#
- # On other words, this won't get nested structs.
- #
- # So, we need to have an extra loop on Python to override such
- # re limitation.
-
- struct_members = KernRe(r'(struct|union)([^\{\};]+)(\{)([^\{\}]*)(\})([^\{\};]*)(;)')
+ struct_members = KernRe(r'(struct|union)' # 0: declaration type
+ r'([^\{\};]+)' # 1: possible name
+ r'(\{)'
+ r'([^\{\}]*)' # 3: Contents of declaration
+ r'(\})'
+ r'([^\{\};]*)(;)') # 5: Remaining stuff after declaration
tuples = struct_members.findall(members)
while tuples:
for t in tuples:
--
2.50.1
next prev parent reply other threads:[~2025-08-07 21:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-07 21:16 [PATCH v2 00/12] docs: kdoc: thrash up dump_struct() Jonathan Corbet
2025-08-07 21:16 ` [PATCH v2 01/12] docs: kdoc: consolidate the stripping of private struct/union members Jonathan Corbet
2025-08-07 21:16 ` [PATCH v2 02/12] docs: kdoc: Move a regex line in dump_struct() Jonathan Corbet
2025-08-07 21:16 ` [PATCH v2 03/12] docs: kdoc: backslashectomy in kdoc_parser Jonathan Corbet
2025-08-07 21:16 ` [PATCH v2 04/12] docs: kdoc: move the prefix transforms out of dump_struct() Jonathan Corbet
2025-08-07 21:16 ` [PATCH v2 05/12] docs: kdoc: split top-level prototype parsing " Jonathan Corbet
2025-08-07 21:16 ` [PATCH v2 06/12] docs: kdoc: split struct-member rewriting " Jonathan Corbet
2025-08-07 21:16 ` [PATCH v2 07/12] docs: kdoc: rework the rewrite_struct_members() main loop Jonathan Corbet
2025-08-07 21:16 ` [PATCH v2 08/12] docs: kdoc: remove an extraneous strip() call Jonathan Corbet
2025-08-07 21:16 ` Jonathan Corbet [this message]
2025-08-07 21:16 ` [PATCH v2 10/12] docs: kdoc: further rewrite_struct_members() cleanup Jonathan Corbet
2025-08-09 15:44 ` Mauro Carvalho Chehab
2025-08-07 21:16 ` [PATCH v2 11/12] docs: kdoc: extract output formatting from dump_struct() Jonathan Corbet
2025-08-07 21:16 ` [PATCH v2 12/12] docs: kdoc: a few final dump_struct() touches Jonathan Corbet
2025-08-09 15:47 ` [PATCH v2 00/12] docs: kdoc: thrash up dump_struct() Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250807211639.47286-10-corbet@lwn.net \
--to=corbet@lwn.net \
--cc=akiyks@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).