move the rest of the core code to the Ledger package

Ledger/Account.hs

@@ -1,12 +1,12 @@
-module Account
+module Ledger.Account
 where
 import Ledger.Utils
 import Ledger.Types
-import AccountName
-import Amount
-import LedgerEntry
-import RawTransaction
-import Transaction
+import Ledger.AccountName
+import Ledger.Amount
+import Ledger.LedgerEntry
+import Ledger.RawTransaction
+import Ledger.Transaction
 
 
 instance Show Account where

Ledger/AccountName.hs

@@ -1,4 +1,4 @@
-module AccountName
+module Ledger.AccountName
 where
 import Ledger.Utils
 import Ledger.Types

Ledger/Amount.hs

@@ -34,7 +34,7 @@ currencies can be converted to a simple amount. Arithmetic examples:
 @   
 -}
 
-module Amount
+module Ledger.Amount
 where
 import Ledger.Utils
 import Ledger.Types

Ledger/Ledger.hs

@@ -1,15 +1,15 @@
-module Ledger
+module Ledger.Ledger
 where
 import qualified Data.Map as Map
 import Data.Map ((!))
 import Ledger.Utils
 import Ledger.Types
-import Amount
-import Account
-import AccountName
-import Transaction
-import RawLedger
-import LedgerEntry
+import Ledger.Amount
+import Ledger.Account
+import Ledger.AccountName
+import Ledger.Transaction
+import Ledger.RawLedger
+import Ledger.LedgerEntry
 
 
 rawLedgerTransactions :: RawLedger -> [Transaction]

Ledger/LedgerEntry.hs

@@ -1,9 +1,9 @@
-module LedgerEntry
+module Ledger.LedgerEntry
 where
 import Ledger.Utils
 import Ledger.Types
-import RawTransaction
-import Amount
+import Ledger.RawTransaction
+import Ledger.Amount
 
 
 instance Show LedgerEntry where show = showEntryDescription

Ledger/Models.hs

@@ -0,0 +1,32 @@
+{-| 
+This module makes it easier to import all the hledger "models",
+the main data types and their "methods".
+-}
+module Ledger.Models (
+               module Ledger.Types,
+               module Ledger.Currency,
+               module Ledger.Amount,
+               module Ledger.AccountName,
+               module Ledger.RawTransaction,
+               module Ledger.LedgerEntry,
+               module Ledger.TimeLog,
+               module Ledger.Transaction,
+               -- module Ledger.RawLedger,
+               module Ledger.Account,
+               module Ledger.Ledger,
+              )
+where
+import qualified Data.Map as Map
+
+import Ledger.Types
+import Ledger.Currency
+import Ledger.Amount
+import Ledger.AccountName
+import Ledger.RawTransaction
+import Ledger.LedgerEntry
+import Ledger.TimeLog
+import Ledger.Transaction
+import Ledger.RawLedger
+import Ledger.Account
+import Ledger.Ledger
+

Ledger/Parse.hs

@@ -101,7 +101,7 @@ i, o, b, h
 See Tests.hs for sample data.
 -}
 
-module Parse
+module Ledger.Parse
 where
 import qualified Data.Map as Map
 import Text.ParserCombinators.Parsec
@@ -110,21 +110,10 @@ import qualified Text.ParserCombinators.Parsec.Token as P
 import System.IO
 
 import Ledger.Utils
-import Models
-import Options
-
+import Ledger.Models
 
 -- utils
 
--- | parse the user's specified ledger file and do some action with it
--- (or report a parse error)
-parseLedgerAndDo :: [Flag] -> (Regex,Regex) -> (Ledger -> IO ()) -> IO ()
-parseLedgerAndDo opts pats cmd = do
-    path <- ledgerFilePath opts
-    parsed <- parseLedgerFile path
-    case parsed of Left err -> parseError err
-                   Right l -> cmd $ cacheLedger l pats
-
 parseLedgerFile :: String -> IO (Either ParseError RawLedger)
 parseLedgerFile "-" = fmap (parse ledgerfile "-") $ hGetContents stdin
 parseLedgerFile f   = parseFromFile ledgerfile f

Ledger/RawLedger.hs

@@ -1,11 +1,11 @@
-module RawLedger
+module Ledger.RawLedger
 where
 import qualified Data.Map as Map
 
 import Ledger.Utils
 import Ledger.Types
-import AccountName
-import LedgerEntry
+import Ledger.AccountName
+import Ledger.LedgerEntry
 
 
 instance Show RawLedger where

Ledger/RawTransaction.hs

