* gdbtk.tcl (delete_expr): Unset corresponding element of

	expr_update_list when destroying an expression.
	(create_expr_window): Initialize expr_num, delete_expr_num,
	and expr_update_list here when each new expression window
	is created, rather than once at startup.
PR 9383

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d0fabdef6970333cfdab386142f6927163b676c7..bb030eb1677aaf4138e6030876d0b7c23d6e5476 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Sat Jul 20 10:09:28 1996  Fred Fish  <fnf@cygnus.com>
+
+       * gdbtk.tcl (delete_expr): Unset corresponding element of
+       expr_update_list when destroying an expression.
+       (create_expr_window): Initialize expr_num, delete_expr_num,
+       and expr_update_list here when each new expression window
+       is created, rather than once at startup.
+
 Fri Jul 19 14:05:57 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
        * dwarf2read.c: New file, DWARF 2 reader originally contributed by

diff --git a/gdb/gdbtk.tcl b/gdb/gdbtk.tcl
index f517245cfa36344c8479cf0e52be08427db5c02e..6d027cca3031cd6c86944fbdefbe6322cc55c43b 100644 (file)
--- a/gdb/gdbtk.tcl
+++ b/gdb/gdbtk.tcl
@@ -27,7 +27,6 @@ set cfunc NIL
 set line_numbers 1
 set breakpoint_file(-1) {[garbage]}
 set disassemble_with_source nosource
-set expr_update_list(0) 0
 set gdb_prompt "(gdb) "
 
 # Hint: The following can be toggled from a tclsh window after
@@ -1089,9 +1088,6 @@ proc not_implemented_yet {message} {
 #      Create the expression display window.
 #
 
-set expr_num 0
-set delete_expr_num 0
-
 # Set delete_expr_num, and set -state of Delete button.
 proc expr_update_button {num} {
   global delete_expr_num
@@ -1135,13 +1131,14 @@ proc add_expr {expr} {
 
 proc delete_expr {} {
   global delete_expr_num
+  global expr_update_list
+
   if {$delete_expr_num > 0} then {
     set e .expr.exprs
     set f e${delete_expr_num}
 
     destroy $e.updates.$f $e.expressions.$f $e.values.$f
-
-    # FIXME should we unset an element of expr_update_list here?
+    unset expr_update_list($delete_expr_num)
   }
 }
 
@@ -1171,9 +1168,21 @@ proc update_exprs {} {
 }
 
 proc create_expr_window {} {
+       global expr_num
+       global delete_expr_num
+       global expr_update_list
 
        if {[winfo exists .expr]} {raise .expr ; return}
 
+       # All the state about individual expressions is stored in the
+       # expression window widgets, so when it is deleted, the
+       # previous values of the expression global variables become
+       # invalid.  Reset to a known initial state.
+       set expr_num 0
+       set delete_expr_num 0
+       catch {unset expr_update_list}
+       set expr_update_list(0) 0
+
        toplevel .expr
        wm title .expr "GDB Expressions"
        wm iconname .expr "Expressions"