Merge pull request #1 from abhin4v/remove-cpp

Removes CPP directives and uses base-compat package instead.

ringo-app/ringo-app.cabal

@@ -23,6 +23,7 @@ executable ringo
                        text                 >=1.2     && <1.3,
                        bytestring           >=0.10    && <0.11,
                        containers           >=0.5     && <0.6,
+                       base-compat          >=0.6     && <1.0,
                        optparse-applicative >=0.11    && <0.13,
                        yaml                 >=0.8.11  && <0.9,
                        vector               >=0.10    && <0.12,

ringo-app/src/Ringo/InputParser.hs

@@ -1,16 +1,12 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 
 module Ringo.InputParser (parseInput) where
 
 import qualified Data.Text as Text
 import qualified Data.Vector as V
 
-#if MIN_VERSION_base(4,8,0)
+import Prelude.Compat
-#else
-import Control.Applicative ((<$>), (<*>), pure)
-#endif
-
 import Data.Maybe       (fromMaybe)
 import Data.Vector      ((!), (!?))
 import Data.Yaml hiding (Null)

ringo/ringo.cabal

@@ -32,6 +32,7 @@ library
                        text           >=1.2 && <1.3,
                        containers     >=0.5 && <0.6,
                        mtl            >=2.1 && <2.3,
+                       base-compat    >=0.6 && <1.0,
                        raw-strings-qq >=1.0 && <1.2,
                        hssqlppp       ==0.6.0
   ghc-options:         -Wall -fwarn-incomplete-uni-patterns -fno-warn-unused-do-bind

ringo/src/Ringo/Extractor/Internal.hs

@@ -1,18 +1,15 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TupleSections #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+
 module Ringo.Extractor.Internal where
 
 import qualified Data.Map  as Map
 import qualified Data.Text as Text
 
-#if MIN_VERSION_base(4,8,0)
+import Prelude.Compat
-#else
-import Control.Applicative  ((<$>))
-#endif
-
 import Control.Monad.Reader (Reader, asks)
 import Data.Function        (on)
 import Data.Maybe           (mapMaybe, fromMaybe, fromJust, catMaybes)

ringo/src/Ringo/Generator/Create.hs

@@ -1,15 +1,11 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 
 module Ringo.Generator.Create (dimensionTableDefnSQL, factTableDefnSQL) where
 
-#if MIN_VERSION_base(4,8,0)
+import Prelude.Compat
-#else
-import Control.Applicative ((<$>))
-#endif
-
 import Control.Monad.Reader     (Reader, asks)
 import Database.HsSqlPpp.Syntax ( Statement(..), RowConstraint(..), AlterTableAction(..)
                                 , AlterTableOperation(..), Constraint(..), Cascade(..)

ringo/src/Ringo/Generator/Internal.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE GADTs #-}
+
 module Ringo.Generator.Internal where
 
 import qualified Data.Map as Map

ringo/src/Ringo/Generator/Populate/Dimension.hs

@@ -1,15 +1,11 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE GADTs #-}
 
 module Ringo.Generator.Populate.Dimension (dimensionTablePopulateSQL) where
 
-#if MIN_VERSION_base(4,8,0)
+import Prelude.Compat
-#else
-import Control.Applicative ((<$>))
-#endif
-
 import Control.Monad.Reader     (Reader, asks)
 import Database.HsSqlPpp.Syntax (Statement, QueryExpr(..), Distinct(..), makeSelect, JoinType(..))
 import Data.Maybe               (fromJust)

ringo/src/Ringo/Generator/Populate/Fact.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE GADTs #-}
@@ -10,11 +10,7 @@ module Ringo.Generator.Populate.Fact (factTablePopulateSQL) where
 
 import qualified Data.Text as Text
 
-#if MIN_VERSION_base(4,8,0)
+import Prelude.Compat
-#else
-import Control.Applicative ((<$>))
-#endif
-
 import Control.Monad.Reader     (Reader, asks)
 import Database.HsSqlPpp.Syntax ( QueryExpr(..), Statement, makeSelect
                                 , SelectList(..), SelectItem(..), JoinType(..) )

ringo/src/Ringo/Utils.hs

@@ -1,9 +1,11 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+
 module Ringo.Utils where
 
 import qualified Control.Arrow as Arrow
 
+import Prelude.Compat
 import Data.Maybe (mapMaybe)
 
 for :: [a] -> (a -> b) -> [b]
@@ -12,13 +14,8 @@ for = flip map
 forMaybe :: [a] -> (a -> Maybe b) -> [b]
 forMaybe = flip mapMaybe
 
-#if MIN_VERSION_base(4,8,0)
 concatFor :: (Foldable t) => t a -> (a -> [b]) -> [b]
 concatFor = flip concatMap
-#else
-concatFor :: [a] -> (a -> [b]) -> [b]
-concatFor = flip concatMap
-#endif
 
 infixr 3 ***, &&&
 

ringo/src/Ringo/Validator.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE PatternSynonyms #-}
 
@@ -9,11 +9,7 @@ module Ringo.Validator (validateEnv) where
 import qualified Data.Map as Map
 import qualified Data.Text as Text
 
-#if MIN_VERSION_base(4,8,0)
+import Prelude.Compat
-#else
-import Control.Applicative ((<$>))
-#endif
-
 import Control.Monad.Reader (Reader, ask, runReader)
 import Data.Function        (on)
 import Data.Maybe           (isJust, fromJust)