summaryrefslogtreecommitdiff
path: root/compiler/hsSyn/HsUtils.lhs
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2012-03-24 22:25:56 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2012-03-24 22:25:56 +0000
commitd9ee9d9d964c5cc4bc40c2a62d825e4b33548860 (patch)
treefd1e819c6ffad29ddfe9c8a6ea38d076ea1789a1 /compiler/hsSyn/HsUtils.lhs
parentb857c8ad367877f424b5fca50bd45199f39f86c7 (diff)
parent4f6a56ea2211761c13808c3248cbf84b47b61c17 (diff)
downloadhaskell-d9ee9d9d964c5cc4bc40c2a62d825e4b33548860.tar.gz
Merge branch 'master' of http://darcs.haskell.org//ghc
Conflicts: compiler/main/HscStats.lhs
Diffstat (limited to 'compiler/hsSyn/HsUtils.lhs')
-rw-r--r--compiler/hsSyn/HsUtils.lhs5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/hsSyn/HsUtils.lhs b/compiler/hsSyn/HsUtils.lhs
index 88c09387db..2049ebb7e3 100644
--- a/compiler/hsSyn/HsUtils.lhs
+++ b/compiler/hsSyn/HsUtils.lhs
@@ -269,8 +269,9 @@ mkHsBSig :: a -> HsBndrSig a
mkHsBSig x = HsBSig x placeHolderBndrs
-------------
-userHsTyVarBndrs :: [Located name] -> [Located (HsTyVarBndr name)]
-userHsTyVarBndrs bndrs = [ L loc (UserTyVar v) | L loc v <- bndrs ]
+userHsTyVarBndrs :: SrcSpan -> [Located name] -> [Located (HsTyVarBndr name)]
+-- Caller sets location
+userHsTyVarBndrs loc bndrs = [ L loc (UserTyVar v) | L _ v <- bndrs ]
\end{code}