Various updates and style changes

Author: jtanguy

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Julien Tanguy
+Copyright (c) 2015, Julien Tanguy
 
 All rights reserved.
 

lib/Shogi/SFEN.hs

@@ -12,23 +12,23 @@ sfen :: Parser Game
 sfen = Game <$> (boardParser <* char ' ') <*> (color <* char ' ') <*> hand <*> optional (char ' ' *> natural) <* eof
 
 color :: Parser Color
-color = ((char 'B' *> pure Black)
-      <|> (char 'W' *> pure White))
+color = (char 'B' *> pure Black)
+    <|> (char 'W' *> pure White)
 
 hand :: Parser [Piece]
 hand = (char '-' *> pure [])
-     <|> (fmap concat (many pieces))
+    <|> fmap concat (many pieces)
 
 pieces :: Parser [Piece]
-pieces = replicate <$> (option 1 (num)) <*> piece
+pieces = replicate <$> option 1 num <*> piece
 
 boardParser :: Parser Board
-boardParser = (sepBy boardLine (char '/'))
+boardParser = sepBy boardLine (char '/')
 
 boardLine :: Parser [Square]
 boardLine = fmap concat $ many ( ((:[]). Just <$> piece) <|> emptySq )
   where
-    emptySq = (flip replicate Nothing) <$> num
+    emptySq = flip replicate Nothing <$> num
 
 num :: Parser Int
 num = fmap f $ oneOf "123456789"
@@ -54,22 +54,22 @@ gold :: Parser Piece
 gold = Gold . colored <$> oneOf "gG"
 
 rook :: Parser Piece
-rook = Rook <$> promoted <*> (fmap colored $ oneOf "rR")
+rook = Rook <$> promoted <*> fmap colored (oneOf "rR")
 
 bishop :: Parser Piece
-bishop = Bishop <$> promoted <*> (fmap colored $ oneOf "bB")
+bishop = Bishop <$> promoted <*> fmap colored (oneOf "bB")
 
 silver :: Parser Piece
-silver = Silver <$> promoted <*> (fmap colored $ oneOf "sS")
+silver = Silver <$> promoted <*> fmap colored (oneOf "sS")
 
 knight :: Parser Piece
-knight = Knight <$> promoted <*> (fmap colored $ oneOf "nN")
+knight = Knight <$> promoted <*> fmap colored (oneOf "nN")
 
 lance :: Parser Piece
-lance = Lance <$> promoted <*> (fmap colored $ oneOf "lL")
+lance = Lance <$> promoted <*> fmap colored (oneOf "lL")
 
 pawn :: Parser Piece
-pawn = Pawn <$> promoted <*> (fmap colored $ oneOf "pP")
+pawn = Pawn <$> promoted <*> fmap colored (oneOf "pP")
 
 -- ** Utility
 colored :: Char -> Color

shogi.cabal

@@ -21,11 +21,11 @@ library
                        , Shogi.SFEN
   -- other-modules:       
   -- other-extensions:    
-  build-depends:       base >=4.6 && <4.7
-                     , ansi-wl-pprint == 0.6.*
-                     , lens == 4.1.*
-                     , text == 0.11.*
-                     , transformers == 0.3.*
+  build-depends:       base >=4.6 && <4.8
+                     , ansi-wl-pprint >= 0.6
+                     , lens >= 4.1
+                     , text >= 0.11
+                     , transformers >= 0.3
                      , trifecta >= 1.4
   hs-source-dirs:      lib
   default-language:    Haskell2010
@@ -35,25 +35,25 @@ test-suite tests
   default-language:    Haskell2010
   main-is: TestSuite.hs
   hs-source-dirs: tests
-  build-depends:       base >=4.6 && <4.7
+  build-depends:       base >=4.6 && <4.8
                      , shogi
                      , trifecta >= 1.4
-                     , lens == 4.1.*
+                     , lens >= 4.1
                      , tasty      >= 0.4
                      , tasty-hunit >= 0.4
   Other-modules:
     Shogi.SFEN.Tests
 
 executable shogi
   main-is:             Main.hs
-  other-modules:       Game.UI
+  other-modules:       UI
   -- other-extensions:    
