diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-11-13 11:22:41 +0100 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-11-13 11:22:41 +0100 |
| commit | b75f803afb3189a9f3b594a190fdb8d6207e7624 (patch) | |
| tree | 28b33d0d1ffa2fbe42d044235987f34b0c733fbb /pretyping/unification.ml | |
| parent | a7df689e73dd396dafdbb4891d534b7fa5cb0fc8 (diff) | |
| parent | f3abbc55ef160d1a65d4467bfe9b25b30b965a46 (diff) | |
Merge PR #6065: [api] Deprecate all legacy uses of Names in core.
Diffstat (limited to 'pretyping/unification.ml')
| -rw-r--r-- | pretyping/unification.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pretyping/unification.ml b/pretyping/unification.ml index 86ebc1f01..c149aaaaa 100644 --- a/pretyping/unification.ml +++ b/pretyping/unification.ml @@ -558,10 +558,10 @@ let oracle_order env cf1 cf2 = | Some k2 -> match k1, k2 with | IsProj (p, _), IsKey (ConstKey (p',_)) - when eq_constant (Projection.constant p) p' -> + when Constant.equal (Projection.constant p) p' -> Some (not (Projection.unfolded p)) | IsKey (ConstKey (p,_)), IsProj (p', _) - when eq_constant p (Projection.constant p') -> + when Constant.equal p (Projection.constant p') -> Some (Projection.unfolded p') | _ -> Some (Conv_oracle.oracle_order (fun x -> x) @@ -788,7 +788,7 @@ let rec unify_0_with_initial_metas (sigma,ms,es as subst : subst0) conv_at_top e | _, LetIn (_,a,_,c) -> unirec_rec curenvnb pb opt substn cM (subst1 a c) (** Fast path for projections. *) - | Proj (p1,c1), Proj (p2,c2) when eq_constant + | Proj (p1,c1), Proj (p2,c2) when Constant.equal (Projection.constant p1) (Projection.constant p2) -> (try unify_same_proj curenvnb cv_pb {opt with at_top = true} substn c1 c2 |