Skip to content

Update to use modern Haskell. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maacl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to use modern Haskell. #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dist-newstyle
16 changes: 9 additions & 7 deletions src/Observations.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,16 @@ unTEs (TEs x) = x
instance Functor TimedEvents where
fmap f (TEs tes) = TEs [ (t,f e) | (t,e) <- tes ]

instance Monoid a => Monoid (TimedEvents a) where
mempty = TEs []
mappend as bs =
fmap mappendMergeResult (mergeEvents as bs)
instance Semigroup a => Semigroup (TimedEvents a) where
as <> bs =
fmap mappendMergeResult (mergeEvents as bs)
where
mappendMergeResult (OnlyInLeft a) = a
mappendMergeResult (InBoth a b) = a `mappend` b
mappendMergeResult (OnlyInRight b) = b
mappendMergeResult (OnlyInLeft a) = a
mappendMergeResult (InBoth a b) = a <> b
mappendMergeResult (OnlyInRight b) = b

instance Semigroup a => Monoid (TimedEvents a) where
mempty = TEs []

-- mconcat = --TODO: optimise mconcat to do more balanced merges

Expand Down
4 changes: 2 additions & 2 deletions src/XmlUtils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import Text.XML.HaXml.Types (QName(..))
import Text.XML.HaXml.XmlContent
import Data.Time

attrStr :: Monad m => QName -> Element t -> m String
attrStr :: MonadFail m => QName -> Element t -> m String
attrStr n (Elem _ as _) =
case lookup n as of
Nothing -> fail ("expected attribute " ++ localName n)
Just av -> return (attr2str av)

attrRead :: (Read b, Monad m) => QName -> Element t -> m b
attrRead :: (Read b, MonadFail m) => QName -> Element t -> m b
attrRead n e = do
str <- attrStr n e
case reads str of
Expand Down