diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2016-09-22 16:57:38 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2016-09-22 16:57:38 +0200 |
| commit | 3c47248abc27aa9c64120db30dcb0d7bf945bc70 (patch) | |
| tree | 0dd3a804e1924862390a7f78abc9a8a119127f9c /interp/constrexpr_ops.ml | |
| parent | ceb68d1d643ac65f500e0201f61e73cf22e6e2fb (diff) | |
| parent | 1bc1cba7a759a285131a3ed6ea8979716700b856 (diff) | |
Merge remote-tracking branch 'github/pr/283' into trunk
Was PR#283: Stylistic improvements in intf/decl_kinds.mli.
Diffstat (limited to 'interp/constrexpr_ops.ml')
| -rw-r--r-- | interp/constrexpr_ops.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/interp/constrexpr_ops.ml b/interp/constrexpr_ops.ml index 59c24900d..2644a56b3 100644 --- a/interp/constrexpr_ops.ml +++ b/interp/constrexpr_ops.ml @@ -17,7 +17,7 @@ open Decl_kinds (***********************) (* For binders parsing *) -let binding_kind_eq bk1 bk2 = match bk1, bk2 with +let implicit_status_eq bk1 bk2 = match bk1, bk2 with | Explicit, Explicit -> true | Implicit, Implicit -> true | _ -> false @@ -28,9 +28,9 @@ let abstraction_kind_eq ak1 ak2 = match ak1, ak2 with | _ -> false let binder_kind_eq b1 b2 = match b1, b2 with -| Default bk1, Default bk2 -> binding_kind_eq bk1 bk2 +| Default bk1, Default bk2 -> implicit_status_eq bk1 bk2 | Generalized (bk1, ck1, b1), Generalized (bk2, ck2, b2) -> - binding_kind_eq bk1 bk2 && binding_kind_eq ck1 ck2 && + implicit_status_eq bk1 bk2 && implicit_status_eq ck1 ck2 && (if b1 then b2 else not b2) | _ -> false @@ -165,7 +165,7 @@ let rec constr_expr_eq e1 e2 = | CPrim(_,i1), CPrim(_,i2) -> prim_token_eq i1 i2 | CGeneralization (_, bk1, ak1, e1), CGeneralization (_, bk2, ak2, e2) -> - binding_kind_eq bk1 bk2 && + implicit_status_eq bk1 bk2 && Option.equal abstraction_kind_eq ak1 ak2 && constr_expr_eq e1 e2 | CDelimiters(_,s1,e1), CDelimiters(_,s2,e2) -> |