diff --git a/Ledger/Models.hs b/Ledger.hs similarity index 88% rename from Ledger/Models.hs rename to Ledger.hs index 6fae92e1f..33f6a1aa9 100644 --- a/Ledger/Models.hs +++ b/Ledger.hs @@ -1,7 +1,6 @@ {-| -Import this module to get all the hledger \"models\" and their \"methods\". -} -module Ledger.Models ( +module Ledger ( module Ledger.Types, module Ledger.Currency, module Ledger.Amount, diff --git a/Ledger/Parse.hs b/Ledger/Parse.hs index 3e7e83d42..57767e57f 100644 --- a/Ledger/Parse.hs +++ b/Ledger/Parse.hs @@ -110,7 +110,10 @@ import qualified Text.ParserCombinators.Parsec.Token as P import System.IO import Ledger.Utils -import Ledger.Models +import Ledger.Types +import Ledger.LedgerEntry (autofillEntry) +import Ledger.Currency (getcurrency) +import Ledger.TimeLog (ledgerFromTimeLog) -- utils diff --git a/Tests.hs b/Tests.hs index 8b26a430d..05b1d9e31 100644 --- a/Tests.hs +++ b/Tests.hs @@ -4,7 +4,7 @@ import qualified Data.Map as Map import Text.ParserCombinators.Parsec import Options -import Ledger.Models +import Ledger import Ledger.Parse import Ledger.Utils diff --git a/hledger.hs b/hledger.hs index e22c70bf6..2551ba382 100644 --- a/hledger.hs +++ b/hledger.hs @@ -22,7 +22,6 @@ hledger ("Main") "Tests" "Parse" "Options" - "Models" "TimeLog" "Ledger" "Account" @@ -63,7 +62,7 @@ import qualified Data.Map as Map (lookup) import Options import Tests (hunit, quickcheck) -import Ledger.Models +import Ledger import Ledger.Parse (parseLedgerFile) import Ledger.Utils hiding (test)