aboutsummaryrefslogtreecommitdiff
path: root/src/HsParseUtils.lhs
diff options
context:
space:
mode:
authorDuncan Coutts <duncan.coutts@worc.ox.ac.uk>2006-01-21 17:15:27 +0000
committerDuncan Coutts <duncan.coutts@worc.ox.ac.uk>2006-01-21 17:15:27 +0000
commit43bb89fa9667162f3f4a0e024a3f926696c173b9 (patch)
tree92d67daf703a0b5acb50c7dd502b0ee163b52f2e /src/HsParseUtils.lhs
parentf52324bb86a403f41ad9fc2050bc350fd7635714 (diff)
Teach haddock about line pragmas and add accurate source code links
Teach haddock about C and Haskell style line pragmas. Extend the lexer/parser's source location tracking to include the file name as well as line/column. This way each AST item that is tagged with a SrcLoc gets the original file name too. Use this original file name to add source links to each exported item, in the same visual style as the wiki links. Note that the per-export source links are to the defining module rather than whichever module haddock pretends it is exported from. This is what we want for source code links. The source code link URL can also contain the name of the export so one could implement jumping to the actual location of the function in the file if it were linked to an html version of the source rather than just plain text. The name can be selected with the %N wild card. So for linking to the raw source code one might use: --source=http://darcs/haskell.org/foo/%F Or for linking to html syntax highlighted code: --source=http://darcs/haskell.org/foo/%M.html#%N
Diffstat (limited to 'src/HsParseUtils.lhs')
-rw-r--r--src/HsParseUtils.lhs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/HsParseUtils.lhs b/src/HsParseUtils.lhs
index 5498cfd3..58f7f763 100644
--- a/src/HsParseUtils.lhs
+++ b/src/HsParseUtils.lhs
@@ -43,8 +43,8 @@ import Ratio
\begin{code}
parseError :: String -> P a
-parseError s = \r (SrcLoc y x) ->
- failP (show y ++ ":" ++ show x ++ ": " ++ s) r (SrcLoc y x)
+parseError s = \r (SrcLoc y x f) ->
+ failP (show f ++ ": " ++ show y ++ ":" ++ show x ++ ": " ++ s) r (SrcLoc y x f)
splitTyConApp :: HsType -> P (HsName,[HsType])
splitTyConApp t0 = split t0 []