From 59cbc230d8598a00dad5fffa29a6c5c82cb35cf6 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 19 Mar 2014 16:11:46 -0700 Subject: [PATCH] drop data-pprint for now, does not support ghc 7.8 The data-pprint and pretty-show packages used for debugging tend to be poorly supported, drop one of them for now. --- hledger-lib/Hledger/Utils.hs | 28 ++++++++++++++-------------- hledger-lib/hledger-lib.cabal | 4 ++-- hledger/hledger.cabal | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hledger-lib/Hledger/Utils.hs b/hledger-lib/Hledger/Utils.hs index 8114ec754..33b8b7707 100644 --- a/hledger-lib/Hledger/Utils.hs +++ b/hledger-lib/Hledger/Utils.hs @@ -21,7 +21,7 @@ module Hledger.Utils (---- provide these frequently used modules - or not, for c ---- all of this one: module Hledger.Utils, Debug.Trace.trace, - module Data.PPrint, + -- module Data.PPrint, -- module Hledger.Utils.UTF8IOCompat SystemString,fromSystemString,toSystemString,error',userError', ppShow @@ -36,7 +36,7 @@ import Data.Data import Data.List import qualified Data.Map as M import Data.Maybe -import Data.PPrint +-- import Data.PPrint import Data.Time.Clock import Data.Time.LocalTime import Data.Tree @@ -418,18 +418,18 @@ dbgppshow level | debugLevel >= level = \s -> traceWith (((s++": ")++) . ppShow) | otherwise = flip const --- | Print a showable value to the console, with a message, if the --- debug level is at or above the specified level (uses --- unsafePerformIO). --- Values are displayed with pprint. Field names are not shown, but the --- output is compact with smart line wrapping, long data elided, --- and slow calculations timed out. -dbgpprint :: Data a => Int -> String -> a -> a -dbgpprint level msg a - | debugLevel >= level = unsafePerformIO $ do - pprint a >>= putStrLn . ((msg++": \n") ++) . show - return a - | otherwise = a +-- -- | Print a showable value to the console, with a message, if the +-- -- debug level is at or above the specified level (uses +-- -- unsafePerformIO). +-- -- Values are displayed with pprint. Field names are not shown, but the +-- -- output is compact with smart line wrapping, long data elided, +-- -- and slow calculations timed out. +-- dbgpprint :: Data a => Int -> String -> a -> a +-- dbgpprint level msg a +-- | debugLevel >= level = unsafePerformIO $ do +-- pprint a >>= putStrLn . ((msg++": \n") ++) . show +-- return a +-- | otherwise = a -- | Like dbg, then exit the program. Uses unsafePerformIO. diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 27a9e1b62..951e2ecf1 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -60,7 +60,7 @@ library ,cmdargs >= 0.10 && < 0.11 ,containers ,csv - ,data-pprint >= 0.2.3 && < 0.3 + -- ,data-pprint >= 0.2.3 && < 0.3 ,directory ,filepath ,mtl @@ -91,7 +91,7 @@ test-suite tests , cmdargs , containers , csv - , data-pprint >= 0.2.3 && < 0.3 + -- , data-pprint >= 0.2.3 && < 0.3 , directory , filepath , HUnit diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 66a1961aa..b99a9b0c8 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -67,7 +67,7 @@ library -- ,cabal-file-th ,containers ,cmdargs >= 0.10 && < 0.11 - ,data-pprint >= 0.2.1 && < 0.3 + -- ,data-pprint >= 0.2.1 && < 0.3 ,directory ,filepath ,haskeline >= 0.6 && <= 0.8 @@ -124,7 +124,7 @@ executable hledger ,base >= 4.3 && < 5 ,containers ,cmdargs >= 0.10 && < 0.11 - ,data-pprint >= 0.2.1 && < 0.3 + -- ,data-pprint >= 0.2.1 && < 0.3 ,directory ,filepath ,haskeline >= 0.6 && <= 0.8 @@ -155,7 +155,7 @@ test-suite tests , cmdargs , containers , csv - , data-pprint >= 0.2.1 && < 0.3 + -- , data-pprint >= 0.2.1 && < 0.3 , directory , filepath , haskeline