[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
John Goerzen
jgoerzen at complete.org
Fri Apr 23 14:58:29 UTC 2010
The following commit has been merged in the master branch:
commit 4c4e357f04d251afc54f78419d1789ddbda1cc82
Author: John Goerzen <jgoerzen at complete.org>
Date: Tue May 3 01:06:03 2005 +0100
Imported new State monad code from Hsemail
diff --git a/MissingH/Hsemail/Rfc2821.hs b/MissingH/Hsemail/Rfc2821.hs
index d3b59b8..a3cc85f 100644
--- a/MissingH/Hsemail/Rfc2821.hs
+++ b/MissingH/Hsemail/Rfc2821.hs
@@ -1,7 +1,7 @@
{-# OPTIONS -fglasgow-exts #-}
{- |
Module : Text.ParserCombinators.Parsec.Rfc2821
- Copyright : (c) 2005-02-10 by Peter Simons
+ Copyright : (c) 2005-04-29 by Peter Simons
License : GPL2
Maintainer : simons at cryp.to
@@ -16,12 +16,7 @@
module MissingH.Hsemail.Rfc2821 where
import Control.Exception ( assert )
-#if __GLASGOW_HASKELL__ >= 630 || __HUGS__
-{- State is defined in Parsec on this platform and including
-Control.Monad.Date gives an error because it becomes ambiguous -}
-#else
import Control.Monad.State
-#endif
import Text.ParserCombinators.Parsec
import Text.ParserCombinators.Parsec.Error
import Data.List ( intersperse )
@@ -68,7 +63,7 @@ data Event
| Unrecognized String
deriving (Eq, Show)
-type SmtpdFSM = State SessionState Event
+type SmtpdFSM = Control.Monad.State.State SessionState Event
-- |Parse a line of SMTP dialogue and run 'handleSmtpCmd' to
-- determine the 'Event'. In case of syntax errors,
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list