From 6e7610c1b7fb746ae2b2ad03bee91fa470ca3309 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 6 Dec 2013 13:26:08 -0800 Subject: [PATCH] drop some experimental pprint logging --- hledger/Hledger/Cli/Main.hs | 6 ++---- hledger/Hledger/Cli/Options.hs | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hledger/Hledger/Cli/Main.hs b/hledger/Hledger/Cli/Main.hs index 7bf95da22..7d677bba0 100644 --- a/hledger/Hledger/Cli/Main.hs +++ b/hledger/Hledger/Cli/Main.hs @@ -40,7 +40,6 @@ module Hledger.Cli.Main where import Control.Monad import Data.List -import Data.PPrint import Safe import System.Console.CmdArgs.Explicit (modeHelp) -- import System.Console.CmdArgs.Helper @@ -114,9 +113,8 @@ main = do version = putStrLn prognameandversion badCommandError = error' ("command "++rawcmd++" is not recognized, run with no command to see a list") >> exitFailure f `orShowHelp` mode = if hasHelp args then putStr (showModeHelp mode) else f - when (debug_ opts) $ do - putStrLn $ "processed opts:\n" ++ show opts - putStrLn . show =<< pprint opts + when (debug_ opts > 0) $ do + putStrLn $ "processed opts:\n" ++ ppShow opts putStrLn $ "command matched: " ++ show cmd putStrLn $ "isNullCommand: " ++ show isNullCommand putStrLn $ "isInternalCommand: " ++ show isInternalCommand diff --git a/hledger/Hledger/Cli/Options.hs b/hledger/Hledger/Cli/Options.hs index 54ee19b04..58b5a501a 100644 --- a/hledger/Hledger/Cli/Options.hs +++ b/hledger/Hledger/Cli/Options.hs @@ -90,7 +90,6 @@ import Control.Monad (when) import Data.List import Data.List.Split import Data.Maybe -import Data.PPrint (pprint) import Data.Time.Calendar import Safe import System.Console.CmdArgs @@ -715,7 +714,6 @@ debugArgs args opts = putStrLn $ "running: " ++ progname putStrLn $ "raw args: " ++ show args putStrLn $ "processed opts:\n" ++ show opts - putStrLn . show =<< pprint opts d <- getCurrentDay putStrLn $ "search query: " ++ (show $ queryFromOpts d $ reportopts_ opts)