diff options
| author | herbelin | 2011-12-04 20:48:20 +0000 |
|---|---|---|
| committer | herbelin | 2011-12-04 20:48:20 +0000 |
| commit | 17e99469c656a157f5ab998e21c41294ea2abbf8 (patch) | |
| tree | 4e0d8129a9f09659d91d19a05b2cc5e4d61365f9 /pretyping/evarconv.ml | |
| parent | c9f87fca10b37d15fc943dc4f5d2adb1c3304a3c (diff) | |
Discarding let-ins from the instances of the evars in the
pattern-unification test. They were tolerated up to r14539. Also
expanded the let-ins not bound to rel or var in the right-hand side of
a term for which pattern-unification is tested (this expansion can
refer to a non-let variable that has to be taken into account in the
pattern-unification test).
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14757 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping/evarconv.ml')
| -rw-r--r-- | pretyping/evarconv.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pretyping/evarconv.ml b/pretyping/evarconv.ml index ec581eaf16..91b0eacc48 100644 --- a/pretyping/evarconv.ml +++ b/pretyping/evarconv.ml @@ -228,7 +228,7 @@ and evar_eqappr_x ?(rhs_is_stuck_proj = false) | Flexible ev1, MaybeFlexible flex2 -> let f1 i = - match is_unification_pattern_evar env ev1 l1 (applist appr2) with + match is_unification_pattern_evar env evd ev1 l1 (applist appr2) with | Some l1' -> (* Miller-Pfenning's patterns unification *) (* Preserve generality (except that CCI has no eta-conversion) *) @@ -261,7 +261,7 @@ and evar_eqappr_x ?(rhs_is_stuck_proj = false) | MaybeFlexible flex1, Flexible ev2 -> let f1 i = - match is_unification_pattern_evar env ev2 l2 (applist appr1) with + match is_unification_pattern_evar env evd ev2 l2 (applist appr1) with | Some l1' -> (* Miller-Pfenning's patterns unification *) (* Preserve generality (except that CCI has no eta-conversion) *) @@ -361,7 +361,7 @@ and evar_eqappr_x ?(rhs_is_stuck_proj = false) evar_conv_x ts (push_rel (na,None,c) env) i CONV c'1 c'2)] | Flexible ev1, (Rigid _ | PseudoRigid _) -> - (match is_unification_pattern_evar env ev1 l1 (applist appr2) with + (match is_unification_pattern_evar env evd ev1 l1 (applist appr2) with | Some l1 -> (* Miller-Pfenning's pattern unification *) (* Preserve generality thanks to eta-conversion) *) @@ -375,7 +375,7 @@ and evar_eqappr_x ?(rhs_is_stuck_proj = false) true) | (Rigid _ | PseudoRigid _), Flexible ev2 -> - (match is_unification_pattern_evar env ev2 l2 (applist appr1) with + (match is_unification_pattern_evar env evd ev2 l2 (applist appr1) with | Some l2 -> (* Miller-Pfenning's pattern unification *) (* Preserve generality thanks to eta-conversion) *) |