[gentoo-commits] gentoo-x86 commit in dev-haskell/options/files: options-1.2.1-ghc-7.10.patch

[Mark Wright (gienah)]

gienah      15/01/01 13:19:02

  Added:                options-1.2.1-ghc-7.10.patch
  Log:
  Bump options to 1.2.1, patch for ghc 7.10
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

Revision  Changes    Path
1.1                  dev-haskell/options/files/options-1.2.1-ghc-7.10.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/options/files/options-1.2.1-ghc-7.10.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/options/files/options-1.2.1-ghc-7.10.patch?rev=1.1&content-type=text/plain

Index: options-1.2.1-ghc-7.10.patch
===================================================================
--- options-1.2.1-orig/lib/Options/Tokenize.hs	2014-12-14 16:34:53.000000000 +1100
+++ options-1.2.1/lib/Options/Tokenize.hs	2015-01-02 00:14:05.390013340 +1100
@@ -11,6 +11,7 @@
 	, tokenize
 	) where
 
+import           Control.Applicative
 import           Control.Monad.Error hiding (throwError)
 import qualified Control.Monad.Error
 import           Control.Monad.State
@@ -53,6 +54,13 @@
 
 newtype Tok a = Tok { unTok :: ErrorT String (StateT TokState Identity) a }
 
+instance Functor Tok where
+    fmap  = liftM
+
+instance Applicative Tok where
+    pure  = return
+    (<*>) = ap
+
 instance Monad Tok where
 	return = Tok . return
 	m >>= f = Tok (unTok m >>= unTok . f)