slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: fix haddock generation (web excluded)

Browse Source
This commit is contained in:
Simon Michael 2012-11-19 23:36:36 +00:00
parent 4248df5c6f
commit 79f0e98186
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -56,15 +56,15 @@ SOURCEFILES:= \
# a more careful list suitable for for haddock # a more careful list suitable for for haddock
HADDOCKSOURCEFILES:= \ HADDOCKSOURCEFILES:= \
hledger-lib/*hs \ hledger-lib/Hledger.hs \
hledger-lib/Hledger/*hs \ hledger-lib/Hledger/*hs \
hledger-lib/Hledger/*/*hs \ hledger-lib/Hledger/*/*hs \
hledger/Hledger/*hs \ hledger/Hledger/*hs \
hledger/Hledger/*/*hs \ hledger/Hledger/*/*hs \
hledger-web/Hledger/*hs \ # hledger-web/Hledger/*hs \
hledger-web/Hledger/*/*hs \ # hledger-web/Hledger/*/*hs \
hledger-web/app/*.hs \ # hledger-web/app/*.hs \
hledger-web/Settings/*.hs # hledger-web/Settings/*.hs
CABALFILES:= \ CABALFILES:= \
hledger/hledger.cabal \ hledger/hledger.cabal \

4
hledger-lib/Hledger/Data/Amount.hs
View File

@ -149,8 +149,8 @@ similarAmountsOp op Amount{acommodity=_, aquantity=aq, astyle=AmountStyle{aspre
Amount{acommodity=bc, aquantity=bq, astyle=bs@AmountStyle{asprecision=bp}} = Amount{acommodity=bc, aquantity=bq, astyle=bs@AmountStyle{asprecision=bp}} =
-- trace ("a:"++showAmount a) $ trace ("b:"++showAmount b++"\n") $ tracewith (("=:"++).showAmount) -- trace ("a:"++showAmount a) $ trace ("b:"++showAmount b++"\n") $ tracewith (("=:"++).showAmount)
amount{acommodity=bc, aquantity=aq `op` bq, astyle=bs{asprecision=max ap bp}} 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}} -- 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" -- otherwise = error "tried to do simple arithmetic with amounts in different commodities"
-- | Convert an amount to the specified commodity, ignoring and discarding -- | Convert an amount to the specified commodity, ignoring and discarding
-- any assigned prices and assuming an exchange rate of 1. -- any assigned prices and assuming an exchange rate of 1.