Minor updates to contrib/x11/examples

diff --git a/contrib/x11/examples/automata.factor b/contrib/x11/examples/automata.factor
index 64fd037efeed2f6bbd9e348a541f644b754a89af..f5480b5bbbba411a4d2137ec7e51beb61da571ef 100644 (file)
--- a/contrib/x11/examples/automata.factor
+++ b/contrib/x11/examples/automata.factor
@@ -63,7 +63,8 @@ f initialize-x create-window win set
 
 : show-point ( { x y } p -- ) 1 = [ draw-point ] [ drop ] if ;
 
-: (show-line) ( { x y } line -- ) [ >r dup r> show-point { 1 0 } v+ ] each drop ;
+: (show-line) ( { x y } line -- )
+[ >r dup r> show-point { 1 0 } v+ ] each drop ;
 
 : show-line ( y line -- ) >r >r 0 r> 2array r> (show-line) ;
 
@@ -72,8 +73,8 @@ f initialize-x create-window win set
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : run-rule ( -- last-line ) clear-window
-0 random-line window-height [ drop 2dup show-line >r 1 + r> step-line ] each nip
-flush-dpy ;
+0 random-line window-height [ drop 2dup show-line >r 1 + r> step-line ]
+each nip flush-dpy ;
 
 : run-rule-wrapped ( -- last-line ) clear-window
 0 random-line 400 [ drop 2dup show-line >r 1 + r> step-line-wrapped ] each nip

diff --git a/contrib/x11/examples/boids.factor b/contrib/x11/examples/boids.factor
index 0c2529779c026412553dffe66336ccf5db2ab391..b5bbd4bf66b2fde520bf8076d5b4cef7cb179040 100644 (file)
--- a/contrib/x11/examples/boids.factor
+++ b/contrib/x11/examples/boids.factor
@@ -48,11 +48,9 @@ SYMBOL: time-slice   0.5 time-slice set-global
 ! : random-n ( n -- random-0-to-n-1 )
 !   1 - 0 swap random-int ;
 
-: random-pos ( -- pos )
-  world-size get [ random-int ] map ;
+: random-pos ( -- pos ) world-size get [ random-int ] map ;
 
-: random-vel ( -- vel )
-  2 >array [ drop -10 10 random-range ] map ;
+: random-vel ( -- vel ) 2 >array [ drop -10 10 random-range ] map ;
 
 : random-boid ( -- boid ) random-pos random-vel <boid> ;
 
@@ -63,7 +61,7 @@ SYMBOL: time-slice   0.5 time-slice set-global
 SYMBOL: boids
 
 : setup-window
-  ":0.0" initialize-x
+  f initialize-x
   create-window win set
   world-size get resize-window
   map-window
@@ -88,15 +86,13 @@ SYMBOL: boids
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: distance ( boid boid -- n )
-  boid-pos swap boid-pos v- norm ;
+: distance ( boid boid -- n ) boid-pos swap boid-pos v- norm ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : r->d ( radians -- degrees ) 180 * pi / ;
-  
-: constrain ( n a b -- n )
-  >r max r> min ;
+
+: constrain ( n a b -- n ) >r max r> min ;
 
 : angle-between ( vec vec -- angle )
   2dup >r >r
@@ -110,8 +106,7 @@ SYMBOL: boids
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: vsum ( vector-of-vectors --- vec )
-  { 0 0 } [ v+ ] reduce ;
+: vsum ( vector-of-vectors --- vec ) { 0 0 } [ v+ ] reduce ;
 
 : average-position ( boids -- pos )
   [ boid-pos ] map   dup >r   vsum   r>   length   v/n ;
@@ -126,8 +121,7 @@ SYMBOL: boids
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: within-radius? ( self other radius -- ? )
-  >r distance r> <= ;
+: within-radius? ( self other radius -- ? ) >r distance r> <= ;
 
 : within-view-angle? ( self other view-angle -- ? )
   >r relative-angle r> 2 / <= ;
@@ -253,25 +247,19 @@ SYMBOL: boids
   dup   1 world-size get nth   >=   [ drop 0 ] when
   dup   0 < [ drop 1 world-size get nth   1 - ] when ;
 
-: wrap-pos ( pos -- pos )
-  [ ] each
-  wrap-y swap wrap-x swap 2array ;
+: wrap-pos ( pos -- pos ) [ ] each wrap-y swap wrap-x swap 2array ;
 
-: iterate-boid ( self -- self )
-  dup >r new-pos wrap-pos r> new-vel <boid> ;
+: iterate-boid ( self -- self ) dup >r new-pos wrap-pos r> new-vel <boid> ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: iterate-boids ( -- )
-  boids get [ iterate-boid ] map boids set ;
+: iterate-boids ( -- ) boids get [ iterate-boid ] map boids set ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: draw-boids ( -- )
-  boids get [ draw-boid ] each flush-dpy ;
+: draw-boids ( -- ) boids get [ draw-boid ] each flush-dpy ;
 
-: run-boids ( -- )
-  iterate-boids clear-window draw-boids 1 sleep run-boids ;
+: run-boids ( -- ) iterate-boids clear-window draw-boids 1 sleep run-boids ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Comments from others: