| 1 |
slyfox 15/08/01 15:45:57 |
| 2 |
|
| 3 |
Added: frown-0.6.1-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/frown/files/frown-0.6.1-ghc-7.10.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/frown/files/frown-0.6.1-ghc-7.10.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/frown/files/frown-0.6.1-ghc-7.10.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: frown-0.6.1-ghc-7.10.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/Base.lhs b/Base.lhs |
| 18 |
index c26e048..46c68de 100644 |
| 19 |
--- a/Base.lhs |
| 20 |
+++ b/Base.lhs |
| 21 |
@@ -38,3 +38,4 @@ |
| 22 |
> import Prettier |
| 23 |
-> import Control.Monad ( MonadPlus(..) ) |
| 24 |
+> import Control.Applicative |
| 25 |
+> import Control.Monad |
| 26 |
> import System.IO |
| 27 |
@@ -117,2 +118,9 @@ A simple exception monad. |
| 28 |
|
| 29 |
+> instance Functor Result where |
| 30 |
+> fmap = liftM |
| 31 |
+ |
| 32 |
+> instance Applicative Result where |
| 33 |
+> pure = return |
| 34 |
+> (<*>) = ap -- defined in Control.Monad |
| 35 |
+ |
| 36 |
> instance Monad Result where |
| 37 |
@@ -123,2 +131,6 @@ A simple exception monad. |
| 38 |
|
| 39 |
+> instance Alternative Result where |
| 40 |
+> (<|>) = mplus |
| 41 |
+> empty = mzero |
| 42 |
+ |
| 43 |
> instance MonadPlus Result where |
| 44 |
diff --git a/Compact.lhs b/Compact.lhs |
| 45 |
index 6886a6a..84f125c 100644 |
| 46 |
--- a/Compact.lhs |
| 47 |
+++ b/Compact.lhs |
| 48 |
@@ -54,3 +54,3 @@ |
| 49 |
> import Data.Maybe |
| 50 |
-> import Prelude hiding ( lookup ) |
| 51 |
+> import Prelude hiding ( lookup, (<$>) ) |
| 52 |
|
| 53 |
diff --git a/Convert.lhs b/Convert.lhs |
| 54 |
index 01d2c32..d31f437 100644 |
| 55 |
--- a/Convert.lhs |
| 56 |
+++ b/Convert.lhs |
| 57 |
@@ -235,2 +235,9 @@ Writer monad for collecting multiple error messages. |
| 58 |
|
| 59 |
+> instance Functor (Writer w) where |
| 60 |
+> fmap = liftM |
| 61 |
+ |
| 62 |
+> instance Applicative (Writer w) where |
| 63 |
+> pure = return |
| 64 |
+> (<*>) = ap -- defined in Control.Monad |
| 65 |
+ |
| 66 |
> instance Monad (Writer w) where |
| 67 |
diff --git a/GParser2.hs b/GParser2.hs |
| 68 |
index 0cb4c21..1597acc 100644 |
| 69 |
--- a/GParser2.hs |
| 70 |
+++ b/GParser2.hs |
| 71 |
@@ -41,2 +41,5 @@ |
| 72 |
where |
| 73 |
+ import Prelude hiding ((<$>)) |
| 74 |
+ import Control.Applicative hiding ((<$>)) |
| 75 |
+ import Control.Monad hiding ( guard ) |
| 76 |
import Lexer2 |
| 77 |
@@ -2130,3 +2133,10 @@ |
| 78 |
-> m Answer) } |
| 79 |
- |
| 80 |
+ |
| 81 |
+ instance (Monad m) => Functor (Lex m) where |
| 82 |
+ fmap = liftM |
| 83 |
+ |
| 84 |
+ instance (Monad m) => Applicative (Lex m) where |
| 85 |
+ pure = return |
| 86 |
+ (<*>) = ap -- defined in Control.Monad |
| 87 |
+ |
| 88 |
instance (Monad m) => Monad (Lex m) where |
| 89 |
diff --git a/GParser2.lg b/GParser2.lg |
| 90 |
index e036f8f..800e245 100644 |
| 91 |
--- a/GParser2.lg |
| 92 |
+++ b/GParser2.lg |
| 93 |
@@ -41,2 +41,5 @@ Compile me with |
| 94 |
> where |
| 95 |
+> import Prelude hiding ((<$>)) |
| 96 |
+> import Control.Applicative hiding ((<$>)) |
| 97 |
+> import Control.Monad hiding ( guard ) |
| 98 |
> import Lexer2 |
| 99 |
@@ -354,2 +357,10 @@ A continuation-based state monad. |
| 100 |
> |
| 101 |
+ |
| 102 |
+> instance (Monad m) => Functor (Lex m) where |
| 103 |
+> fmap = liftM |
| 104 |
+ |
| 105 |
+> instance (Monad m) => Applicative (Lex m) where |
| 106 |
+> pure = return |
| 107 |
+> (<*>) = ap -- defined in Control.Monad |
| 108 |
+ |
| 109 |
> instance (Monad m) => Monad (Lex m) where |
| 110 |
diff --git a/GVStack.lhs b/GVStack.lhs |
| 111 |
index acb5d96..3869493 100644 |
| 112 |
--- a/GVStack.lhs |
| 113 |
+++ b/GVStack.lhs |
| 114 |
@@ -51,3 +51,3 @@ |
| 115 |
> import Data.List ( maximumBy ) |
| 116 |
-> import Prelude hiding ( lookup ) |
| 117 |
+> import Prelude hiding ( lookup, (<$>) ) |
| 118 |
|
| 119 |
diff --git a/Lib/OrdUniqListSet.lhs b/Lib/OrdUniqListSet.lhs |
| 120 |
index ddb8629..decf65d 100644 |
| 121 |
--- a/Lib/OrdUniqListSet.lhs |
| 122 |
+++ b/Lib/OrdUniqListSet.lhs |
| 123 |
@@ -114,2 +114,6 @@ Yes, \tr{Set} is a functor and a monad. |
| 124 |
> |
| 125 |
+> instance Applicative Set where |
| 126 |
+> pure = return |
| 127 |
+> (<*>) = ap -- defined in Control.Monad |
| 128 |
+> |
| 129 |
> instance Monad Set where |
| 130 |
diff --git a/Stackless.lhs b/Stackless.lhs |
| 131 |
index 2fb1a97..dac8ef5 100644 |
| 132 |
--- a/Stackless.lhs |
| 133 |
+++ b/Stackless.lhs |
| 134 |
@@ -53,3 +53,3 @@ |
| 135 |
> import Control.Monad |
| 136 |
-> import Prelude hiding ( lookup ) |
| 137 |
+> import Prelude hiding ( lookup, (<$>) ) |
| 138 |
|
| 139 |
diff --git a/Standard.lhs b/Standard.lhs |
| 140 |
index 9fb5305..c3fcbb0 100644 |
| 141 |
--- a/Standard.lhs |
| 142 |
+++ b/Standard.lhs |
| 143 |
@@ -52,3 +52,3 @@ |
| 144 |
> import Data.Maybe |
| 145 |
-> import Prelude hiding ( lookup ) |
| 146 |
+> import Prelude hiding ( lookup, (<$>) ) |
Archives