diff --git a/GhcMod.hs b/GhcMod.hs index 7586ff3..551e30b 100644 --- a/GhcMod.hs +++ b/GhcMod.hs @@ -69,20 +69,20 @@ module GhcMod ( , unloadMappedFile ) where -import GhcMod.Boot -import GhcMod.Browse -import GhcMod.CaseSplit -import GhcMod.Check -import GhcMod.Debug -import GhcMod.FillSig -import GhcMod.Find -import GhcMod.Flag -import GhcMod.Info -import GhcMod.Lang -import GhcMod.Lint -import GhcMod.Modules -import GhcMod.PkgDoc -import GhcMod.Test +import GhcModExe.Boot +import GhcModExe.Browse +import GhcModExe.CaseSplit +import GhcModExe.Check +import GhcModExe.Debug +import GhcModExe.FillSig +import GhcModExe.Find +import GhcModExe.Flag +import GhcModExe.Info +import GhcModExe.Lang +import GhcModExe.Lint +import GhcModExe.Modules +import GhcModExe.PkgDoc +import GhcModExe.Test import Language.Haskell.GhcMod.Cradle import Language.Haskell.GhcMod.FileMapping import Language.Haskell.GhcMod.Logging diff --git a/GhcMod/Boot.hs b/GhcModExe/Boot.hs similarity index 82% rename from GhcMod/Boot.hs rename to GhcModExe/Boot.hs index cb39c03..35c43d3 100644 --- a/GhcMod/Boot.hs +++ b/GhcModExe/Boot.hs @@ -1,12 +1,12 @@ -module GhcMod.Boot where +module GhcModExe.Boot where import Control.Applicative import Prelude -import GhcMod.Browse -import GhcMod.Flag -import GhcMod.Lang -import GhcMod.Modules +import GhcModExe.Browse +import GhcModExe.Flag +import GhcModExe.Lang +import GhcModExe.Modules import Language.Haskell.GhcMod.Monad import Language.Haskell.GhcMod.Types (defaultBrowseOpts) diff --git a/GhcMod/Browse.hs b/GhcModExe/Browse.hs similarity index 99% rename from GhcMod/Browse.hs rename to GhcModExe/Browse.hs index 04e9599..d09666b 100644 --- a/GhcMod/Browse.hs +++ b/GhcModExe/Browse.hs @@ -1,5 +1,5 @@ {-# LANGUAGE CPP #-} -module GhcMod.Browse ( +module GhcModExe.Browse ( browse, BrowseOpts(..) ) where diff --git a/GhcMod/CaseSplit.hs b/GhcModExe/CaseSplit.hs similarity index 99% rename from GhcMod/CaseSplit.hs rename to GhcModExe/CaseSplit.hs index f2dadfb..02562aa 100644 --- a/GhcMod/CaseSplit.hs +++ b/GhcModExe/CaseSplit.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP #-} -module GhcMod.CaseSplit ( +module GhcModExe.CaseSplit ( splits ) where diff --git a/GhcMod/Check.hs b/GhcModExe/Check.hs similarity index 98% rename from GhcMod/Check.hs rename to GhcModExe/Check.hs index 80b27f8..dcb6868 100644 --- a/GhcMod/Check.hs +++ b/GhcModExe/Check.hs @@ -1,4 +1,4 @@ -module GhcMod.Check ( +module GhcModExe.Check ( checkSyntax , check , expandTemplate diff --git a/GhcMod/Debug.hs b/GhcModExe/Debug.hs similarity index 98% rename from GhcMod/Debug.hs rename to GhcModExe/Debug.hs index 9e53b41..49bec02 100644 --- a/GhcMod/Debug.hs +++ b/GhcModExe/Debug.hs @@ -1,4 +1,4 @@ -module GhcMod.Debug (debugInfo, rootInfo, componentInfo) where +module GhcModExe.Debug (debugInfo, rootInfo, componentInfo) where import Control.Arrow (first) import Control.Applicative @@ -11,7 +11,7 @@ import Data.Version import Data.List.Split import System.Directory -import GhcMod.Internal +import GhcModExe.Internal import Language.Haskell.GhcMod.Cradle import Language.Haskell.GhcMod.Monad import Language.Haskell.GhcMod.Output diff --git a/GhcMod/FillSig.hs b/GhcModExe/FillSig.hs similarity index 99% rename from GhcMod/FillSig.hs rename to GhcModExe/FillSig.hs index df5f98d..0172a3b 100644 --- a/GhcMod/FillSig.hs +++ b/GhcModExe/FillSig.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP, MultiParamTypeClasses, FunctionalDependencies #-} {-# LANGUAGE FlexibleInstances #-} -module GhcMod.FillSig ( +module GhcModExe.FillSig ( sig , refine , auto diff --git a/GhcMod/Find.hs b/GhcModExe/Find.hs similarity index 99% rename from GhcMod/Find.hs rename to GhcModExe/Find.hs index ebc60e5..8ed9225 100644 --- a/GhcMod/Find.hs +++ b/GhcModExe/Find.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP, BangPatterns, TupleSections, DeriveGeneric #-} -module GhcMod.Find +module GhcModExe.Find #ifndef SPEC ( Symbol , SymbolDb diff --git a/GhcMod/Flag.hs b/GhcModExe/Flag.hs similarity index 90% rename from GhcMod/Flag.hs rename to GhcModExe/Flag.hs index d202c57..1a09f77 100644 --- a/GhcMod/Flag.hs +++ b/GhcModExe/Flag.hs @@ -1,4 +1,4 @@ -module GhcMod.Flag where +module GhcModExe.Flag where import qualified Language.Haskell.GhcMod.Gap as Gap import Language.Haskell.GhcMod.Convert diff --git a/GhcMod/Info.hs b/GhcModExe/Info.hs similarity index 99% rename from GhcMod/Info.hs rename to GhcModExe/Info.hs index 662912d..0b635ae 100644 --- a/GhcMod/Info.hs +++ b/GhcModExe/Info.hs @@ -1,4 +1,4 @@ -module GhcMod.Info ( +module GhcModExe.Info ( info , types ) where diff --git a/GhcMod/Internal.hs b/GhcModExe/Internal.hs similarity index 98% rename from GhcMod/Internal.hs rename to GhcModExe/Internal.hs index 6bf38a8..d310690 100644 --- a/GhcMod/Internal.hs +++ b/GhcModExe/Internal.hs @@ -1,6 +1,6 @@ -- | Low level access to the ghc-mod library. -module GhcMod.Internal ( +module GhcModExe.Internal ( -- * Types GHCOption , IncludeDir diff --git a/GhcMod/Lang.hs b/GhcModExe/Lang.hs similarity index 90% rename from GhcMod/Lang.hs rename to GhcModExe/Lang.hs index ac5f16f..0a5ac4b 100644 --- a/GhcMod/Lang.hs +++ b/GhcModExe/Lang.hs @@ -1,4 +1,4 @@ -module GhcMod.Lang where +module GhcModExe.Lang where import DynFlags (supportedLanguagesAndExtensions) import Language.Haskell.GhcMod.Convert diff --git a/GhcMod/Lint.hs b/GhcModExe/Lint.hs similarity index 97% rename from GhcMod/Lint.hs rename to GhcModExe/Lint.hs index 3f0a986..12237a9 100644 --- a/GhcMod/Lint.hs +++ b/GhcModExe/Lint.hs @@ -1,4 +1,4 @@ -module GhcMod.Lint where +module GhcModExe.Lint where import Exception (ghandle) import Control.Exception (SomeException(..)) diff --git a/GhcMod/Modules.hs b/GhcModExe/Modules.hs similarity index 95% rename from GhcMod/Modules.hs rename to GhcModExe/Modules.hs index baeabcc..80abe7d 100644 --- a/GhcMod/Modules.hs +++ b/GhcModExe/Modules.hs @@ -1,4 +1,4 @@ -module GhcMod.Modules (modules) where +module GhcModExe.Modules (modules) where import Control.Arrow import Data.List diff --git a/GhcMod/PkgDoc.hs b/GhcModExe/PkgDoc.hs similarity index 96% rename from GhcMod/PkgDoc.hs rename to GhcModExe/PkgDoc.hs index 855e14f..d10d2d8 100644 --- a/GhcMod/PkgDoc.hs +++ b/GhcModExe/PkgDoc.hs @@ -1,4 +1,4 @@ -module GhcMod.PkgDoc (pkgDoc) where +module GhcModExe.PkgDoc (pkgDoc) where import Language.Haskell.GhcMod.Types import Language.Haskell.GhcMod.GhcPkg diff --git a/GhcMod/Test.hs b/GhcModExe/Test.hs similarity index 97% rename from GhcMod/Test.hs rename to GhcModExe/Test.hs index 03cb998..be127e9 100644 --- a/GhcMod/Test.hs +++ b/GhcModExe/Test.hs @@ -1,4 +1,4 @@ -module GhcMod.Test where +module GhcModExe.Test where import Control.Applicative import Data.List diff --git a/ghc-mod.cabal b/ghc-mod.cabal index 199e64e..d149c14 100644 --- a/ghc-mod.cabal +++ b/ghc-mod.cabal @@ -115,21 +115,21 @@ Library HS-Source-Dirs: ., core Exposed-Modules: GhcMod - GhcMod.Boot - GhcMod.Browse - GhcMod.CaseSplit - GhcMod.Check - GhcMod.Debug - GhcMod.FillSig - GhcMod.Find - GhcMod.Flag - GhcMod.Info - GhcMod.Internal - GhcMod.Lang - GhcMod.Lint - GhcMod.Modules - GhcMod.PkgDoc - GhcMod.Test + GhcModExe.Boot + GhcModExe.Browse + GhcModExe.CaseSplit + GhcModExe.Check + GhcModExe.Debug + GhcModExe.FillSig + GhcModExe.Find + GhcModExe.Flag + GhcModExe.Info + GhcModExe.Internal + GhcModExe.Lang + GhcModExe.Lint + GhcModExe.Modules + GhcModExe.PkgDoc + GhcModExe.Test Language.Haskell.GhcMod.CabalHelper Language.Haskell.GhcMod.Caching Language.Haskell.GhcMod.Caching.Types @@ -212,7 +212,7 @@ Library Executable ghc-mod Default-Language: Haskell2010 - Main-Is: GHCMod.hs + Main-Is: GHCModMain.hs Other-Modules: Paths_ghc_mod , GHCMod.Options , GHCMod.Options.Commands diff --git a/src/GHCMod.hs b/src/GHCModMain.hs similarity index 98% rename from src/GHCMod.hs rename to src/GHCModMain.hs index 3acc860..9693f4d 100644 --- a/src/GHCMod.hs +++ b/src/GHCModMain.hs @@ -17,8 +17,8 @@ import Prelude import GHCMod.Options import GhcMod -import GhcMod.Find -import GhcMod.Internal hiding (MonadIO,liftIO) +import GhcModExe.Find +import GhcModExe.Internal hiding (MonadIO,liftIO) import Language.Haskell.GhcMod.Monad import Language.Haskell.GhcMod.Types