From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 3/5] Documentation: gen_commands.py: rework if statements for compactness
Date: Fri, 24 Oct 2025 11:07:04 +0200 [thread overview]
Message-ID: <20251024090708.2476109-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20251024090708.2476109-1-a.fatoum@pengutronix.de>
The code can get a bit easier to follow by removing some clutter:
- use elif instead continue
- combine assignments and checks into one line
No functional change. This was verified by regenerating the docs and
checking the diff.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
Documentation/gen_commands.py | 66 ++++++++++++++---------------------
1 file changed, 27 insertions(+), 39 deletions(-)
diff --git a/Documentation/gen_commands.py b/Documentation/gen_commands.py
index 8e129d6b253f..2f15c8b40540 100755
--- a/Documentation/gen_commands.py
+++ b/Documentation/gen_commands.py
@@ -44,69 +44,57 @@ def parse_c(name):
cmd = None
last = None
for line in open(name, 'r'):
- x = HELP_START.match(line)
- if x:
+ if x := HELP_START.match(line):
cmd = CMDS.setdefault(x.group(1), defaultdict(list))
cmd.setdefault("files", set()).add(name)
- continue
- x = CMD_START.match(line)
- if x:
+
+ elif x := CMD_START.match(line):
cmd = CMDS.setdefault(x.group(1), defaultdict(list))
cmd.setdefault("files", set()).add(name)
- continue
- if cmd is None:
- continue
- x = HELP_TEXT.match(line)
- if x:
- if 'h_opts' not in cmd:
- last = cmd['h_pre']
- else:
- last = cmd['h_post']
+
+ elif cmd is None:
+ pass
+
+ elif x := HELP_TEXT.match(line):
+ last = cmd['h_post' if 'h_opts' in cmd else 'h_pre']
last.append(string_escape(x.group(1)).strip())
- continue
- x = HELP_OPT.match(line)
- if x:
+
+ elif x := HELP_OPT.match(line):
last = cmd['h_opts']
last.append([
string_escape(x.group(1)),
string_escape(x.group(2)),
])
- continue
- x = CMD_FUNC.match(line)
- if x:
+
+ elif x := CMD_FUNC.match(line):
last = cmd['c_func']
last.append(x.group(1))
- continue
- x = CMD_DESC.match(line)
- if x:
+
+ elif x := CMD_DESC.match(line):
last = cmd['c_desc']
last.append(string_escape(x.group(1)))
- continue
- x = CMD_OPTS.match(line)
- if x:
+
+ elif x := CMD_OPTS.match(line):
last = cmd['c_opts']
last.append(string_escape_literal(x.group(1)))
- continue
- x = CMD_GROUP.match(line)
- if x:
+
+ elif x := CMD_GROUP.match(line):
last = cmd['c_group']
last.append(x.group(1).split('_')[-1].lower())
- continue
- x = CONT.match(line)
- if x:
+
+ elif x := CONT.match(line):
if last is None:
raise Exception("Parse error in %s: %r" % (name, line))
if isinstance(last[-1], str):
last[-1] += string_escape(x.group(1))
elif isinstance(last[-1], list):
last[-1][1] += string_escape(x.group(1))
- continue
- x = HELP_END.match(line)
- if x:
- cmd = last = None
- x = CMD_END.match(line)
- if x:
- cmd = last = None
+
+ else:
+ if x := HELP_END.match(line):
+ cmd = last = None
+ if x := CMD_END.match(line):
+ cmd = last = None
def gen_rst(name, cmd):
--
2.47.3
next prev parent reply other threads:[~2025-10-24 9:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-24 9:07 [PATCH 1/5] Documentation: gen_commands.py: escape special characters Ahmad Fatoum
2025-10-24 9:07 ` [PATCH 2/5] Documentation: gen_commands.py: align whitespace with coding style Ahmad Fatoum
2025-10-24 9:07 ` Ahmad Fatoum [this message]
2025-10-24 9:07 ` [PATCH 4/5] Documentation: gen_commands.py: use literal block for help text Ahmad Fatoum
2025-10-24 9:07 ` [PATCH 5/5] Documentation: gen_commands.py: escape name in title Ahmad Fatoum
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=20251024090708.2476109-3-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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