X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FHaddockParse.y;h=e3f45f9475e1cf543b2ba7db9f9110ed4ef34c83;hp=e23b4ee3c9f51e0d5760892379fecc63d6b49224;hb=1168a37f6bfad3d7025ecb21b9917799937936f3;hpb=536eaecd1071cfd25e0384b10ed9b72f98b21f46

diff --git a/compiler/parser/HaddockParse.y b/compiler/parser/HaddockParse.y
index e23b4ee..e3f45f9 100644
--- a/compiler/parser/HaddockParse.y
+++ b/compiler/parser/HaddockParse.y
@@ -6,7 +6,11 @@
 --     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
-module HaddockParse (parseHaddockParagraphs, parseHaddockString) where
+module HaddockParse (
+  parseHaddockParagraphs, 
+  parseHaddockString, 
+  MyEither(..)
+) where
 
 import {-# SOURCE #-} HaddockLex
 import HsSyn
@@ -31,7 +35,7 @@ import RdrName
 	PARA    { TokPara }
 	STRING	{ TokString $$ }
 
-%monad { Either String }
+%monad { MyEither String }
 
 %name parseHaddockParagraphs  doc
 %name parseHaddockString seq
@@ -94,16 +98,17 @@ strings  :: { String }
 	| STRING strings	{ $1 ++ $2 }
 
 {
-happyError :: [Token] -> Either String a
-happyError toks = 
---  Left ("parse error in doc string: "  ++ show (take 3 toks))
-  Left ("parse error in doc string")
-
--- Either monad (we can't use MonadError because GHC < 5.00 has
--- an older incompatible version).
-instance Monad (Either String) where
-	return        = Right
-	Left  l >>= _ = Left l
-	Right r >>= k = k r
-	fail msg      = Left msg
+happyError :: [Token] -> MyEither String a
+happyError toks = MyLeft ("parse error in doc string")
+
+-- We don't want to make an instance for Either String,
+-- since every user of the GHC API would get that instance
+
+data MyEither a b = MyLeft a | MyRight b
+
+instance Monad (MyEither String) where
+	return          = MyRight
+	MyLeft  l >>= _ = MyLeft l
+	MyRight r >>= k = k r
+	fail msg        = MyLeft msg
 }