From 77c69efe8d17e3dbbfd51c94bdf99887134b1046 Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Tue, 11 Aug 2015 17:11:11 -0700 Subject: [PATCH 1/2] Add the CPP pragma --- src/Cryptol/Parser/AST.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Cryptol/Parser/AST.hs b/src/Cryptol/Parser/AST.hs index 795954e1..da07e2a5 100644 --- a/src/Cryptol/Parser/AST.hs +++ b/src/Cryptol/Parser/AST.hs @@ -6,6 +6,7 @@ -- Stability : provisional -- Portability : portable +{-# LANGUAGE CPP #-} {-# LANGUAGE Safe #-} {-# LANGUAGE PatternGuards #-} {-# LANGUAGE RecordWildCards #-} From 579b129c2fae4b32c413ce7f8e145a395016f73e Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Tue, 11 Aug 2015 17:16:57 -0700 Subject: [PATCH 2/2] Only import Traversable in < ghc 7.10 --- src/Cryptol/Eval.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cryptol/Eval.hs b/src/Cryptol/Eval.hs index 68ffa19d..97639e3c 100644 --- a/src/Cryptol/Eval.hs +++ b/src/Cryptol/Eval.hs @@ -29,11 +29,11 @@ import Cryptol.Utils.PP import Cryptol.Prims.Eval import qualified Data.Map as Map -import Data.Traversable (sequenceA) #if __GLASGOW_HASKELL__ < 710 import Control.Applicative (Applicative(..)) import Data.Monoid (Monoid(..),mconcat) +import Data.Traversable (sequenceA) #endif -- Expression Evaluation -------------------------------------------------------