diff options
author | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2018-06-05 21:59:27 +0200 |
---|---|---|
committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2018-06-05 21:59:27 +0200 |
commit | 1c67e29e735ab1e7bb121304f710ef48a23a8b9b (patch) | |
tree | 68cea0859c0a8e8f4330fbd12f536e09461f5974 /pretyping | |
parent | 03a18dc64f374c1234a041324c6b45ea701c5753 (diff) | |
parent | d28c22a7b173fc78de98c8bf0f986cb163e210a0 (diff) |
Merge PR #7004: Make `simple apply` obey `Opaque` directive.
Diffstat (limited to 'pretyping')
-rw-r--r-- | pretyping/unification.ml | 9 | ||||
-rw-r--r-- | pretyping/unification.mli | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pretyping/unification.ml b/pretyping/unification.ml index a8a4003dc..5cf6e4b26 100644 --- a/pretyping/unification.ml +++ b/pretyping/unification.ml @@ -398,8 +398,13 @@ let default_no_delta_core_unify_flags () = { (default_core_unify_flags ()) with modulo_betaiota = false; } -let default_no_delta_unify_flags () = - let flags = default_no_delta_core_unify_flags () in { +let default_no_delta_unify_flags ts = + let flags = default_no_delta_core_unify_flags () in + let flags = { flags with + modulo_conv_on_closed_terms = Some ts; + modulo_delta_types = ts + } in + { core_unify_flags = flags; merge_unify_flags = flags; subterm_unify_flags = flags; diff --git a/pretyping/unification.mli b/pretyping/unification.mli index 16ce5c93d..e2e261ae7 100644 --- a/pretyping/unification.mli +++ b/pretyping/unification.mli @@ -8,6 +8,7 @@ (* * (see LICENSE file for the text of the license) *) (************************************************************************) +open Names open Constr open EConstr open Environ @@ -40,7 +41,7 @@ val default_core_unify_flags : unit -> core_unify_flags val default_no_delta_core_unify_flags : unit -> core_unify_flags val default_unify_flags : unit -> unify_flags -val default_no_delta_unify_flags : unit -> unify_flags +val default_no_delta_unify_flags : transparent_state -> unify_flags val elim_flags : unit -> unify_flags val elim_no_delta_flags : unit -> unify_flags |