Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/f4d81b2729c8667ea489e5f2f11e453e52f7ba24 >--------------------------------------------------------------- commit f4d81b2729c8667ea489e5f2f11e453e52f7ba24 Author: Duncan Coutts <[email protected]> Date: Wed Aug 6 01:11:14 2008 +0000 Remove showFields use the pre-existing ppFields >--------------------------------------------------------------- cabal-install/Distribution/Client/Config.hs | 10 +++++----- cabal-install/Distribution/Client/Logging.hs | 8 ++++---- cabal-install/Distribution/Client/ParseUtils.hs | 6 ------ cabal-install/Distribution/Client/Reporting.hs | 8 ++++---- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/cabal-install/Distribution/Client/Config.hs b/cabal-install/Distribution/Client/Config.hs index dc385df..82c9645 100644 --- a/cabal-install/Distribution/Client/Config.hs +++ b/cabal-install/Distribution/Client/Config.hs @@ -31,13 +31,13 @@ import System.Directory (createDirectoryIfMissing, getAppUserDataDirectory) import System.FilePath ((</>), takeDirectory) import Network.URI ( URI(..), URIAuth(..), parseAbsoluteURI, uriToString ) -import Text.PrettyPrint.HughesPJ (text) +import Text.PrettyPrint.HughesPJ as Disp (text, render) import Distribution.Compat.ReadP as ReadP ( ReadP, char, munch1, pfail ) import Distribution.Compiler (CompilerFlavor(..), defaultCompilerFlavor) import Distribution.ParseUtils - ( FieldDescr(..), simpleField, listField, liftField, field + ( FieldDescr(..), ppFields, simpleField, listField, liftField, field , parseFilePathQ, parseTokenQ , ParseResult(..), showPWarning, locatedErrorMsg ) import Distribution.Simple.Compiler (PackageDB(..)) @@ -55,7 +55,7 @@ import Distribution.System import Distribution.Client.Types ( RemoteRepo(..), Repo(..), Username(..), Password(..) ) -import Distribution.Client.ParseUtils (showFields, parseBasicStanza) +import Distribution.Client.ParseUtils (parseBasicStanza) import Distribution.Client.Utils (readFileIfExists) import Distribution.Simple.Utils (notice, warn) @@ -199,10 +199,10 @@ loadConfig verbosity configFile = do writeDefaultConfigFile :: FilePath -> SavedConfig -> IO () writeDefaultConfigFile file cfg = do createDirectoryIfMissing True (takeDirectory file) - writeFile file $ showFields configWriteFieldDescrs cfg ++ "\n" + writeFile file $ Disp.render (ppFields cfg configWriteFieldDescrs) ++ "\n" showConfig :: SavedConfig -> String -showConfig = showFields configFieldDescrs +showConfig cfg = render $ ppFields cfg configFieldDescrs -- | All config file fields. configFieldDescrs :: [FieldDescr SavedConfig] diff --git a/cabal-install/Distribution/Client/Logging.hs b/cabal-install/Distribution/Client/Logging.hs index 926c394..6ef9e51 100644 --- a/cabal-install/Distribution/Client/Logging.hs +++ b/cabal-install/Distribution/Client/Logging.hs @@ -43,7 +43,7 @@ import qualified Distribution.Client.InstallPlan as InstallPlan import Distribution.Client.InstallPlan ( InstallPlan, PlanPackage ) import Distribution.Client.ParseUtils - ( showFields, parseBasicStanza ) + ( parseBasicStanza ) import qualified Paths_cabal_install (version) import Distribution.Package @@ -59,11 +59,11 @@ import Distribution.Compiler import Distribution.Text ( Text(disp, parse) ) import Distribution.ParseUtils - ( FieldDescr(..), ParseResult(..), simpleField, listField ) + ( FieldDescr(..), ParseResult(..), simpleField, listField, ppFields ) import qualified Distribution.Compat.ReadP as Parse ( ReadP, {-pfail,-} munch1, char, option ) import Text.PrettyPrint.HughesPJ as Disp - ( Doc, char, text, (<>) ) + ( Doc, render, char, text, (<>) ) import Data.List ( unfoldr ) @@ -201,7 +201,7 @@ parseBuildLog str = -- Pretty-printing showBuildLogEntry :: BuildLogEntry -> String -showBuildLogEntry = showFields fieldDescrs +showBuildLogEntry e = Disp.render (ppFields e fieldDescrs) -- ----------------------------------------------------------------------------- -- Description of the fields, for parsing/printing diff --git a/cabal-install/Distribution/Client/ParseUtils.hs b/cabal-install/Distribution/Client/ParseUtils.hs index 6135da4..6efbfb9 100644 --- a/cabal-install/Distribution/Client/ParseUtils.hs +++ b/cabal-install/Distribution/Client/ParseUtils.hs @@ -1,6 +1,5 @@ module Distribution.Client.ParseUtils ( parseBasicStanza, - showFields, ) where import Distribution.ParseUtils @@ -9,7 +8,6 @@ import Distribution.ParseUtils import Control.Monad (foldM) import Data.Maybe (listToMaybe) -import Text.PrettyPrint.HughesPJ (render, vcat, text, (<>), (<+>)) parseBasicStanza :: [FieldDescr a] -> a -> String -> ParseResult a parseBasicStanza fields empty inp = @@ -31,7 +29,3 @@ setField _ x s = lookupFieldDescr :: [FieldDescr a] -> String -> Maybe (FieldDescr a) lookupFieldDescr fs n = listToMaybe [f | f@(FieldDescr name _ _) <- fs, name == n] - -showFields :: [FieldDescr a] -> a -> String -showFields fields x = render $ vcat [ text name <> text ":" <+> getter x - | FieldDescr name getter _ <- fields ] diff --git a/cabal-install/Distribution/Client/Reporting.hs b/cabal-install/Distribution/Client/Reporting.hs index 621981f..60b38ca 100644 --- a/cabal-install/Distribution/Client/Reporting.hs +++ b/cabal-install/Distribution/Client/Reporting.hs @@ -40,7 +40,7 @@ import qualified Distribution.Client.InstallPlan as InstallPlan import Distribution.Client.InstallPlan ( InstallPlan, PlanPackage ) import Distribution.Client.ParseUtils - ( showFields, parseBasicStanza ) + ( parseBasicStanza ) import qualified Paths_cabal_install (version) import Distribution.Package @@ -56,11 +56,11 @@ import Distribution.Compiler import Distribution.Text ( Text(disp, parse) ) import Distribution.ParseUtils - ( FieldDescr(..), ParseResult(..), simpleField, listField ) + ( FieldDescr(..), ParseResult(..), simpleField, listField, ppFields ) import qualified Distribution.Compat.ReadP as Parse ( ReadP, pfail, munch1, char, option, skipSpaces ) import Text.PrettyPrint.HughesPJ as Disp - ( Doc, char, text, (<+>), (<>) ) + ( Doc, render, char, text, (<+>), (<>) ) import Distribution.Simple.Utils ( comparing, equating ) @@ -217,7 +217,7 @@ parseBuildReports str = -- Pretty-printing showBuildReport :: BuildReport -> String -showBuildReport = showFields fieldDescrs +showBuildReport br = Disp.render (ppFields br fieldDescrs) -- ----------------------------------------------------------------------------- -- Description of the fields, for parsing/printing _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
