Update the Hangman game from ch13

Author: dwayne

ch13/hangman/LICENSE

@@ -1,4 +1,4 @@
-Copyright Author name here (c) 2016
+Copyright Dwayne Crooks (c) 2017
 
 All rights reserved.
 
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
       disclaimer in the documentation and/or other materials provided
       with the distribution.
 
-    * Neither the name of Author name here nor the names of other
+    * Neither the name of Dwayne Crooks nor the names of other
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 

ch13/hangman/README.md

@@ -0,0 +1 @@
+# hangman

ch13/hangman/hangman.cabal

@@ -1,22 +1,22 @@
 name:                hangman
 version:             0.1.0.0
 synopsis:            Playing Hangman
-description:         Please see README.md
-homepage:            https://github.com/dwayne/hangman
+homepage:            https://github.com/dwayne/hangman#readme
 license:             BSD3
 license-file:        LICENSE
 author:              Dwayne Crooks
 maintainer:          me@dwaynecrooks.com
-copyright:           2016 Dwayne Crooks
+copyright:           2017 Dwayne Crooks
 category:            Game
 build-type:          Simple
-extra-source-files:  data/dict.txt
 cabal-version:       >=1.10
+extra-source-files:  README.md
+                   , data/dict.txt
 
 executable hangman
   hs-source-dirs:      src
   main-is:             Main.hs
   default-language:    Haskell2010
   build-depends:       base >= 4.7 && < 5
-                     , random == 1.1
-                     , split == 0.2.3
+                     , random
+                     , split

ch13/hangman/src/Main.hs

@@ -5,80 +5,87 @@ import Data.Char (toLower)
 import Data.Maybe (isJust)
 import Data.List (intersperse)
 import System.Exit (exitSuccess)
+import System.IO
+
 import System.Random (randomRIO)
 
-main :: IO ()
-main = do
-  word <- randomWord'
-  let puzzle = freshPuzzle (fmap toLower word)
-  runGame puzzle
 
 type WordList = [String]
 
+
 allWords :: IO WordList
 allWords = do
   dict <- readFile "data/dict.txt"
   return (lines dict)
 
+
 minWordLength :: Int
 minWordLength = 5
 
+
 maxWordLength :: Int
 maxWordLength = 9
 
+
 gameWords :: IO WordList
 gameWords = do
   aw <- allWords
-  return $ filter gameLength aw
-  where gameLength w =
-          let l = length (w :: String)
-          in  l > minWordLength && l < maxWordLength
+  return (filter gameLength aw)
+  where
+    gameLength w =
+      let
+        l = length (w :: String)
+      in
+        l > minWordLength && l < maxWordLength
+
 
 randomWord :: WordList -> IO String
 randomWord wl = do
   randomIndex <- randomRIO (0, length wl - 1)
   return $ wl !! randomIndex
 
+
 randomWord' :: IO String
 randomWord' = gameWords >>= randomWord
 
+
 data Puzzle = Puzzle String [Maybe Char] [Char]
--- the word we're trying to guess
--- the characters we've filled in so far
--- the letters we've guessed so far
+
 
 instance Show Puzzle where
   show (Puzzle _ discovered guessed) =
     (intersperse ' ' $ fmap renderPuzzleChar discovered)
     ++ " Guessed so far: " ++ guessed
 
-renderPuzzleChar :: Maybe Char -> Char
-renderPuzzleChar = maybe '_' id
 
 freshPuzzle :: String -> Puzzle
-freshPuzzle word = Puzzle word discovered []
-  where discovered = fmap (const Nothing) word
+freshPuzzle w = Puzzle w (map (const Nothing) w) []
+
 
 charInWord :: Puzzle -> Char -> Bool
 charInWord (Puzzle word _ _) c = elem c word
 
+
 alreadyGuessed :: Puzzle -> Char -> Bool
 alreadyGuessed (Puzzle _ _ guessed) c = elem c guessed
 
+
+renderPuzzleChar :: Maybe Char -> Char
+renderPuzzleChar Nothing  = '_'
+renderPuzzleChar (Just c) = c
+
+
 fillInCharacter :: Puzzle -> Char -> Puzzle
-fillInCharacter (Puzzle word fillInSoFar s) c =
+fillInCharacter (Puzzle word filledInSoFar s) c =
   Puzzle word newFilledInSoFar (c : s)
   where
     zipper guessed wordChar guessChar =
