From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@polymtl.ca>, Tom Tromey <tom@tromey.com>
Subject: [PATCH v3 09/10] gdb: make-target-delegates.py: add Entry type
Date: Sun, 26 Feb 2023 20:14:02 -0500 [thread overview]
Message-ID: <20230227011403.612304-10-simon.marchi@polymtl.ca> (raw)
In-Reply-To: <20230227011403.612304-1-simon.marchi@polymtl.ca>
Add the Entry type and use it in the `entries` map, rather than using an
ad-hoc str -> str map that comes from the re.match. This will make it
easier to make typing work in a subsequent patch, but it also helps
readers know what attributes exist for entries, which is not clear
currently.
Change-Id: I5b58dee1ed7ae85987b99bd417e641ede718624c
Reviewed-By: Tom Tromey <tom@tromey.com>
---
gdb/make-target-delegates.py | 55 +++++++++++++++++++++++++-----------
1 file changed, 39 insertions(+), 16 deletions(-)
diff --git a/gdb/make-target-delegates.py b/gdb/make-target-delegates.py
index 2df84cd458c6..1e2e741bc320 100755
--- a/gdb/make-target-delegates.py
+++ b/gdb/make-target-delegates.py
@@ -21,8 +21,9 @@
# make-target-delegates.py
import re
-import gdbcopyright
+from typing import List
+import gdbcopyright
# The line we search for in target.h that marks where we should start
# looking for methods.
@@ -92,6 +93,16 @@ ARGTYPES = re.compile(
TARGET_DEBUG_PRINTER = r"\s*TARGET_DEBUG_PRINTER\s*\((?P<arg>[^)]*)\)\s*"
+class Entry:
+ def __init__(
+ self, argtypes: List[str], return_type: str, style: str, default_arg: str
+ ):
+ self.argtypes = argtypes
+ self.return_type = return_type
+ self.style = style
+ self.default_arg = default_arg
+
+
def scan_target_h():
found_trigger = False
all_the_text = ""
@@ -295,10 +306,9 @@ def print_class(f, class_name, delegators, entries):
print("", file=f)
for name in delegators:
- return_type = entries[name]["return_type"]
- argtypes = entries[name]["argtypes"]
print(" ", file=f, end="")
- write_declaration(f, name, return_type, argtypes)
+ entry = entries[name]
+ write_declaration(f, name, entry.return_type, entry.argtypes)
print("};\n", file=f)
@@ -313,11 +323,14 @@ for current_line in scan_target_h():
if not m:
continue
data = m.groupdict()
- data["argtypes"] = parse_argtypes(data["args"])
- data["return_type"] = data["return_type"].strip()
- entries[data["name"]] = data
+ name = data["name"]
+ argtypes = parse_argtypes(data["args"])
+ return_type = data["return_type"].strip()
+ style = data["style"]
+ default_arg = data["default_arg"]
+ entries[name] = Entry(argtypes, return_type, style, default_arg)
- delegators.append(data["name"])
+ delegators.append(name)
with open("target-delegates.c", "w") as f:
print(
@@ -330,11 +343,21 @@ with open("target-delegates.c", "w") as f:
print_class(f, "debug_target", delegators, entries)
for name in delegators:
- tdefault = entries[name]["default_arg"]
- return_type = entries[name]["return_type"]
- style = entries[name]["style"]
- argtypes = entries[name]["argtypes"]
-
- write_delegator(f, name, return_type, argtypes)
- write_tdefault(f, tdefault, style, name, return_type, argtypes)
- write_debugmethod(f, tdefault, name, return_type, argtypes)
+ entry = entries[name]
+
+ write_delegator(f, name, entry.return_type, entry.argtypes)
+ write_tdefault(
+ f,
+ entry.default_arg,
+ entry.style,
+ name,
+ entry.return_type,
+ entry.argtypes,
+ )
+ write_debugmethod(
+ f,
+ entry.default_arg,
+ name,
+ entry.return_type,
+ entry.argtypes,
+ )
--
2.39.2
next prev parent reply other threads:[~2023-02-27 1:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 1:13 [PATCH v3 00/10] Add typing annotations to gdbarch*.py and make-target-delegates.py Simon Marchi
2023-02-27 1:13 ` [PATCH v3 01/10] gdb: remove invalid / dead code from gdbarch.py Simon Marchi
2023-02-27 1:13 ` [PATCH v3 02/10] gdb: reformat Python files with black 23.1.0 Simon Marchi
2023-02-27 1:13 ` [PATCH v3 03/10] gdb: gdbarch.py: spell out parameters of _Component.__init__ Simon Marchi
2023-02-27 1:13 ` [PATCH v3 04/10] gdb: gdbarch.py: remove Info.__init__ Simon Marchi
2023-02-27 1:13 ` [PATCH v3 05/10] gdb: pyproject.toml: set pyright typeCheckingMode = "strict" Simon Marchi
2023-02-27 1:13 ` [PATCH v3 06/10] gdb: split gdbarch component types to gdbarch_types.py Simon Marchi
2023-02-27 1:14 ` [PATCH v3 07/10] gdb: gdbarch*.py, copyright.py: add type annotations Simon Marchi
2023-02-27 1:14 ` [PATCH v3 08/10] gdb: make-target-delegates.py: make one string raw Simon Marchi
2023-02-27 1:14 ` Simon Marchi [this message]
2023-02-27 1:14 ` [PATCH v3 10/10] gdb: make-target-delegates.py: add type annotations Simon Marchi
2023-02-27 17:38 ` [PATCH v3 00/10] Add typing annotations to gdbarch*.py and make-target-delegates.py Andrew Burgess
2023-02-27 18:27 ` Simon Marchi
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=20230227011403.612304-10-simon.marchi@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--cc=gdb-patches@sourceware.org \
--cc=tom@tromey.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).