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

fix a syntax problem with a splace that provides a parameter to a function

Browse source
This commit is contained in:
Joey Hess 2013-04-13 17:22:15 -04:00
parent 504cce3ce3
commit eda0ba7397
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Build/EvilSplicer.hs
View file

@ -173,13 +173,16 @@ expandSplice s lls = concat [before, new:splicerest, end]
l:r -> (expandtabs l, take (length r) (repeat [])) l:r -> (expandtabs l, take (length r) (repeat []))
_ -> ([], []) _ -> ([], [])
new = concat new = concat
[ let s = deqqstart $ take (coordColumn cs - 1) splicestart [ beforesplice
in if all isSpace s
then ""
else s
, addindent (findindent splicestart) (mangleCode $ splicedResult s) , addindent (findindent splicestart) (mangleCode $ splicedResult s)
, deqqend $ drop (coordColumn ce) splicestart , deqqend $ drop (coordColumn ce) splicestart
] ]
where
beforesplice =
let s = deqqstart $ take (coordColumn cs - 1) splicestart
in if all isSpace s
then ""
else s ++ " $ "
{- coordinates assume tabs are expanded to 8 spaces -} {- coordinates assume tabs are expanded to 8 spaces -}
expandtabs = replace "\t" (take 8 $ repeat ' ') expandtabs = replace "\t" (take 8 $ repeat ' ')