From 638238dc5c677fea7fc7611b5a8e20d687ef00e7 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 10 Apr 2009 05:40:57 +0000
Subject: [PATCH] ledgerFile cleanup

---
 Ledger/Parse.hs | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Ledger/Parse.hs b/Ledger/Parse.hs
index a89c80445..f716e26ad 100644
--- a/Ledger/Parse.hs
+++ b/Ledger/Parse.hs
@@ -83,23 +83,24 @@ parseLedger reftime inname intxt = do
     Right m  -> liftM (rawLedgerConvertTimeLog reftime) $ m `ap` (return rawLedgerEmpty)
     Left err -> throwError $ show err
 
--- As all ledger line types can be distinguished by the first
--- character, excepting transactions versus empty (blank or
--- comment-only) lines, can use choice w/o try
 
 ledgerFile :: GenParser Char LedgerFileCtx (ErrorT String IO (RawLedger -> RawLedger))
-ledgerFile = do ledger_txns <- many1 ledgerItem
+ledgerFile = do items <- many1 ledgerItem
                 eof
-                return $ liftM (foldr1 (.)) $ sequence ledger_txns
-    where ledgerItem = choice [ ledgerDirective
-                                  , liftM (return . addLedgerTransaction) ledgerTransaction
-                                  , liftM (return . addModifierTransaction) ledgerModifierTransaction
-                                  , liftM (return . addPeriodicTransaction) ledgerPeriodicTransaction
-                                  , liftM (return . addHistoricalPrice) ledgerHistoricalPrice
-                                  , ledgerDefaultYear
-                                  , emptyLine >> return (return id)
-                                  , liftM (return . addTimeLogEntry)  timelogentry
-                                  ]
+                return $ liftM (foldr1 (.)) $ sequence items
+    where 
+      -- As all ledger line types can be distinguished by the first
+      -- character, excepting transactions versus empty (blank or
+      -- comment-only) lines, can use choice w/o try
+      ledgerItem = choice [ ledgerDirective
+                          , liftM (return . addLedgerTransaction) ledgerTransaction
+                          , liftM (return . addModifierTransaction) ledgerModifierTransaction
+                          , liftM (return . addPeriodicTransaction) ledgerPeriodicTransaction
+                          , liftM (return . addHistoricalPrice) ledgerHistoricalPrice
+                          , ledgerDefaultYear
+                          , emptyLine >> return (return id)
+                          , liftM (return . addTimeLogEntry)  timelogentry
+                          ]
 
 ledgerDirective :: GenParser Char LedgerFileCtx (ErrorT String IO (RawLedger -> RawLedger))
 ledgerDirective = do char '!'