From 97dee59731e610fc78f08a183bd1ad010674a772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Tue, 19 Sep 2023 11:01:04 -0300 Subject: [PATCH] Move files from src-ghc to src when they depend on Language.Haskell.Liquid.* --- .hlint.yaml | 9 ++++----- README.md | 6 +++--- liquidhaskell-boot/liquidhaskell-boot.cabal | 16 ++++++++-------- .../src/Language/Haskell/Liquid/Bare.hs | 4 ++-- .../src/Language/Haskell/Liquid/Bare/Axiom.hs | 4 ++-- .../src/Language/Haskell/Liquid/Bare/Check.hs | 4 ++-- .../src/Language/Haskell/Liquid/Bare/Class.hs | 2 +- .../src/Language/Haskell/Liquid/Bare/DataType.hs | 2 +- .../Language/Haskell/Liquid/Bare/Elaborate.hs | 2 +- .../src/Language/Haskell/Liquid/Bare/Expand.hs | 2 +- .../src/Language/Haskell/Liquid/Bare/Laws.hs | 2 +- .../src/Language/Haskell/Liquid/Bare/Measure.hs | 2 +- .../src/Language/Haskell/Liquid/Bare/Misc.hs | 2 +- .../src/Language/Haskell/Liquid/Bare/Plugged.hs | 4 ++-- .../src/Language/Haskell/Liquid/Bare/Resolve.hs | 2 +- .../src/Language/Haskell/Liquid/Bare/ToBare.hs | 2 +- .../Language/Haskell/Liquid/Bare/Typeclass.hs | 2 +- .../src/Language/Haskell/Liquid/Bare/Types.hs | 2 +- .../Language/Haskell/Liquid/Constraint/Env.hs | 2 +- .../Language/Haskell/Liquid/Constraint/Fresh.hs | 2 +- .../Haskell/Liquid/Constraint/Generate.hs | 6 +++--- .../Language/Haskell/Liquid/Constraint/Init.hs | 4 ++-- .../Language/Haskell/Liquid/Constraint/Monad.hs | 2 +- .../Haskell/Liquid/Constraint/Qualifier.hs | 2 +- .../Haskell/Liquid/Constraint/Relational.hs | 8 ++++---- .../Haskell/Liquid/Constraint/Termination.hs | 2 +- .../Haskell/Liquid/Constraint/ToFixpoint.hs | 2 +- .../Language/Haskell/Liquid/Constraint/Types.hs | 2 +- .../Language/Haskell}/Liquid/GHC/Interface.hs | 8 ++++---- .../Language/Haskell}/Liquid/GHC/Logging.hs | 2 +- .../Language/Haskell}/Liquid/GHC/Misc.hs | 2 +- .../Language/Haskell}/Liquid/GHC/Play.hs | 4 ++-- .../src/Language/Haskell/Liquid/GHC/Plugin.hs | 8 ++++---- .../Language/Haskell/Liquid/GHC/Plugin/Types.hs | 4 ++-- .../Language/Haskell}/Liquid/GHC/Resugar.hs | 4 ++-- .../Language/Haskell}/Liquid/GHC/SpanStack.hs | 4 ++-- .../Language/Haskell}/Liquid/GHC/TypeRep.hs | 4 ++-- .../Language/Haskell}/Liquid/GHC/Types.hs | 2 +- .../src/Language/Haskell/Liquid/Liquid.hs | 4 ++-- .../src/Language/Haskell/Liquid/Measure.hs | 2 +- .../src/Language/Haskell/Liquid/Parse.hs | 2 +- .../Haskell/Liquid/Termination/Structural.hs | 2 +- .../Language/Haskell/Liquid/Transforms/ANF.hs | 8 ++++---- .../Haskell/Liquid/Transforms/CoreToLogic.hs | 6 +++--- .../Haskell/Liquid/Transforms/InlineAux.hs | 2 +- .../Language/Haskell/Liquid/Transforms/Rec.hs | 4 ++-- .../Haskell/Liquid/Transforms/Rewrite.hs | 8 ++++---- .../Haskell/Liquid/Types/Dictionaries.hs | 2 +- .../Language/Haskell/Liquid/Types/Literals.hs | 2 +- .../Language/Haskell/Liquid/Types/PredType.hs | 4 ++-- .../Language/Haskell/Liquid/Types/PrettyPrint.hs | 4 ++-- .../src/Language/Haskell/Liquid/Types/RefType.hs | 6 +++--- .../src/Language/Haskell/Liquid/Types/Specs.hs | 2 +- .../src/Language/Haskell/Liquid/Types/Types.hs | 4 ++-- .../Language/Haskell/Liquid/Types/Variance.hs | 2 +- .../Language/Haskell/Liquid/Types/Visitors.hs | 2 +- .../src/Language/Haskell/Liquid/UX/ACSS.hs | 2 +- .../src/Language/Haskell/Liquid/UX/Annotate.hs | 2 +- .../src/Language/Haskell/Liquid/UX/CmdLine.hs | 2 +- .../src/Language/Haskell/Liquid/UX/DiffCheck.hs | 2 +- .../src/Language/Haskell/Liquid/UX/Errors.hs | 2 +- .../Language/Haskell/Liquid/UX/QuasiQuoter.hs | 2 +- .../src/Language/Haskell/Liquid/UX/Tidy.hs | 2 +- .../src/Language/Haskell/Liquid/WiredIn.hs | 4 ++-- 64 files changed, 113 insertions(+), 114 deletions(-) rename liquidhaskell-boot/{src-ghc => src/Language/Haskell}/Liquid/GHC/Interface.hs (98%) rename liquidhaskell-boot/{src-ghc => src/Language/Haskell}/Liquid/GHC/Logging.hs (97%) rename liquidhaskell-boot/{src-ghc => src/Language/Haskell}/Liquid/GHC/Misc.hs (99%) rename liquidhaskell-boot/{src-ghc => src/Language/Haskell}/Liquid/GHC/Play.hs (99%) rename liquidhaskell-boot/{src-ghc => src/Language/Haskell}/Liquid/GHC/Resugar.hs (98%) rename liquidhaskell-boot/{src-ghc => src/Language/Haskell}/Liquid/GHC/SpanStack.hs (95%) rename liquidhaskell-boot/{src-ghc => src/Language/Haskell}/Liquid/GHC/TypeRep.hs (97%) rename liquidhaskell-boot/{src-ghc => src/Language/Haskell}/Liquid/GHC/Types.hs (98%) diff --git a/.hlint.yaml b/.hlint.yaml index a96dd4e052..9ec24ab526 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -1,16 +1,15 @@ # To be compatible with GHC naming turn off the camelCase rule. -- ignore: {name: "Use camelCase", within: [Liquid.GHC.Misc]} # 4 hints +- ignore: {name: "Use camelCase", within: [Language.Haskell.Liquid.GHC.Misc]} # 4 hints # Linting LANGUAGE pragmas with complex CPP ifdefs is too hard. - ignore: { name: "Unused LANGUAGE pragma", within: [ Liquid.GHC.API, - Liquid.GHC.Interface, - Liquid.GHC.GhcMonadLike, - Liquid.GHC.Misc + Language.Haskell.Liquid.GHC.Interface, + Language.Haskell.Liquid.GHC.Misc ] } # The following are kept for usability and style sake - ignore: {name: "Avoid lambda"} # 4 hints - ignore: {name: "Eta reduce"} # 51 hints -- ignore: {name: "Use infix"} # 3 hints \ No newline at end of file +- ignore: {name: "Use infix"} # 3 hints diff --git a/README.md b/README.md index 653a9236d1..de66a5479d 100644 --- a/README.md +++ b/README.md @@ -353,7 +353,7 @@ using**. [GHC.API]: liquidhaskell-boot/src-ghc/Liquid/GHC/API.hs [Plugin]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs [GHC.Plugin]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs -[GHC.Interface]: liquidhaskell-boot/src-ghc/Liquid/GHC/Interface.hs +[GHC.Interface]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Interface.hs [SpecFinder]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin/SpecFinder.hs [BareSpec]: liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Specs.hs#L362 [LiftedSpec]: liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Specs.hs#L559 @@ -366,7 +366,7 @@ using**. [ghcide]: https://github.com/haskell/ghcide [findRelevantSpecs]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin/SpecFinder.hs#L65 [core binds]: https://hackage.haskell.org/package/ghc-9.2.5/docs/CoreSyn.html#t:CoreBind -[configureGhcTargets]: liquidhaskell-boot/src-ghc/Liquid/GHC/Interface.hs#L254 -[processTargetModule]: liquidhaskell-boot/src-ghc/Liquid/GHC/Interface.hs#L483 +[configureGhcTargets]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Interface.hs#L254 +[processTargetModule]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Interface.hs#L483 [processModule]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs#L509 diff --git a/liquidhaskell-boot/liquidhaskell-boot.cabal b/liquidhaskell-boot/liquidhaskell-boot.cabal index 8f0e463022..590c1346b6 100644 --- a/liquidhaskell-boot/liquidhaskell-boot.cabal +++ b/liquidhaskell-boot/liquidhaskell-boot.cabal @@ -65,14 +65,14 @@ library Liquid.GHC.API Liquid.GHC.API.Extra Liquid.GHC.API.StableModule - Liquid.GHC.Interface - Liquid.GHC.Logging - Liquid.GHC.Misc - Liquid.GHC.Play - Liquid.GHC.Resugar - Liquid.GHC.SpanStack - Liquid.GHC.Types - Liquid.GHC.TypeRep + Language.Haskell.Liquid.GHC.Interface + Language.Haskell.Liquid.GHC.Logging + Language.Haskell.Liquid.GHC.Misc + Language.Haskell.Liquid.GHC.Play + Language.Haskell.Liquid.GHC.Resugar + Language.Haskell.Liquid.GHC.SpanStack + Language.Haskell.Liquid.GHC.Types + Language.Haskell.Liquid.GHC.TypeRep Language.Haskell.Liquid.GHC.Plugin Language.Haskell.Liquid.GHC.Plugin.Tutorial Language.Haskell.Liquid.LawInstances diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare.hs index f9cdb17c09..608ab1a6dd 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare.hs @@ -39,9 +39,9 @@ import Language.Fixpoint.Misc as Misc import Language.Fixpoint.Types hiding (dcFields, DataDecl, Error, panic) import qualified Language.Fixpoint.Types as F import qualified Language.Haskell.Liquid.Misc as Misc -- (nubHashOn) -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Liquid.GHC.API as Ghc -import Liquid.GHC.Types (StableName) +import Language.Haskell.Liquid.GHC.Types (StableName) import Language.Haskell.Liquid.Types import Language.Haskell.Liquid.WiredIn import qualified Language.Haskell.Liquid.Measure as Ms diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs index 03f065869f..0f6d90abfd 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs @@ -24,10 +24,10 @@ import Language.Fixpoint.Misc import qualified Language.Haskell.Liquid.Measure as Ms import qualified Language.Fixpoint.Types as F import qualified Liquid.GHC.API as Ghc -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import Language.Haskell.Liquid.Types.RefType import Language.Haskell.Liquid.Transforms.CoreToLogic -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc import Language.Haskell.Liquid.Types import Language.Haskell.Liquid.Bare.Resolve as Bare diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Check.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Check.hs index 66e0087e8b..eb6da12fe2 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Check.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Check.hs @@ -32,8 +32,8 @@ import Data.Hashable import qualified Language.Fixpoint.Misc as Misc import Language.Fixpoint.SortCheck (checkSorted, checkSortedReftFull, checkSortFull) import qualified Language.Fixpoint.Types as F -import qualified Liquid.GHC.Misc as GM -import Liquid.GHC.Play (getNonPositivesTyCon) +import qualified Language.Haskell.Liquid.GHC.Misc as GM +import Language.Haskell.Liquid.GHC.Play (getNonPositivesTyCon) import Language.Haskell.Liquid.Misc (condNull, thd5) import Language.Haskell.Liquid.Types import Language.Haskell.Liquid.WiredIn diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Class.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Class.hs index af35267c8f..a5d18876b5 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Class.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Class.hs @@ -24,7 +24,7 @@ import qualified Language.Fixpoint.Types as F import qualified Language.Fixpoint.Types.Visitor as F import Language.Haskell.Liquid.Types.Dictionaries -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Liquid.GHC.API as Ghc import Language.Haskell.Liquid.Misc import Language.Haskell.Liquid.Types.RefType diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/DataType.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/DataType.hs index 06b9824c1b..862ec5b1e7 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/DataType.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/DataType.hs @@ -28,7 +28,7 @@ import qualified Data.HashSet as S import qualified Data.Maybe as Mb import qualified Language.Fixpoint.Types as F -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Liquid.GHC.API as Ghc import Language.Haskell.Liquid.Types.PredType (dataConPSpecType) import qualified Language.Haskell.Liquid.Types.RefType as RT diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs index 76372db874..c79454db60 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs @@ -26,7 +26,7 @@ where import qualified Language.Fixpoint.Types as F -- import Control.Arrow import Liquid.GHC.API hiding (panic, varName) -import qualified Liquid.GHC.Misc +import qualified Language.Haskell.Liquid.GHC.Misc as GM import Language.Haskell.Liquid.Types.Types import Language.Haskell.Liquid.Types.RefType diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs index 24f6520ded..7c8d448362 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs @@ -40,7 +40,7 @@ import qualified Language.Fixpoint.Types as F -- import qualified Language.Fixpoint.Types.Visitor as F import qualified Language.Fixpoint.Misc as Misc import Language.Fixpoint.Types (Expr(..)) -- , Symbol, symbol) -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Liquid.GHC.API as Ghc import qualified Language.Haskell.Liquid.Types.RefType as RT import Language.Haskell.Liquid.Types hiding (fresh) diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Laws.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Laws.hs index 04994a3548..a34c5ea887 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Laws.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Laws.hs @@ -7,7 +7,7 @@ import Control.Monad ((<=<)) import qualified Language.Haskell.Liquid.Measure as Ms import qualified Language.Fixpoint.Types as F -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import Language.Haskell.Liquid.Bare.Types as Bare import Language.Haskell.Liquid.Bare.Resolve as Bare import Language.Haskell.Liquid.Bare.Expand as Bare diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Measure.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Measure.hs index 1ed0e75db1..cdafd19b25 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Measure.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Measure.hs @@ -35,7 +35,7 @@ import qualified Language.Fixpoint.Misc as Misc import qualified Language.Haskell.Liquid.Misc as Misc import Language.Haskell.Liquid.Misc ((.||.)) import qualified Liquid.GHC.API as Ghc -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Language.Haskell.Liquid.Types.RefType as RT import Language.Haskell.Liquid.Types -- import Language.Haskell.Liquid.Types.Bounds diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Misc.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Misc.hs index 4fccb9f464..3c90c6eeae 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Misc.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Misc.hs @@ -24,7 +24,7 @@ import qualified Data.Maybe as Mb --(fromMaybe, isNot import qualified Text.PrettyPrint.HughesPJ as PJ import qualified Data.List as L import qualified Language.Fixpoint.Types as F -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc import Language.Haskell.Liquid.Types.RefType import Language.Haskell.Liquid.Types.Types diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Plugged.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Plugged.hs index 939ed15e53..4dc9f0bcc0 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Plugged.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Plugged.hs @@ -21,9 +21,9 @@ import qualified Data.Maybe as Mb import qualified Data.List as L import qualified Language.Fixpoint.Types as F import qualified Language.Fixpoint.Types.Visitor as F -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Liquid.GHC.API as Ghc -import Liquid.GHC.Types (StableName, mkStableName) +import Language.Haskell.Liquid.GHC.Types (StableName, mkStableName) import Language.Haskell.Liquid.Types.RefType () import Language.Haskell.Liquid.Types import qualified Language.Haskell.Liquid.Misc as Misc diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Resolve.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Resolve.hs index d7a42d7437..f020d15c4a 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Resolve.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Resolve.hs @@ -67,7 +67,7 @@ import qualified Language.Fixpoint.Types as F import qualified Language.Fixpoint.Types.Visitor as F import qualified Language.Fixpoint.Misc as Misc import qualified Liquid.GHC.API as Ghc -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Language.Haskell.Liquid.Misc as Misc import qualified Language.Haskell.Liquid.Types.RefType as RT import Language.Haskell.Liquid.Types.Types diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/ToBare.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/ToBare.hs index e9164c430b..1ad7230b4b 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/ToBare.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/ToBare.hs @@ -14,7 +14,7 @@ import Data.Bifunctor import Language.Fixpoint.Misc (mapSnd) import qualified Language.Fixpoint.Types as F -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc import Liquid.GHC.API import Language.Haskell.Liquid.Types -- import Language.Haskell.Liquid.Measure diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Typeclass.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Typeclass.hs index 08d6405d17..b71b4bb3d3 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Typeclass.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Typeclass.hs @@ -22,7 +22,7 @@ import qualified Data.Maybe as Mb import qualified Language.Fixpoint.Types as F import qualified Language.Fixpoint.Misc as Misc import Language.Haskell.Liquid.Bare.Elaborate -import qualified Liquid.GHC.Misc +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Liquid.GHC.API as Ghc diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Types.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Types.hs index c2bb8d84e3..8e29153bf6 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Types.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Types.hs @@ -37,7 +37,7 @@ import qualified Language.Haskell.Liquid.Types.RefType as RT import Language.Haskell.Liquid.Types.Types import Language.Haskell.Liquid.Types.Specs hiding (BareSpec) import Liquid.GHC.API as Ghc hiding (Located, Env) -import Liquid.GHC.Types (StableName) +import Language.Haskell.Liquid.GHC.Types (StableName) type ModSpecs = M.HashMap ModName Ms.BareSpec diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Env.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Env.hs index 71fb21fa54..f051e85b59 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Env.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Env.hs @@ -68,7 +68,7 @@ import Language.Fixpoint.SortCheck (pruneUnsortedReft) import Liquid.GHC.API hiding (panic) import Language.Haskell.Liquid.Types.RefType -import qualified Liquid.GHC.SpanStack as Sp +import qualified Language.Haskell.Liquid.GHC.SpanStack as Sp import Language.Haskell.Liquid.Types hiding (binds, Loc, loc, freeTyVars, Def) import Language.Haskell.Liquid.Constraint.Types import Language.Haskell.Liquid.Constraint.Fresh () diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Fresh.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Fresh.hs index 8ec4783308..611e1107bc 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Fresh.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Fresh.hs @@ -37,7 +37,7 @@ import Language.Haskell.Liquid.Types -- import Language.Haskell.Liquid.Types.RefType -- import Language.Haskell.Liquid.Types.Fresh import Language.Haskell.Liquid.Constraint.Types -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import Liquid.GHC.API as Ghc -------------------------------------------------------------------------------- diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Generate.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Generate.hs index 149d12365f..17b8ef0924 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Generate.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Generate.hs @@ -23,9 +23,9 @@ import Liquid.GHC.API as Ghc hiding ( panic , text , vcat ) -import qualified Liquid.GHC.Resugar as Rs -import qualified Liquid.GHC.SpanStack as Sp -import qualified Liquid.GHC.Misc as GM -- ( isInternal, collectArguments, tickSrcSpan, showPpr ) +import qualified Language.Haskell.Liquid.GHC.Resugar as Rs +import qualified Language.Haskell.Liquid.GHC.SpanStack as Sp +import qualified Language.Haskell.Liquid.GHC.Misc as GM -- ( isInternal, collectArguments, tickSrcSpan, showPpr ) import Text.PrettyPrint.HughesPJ ( text ) import Control.Monad.State import Data.Maybe (fromMaybe, isJust, mapMaybe) diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Init.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Init.hs index 5163e7ac19..228082d027 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Init.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Init.hs @@ -27,8 +27,8 @@ import qualified Language.Haskell.Liquid.UX.CTags as Tg import Language.Haskell.Liquid.Constraint.Fresh import Language.Haskell.Liquid.Constraint.Env import Language.Haskell.Liquid.WiredIn (dictionaryVar) -import qualified Liquid.GHC.SpanStack as Sp -import Liquid.GHC.Misc ( idDataConM, hasBaseTypeVar, isDataConId) -- dropModuleNames, simplesymbol) +import qualified Language.Haskell.Liquid.GHC.SpanStack as Sp +import Language.Haskell.Liquid.GHC.Misc ( idDataConM, hasBaseTypeVar, isDataConId) -- dropModuleNames, simplesymbol) import Liquid.GHC.API as Ghc import Language.Haskell.Liquid.Misc import Language.Fixpoint.Misc diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Monad.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Monad.hs index f5e4d0930f..50d1286c26 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Monad.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Monad.hs @@ -15,7 +15,7 @@ import Language.Haskell.Liquid.Types hiding (loc) import Language.Haskell.Liquid.Constraint.Types import Language.Haskell.Liquid.Constraint.Env import Language.Fixpoint.Misc hiding (errorstar) -import Liquid.GHC.Misc -- (concatMapM) +import Language.Haskell.Liquid.GHC.Misc -- (concatMapM) import Liquid.GHC.API as Ghc hiding (panic, showPpr) -------------------------------------------------------------------------------- diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Qualifier.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Qualifier.hs index c848e0a470..a4374b0a6e 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Qualifier.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Qualifier.hs @@ -18,7 +18,7 @@ import Language.Fixpoint.Types hiding (panic, mkQual) import qualified Language.Fixpoint.Types.Config as FC import Language.Fixpoint.SortCheck import Language.Haskell.Liquid.Types.RefType -import Liquid.GHC.Misc (getSourcePos) +import Language.Haskell.Liquid.GHC.Misc (getSourcePos) import Language.Haskell.Liquid.Misc (condNull) import Language.Haskell.Liquid.Types.PredType import Liquid.GHC.API hiding (Expr, mkQual, panic) diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Relational.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Relational.hs index 5e1d1d78b8..668e21fbd0 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Relational.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Relational.hs @@ -35,10 +35,10 @@ import Liquid.GHC.API ( Alt , TyVar , Var(..)) import qualified Liquid.GHC.API as Ghc -import qualified Liquid.GHC.Misc as GM -import Liquid.GHC.Play (Subable(sub, subTy)) -import qualified Liquid.GHC.SpanStack as Sp -import Liquid.GHC.TypeRep () +import qualified Language.Haskell.Liquid.GHC.Misc as GM +import Language.Haskell.Liquid.GHC.Play (Subable(sub, subTy)) +import qualified Language.Haskell.Liquid.GHC.SpanStack as Sp +import Language.Haskell.Liquid.GHC.TypeRep () import Language.Haskell.Liquid.Misc import Language.Haskell.Liquid.Types hiding (Def, Loc, binds, diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Termination.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Termination.hs index c164aedcda..83e48ca1d0 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Termination.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Termination.hs @@ -26,7 +26,7 @@ import GHC.Types.Var (Var) import GHC.Types.Name (NamedThing, getSrcSpan) import GHC.Core.TyCon (TyCon) import GHC.Core (Bind, CoreExpr, bindersOf) -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Language.Fixpoint.Types as F import Language.Fixpoint.Types.PrettyPrint (PPrint) import Language.Haskell.Liquid.Constraint.Types (CG, CGInfo (..), CGEnv, makeRecInvariants) diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/ToFixpoint.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/ToFixpoint.hs index b11dff81fe..f1b2b6cb20 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/ToFixpoint.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/ToFixpoint.hs @@ -26,7 +26,7 @@ import qualified Data.Maybe as Mb -- imports for AxiomEnv import qualified Language.Haskell.Liquid.UX.Config as Config import Language.Haskell.Liquid.UX.DiffCheck (coreDefs, coreDeps, dependsOn, Def(..)) -import qualified Liquid.GHC.Misc as GM -- (simplesymbol) +import qualified Language.Haskell.Liquid.GHC.Misc as GM -- (simplesymbol) import qualified Data.List as L import qualified Data.HashMap.Strict as M import qualified Data.HashSet as S diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Types.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Types.hs index 648af57019..57038339e2 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Types.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Types.hs @@ -63,7 +63,7 @@ import Control.DeepSeq import Data.Maybe (isJust, mapMaybe) import Control.Monad.State -import Liquid.GHC.SpanStack +import Language.Haskell.Liquid.GHC.SpanStack import Liquid.GHC.API as Ghc hiding ( (<+>) , vcat , parens diff --git a/liquidhaskell-boot/src-ghc/Liquid/GHC/Interface.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Interface.hs similarity index 98% rename from liquidhaskell-boot/src-ghc/Liquid/GHC/Interface.hs rename to liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Interface.hs index bb4a6f8ef9..4dc4b74e54 100644 --- a/liquidhaskell-boot/src-ghc/Liquid/GHC/Interface.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Interface.hs @@ -14,7 +14,7 @@ {-# OPTIONS_GHC -Wwarn=deprecations #-} {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} -module Liquid.GHC.Interface ( +module Language.Haskell.Liquid.GHC.Interface ( -- * Printer pprintCBs @@ -76,9 +76,9 @@ import Text.Megaparsec.Error import Text.PrettyPrint.HughesPJ hiding (first, (<>)) import Language.Fixpoint.Types hiding (err, panic, Error, Result, Expr) import qualified Language.Fixpoint.Misc as Misc -import Liquid.GHC.Misc -import Liquid.GHC.Types (MGIModGuts(..)) -import Liquid.GHC.Play +import Language.Haskell.Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Types (MGIModGuts(..)) +import Language.Haskell.Liquid.GHC.Play import Language.Haskell.Liquid.WiredIn (isDerivedInstance) import qualified Language.Haskell.Liquid.Measure as Ms import qualified Language.Haskell.Liquid.Misc as Misc diff --git a/liquidhaskell-boot/src-ghc/Liquid/GHC/Logging.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Logging.hs similarity index 97% rename from liquidhaskell-boot/src-ghc/Liquid/GHC/Logging.hs rename to liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Logging.hs index 92649030fc..d90b35fe25 100644 --- a/liquidhaskell-boot/src-ghc/Liquid/GHC/Logging.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Logging.hs @@ -9,7 +9,7 @@ to pay the price of a pretty-printing \"roundtrip\". -} -module Liquid.GHC.Logging ( +module Language.Haskell.Liquid.GHC.Logging ( fromPJDoc , putWarnMsg , mkLongErrAt diff --git a/liquidhaskell-boot/src-ghc/Liquid/GHC/Misc.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Misc.hs similarity index 99% rename from liquidhaskell-boot/src-ghc/Liquid/GHC/Misc.hs rename to liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Misc.hs index 28722fb1c3..ed0809b564 100644 --- a/liquidhaskell-boot/src-ghc/Liquid/GHC/Misc.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Misc.hs @@ -18,7 +18,7 @@ -- accessing GHC module information. It should NEVER depend on -- ANY module inside the Language.Haskell.Liquid.* tree. -module Liquid.GHC.Misc where +module Language.Haskell.Liquid.GHC.Misc where import Data.String import qualified Data.List as L diff --git a/liquidhaskell-boot/src-ghc/Liquid/GHC/Play.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Play.hs similarity index 99% rename from liquidhaskell-boot/src-ghc/Liquid/GHC/Play.hs rename to liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Play.hs index 747a1e0861..32d1c00511 100644 --- a/liquidhaskell-boot/src-ghc/Liquid/GHC/Play.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Play.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -Wno-incomplete-patterns #-} -- TODO(#1918): Only needed for GHC <9.0.1. -module Liquid.GHC.Play where +module Language.Haskell.Liquid.GHC.Play where import Prelude hiding (error) @@ -13,7 +13,7 @@ import qualified Data.List as L import qualified Data.Maybe as Mb import Liquid.GHC.API as Ghc hiding (substTysWith, panic,showPpr) -import Liquid.GHC.Misc () +import Language.Haskell.Liquid.GHC.Misc () import Language.Haskell.Liquid.Types.Errors import Language.Haskell.Liquid.Types.Variance diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs index 261db5e2ae..22392ec373 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs @@ -19,22 +19,22 @@ import qualified Liquid.GHC.API as O import Liquid.GHC.API as GHC hiding (Target, Type) import qualified Text.PrettyPrint.HughesPJ as PJ import qualified Language.Fixpoint.Types as F -import qualified Liquid.GHC.Misc as LH +import qualified Language.Haskell.Liquid.GHC.Misc as LH import qualified Language.Haskell.Liquid.UX.CmdLine as LH -import qualified Liquid.GHC.Interface as LH +import qualified Language.Haskell.Liquid.GHC.Interface as LH import qualified Language.Haskell.Liquid.Liquid as LH import qualified Language.Haskell.Liquid.Types.PrettyPrint as LH ( filterReportErrors , filterReportErrorsWith , defaultFilterReporter , reduceFilters ) -import qualified Liquid.GHC.Logging as LH (fromPJDoc) +import qualified Language.Haskell.Liquid.GHC.Logging as LH (fromPJDoc) import Language.Haskell.Liquid.GHC.Plugin.Types import Language.Haskell.Liquid.GHC.Plugin.Util as Util import Language.Haskell.Liquid.GHC.Plugin.SpecFinder as SpecFinder -import Liquid.GHC.Types (MGIModGuts(..), miModGuts) +import Language.Haskell.Liquid.GHC.Types (MGIModGuts(..), miModGuts) import GHC.LanguageExtensions import Control.Monad diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin/Types.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin/Types.hs index d113d2d66b..6eda30c3a9 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin/Types.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin/Types.hs @@ -36,8 +36,8 @@ import qualified Data.HashSet as HS import Language.Haskell.Liquid.Types.Specs import Liquid.GHC.API as GHC -import qualified Liquid.GHC.Interface as LH -import Liquid.GHC.Misc (realSrcLocSourcePos) +import qualified Language.Haskell.Liquid.GHC.Interface as LH +import Language.Haskell.Liquid.GHC.Misc (realSrcLocSourcePos) import Language.Fixpoint.Types.Names ( Symbol ) import Language.Fixpoint.Types.Spans ( SourcePos, dummyPos ) diff --git a/liquidhaskell-boot/src-ghc/Liquid/GHC/Resugar.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Resugar.hs similarity index 98% rename from liquidhaskell-boot/src-ghc/Liquid/GHC/Resugar.hs rename to liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Resugar.hs index 7e3ad4580f..1e6035da03 100644 --- a/liquidhaskell-boot/src-ghc/Liquid/GHC/Resugar.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Resugar.hs @@ -9,7 +9,7 @@ -- into high-level patterns, that can receive special case handling in -- different phases (e.g. ANF, Constraint Generation, etc.) -module Liquid.GHC.Resugar ( +module Language.Haskell.Liquid.GHC.Resugar ( -- * High-level Source Patterns Pattern (..) @@ -22,7 +22,7 @@ module Liquid.GHC.Resugar ( import qualified Data.List as L import Liquid.GHC.API as Ghc hiding (PatBind) -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Language.Fixpoint.Types as F import qualified Text.PrettyPrint.HughesPJ as PJ -- import Debug.Trace diff --git a/liquidhaskell-boot/src-ghc/Liquid/GHC/SpanStack.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/SpanStack.hs similarity index 95% rename from liquidhaskell-boot/src-ghc/Liquid/GHC/SpanStack.hs rename to liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/SpanStack.hs index 2767ca2f0f..ecd99e177e 100644 --- a/liquidhaskell-boot/src-ghc/Liquid/GHC/SpanStack.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/SpanStack.hs @@ -1,6 +1,6 @@ {-# LANGUAGE BangPatterns #-} -module Liquid.GHC.SpanStack +module Language.Haskell.Liquid.GHC.SpanStack ( -- * Stack of positions Span (..) , SpanStack @@ -17,7 +17,7 @@ module Liquid.GHC.SpanStack import Prelude hiding (error) import Data.Maybe (listToMaybe, fromMaybe) -import Liquid.GHC.Misc (tickSrcSpan, showPpr) +import Language.Haskell.Liquid.GHC.Misc (tickSrcSpan, showPpr) import qualified Liquid.GHC.API as Ghc import Liquid.GHC.API ( SrcSpan , fsLit diff --git a/liquidhaskell-boot/src-ghc/Liquid/GHC/TypeRep.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/TypeRep.hs similarity index 97% rename from liquidhaskell-boot/src-ghc/Liquid/GHC/TypeRep.hs rename to liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/TypeRep.hs index 64e3b89047..4012ea6e6a 100644 --- a/liquidhaskell-boot/src-ghc/Liquid/GHC/TypeRep.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/TypeRep.hs @@ -9,13 +9,13 @@ {-# OPTIONS_GHC -Wno-incomplete-patterns #-} -- TODO(#1918): Only needed for GHC <9.0.1. {-# OPTIONS_GHC -Wno-orphans #-} -module Liquid.GHC.TypeRep ( +module Language.Haskell.Liquid.GHC.TypeRep ( mkTyArg, showTy ) where -import Liquid.GHC.Misc (showPpr) +import Language.Haskell.Liquid.GHC.Misc (showPpr) import Liquid.GHC.API as Ghc hiding (mkTyArg, showPpr, panic) import Language.Fixpoint.Types (symbol) diff --git a/liquidhaskell-boot/src-ghc/Liquid/GHC/Types.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Types.hs similarity index 98% rename from liquidhaskell-boot/src-ghc/Liquid/GHC/Types.hs rename to liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Types.hs index df2f5353bf..0c5254a9b4 100644 --- a/liquidhaskell-boot/src-ghc/Liquid/GHC/Types.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Types.hs @@ -1,5 +1,5 @@ {-# LANGUAGE DeriveGeneric #-} -module Liquid.GHC.Types where +module Language.Haskell.Liquid.GHC.Types where import Data.HashSet (HashSet, fromList) import Data.Hashable diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Liquid.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Liquid.hs index 895373522e..f938ff74d4 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Liquid.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Liquid.hs @@ -24,13 +24,13 @@ import Language.Haskell.Liquid.Types import Language.Haskell.Liquid.UX.Errors import Language.Haskell.Liquid.UX.CmdLine import Language.Haskell.Liquid.UX.Tidy -import Liquid.GHC.Misc (showCBs, ignoreCoreBinds) -- howPpr) +import Language.Haskell.Liquid.GHC.Misc (showCBs, ignoreCoreBinds) -- howPpr) import Language.Haskell.Liquid.Constraint.Generate import Language.Haskell.Liquid.Constraint.ToFixpoint import Language.Haskell.Liquid.Constraint.Types import Language.Haskell.Liquid.UX.Annotate (mkOutput) import qualified Language.Haskell.Liquid.Termination.Structural as ST -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import Liquid.GHC.API as GHC hiding (text, vcat, ($+$), getOpts, (<+>)) -------------------------------------------------------------------------------- diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Measure.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Measure.hs index 1f6510d194..c6e2ae5bd3 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Measure.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Measure.hs @@ -34,7 +34,7 @@ import qualified Data.Maybe as Mb -- (fromMaybe, isN import Language.Fixpoint.Misc import Language.Fixpoint.Types hiding (panic, R, DataDecl, SrcSpan, LocSymbol) import Liquid.GHC.API as Ghc hiding (Expr, showPpr, panic, (<+>)) -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc -- import qualified Language.Haskell.Liquid.Misc as Misc import Language.Haskell.Liquid.Types.Types -- hiding (GhcInfo(..), GhcSpec (..)) import Language.Haskell.Liquid.Types.RefType diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Parse.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Parse.hs index c1e07c8f98..ef20c21eeb 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Parse.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Parse.hs @@ -37,7 +37,7 @@ import GHC (ModuleName, mkModuleNam import qualified Text.PrettyPrint.HughesPJ as PJ import Text.PrettyPrint.HughesPJ.Compat ((<+>)) import Language.Fixpoint.Types hiding (panic, SVar, DDecl, DataDecl, DataCtor (..), Error, R, Predicate) -import Liquid.GHC.Misc hiding (getSourcePos) +import Language.Haskell.Liquid.GHC.Misc hiding (getSourcePos) import Language.Haskell.Liquid.Types -- import Language.Haskell.Liquid.Types.Errors import qualified Language.Fixpoint.Misc as Misc diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Termination/Structural.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Termination/Structural.hs index 31296fad32..d5a7b073b4 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Termination/Structural.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Termination/Structural.hs @@ -5,7 +5,7 @@ module Language.Haskell.Liquid.Termination.Structural (terminationVars) where import Language.Haskell.Liquid.Types hiding (isDecreasing) -import Liquid.GHC.Misc (showPpr) +import Language.Haskell.Liquid.GHC.Misc (showPpr) import Liquid.GHC.API as GHC hiding ( showPpr , Env , text diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/ANF.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/ANF.hs index 94ccb35fd7..c4359c0dea 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/ANF.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/ANF.hs @@ -13,7 +13,7 @@ module Language.Haskell.Liquid.Transforms.ANF (anormalize) where import Debug.Trace (trace) import Prelude hiding (error) -import Liquid.GHC.TypeRep +import Language.Haskell.Liquid.GHC.TypeRep import Liquid.GHC.API as Ghc hiding ( mkTyArg , showPpr , DsM @@ -25,14 +25,14 @@ import qualified Language.Fixpoint.Types as F import Language.Haskell.Liquid.UX.Config as UX import qualified Language.Haskell.Liquid.Misc as Misc -import Liquid.GHC.Misc as GM +import Language.Haskell.Liquid.GHC.Misc as GM import Language.Haskell.Liquid.Transforms.Rec import Language.Haskell.Liquid.Transforms.InlineAux import Language.Haskell.Liquid.Transforms.Rewrite import Language.Haskell.Liquid.Types.Errors -import qualified Liquid.GHC.SpanStack as Sp -import qualified Liquid.GHC.Resugar as Rs +import qualified Language.Haskell.Liquid.GHC.SpanStack as Sp +import qualified Language.Haskell.Liquid.GHC.Resugar as Rs import Data.Maybe (fromMaybe) import Data.List (sortBy, (\\)) import qualified Text.Printf as Printf diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/CoreToLogic.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/CoreToLogic.hs index c415a1b5f5..173faf1cc4 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/CoreToLogic.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/CoreToLogic.hs @@ -22,7 +22,7 @@ module Language.Haskell.Liquid.Transforms.CoreToLogic import Data.ByteString (ByteString) import Prelude hiding (error) -import Liquid.GHC.TypeRep () -- needed for Eq 'Type' +import Language.Haskell.Liquid.GHC.TypeRep () -- needed for Eq 'Type' import Liquid.GHC.API hiding (Expr, Located, panic) import qualified Liquid.GHC.API as Ghc import qualified Liquid.GHC.API as C @@ -40,13 +40,13 @@ import qualified Language.Fixpoint.Misc as Misc import qualified Language.Haskell.Liquid.Misc as Misc import Language.Fixpoint.Types hiding (panic, Error, R, simplify) import qualified Language.Fixpoint.Types as F -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import Language.Haskell.Liquid.Bare.Types import Language.Haskell.Liquid.Bare.DataType import Language.Haskell.Liquid.Bare.Misc (simpleSymbolVar) -import Liquid.GHC.Play +import Language.Haskell.Liquid.GHC.Play import Language.Haskell.Liquid.Types.Types -- hiding (GhcInfo(..), GhcSpec (..), LM) import Language.Haskell.Liquid.Types.RefType diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/InlineAux.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/InlineAux.hs index d55be8b042..f824c37721 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/InlineAux.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/InlineAux.hs @@ -7,7 +7,7 @@ where import qualified Language.Haskell.Liquid.UX.Config as UX import Liquid.GHC.API import Control.Arrow (second) -import qualified Liquid.GHC.Misc +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Data.HashMap.Strict as M diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/Rec.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/Rec.hs index 9624f2761e..ea3478a1c2 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/Rec.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/Rec.hs @@ -14,8 +14,8 @@ import Control.Monad.State import qualified Data.HashMap.Strict as M import Data.Hashable import Liquid.GHC.API as Ghc hiding (panic) -import Liquid.GHC.Misc -import Liquid.GHC.Play +import Language.Haskell.Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Play import Language.Haskell.Liquid.Misc (mapSndM) import Language.Fixpoint.Misc (mapSnd) -- , traceShow) import Language.Haskell.Liquid.Types.Errors diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/Rewrite.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/Rewrite.hs index f34093e4e7..8d1f0b1ab3 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/Rewrite.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Transforms/Rewrite.hs @@ -25,15 +25,15 @@ module Language.Haskell.Liquid.Transforms.Rewrite ) where import Liquid.GHC.API as Ghc hiding (showPpr, substExpr) -import Liquid.GHC.TypeRep () +import Language.Haskell.Liquid.GHC.TypeRep () import Data.Maybe (fromMaybe) import Control.Monad.State hiding (lift) import Language.Fixpoint.Misc ({- mapFst, -} mapSnd) import qualified Language.Fixpoint.Types as F import Language.Haskell.Liquid.Misc (safeZipWithError, Nat) -import Liquid.GHC.Play (substExpr) -import Liquid.GHC.Resugar -import Liquid.GHC.Misc (unTickExpr, isTupleId, showPpr, mkAlive) -- , showPpr, tracePpr) +import Language.Haskell.Liquid.GHC.Play (substExpr) +import Language.Haskell.Liquid.GHC.Resugar +import Language.Haskell.Liquid.GHC.Misc (unTickExpr, isTupleId, showPpr, mkAlive) -- , showPpr, tracePpr) import Language.Haskell.Liquid.UX.Config (Config, noSimplifyCore) import qualified Data.List as L import qualified Data.HashMap.Strict as M diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Dictionaries.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Dictionaries.hs index e512dd20b0..9347ede5a9 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Dictionaries.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Dictionaries.hs @@ -18,7 +18,7 @@ import Data.Hashable import Prelude hiding (error) import qualified Language.Fixpoint.Types as F import Language.Haskell.Liquid.Types.PrettyPrint () -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Liquid.GHC.API as Ghc import Language.Haskell.Liquid.Types.Types -- import Language.Haskell.Liquid.Types.Visitors (freeVars) diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Literals.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Literals.hs index d31fb24327..c1777f72ce 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Literals.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Literals.hs @@ -8,7 +8,7 @@ module Language.Haskell.Liquid.Types.Literals ) where import Prelude hiding (error) -import Liquid.GHC.TypeRep () +import Language.Haskell.Liquid.GHC.TypeRep () import Liquid.GHC.API hiding (panic) import Language.Haskell.Liquid.Types.Types diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/PredType.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/PredType.hs index 79bb7b1cf7..486302de36 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/PredType.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/PredType.hs @@ -42,7 +42,7 @@ import Liquid.GHC.API hiding ( panic , parens , showPpr ) -import Liquid.GHC.TypeRep () +import Language.Haskell.Liquid.GHC.TypeRep () import Data.Hashable import qualified Data.HashMap.Strict as M import qualified Data.Maybe as Mb @@ -54,7 +54,7 @@ import Language.Fixpoint.Misc -- import Language.Fixpoint.Types hiding (Expr, Predicate) import qualified Language.Fixpoint.Types as F import qualified Liquid.GHC.API as Ghc -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc import Language.Haskell.Liquid.Misc import Language.Haskell.Liquid.Types.RefType hiding (generalize) import Language.Haskell.Liquid.Types.Types diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/PrettyPrint.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/PrettyPrint.hs index 61e4aab7a7..9cb58a6061 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/PrettyPrint.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/PrettyPrint.hs @@ -62,8 +62,8 @@ import Liquid.GHC.API as Ghc ( Class , srcSpanStartLine , srcSpanStartCol ) -import Liquid.GHC.Logging (mkLongErrAt) -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Logging (mkLongErrAt) +import Language.Haskell.Liquid.GHC.Misc import Language.Haskell.Liquid.Misc import Language.Haskell.Liquid.Types.Types import Prelude hiding (error) diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/RefType.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/RefType.hs index 5b6c88d854..be91b691a6 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/RefType.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/RefType.hs @@ -115,8 +115,8 @@ import Language.Haskell.Liquid.Types.Types hiding (R, DataConP (..)) import Language.Haskell.Liquid.Types.Variance import Language.Haskell.Liquid.Misc import Language.Haskell.Liquid.Types.Names -import qualified Liquid.GHC.Misc as GM -import Liquid.GHC.Play (mapType, stringClassArg, isRecursivenewTyCon) +import qualified Language.Haskell.Liquid.GHC.Misc as GM +import Language.Haskell.Liquid.GHC.Play (mapType, stringClassArg, isRecursivenewTyCon) import Liquid.GHC.API as Ghc hiding ( Expr , Located , tyConName @@ -132,7 +132,7 @@ import Liquid.GHC.API as Ghc hiding ( Expr , panic , text ) -import Liquid.GHC.TypeRep () -- Eq Type instance +import Language.Haskell.Liquid.GHC.TypeRep () -- Eq Type instance import Data.List (foldl') diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Specs.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Specs.hs index 3ea38993e6..bab265ce43 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Specs.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Specs.hs @@ -80,7 +80,7 @@ import Language.Haskell.Liquid.Types.Generics import Language.Haskell.Liquid.Types.Variance import Language.Haskell.Liquid.Types.Bounds import Liquid.GHC.API hiding (text, (<+>)) -import Liquid.GHC.Types +import Language.Haskell.Liquid.GHC.Types import Text.PrettyPrint.HughesPJ (text, (<+>)) import Text.PrettyPrint.HughesPJ as HughesPJ (($$)) diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Types.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Types.hs index 96cea96891..8308e33c12 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Types.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Types.hs @@ -295,8 +295,8 @@ import Language.Fixpoint.Misc import qualified Language.Fixpoint.Types as F import Language.Haskell.Liquid.Types.Generics -import Liquid.GHC.Misc -import Liquid.GHC.Logging as GHC +import Language.Haskell.Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Logging as GHC import Language.Haskell.Liquid.Types.Variance import Language.Haskell.Liquid.Types.Errors import Language.Haskell.Liquid.Misc diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Variance.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Variance.hs index 991aef0bd8..9b587943db 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Variance.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Variance.hs @@ -25,7 +25,7 @@ import qualified Data.HashSet as S import qualified Language.Fixpoint.Types as F import Language.Haskell.Liquid.Types.Generics -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import Liquid.GHC.API as Ghc hiding (text) type VarianceInfo = [Variance] diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Visitors.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Visitors.hs index 23b90f7752..db7e5de434 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Visitors.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Visitors.hs @@ -20,7 +20,7 @@ import qualified Data.HashSet as S import Prelude hiding (error) import Language.Fixpoint.Misc import Liquid.GHC.API -import Liquid.GHC.Misc () +import Language.Haskell.Liquid.GHC.Misc () ------------------------------------------------------------------------------ diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/ACSS.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/ACSS.hs index c2e54c810e..9b5a56bef5 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/ACSS.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/ACSS.hs @@ -25,7 +25,7 @@ import qualified Data.HashMap.Strict as M import Data.List (find, isPrefixOf, findIndex, elemIndices, intercalate, elemIndex) import Data.Char (isSpace) import Text.Printf -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc import Language.Haskell.Liquid.Types.Errors (panic, impossible) data AnnMap = Ann diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Annotate.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Annotate.hs index f08639d2c7..3f3f6402fe 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Annotate.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Annotate.hs @@ -55,7 +55,7 @@ import qualified Language.Haskell.Liquid.UX.ACSS as ACSS import Language.Haskell.HsColour.Classify import Language.Fixpoint.Utils.Files import Language.Fixpoint.Misc -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc import qualified Liquid.GHC.API as SrcLoc import Language.Fixpoint.Types hiding (panic, Error, Loc, Constant (..), Located (..)) import Language.Haskell.Liquid.Misc diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/CmdLine.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/CmdLine.hs index 28e6cf5a0e..60a9da87da 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/CmdLine.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/CmdLine.hs @@ -77,7 +77,7 @@ import Language.Fixpoint.Solver.Stats as Solver import Language.Haskell.Liquid.UX.Annotate import Language.Haskell.Liquid.UX.Config import Language.Haskell.Liquid.UX.SimpleVersion (simpleVersion) -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc import Language.Haskell.Liquid.Types.PrettyPrint () import Language.Haskell.Liquid.Types hiding (typ) import qualified Language.Haskell.Liquid.UX.ACSS as ACSS diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/DiffCheck.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/DiffCheck.hs index f332c9c606..4e7c85da3e 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/DiffCheck.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/DiffCheck.hs @@ -53,7 +53,7 @@ import Language.Fixpoint.Types (atLoc, FixResult (..), import Language.Fixpoint.Utils.Files import Language.Fixpoint.Solver.Stats () import Language.Haskell.Liquid.Misc (mkGraph) -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc import Liquid.GHC.API as Ghc hiding ( Located , sourceName , text diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Errors.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Errors.hs index b5d30d2386..09651e8564 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Errors.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Errors.hs @@ -19,7 +19,7 @@ import Language.Haskell.Liquid.Types.RefType import Language.Haskell.Liquid.Transforms.Simplify import Language.Haskell.Liquid.UX.Tidy import Language.Haskell.Liquid.Types -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM import qualified Language.Haskell.Liquid.Misc as Misc import qualified Language.Fixpoint.Misc as Misc diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/QuasiQuoter.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/QuasiQuoter.hs index 1f4f74079f..21ea56659a 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/QuasiQuoter.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/QuasiQuoter.hs @@ -26,7 +26,7 @@ import Language.Haskell.TH.Quote import Language.Fixpoint.Types hiding (Error, Loc, SrcSpan) import qualified Language.Fixpoint.Types as F -import Liquid.GHC.Misc (fSrcSpan) +import Language.Haskell.Liquid.GHC.Misc (fSrcSpan) import Liquid.GHC.API (SrcSpan) import Language.Haskell.Liquid.Parse import Language.Haskell.Liquid.Types diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Tidy.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Tidy.hs index 76d09a2bba..2ea58c58d3 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Tidy.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/UX/Tidy.hs @@ -36,7 +36,7 @@ import qualified Data.HashSet as S import qualified Data.List as L import qualified Data.Text as T import qualified Control.Exception as Ex -import qualified Liquid.GHC.Misc as GM +import qualified Language.Haskell.Liquid.GHC.Misc as GM -- (dropModuleNames, showPpr, stringTyVar) import Language.Fixpoint.Types hiding (Result, SrcSpan, Error) import Language.Haskell.Liquid.Types.Types diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/WiredIn.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/WiredIn.hs index 86f0811270..d592de671b 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/WiredIn.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/WiredIn.hs @@ -28,7 +28,7 @@ module Language.Haskell.Liquid.WiredIn import Prelude hiding (error) -- import Language.Fixpoint.Misc (mapSnd) -import Liquid.GHC.Misc +import Language.Haskell.Liquid.GHC.Misc import qualified Liquid.GHC.API as Ghc import Liquid.GHC.API (Var, Arity, TyVar, Bind(..), Boxity(..), Expr(..), ArgFlag(..)) import Language.Haskell.Liquid.Types.Types @@ -41,7 +41,7 @@ import Language.Haskell.Liquid.Types.Names (selfSymbol) import qualified Language.Fixpoint.Types as F import qualified Data.HashSet as S -import Liquid.GHC.TypeRep () +import Language.Haskell.Liquid.GHC.TypeRep () -- | Horrible hack to support hardwired symbols like -- `head`, `tail`, `fst`, `snd`