Gentoo Archives: gentoo-commits

From: "Sergei Trofimovich (slyfox)" <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-haskell/drift/files: drift-2.4.2-ghc-7.10.patch
Date: Sat, 01 Aug 2015 15:51:49
Message-Id: 20150801155142.BC8A411E@oystercatcher.gentoo.org
1 slyfox 15/08/01 15:51:42
2
3 Added: drift-2.4.2-ghc-7.10.patch
4 Log:
5 Port to ghc-7.10.
6
7 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
8
9 Revision Changes Path
10 1.1 dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch?rev=1.1&content-type=text/plain
14
15 Index: drift-2.4.2-ghc-7.10.patch
16 ===================================================================
17 diff --git a/src/ParseLib2.hs b/src/ParseLib2.hs
18 index 730e4be..a7406fa 100644
19 --- a/src/ParseLib2.hs
20 +++ b/src/ParseLib2.hs
21 @@ -34,2 +34,3 @@ module ParseLib2
22 import Data.Char
23 +import Control.Applicative hiding ( many )
24 import Control.Monad
25 @@ -49,2 +50,6 @@ instance Functor Parser where
26
27 +instance Applicative Parser where
28 + pure = return
29 + (<*>) = ap -- defined in Control.Monad
30 +
31 instance Monad Parser where
32 @@ -58,2 +63,6 @@ instance Monad Parser where
33
34 +instance Alternative Parser where
35 + (<|>) = mplus
36 + empty = mzero
37 +
38 instance MonadPlus Parser where