Skip to content

Commit 8da9a91

Browse files
committed
Merge pull request #77 from yairchu/master
Make the quasi-quoter for expressions only accept valid syntax.
2 parents ae802c8 + faee6f8 commit 8da9a91

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/Language/ECMAScript3/Syntax/QuasiQuote.hs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@ quoteCommon :: Data a => Parser String a -> String -> TH.ExpQ
3535
quoteCommon p s = do loc <- TH.location
3636
let fname = TH.loc_filename loc
3737
let (line, col) = TH.loc_start loc
38-
let p2 = (getPosition >>= \pos ->
39-
setPosition $ (flip setSourceName) fname $
40-
(flip setSourceLine) line $
41-
(flip setSourceColumn) col $ pos) >> p
38+
let p2 = do pos <- getPosition
39+
setPosition $ (flip setSourceName) fname $
40+
(flip setSourceLine) line $
41+
(flip setSourceColumn) col $ pos
42+
r <- p
43+
eof
44+
return r
4245
case parse p2 "" s of
4346
Left err -> do TH.report True $ show err
4447
return $ TH.UnboxedTupE []

0 commit comments

Comments
 (0)