projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store a SrcSpan instead of a SrcLoc inside a Name
[ghc-hetmet.git]
/
compiler
/
typecheck
/
TcEnv.lhs
diff --git
a/compiler/typecheck/TcEnv.lhs
b/compiler/typecheck/TcEnv.lhs
index
0972530
..
787616a
100644
(file)
--- a/
compiler/typecheck/TcEnv.lhs
+++ b/
compiler/typecheck/TcEnv.lhs
@@
-55,7
+55,6
@@
import TcMType
import TcType
import TcGadt
import qualified Type
import TcType
import TcGadt
import qualified Type
-import Id
import Var
import VarSet
import VarEnv
import Var
import VarSet
import VarEnv
@@
-636,7
+635,7
@@
Make a name for the dict fun for an instance decl. It's an *external*
name, like otber top-level names, and hence must be made with newGlobalBinder.
\begin{code}
name, like otber top-level names, and hence must be made with newGlobalBinder.
\begin{code}
-newDFunName :: Class -> [Type] -> SrcLoc -> TcM Name
+newDFunName :: Class -> [Type] -> SrcSpan -> TcM Name
newDFunName clas (ty:_) loc
= do { index <- nextDFunIndex
; is_boot <- tcIsHsBoot
newDFunName clas (ty:_) loc
= do { index <- nextDFunIndex
; is_boot <- tcIsHsBoot
@@
-650,12
+649,12
@@
newDFunName clas (ty:_) loc
newDFunName clas [] loc = pprPanic "newDFunName" (ppr clas <+> ppr loc)
\end{code}
newDFunName clas [] loc = pprPanic "newDFunName" (ppr clas <+> ppr loc)
\end{code}
-Make a name for the representation tycon of a data/newtype instance. It's an
+Make a name for the representation tycon of a family instance. It's an
*external* name, like otber top-level names, and hence must be made with
newGlobalBinder.
\begin{code}
*external* name, like otber top-level names, and hence must be made with
newGlobalBinder.
\begin{code}
-newFamInstTyConName :: Name -> SrcLoc -> TcM Name
+newFamInstTyConName :: Name -> SrcSpan -> TcM Name
newFamInstTyConName tc_name loc
= do { index <- nextDFunIndex
; mod <- getModule
newFamInstTyConName tc_name loc
= do { index <- nextDFunIndex
; mod <- getModule
@@
-686,7
+685,7
@@
wrongThingErr expected thing name
ptext SLIT("used as a") <+> text expected)
famInstNotFound tycon tys what
ptext SLIT("used as a") <+> text expected)
famInstNotFound tycon tys what
- = failWithTc (msg <+> quotes (ppr tycon <+> hsep (map pprParendType tys)))
+ = failWithTc (msg <+> quotes (pprTypeApp (ppr tycon) tys))
where
msg = ptext $ if length what > 1
then SLIT("More than one family instance for")
where
msg = ptext $ if length what > 1
then SLIT("More than one family instance for")