[1/2] Rename tui-stack -> tui-status

Message ID 20231208-tui-status-rename-v1-1-db019efd7483@tromey.com
State New
Headers
Series Rename TUI status code to follow the docs |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 fail Testing failed
linaro-tcwg-bot/tcwg_gdb_build--master-arm fail Testing failed

Commit Message

Tom Tromey Dec. 8, 2023, 5:43 p.m. UTC
  The TUI status line is called the "status" window in the
documentation, but not in the source.  There, the relevant files are
named "tui-stack", which to me makes it sound like they have something
to do with backtraces.  This patch renames them to "tui-status".
---
 gdb/Makefile.in                       | 4 ++--
 gdb/tui/tui-disasm.c                  | 2 +-
 gdb/tui/tui-hooks.c                   | 2 +-
 gdb/tui/tui-layout.c                  | 2 +-
 gdb/tui/tui-location.c                | 2 +-
 gdb/tui/tui-source.c                  | 2 +-
 gdb/tui/{tui-stack.c => tui-status.c} | 2 +-
 gdb/tui/{tui-stack.h => tui-status.h} | 0
 gdb/tui/tui-win.c                     | 2 +-
 gdb/tui/tui-wingeneral.c              | 2 +-
 gdb/tui/tui-winsource.c               | 2 +-
 gdb/tui/tui.c                         | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
  

Comments

Alexandra Petlanova Hajkova Dec. 13, 2023, 1:35 p.m. UTC | #1
On Fri, Dec 8, 2023 at 6:43 PM Tom Tromey <tom@tromey.com> wrote:

> The TUI status line is called the "status" window in the
> documentation, but not in the source.  There, the relevant files are
> named "tui-stack", which to me makes it sound like they have something
> to do with backtraces.  This patch renames them to "tui-status".
>
>
Hi,

this patch does not compile for me with:
./../binutils-gdb/gdb/tui/tui-data.c:29:10: fatal error: tui/tui-stack.h:
No such file or directory
   29 | #include "tui/tui-stack.h"
      |          ^~~~~~~~~~~~~~~~~

Have you forgotten to modify tui-data.c?
  
Tom Tromey Dec. 13, 2023, 8 p.m. UTC | #2
>>>>> "Alexandra" == Alexandra Petlanova Hajkova <ahajkova@redhat.com> writes:

Alexandra> this patch does not compile for me with:
Alexandra> ./../binutils-gdb/gdb/tui/tui-data.c:29:10: fatal error: tui/tui-stack.h: No such file or directory
Alexandra>    29 | #include "tui/tui-stack.h"
Alexandra>       |          ^~~~~~~~~~~~~~~~~

Alexandra> Have you forgotten to modify tui-data.c?

I think that a patch adding this inclusion landed after I sent my patch.
I will update and send v2 shortly.

Tom
  

Patch

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 3510577f090..c6d60f69d86 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -321,7 +321,7 @@  SUBDIR_TUI_SRCS = \
 	tui/tui-out.c \
 	tui/tui-regs.c \
 	tui/tui-source.c \
-	tui/tui-stack.c \
+	tui/tui-status.c \
 	tui/tui-win.c \
 	tui/tui-wingeneral.c \
 	tui/tui-winsource.c
@@ -1605,7 +1605,7 @@  HFILES_NO_SRCDIR = \
 	tui/tui-out.h \
 	tui/tui-regs.h \
 	tui/tui-source.h \
-	tui/tui-stack.h \
+	tui/tui-status.h \
 	tui/tui-win.h \
 	tui/tui-wingeneral.h \
 	tui/tui-winsource.h \
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index b5d5a4cc20f..38ad4bd8517 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -33,7 +33,7 @@ 
 #include "tui/tui-win.h"
 #include "tui/tui-layout.h"
 #include "tui/tui-winsource.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "tui/tui-file.h"
 #include "tui/tui-disasm.h"
 #include "tui/tui-source.h"
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index 6525f0f2b6c..d6becd5a777 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -44,7 +44,7 @@ 
 #include "tui/tui-io.h"
 #include "tui/tui-regs.h"
 #include "tui/tui-win.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "tui/tui-winsource.h"
 
 #include "gdb_curses.h"
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index a4cb5a8b7bf..189954de535 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -35,7 +35,7 @@ 
 #include "tui/tui-command.h"
 #include "tui/tui-data.h"
 #include "tui/tui-wingeneral.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "tui/tui-regs.h"
 #include "tui/tui-win.h"
 #include "tui/tui-winsource.h"
diff --git a/gdb/tui/tui-location.c b/gdb/tui/tui-location.c
index 9d6d29bcf01..da41d63631e 100644
--- a/gdb/tui/tui-location.c
+++ b/gdb/tui/tui-location.c
@@ -17,7 +17,7 @@ 
 
 #include "defs.h"
 #include "tui/tui.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "tui/tui-data.h"
 #include "tui/tui-location.h"
 #include "symtab.h"
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index bce381add28..6601fa31a48 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -33,7 +33,7 @@ 
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-io.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "tui/tui-win.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-status.c
similarity index 99%
rename from gdb/tui/tui-stack.c
rename to gdb/tui/tui-status.c
index 723d6268aad..9c99312d7dc 100644
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-status.c
@@ -31,7 +31,7 @@ 
 #include "source.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-source.h"
 #include "tui/tui-winsource.h"
diff --git a/gdb/tui/tui-stack.h b/gdb/tui/tui-status.h
similarity index 100%
rename from gdb/tui/tui-stack.h
rename to gdb/tui/tui-status.h
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 9219c1f0184..28d894b9e41 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -44,7 +44,7 @@ 
 #include "tui/tui-data.h"
 #include "tui/tui-layout.h"
 #include "tui/tui-wingeneral.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "tui/tui-regs.h"
 #include "tui/tui-disasm.h"
 #include "tui/tui-source.h"
diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index af4fc746cba..f313eb337bc 100644
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -25,7 +25,7 @@ 
 #include "tui/tui-io.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-win.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "cli/cli-style.h"
 
 #include "gdb_curses.h"
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 52c0b5b69a4..32089c1229c 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -33,7 +33,7 @@ 
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-io.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "tui/tui-win.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-winsource.h"
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 33aced2e7e3..e1c822ce685 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -28,7 +28,7 @@ 
 #include "tui/tui-layout.h"
 #include "tui/tui-io.h"
 #include "tui/tui-regs.h"
-#include "tui/tui-stack.h"
+#include "tui/tui-status.h"
 #include "tui/tui-win.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-winsource.h"