diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs index 8f0c8b9f3..e25aea64d 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs @@ -310,11 +310,10 @@ makeAxiom :: Bare.Env -> Bare.TycEnv -> ModName -> LogicMap -> (LocSymbol, Maybe SpecType, Ghc.Var, Ghc.CoreExpr) -> (Ghc.Var, LocSpecType, F.Equation) -------------------------------------------------------------------------------- -makeAxiom env tycEnv name lmap (x, mbT, v, def) +makeAxiom env tycEnv _name lmap (x, mbT, v, def) = (v, t, e) where - t = Bare.qualifyTop env name (F.loc t0) t0 - (t0, e) = makeAssumeType allowTC embs lmap dm x mbT v def + (t, e) = makeAssumeType allowTC embs lmap dm x mbT v def embs = Bare.tcEmbs tycEnv dm = Bare.tcDataConMap tycEnv allowTC = typeclass (getConfig env) diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs index 372f283d9..ba01a207a 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs @@ -491,10 +491,6 @@ cookSpecTypeE env sigEnv name@(ModName _ _) x bt . fmap txExpToBind -- What does this function DO . (specExpandType rtEnv . fmap (generalizeWith x)) . (if doplug || not allowTC then maybePlug allowTC sigEnv name x else id) - -- we do not qualify/resolve Expr/Pred when typeclass is enabled - -- since ghci will not be able to recognize fully qualified names - -- instead, we leave qualification to ghc elaboration - . Bare.qualifyTop env name l allowTC = typeclass (getConfig env) -- modT = mname `S.member` wiredInMods @@ -509,7 +505,6 @@ cookSpecTypeE env sigEnv name@(ModName _ _) x bt rtEnv = Bare.sigRTEnv sigEnv embs = Bare.sigEmbs sigEnv tyi = Bare.sigTyRTyMap sigEnv - l = F.loc bt -- | We don't want to generalize type variables that maybe bound in the -- outer scope, e.g. see tests/basic/pos/LocalPlug00.hs