From 6a804970f3c9374b42733981e6a9089b4f38bed1 Mon Sep 17 00:00:00 2001 From: jpgarcia Date: Tue, 22 Jan 2019 01:40:54 -0300 Subject: [PATCH] now compiles with ghc 8.X (tested on 8.4.4) --- src/Pretty.lhs | 5 +++++ src/RuleUtils.hs | 2 ++ src/Rules/BitsBinary.hs | 1 + src/Rules/FunctorM.hs | 1 + src/Rules/Generic.hs | 2 +- src/Rules/Monoid.hs | 2 +- src/Rules/Standard.hs | 2 +- src/Rules/Xml.hs | 1 + 8 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Pretty.lhs b/src/Pretty.lhs index 5c929f2..dd851cc 100644 --- a/src/Pretty.lhs +++ b/src/Pretty.lhs @@ -175,8 +175,13 @@ module Pretty ( render, fullRender ) where + +import Prelude hiding ((<>)) + -- Don't import Util( assertPanic ) because it makes a loop in the module structure + + infixl 6 <> infixl 6 <+> infixl 5 $$, $+$ diff --git a/src/RuleUtils.hs b/src/RuleUtils.hs index 2e6155d..6b97f42 100644 --- a/src/RuleUtils.hs +++ b/src/RuleUtils.hs @@ -6,6 +6,8 @@ import Pretty import DataP (Statement(..),Data(..),Type(..),Name,Var,Class, Body(..),Constructor) +import Prelude hiding ((<>)) + -- Rule Declarations type Tag = String diff --git a/src/Rules/BitsBinary.hs b/src/Rules/BitsBinary.hs index 16410fd..de623b2 100644 --- a/src/Rules/BitsBinary.hs +++ b/src/Rules/BitsBinary.hs @@ -3,6 +3,7 @@ module Rules.BitsBinary(rules) where import Data.List (intersperse) import RuleUtils -- useful to have a look at this too +import Prelude hiding ((<>)) rules = [ ("BitsBinary", userRuleBinary, "Binary", "bit based binary encoding of terms", Nothing) diff --git a/src/Rules/FunctorM.hs b/src/Rules/FunctorM.hs index d157de8..b207cf6 100644 --- a/src/Rules/FunctorM.hs +++ b/src/Rules/FunctorM.hs @@ -3,6 +3,7 @@ module Rules.FunctorM (rules) where import Data.List import RuleUtils +import Prelude hiding ((<>)) rules = [ ("FunctorM", userRuleFunctorM, "Generics", "derive reasonable fmapM implementation", Nothing), diff --git a/src/Rules/Generic.hs b/src/Rules/Generic.hs index 3ca8e94..7350151 100644 --- a/src/Rules/Generic.hs +++ b/src/Rules/Generic.hs @@ -4,7 +4,7 @@ module Rules.Generic(rules) where -- import StandardRules import RuleUtils import Data.List(intersperse) - +import Prelude hiding ((<>)) rules :: [RuleDef] rules = [ diff --git a/src/Rules/Monoid.hs b/src/Rules/Monoid.hs index ca48a8d..97d5695 100644 --- a/src/Rules/Monoid.hs +++ b/src/Rules/Monoid.hs @@ -2,7 +2,7 @@ module Rules.Monoid (rules) where import RuleUtils - +import Prelude hiding ((<>)) rules = [ ("Monoid", userRuleMonoid, "Generics", "derive reasonable Data.Monoid implementation", Nothing) ] diff --git a/src/Rules/Standard.hs b/src/Rules/Standard.hs index a8b85d8..6ac5d2a 100644 --- a/src/Rules/Standard.hs +++ b/src/Rules/Standard.hs @@ -3,7 +3,7 @@ module Rules.Standard(rules) where import RuleUtils import Data.List import GenUtil - +import Prelude hiding ((<>)) --- Add Rules Below Here ---------------------------------------------------- diff --git a/src/Rules/Xml.hs b/src/Rules/Xml.hs index 6faa31f..1e8a94c 100644 --- a/src/Rules/Xml.hs +++ b/src/Rules/Xml.hs @@ -3,6 +3,7 @@ module Rules.Xml(rules) where import Data.List (nub,sortBy) import RuleUtils -- useful to have a look at this too +import Prelude hiding ((<>)) rules :: [RuleDef] rules =