Merge pull request #77 from hvr/pr/cleanups

Various cleanups to remove warnings

src/Data/Ranged/RangedSet.hs

@@ -249,7 +249,7 @@ rSetUnfold bound upperFunc succFunc = RSet $ normalise $ ranges1 bound
 
 -- QuickCheck Generators
 
-instance (Arbitrary v, DiscreteOrdered v, Show v) =>
+instance (Arbitrary v, DiscreteOrdered v) =>
       Arbitrary (RSet v)
    where
    arbitrary = frequency [
@@ -266,7 +266,7 @@ instance (Arbitrary v, DiscreteOrdered v, Show v) =>
          rangeList (b1:b2:bs) = Range b1 b2 : rangeList bs
          rangeList _ = []
 
-instance (CoArbitrary v, DiscreteOrdered v, Show v) =>
+instance (CoArbitrary v, DiscreteOrdered v) =>
       CoArbitrary (RSet v)
    where
    coarbitrary (RSet ls) = variant (0 :: Int) . coarbitrary ls

src/Data/Ranged/Ranges.hs

@@ -215,7 +215,7 @@ rangeDifference r1@(Range lower1 upper1) (Range lower2 upper2) =
 
 -- QuickCheck generators
 
-instance (Arbitrary v,  DiscreteOrdered v, Show v) =>
+instance (Arbitrary v,  DiscreteOrdered v) =>
    Arbitrary (Range v) where
 
    arbitrary = frequency [
@@ -234,7 +234,7 @@ instance (Arbitrary v,  DiscreteOrdered v, Show v) =>
       (1, return fullRange)
       ]
 
-instance (CoArbitrary v, DiscreteOrdered v, Show v) =>
+instance (CoArbitrary v, DiscreteOrdered v) =>
    CoArbitrary (Range v) where
 
    coarbitrary (Range lower upper) =

src/Main.hs

@@ -173,7 +173,7 @@ alex cli file basename script = do
 
    -- Inject the tab size
    hPutStrLn out_h $ "alex_tab_size :: Int"
-   hPutStrLn out_h $ "alex_tab_size = " ++ show tab_size
+   hPutStrLn out_h $ "alex_tab_size = " ++ show (tab_size :: Int)
 
    let dfa = scanner2dfa encoding scanner_final scs
        min_dfa = minimizeDFA dfa

src/NFA.hs

@@ -169,11 +169,11 @@ instance Functor NFAM where
   fmap = liftM
 
 instance Applicative NFAM where
-  pure  = return
+  pure a = N $ \s n _ -> (s,n,a)
   (<*>) = ap
 
 instance Monad NFAM where
-  return a = N $ \s n _ -> (s,n,a)
+  return = pure
 
   m >>= k  = N $ \s n e -> case unN m s n e of
                                  (s', n', a) -> unN (k a) s' n' e

src/ParseMonad.hs

@@ -93,14 +93,14 @@ instance Functor P where
   fmap = liftM
 
 instance Applicative P where
-  pure  = return
+  pure a = P $ \env -> Right (env,a)
   (<*>) = ap
 
 instance Monad P where
  (P m) >>= k = P $ \env -> case m env of
                         Left err -> Left err
                         Right (env',ok) -> unP (k ok) env'
- return a = P $ \env -> Right (env,a)
+ return = pure
 
 runP :: String -> (Map String CharSet, Map String RExp) 
         -> P a -> Either ParseError a

templates/wrappers.hs

@@ -203,7 +203,7 @@ instance Monad Alex where
   m >>= k  = Alex $ \s -> case unAlex m s of 
                                 Left msg -> Left msg
                                 Right (s',a) -> unAlex (k a) s'
-  return a = Alex $ \s -> Right (s,a)
+  return = pure
 
 alexGetInput :: Alex AlexInput
 alexGetInput
@@ -302,14 +302,14 @@ instance Functor Alex where
   fmap f m = do x <- m; return (f x)
 
 instance Applicative Alex where
-  pure = return
+  pure a = Alex $ \s -> Right (s,a)
   (<*>) = Control.Monad.ap
 
 instance Monad Alex where
   m >>= k  = Alex $ \s -> case unAlex m s of 
                                 Left msg -> Left msg
                                 Right (s',a) -> unAlex (k a) s'
-  return a = Alex $ \s -> Right (s,a)
+  return = pure
 
 alexGetInput :: Alex AlexInput
 alexGetInput