@@ -1,9 +1,9 @@
-module RawTransaction
+module Ledger.RawTransaction
 where
 import Ledger.Utils
 import Ledger.Types
-import AccountName
-import Amount
+import Ledger.AccountName
+import Ledger.Amount
 
 
 instance Show RawTransaction where show = showLedgerTransaction

Ledger/TimeLog.hs

@@ -1,12 +1,12 @@
-module TimeLog
+module Ledger.TimeLog
 where
 import Ledger.Utils
 import Ledger.Types
-import Currency
-import Amount
-import RawTransaction
-import LedgerEntry
-import RawLedger
+import Ledger.Currency
+import Ledger.Amount
+import Ledger.RawTransaction
+import Ledger.LedgerEntry
+import Ledger.RawLedger
 
 instance Show TimeLogEntry where 
     show t = printf "%s %s %s" (show $ tlcode t) (tldatetime t) (tlcomment t)

Ledger/Transaction.hs

@@ -1,12 +1,12 @@
-module Transaction
+module Ledger.Transaction
 where
 import Ledger.Utils
 import Ledger.Types
-import AccountName
-import LedgerEntry
-import RawTransaction
-import Amount
-import Currency
+import Ledger.AccountName
+import Ledger.LedgerEntry
+import Ledger.RawTransaction
+import Ledger.Amount
+import Ledger.Currency
 
 
 instance Show Transaction where 

Ledger/Utils.hs

@@ -1,4 +1,4 @@
--- standard imports and utilities
+-- standard always-available imports and utilities
 module Ledger.Utils (
               module Ledger.Utils,
               module Char,

Models.hs

@@ -1,32 +0,0 @@
-{-| 
-This module makes it easier to import all the hledger "models",
-the main data types and their "methods".
--}
-module Models (
-               module Ledger.Types,
-               module Currency,
-               module Amount,
-               module AccountName,
-               module RawTransaction,
-               module LedgerEntry,
-               module TimeLog,
-               module Transaction,
-               -- module RawLedger,
-               module Account,
-               module Ledger,
-              )
-where
-import qualified Data.Map as Map
-
-import Ledger.Types
-import Currency
-import Amount
-import AccountName
-import RawTransaction
-import LedgerEntry
-import TimeLog
-import Transaction
-import RawLedger
-import Account
-import Ledger
-

Options.hs

@@ -1,4 +1,4 @@
-module Options (parseOptions, parsePatternArgs, wildcard, Flag(..), usage, ledgerFilePath)
+module Options (parseOptions, parsePatternArgs, wildcard, Flag(..), usage, ledgerFilePath, parseLedgerAndDo)
 where
 import System.Console.GetOpt
 import System.Directory
@@ -7,6 +7,8 @@ import Data.Maybe (fromMaybe)
     
 import Ledger.Utils
 import Ledger.Types
+import Ledger.Parse (parseLedgerFile, parseError)
+import Ledger.Ledger (cacheLedger)
 
 
 usagehdr       = "Usage: hledger [OPTIONS] "++commands++" [ACCTPATTERNS] [-- DESCPATTERNS]\nOptions:"
@@ -88,4 +90,14 @@ regexFor [] = wildcard
 regexFor ss = mkRegex $ "(" ++ (unwords $ intersperse "|" ss) ++ ")"
 
 wildcard :: Regex
-wildcard = mkRegex ".*"
+wildcard = mkRegex ".*"
+
+-- | parse the user's specified ledger file and do some action with it
+-- (or report a parse error)
+parseLedgerAndDo :: [Flag] -> (Regex,Regex) -> (Ledger -> IO ()) -> IO ()
+parseLedgerAndDo opts pats cmd = do
+    path <- ledgerFilePath opts
+    parsed <- parseLedgerFile path
+    case parsed of Left err -> parseError err
+                   Right l -> cmd $ cacheLedger l pats
+

Tests.hs

@@ -4,8 +4,8 @@ import qualified Data.Map as Map
 import Text.ParserCombinators.Parsec
 
 import Options
-import Models
-import Parse
+import Ledger.Models
+import Ledger.Parse
 import Ledger.Utils
 
 -- utils

hledger.hs

@@ -59,13 +59,12 @@ This module includes some helpers for querying your ledger in ghci. Examples:
 module Main
 where
 import System
-import Text.ParserCombinators.Parsec (ParseError)
 import qualified Data.Map as Map (lookup)
 
 import Options
-import Models
-import Parse (parseLedgerAndDo, parseLedgerFile)
 import Tests (hunit, quickcheck)
+import Ledger.Models
+import Ledger.Parse (parseLedgerFile)
 import Ledger.Utils hiding (test)