-  build-depends:       base >=4.6 && <4.7
-                     , ansi-wl-pprint == 0.6.*
-                     , lens == 4.1.*
-                     , ncurses == 0.2.*
-                     , text == 0.11.*
-                     , transformers == 0.3.*
+  build-depends:       base >=4.6 && <4.8
+                     , ansi-wl-pprint >= 0.6
+                     , lens >= 4.1
+                     , ncurses >= 0.2.8
+                     , text >= 0.11
+                     , transformers >= 0.3
                      , trifecta >= 1.4
                      , shogi
   hs-source-dirs:      src

src/Game/Util.hs

@@ -1,28 +1,25 @@
 
 module Main where
 
-import Control.Monad.Trans.RWS
 import Control.Monad.Trans.RWS
 import Data.Monoid
-import qualified Data.Text.IO as TIO
 import Text.PrettyPrint.ANSI.Leijen
 import Text.Trifecta (parseString, Result(..))
 import UI.NCurses
 
-import Shogi.Board
-import Shogi.Game
 import Shogi.SFEN
-import Game.UI
+import UI
 
--- initialSFEN = "lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL B -"
-initialSFEN = "7r1/6B1p/6Bsk/9/7P1/9/9/9/9 B 2S"
+initialSFEN :: String
+initialSFEN = "lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL B -"
+-- initialSFEN = "7r1/6B1p/6Bsk/9/7P1/9/9/9/9 B 2S"
 
 main :: IO ()
 main = case parseString sfen mempty initialSFEN of
     Failure xs -> putDoc xs
     Success g -> runCurses $ do
         setEcho False
         w <- defaultWindow
-        _ <- runRWST (mainLoop) w (UIState (g) (0,0))
+        _ <- runRWST mainLoop w (UIState g (0,0))
         return ()
 

src/Main.hs

@@ -1,5 +1,5 @@
 {-#LANGUAGE OverloadedStrings #-}
-module Game.UI where
+module UI where
 
 import Control.Lens
 import Control.Monad
@@ -10,7 +10,6 @@ import UI.NCurses
 
 import Shogi.Board
 import Shogi.Game
-import Game.Util
 
 data UIState = UIState { _game :: Game, _current :: (Integer,Integer)}
 
@@ -56,16 +55,16 @@ drawGame g = do
 updateBoard :: Board -> Update ()
 updateBoard b = forM_ [0..8] $ \i -> (forM_ [0..8] $ \j -> do
     moveCursor (2*i+2) (3*j+1)
-    drawText (showSq ((b!!(fromInteger i))!!(fromInteger j)))
+    drawText (showSq (b !! fromInteger i !! fromInteger j))
     )
 
 update :: RWST Window [Move] UIState Curses ()
 update = do
     w <- ask
-    g <- gets (view (game))
+    g <- gets (view game)
     (ci,cj) <- gets (view current)
     lift $ updateWindow w (drawGame g >> moveCursor (2*ci+2) (3*cj+2))
-    lift $ render
+    lift render
 
 mainLoop :: RWST Window [Move] UIState Curses ()
 mainLoop = loop where
@@ -80,10 +79,10 @@ mainLoop = loop where
                 ' ' -> modify (game.player %~ togglePlayer) >> loop
                 _ -> loop
             Just (EventSpecialKey k) -> case k of
-                KeyUpArrow	    -> modify (current %~ (mapFst $ inBounds . subtract 1)) >> loop
-                KeyDownArrow    -> modify (current %~ (mapFst $ inBounds . (1+))) >> loop
-                KeyLeftArrow	-> modify (current %~ (mapSnd $ inBounds . subtract 1)) >> loop
-                KeyRightArrow   -> modify (current %~ (mapSnd $ inBounds . (1+))) >> loop
+                KeyUpArrow	    -> modify (current . _1 %~ (inBounds . subtract 1)) >> loop
+                KeyDownArrow    -> modify (current . _1 %~ (inBounds . (1+))) >> loop
+                KeyLeftArrow	-> modify (current . _2 %~ (inBounds . subtract 1)) >> loop
+                KeyRightArrow   -> modify (current . _2 %~ (inBounds . (1+))) >> loop
                 _ -> loop
             _ -> loop
     inBounds = (`mod` 9) . (9+)