nuke some dead code

Author: MaximilianAlgehed

examples/Constrained/Examples/CheatSheet.hs

@@ -364,7 +364,7 @@ tightFit0 = constrained' $ \x y ->
 --         TypeSpec (Cartesian TrueSpec (MemberSpec [0])) []
 --         ---
 --         assert $ Equal (Fst (ToGeneric v_3)) v_1
---   Env {unEnv = fromList [(v_0,EnvValue 0)]}
+--   Env (fromList [(v_0,EnvValue 0)])
 -- genFromSpecT ErrorSpec{} with explanation:
 -- [1..-1]
 

src/Constrained/Base.hs

@@ -101,10 +101,6 @@ import Constrained.GenT
 import Constrained.Generic
 import Constrained.List hiding (toList)
 import Constrained.TypeErrors
-import Control.Monad.Writer (
-  Writer,
-  tell,
- )
 import Data.Foldable (
   toList,
  )
@@ -524,12 +520,6 @@ class
   alternateShow :: TypeSpec a -> BinaryShow
   alternateShow _ = NonBinary
 
-  monadConformsTo :: a -> TypeSpec a -> Writer [String] Bool
-  monadConformsTo x spec =
-    if conformsTo @a x spec
-      then pure True
-      else tell ["Fails by " ++ show spec] >> pure False
-
   -- | For some types (especially finite ones) there may be much better ways to construct
   --   a Specification than the default method of just adding a large 'bad' list to TypSpec. This
   --   function allows each HasSpec instance to decide.

src/Constrained/Conformance.hs

@@ -14,7 +14,6 @@ module Constrained.Conformance (
   conformsToSpec,
   conformsToSpecE,
   satisfies,
-  checkPred,
   checkPredsE,
 ) where
 
@@ -34,59 +33,9 @@ import Data.Semigroup (sconcat)
 import Prettyprinter hiding (cat)
 import Test.QuickCheck (Property, Testable, property)
 
