X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnTypes.lhs;h=a33faa16916a25cb58f32f95ff4083d43cdf8ad9;hp=eb1cd0427111f1af107c0e4c3a5f65231bed1566;hb=30c122df62ec75f9ed7f392f24c2925675bf1d06;hpb=3f1b316d7035c55cd712cd39a9981339bcef2e8c

diff --git a/compiler/typecheck/TcRnTypes.lhs b/compiler/typecheck/TcRnTypes.lhs
index eb1cd04..a33faa1 100644
--- a/compiler/typecheck/TcRnTypes.lhs
+++ b/compiler/typecheck/TcRnTypes.lhs
@@ -53,7 +53,6 @@ import Packages
 import Type
 import Coercion
 import TcType
-import TcGadt
 import InstEnv
 import FamInstEnv
 import IOEnv
@@ -64,7 +63,7 @@ import NameSet
 import Var
 import VarEnv
 import Module
-import UniqFM
+import LazyUniqFM
 import SrcLoc
 import VarSet
 import ErrUtils
@@ -75,6 +74,7 @@ import Bag
 import Outputable
 import ListSetOps
 import FiniteMap
+import FastString
 
 import Data.Maybe
 import Data.List
@@ -318,8 +318,8 @@ data TcLclEnv		-- Changes as we move inside an expression
 	tcl_ctxt :: ErrCtxt,		-- Error context
 	tcl_errs :: TcRef Messages,	-- Place to accumulate errors
 
-	tcl_th_ctxt    :: ThStage,	-- Template Haskell context
-	tcl_arrow_ctxt :: ArrowCtxt,	-- Arrow-notation context
+	tcl_th_ctxt    :: ThStage,	      -- Template Haskell context
+	tcl_arrow_ctxt :: ArrowCtxt,	      -- Arrow-notation context
 
 	tcl_rdr :: LocalRdrEnv,		-- Local name envt
 		-- Maintained during renaming, of course, but also during
@@ -632,7 +632,7 @@ type Int, represented by
 	Method 34 doubleId [Int] origin
 
 In addition to the basic Haskell variants of 'Inst's, they can now also
-represent implication constraints 'forall tvs. (reft, given) => wanted'
+represent implication constraints 'forall tvs. given => wanted'
 and equality constraints 'co :: ty1 ~ ty2'.
 
 NB: Equalities occur in two flavours:
@@ -655,22 +655,17 @@ data Inst
     }
 
   | ImplicInst {	-- An implication constraint
-			-- forall tvs. (reft, given) => wanted
+			-- forall tvs. given => wanted
 	tci_name   :: Name,
 	tci_tyvars :: [TcTyVar],    -- Quantified type variables
-				    -- Includes coercion variables
-				    --   mentioned in tci_reft
-	tci_reft   :: Refinement,
 	tci_given  :: [Inst],	    -- Only Dicts and EqInsts
 				    --   (no Methods, LitInsts, ImplicInsts)
-	tci_wanted :: [Inst],	    -- Only Dicts and ImplicInsts
+	tci_wanted :: [Inst],	    -- Only Dicts, EqInst, and ImplicInsts
 				    --   (no Methods or LitInsts)
 
 	tci_loc    :: InstLoc
     }
-	-- NB: the tci_given are not necessarily rigid,
-	--     although they will be if the tci_reft is non-trivial
-	-- NB: the tci_reft is already applied to tci_given and tci_wanted
+	-- NB: the tci_given are not necessarily rigid
 
   | Method {
 	tci_id :: TcId,		-- The Id for the Inst
@@ -864,18 +859,23 @@ data InstOrigin
 	-- The rest are all occurrences: Insts that are 'wanted'
 	-------------------------------------------------------
   | OccurrenceOf Name		-- Occurrence of an overloaded identifier
+  | SpecPragOrigin Name		-- Specialisation pragma for identifier
 
   | IPOccOrigin  (IPName Name)	-- Occurrence of an implicit parameter
 
   | LiteralOrigin (HsOverLit Name)	-- Occurrence of a literal
+  | NegateOrigin			-- Occurrence of syntactic negation
 
   | ArithSeqOrigin (ArithSeqInfo Name) -- [x..], [x..y] etc
   | PArrSeqOrigin  (ArithSeqInfo Name) -- [:x..y:] and [:x,y..z:]
+  | TupleOrigin			       -- (..,..)
 
   | InstSigOrigin	-- A dict occurrence arising from instantiating
 			-- a polymorphic type during a subsumption check
 
+  | ExprSigOrigin	-- e :: ty
   | RecordUpdOrigin
+  | ViewPatOrigin
   | InstScOrigin	-- Typechecking superclasses of an instance declaration
   | DerivOrigin		-- Typechecking deriving
   | StandAloneDerivOrigin -- Typechecking stand-alone deriving
@@ -887,13 +887,17 @@ data InstOrigin
 
 instance Outputable InstOrigin where
     ppr (OccurrenceOf name)   = hsep [ptext SLIT("a use of"), quotes (ppr name)]
+    ppr (SpecPragOrigin name) = hsep [ptext SLIT("a specialisation pragma for"), quotes (ppr name)]
     ppr (IPOccOrigin name)    = hsep [ptext SLIT("a use of implicit parameter"), quotes (ppr name)]
     ppr (IPBindOrigin name)   = hsep [ptext SLIT("a binding for implicit parameter"), quotes (ppr name)]
     ppr RecordUpdOrigin       = ptext SLIT("a record update")
+    ppr ExprSigOrigin         = ptext SLIT("an expression type signature")
+    ppr ViewPatOrigin         = ptext SLIT("a view pattern")
     ppr (LiteralOrigin lit)   = hsep [ptext SLIT("the literal"), quotes (ppr lit)]
     ppr (ArithSeqOrigin seq)  = hsep [ptext SLIT("the arithmetic sequence"), quotes (ppr seq)]
     ppr (PArrSeqOrigin seq)   = hsep [ptext SLIT("the parallel array sequence"), quotes (ppr seq)]
-    ppr InstSigOrigin	      = ptext SLIT("instantiating a type signature")
+    ppr TupleOrigin	      = ptext SLIT("a tuple")
+    ppr NegateOrigin	      = ptext SLIT("a use of syntactic negation")
     ppr InstScOrigin	      = ptext SLIT("the superclasses of an instance declaration")
     ppr DerivOrigin	      = ptext SLIT("the 'deriving' clause of a data type declaration")
     ppr StandAloneDerivOrigin = ptext SLIT("a 'deriving' declaration")
@@ -903,5 +907,4 @@ instance Outputable InstOrigin where
     ppr (ImplicOrigin doc)    = doc
     ppr (SigOrigin info)      = pprSkolInfo info
     ppr EqOrigin	      = ptext SLIT("a type equality")
-
 \end{code}