Added braces to expressions.

1 files changed, 9 insertions, 8 deletions

diff --git a/library/demos/plot.tcl b/library/demos/plot.tcl
index a1109c2..011f140 100644
--- a/library/demos/plot.tcl
+++ b/library/demos/plot.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a canvas widget showing a 2-D
 # plot with data points that can be dragged with the mouse.
 #
-# RCS: @(#) $Id: plot.tcl,v 1.2 1998/09/14 18:23:29 stanton Exp $
+# RCS: @(#) $Id: plot.tcl,v 1.3 2001/06/14 10:56:58 dkf Exp $
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
@@ -38,20 +38,21 @@ $c create text 225 20 -text "A Simple Plot" -font $plotFont -fill brown
 for {set i 0} {$i <= 10} {incr i} {
     set x [expr {100 + ($i*30)}]
     $c create line $x 250 $x 245 -width 2
-    $c create text $x 254 -text [expr 10*$i] -anchor n -font $plotFont
+    $c create text $x 254 -text [expr {10*$i}] -anchor n -font $plotFont
 }
 for {set i 0} {$i <= 5} {incr i} {
     set y [expr {250 - ($i*40)}]
     $c create line 100 $y 105 $y -width 2
-    $c create text 96 $y -text [expr $i*50].0 -anchor e -font $plotFont
+    $c create text 96 $y -text [expr {$i*50}].0 -anchor e -font $plotFont
 }
 
-foreach point {{12 56} {20 94} {33 98} {32 120} {61 180}
-	{75 160} {98 223}} {
+foreach point {
+    {12 56} {20 94} {33 98} {32 120} {61 180} {75 160} {98 223}
+} {
     set x [expr {100 + (3*[lindex $point 0])}]
     set y [expr {250 - (4*[lindex $point 1])/5}]
-    set item [$c create oval [expr $x-6] [expr $y-6] \
-	    [expr $x+6] [expr $y+6] -width 1 -outline black \
+    set item [$c create oval [expr {$x-6}] [expr {$y-6}] \
+	    [expr {$x+6}] [expr {$y+6}] -width 1 -outline black \
 	    -fill SkyBlue2]
     $c addtag point withtag $item
 }
@@ -92,7 +93,7 @@ proc plotDown {w x y} {
 
 proc plotMove {w x y} {
     global plot
-    $w move selected [expr $x-$plot(lastX)] [expr $y-$plot(lastY)]
+    $w move selected [expr {$x-$plot(lastX)}] [expr {$y-$plot(lastY)}]
     set plot(lastX) $x
     set plot(lastY) $y
 }