From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [pushed 1/2] [gdb/testsuite] Allow procs with default value args in with_override
Date: Tue, 13 Jun 2023 12:24:32 +0200 [thread overview]
Message-ID: <20230613102433.13601-1-tdevries@suse.de> (raw)
Currently proc with_override does not work with procs with default value args.
Fix this, and add a test-case excercising this scenario.
Tested on x86_64-linux.
---
gdb/testsuite/gdb.testsuite/with-override.exp | 81 +++++++++++++++++++
gdb/testsuite/lib/gdb.exp | 20 ++++-
2 files changed, 99 insertions(+), 2 deletions(-)
create mode 100644 gdb/testsuite/gdb.testsuite/with-override.exp
diff --git a/gdb/testsuite/gdb.testsuite/with-override.exp b/gdb/testsuite/gdb.testsuite/with-override.exp
new file mode 100644
index 00000000000..dbd0064ffb0
--- /dev/null
+++ b/gdb/testsuite/gdb.testsuite/with-override.exp
@@ -0,0 +1,81 @@
+# Copyright 2023 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check with_override proc.
+
+proc foo {} {
+ return 0
+}
+
+proc foo1 {} {
+ return 1
+}
+
+proc foo2 {} {
+ return 2
+}
+
+with_test_prefix no-args {
+
+ with_test_prefix before {
+ gdb_assert { [foo] == 0 }
+ }
+
+ with_override foo foo1 {
+ with_test_prefix foo1 {
+ gdb_assert { [foo] == 1 }
+ }
+
+ with_override foo foo2 {
+ with_test_prefix foo2 {
+ gdb_assert { [foo] == 2 }
+ }
+ }
+ }
+
+ with_test_prefix after {
+ gdb_assert { [foo] == 0 }
+ }
+}
+
+proc foo { {a 0} } {
+ return [expr $a + 1]
+}
+
+proc foo_plus_1 { {a 0} } {
+ return [expr $a + 2]
+}
+
+with_test_prefix default-arg {
+
+ with_test_prefix before {
+ gdb_assert { [foo] == 1 }
+ gdb_assert { [foo 0] == 1 }
+ gdb_assert { [foo 1] == 2 }
+ }
+
+ with_override foo foo_plus_1 {
+ with_test_prefix foo_plus_1 {
+ gdb_assert { [foo] == 2 }
+ gdb_assert { [foo 0] == 2 }
+ gdb_assert { [foo 1] == 3 }
+ }
+ }
+
+ with_test_prefix after {
+ gdb_assert { [foo] == 1 }
+ gdb_assert { [foo 0] == 1 }
+ gdb_assert { [foo 1] == 2 }
+ }
+}
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c3e5d4891dc..f214a6bb54d 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -9062,6 +9062,22 @@ proc hex_in_list { val hexlist } {
return [expr $index != -1]
}
+# As info args, but also add the default values.
+
+proc info_args_with_defaults { name } {
+ set args {}
+
+ foreach arg [info args $name] {
+ if { [info default $name $arg default_value] } {
+ lappend args [list $arg $default_value]
+ } else {
+ lappend args $arg
+ }
+ }
+
+ return $args
+}
+
# Override proc NAME to proc OVERRIDE for the duration of the execution of
# BODY.
@@ -9081,7 +9097,7 @@ proc with_override { name override body } {
# Save the old proc, if it exists.
if { [info procs $name] != "" } {
- set old_args [info args $name]
+ set old_args [info_args_with_defaults $name]
set old_body [info body $name]
set existed true
} else {
@@ -9089,7 +9105,7 @@ proc with_override { name override body } {
}
# Install the override.
- set new_args [info args $override]
+ set new_args [info_args_with_defaults $override]
set new_body [info body $override]
eval proc $name {$new_args} {$new_body}
base-commit: 40bea10383b36fbe451d91ed0513792c399de1a6
--
2.35.3
next reply other threads:[~2023-06-13 10:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 10:24 Tom de Vries [this message]
2023-06-13 10:24 ` [pushed 2/2] [gdb/testsuite] Fix and add prompt anchoring in tuiterm Tom de Vries
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=20230613102433.13601-1-tdevries@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@sourceware.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 read-only IMAP folder(s) and NNTP newsgroup(s).