summaryrefslogtreecommitdiff
path: root/compiler/basicTypes
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2011-12-05 04:46:15 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2011-12-05 04:46:15 +0000
commiteb21a9793c903dacfd0b86e5ce80178c8ccbd731 (patch)
tree8e6ae156b130e56bba9be378156206ef2f88cdbd /compiler/basicTypes
parent9a0adc0b01aa62bd605145a555d26645229d5cc1 (diff)
parent2e6dcdf711ebd50eef230a878014a5a9abd20e07 (diff)
downloadhaskell-eb21a9793c903dacfd0b86e5ce80178c8ccbd731.tar.gz
Merge branch 'master' of ../HEAD
Diffstat (limited to 'compiler/basicTypes')
-rw-r--r--compiler/basicTypes/Var.lhs9
1 files changed, 4 insertions, 5 deletions
diff --git a/compiler/basicTypes/Var.lhs b/compiler/basicTypes/Var.lhs
index 8e31fef8ea..d7caf2a521 100644
--- a/compiler/basicTypes/Var.lhs
+++ b/compiler/basicTypes/Var.lhs
@@ -122,14 +122,13 @@ Note [Evidence: EvIds and CoVars]
* An EvId (evidence Id) is a *boxed*, term-level evidence variable
(dictionary, implicit parameter, or equality).
-* DictId, IpId, and EqVar are synonyms when we know what kind of
- evidence we are talking about. For example, an EqVar has type (t1 ~ t2).
-
* A CoVar (coercion variable) is an *unboxed* term-level evidence variable
of type (t1 ~# t2). So it's the unboxed version of an EqVar.
-* Only CoVars can occur in Coercions (but NB the LCoercion hack; see
- Note [LCoercions] in Coercion).
+* Only CoVars can occur in Coercions, EqVars appear in TcCoercions.
+
+* DictId, IpId, and EqVar are synonyms when we know what kind of
+ evidence we are talking about. For example, an EqVar has type (t1 ~ t2).
Note [Kind and type variables]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~