Using bounded

diff --git a/advent02/Main.hs b/advent02/Main.hs
index 9cb89cc02be4dc4faa67d1ec62aedc12ede4ec05..44a236173b398a9e5005ebb10c2be8f952f61eb0 100644 (file)
--- a/advent02/Main.hs
+++ b/advent02/Main.hs
@@ -6,7 +6,7 @@ import qualified Data.Text.IO as TIO
 import Data.Attoparsec.Text hiding (Result)
 import Control.Applicative
 
-data Shape = Rock | Paper | Scissors deriving (Show, Eq, Ord, Enum)
+data Shape = Rock | Paper | Scissors deriving (Show, Eq, Ord, Enum, Bounded)
 data Result = Loss | Draw | Win deriving (Show, Eq, Ord, Enum)
 data Round = Round Shape Shape deriving (Eq, Show)
 data ShapeResult = ShapeResult Shape Result deriving (Eq, Show)
@@ -55,7 +55,8 @@ scoreResult r = 3 * fromEnum r
 roundFromResult :: ShapeResult -> Round
 roundFromResult (ShapeResult shape result) = Round shape p2s
   where p2s = head [ p2Shape 
-                   | p2Shape <- [Rock .. Scissors]
+                   -- | p2Shape <- [Rock .. Scissors]
+                   | p2Shape <- [minBound .. maxBound]
                    , player2Result (Round shape p2Shape) == result
                    ]