From ef738948896497f6e68c9862ea4a40fae42cc0bf Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 17 Nov 2012 03:22:58 +0000 Subject: [PATCH] redo bad fix to balancesheet, cashflow, incomestatement commands I had this crazy idea shakepeare-text interpolation syntax had changed when these failed in hledger-web dev builds. It was CPP of course. --- hledger/Hledger/Cli/Balancesheet.hs | 10 +++++----- hledger/Hledger/Cli/Cashflow.hs | 6 +++--- hledger/Hledger/Cli/Incomestatement.hs | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hledger/Hledger/Cli/Balancesheet.hs b/hledger/Hledger/Cli/Balancesheet.hs index 56c9848ef..f10a35a95 100644 --- a/hledger/Hledger/Cli/Balancesheet.hs +++ b/hledger/Hledger/Cli/Balancesheet.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE QuasiQuotes, RecordWildCards #-} +{-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-} {-| The @balancesheet@ command prints a simple balance sheet. @@ -32,15 +32,15 @@ balancesheet CliOpts{reportopts_=ropts} j = do LT.putStr $ [lt|Balance Sheet Assets: --{unlines $ accountsReportAsText ropts assetreport} +#{unlines $ accountsReportAsText ropts assetreport} Liabilities: --{unlines $ accountsReportAsText ropts liabilityreport} +#{unlines $ accountsReportAsText ropts liabilityreport} Equity: --{unlines $ accountsReportAsText ropts equityreport} +#{unlines $ accountsReportAsText ropts equityreport} Total: -------------------- --{padleft 20 $ showMixedAmountWithoutPrice total} +#{padleft 20 $ showMixedAmountWithoutPrice total} |] withoutBeginDate :: ReportOpts -> ReportOpts diff --git a/hledger/Hledger/Cli/Cashflow.hs b/hledger/Hledger/Cli/Cashflow.hs index aba070951..09be714fe 100644 --- a/hledger/Hledger/Cli/Cashflow.hs +++ b/hledger/Hledger/Cli/Cashflow.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE QuasiQuotes, RecordWildCards #-} +{-# LANGUAGE QuasiQuotes, RecordWildCards, NoCPP #-} {-| The @cashflow@ command prints a simplified cashflow statement. It just @@ -36,11 +36,11 @@ cashflow CliOpts{reportopts_=ropts} j = do LT.putStr $ [lt|Cashflow Statement Cash flows: --{unlines $ accountsReportAsText ropts cashreport} +#{unlines $ accountsReportAsText ropts cashreport} Total: -------------------- --{padleft 20 $ showMixedAmountWithoutPrice total} +#{padleft 20 $ showMixedAmountWithoutPrice total} |] withoutBeginDate :: ReportOpts -> ReportOpts diff --git a/hledger/Hledger/Cli/Incomestatement.hs b/hledger/Hledger/Cli/Incomestatement.hs index 9b682e67f..4c644a4fe 100644 --- a/hledger/Hledger/Cli/Incomestatement.hs +++ b/hledger/Hledger/Cli/Incomestatement.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings #-} +{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings, NoCPP #-} {-| The @incomestatement@ command prints a simple income statement (profit & loss) report. @@ -29,13 +29,13 @@ incomestatement CliOpts{reportopts_=ropts} j = do LT.putStr $ [lt|Income Statement Revenues: --{unlines $ accountsReportAsText ropts incomereport} +#{unlines $ accountsReportAsText ropts incomereport} Expenses: --{unlines $ accountsReportAsText ropts expensereport} +#{unlines $ accountsReportAsText ropts expensereport} Total: -------------------- --{padleft 20 $ showMixedAmountWithoutPrice total} +#{padleft 20 $ showMixedAmountWithoutPrice total} |] tests_Hledger_Cli_Incomestatement :: Test