--- =========================================================================
-
--- | Does the Pred evaluate to true under the given Env.
---   If it doesn't, some explanation appears in the failure of the monad 'm'
-checkPred :: forall m. MonadGenError m => Env -> Pred -> m Bool
-checkPred env = \case
-  p@(ElemPred bool term xs) -> do
-    v <- runTerm env term
-    case (elem v xs, bool) of
-      (True, True) -> pure True
-      (True, False) -> fatalErrorNE ("notElemPred reduces to True" :| [show p])
-      (False, True) -> fatalErrorNE ("elemPred reduces to False" :| [show p])
-      (False, False) -> pure True
-  Monitor {} -> pure True
-  Subst x t p -> checkPred env $ substitutePred x t p
-  Assert t -> runTerm env t
-  GenHint {} -> pure True
-  p@(Reifies t' t f) -> do
-    val <- runTerm env t
-    val' <- runTerm env t'
-    explainNE (NE.fromList ["Reification:", "  " ++ show p]) $ pure (f val == val')
-  ForAll t (x :-> p) -> do
-    set <- runTerm env t
-    and
-      <$> sequence
-        [ checkPred env' p
-        | v <- forAllToList set
-        , let env' = Env.extend x v env
-        ]
-  Case t bs -> do
-    v <- runTerm env t
-    runCaseOn v (mapList thing bs) (\x val ps -> checkPred (Env.extend x val env) ps)
-  When bt p -> do
-    b <- runTerm env bt
-    if b then checkPred env p else pure True
-  TruePred -> pure True
-  FalsePred es -> explainNE es $ pure False
-  DependsOn {} -> pure True
-  And ps -> checkPreds env ps
-  Let t (x :-> p) -> do
-    val <- runTerm env t
-    checkPred (Env.extend x val env) p
-  Exists k (x :-> p) -> do
-    a <- runGE $ k (errorGE . explain "checkPred: Exists" . runTerm env)
-    checkPred (Env.extend x a env) p
-  Explain es p -> explainNE es $ checkPred env p
-
-checkPreds :: (MonadGenError m, Traversable t) => Env -> t Pred -> m Bool
-checkPreds env ps = and <$> mapM (checkPred env) ps
-
 -- ==========================================================
 
--- | Like checkPred, But it takes [Pred] rather than a single Pred,
+-- | Like checkPredE, But it takes [Pred] rather than a single Pred,
 --   and it builds a much more involved explanation if it fails.
 --   Does the Pred evaluate to True under the given Env?
 --   If it doesn't, an involved explanation appears in the (Just message)
@@ -101,8 +50,9 @@ checkPredsE msgs env ps =
     [] -> Nothing
     (x : xs) -> Just (NE.nub (sconcat (x NE.:| xs)))
 
--- | An involved explanation for a single Pred
---   The most important explanations come when an assertion fails.
+-- | Does the Pred evaluate to true under the given Env. An involved
+-- explanation for a single Pred in case of failure and `Nothing` otherwise.
+-- The most important explanations come when an assertion fails.
 checkPredE :: Env -> NE.NonEmpty String -> Pred -> Maybe (NE.NonEmpty String)
 checkPredE env msgs = \case
   p@(ElemPred bool t xs) ->

src/Constrained/Env.hs

@@ -27,7 +27,7 @@ import Prettyprinter
 import Prelude hiding (lookup)
 
 -- | Typed environments for mapping @t`Var` a@ to @a@
-newtype Env = Env {unEnv :: Map EnvKey EnvValue}
+newtype Env = Env (Map EnvKey EnvValue)
   deriving newtype (Semigroup, Monoid)
   deriving stock (Show)
 

src/Constrained/Syntax.hs

@@ -51,9 +51,7 @@ module Constrained.Syntax (
   computeDependencies,
   solvableFrom,
   respecting,
-  dependency,
   applyNameHints,
-  envFromPred,
   isLit,
   mkCase,
   unBind,
@@ -742,46 +740,6 @@ runCaseOn s ((x :-> ps) :> bs@(_ :> _)) f = case s of
   SumLeft a -> f x a ps
   SumRight a -> runCaseOn a bs f
 
--- | Construct an environment for all variables that show up on the top level
--- (i.e. ones bound in `let` and `exists`) from an environment for all the free
--- variables in the pred. The environment you get out of this function is
--- _bigger_ than the environment you put in. From
--- ```
--- let y = x + 1 in let z = y + 1 in foo x y z
--- ```
--- and an environment with `{x -> 1}` you would get `{x -> 1, y -> 2, z -> 3}`
--- out.
-envFromPred :: Env -> Pred -> GE Env
-envFromPred env p = case p of
-  ElemPred _bool _term _xs -> pure env
-  -- NOTE: these don't bind anything
-  Assert {} -> pure env
-  DependsOn {} -> pure env
-  Monitor {} -> pure env
-  TruePred {} -> pure env
-  FalsePred {} -> pure env
-  GenHint {} -> pure env
-  -- NOTE: this is ok because the variables either come from an `Exists`, a `Let`, or from
-  -- the top level
-  Reifies {} -> pure env
-  -- NOTE: variables in here shouldn't escape to the top level
-  ForAll {} -> pure env
-  Case {} -> pure env
-  -- These can introduce binders that show up in the plan
-  When _ pp -> envFromPred env pp
-  Subst x a pp -> envFromPred env (substitutePred x a pp)
-  Let t (x :-> pp) -> do
-    v <- runTerm env t
-    envFromPred (Env.extend x v env) pp
-  Explain _ pp -> envFromPred env pp
-  Exists c (x :-> pp) -> do
-    v <- c (errorGE . explain "envFromPred: Exists" . runTerm env)
-    envFromPred (Env.extend x v env) pp
-  And [] -> pure env
-  And (pp : ps) -> do
-    env' <- envFromPred env pp
-    envFromPred env' (And ps)
-
 ------------------------------------------------------------------------
 -- Lifting name hints to binders
 ------------------------------------------------------------------------
@@ -834,10 +792,6 @@ applyNameHints spec = spec
 -- | `Graph` specialized to dependencies for variables
 type DependGraph = Graph.Graph Name
 
--- | A variable depends on a thing witha buch of other variables
-dependency :: HasVariables t => Name -> t -> DependGraph
-dependency x (freeVarSet -> xs) = Graph.dependency x xs
-
 -- | Everything to the left depends on everything from the right, except themselves
 irreflexiveDependencyOn ::
   forall t t'. (HasVariables t, HasVariables t') => t -> t' -> DependGraph