From 79f0e9818601b605fbec8bddc795b99eb47896fb Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 19 Nov 2012 23:36:36 +0000 Subject: [PATCH] tools: fix haddock generation (web excluded) --- Makefile | 10 +++++----- hledger-lib/Hledger/Data/Amount.hs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 410c5133d..40bb278e3 100644 --- a/Makefile +++ b/Makefile @@ -56,15 +56,15 @@ SOURCEFILES:= \ # a more careful list suitable for for haddock HADDOCKSOURCEFILES:= \ - hledger-lib/*hs \ + hledger-lib/Hledger.hs \ hledger-lib/Hledger/*hs \ hledger-lib/Hledger/*/*hs \ hledger/Hledger/*hs \ hledger/Hledger/*/*hs \ - hledger-web/Hledger/*hs \ - hledger-web/Hledger/*/*hs \ - hledger-web/app/*.hs \ - hledger-web/Settings/*.hs + # hledger-web/Hledger/*hs \ + # hledger-web/Hledger/*/*hs \ + # hledger-web/app/*.hs \ + # hledger-web/Settings/*.hs CABALFILES:= \ hledger/hledger.cabal \ diff --git a/hledger-lib/Hledger/Data/Amount.hs b/hledger-lib/Hledger/Data/Amount.hs index fba79b78a..546b0ab7f 100644 --- a/hledger-lib/Hledger/Data/Amount.hs +++ b/hledger-lib/Hledger/Data/Amount.hs @@ -149,8 +149,8 @@ similarAmountsOp op Amount{acommodity=_, aquantity=aq, astyle=AmountStyle{aspre Amount{acommodity=bc, aquantity=bq, astyle=bs@AmountStyle{asprecision=bp}} = -- trace ("a:"++showAmount a) $ trace ("b:"++showAmount b++"\n") $ tracewith (("=:"++).showAmount) amount{acommodity=bc, aquantity=aq `op` bq, astyle=bs{asprecision=max ap bp}} - -- | ac==bc = amount{acommodity=ac, aquantity=aq `op` bq, astyle=as{asprecision=max ap bp}} - -- | otherwise = error "tried to do simple arithmetic with amounts in different commodities" + -- ac==bc = amount{acommodity=ac, aquantity=aq `op` bq, astyle=as{asprecision=max ap bp}} + -- otherwise = error "tried to do simple arithmetic with amounts in different commodities" -- | Convert an amount to the specified commodity, ignoring and discarding -- any assigned prices and assuming an exchange rate of 1.