summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-15 14:23:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-15 14:23:39 -0400
commit802027473b9344e876599269736fafad1b145d44 (patch)
tree930bfe004064f93b01be156bf1f839761d3e4aba /Build
parentaec93a9847caf7409152bf78664b591ab7608bc5 (diff)
handle multi-line QQ
Diffstat (limited to 'Build')
-rw-r--r--Build/EvilSplicer.hs56
1 files changed, 30 insertions, 26 deletions
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs
index 6fef646ae..22113226a 100644
--- a/Build/EvilSplicer.hs
+++ b/Build/EvilSplicer.hs
@@ -123,31 +123,15 @@ spliceParser = do
<$> (string "expression" <|> string "declarations")
newline
- expression <- indentedLine
+ getthline <- expressionextractor
+ expression <- unlines <$> many1 getthline
indent
string "======>"
newline
- {- All lines of the splice code will start with the same
- - indent, which is stripped. Any other indentation is preserved. -}
- indent <- lookAhead indent
- let getcodeline = do
- string indent
- restOfLine
-
- {- When splicing declarations, GHC will output a splice
- - at 1:1, and then inside the splice code block,
- - the first line will give the actual coordinates of the
- - line that was spliced.
- -}
- let getrealcoords = do
- string indent
- string file
- char ':'
- char '\n' `after` coordsParser
-
- realcoords <- try (Right <$> getrealcoords) <|> (Left <$> getcodeline)
+ getcodeline <- expressionextractor
+ realcoords <- try (Right <$> getrealcoords file) <|> (Left <$> getcodeline)
codelines <- many getcodeline
return $ case realcoords of
Left firstcodeline ->
@@ -163,6 +147,24 @@ spliceParser = do
tosplicetype "expression" = SpliceExpression
tosplicetype s = error $ "unknown splice type: " ++ s
+ {- All lines of the indented expression start with the same
+ - indent, which is stripped. Any other indentation is preserved. -}
+ expressionextractor = do
+ i <- lookAhead indent
+ return $ try $ do
+ string i
+ restOfLine
+
+ {- When splicing declarations, GHC will output a splice
+ - at 1:1, and then inside the splice code block,
+ - the first line will give the actual coordinates of the
+ - line that was spliced. -}
+ getrealcoords file = do
+ indent
+ string file
+ char ':'
+ char '\n' `after` coordsParser
+
{- Extracts the splices, ignoring the rest of the compiler output. -}
splicesExtractor :: Parser [Splice]
splicesExtractor = rights <$> many extract
@@ -230,20 +232,22 @@ applySplices destdir imports splices@(first:_) = do
]
expandExpressionSplice :: Splice -> [String] -> [String]
-expandExpressionSplice s lls = concat [before, new:splicerest, end]
+expandExpressionSplice s lls = concat [before, spliced:padding, end]
where
cs = spliceStart s
ce = spliceEnd s
(before, rest) = splitAt (coordLine cs - 1) lls
(oldlines, end) = splitAt (1 + coordLine (offsetCoord ce cs)) rest
- (splicestart, splicerest) = case oldlines of
- l:r -> (expandtabs l, take (length r) (repeat []))
- _ -> ([], [])
- new = concat
+ (splicestart, padding, spliceend) = case map expandtabs oldlines of
+ ss:r
+ | null r -> (ss, [], ss)
+ | otherwise -> (ss, take (length r) (repeat []), last r)
+ _ -> ([], [], [])
+ spliced = concat
[ joinsplice $ deqqstart $ take (coordColumn cs - 1) splicestart
, addindent (findindent splicestart) (mangleCode $ splicedCode s)
- , deqqend $ drop (coordColumn ce) splicestart
+ , deqqend $ drop (coordColumn ce) spliceend
]
{- coordinates assume tabs are expanded to 8 spaces -}