4ecb53a · project-m36 · git.iko.soy

git.iko.soy/project-m36

squelch warnings surrounding Data.Monoid use and others

commit4ecb53a9d794a5121a43e8eb0959e6d5c0bfd9ef authorAgentM <agentm@themactionfaction.com> dateThu 4 Jul 2019, 00:11 (7 years ago) parent02fd571

21 files changed+45−9

compare with master

unifiedsplit

examples/blog.hs+3−1

@@ -1,5 +1,5 @@

11-- a simple example of a blog schema

2−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings #-}

2+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings, CPP #-}

44import ProjectM36.Client

55import ProjectM36.Base

@@ -17,7 +17,9 @@ import Data.Time.Clock

1717import Data.Time.Calendar

1818import Control.DeepSeq

1919import Data.Proxy

20+#if __GLASGOW_HASKELL__ < 804

2021import Data.Monoid

22+#endif

2123import Data.List

2224import Control.Monad (when, forM_)

2325

src/bin/TutorialD/Interpreter.hs+3−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE GADTs, LambdaCase #-}

1+{-# LANGUAGE GADTs, LambdaCase, CPP #-}

22module TutorialD.Interpreter where

33import TutorialD.Interpreter.Base

44import TutorialD.Interpreter.RODatabaseContextOperator

@@ -28,7 +28,9 @@ import System.Console.Haskeline

2828import System.Directory (getHomeDirectory)

2929import qualified Data.Text as T

3030import System.IO (hPutStrLn, stderr)

31+#if __GLASGOW_HASKELL__ < 804

3132import Data.Monoid

33+#endif

3234import Data.List (isPrefixOf)

3335import Control.Exception

3436import System.Exit

src/bin/TutorialD/Interpreter/Base.hs+2

@@ -35,7 +35,9 @@ import qualified Data.Text.IO as TIO

3535import System.IO

3636import ProjectM36.Relation.Show.Term

3737import GHC.Generics

38+#if __GLASGOW_HASKELL__ < 804

3839import Data.Monoid

40+#endif

3941import qualified Data.UUID as U

4042import Control.Monad.Random

4143import Data.List.NonEmpty as NE

src/bin/TutorialD/Interpreter/Export/Base.hs+3

@@ -1,7 +1,10 @@

1+{-# LANGUAGE CPP #-}

12module TutorialD.Interpreter.Export.Base where

23import ProjectM36.Base

34import ProjectM36.Error

5+#if __GLASGOW_HASKELL__ < 804

46import Data.Monoid

7+#endif

69data RelVarDataExportOperator = RelVarDataExportOperator RelationalExpr FilePath (RelVarDataExportOperator -> Relation -> IO (Maybe RelationalError))

710

src/bin/TutorialD/Interpreter/Import/Base.hs+3

@@ -1,7 +1,10 @@

1+{-# LANGUAGE CPP #-}

12module TutorialD.Interpreter.Import.Base where

23import ProjectM36.Base

34import ProjectM36.Error

5+#if __GLASGOW_HASKELL__ < 804

46import Data.Monoid

7+#endif

69-- | import data into a relation variable

710data RelVarDataImportOperator = RelVarDataImportOperator RelVarName FilePath (RelVarName -> TypeConstructorMapping -> Attributes -> FilePath -> IO (Either RelationalError DatabaseContextExpr))

src/bin/TutorialD/tutd.hs+2

@@ -7,7 +7,9 @@ import ProjectM36.Server

77import System.IO

88import Options.Applicative

99import System.Exit

10+#if __GLASGOW_HASKELL__ < 804

1011import Data.Monoid

12+#endif

1113import Data.Maybe

1214import qualified Data.Text as T

1315

src/bin/benchmark/Handles.hs+2

@@ -6,7 +6,9 @@ import Options.Applicative

66import TutorialD.Interpreter

77import TutorialD.Interpreter.Base hiding (Parser, option)

88import qualified Data.Text as T

9+#if __GLASGOW_HASKELL__ < 804

910import Data.Monoid

11+#endif

1012import Control.Monad

1113

1214data HandlesArgs = HandlesArgs {

src/bin/benchmark/bigrel.hs+3−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE FlexibleInstances #-}

1+{-# LANGUAGE FlexibleInstances, CPP #-}

22{-# OPTIONS_GHC -fno-warn-orphans #-}

33import ProjectM36.Base

44import ProjectM36.Relation

@@ -22,7 +22,9 @@ import System.IO

2222import Control.Monad.State

2323import Control.DeepSeq

2424import Data.Text hiding (map)

25+#if __GLASGOW_HASKELL__ < 804

2526import Data.Monoid

27+#endif

2628

2729{-

2830dumpcsv :: Relation -> IO ()

src/lib/ProjectM36/Atom.hs+2

@@ -3,7 +3,9 @@ import ProjectM36.Base

33import ProjectM36.Error

44import ProjectM36.DataTypes.Interval

55import qualified Data.Text as T

6+#if __GLASGOW_HASKELL__ < 804

67import Data.Monoid

8+#endif

810relationForAtom :: Atom -> Either RelationalError Relation

911relationForAtom (RelationAtom rel) = Right rel

src/lib/ProjectM36/Client.hs+1−2

@@ -1,4 +1,4 @@

1−{-# LANGUAGE DeriveAnyClass, DeriveGeneric, ScopedTypeVariables, BangPatterns, PackageImports #-}

1+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, ScopedTypeVariables, BangPatterns, MonoLocalBinds #-}

22{-|

33Module: ProjectM36.Client

@@ -163,7 +163,6 @@ import qualified STMContainers.Set as StmSet

163163import qualified ProjectM36.Session as Sess

164164import ProjectM36.Session

165165import ProjectM36.Sessions

166−import "list-t" ListT

167166import Data.Binary (Binary)

168167import GHC.Generics (Generic)

169168import Control.DeepSeq (force)

src/lib/ProjectM36/DataFrame.hs+2

@@ -18,7 +18,9 @@ import Data.Maybe

1818import qualified Data.Text as T

1919import Data.Binary

2020import Control.Arrow

21+#if __GLASGOW_HASKELL__ < 804

2122import Data.Monoid

23+#endif

2224

2325data AttributeOrderExpr = AttributeOrderExpr AttributeName Order deriving (Show, Generic, Binary)

2426data AttributeOrder = AttributeOrder AttributeName Order deriving (Show, Generic, Binary)

src/lib/ProjectM36/IsomorphicSchema.hs+2

@@ -14,7 +14,9 @@ import Data.Binary

1414import qualified Data.Map as M

1515import qualified Data.Set as S

1616import qualified Data.List as L

17+#if __GLASGOW_HASKELL__ < 804

1718import Data.Monoid

19+#endif

1820-- isomorphic schemas offer bi-directional functors between two schemas

1921

2022--TODO: note that renaming a relvar should alter any stored isomorphisms as well

src/lib/ProjectM36/Key.hs+2

@@ -2,7 +2,9 @@ module ProjectM36.Key where

22import ProjectM36.Base

33import ProjectM36.Relation

44import qualified Data.Set as S

5+#if __GLASGOW_HASKELL__ < 804

56import Data.Monoid

7+#endif

79{-

810keys can be implemented using inclusion dependencies as well: the count of the projection of the keys' attributes must be equal to the count of the tuples- p. 120 Database in Depth

src/lib/ProjectM36/Relation/Show/HTML.hs+2

@@ -8,7 +8,9 @@ import qualified Data.List as L

88import Data.Text (Text, pack)

99import qualified Data.Text as T

1010import qualified Data.Text.IO as TIO

11+#if __GLASGOW_HASKELL__ < 804

1112import Data.Monoid

13+#endif

1214import qualified Data.Vector as V

1315

1416attributesAsHTML :: Attributes -> Text

src/lib/ProjectM36/Relation/Show/Term.hs+2

@@ -9,7 +9,9 @@ import ProjectM36.Attribute hiding (null)

99import qualified Data.List as L

1010import qualified Data.Text as T

1111import Control.Arrow hiding (left)

12+#if __GLASGOW_HASKELL__ < 804

1213import Data.Monoid

14+#endif

1315import ProjectM36.WCWidth --guess the width that the character will appear as in the terminal

1416

1517boxV :: StringType

src/lib/ProjectM36/Server/EntryPoints.hs+1−1

@@ -1,9 +1,9 @@

1+{-# LANGUAGE MonoLocalBinds #-}

12module ProjectM36.Server.EntryPoints where

23import ProjectM36.Base hiding (inclusionDependencies)

34import ProjectM36.IsomorphicSchema

45import ProjectM36.Client as C

56import ProjectM36.Error

6−import ProjectM36.DataFrame

77import Control.Distributed.Process (Process, ProcessId)

88import Control.Distributed.Process.ManagedProcess (ProcessReply)

99import Control.Distributed.Process.ManagedProcess.Server (reply)

src/lib/ProjectM36/Server/ParseArgs.hs+2

@@ -3,7 +3,9 @@ import ProjectM36.Base

33import ProjectM36.Client

44import Options.Applicative

55import ProjectM36.Server.Config

6+#if __GLASGOW_HASKELL__ < 804

67import Data.Monoid

8+#endif

810parseArgsWithDefaults :: ServerConfig -> Parser ServerConfig

911parseArgsWithDefaults defaults = ServerConfig <$>

src/lib/ProjectM36/Sessions.hs−2

@@ -1,4 +1,3 @@

1−{-# LANGUAGE PackageImports #-}

21module ProjectM36.Sessions where

32import Control.Concurrent.STM

43#if MIN_VERSION_stm_containers(1,0,0)

@@ -8,7 +7,6 @@ import qualified StmContainers.Set as StmSet

87import qualified STMContainers.Map as StmMap

98import qualified STMContainers.Set as StmSet

109#endif

11−import "list-t" ListT

1210import ProjectM36.Attribute

1311import ProjectM36.Base

1412import ProjectM36.Session

src/lib/ProjectM36/TransactionGraph.hs+3−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}

1+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, CPP #-}

22module ProjectM36.TransactionGraph where

33import ProjectM36.Base

44import ProjectM36.Error

@@ -21,7 +21,9 @@ import qualified Data.Text as T

2121import GHC.Generics

2222import Data.Binary

2323import Data.Either (lefts, rights, isRight)

24+#if __GLASGOW_HASKELL__ < 804

2425import Data.Monoid

26+#endif

2527import Control.Arrow

2628import Data.Maybe

2729

src/lib/ProjectM36/TransactionGraph/Persist.hs+2

@@ -24,7 +24,9 @@ import Control.Exception.Base

2424import qualified Data.ByteString as BS

2525import qualified Data.Text.Encoding as TE

2626import Data.ByteString (ByteString)

27+#if __GLASGOW_HASKELL__ < 804

2728import Data.Monoid

29+#endif

2830import qualified Crypto.Hash.SHA256 as SHA256

2931import Control.Arrow

3032import Data.Time.Clock

src/lib/ProjectM36/Tupleable.hs+3

@@ -4,13 +4,16 @@

44{-# LANGUAGE ScopedTypeVariables #-}

55{-# LANGUAGE TypeOperators #-}

66{-# LANGUAGE UndecidableInstances #-}

7+{-# LANGUAGE CPP #-}

89module ProjectM36.Tupleable where

910

1011import Data.Foldable

1112import Data.List (partition)

1213import qualified Data.Map as Map

14+#if __GLASGOW_HASKELL__ < 804

1315import Data.Monoid

16+#endif

1417import Data.Proxy

1518import qualified Data.Text as T

1619import qualified Data.Vector as V