diff options
| author | Pierre-Marie Pédrot | 2019-03-20 09:25:29 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2019-03-20 09:25:29 +0100 |
| commit | b899b102e071ba0faa07949b2ee66bbb7dade23b (patch) | |
| tree | dacdbac86eafb367d5a865f040b70343cb80a1a2 /pretyping/glob_ops.ml | |
| parent | e5a2f0452cf9523bc86e71ae6d2ac30883a28be6 (diff) | |
| parent | a71f586e23b0e68032c556bfa1c37df8f4358c71 (diff) | |
Merge PR #9791: Fix constr_matching on SProp
Ack-by: SkySkimmer
Reviewed-by: ppedrot
Diffstat (limited to 'pretyping/glob_ops.ml')
| -rw-r--r-- | pretyping/glob_ops.ml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pretyping/glob_ops.ml b/pretyping/glob_ops.ml index affed5389f..74432cc010 100644 --- a/pretyping/glob_ops.ml +++ b/pretyping/glob_ops.ml @@ -47,11 +47,18 @@ let map_glob_decl_left_to_right f (na,k,obd,ty) = let glob_sort_eq g1 g2 = let open Glob_term in match g1, g2 with -| GProp, GProp -> true +| GSProp, GSProp +| GProp, GProp | GSet, GSet -> true | GType l1, GType l2 -> List.equal (Option.equal (fun (x,m) (y,n) -> Libnames.qualid_eq x y && Int.equal m n)) l1 l2 -| _ -> false +| (GSProp|GProp|GSet|GType _), _ -> false + +let glob_sort_family = let open Sorts in function +| GSProp -> InSProp +| GProp -> InProp +| GSet -> InSet +| GType _ -> InType let binding_kind_eq bk1 bk2 = match bk1, bk2 with | Decl_kinds.Explicit, Decl_kinds.Explicit -> true |