mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

reorg

Browse source
This commit is contained in:
Joey Hess 2011-12-22 20:21:42 -04:00
parent eb7ef6264e
commit db964e358f
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Utility/Format.hs
View file

@ -36,10 +36,6 @@ data Frag = Const String | Var String Padding
- justification. -} - justification. -}
type Padding = Int type Padding = Int
empty :: Frag -> Bool
empty (Const "") = True
empty _ = False
{- Expands a Format using some variables, generating a formatted string. {- Expands a Format using some variables, generating a formatted string.
- This can be repeatedly called, efficiently. -} - This can be repeatedly called, efficiently. -}
format :: Format -> M.Map String String -> String format :: Format -> M.Map String String -> String
@ -63,7 +59,7 @@ gen :: FormatString -> Format
gen = filter (not . empty) . fuse [] . scan [] . decode_c gen = filter (not . empty) . fuse [] . scan [] . decode_c
where where
-- The Format is built up in reverse, for efficiency, -- The Format is built up in reverse, for efficiency,
-- and can have adjacent Consts. Fusing it fixes both -- and can have many adjacent Consts. Fusing it fixes both
-- problems. -- problems.
fuse f [] = f fuse f [] = f
fuse f (Const c1:Const c2:vs) = fuse f $ Const (c2++c1) : vs fuse f (Const c1:Const c2:vs) = fuse f $ Const (c2++c1) : vs
@ -90,6 +86,9 @@ gen = filter (not . empty) . fuse [] . scan [] . decode_c
novar v = "${" ++ reverse v novar v = "${" ++ reverse v
foundvar f v p cs = scan (Var (reverse v) p : f) cs foundvar f v p cs = scan (Var (reverse v) p : f) cs
empty :: Frag -> Bool
empty (Const "") = True
empty _ = False
{- Decodes a C-style encoding, where \n is a newline, \NNN is an octal {- Decodes a C-style encoding, where \n is a newline, \NNN is an octal
- encoded character, etc. - encoded character, etc.