From 2fe1432631ac103284729c9afbbf0b0045228150 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Mon, 29 Nov 2021 12:25:00 +0000 Subject: [PATCH] Remove `Language.Haskell.` from module names --- brittany.cabal | 60 +++++++++---------- source/executable/Main.hs | 2 +- .../{Language/Haskell => }/Brittany.hs | 10 ++-- .../Haskell => }/Brittany/Internal.hs | 36 +++++------ .../Haskell => }/Brittany/Internal/Backend.hs | 16 ++--- .../Brittany/Internal/BackendUtils.hs | 12 ++-- .../Haskell => }/Brittany/Internal/Config.hs | 12 ++-- .../Brittany/Internal/Config/Types.hs | 6 +- .../Internal/Config/Types/Instances.hs | 6 +- .../Brittany/Internal/ExactPrintUtils.hs | 10 ++-- .../Brittany/Internal/LayouterBasics.hs | 14 ++--- .../Brittany/Internal/Layouters/DataDecl.hs | 14 ++--- .../Brittany/Internal/Layouters/Decl.hs | 24 ++++---- .../Brittany/Internal/Layouters/Expr.hs | 22 +++---- .../Brittany/Internal/Layouters/Expr.hs-boot | 4 +- .../Brittany/Internal/Layouters/IE.hs | 10 ++-- .../Brittany/Internal/Layouters/Import.hs | 14 ++--- .../Brittany/Internal/Layouters/Module.hs | 16 ++--- .../Brittany/Internal/Layouters/Pattern.hs | 14 ++--- .../Brittany/Internal/Layouters/Stmt.hs | 18 +++--- .../Brittany/Internal/Layouters/Stmt.hs-boot | 4 +- .../Brittany/Internal/Layouters/Type.hs | 12 ++-- .../Brittany/Internal/Obfuscation.hs | 6 +- .../Brittany/Internal/ParseModule.hs | 2 +- .../Haskell => }/Brittany/Internal/Prelude.hs | 2 +- .../Brittany/Internal/PreludeUtils.hs | 2 +- .../Brittany/Internal/Transformations/Alt.hs | 12 ++-- .../Internal/Transformations/Columns.hs | 6 +- .../Internal/Transformations/Floating.hs | 10 ++-- .../Internal/Transformations/Indent.hs | 6 +- .../Brittany/Internal/Transformations/Par.hs | 8 +-- .../Haskell => }/Brittany/Internal/Types.hs | 6 +- .../Haskell => }/Brittany/Internal/Utils.hs | 10 ++-- .../{Language/Haskell => }/Brittany/Main.hs | 18 +++--- source/test-suite/Main.hs | 2 +- 35 files changed, 213 insertions(+), 213 deletions(-) rename source/library/{Language/Haskell => }/Brittany.hs (63%) rename source/library/{Language/Haskell => }/Brittany/Internal.hs (95%) rename source/library/{Language/Haskell => }/Brittany/Internal/Backend.hs (98%) rename source/library/{Language/Haskell => }/Brittany/Internal/BackendUtils.hs (98%) rename source/library/{Language/Haskell => }/Brittany/Internal/Config.hs (97%) rename source/library/{Language/Haskell => }/Brittany/Internal/Config/Types.hs (98%) rename source/library/{Language/Haskell => }/Brittany/Internal/Config/Types/Instances.hs (96%) rename source/library/{Language/Haskell => }/Brittany/Internal/ExactPrintUtils.hs (96%) rename source/library/{Language/Haskell => }/Brittany/Internal/LayouterBasics.hs (98%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/DataDecl.hs (97%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/Decl.hs (98%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/Expr.hs (98%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/Expr.hs-boot (67%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/IE.hs (96%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/Import.hs (94%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/Module.hs (94%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/Pattern.hs (95%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/Stmt.hs (87%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/Stmt.hs-boot (50%) rename source/library/{Language/Haskell => }/Brittany/Internal/Layouters/Type.hs (98%) rename source/library/{Language/Haskell => }/Brittany/Internal/Obfuscation.hs (93%) rename source/library/{Language/Haskell => }/Brittany/Internal/ParseModule.hs (99%) rename source/library/{Language/Haskell => }/Brittany/Internal/Prelude.hs (98%) rename source/library/{Language/Haskell => }/Brittany/Internal/PreludeUtils.hs (96%) rename source/library/{Language/Haskell => }/Brittany/Internal/Transformations/Alt.hs (99%) rename source/library/{Language/Haskell => }/Brittany/Internal/Transformations/Columns.hs (96%) rename source/library/{Language/Haskell => }/Brittany/Internal/Transformations/Floating.hs (97%) rename source/library/{Language/Haskell => }/Brittany/Internal/Transformations/Indent.hs (91%) rename source/library/{Language/Haskell => }/Brittany/Internal/Transformations/Par.hs (85%) rename source/library/{Language/Haskell => }/Brittany/Internal/Types.hs (99%) rename source/library/{Language/Haskell => }/Brittany/Internal/Utils.hs (97%) rename source/library/{Language/Haskell => }/Brittany/Main.hs (97%) diff --git a/brittany.cabal b/brittany.cabal index 45b6a65..c95544f 100644 --- a/brittany.cabal +++ b/brittany.cabal @@ -101,36 +101,36 @@ library autogen-modules: Paths_brittany hs-source-dirs: source/library exposed-modules: - Language.Haskell.Brittany - Language.Haskell.Brittany.Internal - Language.Haskell.Brittany.Internal.Backend - Language.Haskell.Brittany.Internal.BackendUtils - Language.Haskell.Brittany.Internal.Config - Language.Haskell.Brittany.Internal.Config.Types - Language.Haskell.Brittany.Internal.Config.Types.Instances - Language.Haskell.Brittany.Internal.ExactPrintUtils - Language.Haskell.Brittany.Internal.LayouterBasics - Language.Haskell.Brittany.Internal.Layouters.DataDecl - Language.Haskell.Brittany.Internal.Layouters.Decl - Language.Haskell.Brittany.Internal.Layouters.Expr - Language.Haskell.Brittany.Internal.Layouters.IE - Language.Haskell.Brittany.Internal.Layouters.Import - Language.Haskell.Brittany.Internal.Layouters.Module - Language.Haskell.Brittany.Internal.Layouters.Pattern - Language.Haskell.Brittany.Internal.Layouters.Stmt - Language.Haskell.Brittany.Internal.Layouters.Type - Language.Haskell.Brittany.Internal.Obfuscation - Language.Haskell.Brittany.Internal.ParseModule - Language.Haskell.Brittany.Internal.Prelude - Language.Haskell.Brittany.Internal.PreludeUtils - Language.Haskell.Brittany.Internal.Transformations.Alt - Language.Haskell.Brittany.Internal.Transformations.Columns - Language.Haskell.Brittany.Internal.Transformations.Floating - Language.Haskell.Brittany.Internal.Transformations.Indent - Language.Haskell.Brittany.Internal.Transformations.Par - Language.Haskell.Brittany.Internal.Types - Language.Haskell.Brittany.Internal.Utils - Language.Haskell.Brittany.Main + Brittany + Brittany.Internal + Brittany.Internal.Backend + Brittany.Internal.BackendUtils + Brittany.Internal.Config + Brittany.Internal.Config.Types + Brittany.Internal.Config.Types.Instances + Brittany.Internal.ExactPrintUtils + Brittany.Internal.LayouterBasics + Brittany.Internal.Layouters.DataDecl + Brittany.Internal.Layouters.Decl + Brittany.Internal.Layouters.Expr + Brittany.Internal.Layouters.IE + Brittany.Internal.Layouters.Import + Brittany.Internal.Layouters.Module + Brittany.Internal.Layouters.Pattern + Brittany.Internal.Layouters.Stmt + Brittany.Internal.Layouters.Type + Brittany.Internal.Obfuscation + Brittany.Internal.ParseModule + Brittany.Internal.Prelude + Brittany.Internal.PreludeUtils + Brittany.Internal.Transformations.Alt + Brittany.Internal.Transformations.Columns + Brittany.Internal.Transformations.Floating + Brittany.Internal.Transformations.Indent + Brittany.Internal.Transformations.Par + Brittany.Internal.Types + Brittany.Internal.Utils + Brittany.Main Paths_brittany executable brittany diff --git a/source/executable/Main.hs b/source/executable/Main.hs index 7a5ae94..6abfcca 100644 --- a/source/executable/Main.hs +++ b/source/executable/Main.hs @@ -1,4 +1,4 @@ -import qualified Language.Haskell.Brittany.Main as BrittanyMain +import qualified Brittany.Main as BrittanyMain main :: IO () main = BrittanyMain.main diff --git a/source/library/Language/Haskell/Brittany.hs b/source/library/Brittany.hs similarity index 63% rename from source/library/Language/Haskell/Brittany.hs rename to source/library/Brittany.hs index a2726c8..d7630ba 100644 --- a/source/library/Language/Haskell/Brittany.hs +++ b/source/library/Brittany.hs @@ -1,6 +1,6 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany +module Brittany ( parsePrintModule , staticDefaultConfig , forwardOptionsSyntaxExtsEnabled @@ -18,7 +18,7 @@ module Language.Haskell.Brittany , BrittanyError(..) ) where -import Language.Haskell.Brittany.Internal -import Language.Haskell.Brittany.Internal.Config -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal +import Brittany.Internal.Config +import Brittany.Internal.Config.Types +import Brittany.Internal.Types diff --git a/source/library/Language/Haskell/Brittany/Internal.hs b/source/library/Brittany/Internal.hs similarity index 95% rename from source/library/Language/Haskell/Brittany/Internal.hs rename to source/library/Brittany/Internal.hs index 06cbb63..e73bcef 100644 --- a/source/library/Language/Haskell/Brittany/Internal.hs +++ b/source/library/Brittany/Internal.hs @@ -2,7 +2,7 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE ScopedTypeVariables #-} -module Language.Haskell.Brittany.Internal +module Brittany.Internal ( parsePrintModule , parsePrintModuleTests , pPrintModule @@ -36,23 +36,23 @@ import qualified GHC.LanguageExtensions.Type as GHC import qualified GHC.OldList as List import GHC.Parser.Annotation (AnnKeywordId(..)) import GHC.Types.SrcLoc (SrcSpan) -import Language.Haskell.Brittany.Internal.Backend -import Language.Haskell.Brittany.Internal.BackendUtils -import Language.Haskell.Brittany.Internal.Config -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.ExactPrintUtils -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Layouters.Decl -import Language.Haskell.Brittany.Internal.Layouters.Module -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Transformations.Alt -import Language.Haskell.Brittany.Internal.Transformations.Columns -import Language.Haskell.Brittany.Internal.Transformations.Floating -import Language.Haskell.Brittany.Internal.Transformations.Indent -import Language.Haskell.Brittany.Internal.Transformations.Par -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.Backend +import Brittany.Internal.BackendUtils +import Brittany.Internal.Config +import Brittany.Internal.Config.Types +import Brittany.Internal.ExactPrintUtils +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Layouters.Decl +import Brittany.Internal.Layouters.Module +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Transformations.Alt +import Brittany.Internal.Transformations.Columns +import Brittany.Internal.Transformations.Floating +import Brittany.Internal.Transformations.Indent +import Brittany.Internal.Transformations.Par +import Brittany.Internal.Types +import Brittany.Internal.Utils import qualified Language.Haskell.GHC.ExactPrint as ExactPrint import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint import qualified UI.Butcher.Monadic as Butcher diff --git a/source/library/Language/Haskell/Brittany/Internal/Backend.hs b/source/library/Brittany/Internal/Backend.hs similarity index 98% rename from source/library/Language/Haskell/Brittany/Internal/Backend.hs rename to source/library/Brittany/Internal/Backend.hs index 55a3c97..35fb3c2 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Backend.hs +++ b/source/library/Brittany/Internal/Backend.hs @@ -4,7 +4,7 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE ScopedTypeVariables #-} -module Language.Haskell.Brittany.Internal.Backend where +module Brittany.Internal.Backend where import qualified Control.Monad.Trans.State.Strict as StateS import qualified Data.Either as Either @@ -19,13 +19,13 @@ import qualified Data.Set as Set import qualified Data.Text as Text import qualified Data.Text.Lazy.Builder as Text.Builder import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.BackendUtils -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.BackendUtils +import Brittany.Internal.Config.Types +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types +import Brittany.Internal.Utils import qualified Language.Haskell.GHC.ExactPrint as ExactPrint import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/BackendUtils.hs b/source/library/Brittany/Internal/BackendUtils.hs similarity index 98% rename from source/library/Language/Haskell/Brittany/Internal/BackendUtils.hs rename to source/library/Brittany/Internal/BackendUtils.hs index 310ea56..dbadef4 100644 --- a/source/library/Language/Haskell/Brittany/Internal/BackendUtils.hs +++ b/source/library/Brittany/Internal/BackendUtils.hs @@ -1,7 +1,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.BackendUtils where +module Brittany.Internal.BackendUtils where import qualified Data.Data import qualified Data.Either @@ -12,11 +12,11 @@ import qualified Data.Text as Text import qualified Data.Text.Lazy.Builder as Text.Builder import GHC (Located) import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.Config.Types +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types +import Brittany.Internal.Utils import Language.Haskell.GHC.ExactPrint.Types (AnnKey, Annotation) import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint diff --git a/source/library/Language/Haskell/Brittany/Internal/Config.hs b/source/library/Brittany/Internal/Config.hs similarity index 97% rename from source/library/Language/Haskell/Brittany/Internal/Config.hs rename to source/library/Brittany/Internal/Config.hs index 040320b..0f62c26 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Config.hs +++ b/source/library/Brittany/Internal/Config.hs @@ -1,7 +1,7 @@ {-# LANGUAGE MonadComprehensions #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Config where +module Brittany.Internal.Config where import qualified Data.Bool as Bool import qualified Data.ByteString as ByteString @@ -12,11 +12,11 @@ import qualified Data.List.NonEmpty as NonEmpty import qualified Data.Semigroup as Semigroup import qualified Data.Yaml import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.Config.Types.Instances () -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.Config.Types +import Brittany.Internal.Config.Types.Instances () +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Utils import qualified System.Console.CmdArgs.Explicit as CmdArgs import qualified System.Directory import qualified System.Directory as Directory diff --git a/source/library/Language/Haskell/Brittany/Internal/Config/Types.hs b/source/library/Brittany/Internal/Config/Types.hs similarity index 98% rename from source/library/Language/Haskell/Brittany/Internal/Config/Types.hs rename to source/library/Brittany/Internal/Config/Types.hs index 0f0075a..aed9f2c 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Config/Types.hs +++ b/source/library/Brittany/Internal/Config/Types.hs @@ -5,7 +5,7 @@ {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TemplateHaskell #-} -module Language.Haskell.Brittany.Internal.Config.Types where +module Brittany.Internal.Config.Types where import Data.CZipWith import Data.Coerce (Coercible, coerce) @@ -14,8 +14,8 @@ import qualified Data.Semigroup as Semigroup import Data.Semigroup (Last) import Data.Semigroup.Generic import GHC.Generics -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils () +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils () diff --git a/source/library/Language/Haskell/Brittany/Internal/Config/Types/Instances.hs b/source/library/Brittany/Internal/Config/Types/Instances.hs similarity index 96% rename from source/library/Language/Haskell/Brittany/Internal/Config/Types/Instances.hs rename to source/library/Brittany/Internal/Config/Types/Instances.hs index c667038..ef7113b 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Config/Types/Instances.hs +++ b/source/library/Brittany/Internal/Config/Types/Instances.hs @@ -16,13 +16,13 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Config.Types.Instances where +module Brittany.Internal.Config.Types.Instances where import qualified Data.Aeson.Key as Key import qualified Data.Aeson.Types as Aeson import Data.Yaml -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.Prelude +import Brittany.Internal.Config.Types +import Brittany.Internal.Prelude diff --git a/source/library/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs b/source/library/Brittany/Internal/ExactPrintUtils.hs similarity index 96% rename from source/library/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs rename to source/library/Brittany/Internal/ExactPrintUtils.hs index 63d6b53..863c1fd 100644 --- a/source/library/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs +++ b/source/library/Brittany/Internal/ExactPrintUtils.hs @@ -5,7 +5,7 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE ScopedTypeVariables #-} -module Language.Haskell.Brittany.Internal.ExactPrintUtils where +module Brittany.Internal.ExactPrintUtils where import qualified Control.Monad.State.Class as State.Class import qualified Control.Monad.Trans.MultiRWS.Strict as MultiRWSS @@ -23,10 +23,10 @@ import qualified GHC.Driver.CmdLine as GHC import GHC.Hs import qualified GHC.Types.SrcLoc as GHC import GHC.Types.SrcLoc (Located, SrcSpan) -import Language.Haskell.Brittany.Internal.Config.Types -import qualified Language.Haskell.Brittany.Internal.ParseModule as ParseModule -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils +import Brittany.Internal.Config.Types +import qualified Brittany.Internal.ParseModule as ParseModule +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils import qualified Language.Haskell.GHC.ExactPrint as ExactPrint import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint import qualified System.IO diff --git a/source/library/Language/Haskell/Brittany/Internal/LayouterBasics.hs b/source/library/Brittany/Internal/LayouterBasics.hs similarity index 98% rename from source/library/Language/Haskell/Brittany/Internal/LayouterBasics.hs rename to source/library/Brittany/Internal/LayouterBasics.hs index 136468e..d4e883b 100644 --- a/source/library/Language/Haskell/Brittany/Internal/LayouterBasics.hs +++ b/source/library/Brittany/Internal/LayouterBasics.hs @@ -4,7 +4,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.LayouterBasics where +module Brittany.Internal.LayouterBasics where import qualified Control.Monad.Trans.MultiRWS.Strict as MultiRWSS import qualified Control.Monad.Writer.Strict as Writer @@ -24,12 +24,12 @@ import GHC.Types.Name (getOccString) import GHC.Types.Name.Occurrence (occNameString) import GHC.Types.Name.Reader (RdrName(..)) import qualified GHC.Types.SrcLoc as GHC -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.ExactPrintUtils -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.Config.Types +import Brittany.Internal.ExactPrintUtils +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types +import Brittany.Internal.Utils import qualified Language.Haskell.GHC.ExactPrint as ExactPrint import qualified Language.Haskell.GHC.ExactPrint.Annotate as ExactPrint.Annotate import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/DataDecl.hs b/source/library/Brittany/Internal/Layouters/DataDecl.hs similarity index 97% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/DataDecl.hs rename to source/library/Brittany/Internal/Layouters/DataDecl.hs index 37f648e..8ed54ff 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/DataDecl.hs +++ b/source/library/Brittany/Internal/Layouters/DataDecl.hs @@ -1,7 +1,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Layouters.DataDecl where +module Brittany.Internal.Layouters.DataDecl where import qualified Data.Data import qualified Data.Semigroup as Semigroup @@ -10,12 +10,12 @@ import GHC (GenLocated(L), Located) import qualified GHC import GHC.Hs import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Layouters.Type -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Config.Types +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Layouters.Type +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/Decl.hs b/source/library/Brittany/Internal/Layouters/Decl.hs similarity index 98% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/Decl.hs rename to source/library/Brittany/Internal/Layouters/Decl.hs index 9e22b6e..fd55956 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/Decl.hs +++ b/source/library/Brittany/Internal/Layouters/Decl.hs @@ -3,7 +3,7 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE ScopedTypeVariables #-} -module Language.Haskell.Brittany.Internal.Layouters.Decl where +module Brittany.Internal.Layouters.Decl where import qualified Data.Data import qualified Data.Foldable @@ -23,17 +23,17 @@ import GHC.Types.Basic , RuleMatchInfo(..) ) import GHC.Types.SrcLoc (Located, SrcSpan, getLoc, unLoc) -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.ExactPrintUtils -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Layouters.DataDecl -import {-# SOURCE #-} Language.Haskell.Brittany.Internal.Layouters.Expr -import Language.Haskell.Brittany.Internal.Layouters.Pattern -import {-# SOURCE #-} Language.Haskell.Brittany.Internal.Layouters.Stmt -import Language.Haskell.Brittany.Internal.Layouters.Type -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Config.Types +import Brittany.Internal.ExactPrintUtils +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Layouters.DataDecl +import {-# SOURCE #-} Brittany.Internal.Layouters.Expr +import Brittany.Internal.Layouters.Pattern +import {-# SOURCE #-} Brittany.Internal.Layouters.Stmt +import Brittany.Internal.Layouters.Type +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types import qualified Language.Haskell.GHC.ExactPrint as ExactPrint import Language.Haskell.GHC.ExactPrint.Types (mkAnnKey) import qualified Language.Haskell.GHC.ExactPrint.Utils as ExactPrint diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/Expr.hs b/source/library/Brittany/Internal/Layouters/Expr.hs similarity index 98% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/Expr.hs rename to source/library/Brittany/Internal/Layouters/Expr.hs index 138a748..0b34383 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/Expr.hs +++ b/source/library/Brittany/Internal/Layouters/Expr.hs @@ -2,7 +2,7 @@ {-# LANGUAGE MonadComprehensions #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Layouters.Expr where +module Brittany.Internal.Layouters.Expr where import qualified Data.Data import qualified Data.Semigroup as Semigroup @@ -14,16 +14,16 @@ import GHC.Hs import qualified GHC.OldList as List import GHC.Types.Basic import GHC.Types.Name -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Layouters.Decl -import Language.Haskell.Brittany.Internal.Layouters.Pattern -import Language.Haskell.Brittany.Internal.Layouters.Stmt -import Language.Haskell.Brittany.Internal.Layouters.Type -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.Config.Types +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Layouters.Decl +import Brittany.Internal.Layouters.Pattern +import Brittany.Internal.Layouters.Stmt +import Brittany.Internal.Layouters.Type +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types +import Brittany.Internal.Utils diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/Expr.hs-boot b/source/library/Brittany/Internal/Layouters/Expr.hs-boot similarity index 67% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/Expr.hs-boot rename to source/library/Brittany/Internal/Layouters/Expr.hs-boot index 4f913c3..bfe60e4 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/Expr.hs-boot +++ b/source/library/Brittany/Internal/Layouters/Expr.hs-boot @@ -1,9 +1,9 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Layouters.Expr where +module Brittany.Internal.Layouters.Expr where import GHC.Hs -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/IE.hs b/source/library/Brittany/Internal/Layouters/IE.hs similarity index 96% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/IE.hs rename to source/library/Brittany/Internal/Layouters/IE.hs index 8684842..d1da317 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/IE.hs +++ b/source/library/Brittany/Internal/Layouters/IE.hs @@ -2,7 +2,7 @@ {-# LANGUAGE MultiWayIf #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Layouters.IE where +module Brittany.Internal.Layouters.IE where import qualified Data.List.Extra import qualified Data.Text as Text @@ -16,10 +16,10 @@ import GHC ) import GHC.Hs import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Prelude +import Brittany.Internal.Types +import Brittany.Internal.Utils diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/Import.hs b/source/library/Brittany/Internal/Layouters/Import.hs similarity index 94% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/Import.hs rename to source/library/Brittany/Internal/Layouters/Import.hs index fc17cde..93e7d83 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/Import.hs +++ b/source/library/Brittany/Internal/Layouters/Import.hs @@ -1,6 +1,6 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Layouters.Import where +module Brittany.Internal.Layouters.Import where import qualified Data.Semigroup as Semigroup import qualified Data.Text as Text @@ -8,12 +8,12 @@ import GHC (GenLocated(L), Located, moduleNameString, unLoc) import GHC.Hs import GHC.Types.Basic import GHC.Unit.Types (IsBootInterface(..)) -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Layouters.IE -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Config.Types +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Layouters.IE +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/Module.hs b/source/library/Brittany/Internal/Layouters/Module.hs similarity index 94% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/Module.hs rename to source/library/Brittany/Internal/Layouters/Module.hs index 8de45d7..2a6cdbb 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/Module.hs +++ b/source/library/Brittany/Internal/Layouters/Module.hs @@ -1,7 +1,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Layouters.Module where +module Brittany.Internal.Layouters.Module where import qualified Data.Maybe import qualified Data.Semigroup as Semigroup @@ -9,13 +9,13 @@ import qualified Data.Text as Text import GHC (AnnKeywordId(..), GenLocated(L), moduleNameString, unLoc) import GHC.Hs import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Layouters.IE -import Language.Haskell.Brittany.Internal.Layouters.Import -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Config.Types +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Layouters.IE +import Brittany.Internal.Layouters.Import +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types import Language.Haskell.GHC.ExactPrint as ExactPrint import Language.Haskell.GHC.ExactPrint.Types (DeltaPos(..), commentContents, deltaRow) diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs b/source/library/Brittany/Internal/Layouters/Pattern.hs similarity index 95% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs rename to source/library/Brittany/Internal/Layouters/Pattern.hs index 773d993..0d31ecb 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs +++ b/source/library/Brittany/Internal/Layouters/Pattern.hs @@ -1,7 +1,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Layouters.Pattern where +module Brittany.Internal.Layouters.Pattern where import qualified Data.Foldable as Foldable import qualified Data.Sequence as Seq @@ -10,12 +10,12 @@ import GHC (GenLocated(L), ol_val) import GHC.Hs import qualified GHC.OldList as List import GHC.Types.Basic -import Language.Haskell.Brittany.Internal.LayouterBasics -import {-# SOURCE #-} Language.Haskell.Brittany.Internal.Layouters.Expr -import Language.Haskell.Brittany.Internal.Layouters.Type -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.LayouterBasics +import {-# SOURCE #-} Brittany.Internal.Layouters.Expr +import Brittany.Internal.Layouters.Type +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs b/source/library/Brittany/Internal/Layouters/Stmt.hs similarity index 87% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs rename to source/library/Brittany/Internal/Layouters/Stmt.hs index 5ef19c7..729e3ef 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs +++ b/source/library/Brittany/Internal/Layouters/Stmt.hs @@ -2,20 +2,20 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE ScopedTypeVariables #-} -module Language.Haskell.Brittany.Internal.Layouters.Stmt where +module Brittany.Internal.Layouters.Stmt where import qualified Data.Semigroup as Semigroup import qualified Data.Text as Text import GHC (GenLocated(L)) import GHC.Hs -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Layouters.Decl -import {-# SOURCE #-} Language.Haskell.Brittany.Internal.Layouters.Expr -import Language.Haskell.Brittany.Internal.Layouters.Pattern -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Config.Types +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Layouters.Decl +import {-# SOURCE #-} Brittany.Internal.Layouters.Expr +import Brittany.Internal.Layouters.Pattern +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs-boot b/source/library/Brittany/Internal/Layouters/Stmt.hs-boot similarity index 50% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs-boot rename to source/library/Brittany/Internal/Layouters/Stmt.hs-boot index 6cfd5c8..0c1cf13 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs-boot +++ b/source/library/Brittany/Internal/Layouters/Stmt.hs-boot @@ -1,9 +1,9 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Layouters.Stmt where +module Brittany.Internal.Layouters.Stmt where import GHC.Hs -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Layouters/Type.hs b/source/library/Brittany/Internal/Layouters/Type.hs similarity index 98% rename from source/library/Language/Haskell/Brittany/Internal/Layouters/Type.hs rename to source/library/Brittany/Internal/Layouters/Type.hs index 1662ffb..a19be50 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Layouters/Type.hs +++ b/source/library/Brittany/Internal/Layouters/Type.hs @@ -1,7 +1,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Layouters.Type where +module Brittany.Internal.Layouters.Type where import qualified Data.Text as Text import GHC (AnnKeywordId(..), GenLocated(L)) @@ -9,11 +9,11 @@ import GHC.Hs import qualified GHC.OldList as List import GHC.Types.Basic import GHC.Utils.Outputable (ftext, showSDocUnsafe) -import Language.Haskell.Brittany.Internal.LayouterBasics -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.LayouterBasics +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types +import Brittany.Internal.Utils (FirstLastView(..), splitFirstLast) diff --git a/source/library/Language/Haskell/Brittany/Internal/Obfuscation.hs b/source/library/Brittany/Internal/Obfuscation.hs similarity index 93% rename from source/library/Language/Haskell/Brittany/Internal/Obfuscation.hs rename to source/library/Brittany/Internal/Obfuscation.hs index c1bd60a..6ec2320 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Obfuscation.hs +++ b/source/library/Brittany/Internal/Obfuscation.hs @@ -1,14 +1,14 @@ {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Obfuscation where +module Brittany.Internal.Obfuscation where import Data.Char import qualified Data.Map as Map import qualified Data.Set as Set import qualified Data.Text as Text import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils import System.Random diff --git a/source/library/Language/Haskell/Brittany/Internal/ParseModule.hs b/source/library/Brittany/Internal/ParseModule.hs similarity index 99% rename from source/library/Language/Haskell/Brittany/Internal/ParseModule.hs rename to source/library/Brittany/Internal/ParseModule.hs index 2cc259f..1a1ea51 100644 --- a/source/library/Language/Haskell/Brittany/Internal/ParseModule.hs +++ b/source/library/Brittany/Internal/ParseModule.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -Wno-implicit-prelude #-} -module Language.Haskell.Brittany.Internal.ParseModule where +module Brittany.Internal.ParseModule where import qualified Control.Monad as Monad import qualified Control.Monad.IO.Class as IO diff --git a/source/library/Language/Haskell/Brittany/Internal/Prelude.hs b/source/library/Brittany/Internal/Prelude.hs similarity index 98% rename from source/library/Language/Haskell/Brittany/Internal/Prelude.hs rename to source/library/Brittany/Internal/Prelude.hs index 8198533..a130166 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Prelude.hs +++ b/source/library/Brittany/Internal/Prelude.hs @@ -1,4 +1,4 @@ -module Language.Haskell.Brittany.Internal.Prelude +module Brittany.Internal.Prelude ( module E ) where diff --git a/source/library/Language/Haskell/Brittany/Internal/PreludeUtils.hs b/source/library/Brittany/Internal/PreludeUtils.hs similarity index 96% rename from source/library/Language/Haskell/Brittany/Internal/PreludeUtils.hs rename to source/library/Brittany/Internal/PreludeUtils.hs index 394a78d..1a6f5e4 100644 --- a/source/library/Language/Haskell/Brittany/Internal/PreludeUtils.hs +++ b/source/library/Brittany/Internal/PreludeUtils.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} -module Language.Haskell.Brittany.Internal.PreludeUtils where +module Brittany.Internal.PreludeUtils where import Control.Applicative import Control.DeepSeq (NFData, force) diff --git a/source/library/Language/Haskell/Brittany/Internal/Transformations/Alt.hs b/source/library/Brittany/Internal/Transformations/Alt.hs similarity index 99% rename from source/library/Language/Haskell/Brittany/Internal/Transformations/Alt.hs rename to source/library/Brittany/Internal/Transformations/Alt.hs index 5cca1ca..00a242e 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Transformations/Alt.hs +++ b/source/library/Brittany/Internal/Transformations/Alt.hs @@ -7,7 +7,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeOperators #-} -module Language.Haskell.Brittany.Internal.Transformations.Alt where +module Brittany.Internal.Transformations.Alt where import qualified Control.Monad.Memo as Memo import qualified Control.Monad.Trans.MultiRWS.Strict as MultiRWSS @@ -16,11 +16,11 @@ import qualified Data.List.Extra import qualified Data.Semigroup as Semigroup import qualified Data.Text as Text import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.Config.Types +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types +import Brittany.Internal.Utils diff --git a/source/library/Language/Haskell/Brittany/Internal/Transformations/Columns.hs b/source/library/Brittany/Internal/Transformations/Columns.hs similarity index 96% rename from source/library/Language/Haskell/Brittany/Internal/Transformations/Columns.hs rename to source/library/Brittany/Internal/Transformations/Columns.hs index 0d2231e..a43bd69 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Transformations/Columns.hs +++ b/source/library/Brittany/Internal/Transformations/Columns.hs @@ -1,12 +1,12 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Transformations.Columns where +module Brittany.Internal.Transformations.Columns where import qualified Data.Generics.Uniplate.Direct as Uniplate import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Prelude +import Brittany.Internal.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Transformations/Floating.hs b/source/library/Brittany/Internal/Transformations/Floating.hs similarity index 97% rename from source/library/Language/Haskell/Brittany/Internal/Transformations/Floating.hs rename to source/library/Brittany/Internal/Transformations/Floating.hs index 919decf..37d0b43 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Transformations/Floating.hs +++ b/source/library/Brittany/Internal/Transformations/Floating.hs @@ -1,14 +1,14 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Transformations.Floating where +module Brittany.Internal.Transformations.Floating where import qualified Data.Generics.Uniplate.Direct as Uniplate import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types +import Brittany.Internal.Utils diff --git a/source/library/Language/Haskell/Brittany/Internal/Transformations/Indent.hs b/source/library/Brittany/Internal/Transformations/Indent.hs similarity index 91% rename from source/library/Language/Haskell/Brittany/Internal/Transformations/Indent.hs rename to source/library/Brittany/Internal/Transformations/Indent.hs index 613c5f0..da0b102 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Transformations/Indent.hs +++ b/source/library/Brittany/Internal/Transformations/Indent.hs @@ -1,12 +1,12 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Transformations.Indent where +module Brittany.Internal.Transformations.Indent where import qualified Data.Generics.Uniplate.Direct as Uniplate import qualified GHC.OldList as List -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Prelude +import Brittany.Internal.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Transformations/Par.hs b/source/library/Brittany/Internal/Transformations/Par.hs similarity index 85% rename from source/library/Language/Haskell/Brittany/Internal/Transformations/Par.hs rename to source/library/Brittany/Internal/Transformations/Par.hs index 6fe374a..dda3329 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Transformations/Par.hs +++ b/source/library/Brittany/Internal/Transformations/Par.hs @@ -1,11 +1,11 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Internal.Transformations.Par where +module Brittany.Internal.Transformations.Par where -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal.Prelude +import Brittany.Internal.Types +import Brittany.Internal.Utils diff --git a/source/library/Language/Haskell/Brittany/Internal/Types.hs b/source/library/Brittany/Internal/Types.hs similarity index 99% rename from source/library/Language/Haskell/Brittany/Internal/Types.hs rename to source/library/Brittany/Internal/Types.hs index 6a2c8af..d8b1f44 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Types.hs +++ b/source/library/Brittany/Internal/Types.hs @@ -10,7 +10,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StandaloneDeriving #-} -module Language.Haskell.Brittany.Internal.Types where +module Brittany.Internal.Types where import qualified Control.Monad.Trans.MultiRWS.Strict as MultiRWSS import qualified Data.Data @@ -19,8 +19,8 @@ import qualified Data.Kind as Kind import qualified Data.Strict.Maybe as Strict import qualified Data.Text.Lazy.Builder as Text.Builder import GHC (AnnKeywordId, GenLocated, Located, SrcSpan) -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.Prelude +import Brittany.Internal.Config.Types +import Brittany.Internal.Prelude import qualified Language.Haskell.GHC.ExactPrint as ExactPrint import Language.Haskell.GHC.ExactPrint (AnnKey) import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint.Types diff --git a/source/library/Language/Haskell/Brittany/Internal/Utils.hs b/source/library/Brittany/Internal/Utils.hs similarity index 97% rename from source/library/Language/Haskell/Brittany/Internal/Utils.hs rename to source/library/Brittany/Internal/Utils.hs index b62028f..1210c98 100644 --- a/source/library/Language/Haskell/Brittany/Internal/Utils.hs +++ b/source/library/Brittany/Internal/Utils.hs @@ -5,7 +5,7 @@ {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE ScopedTypeVariables #-} -module Language.Haskell.Brittany.Internal.Utils where +module Brittany.Internal.Utils where import qualified Data.ByteString as B import qualified Data.Coerce @@ -22,10 +22,10 @@ import qualified GHC.OldList as List import GHC.Types.Name.Occurrence as OccName (occNameString) import qualified GHC.Types.SrcLoc as GHC import qualified GHC.Utils.Outputable as GHC -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types +import Brittany.Internal.Config.Types +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint.Types import qualified Language.Haskell.GHC.ExactPrint.Utils as ExactPrint.Utils import qualified Text.PrettyPrint as PP diff --git a/source/library/Language/Haskell/Brittany/Main.hs b/source/library/Brittany/Main.hs similarity index 97% rename from source/library/Language/Haskell/Brittany/Main.hs rename to source/library/Brittany/Main.hs index e599fc2..fe25bf2 100644 --- a/source/library/Language/Haskell/Brittany/Main.hs +++ b/source/library/Brittany/Main.hs @@ -2,7 +2,7 @@ {-# LANGUAGE MultiWayIf #-} {-# LANGUAGE NoImplicitPrelude #-} -module Language.Haskell.Brittany.Main where +module Brittany.Main where import Control.Monad (zipWithM) import qualified Control.Monad.Trans.Except as ExceptT @@ -20,14 +20,14 @@ import qualified GHC.Driver.Session as GHC import qualified GHC.LanguageExtensions.Type as GHC import qualified GHC.OldList as List import GHC.Utils.Outputable (Outputable(..), showSDocUnsafe) -import Language.Haskell.Brittany.Internal -import Language.Haskell.Brittany.Internal.Config -import Language.Haskell.Brittany.Internal.Config.Types -import Language.Haskell.Brittany.Internal.Obfuscation -import Language.Haskell.Brittany.Internal.Prelude -import Language.Haskell.Brittany.Internal.PreludeUtils -import Language.Haskell.Brittany.Internal.Types -import Language.Haskell.Brittany.Internal.Utils +import Brittany.Internal +import Brittany.Internal.Config +import Brittany.Internal.Config.Types +import Brittany.Internal.Obfuscation +import Brittany.Internal.Prelude +import Brittany.Internal.PreludeUtils +import Brittany.Internal.Types +import Brittany.Internal.Utils import qualified Language.Haskell.GHC.ExactPrint as ExactPrint import Paths_brittany import qualified System.Directory as Directory diff --git a/source/test-suite/Main.hs b/source/test-suite/Main.hs index e48ec56..7ff05a4 100644 --- a/source/test-suite/Main.hs +++ b/source/test-suite/Main.hs @@ -1,6 +1,6 @@ import qualified Control.Monad as Monad import qualified Data.List as List -import qualified Language.Haskell.Brittany.Main as Brittany +import qualified Brittany.Main as Brittany import qualified System.Directory as Directory import qualified System.FilePath as FilePath import qualified Test.Hspec as Hspec