-      if wordChar == guessed then Just wordChar else guessChar
+      if wordChar == guessed
+      then Just wordChar
+      else guessChar
 
-    newFilledInSoFar =
-      zipWith (zipper c) word fillInSoFar
+    newFilledInSoFar = zipWith (zipper c) word filledInSoFar
 
-    -- For e.g. let c = 'h', word = "his", filledInSoFar = [Nothing, Just 'i', Nothing]
-    -- then zipper 'h' 'h' Nothing  = Just 'h'
-    --      zipper 'h' 'i' Just 'i' = Just 'i'
-    --      zipper 'h' 's' Nothing  = Nothing
 
 handleGuess :: Puzzle -> Char -> IO Puzzle
 handleGuess puzzle guess = do
@@ -87,29 +94,34 @@ handleGuess puzzle guess = do
     (_, True) -> do
       putStrLn "You already guessed that character, pick something else!"
       return puzzle
-
     (True, _) -> do
       putStrLn "This character was in the word, filling in the word accordingly."
       return (fillInCharacter puzzle guess)
-
     (False, _) -> do
       putStrLn "This character wasn't in the word, try again."
       return (fillInCharacter puzzle guess)
 
+
 gameOver :: Puzzle -> IO ()
 gameOver (Puzzle wordToGuess _ guessed) =
-  if (length guessed) > 7 then
-    do putStrLn "You lose!"
-       putStrLn $ "The word was: " ++ wordToGuess
-       exitSuccess
-  else return ()
+  if (length guessed) > 7
+  then do
+    putStrLn "You lose!"
+    putStrLn $ "The word was: " ++ wordToGuess
+    exitSuccess
+  else
+    return ()
+
 
 gameWin :: Puzzle -> IO ()
 gameWin (Puzzle _ filledInSoFar _) =
-  if all isJust filledInSoFar then
-    do putStrLn "You win!"
-       exitSuccess
-  else return ()
+  if all isJust filledInSoFar
+  then do
+    putStrLn "You win!"
+    exitSuccess
+  else
+    return ()
+
 
 runGame :: Puzzle -> IO ()
 runGame puzzle = forever $ do
@@ -121,3 +133,11 @@ runGame puzzle = forever $ do
   case guess of
     [c] -> handleGuess puzzle c >>= runGame
     _   -> putStrLn "Your guess must be a single character."
+
+
+main :: IO ()
+main = do
+  hSetBuffering stdout NoBuffering
+  word <- randomWord'
+  let puzzle = freshPuzzle (fmap toLower word)
+  runGame puzzle

ch13/hangman/stack.yaml

@@ -1,25 +1,25 @@
 # This file was automatically generated by 'stack init'
-# 
+#
 # Some commonly used options have been documented as comments in this file.
 # For advanced use and comprehensive documentation of the format, please see:
 # http://docs.haskellstack.org/en/stable/yaml_configuration/
 
 # Resolver to choose a 'specific' stackage snapshot or a compiler version.
 # A snapshot resolver dictates the compiler version and the set of packages
 # to be used for project dependencies. For example:
-# 
+#
 # resolver: lts-3.5
 # resolver: nightly-2015-09-21
 # resolver: ghc-7.10.2
 # resolver: ghcjs-0.1.0_ghc-7.10.2
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-5.15
+resolver: lts-8.2
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
-# 
+#
 # packages:
 # - some-directory
 # - https://example.com/foo/bar/baz-0.0.2.tar.gz
@@ -31,7 +31,7 @@ resolver: lts-5.15
 #  subdirs:
 #  - auto-update
 #  - wai
-# 
+#
 # A package marked 'extra-dep: true' will only be built if demanded by a
 # non-dependency (i.e. a user package), and its test suites and benchmarks
 # will not be run. This is useful for tweaking upstream packages.
@@ -49,18 +49,18 @@ extra-package-dbs: []
 
 # Control whether we use the GHC we find on the path
 # system-ghc: true
-# 
+#
 # Require a specific version of stack, using version ranges
 # require-stack-version: -any # Default
-# require-stack-version: ">=1.1"
-# 
+# require-stack-version: ">=1.3"
+#
 # Override the architecture used by stack, especially useful on Windows
 # arch: i386
 # arch: x86_64
-# 
+#
 # Extra directories used by stack for building
 # extra-include-dirs: [/path/to/dir]
 # extra-lib-dirs: [/path/to/dir]
-# 
+#
 # Allow a newer minor version of GHC than the snapshot specifies
 # compiler-check: newer-minor