From 26a37bf3df010551924c8a918304c67b2929daa8 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 24 Nov 2012 15:13:14 +0000 Subject: [PATCH] web: quick fix for "Prelude.read: no parse" errors with GHC >= 7.6 --- hledger-web/Handler/Utils.hs | 2 +- hledger/Hledger/Cli/Utils.hs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hledger-web/Handler/Utils.hs b/hledger-web/Handler/Utils.hs index 3fcb7a28d..351875396 100644 --- a/hledger-web/Handler/Utils.hs +++ b/hledger-web/Handler/Utils.hs @@ -122,7 +122,7 @@ numbered :: [a] -> [(Int,a)] numbered = zip [1..] dayToJsTimestamp :: Day -> Integer -dayToJsTimestamp d = read (formatTime defaultTimeLocale "%s" t) * 1000 +dayToJsTimestamp d = read (formatTime defaultTimeLocale "%s" t) * 1000 -- XXX read where t = UTCTime d (secondsToDiffTime 0) chomp :: String -> String diff --git a/hledger/Hledger/Cli/Utils.hs b/hledger/Hledger/Cli/Utils.hs index e5899091c..4598bc487 100644 --- a/hledger/Hledger/Cli/Utils.hs +++ b/hledger/Hledger/Cli/Utils.hs @@ -103,12 +103,13 @@ fileModificationTime :: FilePath -> IO ClockTime fileModificationTime f | null f = getClockTime | otherwise = (do +-- getModificationTime returned a ClockTime till GHC 7.6 (directory 1.2), now it's UTCTime #if __GLASGOW_HASKELL__ < 706 clo <- getModificationTime f #else utc <- getModificationTime f let nom = utcTimeToPOSIXSeconds utc - let clo = TOD (read $ show nom) 0 -- XXX + let clo = TOD (read $ takeWhile (`elem` "0123456789") $ show nom) 0 -- XXX read #endif return clo )