Harmonize spelling

[factor.git] / extra / tetris / tetromino / tetromino.factor

diff --git a/extra/tetris/tetromino/tetromino.factor b/extra/tetris/tetromino/tetromino.factor
index 510daaec41085c5a6dde36b96cbcf11f5535b38d..8ef06eb173cd74d91091c64c3fbcfe20f591e86c 100644 (file)
--- a/extra/tetris/tetromino/tetromino.factor
+++ b/extra/tetris/tetromino/tetromino.factor
@@ -1,10 +1,11 @@
 ! Copyright (C) 2006, 2007, 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel arrays namespaces sequences math math.order
-math.vectors colors colors.constants random ;
+
+USING: colors math namespaces random sequences ;
+
 IN: tetris.tetromino
 
-TUPLE: tetromino states colour ;
+TUPLE: tetromino states color ;
 
 C: <tetromino> tetromino
 
@@ -14,7 +15,7 @@ SYMBOL: tetrominoes
   [
     { {
         { 0 0 } { 1 0 } { 2 0 } { 3 0 }
-      } 
+      }
       { { 0 0 }
         { 0 1 }
         { 0 2 }
@@ -60,7 +61,7 @@ SYMBOL: tetrominoes
       }
     } COLOR: orange
   ] [
-    { 
+    {
       { { 0 0 } { 1 0 } { 2 0 }
                         { 2 1 }
       } {
@@ -104,11 +105,10 @@ SYMBOL: tetrominoes
     tetrominoes get random ;
 
 : blocks-max ( blocks quot -- max )
-    map [ 1 + ] [ max ] map-reduce ; inline
+    map supremum 1 + ; inline
 
 : blocks-width ( blocks -- width )
     [ first ] blocks-max ;
 
 : blocks-height ( blocks -- height )
     [ second ] blocks-max ;
-