From 1bb33be54deab518100ef90635808007c4aebd65 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 27 Feb 2020 22:49:53 -0800 Subject: [PATCH] ;lib: Hledger.Read.TimedotReader cleanup --- hledger-lib/Hledger/Read/TimedotReader.hs | 28 +++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/hledger-lib/Hledger/Read/TimedotReader.hs b/hledger-lib/Hledger/Read/TimedotReader.hs index 7e1b5a788..93faa830f 100644 --- a/hledger-lib/Hledger/Read/TimedotReader.hs +++ b/hledger-lib/Hledger/Read/TimedotReader.hs @@ -1,3 +1,6 @@ +-- * -*- eval: (orgstruct-mode 1); orgstruct-heading-prefix-regexp:"-- "; -*- +-- ** doc +-- In Emacs, use TAB on lines beginning with "-- *" to collapse/expand sections. {-| A reader for the "timedot" file format. @@ -23,8 +26,15 @@ inc.client1 .... .... .. -} -{-# LANGUAGE OverloadedStrings, PackageImports #-} +-- ** language +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE PackageImports #-} +-- ** doctest setup +-- $setup +-- >>> :set -XOverloadedStrings + +-- ** exports module Hledger.Read.TimedotReader ( -- * Reader reader, @@ -32,6 +42,8 @@ module Hledger.Read.TimedotReader ( timedotfilep, ) where + +-- ** imports import Prelude () import "base-compat-batteries" Prelude.Compat import Control.Monad @@ -48,10 +60,7 @@ import Hledger.Data import Hledger.Read.Common import Hledger.Utils --- traceparse :: Monad m => a -> m a --- traceparse = return -traceparse :: String -> JournalParser m () -traceparse = lift.traceParse +-- ** reader reader :: Reader reader = Reader @@ -65,6 +74,15 @@ reader = Reader parse :: InputOpts -> FilePath -> Text -> ExceptT String IO Journal parse = parseAndFinaliseJournal' timedotfilep +-- ** utilities + +-- traceparse :: Monad m => a -> m a +-- traceparse = return +traceparse :: String -> JournalParser m () +traceparse = lift.traceParse + +-- ** parsers + timedotfilep :: JournalParser m ParsedJournal timedotfilep = do many timedotfileitemp eof