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

misc cleanup

Browse Source
This commit is contained in:
Simon Michael 2008-11-26 05:21:44 +00:00
parent 4d49177117
commit 3e1a615dbf
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Ledger/Parse.hs
View File

@ -507,7 +507,7 @@ smartdate = do
,try d ,try d
,try month ,try month
,try mon ,try mon
,try parsetoday ,try today'
,try yesterday ,try yesterday
,try tomorrow ,try tomorrow
-- ,try thiswhatever -- ,try thiswhatever
@ -516,15 +516,15 @@ smartdate = do
] ]
return $ (y,m,d) return $ (y,m,d)
datesep = oneOf "/-." datesepchar = oneOf "/-."
ymd :: Parser (String,String,String) ymd :: Parser (String,String,String)
ymd = do ymd = do
y <- many1 digit y <- many1 digit
datesep datesepchar
m <- many1 digit m <- many1 digit
guard (read m <= 12) guard (read m <= 12)
datesep datesepchar
d <- many1 digit d <- many1 digit
guard (read d <= 31) guard (read d <= 31)
return (y,m,d) return (y,m,d)
@ -533,7 +533,7 @@ ym :: Parser (String,String,String)
ym = do ym = do
y <- many1 digit y <- many1 digit
guard (read y > 12) guard (read y > 12)
datesep datesepchar
m <- many1 digit m <- many1 digit
guard (read m <= 12) guard (read m <= 12)
return (y,m,"1") return (y,m,"1")
@ -555,7 +555,7 @@ md :: Parser (String,String,String)
md = do md = do
m <- many1 digit m <- many1 digit
guard (read m <= 12) guard (read m <= 12)
datesep datesepchar
d <- many1 digit d <- many1 digit
guard (read d <= 31) guard (read d <= 31)
return ("",m,d) return ("",m,d)
@ -577,10 +577,9 @@ mon = do
let i = maybe 0 (+1) $ (map toLower m) `elemIndex` mons let i = maybe 0 (+1) $ (map toLower m) `elemIndex` mons
return ("",show i,"1") return ("",show i,"1")
parsetoday = string "today" >> return ("","","today") today' = string "today" >> return ("","","today")
yesterday = string "yesterday" >> return ("","","yesterday") yesterday = string "yesterday" >> return ("","","yesterday")
tomorrow = string "tomorrow" >> return ("","","tomorrow") tomorrow = string "tomorrow" >> return ("","","tomorrow")
type TransactionMatcher = Transaction -> Bool type TransactionMatcher = Transaction -> Bool

21
Options.hs
View File

@ -9,12 +9,8 @@ import Ledger.Dates
import Ledger.Utils import Ledger.Utils
usage = usageInfo usagehdr options ++ usageftr defaultfile = "~/.ledger"
fileenvvar = "LEDGER"
negativePatternChar opts
| OptionsAnywhere `elem` opts = '^'
| otherwise = '-'
usagehdr = "Usage: hledger [OPTS] COMMAND [ACCTPATTERNS] [-- DESCPATTERNS]\n" ++ usagehdr = "Usage: hledger [OPTS] COMMAND [ACCTPATTERNS] [-- DESCPATTERNS]\n" ++
"\n" ++ "\n" ++
"Options (before command, unless using --options-anywhere):" "Options (before command, unless using --options-anywhere):"
@ -31,8 +27,7 @@ usageftr = "\n" ++
"\n" ++ "\n" ++
"Also: hledger [-v] test [TESTPATTERNS] to run self-tests.\n" ++ "Also: hledger [-v] test [TESTPATTERNS] to run self-tests.\n" ++
"\n" "\n"
defaultfile = "~/.ledger" usage = usageInfo usagehdr options ++ usageftr
fileenvvar = "LEDGER"
-- | Command-line options we accept. -- | Command-line options we accept.
options :: [OptDescr Opt] options :: [OptDescr Opt]
@ -203,14 +198,10 @@ parseAccountDescriptionArgs opts args = (as, ds')
where (as, ds) = break (==patseparator) args where (as, ds) = break (==patseparator) args
ds' = dropWhile (==patseparator) ds ds' = dropWhile (==patseparator) ds
patseparator = replicate 2 negchar patseparator = replicate 2 negchar
negchar = negativePatternChar opts negchar
| OptionsAnywhere `elem` opts = '^'
| otherwise = '-'
-- testoptions RequireOrder ["foo","-v"]
-- testoptions Permute ["foo","-v"]
-- testoptions (ReturnInOrder Arg) ["foo","-v"]
-- testoptions Permute ["foo","--","-v"]
-- testoptions Permute ["-?o","--name","bar","--na=baz"]
-- testoptions Permute ["--ver","foo"]
testoptions order cmdline = putStr $ testoptions order cmdline = putStr $
case getOpt order options cmdline of case getOpt order options cmdline of
(o,n,[] ) -> "options=" ++ show o ++ " args=" ++ show n (o,n,[] ) -> "options=" ++ show o ++ " args=" ++ show n