diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2013-07-09 14:24:10 +0100 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-01-12 14:48:35 -0600 |
| commit | bb6cef20b82ef7a7f2d49f3ef6dc1a7ce880b5f0 (patch) | |
| tree | ea07b1d4ab43169bc8d7074ff05bf1792c93feb0 /src/Haddock.hs | |
| parent | c1228df0339d041b455bb993786a9ed6322c5e01 (diff) | |
One pass parser and tests.
We remove the HTML test as it is no longer necessary. We cover the
test case in spec tests and other HTML tests but keeping this around
fails: this is because the new parser has different semantics there.
In fact, I suspect the original behaviour was a bug that wasn't
caught/fixed but simply included as-is during the testing.
Diffstat (limited to 'src/Haddock.hs')
| -rw-r--r-- | src/Haddock.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Haddock.hs b/src/Haddock.hs index 6d16d601..b741f5f1 100644 --- a/src/Haddock.hs +++ b/src/Haddock.hs @@ -23,8 +23,7 @@ import Haddock.Backends.Xhtml.Themes (getThemes) import Haddock.Backends.LaTeX import Haddock.Backends.Hoogle import Haddock.Interface -import Haddock.Lex -import Haddock.Parse +import Haddock.Parser import Haddock.Types import Haddock.Version import Haddock.InterfaceFile @@ -447,8 +446,7 @@ getPrologue dflags flags = [] -> return Nothing [filename] -> do str <- readFile filename - case parseParas (tokenise dflags str - (1,0) {- TODO: real position -}) of + case parseParas dflags str of Nothing -> throwE $ "failed to parse haddock prologue from file: " ++ filename Just doc -> return (Just doc) _otherwise -> throwE "multiple -p/--prologue options" |