* config/gdb-comm.exp (gdb_comm_load): Brace some expressions.

	* config/i960.exp (i960_spawn): Initialise status.
	* config/netware.exp (${board}_init): Brace some if expressions.
	* lib/dg.exp (dg-test): Brace some expressions.
	* lib/framework.exp (clone_output, log_and_exit, log_summary,
	record_test, pass, fail): Likewise.
	* lib/libgloss.exp (get_multilibs): Likewise.
	* lib/remote.exp (standard_transmit, unix_clean_filename,
	remote_load, check_for_board_status, remote_expect): Likewise.
	* lib/rsh.exp (rsh_exec): Likewise.

9 files changed, 48 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index d19d2a7..e88807c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-23  Ben Elliston  <bje@gnu.org>
+
+	* config/gdb-comm.exp (gdb_comm_load): Brace some expressions.
+	* config/i960.exp (i960_spawn): Initialise status.
+	* config/netware.exp (${board}_init): Brace some if expressions.
+	* lib/dg.exp (dg-test): Brace some expressions.
+	* lib/framework.exp (clone_output, log_and_exit, log_summary,
+	record_test, pass, fail): Likewise.
+	* lib/libgloss.exp (get_multilibs): Likewise.
+	* lib/remote.exp (standard_transmit, unix_clean_filename,
+	remote_load, check_for_board_status, remote_expect): Likewise.
+	* lib/rsh.exp (rsh_exec): Likewise.
+
 2006-05-22  Ben Elliston  <bje@gnu.org>
 
 	* baseboards/cris-sim.exp: Use switch, not case.
diff --git a/config/gdb-comm.exp b/config/gdb-comm.exp
index 92af199..b7dbfc3 100644
--- a/config/gdb-comm.exp
+++ b/config/gdb-comm.exp
@@ -292,8 +292,8 @@ proc gdb_comm_load { dest prog args } {
 	    }
 	    -re "$gdb_prompt" { }
 	}
