diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2007-02-21 17:07:50 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2007-02-21 17:07:50 +0000 |
| commit | 673455fadfc0ca4df1fa33a629c57694bf442394 (patch) | |
| tree | ecf37553eaa5878f349f56c22440d94255f3c719 /pretyping/evarconv.ml | |
| parent | 3e5f0e1521168412e3f0982a6c5456fd2978e63b (diff) | |
Prise en compte de l'environnement dans les pbs de conversion + MAJ CHANGES
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9664 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping/evarconv.ml')
| -rw-r--r-- | pretyping/evarconv.ml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pretyping/evarconv.ml b/pretyping/evarconv.ml index 34f5a3c14..66270c2b3 100644 --- a/pretyping/evarconv.ml +++ b/pretyping/evarconv.ml @@ -327,7 +327,7 @@ and evar_eqappr_x env isevars pbty (term1,l1 as appr1) (term2,l2 as appr2) = solve_simple_eqn evar_conv_x env isevars (pbty,ev1,t2) else (* Postpone the use of an heuristic *) - add_conv_pb (pbty,applist(term1,l1),applist(term2,l2)) isevars, + add_conv_pb (pbty,env,applist(term1,l1),applist(term2,l2)) isevars, true | Rigid _, Flexible ev2 -> @@ -342,7 +342,7 @@ and evar_eqappr_x env isevars pbty (term1,l1 as appr1) (term2,l2 as appr2) = solve_simple_eqn evar_conv_x env isevars (pbty,ev2,t1) else (* Postpone the use of an heuristic *) - add_conv_pb (pbty,applist(term1,l1),applist(term2,l2)) isevars, + add_conv_pb (pbty,env,applist(term1,l1),applist(term2,l2)) isevars, true | MaybeFlexible flex1, Rigid _ -> @@ -524,8 +524,7 @@ let first_order_unification env isevars pbty (term1,l1) (term2,l2) = let consider_remaining_unif_problems env isevars = let (isevars,pbs) = get_conv_pbs isevars (fun _ -> true) in List.fold_left - (fun (isevars,b as p) (pbty,t1,t2) -> - (* Pas le bon env pour le problème... *) + (fun (isevars,b as p) (pbty,env,t1,t2) -> if b then first_order_unification env isevars pbty (apprec_nohdbeta env isevars (whd_castappevar (evars_of isevars) t1)) (apprec_nohdbeta env isevars (whd_castappevar (evars_of isevars) t2)) |