* lib/debugger.exp (watcharray): Add `array' parameter. Rename

	`type' parameter to `op' and update all uses in the proc.
	(watchvar): Add `ignore' parameter for scalar variables.
	Likewise, rename `type' to `op' and update throughout the proc.

2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f600630..c78baae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-22  Ben Elliston  <bje@gnu.org>
 
+	* lib/debugger.exp (watcharray): Add `array' parameter.  Rename
+	`type' parameter to `op' and update all uses in the proc.
+	(watchvar): Add `ignore' parameter for scalar variables.
+	Likewise, rename `type' to `op' and update throughout the proc.
+	
 	* runtest.exp: Use switch, not case.
 	* lib/framework.exp (clone_output): Likewise.
 	(clear_xfail): Likewise.
diff --git a/lib/debugger.exp b/lib/debugger.exp
index 13c6d78..10c6fdc 100644
--- a/lib/debugger.exp
+++ b/lib/debugger.exp
@@ -80,18 +80,18 @@ proc dumpwatch { args } {
 
 # Trap a watchpoint for an array.
 #
-proc watcharray { element type} {
+proc watcharray { array element op } {
     upvar [set array]($element) avar
-    switch $type {
+    switch $op {
 	"w" { puts "New value of [set array]($element) is $avar" }
 	"r" { puts "[set array]($element) (= $avar) was just read" }
 	"u" { puts "[set array]($element) (= $avar) was just unset" }
     }
 }
 
-proc watchvar { v type } {
+proc watchvar { v ignored op } {
     upvar $v var
-    switch $type {
+    switch $op {
 	"w" { puts "New value of $v is $var" }
 	"r" { puts "$v (=$var) was just read" }
 	"u" { puts "$v (=$var) was just unset" }