-	set dataoff [format 0x%x [expr $dataoff + $textoff]]
-	set bssoff [format 0x%x [expr $bssoff + $textoff]]
+	set dataoff [format 0x%x [expr {$dataoff + $textoff}]]
+	set bssoff [format 0x%x [expr {$bssoff + $textoff}]]
 	remote_send host "sect .data $dataoff\n"
 	remote_expect host 10 {
 	    -re "$gdb_prompt" { }
diff --git a/config/i960.exp b/config/i960.exp
index 18810d4..7396c05 100644
--- a/config/i960.exp
+++ b/config/i960.exp
@@ -149,6 +149,7 @@ proc i960_spawn { dest prog args } {
 proc i960_wait { dest timeout } {
     set output ""
     set shell_prompt [board_info $dest shell_prompt]
+    set status -1
 
     remote_expect $dest $timeout {
 	-re " fault at \[0-9a-h\]+, subtype \[0-9a-h\]+" {
diff --git a/config/netware.exp b/config/netware.exp
index 922fc39..183ba53 100644
--- a/config/netware.exp
+++ b/config/netware.exp
@@ -28,6 +28,8 @@ load_lib remote.exp
 
 proc ${board}_init { args } {
     global NLMCONV
+
+    # FIXME: rootme is undefined.
     if {![info exists NLMCONV]} then {
 	set NLMCONV [findfile "$rootme/../binutils/nlmconv"]
     }
@@ -43,7 +45,7 @@ proc ${board}_init { args } {
     } else {
 	set passwd ""
     }
-    if $shell_id<0 then {
+    if {$shell_id < 0} then {
 	warning "Couldn't connect to target"
 	return -1
     }
@@ -102,7 +104,7 @@ proc ${board}_load { dest prog args } {
 
     set output ""
 
-    if $shell_id<0 then {
+    if {$shell_id < 0} then {
 	verbose -log "$prog not executed because there is no target" 3
 	return "untested"
     }
@@ -112,6 +114,8 @@ proc ${board}_load { dest prog args } {
 
     # We can't blindly append a suffix to the object name, because the
     # result may not be valid on netware's 8.3 filesystem.
+    #
+    # FIXME: tmpdir is undefined.
     set nlm "$tmpdir/x.nlm"
     set lnk "$tmpdir/x.lnk"
 
diff --git a/lib/dg.exp b/lib/dg.exp
index b91a23e..840c2d8 100644
--- a/lib/dg.exp
+++ b/lib/dg.exp
@@ -634,8 +634,8 @@ proc dg-test { args } {
 	return
     }
     set prog [lindex $args $i]
-    set tool_flags [lindex $args [expr $i + 1]]
-    set default_extra_tool_flags [lindex $args [expr $i + 2]]
+    set tool_flags [lindex $args [expr {$i + 1}]]
+    set default_extra_tool_flags [lindex $args [expr {$i + 2}]]
 
     set text "\[- A-Za-z0-9\.\;\"\_\:\'\`\(\)\!\#\=\+\?\&\*]*"
 
@@ -811,7 +811,7 @@ proc dg-test { args } {
     # FIXME: why?
     if { ${dg-interpreter-batch-mode} == 0 } {
 	# Catch excess errors (new bugs or incomplete testcases).
-	if ${dg-excess-errors-flag} {
+	if {${dg-excess-errors-flag}} {
 	    setup_xfail "*-*-*"
 	}
 	if {![string match "" $comp_output]} {
diff --git a/lib/framework.exp b/lib/framework.exp
index af73723..92d409e 100644
--- a/lib/framework.exp
+++ b/lib/framework.exp
@@ -295,7 +295,7 @@ proc clone_output { message } {
     regsub "^\[ \t\]*(\[^ \t\]+).*$" "$message" "\\1" firstword
     switch "$firstword" {
 	{"PASS:" "XFAIL:" "KFAIL:" "UNRESOLVED:" "UNSUPPORTED:" "UNTESTED:"} {
-	    if $all_flag {
+	    if {$all_flag} {
 		send_user "$message\n"
 		return "$message"
 	    } else {
@@ -352,7 +352,7 @@ proc log_and_exit {} {
     close_logs
     cleanup
     verbose -log "runtest completed at [timestamp -format %c]"
-    if $mail_logs {
+    if {$mail_logs} {
 	mail_file $outdir/$tool.sum $mailing_list "Dejagnu Summary Log"
     }
     remote_close host
@@ -409,10 +409,10 @@ proc log_summary { args } {
 
 	    if { $testcnt>$totlcnt || $testcnt<$totlcnt } {
 		if { $testcnt > $totlcnt } {
-		    set mismatch "unreported  [expr $testcnt-$totlcnt]"
+		    set mismatch "unreported  [expr {$testcnt - $totlcnt}]"
 		}
 		if { $testcnt < $totlcnt } {
-		    set mismatch "misreported [expr $totlcnt-$testcnt]"
+		    set mismatch "misreported [expr {$totlcnt - $testcnt}]"
 		}
 	    } else {
 		verbose "# of testcases run         $testcnt"
@@ -714,13 +714,13 @@ proc record_test { type message args } {
 
     switch $type {
 	PASS {
-	    if $prms_id {
+	    if {$prms_id} {
 		set message [concat $message "\t(PRMS $prms_id)"]
 	    }
 	}
 	FAIL {
 	    set exit_status 1
-	    if $prms_id {
+	    if {$prms_id} {
 		set message [concat $message "\t(PRMS $prms_id)"]
 	    }
 	}
@@ -753,7 +753,7 @@ proc record_test { type message args } {
 		set message [concat $message "\t(PRMS $kfail_prms)"]
 	    } elseif { $xfail_flag && $xfail_prms != 0 } {
 		set message [concat $message "\t(PRMS $xfail_prms)"]
-	    } elseif $prms_id {
+	    } elseif { $prms_id } {
 		set message [concat $message "\t(PRMS $prms_id)"]
 	    }
 	}
@@ -765,7 +765,7 @@ proc record_test { type message args } {
 		set message [concat $message "\t(PRMS $kfail_prms)"]
 	    } elseif { $xfail_flag && $xfail_prms != 0 } {
 		set message [concat $message "\t(PRMS $xfail_prms)"]
-	    } elseif $prms_id {
+	    } elseif { $prms_id } {
 		set message [concat $message "\t(PRMS $prms_id)"]
 	    }
 	}
@@ -776,7 +776,7 @@ proc record_test { type message args } {
 		set message [concat $message "\t(PRMS $kfail_prms)"]
 	    } elseif { $xfail_flag && $xfail_prms != 0 } {
 		set message [concat $message "\t(PRMS $xfail_prms)"]
-	    } elseif $prms_id {
+	    } elseif { $prms_id } {
 		set message [concat $message "\t(PRMS $prms_id)"]
 	    }
 	}
@@ -787,7 +787,7 @@ proc record_test { type message args } {
 	}
     }
 
-    if $bug_id {
+    if { $bug_id } {
 	set message [concat $message "\t(BUG $bug_id)"]
     }
 
@@ -833,9 +833,9 @@ proc pass { message } {
 	unset compiler_conditional_xfail_data
     }
 
-    if $kfail_flag {
+    if { $kfail_flag } {
 	record_test KPASS $message
-    } elseif $xfail_flag {
+    } elseif { $xfail_flag } {
 	record_test XPASS $message
     } else {
 	record_test PASS $message
@@ -855,9 +855,9 @@ proc fail { message } {
 	unset compiler_conditional_xfail_data
     }
 
-    if $kfail_flag {
+    if { $kfail_flag } {
 	record_test KFAIL $message
-    } elseif $xfail_flag {
+    } elseif { $xfail_flag } {
 	record_test XFAIL $message
     } else {
 	record_test FAIL $message
diff --git a/lib/libgloss.exp b/lib/libgloss.exp
index ed133e5..8c2be25 100644
--- a/lib/libgloss.exp
+++ b/lib/libgloss.exp
@@ -523,7 +523,7 @@ proc get_multilibs { args } {
     set lines [split [exec $compiler -dumpspecs] "\n"]
     for {set i 0} {$i <= [llength $lines] - 1} {incr i 1} {
 	if {"*multilib_matches:" == "[lindex $lines $i]"} {
-	    set multimatches [lindex $lines [expr $i + 1]]
+	    set multimatches [lindex $lines [expr {$i + 1}]]
 	    break
 	}
     }
diff --git a/lib/remote.exp b/lib/remote.exp
index dadbb65..24037ac 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -512,6 +512,7 @@ proc call_remote { type proc dest args } {
 	    global board
 
 	    if {[info exists board]} {
+		# FIXME: WTF?
 		blooie
 	    }
 	    load_board_description $dest
@@ -608,7 +609,7 @@ proc standard_transmit {dest file} {
             catch "close $fd"
             return -1
         }
-	set chars [expr $chars + ([string length $cur_line] * 10)]
+	set chars [expr {$chars + ([string length $cur_line] * 10)}]
 	if { $chars > $baud } {
 	    sleep 1
 	    set chars 0
@@ -744,7 +745,7 @@ proc unix_clean_filename { dest file } {
 	    continue
 	}
 	if { $x == ".." } {
-	    set rlen [expr [llength $result] - 2]
+	    set rlen [expr {[llength $result] - 2}]
 	    if { $rlen >= 0 } {
 		set result [lrange $result 0 $rlen]
 	    } else {
@@ -891,7 +892,7 @@ proc remote_load { dest prog args } {
 	    }
 	}
     }
-    if $empty {
+    if {$empty} {
 	global sum_program
 
 	if {[info exists sum_program]} {
@@ -1146,7 +1147,7 @@ proc check_for_board_status  { variable } {
 	if { $result == "" } {
 	    return $nomatch_return
 	} else {
-	    return [expr $result]
+	    return [expr {$result}]
 	}
     } else {
 	return $nomatch_return
@@ -1193,7 +1194,7 @@ proc remote_expect { board timeout args } {
 
 	if { $x == "-i" || $x == "-timeout" || $x == "-ex" } {
 	    append res "$x "
-	    set next [expr ${i}+1]
+	    set next [expr {$i + 1}]
 	    append res "[lrange $args $next $next]"
 	    incr i
 	    continue
@@ -1204,7 +1205,7 @@ proc remote_expect { board timeout args } {
 	}
 	if { $x == "-re" } {
 	    append res "${x} "
-	    set next [expr ${i}+1]
+	    set next [expr {$i + 1}]
 	    set y [lrange $args $next $next]
 	    append res "${y} "
 	    set got_re 1
diff --git a/lib/rsh.exp b/lib/rsh.exp
index 7c6472f..1c08788 100644
--- a/lib/rsh.exp
+++ b/lib/rsh.exp
@@ -288,5 +288,5 @@ proc rsh_exec { boardname cmd args } {
     # Delete one trailing \n because that is what `exec' will do and we want
     # to behave identical to it.
     regsub "\n$" $output "" output
-    return [list [expr $status != 0] $output]
+    return [list [expr {$status != 0}] $output]
 }