diff options
Diffstat (limited to 'compiler/main/DynFlags.hs')
| -rw-r--r-- | compiler/main/DynFlags.hs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index d3fbe16f1d..fbfd17e9a9 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -26,7 +26,6 @@ module DynFlags ( PlatformConstants(..), FatalMessager, LogAction, FlushOut(..), FlushErr(..), ProfAuto(..), - PluginType(..), glasgowExtsFlags, dopt, dopt_set, dopt_unset, gopt, gopt_set, gopt_unset, @@ -617,8 +616,6 @@ getSigOf dflags n = SigOf m -> Just m SigOfMap m -> Map.lookup n m -data PluginType = PluginCore2Core | PluginTypeCheck - -- | Contains not only a collection of 'GeneralFlag's but also a plethora of -- information relating to the compilation of a single file or GHC session data DynFlags = DynFlags { @@ -721,7 +718,7 @@ data DynFlags = DynFlags { hpcDir :: String, -- ^ Path to store the .mix files -- Plugins - pluginModNames :: [(ModuleName, PluginType)], + pluginModNames :: [ModuleName], pluginModNameOpts :: [(ModuleName, String)], -- GHC API hooks @@ -1731,7 +1728,7 @@ setLanguage l = upd (`lang_set` Just l) -- | Some modules have dependencies on others through the DynFlags rather than textual imports dynFlagDependencies :: DynFlags -> [ModuleName] -dynFlagDependencies = map fst . pluginModNames +dynFlagDependencies = pluginModNames -- | Is the -fpackage-trust mode on packageTrustOn :: DynFlags -> Bool @@ -1882,9 +1879,9 @@ parseSigOf str = case filter ((=="").snd) (readP_to_S parse str) of setSigOf :: String -> DynFlags -> DynFlags setSigOf s d = d { sigOf = parseSigOf s } -addPluginModuleName :: PluginType -> String -> DynFlags -> DynFlags -addPluginModuleName pty name d = - d { pluginModNames = (mkModuleName name, pty) : (pluginModNames d) } +addPluginModuleName :: String -> DynFlags -> DynFlags +addPluginModuleName name d = + d { pluginModNames = mkModuleName name : pluginModNames d } addPluginModuleNameOption :: String -> DynFlags -> DynFlags addPluginModuleNameOption optflag d = d { pluginModNameOpts = (mkModuleName m, option) : (pluginModNameOpts d) } @@ -2459,8 +2456,7 @@ dynamic_flags = [ ------ Plugin flags ------------------------------------------------ , Flag "fplugin-opt" (hasArg addPluginModuleNameOption) - , Flag "fplugin" (hasArg (addPluginModuleName PluginCore2Core)) - , Flag "ftc-plugin" (hasArg (addPluginModuleName PluginTypeCheck)) + , Flag "fplugin" (hasArg addPluginModuleName) ------ Optimisation flags ------------------------------------------ , Flag "O" (noArgM (setOptLevel 1)) |