Don't reexport the SeqMap API

cryptol-remote-api/src/CryptolServer/Data/Expression.hs

@@ -31,12 +31,14 @@ import Numeric (showHex)
 import Cryptol.Backend.Monad
 import Cryptol.Backend.Concrete hiding (Concrete)
 import qualified Cryptol.Backend.Concrete as C
+import Cryptol.Backend.SeqMap (enumerateSeqMap)
 import Cryptol.Backend.WordValue (asWordVal)
 
 import Cryptol.Eval (evalSel)
 import Cryptol.Eval.Concrete (Value)
 import Cryptol.Eval.Type (TValue(..), tValTy)
-import Cryptol.Eval.Value (GenValue(..), enumerateSeqMap)
+import Cryptol.Eval.Value (GenValue(..))
+
 
 import Cryptol.Parser
 import Cryptol.Parser.AST (Bind(..), BindDef(..), Decl(..), Expr(..), Named(Named), TypeInst(NamedInst), Type(..), PName(..), Literal(..), NumInfo(..), Type,

src/Cryptol/Eval.hs

@@ -40,6 +40,7 @@ module Cryptol.Eval (
 import Cryptol.Backend
 import Cryptol.Backend.Concrete( Concrete(..) )
 import Cryptol.Backend.Monad
+import Cryptol.Backend.SeqMap
 import Cryptol.Backend.WordValue
 
 import Cryptol.Eval.Env

src/Cryptol/Eval/Value.hs

@@ -60,32 +60,9 @@ module Cryptol.Eval.Value
     -- ** Pretty printing
   , defaultPPOpts
   , ppValue
-
-    -- * Sequence Maps
-  , SeqMap
-  , indexSeqMap
-  , lookupSeqMap
-  , finiteSeqMap
-  , infiniteSeqMap
-  , enumerateSeqMap
-  , streamSeqMap
-  , reverseSeqMap
-  , updateSeqMap
-  , dropSeqMap
-  , concatSeqMap
-  , splitSeqMap
-  , memoMap
-  , delaySeqMap
-  , zipSeqMap
-  , mapSeqMap
-
     -- * Merge and if/then/else
   , iteValue
-  , mergeWord
   , mergeValue
-  , barrelShifter
-
-  , enumerateIntBits'
   ) where
 
 import Data.Ratio

src/Cryptol/REPL/Command.hs

@@ -65,6 +65,7 @@ import qualified Cryptol.Utils.Ident as M
 import qualified Cryptol.ModuleSystem.Env as M
 
 import qualified Cryptol.Backend.Monad as E
+import qualified Cryptol.Backend.SeqMap as E
 import           Cryptol.Eval.Concrete( Concrete(..) )
 import qualified Cryptol.Eval.Concrete as Concrete
 import qualified Cryptol.Eval.Env as E

src/Cryptol/Symbolic.hs

@@ -50,6 +50,7 @@ import qualified LibBF as FP
 
 import           Cryptol.Backend
 import           Cryptol.Backend.FloatHelpers(bfValue)
+import           Cryptol.Backend.SeqMap (finiteSeqMap)
 import           Cryptol.Backend.WordValue (wordVal)
 
 import qualified Cryptol.Eval.Concrete as Concrete

src/Cryptol/Testing/Random.hs

@@ -41,11 +41,11 @@ import Cryptol.Backend        (Backend(..), SRational(..))
 import Cryptol.Backend.FloatHelpers (floatFromBits)
 import Cryptol.Backend.Monad  (runEval,Eval,EvalErrorEx(..))
 import Cryptol.Backend.Concrete
+import Cryptol.Backend.SeqMap (indexSeqMap, finiteSeqMap)
 import Cryptol.Backend.WordValue (wordVal)
 
 import Cryptol.Eval.Type      (TValue(..))
-import Cryptol.Eval.Value     (GenValue(..), indexSeqMap,
-                               ppValue, defaultPPOpts, finiteSeqMap, fromVFun)
+import Cryptol.Eval.Value     (GenValue(..), ppValue, defaultPPOpts, fromVFun)
 import Cryptol.TypeCheck.Solver.InfNat (widthInteger)
 import Cryptol.Utils.Ident    (Ident)
 import Cryptol.Utils.Panic    (panic)