diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ `smuggler2` uses [PVP Versioning][1]. The change log is available [on GitHub][2]. +## [0.3.5.1]: -- 14 June 2020 +- fix bug that left some files with open imports unprocessed +- add `LeaveOpenImports` and `MakeOpenImports` options + ## [0.3.4.2]: -- 10 June 2020 - Add test golden files to the distribution diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # For convenience # -.PHONY: build install test clean accept doc hlint ghcid weed +.PHONY: build install test clean accept doc hlint ghcid upload weed all: build test doc @@ -27,8 +27,15 @@ doc: cabal haddock - cabal v2-haddock --haddock-for-hackage --enable-doc -# cabal upload -d --publish dist-newstyle/smuggler2-0.3.x.y-docs.tar.gz + cabal haddock --haddock-for-hackage --enable-doc --haddock-option=--hyperlinked-source + +upload: + cabal check + cabal gen-bounds + cabal sdist + cabal haddock --haddock-for-hackage --enable-doc --haddock-option=--hyperlinked-source + cabal upload dist-newstyle/sdist/smuggler2-0.3.*.*.tar.gz +# cabal upload -d --publish dist-newstyle/smuggler2-0.3.*.*-docs.tar.gz hlint: hlint src test/Test.hs diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -17,15 +17,21 @@ name is used elsewhere in your package. Limiting exports may make it easier for `ghc` to optimise some code. -While writing code, it may be convenient to import a complete module (by not -specifiying what is to be imported from it) and then get Smuggler2 to limit the -import to include only the names that are used. +The [Haskell Wiki](https://wiki.haskell.org/Import_modules_properly) sets out +the pros and cons of using explicit import lists. `Smuggler2` offers the option +of leaving a module imports open (by not specifiying explcitly what is to be +imported from them) while developing and then getting `Smuggler2` to add minimal +lists of explicit exports. This helps to document modules and, arguably, makes +them easier to read by avoiding the need to qualify names to give an indication +of where they came from. It could also provides a cross-check that only expected +names are being used. ## How to use Install `smuggler2` using `cabal install --lib smuggler2`. -If you also want the `ghc` wrapper, install it using `cabal install exe:smuggler2`. +If you also want the `ghc` wrapper, install it using +`cabal install exe:smuggler2`. ### Adding Smuggler2 to your dependencies @@ -63,8 +69,8 @@ ### Alternatively, using a local version If you have installed `smuggler2` from a local copy of this repository, you may -need to add `-package smuggler2` to your `ghc-options` if you did not -install using the `--lib` flag to `cabal install`. +need to add `-package smuggler2` to your `ghc-options` if you did not install +using the `--lib` flag to `cabal install`. ### Or use a `ghc` wrapper @@ -83,6 +89,14 @@ $ cabal build -w ghc-smuggler2 ``` +Smuggler2 tries not to change files when there is no work to do. + +You can just run `ghcid` as usual: + +```bash +$ ghcid --command='cabal repl' +``` + ## Options `Smuggler2` has several (case-insensitive) options, which can be set by adding @@ -107,31 +121,42 @@ all available exports (which, again, you can, of course, then prune to your requirements). -Any other option value is used to generate a source file with a new extension of -the option value (`new` in the following example) rather than replacing the -original file. +- `LeaveOpenImports` and `MakeOpenImports` take a comma-separated list of module + names. The specified modules are to be left open if they were open in the + sourcee (in the case of `LeaveOpenImports`) and made open even if they were + not originall (in the case of `MakeOpenImports`). For example, you could add -```Cabal - ghc-options: -fplugin=Smuggler2.Plugin -fplugin-opt=Smuggler2.Plugin:new -``` + ```bash + -fplugin-opt=Smuggler2.Plugin:LeaveOpenImports:Relude,RIO,Prelude,Some.Module + ``` -This will create output files with a `.new` suffix rather the overwriting the -originals. + This may be helpful if you use ghc's `NoImplicitPrelude` language feature and + import a prelude manually. -Smuggler2 tries not to change files when there is no work to do. -So you can just run `ghcid` as usual: + If the `PreserveInstanceImports` option was sepecified, the `LeaveOpenImports` + and `MakeOpenImports` options override it for the specified modules, They have + no effect, if `NoImportProcessing` was specified. If a module is specified + both to be left open and made open, it will be made open. -```bash -$ ghcid --command='cabal repl' -``` +- Any other option value is used to generate a source file with a new extension + of the option value (`new` in the following example) rather than replacing the + original file. + ```Cabal + ghc-options: -fplugin=Smuggler2.Plugin -fplugin-opt=Smuggler2.Plugin:new + ``` + + This will create output files with a `.new` suffix rather the overwriting the + originals. + ## Caveats Because `cabal` and `ghc` don't have full support for distinguishing dependent -packages from plug-ins you will probably want to ensure that the build -dependencies for your project are installed into your local package db first, -before enabling sumuggler, otherwise they will all be processed by it too, -as your project builds, which should do no harm, but will increase your build time. +packages from plug-ins you will probably want to ensure that the build the +dependencies for your project tha are installed into your local package db +first, before enabling sumuggler, otherwise they will all be processed by it +too, as your project builds, which should do no harm, but will increase your +build time. `Smuggler2` is robust -- it can chew through the [Agda](https://github.com/agda/agda) codebase of over 370 modules with complex @@ -149,13 +174,13 @@ - `Smuggler2` rewrites the existing imports, rather than attempting to prune them. (This is a more aggressive approach than `smuggler` which focuses on - removing redundant imports.) It has advantages and disadvantages. - The advantage is that a minimal set of imports is generated in a reproducable + removing redundant imports.) It has advantages and disadvantages. The + advantage is that a minimal set of imports is generated in a reproducable format. So you can just import a library without specifying any specific - imports and `Smuggler2` will add an explict list of things that are - used from it. This can be a useful check and better document your modules. - The disdvantage is that imports may be reordered, comments and - blank lines dropped, external imports mixed with external, etc. + imports and `Smuggler2` will add an explict list of things that are used from + it. This can be a useful check and better document your modules. The + disdvantage is that imports may be reordered, comments and blank lines + dropped, external imports mixed with external, etc. - By default `Smuggler2` does not remove imports completely because an import may be being used to only import instances of typeclasses, So it will leave @@ -189,7 +214,7 @@ - Multiple separate import lines referring to the same library are not consolidated -- Literate Haskell `.lhs` files will procssed into ordinary haskell files a +- Literate Haskell `.lhs` files will procssed into ordinary haskell files wth a `-lhs` suffix. * `hiding` clauses may not be properly analysed. So hiding things that are not diff --git a/TODO.md b/TODO.md --- a/TODO.md +++ b/TODO.md @@ -14,7 +14,7 @@ - [ ] Do a better job of preserving comments -- [ ] Running test suite on both an imported module and the module that imports +- [X] Running test suite on both an imported module and the module that imports it creates race conditions because both cases will generate the same minimum imprts dump file @@ -34,3 +34,5 @@ - [ ] Check that an export does not need to be qualified - [ ]- Figure out fhy github workflow uses ghc 8.10.1 when it should be running 8.8.3 + +- [ ] #1 Add options for handling `NoImplictPrelude` and keeping it pristine? diff --git a/app/Main.hs b/app/Main.hs --- a/app/Main.hs +++ b/app/Main.hs @@ -1,21 +1,23 @@ -module Main ( - main ) where +module Main where -import GHC.Paths ( ghc ) -import System.Environment ( getArgs ) -import System.Exit ( exitWith ) +import GHC.Paths (ghc) +import System.Environment (getArgs) +import System.Exit (exitWith) import System.Process.Typed - ( runProcess, setEnvInherit, setWorkingDirInherit, shell ) + ( proc, + runProcess, + setEnvInherit, + setWorkingDirInherit, + ) main :: IO () main = do args <- getArgs + runProcess ( setWorkingDirInherit . setEnvInherit $ - shell - ( ghc - ++ " -fplugin=Smuggler2.Plugin " - ++ unwords args - ) + proc + ghc + ("-fplugin=Smuggler2.Plugin" : args) ) >>= exitWith diff --git a/smuggler2.cabal b/smuggler2.cabal --- a/smuggler2.cabal +++ b/smuggler2.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: smuggler2 -version: 0.3.4.2 +version: 0.3.5.1 synopsis: GHC Source Plugin that helps to minimise imports and generate explicit exports @@ -18,7 +18,7 @@ license-file: LICENSE author: jrp2014, Dmitrii Kovanikov, Veronika Romashkina maintainer: jrp2014 -copyright: 2020 jrp2014, Dmitrii Kovanikov +copyright: 2020 jrp2014, Dmitrii Kovanikov, Veronika Romashkina category: Development, Refactoring, Compiler Plugin build-type: Simple extra-doc-files: @@ -28,12 +28,12 @@ extra-source-files: test/tests/**/*.hs - test/tests/**/*.MinimiseImportsNoExportProcessing-golden + test/tests/**/*.MinimiseImportsNoExportProcessingPreludeDataVersion-golden test/tests/**/*.MinimiseImportsReplaceExports-golden test/tests/**/*.NoImportProcessingAddExplicitExports-golden test/tests/**/*.NoImportProcessingNoExportProcessing-golden test/tests/**/*.NoImportProcessingReplaceExports-golden - test/tests/**/*.PreserveInstanceImportsNoExportProcessing-golden + test/tests/**/*.PreserveInstanceImportsNoExportProcessingPrelude-golden Makefile Setup.hs weeder.dhall @@ -66,6 +66,7 @@ -O2 -Wall -Wextra -Wincomplete-uni-patterns -Wincomplete-record-updates -Wcompat -Widentities -Wredundant-constraints -fhide-source-paths + -fobject-code if impl(ghc >=8.10.0) ghc-options: -Wunused-packages -fwrite-ide-info @@ -114,6 +115,7 @@ , ghc >=8.6.5 && <8.11 , ghc-boot >=8.6.5 && <8.11 , ghc-exactprint ^>=0.6.3 + , split ^>=0.2.3 , syb ^>=0.7.1 if flag(debug) @@ -136,6 +138,7 @@ , containers , directory , filepath + , ghc , ghc-paths , smuggler2 , tasty diff --git a/src/Smuggler2/Options.hs b/src/Smuggler2/Options.hs --- a/src/Smuggler2/Options.hs +++ b/src/Smuggler2/Options.hs @@ -1,6 +1,6 @@ +{-# LANGUAGE DeriveAnyClass #-} -- | -- Description: handling of command line options - module Smuggler2.Options ( Options (..), parseCommandLineOptions, @@ -9,9 +9,12 @@ ) where -import Data.Char (toLower) -import Data.List (foldl') -import Plugins (CommandLineOption) +import Data.Char ( isSpace, toLower ) +import Data.List ( foldl' ) +import Data.List.Split ( splitOn ) +import GHC ( mkModuleName, ModuleName ) +import Outputable ( Outputable ) +import Plugins ( CommandLineOption ) -- | Ways of performing import processing data ImportAction = NoImportProcessing | PreserveInstanceImports | MinimiseImports @@ -25,14 +28,16 @@ data Options = Options { importAction :: ImportAction, exportAction :: ExportAction, - newExtension :: Maybe String + newExtension :: Maybe String, + leaveOpenImports :: [ModuleName], + makeOpenImports :: [ModuleName] } - deriving (Show) + deriving (Outputable) -- | The default is to retain instance-only imports (eg, Data.List () ) -- and add explict exports only if they are not already present defaultOptions :: Options -defaultOptions = Options PreserveInstanceImports AddExplicitExports Nothing +defaultOptions = Options PreserveInstanceImports AddExplicitExports Nothing [] [] -- | Simple command line option parser. Last occurrence wins. parseCommandLineOptions :: [CommandLineOption] -> Options @@ -46,4 +51,20 @@ "noexportprocessing" -> opts {exportAction = NoExportProcessing} "addexplicitexports" -> opts {exportAction = AddExplicitExports} "replaceexports" -> opts {exportAction = ReplaceExports} - _ -> opts {newExtension = Just clo} + _ + | Just modulenames <- stripPrefixCI "leaveopenimports:" clo -> + opts {leaveOpenImports = parseModuleNames modulenames} + | Just modulenames <- stripPrefixCI "makeopenimports:" clo -> + opts {makeOpenImports = parseModuleNames modulenames} + | otherwise -> opts {newExtension = Just clo} + +-- | split on comma. Not v robust ( +parseModuleNames :: String -> [ModuleName] +parseModuleNames arg = mkModuleName <$> splitOn "," (filter (not . isSpace) arg) + +-- | case-insensitive version of @Data.List.stripPrefix@ +stripPrefixCI :: String -> String -> Maybe String +stripPrefixCI [] ys = Just ys +stripPrefixCI (x : xs) (y : ys) + | toLower x == toLower y = stripPrefixCI xs ys +stripPrefixCI _ _ = Nothing diff --git a/src/Smuggler2/Plugin.hs b/src/Smuggler2/Plugin.hs --- a/src/Smuggler2/Plugin.hs +++ b/src/Smuggler2/Plugin.hs @@ -7,70 +7,73 @@ ) where -import Avail ( AvailInfo, Avails ) -import Control.Monad ( unless ) -import Data.Bool ( bool ) -import Data.Maybe ( fromMaybe, isNothing ) -import Data.Version ( showVersion ) -import DynFlags - ( DynFlags(dumpDir), HasDynFlags(getDynFlags), xopt ) -import ErrUtils ( compilationProgressMsg, fatalErrorMsg ) +import Avail (AvailInfo, Avails) +import Control.Monad (unless, when) +import Data.Bool (bool) +import Data.List (intersect) +import Data.Maybe (fromMaybe, isJust, isNothing) +import Data.Version (showVersion) +import DynFlags (DynFlags (dumpDir), HasDynFlags (getDynFlags), xopt) +import ErrUtils (compilationProgressMsg, fatalErrorMsg, warningMsg) import GHC - ( GenLocated(L), - GhcPs, - HsModule(hsmodExports, hsmodImports), - ImportDecl(ideclHiding, ideclImplicit), - LIE, - LImportDecl, - Located, - ms_location, - ml_hs_file, - ModSummary(ms_hspp_buf, ms_mod), - Module(moduleName), - ParsedSource, - moduleNameString, - unLoc ) -import GHC.LanguageExtensions ( Extension(Cpp) ) -import GHC.IO.Encoding ( setLocaleEncoding, utf8 ) -import IOEnv ( MonadIO(liftIO), readMutVar ) + ( GenLocated (L), + GhcPs, + GhcRn, + HsModule (hsmodExports, hsmodImports), + ImportDecl (ideclHiding, ideclImplicit, ideclName), + LIE, + LImportDecl, + Located, + ModSummary (ms_hspp_buf, ms_mod), + Module (moduleName), + ParsedSource, + ml_hs_file, + moduleNameString, + ms_location, + unLoc, + ) +import GHC.IO.Encoding (setLocaleEncoding, utf8) +import GHC.LanguageExtensions (Extension (Cpp)) +import IOEnv (MonadIO (liftIO), readMutVar) import Language.Haskell.GHC.ExactPrint - ( Anns, - TransformT, - addTrailingCommaT, - exactPrint, - graftT, - runTransform, - setEntryDPT ) -import Language.Haskell.GHC.ExactPrint.Types ( DeltaPos(DP) ) -import Outputable - ( Outputable(ppr), neverQualify, printForUser, text, vcat ) -import Paths_smuggler2 ( version ) + ( Anns, + TransformT, + addTrailingCommaT, + exactPrint, + graftT, + runTransform, + setEntryDPT, + ) +import Language.Haskell.GHC.ExactPrint.Types (DeltaPos (DP)) +import Outputable (Outputable (ppr), neverQualify, printForUser, text, vcat) +import Paths_smuggler2 (version) import Plugins - ( CommandLineOption, - Plugin(pluginRecompile, typeCheckResultAction), - defaultPlugin, - purePlugin ) -import RnNames ( ImportDeclUsage, findImportUsage ) -import Smuggler2.Anns ( mkLoc, mkParenT ) -import Smuggler2.Imports ( getMinimalImports ) -import Smuggler2.Exports ( mkExportAnnT ) + ( CommandLineOption, + Plugin (pluginRecompile, typeCheckResultAction), + defaultPlugin, + purePlugin, + ) +import RnNames (ImportDeclUsage, findImportUsage) +import Smuggler2.Anns (mkLoc, mkParenT) +import Smuggler2.Exports (mkExportAnnT) +import Smuggler2.Imports (getMinimalImports) import Smuggler2.Options - ( ExportAction(AddExplicitExports, NoExportProcessing, - ReplaceExports), - ImportAction(MinimiseImports, NoImportProcessing), - Options(exportAction, importAction, newExtension), - parseCommandLineOptions ) -import Smuggler2.Parser ( runParser ) -import StringBuffer ( StringBuffer(StringBuffer), lexemeToString ) -import System.Directory ( removeFile ) -import System.FilePath ( (-<.>), (), isExtensionOf, takeExtension ) -import System.IO ( IOMode(WriteMode), withFile ) -import TcRnExports ( exports_from_avail ) + ( ExportAction (AddExplicitExports, NoExportProcessing, ReplaceExports), + ImportAction (MinimiseImports, NoImportProcessing), + Options (..), + parseCommandLineOptions, + ) +import Smuggler2.Parser (runParser) +import StringBuffer (StringBuffer (StringBuffer), lexemeToString) +import System.Directory (removeFile) +import System.FilePath (isExtensionOf, takeExtension, (-<.>), ()) +import System.IO (IOMode (WriteMode), withFile) +import TcRnExports (exports_from_avail) import TcRnTypes - ( TcGblEnv(tcg_rdr_env, tcg_imports, tcg_mod, tcg_exports, - tcg_rn_imports, tcg_used_gres, tcg_rn_exports), - TcM, - RnM ) + ( RnM, + TcGblEnv (tcg_exports, tcg_imports, tcg_mod, tcg_rdr_env, tcg_rn_exports, tcg_rn_imports, tcg_used_gres), + TcM, + ) -- | 'Plugin' interface to GHC plugin :: Plugin @@ -83,19 +86,27 @@ -- | The plugin itself smugglerPlugin :: [CommandLineOption] -> ModSummary -> TcGblEnv -> TcM TcGblEnv smugglerPlugin clopts modSummary tcEnv - -- short circuit, if nothing to do + -- short circuit silently, if nothing to do | (importAction options == NoImportProcessing) && (exportAction options == NoExportProcessing) = return tcEnv | otherwise = do - -- Get the imports and their usage - let imports = tcg_rn_imports tcEnv + dflags <- getDynFlags + liftIO $ compilationProgressMsg dflags ("smuggler2 " ++ showVersion version) + + -- Get imports usage uses <- readMutVar $ tcg_used_gres tcEnv let usage = findImportUsage imports uses -- This ensures that the source file is not touched if there are no unused - -- imports, or exports already exist and we are not replacing them - let noUnusedImports = all (\(_decl, used, unused) -> not (null used) && null unused) usage + -- imports, or exports already exist and we are not replacing them. Assumes + -- that an open import (ideclHiding Nothing) has unused imports. + let noUnusedImports = + all + ( \(L _ decl, used, unused) -> + null unused && not (null used) && isJust (ideclHiding decl) + ) + usage let hasExplicitExports = case tcg_rn_exports tcEnv of Nothing -> False -- There is not even a module header @@ -110,25 +121,41 @@ && ( exportAction options == NoExportProcessing || (hasExplicitExports && exportAction options /= ReplaceExports) ) - then return tcEnv + then do + liftIO $ + compilationProgressMsg + dflags + ( "smuggler2: nothing to do for module " + ++ (moduleNameString . moduleName $ ms_mod modSummary) + ) + return tcEnv else do - dflags <- getDynFlags - liftIO $ compilationProgressMsg dflags ("smuggler2 " ++ showVersion version) + when (importAction options == NoImportProcessing && not (null $ leaveOpenImports options)) + . liftIO + $ warningMsg dflags (text "LeaveOpenModules ignored as NoImportProcessing also specified") + when (importAction options == NoImportProcessing && not (null $ makeOpenImports options)) + . liftIO + $ warningMsg dflags (text "MakeOpenModules ignored as NoImportProcessing also specified") -- Dump GHC's view of what the minimal imports are for the current - -- module, so that they can be annotated when parsed back in + -- module, so that they can be annotated when parsed back in. -- This is needed because there too much information loss between -- the parsed and renamed AST to use the latter for reconstituting the - -- source. An alternative would be to "index" each name location with + -- source. @ghc-exactprint@ "index"es ('Anns') each name location with -- a SrcSpan to allow the name matchup, and to make the 'ParsedSource' a -- 100% representation of the original source (modulo tabs, trailing -- whitespace per line). let minImpFilePath = mkMinimalImportsPath dflags (ms_mod modSummary) printMinimalImports' dflags minImpFilePath usage - -- Run smuggling only for its side effects + -- Run smuggling only for its side effects; don't change the tcEnv we + -- were givem. tcEnv <$ smuggling dflags minImpFilePath where + -- The original imports + imports :: [LImportDecl GhcRn] + imports = tcg_rn_imports tcEnv + -- Does all the work smuggling :: DynFlags -> FilePath -> RnM () smuggling dflags minImpFilePath = do @@ -159,7 +186,8 @@ liftIO $ fatalErrorMsg dflags (text $ "smuggler: failed to parse minimal imports from " ++ minImpFilePath) Right (annsImpMod, L _ impMod) -> do - -- The actual minimal imports themselves, as generated by GHC + -- The actual minimal imports themselves, as generated by GHC, + -- with open imports processed as specified let minImports = hsmodImports impMod -- What is exported by the module @@ -187,20 +215,25 @@ -- Print the result let newContent = exactPrint astHsMod' annsHsMod' - liftIO $ writeFile (modulePath -<.> ext) newContent + let newModulePath = modulePath -<.> ext + liftIO $ writeFile newModulePath newContent + liftIO $ + compilationProgressMsg + dflags + ( "smuggler2: output written to " ++ newModulePath ) + -- Clean up: delete the GHC-generated imports file liftIO $ removeFile minImpFilePath where - -- Generates the things that would be exportabe if there were no -- explicit export header, so suitable for replacing one exportable :: RnM [AvailInfo] exportable = do let rdr_env = tcg_rdr_env tcEnv - let imports = tcg_imports tcEnv -- actually not needed for the Nothing case + let importAvails = tcg_imports tcEnv -- actually not needed for the Nothing case let this_mod = tcg_mod tcEnv - exports <- exports_from_avail Nothing rdr_env imports this_mod + exports <- exports_from_avail Nothing rdr_env importAvails this_mod return (snd exports) -- Replace a target module's imports @@ -254,6 +287,7 @@ | otherwise = do -- Generate the exports list exportsList <- mapM mkExportAnnT exports + -- add commas in between and parens around mapM_ addTrailingCommaT (init exportsList) lExportsList <- mkLoc exportsList >>= mkParenT unLoc @@ -264,7 +298,9 @@ -- This version of the GHC function ignores implicit imports, as they -- cannot be parsed back in. (There is an extraneous (implicit)) - -- It also provides for leaving out instance-only imports (eg, Data.List() ) + -- It also provides for leaving out instance-only imports (eg, + -- @import Data.List ()@) and handles the preservation of open imports + -- (eg, @import Prelude@) printMinimalImports' :: DynFlags -> FilePath -> [ImportDeclUsage] -> RnM () printMinimalImports' dflags filename imports_w_usage = do @@ -279,19 +315,46 @@ -- we never qualify things inside there -- E.g. import Blag( f, b ) -- not import Blag( Blag.f, Blag.g )! - printForUser dflags h neverQualify (vcat (map ppr (filter (letThrough . unLoc) imports'))) + printForUser + dflags + h + neverQualify + ( vcat + ( map + (ppr . leaveOpen) + (filter letThrough imports') + ) + ) ) where notImplicit :: ImportDecl pass -> Bool notImplicit = not . ideclImplicit + -- notInstancesOnly :: ImportDecl pass -> Bool notInstancesOnly i = case ideclHiding i of Just (False, L _ []) -> False _ -> True + -- keepInstanceOnlyImports :: Bool keepInstanceOnlyImports = importAction options /= MinimiseImports - letThrough :: ImportDecl pass -> Bool - letThrough i = notImplicit i && (keepInstanceOnlyImports || notInstancesOnly i) + -- Ignore explicit instance only imports, unless the 'MinimiseImports' + -- option is specified + letThrough :: LImportDecl pass -> Bool + letThrough (L _ i) = notImplicit i && (keepInstanceOnlyImports || notInstancesOnly i) + -- + leaveOpen :: LImportDecl pass -> LImportDecl pass + leaveOpen (L l decl) = L l $ case ideclHiding decl of + Just (False, L _ _) -- ie, not hiding + | thisModule `elem` kModules || thisModule `elem` mModules -> decl {ideclHiding = Nothing} + _ -> decl + where + thisModule = unLoc (ideclName decl) + mModules = makeOpenImports options + lModules = leaveOpenImports options + oModules = unLoc . ideclName <$> filter isOpen (unLoc <$> imports) -- original open imports + where + isOpen = isNothing . ideclHiding + kModules = lModules `intersect` oModules -- original open imports to leave open -- Construct the path into which GHC's version of minimal imports is dumped mkMinimalImportsPath :: DynFlags -> Module -> FilePath @@ -307,5 +370,6 @@ options :: Options options = parseCommandLineOptions clopts + -- strBufToStr :: StringBuffer -> String strBufToStr sb@(StringBuffer _ len _) = lexemeToString sb len diff --git a/test/Test.hs b/test/Test.hs --- a/test/Test.hs +++ b/test/Test.hs @@ -3,10 +3,11 @@ module Main where import Control.Monad (forM) -import Data.List (sort) +import Data.List (intercalate, sort) import Data.Maybe (fromMaybe) import qualified Data.Set as Set (fromList, member) import GHC.Paths (ghc) +import GHC (mkModuleName, moduleNameString) import Smuggler2.Options (ExportAction (..), ImportAction (..), Options (..)) import System.Directory (doesDirectoryExist, getDirectoryContents) import System.Environment (lookupEnv) @@ -28,20 +29,29 @@ -- | Combinations of import and export action options to be tested optionsList :: [Options] optionsList = - [ mkOptions PreserveInstanceImports NoExportProcessing, - mkOptions MinimiseImports ReplaceExports, - mkOptions MinimiseImports NoExportProcessing, - mkOptions NoImportProcessing AddExplicitExports, - mkOptions NoImportProcessing NoExportProcessing, - mkOptions NoImportProcessing ReplaceExports + [ mkOptions PreserveInstanceImports NoExportProcessing [] ["Prelude"], + mkOptions MinimiseImports ReplaceExports [] [], + mkOptions MinimiseImports NoExportProcessing ["Prelude", "Data.Version"] [], + mkOptions NoImportProcessing AddExplicitExports [] [], + mkOptions NoImportProcessing NoExportProcessing [] [], + mkOptions NoImportProcessing ReplaceExports [] [] ] where - mkOptions :: ImportAction -> ExportAction -> Options - mkOptions ia ea = Options ia ea (Just $ mkExt ia ea) + mkOptions :: ImportAction -> ExportAction -> [String] -> [String] -> Options + mkOptions ia ea lo mo = + Options + ia + ea + (Just $ mkExt ia ea lo mo) + (mkModuleName <$> lo) + (mkModuleName <$> mo) -- | Make an extention for an output file -mkExt :: ImportAction -> ExportAction -> String -mkExt ia ea = show ia ++ show ea -- ++ "-" ++ takeFileName ghc +mkExt :: ImportAction -> ExportAction -> [String] -> [String] -> String +mkExt ia ea lo mo = + show ia + ++ show ea + ++ filter (/= '.') ( concat lo ++ concat mo ) -- ++ "-" ++ takeFileName ghc -- | Generate test for a list of 'Options' each of which specify what action to -- take on imports and exports @@ -59,11 +69,13 @@ testName [ goldenVsFileDiff (takeBaseName testFile) -- test name - (\ref new -> ["git", "diff", "--no-index", ref, new]) -- how to display diffs + -- The -G. is needed because cabal sdist changes the golden file + -- permissions and so all the tests fail. + (\ref new -> ["git", "diff", "--no-index", "-G.", ref, new]) -- how to display diffs (testFile -<.> testName ++ "-golden") -- golden file outputFilename ( do - -- Write a default output file for those tests where smuggler + -- Write a default output file for those tests where smuggler2 -- (deliberately) does not generate a new one writeBinaryFile outputFilename "Source file was not touched\r\n" compile testFile opts @@ -119,14 +131,15 @@ setWorkingDirInherit . setEnvInherit $ proc (head cabalCmd) - (tail cabalCmd ++ cabalArgs) :: ProcessConfig () () () + (tail cabalCmd ++ cabalArgs) :: + ProcessConfig () () () runProcess_ cabalConfig where cabalArgs :: [String] cabalArgs = -- - not sure why it is necessary to mention the smuggler2 package explicitly, -- but it appears to be hidden otherwise. - -- - This also puts the .imports files that smuggler generates somewhere they + -- - This also puts the .imports files that smuggler2 generates somewhere they -- can easily be found [ "--with-compiler=" ++ ghc, "exec", @@ -143,7 +156,14 @@ ("-fplugin-opt=Smuggler2.Plugin:" ++) ( let ia = importAction opts ea = exportAction opts - -- the extension should have been set by 'optionsList' - in (fromMaybe "missng" (newExtension opts) : [show ia, show ea]) + ne = newExtension opts + lo = intercalate "," (moduleNameString <$> leaveOpenImports opts) + mo = intercalate "," (moduleNameString <$> makeOpenImports opts) + in -- The extension should have been set by 'optionsList' + -- The rest of the list are the other arguments for the test + ( fromMaybe "missng" ne : [show ia, show ea] + ++ ["LeaveOpenImports:" ++ lo | not (null lo)] + ++ ["MakeOpenImports:" ++ mo | not (null mo)] + ) ) ++ [testcase] diff --git a/test/tests/Bare.MinimiseImportsNoExportProcessing-golden b/test/tests/Bare.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Bare.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ - - -main = undefined diff --git a/test/tests/Bare.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/Bare.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/Bare.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,3 @@ + + +main = undefined diff --git a/test/tests/Bare.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/Bare.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Bare.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ - - -import Data.List () - -main = undefined diff --git a/test/tests/Bare.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/Bare.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/Bare.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ + + +import Data.List () + +main = undefined diff --git a/test/tests/BareHello.MinimiseImportsNoExportProcessing-golden b/test/tests/BareHello.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BareHello.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/BareHello.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/BareHello.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/BareHello.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,5 @@ +module BareHello where + +foo = (+1) + +main = putStrLn "Hello, World" diff --git a/test/tests/BareHello.MinimiseImportsReplaceExports-golden b/test/tests/BareHello.MinimiseImportsReplaceExports-golden --- a/test/tests/BareHello.MinimiseImportsReplaceExports-golden +++ b/test/tests/BareHello.MinimiseImportsReplaceExports-golden @@ -1,4 +1,7 @@ module BareHello ( + foo, main ) where + +foo = (+1) main = putStrLn "Hello, World" diff --git a/test/tests/BareHello.NoImportProcessingAddExplicitExports-golden b/test/tests/BareHello.NoImportProcessingAddExplicitExports-golden --- a/test/tests/BareHello.NoImportProcessingAddExplicitExports-golden +++ b/test/tests/BareHello.NoImportProcessingAddExplicitExports-golden @@ -1,4 +1,7 @@ module BareHello ( + foo, main ) where + +foo = (+1) main = putStrLn "Hello, World" diff --git a/test/tests/BareHello.NoImportProcessingReplaceExports-golden b/test/tests/BareHello.NoImportProcessingReplaceExports-golden --- a/test/tests/BareHello.NoImportProcessingReplaceExports-golden +++ b/test/tests/BareHello.NoImportProcessingReplaceExports-golden @@ -1,4 +1,7 @@ module BareHello ( + foo, main ) where + +foo = (+1) main = putStrLn "Hello, World" diff --git a/test/tests/BareHello.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/BareHello.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BareHello.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/BareHello.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/BareHello.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/BareHello.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module BareHello where + +foo = (+1) + +main = putStrLn "Hello, World" diff --git a/test/tests/BareHello.hs b/test/tests/BareHello.hs --- a/test/tests/BareHello.hs +++ b/test/tests/BareHello.hs @@ -1,3 +1,5 @@ module BareHello where +foo = (+1) + main = putStrLn "Hello, World" diff --git a/test/tests/BoolBoolUnused.MinimiseImportsNoExportProcessing-golden b/test/tests/BoolBoolUnused.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BoolBoolUnused.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -module Test.BoolBoolUnused where diff --git a/test/tests/BoolBoolUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/BoolBoolUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/BoolBoolUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,1 @@ +module Test.BoolBoolUnused where diff --git a/test/tests/BoolBoolUnused.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/BoolBoolUnused.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BoolBoolUnused.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.BoolBoolUnused where - -import Data.Bool () diff --git a/test/tests/BoolBoolUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/BoolBoolUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/BoolBoolUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,3 @@ +module Test.BoolBoolUnused where + +import Data.Bool () diff --git a/test/tests/BoolBoolUsed.MinimiseImportsNoExportProcessing-golden b/test/tests/BoolBoolUsed.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BoolBoolUsed.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.BoolBoolUsed where - -import Data.Bool ( bool ) - -func = bool diff --git a/test/tests/BoolBoolUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/BoolBoolUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/BoolBoolUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,5 @@ +module Test.BoolBoolUsed where + +import Data.Bool ( bool ) + +func = bool diff --git a/test/tests/BoolBoolUsed.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/BoolBoolUsed.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BoolBoolUsed.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.BoolBoolUsed where - -import Data.Bool ( bool ) - -func = bool diff --git a/test/tests/BoolBoolUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/BoolBoolUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/BoolBoolUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.BoolBoolUsed where + +import Data.Bool ( bool ) + +func = bool diff --git a/test/tests/BoolPartlyUsedFirst.MinimiseImportsNoExportProcessing-golden b/test/tests/BoolPartlyUsedFirst.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BoolPartlyUsedFirst.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.BoolPartlyUsedFirst where - -import Data.Bool ( bool ) - -foo = bool diff --git a/test/tests/BoolPartlyUsedFirst.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/BoolPartlyUsedFirst.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/BoolPartlyUsedFirst.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,5 @@ +module Test.BoolPartlyUsedFirst where + +import Data.Bool ( bool ) + +foo = bool diff --git a/test/tests/BoolPartlyUsedFirst.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/BoolPartlyUsedFirst.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BoolPartlyUsedFirst.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.BoolPartlyUsedFirst where - -import Data.Bool ( bool ) - -foo = bool diff --git a/test/tests/BoolPartlyUsedFirst.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/BoolPartlyUsedFirst.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/BoolPartlyUsedFirst.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.BoolPartlyUsedFirst where + +import Data.Bool ( bool ) + +foo = bool diff --git a/test/tests/BoolPartlyUsedLast.MinimiseImportsNoExportProcessing-golden b/test/tests/BoolPartlyUsedLast.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BoolPartlyUsedLast.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.BoolPartlyUsedLast where - -foo = not diff --git a/test/tests/BoolPartlyUsedLast.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/BoolPartlyUsedLast.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/BoolPartlyUsedLast.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,3 @@ +module Test.BoolPartlyUsedLast where + +foo = not diff --git a/test/tests/BoolPartlyUsedLast.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/BoolPartlyUsedLast.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/BoolPartlyUsedLast.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.BoolPartlyUsedLast where - -import Data.Bool () - -foo = not diff --git a/test/tests/BoolPartlyUsedLast.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/BoolPartlyUsedLast.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/BoolPartlyUsedLast.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.BoolPartlyUsedLast where + +import Data.Bool () + +foo = not diff --git a/test/tests/CPP.MinimiseImportsNoExportProcessing-golden b/test/tests/CPP.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/CPP.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/CPP.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/CPP.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/CPP.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,1 @@ +Source file was not touched diff --git a/test/tests/CPP.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/CPP.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/CPP.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/CPP.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/CPP.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/CPP.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,1 @@ +Source file was not touched diff --git a/test/tests/Class.MinimiseImportsNoExportProcessing-golden b/test/tests/Class.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Class.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/Class.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/Class.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/Class.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,42 @@ +module Class where + + +data Record a = Record { aa :: a, b :: String } + +data Impossible + + = Impossible String Integer + -- ^ We reached a program point which should be unreachable. + + | Unreachable String Integer + -- ^ @Impossible@ with a different error message. + -- Used when we reach a program point which can in principle + -- be reached, but not for a certain run. + + | ImpMissingDefinitions [String] String + -- ^ We reached a program point without all the required + -- primitives or BUILTIN to proceed forward. + -- @ImpMissingDefinitions neededDefs forThis@ + + +class CatchImpossible m where + + -- | Catch any 'Impossible' exception. + catchImpossible :: m a -> (Impossible -> m a) -> m a + catchImpossible = catchImpossibleJust Just + + -- | Catch only 'Impossible' exceptions selected by the filter. + catchImpossibleJust :: (Impossible -> Maybe b) -> m a -> (b -> m a) -> m a + catchImpossibleJust = flip . handleImpossibleJust + + -- | Version of 'catchImpossible' with argument order suiting short handlers. + handleImpossible :: (Impossible -> m a) -> m a -> m a + handleImpossible = flip catchImpossible + + -- | Version of 'catchImpossibleJust' with argument order suiting short handlers. + handleImpossibleJust :: (Impossible -> Maybe b) -> (b -> m a) -> m a -> m a + handleImpossibleJust = flip . catchImpossibleJust + + {-# MINIMAL catchImpossibleJust | handleImpossibleJust #-} + + diff --git a/test/tests/Class.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/Class.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Class.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/Class.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/Class.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/Class.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,42 @@ +module Class where + + +data Record a = Record { aa :: a, b :: String } + +data Impossible + + = Impossible String Integer + -- ^ We reached a program point which should be unreachable. + + | Unreachable String Integer + -- ^ @Impossible@ with a different error message. + -- Used when we reach a program point which can in principle + -- be reached, but not for a certain run. + + | ImpMissingDefinitions [String] String + -- ^ We reached a program point without all the required + -- primitives or BUILTIN to proceed forward. + -- @ImpMissingDefinitions neededDefs forThis@ + + +class CatchImpossible m where + + -- | Catch any 'Impossible' exception. + catchImpossible :: m a -> (Impossible -> m a) -> m a + catchImpossible = catchImpossibleJust Just + + -- | Catch only 'Impossible' exceptions selected by the filter. + catchImpossibleJust :: (Impossible -> Maybe b) -> m a -> (b -> m a) -> m a + catchImpossibleJust = flip . handleImpossibleJust + + -- | Version of 'catchImpossible' with argument order suiting short handlers. + handleImpossible :: (Impossible -> m a) -> m a -> m a + handleImpossible = flip catchImpossible + + -- | Version of 'catchImpossibleJust' with argument order suiting short handlers. + handleImpossibleJust :: (Impossible -> Maybe b) -> (b -> m a) -> m a -> m a + handleImpossibleJust = flip . catchImpossibleJust + + {-# MINIMAL catchImpossibleJust | handleImpossibleJust #-} + + diff --git a/test/tests/ConstructorsUnused.MinimiseImportsNoExportProcessing-golden b/test/tests/ConstructorsUnused.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ConstructorsUnused.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.ConstructorsUnused where - -foo = not diff --git a/test/tests/ConstructorsUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/ConstructorsUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/ConstructorsUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,3 @@ +module Test.ConstructorsUnused where + +foo = not diff --git a/test/tests/ConstructorsUnused.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/ConstructorsUnused.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ConstructorsUnused.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.ConstructorsUnused where - -import Data.Bool () - -foo = not diff --git a/test/tests/ConstructorsUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/ConstructorsUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/ConstructorsUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.ConstructorsUnused where + +import Data.Bool () + +foo = not diff --git a/test/tests/Dummy.MinimiseImportsNoExportProcessing-golden b/test/tests/Dummy.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Dummy.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/Dummy.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/Dummy.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/Dummy.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,4 @@ +module Test.Dummy where + +main :: IO () +main = pure () diff --git a/test/tests/Dummy.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/Dummy.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Dummy.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/Dummy.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/Dummy.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/Dummy.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,4 @@ +module Test.Dummy where + +main :: IO () +main = pure () diff --git a/test/tests/Duplicated.MinimiseImportsNoExportProcessing-golden b/test/tests/Duplicated.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Duplicated.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,7 +0,0 @@ -module Duplicated where - -import Data.Char ( isDigit ) -import Data.Char ( isLetter ) - - -test x = isDigit x || isLetter x diff --git a/test/tests/Duplicated.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/Duplicated.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/Duplicated.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,7 @@ +module Duplicated where + +import Data.Char ( isDigit ) +import Data.Char ( isLetter ) + + +test x = isDigit x || isLetter x diff --git a/test/tests/Duplicated.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/Duplicated.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Duplicated.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,8 +0,0 @@ -module Duplicated where - -import Data.Char ( isDigit ) -import Data.Char () -import Data.Char ( isLetter ) - - -test x = isDigit x || isLetter x diff --git a/test/tests/Duplicated.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/Duplicated.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/Duplicated.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,8 @@ +module Duplicated where + +import Data.Char ( isDigit ) +import Data.Char () +import Data.Char ( isLetter ) + + +test x = isDigit x || isLetter x diff --git a/test/tests/ExportExplicit.MinimiseImportsNoExportProcessing-golden b/test/tests/ExportExplicit.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ExportExplicit.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/ExportExplicit.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/ExportExplicit.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/ExportExplicit.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,10 @@ +module Test.ExportExplicit (isExported, anotherExport) where + +isExported = (+1) + +anotherExport = True + +andAnother = 27 + +main :: IO () +main = pure () diff --git a/test/tests/ExportExplicit.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/ExportExplicit.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ExportExplicit.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/ExportExplicit.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/ExportExplicit.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/ExportExplicit.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,10 @@ +module Test.ExportExplicit (isExported, anotherExport) where + +isExported = (+1) + +anotherExport = True + +andAnother = 27 + +main :: IO () +main = pure () diff --git a/test/tests/ExportImplicit.MinimiseImportsNoExportProcessing-golden b/test/tests/ExportImplicit.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ExportImplicit.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/ExportImplicit.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/ExportImplicit.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/ExportImplicit.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,10 @@ +module Test.ExportImplicit where + +import Data.Char ( toLower ) + +isExported = (+1) + +alsoExported = map toLower "AbC" + +main :: IO () +main = print $ isExported 1 diff --git a/test/tests/ExportImplicit.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/ExportImplicit.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ExportImplicit.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/ExportImplicit.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/ExportImplicit.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/ExportImplicit.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,10 @@ +module Test.ExportImplicit where + +import Data.Char ( toLower ) + +isExported = (+1) + +alsoExported = map toLower "AbC" + +main :: IO () +main = print $ isExported 1 diff --git a/test/tests/ExportPattern2.MinimiseImportsNoExportProcessing-golden b/test/tests/ExportPattern2.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ExportPattern2.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/ExportPattern2.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/ExportPattern2.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/ExportPattern2.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,142 @@ +{-# LANGUAGE GADTs #-} +{-# LANGUAGE PatternSynonyms #-} +{-# LANGUAGE ViewPatterns #-} + +module ExportPattern2 where + +import Control.Monad ( guard ) +import qualified Data.Sequence as Seq + ( viewl, viewr, ViewL((:<), EmptyL), ViewR((:>)) ) + +pattern P = 42 + +--useP P = 43 + +-- + +data Type = App String [Type] + +pattern Arrow :: Type -> Type -> Type +pattern Arrow t1 t2 = App "->" [t1, t2] + +pattern Int = App "Int" [] + +pattern Maybe t = App "Maybe" [t] + + +{- +collectArgs :: Type -> [Type] +collectArgs (Arrow t1 t2) = t1 : collectArgs t2 +collectArgs _ = [] + +isInt :: Type -> Bool +isInt Int = True +isInt _ = False + +isIntEndo :: Type -> Bool +isIntEndo (Arrow Int Int) = True +isIntEndo _ = False + +arrows :: [Type] -> Type -> Type +arrows = flip $ foldr Arrow +-} + +-- + + +pattern Empty <- (Seq.viewl -> Seq.EmptyL) +pattern x :< xs <- (Seq.viewl -> x Seq.:< xs) +pattern xs :> x <- (Seq.viewr -> xs Seq.:> x) + +{- +viewPL (x :< Empty) = x +viewPR (Empty :> y) = y +-} + +-- + + +pattern Succ n <- + (\x -> (x -1) <$ guard (x > 0) -> Just n) + where + Succ n = n + 1 + +{- +fac (Succ n) = Succ n * fac n +fac 0 = 1 +-} + +-- + + +data Showable where + MkShowable :: (Show a) => a -> Showable + +-- Required context is empty, but provided context is not +pattern Sh :: () => (Show a) => a -> Showable +pattern Sh x <- MkShowable x + +{- +showable :: (Show a) => a -> Showable +showable x = MkShowable x +-} + +-- + + +-- Provided context is empty +pattern One :: (Num a, Eq a) => a +pattern One <- 1 + + +-- one One = 2 + +-- + + +pattern Pair x y <- [x, y] + + + +{- +f (Pair True True) = True +f _ = False + +g [True, True] = True +g _ = False +-} + + + +-- + +data Nat = Z | S Nat deriving (Show) + +pattern Ess p = S p + + +--two = S ( S Z) + +-- + +pattern Single x = [x] + +pattern Head x <- x : xs + +{- single (Single x) = x +hd :: [a] -> a +hd (Head x) = x +-} + +-- + + +data T a where + MkT :: (Show b) => a -> b -> T a + +pattern ExNumPat x = MkT 42 x + +{- +h :: (Num t, Eq t) => T t -> String +h (ExNumPat x) = show x +-} diff --git a/test/tests/ExportPattern2.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/ExportPattern2.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ExportPattern2.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/ExportPattern2.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/ExportPattern2.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/ExportPattern2.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,142 @@ +{-# LANGUAGE GADTs #-} +{-# LANGUAGE PatternSynonyms #-} +{-# LANGUAGE ViewPatterns #-} + +module ExportPattern2 where + +import Control.Monad ( guard ) +import qualified Data.Sequence as Seq + ( viewl, viewr, ViewL((:<), EmptyL), ViewR((:>)) ) + +pattern P = 42 + +--useP P = 43 + +-- + +data Type = App String [Type] + +pattern Arrow :: Type -> Type -> Type +pattern Arrow t1 t2 = App "->" [t1, t2] + +pattern Int = App "Int" [] + +pattern Maybe t = App "Maybe" [t] + + +{- +collectArgs :: Type -> [Type] +collectArgs (Arrow t1 t2) = t1 : collectArgs t2 +collectArgs _ = [] + +isInt :: Type -> Bool +isInt Int = True +isInt _ = False + +isIntEndo :: Type -> Bool +isIntEndo (Arrow Int Int) = True +isIntEndo _ = False + +arrows :: [Type] -> Type -> Type +arrows = flip $ foldr Arrow +-} + +-- + + +pattern Empty <- (Seq.viewl -> Seq.EmptyL) +pattern x :< xs <- (Seq.viewl -> x Seq.:< xs) +pattern xs :> x <- (Seq.viewr -> xs Seq.:> x) + +{- +viewPL (x :< Empty) = x +viewPR (Empty :> y) = y +-} + +-- + + +pattern Succ n <- + (\x -> (x -1) <$ guard (x > 0) -> Just n) + where + Succ n = n + 1 + +{- +fac (Succ n) = Succ n * fac n +fac 0 = 1 +-} + +-- + + +data Showable where + MkShowable :: (Show a) => a -> Showable + +-- Required context is empty, but provided context is not +pattern Sh :: () => (Show a) => a -> Showable +pattern Sh x <- MkShowable x + +{- +showable :: (Show a) => a -> Showable +showable x = MkShowable x +-} + +-- + + +-- Provided context is empty +pattern One :: (Num a, Eq a) => a +pattern One <- 1 + + +-- one One = 2 + +-- + + +pattern Pair x y <- [x, y] + + + +{- +f (Pair True True) = True +f _ = False + +g [True, True] = True +g _ = False +-} + + + +-- + +data Nat = Z | S Nat deriving (Show) + +pattern Ess p = S p + + +--two = S ( S Z) + +-- + +pattern Single x = [x] + +pattern Head x <- x : xs + +{- single (Single x) = x +hd :: [a] -> a +hd (Head x) = x +-} + +-- + + +data T a where + MkT :: (Show b) => a -> b -> T a + +pattern ExNumPat x = MkT 42 x + +{- +h :: (Num t, Eq t) => T t -> String +h (ExNumPat x) = show x +-} diff --git a/test/tests/ImplicitImportUnused.MinimiseImportsNoExportProcessing-golden b/test/tests/ImplicitImportUnused.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ImplicitImportUnused.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,7 +0,0 @@ -module Test.ImplicitImportUnused where - -import Data.Maybe ( isJust ) - -foo = isJust - -bar = 27 diff --git a/test/tests/ImplicitImportUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/ImplicitImportUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/ImplicitImportUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,7 @@ +module Test.ImplicitImportUnused where + +import Data.Maybe ( isJust ) + +foo = isJust + +bar = 27 diff --git a/test/tests/ImplicitImportUnused.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/ImplicitImportUnused.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ImplicitImportUnused.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,9 +0,0 @@ -module Test.ImplicitImportUnused where - -import Data.List () -import Data.Bool () -import Data.Maybe ( isJust ) - -foo = isJust - -bar = 27 diff --git a/test/tests/ImplicitImportUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/ImplicitImportUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/ImplicitImportUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,9 @@ +module Test.ImplicitImportUnused where + +import Data.List () +import Data.Bool () +import Data.Maybe ( isJust ) + +foo = isJust + +bar = 27 diff --git a/test/tests/ImplicitImportUsed.MinimiseImportsNoExportProcessing-golden b/test/tests/ImplicitImportUsed.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ImplicitImportUsed.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.ImplicitImportUsed where - -import Data.List ( intercalate ) - -foo = intercalate "," diff --git a/test/tests/ImplicitImportUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/ImplicitImportUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/ImplicitImportUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,5 @@ +module Test.ImplicitImportUsed where + +import Data.List ( intercalate ) + +foo = intercalate "," diff --git a/test/tests/ImplicitImportUsed.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/ImplicitImportUsed.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ImplicitImportUsed.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.ImplicitImportUsed where - -import Data.List ( intercalate ) - -foo = intercalate "," diff --git a/test/tests/ImplicitImportUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/ImplicitImportUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/ImplicitImportUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.ImplicitImportUsed where + +import Data.List ( intercalate ) + +foo = intercalate "," diff --git a/test/tests/ImportEmpty.MinimiseImportsNoExportProcessing-golden b/test/tests/ImportEmpty.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ImportEmpty.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -module Test.ImportEmpty where diff --git a/test/tests/ImportEmpty.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/ImportEmpty.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/ImportEmpty.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,1 @@ +module Test.ImportEmpty where diff --git a/test/tests/ImportEmpty.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/ImportEmpty.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ImportEmpty.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.ImportEmpty where - -import Data.Bool () diff --git a/test/tests/ImportEmpty.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/ImportEmpty.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/ImportEmpty.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,3 @@ +module Test.ImportEmpty where + +import Data.Bool () diff --git a/test/tests/ImportPattern.MinimiseImportsNoExportProcessing-golden b/test/tests/ImportPattern.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ImportPattern.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,147 +0,0 @@ -{-# LANGUAGE GADTs #-} -{-# LANGUAGE PatternSynonyms #-} -{-# LANGUAGE ViewPatterns #-} - -module ImportPattern where - -import Imported.ExportPattern - ( T, - Nat(Z, S), - Showable(..), - Type, - pattern ExNumPat, - pattern Head, - pattern Single, - pattern Pair, - pattern One, - pattern Succ, - pattern (:>), - pattern (:<), - pattern Empty, - pattern Int, - pattern Arrow, - pattern P ) - --- pattern P = 42 - -useP P = 43 - --- - -{- -data Type = App String [Type] - -pattern Arrow :: Type -> Type -> Type -pattern Arrow t1 t2 = App "->" [t1, t2] - -pattern Int = App "Int" [] - -pattern Maybe t = App "Maybe" [t] - --} - -collectArgs :: Type -> [Type] -collectArgs (Arrow t1 t2) = t1 : collectArgs t2 -collectArgs _ = [] - -isInt :: Type -> Bool -isInt Int = True -isInt _ = False - -isIntEndo :: Type -> Bool -isIntEndo (Arrow Int Int) = True -isIntEndo _ = False - -arrows :: [Type] -> Type -> Type -arrows = flip $ foldr Arrow - --- -{- - -pattern Empty <- (Seq.viewl -> Seq.EmptyL) -pattern x :< xs <- (Seq.viewl -> x Seq.:< xs) -pattern xs :> x <- (Seq.viewr -> xs Seq.:> x) --} - -viewPL (x :< Empty) = x -viewPR (Empty :> y) = y - --- - -{- -pattern Succ n <- - (\x -> (x -1) <$ guard (x > 0) -> Just n) - where - Succ n = n + 1 --} - -fac (Succ n) = Succ n * fac n -fac 0 = 1 - --- - -{- -data Showable where - MkShowable :: (Show a) => a -> Showable - --- Required context is empty, but provided context is not -pattern Sh :: () => (Show a) => a -> Showable -pattern Sh x <- MkShowable x --} - -showable :: (Show a) => a -> Showable -showable x = MkShowable x - --- - -{- --- Provided context is empty -pattern One :: (Num a, Eq a) => a -pattern One <- 1 --} - -one One = 2 - --- - - ---pattern Pair x y <- [x, y] - - -f (Pair True True) = True -f _ = False - -g [True, True] = True -g _ = False - - --- -{- -data Nat = Z | S Nat deriving (Show) - -pattern Ess p = S p --} - -two = S ( S Z) - --- - --- pattern Single x = [x] - --- pattern Head x <- x : xs - -single (Single x) = x -hd :: [a] -> a -hd (Head x) = x - --- - -{- -data T a where - MkT :: (Show b) => a -> b -> T a - -pattern ExNumPat x = MkT 42 x --} - -h :: (Num t, Eq t) => T t -> String -h (ExNumPat x) = show x diff --git a/test/tests/ImportPattern.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/ImportPattern.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/ImportPattern.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,147 @@ +{-# LANGUAGE GADTs #-} +{-# LANGUAGE PatternSynonyms #-} +{-# LANGUAGE ViewPatterns #-} + +module ImportPattern where + +import Imported.ExportPattern + ( T, + Nat(Z, S), + Showable(..), + Type, + pattern ExNumPat, + pattern Head, + pattern Single, + pattern Pair, + pattern One, + pattern Succ, + pattern (:>), + pattern (:<), + pattern Empty, + pattern Int, + pattern Arrow, + pattern P ) + +-- pattern P = 42 + +useP P = 43 + +-- + +{- +data Type = App String [Type] + +pattern Arrow :: Type -> Type -> Type +pattern Arrow t1 t2 = App "->" [t1, t2] + +pattern Int = App "Int" [] + +pattern Maybe t = App "Maybe" [t] + +-} + +collectArgs :: Type -> [Type] +collectArgs (Arrow t1 t2) = t1 : collectArgs t2 +collectArgs _ = [] + +isInt :: Type -> Bool +isInt Int = True +isInt _ = False + +isIntEndo :: Type -> Bool +isIntEndo (Arrow Int Int) = True +isIntEndo _ = False + +arrows :: [Type] -> Type -> Type +arrows = flip $ foldr Arrow + +-- +{- + +pattern Empty <- (Seq.viewl -> Seq.EmptyL) +pattern x :< xs <- (Seq.viewl -> x Seq.:< xs) +pattern xs :> x <- (Seq.viewr -> xs Seq.:> x) +-} + +viewPL (x :< Empty) = x +viewPR (Empty :> y) = y + +-- + +{- +pattern Succ n <- + (\x -> (x -1) <$ guard (x > 0) -> Just n) + where + Succ n = n + 1 +-} + +fac (Succ n) = Succ n * fac n +fac 0 = 1 + +-- + +{- +data Showable where + MkShowable :: (Show a) => a -> Showable + +-- Required context is empty, but provided context is not +pattern Sh :: () => (Show a) => a -> Showable +pattern Sh x <- MkShowable x +-} + +showable :: (Show a) => a -> Showable +showable x = MkShowable x + +-- + +{- +-- Provided context is empty +pattern One :: (Num a, Eq a) => a +pattern One <- 1 +-} + +one One = 2 + +-- + + +--pattern Pair x y <- [x, y] + + +f (Pair True True) = True +f _ = False + +g [True, True] = True +g _ = False + + +-- +{- +data Nat = Z | S Nat deriving (Show) + +pattern Ess p = S p +-} + +two = S ( S Z) + +-- + +-- pattern Single x = [x] + +-- pattern Head x <- x : xs + +single (Single x) = x +hd :: [a] -> a +hd (Head x) = x + +-- + +{- +data T a where + MkT :: (Show b) => a -> b -> T a + +pattern ExNumPat x = MkT 42 x +-} + +h :: (Num t, Eq t) => T t -> String +h (ExNumPat x) = show x diff --git a/test/tests/ImportPattern.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/ImportPattern.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/ImportPattern.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,149 +0,0 @@ -{-# LANGUAGE GADTs #-} -{-# LANGUAGE PatternSynonyms #-} -{-# LANGUAGE ViewPatterns #-} - -module ImportPattern where - -import Control.Monad () -import qualified Data.Sequence as Seq () -import Imported.ExportPattern - ( T, - Nat(Z, S), - Showable(..), - Type, - pattern ExNumPat, - pattern Head, - pattern Single, - pattern Pair, - pattern One, - pattern Succ, - pattern (:>), - pattern (:<), - pattern Empty, - pattern Int, - pattern Arrow, - pattern P ) - --- pattern P = 42 - -useP P = 43 - --- - -{- -data Type = App String [Type] - -pattern Arrow :: Type -> Type -> Type -pattern Arrow t1 t2 = App "->" [t1, t2] - -pattern Int = App "Int" [] - -pattern Maybe t = App "Maybe" [t] - --} - -collectArgs :: Type -> [Type] -collectArgs (Arrow t1 t2) = t1 : collectArgs t2 -collectArgs _ = [] - -isInt :: Type -> Bool -isInt Int = True -isInt _ = False - -isIntEndo :: Type -> Bool -isIntEndo (Arrow Int Int) = True -isIntEndo _ = False - -arrows :: [Type] -> Type -> Type -arrows = flip $ foldr Arrow - --- -{- - -pattern Empty <- (Seq.viewl -> Seq.EmptyL) -pattern x :< xs <- (Seq.viewl -> x Seq.:< xs) -pattern xs :> x <- (Seq.viewr -> xs Seq.:> x) --} - -viewPL (x :< Empty) = x -viewPR (Empty :> y) = y - --- - -{- -pattern Succ n <- - (\x -> (x -1) <$ guard (x > 0) -> Just n) - where - Succ n = n + 1 --} - -fac (Succ n) = Succ n * fac n -fac 0 = 1 - --- - -{- -data Showable where - MkShowable :: (Show a) => a -> Showable - --- Required context is empty, but provided context is not -pattern Sh :: () => (Show a) => a -> Showable -pattern Sh x <- MkShowable x --} - -showable :: (Show a) => a -> Showable -showable x = MkShowable x - --- - -{- --- Provided context is empty -pattern One :: (Num a, Eq a) => a -pattern One <- 1 --} - -one One = 2 - --- - - ---pattern Pair x y <- [x, y] - - -f (Pair True True) = True -f _ = False - -g [True, True] = True -g _ = False - - --- -{- -data Nat = Z | S Nat deriving (Show) - -pattern Ess p = S p --} - -two = S ( S Z) - --- - --- pattern Single x = [x] - --- pattern Head x <- x : xs - -single (Single x) = x -hd :: [a] -> a -hd (Head x) = x - --- - -{- -data T a where - MkT :: (Show b) => a -> b -> T a - -pattern ExNumPat x = MkT 42 x --} - -h :: (Num t, Eq t) => T t -> String -h (ExNumPat x) = show x diff --git a/test/tests/ImportPattern.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/ImportPattern.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/ImportPattern.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,149 @@ +{-# LANGUAGE GADTs #-} +{-# LANGUAGE PatternSynonyms #-} +{-# LANGUAGE ViewPatterns #-} + +module ImportPattern where + +import Control.Monad () +import qualified Data.Sequence as Seq () +import Imported.ExportPattern + ( T, + Nat(Z, S), + Showable(..), + Type, + pattern ExNumPat, + pattern Head, + pattern Single, + pattern Pair, + pattern One, + pattern Succ, + pattern (:>), + pattern (:<), + pattern Empty, + pattern Int, + pattern Arrow, + pattern P ) + +-- pattern P = 42 + +useP P = 43 + +-- + +{- +data Type = App String [Type] + +pattern Arrow :: Type -> Type -> Type +pattern Arrow t1 t2 = App "->" [t1, t2] + +pattern Int = App "Int" [] + +pattern Maybe t = App "Maybe" [t] + +-} + +collectArgs :: Type -> [Type] +collectArgs (Arrow t1 t2) = t1 : collectArgs t2 +collectArgs _ = [] + +isInt :: Type -> Bool +isInt Int = True +isInt _ = False + +isIntEndo :: Type -> Bool +isIntEndo (Arrow Int Int) = True +isIntEndo _ = False + +arrows :: [Type] -> Type -> Type +arrows = flip $ foldr Arrow + +-- +{- + +pattern Empty <- (Seq.viewl -> Seq.EmptyL) +pattern x :< xs <- (Seq.viewl -> x Seq.:< xs) +pattern xs :> x <- (Seq.viewr -> xs Seq.:> x) +-} + +viewPL (x :< Empty) = x +viewPR (Empty :> y) = y + +-- + +{- +pattern Succ n <- + (\x -> (x -1) <$ guard (x > 0) -> Just n) + where + Succ n = n + 1 +-} + +fac (Succ n) = Succ n * fac n +fac 0 = 1 + +-- + +{- +data Showable where + MkShowable :: (Show a) => a -> Showable + +-- Required context is empty, but provided context is not +pattern Sh :: () => (Show a) => a -> Showable +pattern Sh x <- MkShowable x +-} + +showable :: (Show a) => a -> Showable +showable x = MkShowable x + +-- + +{- +-- Provided context is empty +pattern One :: (Num a, Eq a) => a +pattern One <- 1 +-} + +one One = 2 + +-- + + +--pattern Pair x y <- [x, y] + + +f (Pair True True) = True +f _ = False + +g [True, True] = True +g _ = False + + +-- +{- +data Nat = Z | S Nat deriving (Show) + +pattern Ess p = S p +-} + +two = S ( S Z) + +-- + +-- pattern Single x = [x] + +-- pattern Head x <- x : xs + +single (Single x) = x +hd :: [a] -> a +hd (Head x) = x + +-- + +{- +data T a where + MkT :: (Show b) => a -> b -> T a + +pattern ExNumPat x = MkT 42 x +-} + +h :: (Num t, Eq t) => T t -> String +h (ExNumPat x) = show x diff --git a/test/tests/MoreExports.MinimiseImportsNoExportProcessing-golden b/test/tests/MoreExports.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/MoreExports.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/MoreExports.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/MoreExports.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/MoreExports.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,20 @@ +module MoreExports where + +--Another comment +-- + +newtype N a = Int a + +data D a = A a | B | C a + +data R = R { a :: Int, b :: Bool } + +data H = I | J | K deriving Show + + +foo = (+1) + +-- A further Comment + +main :: IO () +main = print J diff --git a/test/tests/MoreExports.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/MoreExports.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/MoreExports.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/MoreExports.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/MoreExports.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/MoreExports.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,20 @@ +module MoreExports where + +--Another comment +-- + +newtype N a = Int a + +data D a = A a | B | C a + +data R = R { a :: Int, b :: Bool } + +data H = I | J | K deriving Show + + +foo = (+1) + +-- A further Comment + +main :: IO () +main = print J diff --git a/test/tests/MultilineUnused.MinimiseImportsNoExportProcessing-golden b/test/tests/MultilineUnused.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/MultilineUnused.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.MultilineUnused where - -import Data.Bool ( bool ) - -foo = bool diff --git a/test/tests/MultilineUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/MultilineUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/MultilineUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,5 @@ +module Test.MultilineUnused where + +import Data.Bool ( bool ) + +foo = bool diff --git a/test/tests/MultilineUnused.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/MultilineUnused.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/MultilineUnused.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,6 +0,0 @@ -module Test.MultilineUnused where - -import Data.Bool ( bool ) -import Data.List () - -foo = bool diff --git a/test/tests/MultilineUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/MultilineUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/MultilineUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,6 @@ +module Test.MultilineUnused where + +import Data.Bool ( bool ) +import Data.List () + +foo = bool diff --git a/test/tests/NoImplicitPrelude.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/NoImplicitPrelude.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/NoImplicitPrelude.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,15 @@ +{-# LANGUAGE NoImplicitPrelude #-} + +module NoImplicitPrelude where + +import Data.List ( (++), intercalate ) +import Data.Version ( makeVersion ) +import Prelude + +export = intercalate ", " ["Lorem", "ipsum", "dolor"] + +version = makeVersion [1, 2, 3] + +useprelude = "abc" <> "def" + +useprelude2 = "efg" ++ "ghi" diff --git a/test/tests/NoImplicitPrelude.MinimiseImportsReplaceExports-golden b/test/tests/NoImplicitPrelude.MinimiseImportsReplaceExports-golden new file mode 100644 --- /dev/null +++ b/test/tests/NoImplicitPrelude.MinimiseImportsReplaceExports-golden @@ -0,0 +1,19 @@ +{-# LANGUAGE NoImplicitPrelude #-} + +module NoImplicitPrelude ( + export, + version, + useprelude, + useprelude2 ) where + +import Data.List ( (++), intercalate ) +import Data.Version ( makeVersion ) +import Prelude ( Semigroup((<>)) ) + +export = intercalate ", " ["Lorem", "ipsum", "dolor"] + +version = makeVersion [1, 2, 3] + +useprelude = "abc" <> "def" + +useprelude2 = "efg" ++ "ghi" diff --git a/test/tests/NoImplicitPrelude.NoImportProcessingAddExplicitExports-golden b/test/tests/NoImplicitPrelude.NoImportProcessingAddExplicitExports-golden new file mode 100644 --- /dev/null +++ b/test/tests/NoImplicitPrelude.NoImportProcessingAddExplicitExports-golden @@ -0,0 +1,19 @@ +{-# LANGUAGE NoImplicitPrelude #-} + +module NoImplicitPrelude ( + export, + version, + useprelude, + useprelude2 ) where + +import Data.List +import Data.Version (makeVersion) +import Prelude + +export = intercalate ", " ["Lorem", "ipsum", "dolor"] + +version = makeVersion [1, 2, 3] + +useprelude = "abc" <> "def" + +useprelude2 = "efg" ++ "ghi" diff --git a/test/tests/NoImplicitPrelude.NoImportProcessingNoExportProcessing-golden b/test/tests/NoImplicitPrelude.NoImportProcessingNoExportProcessing-golden new file mode 100644 --- /dev/null +++ b/test/tests/NoImplicitPrelude.NoImportProcessingNoExportProcessing-golden @@ -0,0 +1,1 @@ +Source file was not touched diff --git a/test/tests/NoImplicitPrelude.NoImportProcessingReplaceExports-golden b/test/tests/NoImplicitPrelude.NoImportProcessingReplaceExports-golden new file mode 100644 --- /dev/null +++ b/test/tests/NoImplicitPrelude.NoImportProcessingReplaceExports-golden @@ -0,0 +1,19 @@ +{-# LANGUAGE NoImplicitPrelude #-} + +module NoImplicitPrelude ( + export, + version, + useprelude, + useprelude2 ) where + +import Data.List +import Data.Version (makeVersion) +import Prelude + +export = intercalate ", " ["Lorem", "ipsum", "dolor"] + +version = makeVersion [1, 2, 3] + +useprelude = "abc" <> "def" + +useprelude2 = "efg" ++ "ghi" diff --git a/test/tests/NoImplicitPrelude.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/NoImplicitPrelude.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/NoImplicitPrelude.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,15 @@ +{-# LANGUAGE NoImplicitPrelude #-} + +module NoImplicitPrelude where + +import Data.List ( (++), intercalate ) +import Data.Version ( makeVersion ) +import Prelude + +export = intercalate ", " ["Lorem", "ipsum", "dolor"] + +version = makeVersion [1, 2, 3] + +useprelude = "abc" <> "def" + +useprelude2 = "efg" ++ "ghi" diff --git a/test/tests/NoImplicitPrelude.hs b/test/tests/NoImplicitPrelude.hs new file mode 100644 --- /dev/null +++ b/test/tests/NoImplicitPrelude.hs @@ -0,0 +1,15 @@ +{-# LANGUAGE NoImplicitPrelude #-} + +module NoImplicitPrelude where + +import Data.List +import Data.Version (makeVersion) +import Prelude + +export = intercalate ", " ["Lorem", "ipsum", "dolor"] + +version = makeVersion [1, 2, 3] + +useprelude = "abc" <> "def" + +useprelude2 = "efg" ++ "ghi" diff --git a/test/tests/Operator.MinimiseImportsNoExportProcessing-golden b/test/tests/Operator.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Operator.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/Operator.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/Operator.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/Operator.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,8 @@ +module Operator where + +infixl 5 $+$ + +($+$) :: [a] -> [a] -> [a] +[] $+$ d = d +d $+$ [] = d +d $+$ d' = d ++ d' diff --git a/test/tests/Operator.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/Operator.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Operator.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,1 +0,0 @@ -Source file was not touched diff --git a/test/tests/Operator.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/Operator.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/Operator.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,8 @@ +module Operator where + +infixl 5 $+$ + +($+$) :: [a] -> [a] -> [a] +[] $+$ d = d +d $+$ [] = d +d $+$ d' = d ++ d' diff --git a/test/tests/Pattern.MinimiseImportsNoExportProcessing-golden b/test/tests/Pattern.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Pattern.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,10 +0,0 @@ -{-# LANGUAGE PatternSynonyms #-} -module Pattern where - -import qualified Data.List.NonEmpty as List1 ( cycle ) -import Data.List.NonEmpty ( NonEmpty((:|)) ) - - -test = List1.cycle (1 :| [2,3]) - -test2 = 1 :| [2,3,1,2,3] diff --git a/test/tests/Pattern.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/Pattern.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/Pattern.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,10 @@ +{-# LANGUAGE PatternSynonyms #-} +module Pattern where + +import qualified Data.List.NonEmpty as List1 ( cycle ) +import Data.List.NonEmpty ( NonEmpty((:|)) ) + + +test = List1.cycle (1 :| [2,3]) + +test2 = 1 :| [2,3,1,2,3] diff --git a/test/tests/Pattern.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/Pattern.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/Pattern.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,10 +0,0 @@ -{-# LANGUAGE PatternSynonyms #-} -module Pattern where - -import qualified Data.List.NonEmpty as List1 ( cycle ) -import Data.List.NonEmpty ( NonEmpty((:|)) ) - - -test = List1.cycle (1 :| [2,3]) - -test2 = 1 :| [2,3,1,2,3] diff --git a/test/tests/Pattern.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/Pattern.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/Pattern.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,10 @@ +{-# LANGUAGE PatternSynonyms #-} +module Pattern where + +import qualified Data.List.NonEmpty as List1 ( cycle ) +import Data.List.NonEmpty ( NonEmpty((:|)) ) + + +test = List1.cycle (1 :| [2,3]) + +test2 = 1 :| [2,3,1,2,3] diff --git a/test/tests/QualUnqual.MinimiseImportsNoExportProcessing-golden b/test/tests/QualUnqual.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/QualUnqual.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,6 +0,0 @@ -module QualUnqual where - -import qualified Data.Char as C ( isDigit ) -import Data.Char ( isDigit ) - -test x = C.isDigit x || isDigit x diff --git a/test/tests/QualUnqual.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/QualUnqual.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/QualUnqual.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,6 @@ +module QualUnqual where + +import qualified Data.Char as C ( isDigit ) +import Data.Char ( isDigit ) + +test x = C.isDigit x || isDigit x diff --git a/test/tests/QualUnqual.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/QualUnqual.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/QualUnqual.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,6 +0,0 @@ -module QualUnqual where - -import qualified Data.Char as C ( isDigit ) -import Data.Char ( isDigit ) - -test x = C.isDigit x || isDigit x diff --git a/test/tests/QualUnqual.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/QualUnqual.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/QualUnqual.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,6 @@ +module QualUnqual where + +import qualified Data.Char as C ( isDigit ) +import Data.Char ( isDigit ) + +test x = C.isDigit x || isDigit x diff --git a/test/tests/TypeConstructorUnused.MinimiseImportsNoExportProcessing-golden b/test/tests/TypeConstructorUnused.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeConstructorUnused.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.TypeConstructorUnused where - -true = True diff --git a/test/tests/TypeConstructorUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/TypeConstructorUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeConstructorUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,3 @@ +module Test.TypeConstructorUnused where + +true = True diff --git a/test/tests/TypeConstructorUnused.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/TypeConstructorUnused.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeConstructorUnused.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.TypeConstructorUnused where - -import Data.Bool () - -true = True diff --git a/test/tests/TypeConstructorUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/TypeConstructorUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeConstructorUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.TypeConstructorUnused where + +import Data.Bool () + +true = True diff --git a/test/tests/TypeConstructorUnusedComma.MinimiseImportsNoExportProcessing-golden b/test/tests/TypeConstructorUnusedComma.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeConstructorUnusedComma.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.TypeConstructorUnusedComma where - -false = False diff --git a/test/tests/TypeConstructorUnusedComma.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/TypeConstructorUnusedComma.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeConstructorUnusedComma.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,3 @@ +module Test.TypeConstructorUnusedComma where + +false = False diff --git a/test/tests/TypeConstructorUnusedComma.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/TypeConstructorUnusedComma.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeConstructorUnusedComma.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.TypeConstructorUnusedComma where - -import Data.Bool () - -false = False diff --git a/test/tests/TypeConstructorUnusedComma.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/TypeConstructorUnusedComma.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeConstructorUnusedComma.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.TypeConstructorUnusedComma where + +import Data.Bool () + +false = False diff --git a/test/tests/TypeConstructorUsed.MinimiseImportsNoExportProcessing-golden b/test/tests/TypeConstructorUsed.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeConstructorUsed.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.TypeConstructorUsed where - -true = True diff --git a/test/tests/TypeConstructorUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/TypeConstructorUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeConstructorUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,3 @@ +module Test.TypeConstructorUsed where + +true = True diff --git a/test/tests/TypeConstructorUsed.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/TypeConstructorUsed.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeConstructorUsed.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.TypeConstructorUsed where - -import Data.Bool () - -true = True diff --git a/test/tests/TypeConstructorUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/TypeConstructorUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeConstructorUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.TypeConstructorUsed where + +import Data.Bool () + +true = True diff --git a/test/tests/TypeFam.MinimiseImportsNoExportProcessing-golden b/test/tests/TypeFam.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeFam.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,43 +0,0 @@ -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies #-} - --- http://www.mchaver.com/posts/2017-06-21-type-families.html - -module TypeFam where - -import Data.Text ( Text ) -import Imported.TypeFam ( Concat(cat, type ConcatTy) ) - - -result :: ConcatTy Text String -result = cat ("Hello" :: Text) (" World!" :: String) - -main = print result - -class Container c where - type Elem c - empty :: c - insert :: Elem c -> c -> c - member :: Elem c -> c -> Bool - toList :: c -> [Elem c] - -instance Eq e => Container [e] where - type Elem [e] = e - empty = [] - insert e l = (e:l) - member e [] = False - member e (x:xs) - | e == x = True - | otherwise = member e xs - toList l = l - -instance Eq e => Container (Maybe e) where - type Elem (Maybe e) = e -- type synonym - empty = Nothing - insert e l = Just e -- destructive, replaces previous element - member e Nothing = False - member e (Just x) = e == x - toList Nothing = [] - toList (Just x) = [x] diff --git a/test/tests/TypeFam.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/TypeFam.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeFam.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,43 @@ +{-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TypeFamilies #-} + +-- http://www.mchaver.com/posts/2017-06-21-type-families.html + +module TypeFam where + +import Data.Text ( Text ) +import Imported.TypeFam ( Concat(cat, type ConcatTy) ) + + +result :: ConcatTy Text String +result = cat ("Hello" :: Text) (" World!" :: String) + +main = print result + +class Container c where + type Elem c + empty :: c + insert :: Elem c -> c -> c + member :: Elem c -> c -> Bool + toList :: c -> [Elem c] + +instance Eq e => Container [e] where + type Elem [e] = e + empty = [] + insert e l = (e:l) + member e [] = False + member e (x:xs) + | e == x = True + | otherwise = member e xs + toList l = l + +instance Eq e => Container (Maybe e) where + type Elem (Maybe e) = e -- type synonym + empty = Nothing + insert e l = Just e -- destructive, replaces previous element + member e Nothing = False + member e (Just x) = e == x + toList Nothing = [] + toList (Just x) = [x] diff --git a/test/tests/TypeFam.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/TypeFam.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeFam.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,47 +0,0 @@ -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies #-} - --- http://www.mchaver.com/posts/2017-06-21-type-families.html - -module TypeFam where - -import qualified Data.ByteString.Char8 as BS () -import Data.ByteString () -import Data.Monoid () -import qualified Data.Text as T () -import Data.Text ( Text ) -import Imported.TypeFam ( Concat(cat, type ConcatTy) ) - - -result :: ConcatTy Text String -result = cat ("Hello" :: Text) (" World!" :: String) - -main = print result - -class Container c where - type Elem c - empty :: c - insert :: Elem c -> c -> c - member :: Elem c -> c -> Bool - toList :: c -> [Elem c] - -instance Eq e => Container [e] where - type Elem [e] = e - empty = [] - insert e l = (e:l) - member e [] = False - member e (x:xs) - | e == x = True - | otherwise = member e xs - toList l = l - -instance Eq e => Container (Maybe e) where - type Elem (Maybe e) = e -- type synonym - empty = Nothing - insert e l = Just e -- destructive, replaces previous element - member e Nothing = False - member e (Just x) = e == x - toList Nothing = [] - toList (Just x) = [x] diff --git a/test/tests/TypeFam.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/TypeFam.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeFam.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,47 @@ +{-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TypeFamilies #-} + +-- http://www.mchaver.com/posts/2017-06-21-type-families.html + +module TypeFam where + +import qualified Data.ByteString.Char8 as BS () +import Data.ByteString () +import Data.Monoid () +import qualified Data.Text as T () +import Data.Text ( Text ) +import Imported.TypeFam ( Concat(cat, type ConcatTy) ) + + +result :: ConcatTy Text String +result = cat ("Hello" :: Text) (" World!" :: String) + +main = print result + +class Container c where + type Elem c + empty :: c + insert :: Elem c -> c -> c + member :: Elem c -> c -> Bool + toList :: c -> [Elem c] + +instance Eq e => Container [e] where + type Elem [e] = e + empty = [] + insert e l = (e:l) + member e [] = False + member e (x:xs) + | e == x = True + | otherwise = member e xs + toList l = l + +instance Eq e => Container (Maybe e) where + type Elem (Maybe e) = e -- type synonym + empty = Nothing + insert e l = Just e -- destructive, replaces previous element + member e Nothing = False + member e (Just x) = e == x + toList Nothing = [] + toList (Just x) = [x] diff --git a/test/tests/TypeUnused.MinimiseImportsNoExportProcessing-golden b/test/tests/TypeUnused.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeUnused.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.TypeUnused where - -foo = not diff --git a/test/tests/TypeUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/TypeUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,3 @@ +module Test.TypeUnused where + +foo = not diff --git a/test/tests/TypeUnused.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/TypeUnused.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeUnused.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.TypeUnused where - -import Data.Bool () - -foo = not diff --git a/test/tests/TypeUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/TypeUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.TypeUnused where + +import Data.Bool () + +foo = not diff --git a/test/tests/TypeUsed.MinimiseImportsNoExportProcessing-golden b/test/tests/TypeUsed.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeUsed.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,4 +0,0 @@ -module Test.TypeUsed where - -foo :: Bool -foo = undefined diff --git a/test/tests/TypeUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/TypeUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,4 @@ +module Test.TypeUsed where + +foo :: Bool +foo = undefined diff --git a/test/tests/TypeUsed.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/TypeUsed.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/TypeUsed.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,6 +0,0 @@ -module Test.TypeUsed where - -import Data.Bool () - -foo :: Bool -foo = undefined diff --git a/test/tests/TypeUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/TypeUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/TypeUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,6 @@ +module Test.TypeUsed where + +import Data.Bool () + +foo :: Bool +foo = undefined diff --git a/test/tests/WildcardUnused.MinimiseImportsNoExportProcessing-golden b/test/tests/WildcardUnused.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/WildcardUnused.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.WildcardUnused where - -foo = not diff --git a/test/tests/WildcardUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/WildcardUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/WildcardUnused.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,3 @@ +module Test.WildcardUnused where + +foo = not diff --git a/test/tests/WildcardUnused.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/WildcardUnused.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/WildcardUnused.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.WildcardUnused where - -import Data.Bool () - -foo = not diff --git a/test/tests/WildcardUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/WildcardUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/WildcardUnused.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.WildcardUnused where + +import Data.Bool () + +foo = not diff --git a/test/tests/WildcardUsed.MinimiseImportsNoExportProcessing-golden b/test/tests/WildcardUsed.MinimiseImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/WildcardUsed.MinimiseImportsNoExportProcessing-golden +++ /dev/null @@ -1,3 +0,0 @@ -module Test.WildcardUsed where - -foo = False diff --git a/test/tests/WildcardUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden b/test/tests/WildcardUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden new file mode 100644 --- /dev/null +++ b/test/tests/WildcardUsed.MinimiseImportsNoExportProcessingPreludeDataVersion-golden @@ -0,0 +1,3 @@ +module Test.WildcardUsed where + +foo = False diff --git a/test/tests/WildcardUsed.PreserveInstanceImportsNoExportProcessing-golden b/test/tests/WildcardUsed.PreserveInstanceImportsNoExportProcessing-golden deleted file mode 100644 --- a/test/tests/WildcardUsed.PreserveInstanceImportsNoExportProcessing-golden +++ /dev/null @@ -1,5 +0,0 @@ -module Test.WildcardUsed where - -import Data.Bool () - -foo = False diff --git a/test/tests/WildcardUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden b/test/tests/WildcardUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden new file mode 100644 --- /dev/null +++ b/test/tests/WildcardUsed.PreserveInstanceImportsNoExportProcessingPrelude-golden @@ -0,0 +1,5 @@ +module Test.WildcardUsed where + +import Data.Bool () + +foo = False