untested and possibly incomplete patches for ghc7.10

UU-ComputerScience · Mar 31, 2015 · 4a95bd8 · 4a95bd8
1 parent 5622cd1
commit 4a95bd8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/src/UHC/Util/Lens.hs b/src/UHC/Util/Lens.hs
@@ -53,7 +53,7 @@ type Lens a b = a :-> b
 -- * Operator interface for composition
 
 infixl 9 ^*
--- | functional getter, which acts like a field accessor
+-- | composition
 (^*) :: (a :-> b) -> (b :-> c) -> (a :-> c)
 f1 ^* f2 = f2 . f1
 {-# INLINE (^*) #-}

diff --git a/src/UHC/Util/ParseUtils.hs b/src/UHC/Util/ParseUtils.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE RankNTypes, FlexibleContexts #-}
+{-# LANGUAGE RankNTypes, FlexibleContexts, CPP #-}
 
 module UHC.Util.ParseUtils
   ( -- * Specific parser types
@@ -27,6 +27,11 @@ module UHC.Util.ParseUtils
   )
   where
 
+#if __GLASGOW_HASKELL__ >= 710
+import Prelude hiding ( (<*>), (<*), (*>), (<$>), (<$) )
+#else
+#endif
+
 import qualified Data.Map as Map
 import Data.Maybe
 import UU.Parsing

diff --git a/src/UHC/Util/VarLookup.hs b/src/UHC/Util/VarLookup.hs
@@ -2,7 +2,11 @@
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE CPP #-}
+#if __GLASGOW_HASKELL__ >= 710
+#else
 {-# LANGUAGE OverlappingInstances #-}
+#endif
 
 module UHC.Util.VarLookup
 	( VarLookup (..)
@@ -79,11 +83,21 @@ infixr 7 |+>
 class VarLookupCmb m1 m2 where
   (|+>) :: m1 -> m2 -> m2
 
-instance VarLookupCmb m1 m2 => VarLookupCmb m1 [m2] where
-  m1 |+> (m2:m2s) = (m1 |+> m2) : m2s
-
-instance (VarLookupCmb m1 m1, VarLookupCmb m1 m2) => VarLookupCmb [m1] [m2] where
-  m1 |+> (m2:m2s) = (foldr1 (|+>) m1 |+> m2) : m2s
+#if __GLASGOW_HASKELL__ >= 710
+instance {-# OVERLAPPING #-}
+#else
+instance
+#endif
+  VarLookupCmb m1 m2 => VarLookupCmb m1 [m2] where
+    m1 |+> (m2:m2s) = (m1 |+> m2) : m2s
+
+#if __GLASGOW_HASKELL__ >= 710
+instance {-# OVERLAPPING #-}
+#else
+instance
+#endif
+  (VarLookupCmb m1 m1, VarLookupCmb m1 m2) => VarLookupCmb [m1] [m2] where
+    m1 |+> (m2:m2s) = (foldr1 (|+>) m1 |+> m2) : m2s
 
 class VarLookupBase m k v | m -> k v where
   varlookupEmpty :: m