move Ledger.* to Hledger.Data.*

Hledger/Cli/Commands/Add.hs

@@ -7,7 +7,7 @@ A history-aware add command to help with data entry.
 
 module Hledger.Cli.Commands.Add
 where
-import Ledger
+import Hledger.Data
 import Hledger.Cli.Options
 import Hledger.Cli.Commands.Register (showRegisterReport)
 #if __GLASGOW_HASKELL__ <= 610

Hledger/Cli/Commands/All.hs

@@ -24,7 +24,7 @@ module Hledger.Cli.Commands.All (
 #ifdef CHART
                      module Hledger.Cli.Commands.Chart,
 #endif
-                     tests_Commands
+                     tests_Hledger_Commands
               )
 where
 import Hledger.Cli.Commands.Add
@@ -46,7 +46,7 @@ import Hledger.Cli.Commands.Chart
 import Test.HUnit (Test(TestList))
 
 
-tests_Commands = TestList
+tests_Hledger_Commands = TestList
     [
 --      Hledger.Cli.Commands.Add.tests_Add
 --     ,Hledger.Cli.Commands.Balance.tests_Balance

Hledger/Cli/Commands/Balance.hs

@@ -97,12 +97,12 @@ balance report:
 
 module Hledger.Cli.Commands.Balance
 where
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Amount
-import Ledger.AccountName
-import Ledger.Posting
-import Ledger.Ledger
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Amount
+import Hledger.Data.AccountName
+import Hledger.Data.Posting
+import Hledger.Data.Ledger
 import Hledger.Cli.Options
 #if __GLASGOW_HASKELL__ <= 610
 import Prelude hiding ( putStr )

Hledger/Cli/Commands/Chart.hs

@@ -6,11 +6,11 @@ Generate balances pie chart
 
 module Hledger.Cli.Commands.Chart
 where
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Amount
-import Ledger.Ledger
-import Ledger.Commodity
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Amount
+import Hledger.Data.Ledger
+import Hledger.Data.Commodity
 import Hledger.Cli.Options
 
 import Control.Monad (liftM3)

Hledger/Cli/Commands/Convert.hs

@@ -6,17 +6,17 @@ format, and print it on stdout. See the manual for more details.
 module Hledger.Cli.Commands.Convert where
 import Hledger.Cli.Options (Opt(Debug))
 import Hledger.Version (versionstr)
-import Ledger.Types (Ledger,AccountName,Transaction(..),Posting(..),PostingType(..))
-import Ledger.Utils (strip, spacenonewline, restofline, parseWithCtx, assertParse, assertParseEqual)
-import Ledger.Parse (someamount, emptyCtx, ledgeraccountname)
-import Ledger.Amount (nullmixedamt)
+import Hledger.Data.Types (Ledger,AccountName,Transaction(..),Posting(..),PostingType(..))
+import Hledger.Data.Utils (strip, spacenonewline, restofline, parseWithCtx, assertParse, assertParseEqual)
+import Hledger.Data.Parse (someamount, emptyCtx, ledgeraccountname)
+import Hledger.Data.Amount (nullmixedamt)
 import Safe (atDef, maximumDef)
 import System.IO (stderr)
 import Text.CSV (parseCSVFromFile, printCSV)
 import Text.Printf (hPrintf)
 import Text.RegexPR (matchRegexPR, gsubRegexPR)
 import Data.Maybe
-import Ledger.Dates (firstJust, showDate, parsedate)
+import Hledger.Data.Dates (firstJust, showDate, parsedate)
 import System.Locale (defaultTimeLocale)
 import Data.Time.Format (parseTime)
 import Control.Monad (when, guard, liftM)

Hledger/Cli/Commands/Histogram.hs

@@ -7,7 +7,7 @@ Print a histogram report.
 
 module Hledger.Cli.Commands.Histogram
 where
-import Ledger
+import Hledger.Data
 import Hledger.Cli.Options
 #if __GLASGOW_HASKELL__ <= 610
 import Prelude hiding ( putStr )

Hledger/Cli/Commands/Print.hs

@@ -7,7 +7,7 @@ A ledger-compatible @print@ command.
 
 module Hledger.Cli.Commands.Print
 where
-import Ledger
+import Hledger.Data
 import Hledger.Cli.Options
 #if __GLASGOW_HASKELL__ <= 610
 import Prelude hiding ( putStr )

Hledger/Cli/Commands/Register.hs

@@ -13,7 +13,7 @@ module Hledger.Cli.Commands.Register (
 ) where
 
 import Safe (headMay, lastMay)
-import Ledger
+import Hledger.Data
 import Hledger.Cli.Options
 #if __GLASGOW_HASKELL__ <= 610
 import Prelude hiding ( putStr )

Hledger/Cli/Commands/Stats.hs

@@ -7,7 +7,7 @@ Print some statistics for the ledger.
 
 module Hledger.Cli.Commands.Stats
 where
-import Ledger
+import Hledger.Data
 import Hledger.Cli.Options
 #if __GLASGOW_HASKELL__ <= 610
 import Prelude hiding ( putStr )

Hledger/Cli/Commands/UI.hs

@@ -8,7 +8,7 @@ module Hledger.Cli.Commands.UI
 where
 import Safe (headDef)
 import Graphics.Vty
-import Ledger
+import Hledger.Data
 import Hledger.Cli.Options
 import Hledger.Cli.Commands.Balance
 import Hledger.Cli.Commands.Register

Hledger/Cli/Commands/Web.hs

@@ -44,7 +44,7 @@ import Hledger.Cli.Commands.Balance
 import Hledger.Cli.Commands.Histogram
 import Hledger.Cli.Commands.Print
 import Hledger.Cli.Commands.Register
-import Ledger
+import Hledger.Data
 import Hledger.Cli.Options hiding (value)
 #ifdef MAKE
 import Paths_hledger_make (getDataFileName)

Hledger/Cli/Main.hs

@@ -12,7 +12,7 @@ import System.IO.UTF8
 #endif
 
 import Hledger.Cli.Commands.All
-import Ledger
+import Hledger.Data
 import Hledger.Cli.Options
 import Hledger.Tests
 import Hledger.Utils (withLedgerDo)

Hledger/Cli/Options.hs

@@ -8,10 +8,10 @@ where
 import System.Console.GetOpt
 import System.Environment
 import Hledger.Version (timeprogname)
-import Ledger.IO (myLedgerPath,myTimelogPath)
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Dates
+import Hledger.Data.IO (myLedgerPath,myTimelogPath)
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Dates
 #if __GLASGOW_HASKELL__ <= 610
 import Codec.Binary.UTF8.String (decodeString)
 #endif

Hledger/Tests.hs

@@ -36,7 +36,7 @@ import System.Exit (exitFailure, exitWith, ExitCode(ExitSuccess)) -- base 3 comp
 import System.Time (ClockTime(TOD))
 
 import Hledger.Cli.Commands.All
-import Ledger  -- including testing utils in Ledger.Utils
+import Hledger.Data  -- including testing utils in Hledger.Data.Utils
 import Hledger.Cli.Options
 import Hledger.Utils
 
@@ -59,8 +59,8 @@ runtests opts args = do
 -- inconvenient due to import cycles or whatever, we define them here.
 tests :: Test
 tests = TestList [
-   tests_Ledger,
-   tests_Commands,
+   tests_Hledger_Data,
+   tests_Hledger_Commands,
 
    "account directive" ~:
    let sameParse str1 str2 = do l1 <- journalFromString str1

Hledger/Utils.hs

@@ -1,15 +1,15 @@
 {-# LANGUAGE CPP #-}
 {-|
 
-Utilities for top-level modules and ghci. See also "Ledger.IO" and
-"Ledger.Utils".
+Utilities for top-level modules and ghci. See also Hledger.Data.IO and
+Hledger.Data.Utils.
 
 -}
 
 module Hledger.Utils
 where
 import Control.Monad.Error
-import Ledger
+import Hledger.Data
 import Hledger.Cli.Options (Opt(..),ledgerFilePathFromOpts) -- ,optsToFilterSpec)
 import System.Directory (doesFileExist)
 import System.IO (stderr)

Hledger/Version.hs

@@ -7,7 +7,7 @@ numbering policy.
 module Hledger.Version
 where
 import System.Info (os, arch)
-import Ledger.Utils
+import Hledger.Data.Utils
 
 -- version and PATCHLEVEL are set by the makefile
 version       = "0.8.0"

Makefile

@@ -36,7 +36,8 @@ SOURCEFILES:= \
 	Hledger/Cli/*hs \
 	Hledger/Cli/Commands/*hs \
 	hledger-lib/*hs \
-	hledger-lib/Ledger/*hs
+	hledger-lib/Hledger/*hs \
+	hledger-lib/Hledger/Data/*hs
 DOCFILES:=README README2 MANUAL NEWS CONTRIBUTORS SCREENSHOTS
 BINARYFILENAME=`runhaskell ./hledger.hs --binary-filename`
 PATCHLEVEL:=$(shell expr `darcs changes --count --from-tag=\\\\\.` - 1)

hledger-lib/Hledger/Data.hs

@@ -0,0 +1,58 @@
+{-| 
+
+The Ledger library allows parsing and querying of ledger files.  It
+generally provides a compatible subset of C++ ledger's functionality.
+This package re-exports all the Ledger.* modules.
+
+-}
+
+module Hledger.Data (
+               module Hledger.Data.Account,
+               module Hledger.Data.AccountName,
+               module Hledger.Data.Amount,
+               module Hledger.Data.Commodity,
+               module Hledger.Data.Dates,
+               module Hledger.Data.IO,
+               module Hledger.Data.Transaction,
+               module Hledger.Data.Ledger,
+               module Hledger.Data.Parse,
+               module Hledger.Data.Journal,
+               module Hledger.Data.Posting,
+               module Hledger.Data.TimeLog,
+               module Hledger.Data.Types,
+               module Hledger.Data.Utils,
+               tests_Hledger_Data
+              )
+where
+import Hledger.Data.Account
+import Hledger.Data.AccountName
+import Hledger.Data.Amount
+import Hledger.Data.Commodity
+import Hledger.Data.Dates
+import Hledger.Data.IO
+import Hledger.Data.Transaction
+import Hledger.Data.Ledger
+import Hledger.Data.Parse
+import Hledger.Data.Journal
+import Hledger.Data.Posting
+import Hledger.Data.TimeLog
+import Hledger.Data.Types
+import Hledger.Data.Utils
+
+tests_Hledger_Data = TestList
+    [
+    --  Hledger.Data.Account.tests_Account
+    -- ,Hledger.Data.AccountName.tests_AccountName
+     Hledger.Data.Amount.tests_Amount
+    -- ,Hledger.Data.Commodity.tests_Commodity
+    ,Hledger.Data.Dates.tests_Dates
+    -- ,Hledger.Data.IO.tests_IO
+    ,Hledger.Data.Transaction.tests_Transaction
+    -- ,Hledger.Data.Hledger.Data.tests_Hledger.Data
+    ,Hledger.Data.Parse.tests_Parse
+    -- ,Hledger.Data.Journal.tests_Journal
+    -- ,Hledger.Data.Posting.tests_Posting
+    -- ,Hledger.Data.TimeLog.tests_TimeLog
+    -- ,Hledger.Data.Types.tests_Types
+    -- ,Hledger.Data.Utils.tests_Utils
+    ]

hledger-lib/Hledger/Data/Account.hs

@@ -10,11 +10,11 @@ A compound data type for efficiency. An 'Account' stores
 
 -}
 
-module Ledger.Account
+module Hledger.Data.Account
 where
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Amount
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Amount
 
 
 instance Show Account where

hledger-lib/Hledger/Data/AccountName.hs

@@ -6,10 +6,10 @@ From a set of these we derive the account hierarchy.
 
 -}
 
-module Ledger.AccountName
+module Hledger.Data.AccountName
 where
-import Ledger.Utils
-import Ledger.Types
+import Hledger.Data.Utils
+import Hledger.Data.Types
 import Data.Map (Map)
 import qualified Data.Map as M
 

hledger-lib/Hledger/Data/Amount.hs

@@ -38,11 +38,11 @@ price-discarding arithmetic which ignores and discards prices.
 
 -}
 
-module Ledger.Amount
+module Hledger.Data.Amount
 where
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Commodity
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Commodity
 
 
 instance Show Amount where show = showAmount

hledger-lib/Hledger/Data/Commodity.hs

@@ -6,10 +6,10 @@ display 'Amount's of the commodity - is the symbol on the left or right,
 are thousands separated by comma, significant decimal places and so on.
 
 -}
-module Ledger.Commodity
+module Hledger.Data.Commodity
 where
-import Ledger.Utils
-import Ledger.Types
+import Hledger.Data.Utils
+import Hledger.Data.Types
 
 
 -- convenient amount and commodity constructors, for tests etc.

hledger-lib/Hledger/Data/Dates.hs

@@ -18,7 +18,7 @@ quarterly, etc.
 
 -}
 
-module Ledger.Dates
+module Hledger.Data.Dates
 where
 
 import Data.Time.Format
@@ -27,8 +27,8 @@ import System.Locale (defaultTimeLocale)
 import Text.ParserCombinators.Parsec
 import Text.ParserCombinators.Parsec.Char
 import Text.ParserCombinators.Parsec.Combinator
-import Ledger.Types
-import Ledger.Utils
+import Hledger.Data.Types
+import Hledger.Data.Utils
 
 
 showDate :: Day -> String

hledger-lib/Hledger/Data/IO.hs

@@ -3,14 +3,14 @@
 Utilities for doing I/O with ledger files.
 -}
 
-module Ledger.IO
+module Hledger.Data.IO
 where
 import Control.Monad.Error
-import Ledger.Ledger (cacheLedger', nullledger)
-import Ledger.Parse (parseLedger)
-import Ledger.Types (FilterSpec(..),WhichDate(..),Journal(..),Ledger(..))
-import Ledger.Utils (getCurrentLocalTime)
-import Ledger.Dates (nulldatespan)
+import Hledger.Data.Ledger (cacheLedger', nullledger)
+import Hledger.Data.Parse (parseLedger)
+import Hledger.Data.Types (FilterSpec(..),WhichDate(..),Journal(..),Ledger(..))
+import Hledger.Data.Utils (getCurrentLocalTime)
+import Hledger.Data.Dates (nulldatespan)
 import System.Directory (getHomeDirectory)
 import System.Environment (getEnv)
 #if __GLASGOW_HASKELL__ <= 610

hledger-lib/Hledger/Data/Journal.hs

@@ -6,18 +6,18 @@ to form a 'Ledger'.
 
 -}
 
-module Ledger.Journal
+module Hledger.Data.Journal
 where
 import qualified Data.Map as Map
 import Data.Map (findWithDefault, (!))
 import System.Time (ClockTime(TOD))
-import Ledger.Utils
-import Ledger.Types
-import Ledger.AccountName
-import Ledger.Amount
-import Ledger.Transaction (ledgerTransactionWithDate)
-import Ledger.Posting
-import Ledger.TimeLog
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.AccountName
+import Hledger.Data.Amount
+import Hledger.Data.Transaction (ledgerTransactionWithDate)
+import Hledger.Data.Posting
+import Hledger.Data.TimeLog
 
 
 instance Show Journal where

hledger-lib/Hledger/Data/Ledger.hs

@@ -17,7 +17,7 @@ This is the main object you'll deal with as a user of the Ledger
 library. The most useful functions also have shorter, lower-case
 aliases for easier interaction. Here's an example:
 
-> > import Ledger
+> > import Hledger.Data
 > > l <- readLedger "sample.ledger"
 > > accountnames l
 > ["assets","assets:bank","assets:bank:checking","assets:bank:saving",...
@@ -51,16 +51,16 @@ aliases for easier interaction. Here's an example:
 
 -}
 
-module Ledger.Ledger
+module Hledger.Data.Ledger
 where
 import qualified Data.Map as Map
 import Data.Map (findWithDefault, fromList)
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Account (nullacct)
-import Ledger.AccountName
-import Ledger.Journal
-import Ledger.Posting
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Account (nullacct)
+import Hledger.Data.AccountName
+import Hledger.Data.Journal
+import Hledger.Data.Posting
 
 
 instance Show Ledger where

hledger-lib/Hledger/Data/Parse.hs

@@ -140,7 +140,7 @@ o 2007/03/10 17:26:02
 
 -}
 
-module Ledger.Parse
+module Hledger.Data.Parse
 where
 import Control.Monad.Error (ErrorT(..), MonadIO, liftIO, throwError, catchError)
 import Text.ParserCombinators.Parsec
@@ -151,15 +151,15 @@ import System.Directory
 import Prelude hiding (readFile, putStr, putStrLn, print, getContents)
 import System.IO.UTF8
 #endif
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Dates
-import Ledger.AccountName (accountNameFromComponents,accountNameComponents)
-import Ledger.Amount
-import Ledger.Transaction
-import Ledger.Posting
-import Ledger.Journal
-import Ledger.Commodity (dollars,dollar,unknown)
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Dates
+import Hledger.Data.AccountName (accountNameFromComponents,accountNameComponents)
+import Hledger.Data.Amount
+import Hledger.Data.Transaction
+import Hledger.Data.Posting
+import Hledger.Data.Journal
+import Hledger.Data.Commodity (dollars,dollar,unknown)
 import System.FilePath(takeDirectory,combine)
 
 

hledger-lib/Hledger/Data/Posting.hs

@@ -7,13 +7,13 @@ we can get a date or description for a posting (from the transaction).
 
 -}
 
-module Ledger.Posting
+module Hledger.Data.Posting
 where
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Amount
-import Ledger.AccountName
-import Ledger.Dates (nulldate)
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Amount
+import Hledger.Data.AccountName
+import Hledger.Data.Dates (nulldate)
 
 
 instance Show Posting where show = showPosting

hledger-lib/Hledger/Data/TimeLog.hs

@@ -6,13 +6,13 @@ converted to 'Transactions' and queried like a ledger.
 
 -}
 
-module Ledger.TimeLog
+module Hledger.Data.TimeLog
 where
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Dates
-import Ledger.Commodity
-import Ledger.Transaction
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Dates
+import Hledger.Data.Commodity
+import Hledger.Data.Transaction
 
 instance Show TimeLogEntry where 
     show t = printf "%s %s %s" (show $ tlcode t) (show $ tldatetime t) (tlcomment t)

hledger-lib/Hledger/Data/Transaction.hs

@@ -5,14 +5,14 @@ normally contains two or more balanced 'Posting's.
 
 -}
 
-module Ledger.Transaction
+module Hledger.Data.Transaction
 where
-import Ledger.Utils
-import Ledger.Types
-import Ledger.Dates
-import Ledger.Posting
-import Ledger.Amount
-import Ledger.Commodity (dollars, dollar, unknown)
+import Hledger.Data.Utils
+import Hledger.Data.Types
+import Hledger.Data.Dates
+import Hledger.Data.Posting
+import Hledger.Data.Amount
+import Hledger.Data.Commodity (dollars, dollar, unknown)
 
 instance Show Transaction where show = showTransactionUnelided
 

hledger-lib/Hledger/Data/Types.hs

@@ -27,9 +27,9 @@ Terminology has been in flux:
 
 -}
 
-module Ledger.Types 
+module Hledger.Data.Types
 where
-import Ledger.Utils
+import Hledger.Data.Utils
 import qualified Data.Map as Map
 import System.Time (ClockTime)
 import Data.Typeable (Typeable)

hledger-lib/Hledger/Data/Utils.hs

@@ -6,7 +6,7 @@ needed low in the module hierarchy. This is the bottom of the dependency graph.
 
 -}
 
-module Ledger.Utils (
+module Hledger.Data.Utils (
 module Data.Char,
 module Control.Monad,
 module Data.List,
@@ -18,7 +18,7 @@ module Data.Time.Clock,
 module Data.Time.Calendar,
 module Data.Time.LocalTime,
 module Debug.Trace,
-module Ledger.Utils,
+module Hledger.Data.Utils,
 module Text.Printf,
 module Text.RegexPR,
 module Test.HUnit,

hledger-lib/Ledger.hs

@@ -1,58 +0,0 @@
-{-| 
-
-The Ledger library allows parsing and querying of ledger files.  It
-generally provides a compatible subset of C++ ledger's functionality.
-This package re-exports all the Ledger.* modules.
-
--}
-
-module Ledger (
-               module Ledger.Account,
-               module Ledger.AccountName,
-               module Ledger.Amount,
-               module Ledger.Commodity,
-               module Ledger.Dates,
-               module Ledger.IO,
-               module Ledger.Transaction,
-               module Ledger.Ledger,
-               module Ledger.Parse,
-               module Ledger.Journal,
-               module Ledger.Posting,
-               module Ledger.TimeLog,
-               module Ledger.Types,
-               module Ledger.Utils,
-               tests_Ledger
-              )
-where
-import Ledger.Account
-import Ledger.AccountName
-import Ledger.Amount
-import Ledger.Commodity
-import Ledger.Dates
-import Ledger.IO
-import Ledger.Transaction
-import Ledger.Ledger
-import Ledger.Parse
-import Ledger.Journal
-import Ledger.Posting
-import Ledger.TimeLog
-import Ledger.Types
-import Ledger.Utils
-
-tests_Ledger = TestList
-    [
-    --  Ledger.Account.tests_Account
-    -- ,Ledger.AccountName.tests_AccountName
-     Ledger.Amount.tests_Amount
-    -- ,Ledger.Commodity.tests_Commodity
-    ,Ledger.Dates.tests_Dates
-    -- ,Ledger.IO.tests_IO
-    ,Ledger.Transaction.tests_Transaction
-    -- ,Ledger.Ledger.tests_Ledger
-    ,Ledger.Parse.tests_Parse
-    -- ,Ledger.Journal.tests_Journal
-    -- ,Ledger.Posting.tests_Posting
-    -- ,Ledger.TimeLog.tests_TimeLog
-    -- ,Ledger.Types.tests_Types
-    -- ,Ledger.Utils.tests_Utils
-    ]

hledger-lib/hledger-lib.cabal

@@ -26,21 +26,21 @@ build-type:     Simple
 
 library
   exposed-modules:
-                  Ledger
-                  Ledger.Account
-                  Ledger.AccountName
-                  Ledger.Amount
-                  Ledger.Commodity
-                  Ledger.Dates
-                  Ledger.IO
-                  Ledger.Transaction
-                  Ledger.Journal
-                  Ledger.Ledger
-                  Ledger.Posting
-                  Ledger.Parse
-                  Ledger.TimeLog
-                  Ledger.Types
-                  Ledger.Utils
+                  Hledger.Data
+                  Hledger.Data.Account
+                  Hledger.Data.AccountName
+                  Hledger.Data.Amount
+                  Hledger.Data.Commodity
+                  Hledger.Data.Dates
+                  Hledger.Data.IO
+                  Hledger.Data.Transaction
+                  Hledger.Data.Journal
+                  Hledger.Data.Ledger
+                  Hledger.Data.Posting
+                  Hledger.Data.Parse
+                  Hledger.Data.TimeLog
+                  Hledger.Data.Types
+                  Hledger.Data.Utils
   Build-Depends:
                   base >= 3 && < 5
                  ,containers