From 7c467a66bf44626c181c7a0b22224ce73af45d31 Mon Sep 17 00:00:00 2001 From: Tuowen Zhao Date: Sun, 22 May 2016 21:50:48 -0500 Subject: listen cal --- src/Mahjong/Set.hs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/Mahjong/Set.hs') diff --git a/src/Mahjong/Set.hs b/src/Mahjong/Set.hs index 4c3e799..31798e5 100644 --- a/src/Mahjong/Set.hs +++ b/src/Mahjong/Set.hs @@ -1,20 +1,19 @@ module Set where -import Pai +import Tile import Data.List (sort) import Data.Char (isDigit) import Data.Either -data MSet = MSet {getMSet:: [MCard]} +type MSet = [MTile] -instance Show MSet where - show xs = fst $ foldr f ("",Nothing) $ sort $ getMSet xs - where f (MCard col n) (o,p) = let o' = show n ++ (if Just col == p then "" - else show col) ++ o in (o', Just col) +showMSet xs = fst $ foldr f ("",Nothing) $ sort xs + where f (MTile col n) (o,p) = let o' = show n ++ (if Just col == p then "" + else show col) ++ o in (o', Just col) readMSet r = fst $ foldr f ([],Man) $ map g r where g x | isDigit x = Left ((read [x])::Int) | otherwise = Right ((read [x])::MCol) - f (Left a) (xs,col) = ((MCard col a):xs,col) + f (Left a) (xs,col) = ((MTile col a):xs,col) f (Right a) (xs,col) = (xs,a) -- cgit v1.2.3-70-g09d2