From 990bb42c7d744ef05b187a81ac5bed13c9f74336 Mon Sep 17 00:00:00 2001 From: Mohsen Date: Fri, 19 Feb 2016 13:00:38 -0800 Subject: [PATCH] Include cabal's otherExtensions & oldExtensions for libraries --- src/Argon/Cabal.hs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Argon/Cabal.hs b/src/Argon/Cabal.hs index 2994f00..adb6ab3 100644 --- a/src/Argon/Cabal.hs +++ b/src/Argon/Cabal.hs @@ -31,11 +31,13 @@ parseExts path = extract <$> Dist.readPackageDescription Dist.silent path (Dist.libBuildInfo . Dist.condTreeData) <$> Dist.condLibrary pkg extFromBI :: Dist.BuildInfo -> [GHC.ExtensionFlag] -extFromBI = mapMaybe (get . toString) . Dist.defaultExtensions - where get = flip M.lookup flagsMap - toString (Dist.UnknownExtension ext) = ext - toString (Dist.EnableExtension ext) = show ext - toString (Dist.DisableExtension ext) = show ext +extFromBI buildInfo = concat [extensionList Dist.defaultExtensions, extensionList Dist.otherExtensions, extensionList Dist.oldExtensions] + where + extensionList extType = mapMaybe (get . toString) (extType buildInfo) + get = flip M.lookup flagsMap + toString (Dist.UnknownExtension ext) = ext + toString (Dist.EnableExtension ext) = show ext + toString (Dist.DisableExtension ext) = show ext #if __GLASGOW_HASKELL__ < 710 specToPair :: (String, GHC.ExtensionFlag, a) -> (String, GHC.ExtensionFlag)