Eq and Ord have moved into GHC.Classes

[ghc-base.git] / Data / Generics / Text.hs

diff --git a/Data/Generics/Text.hs b/Data/Generics/Text.hs
index 1ad767f..0137c36 100644 (file)
--- a/Data/Generics/Text.hs
+++ b/Data/Generics/Text.hs
@@ -6,7 +6,7 @@
 -- 
 -- Maintainer  :  libraries@haskell.org
 -- Stability   :  experimental
--- Portability :  non-portable
+-- Portability :  non-portable (uses Data.Generics.Basics)
 --
 -- \"Scrap your boilerplate\" --- Generic programming in Haskell 
 -- See <http://www.cs.vu.nl/boilerplate/>. The present module provides
@@ -14,10 +14,10 @@
 --
 -----------------------------------------------------------------------------
 
-module Data.Generics.Text ( 
+module Data.Generics.Text (
 
-       gshow,
-       gread
+        gshow,
+        gread
 
  ) where
 
@@ -68,7 +68,7 @@ gread = readP_to_S gread'
  where
 
   -- Helper for recursive read
-  gread' :: Data a => ReadP a
+  gread' :: Data a' => ReadP a'
   gread' = allButString `extR` stringCase
 
    where
@@ -80,45 +80,45 @@ gread = readP_to_S gread'
     -- Determine result type
     myDataType = dataTypeOf (getArg allButString)
      where
-      getArg :: ReadP a -> a
+      getArg :: ReadP a'' -> a''
       getArg = undefined
 
     -- The generic default for gread
     allButString =
       do
-               -- Drop "  (  "
-         skipSpaces                    -- Discard leading space
-         char '('                      -- Parse '('
-         skipSpaces                    -- Discard following space
-
-               -- Do the real work
-        str  <- parseConstr            -- Get a lexeme for the constructor
-         con  <- str2con str           -- Convert it to a Constr (may fail)
+                -- Drop "  (  "
+         skipSpaces                     -- Discard leading space
+         char '('                       -- Parse '('
+         skipSpaces                     -- Discard following space
+
+                -- Do the real work
+         str  <- parseConstr            -- Get a lexeme for the constructor
+         con  <- str2con str            -- Convert it to a Constr (may fail)
          x    <- fromConstrM gread' con -- Read the children
 
-               -- Drop "  )  "
-         skipSpaces                    -- Discard leading space
-         char ')'                      -- Parse ')'
-         skipSpaces                    -- Discard following space
+                -- Drop "  )  "
+         skipSpaces                     -- Discard leading space
+         char ')'                       -- Parse ')'
+         skipSpaces                     -- Discard following space
 
          return x
 
     -- Turn string into constructor driven by the requested result type,
     -- failing in the monad if it isn't a constructor of this data type
-    str2con :: String -> ReadP Constr  
+    str2con :: String -> ReadP Constr
     str2con = maybe mzero return
             . readConstr myDataType
 
     -- Get a Constr's string at the front of an input string
     parseConstr :: ReadP String
-    parseConstr =  
+    parseConstr =
                string "[]"     -- Compound lexeme "[]"
-          <++  infixOp        -- Infix operator in parantheses
+          <++  infixOp         -- Infix operator in parantheses
           <++  readS_to_P lex  -- Ordinary constructors and literals
 
     -- Handle infix operators such as (:)
     infixOp :: ReadP String
     infixOp = do c1  <- char '('
                  str <- munch1 (not . (==) ')')
-                c2  <- char ')'
+                 c2  <- char ')'
                  return $ [c1] ++ str ++ [c2]