aboutsummaryrefslogtreecommitdiffhomepage
path: root/checker
diff options
context:
space:
mode:
authorGravatar glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>2010-09-23 10:01:20 +0000
committerGravatar glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>2010-09-23 10:01:20 +0000
commit679801623c1f55d0081f952c2094c3572fa39d4f (patch)
treeb87f22ad4ca0db14f978ba299af22fd3d3edf081 /checker
parentc92183a4bc227dbcfc3bf874801bd03724e5541d (diff)
Fix inconsistency in Prop/Set conversion check
This commit fixes a bug that made the system inconsistent with proof irrelevance (the main idea being that Set = Prop by reflexivity). git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13450 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'checker')
-rw-r--r--checker/reduction.ml3
1 files changed, 2 insertions, 1 deletions
diff --git a/checker/reduction.ml b/checker/reduction.ml
index 1f963d125..a86d23ecb 100644
--- a/checker/reduction.ml
+++ b/checker/reduction.ml
@@ -152,7 +152,8 @@ type conv_pb =
let sort_cmp univ pb s0 s1 =
match (s0,s1) with
- | (Prop c1, Prop c2) -> if c1 = Pos & c2 = Null then raise NotConvertible
+ | (Prop c1, Prop c2) when pb = CUMUL -> if c1 = Pos & c2 = Null then raise NotConvertible
+ | (Prop c1, Prop c2) -> if c1 <> c2 then raise NotConvertible
| (Prop c1, Type u) ->
(match pb with
CUMUL -> ()