Fixed a little inefficiency of "set/destruct" over a pattern. Now

different instances of a meta are checked against full conversion.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16086 85f007b7-540e-0410-9357-904b9bb8a0f7

5 files changed, 9 insertions, 1 deletions

diff --git a/tactics/auto.ml b/tactics/auto.ml
index 7ac79356f3..f251b4f85d 100644
--- a/tactics/auto.ml
+++ b/tactics/auto.ml
@@ -1035,6 +1035,7 @@ let auto_unif_flags = {
   use_metas_eagerly_in_conv_on_closed_terms = false;
   modulo_delta = empty_transparent_state;
   modulo_delta_types = full_transparent_state;
+  modulo_delta_in_merge = None;
   check_applied_meta_types = false;
   resolve_evars = true;
   use_pattern_unification = false;
diff --git a/tactics/class_tactics.ml4 b/tactics/class_tactics.ml4
index 8e0dbc6efb..53a284fa88 100644
--- a/tactics/class_tactics.ml4
+++ b/tactics/class_tactics.ml4
@@ -67,6 +67,7 @@ let auto_unif_flags = {
   use_metas_eagerly_in_conv_on_closed_terms = true;
   modulo_delta = var_full_transparent_state;
   modulo_delta_types = full_transparent_state;
+  modulo_delta_in_merge = None;
   check_applied_meta_types = false;
   resolve_evars = false;
   use_pattern_unification = true;
diff --git a/tactics/equality.ml b/tactics/equality.ml
index 1af172bfb2..16ee05f9ec 100644
--- a/tactics/equality.ml
+++ b/tactics/equality.ml
@@ -84,6 +84,7 @@ let rewrite_unif_flags = {
   Unification.use_metas_eagerly_in_conv_on_closed_terms = true;
   Unification.modulo_delta = empty_transparent_state;
   Unification.modulo_delta_types = empty_transparent_state;
+  Unification.modulo_delta_in_merge = None;
   Unification.check_applied_meta_types = true;
   Unification.resolve_evars = true;
   Unification.use_pattern_unification = true;
@@ -152,6 +153,7 @@ let rewrite_conv_closed_unif_flags = {
 
   Unification.modulo_delta = empty_transparent_state;
   Unification.modulo_delta_types = full_transparent_state;
+  Unification.modulo_delta_in_merge = None;
   Unification.check_applied_meta_types = true;
   Unification.resolve_evars = false;
   Unification.use_pattern_unification = true;
diff --git a/tactics/rewrite.ml4 b/tactics/rewrite.ml4
index 9c27b29517..b2a79dda36 100644
--- a/tactics/rewrite.ml4
+++ b/tactics/rewrite.ml4
@@ -285,6 +285,7 @@ let rewrite_unif_flags = {
   Unification.use_metas_eagerly_in_conv_on_closed_terms = true;
   Unification.modulo_delta = empty_transparent_state;
   Unification.modulo_delta_types = full_transparent_state;
+  Unification.modulo_delta_in_merge = None;
   Unification.check_applied_meta_types = true;
   Unification.resolve_evars = true;
   Unification.use_pattern_unification = true;
@@ -296,11 +297,12 @@ let rewrite_unif_flags = {
   Unification.allow_K_in_toplevel_higher_order_unification = true
 }
 
-let rewrite2_unif_flags = 
+let rewrite2_unif_flags =
   {  Unification.modulo_conv_on_closed_terms = Some conv_transparent_state;
      Unification.use_metas_eagerly_in_conv_on_closed_terms = true;
      Unification.modulo_delta = empty_transparent_state;
      Unification.modulo_delta_types = conv_transparent_state;
+     Unification.modulo_delta_in_merge = None;
      Unification.check_applied_meta_types = true;
      Unification.resolve_evars = true;
      Unification.use_pattern_unification = true;
@@ -318,6 +320,7 @@ let general_rewrite_unif_flags () =
        Unification.use_metas_eagerly_in_conv_on_closed_terms = true;
        Unification.modulo_delta = ts;
        Unification.modulo_delta_types = ts;
+       Unification.modulo_delta_in_merge = None;
        Unification.check_applied_meta_types = true;
        Unification.resolve_evars = true;
        Unification.use_pattern_unification = true;
diff --git a/tactics/tactics.ml b/tactics/tactics.ml
index f6f939ed33..abafaa0597 100644
--- a/tactics/tactics.ml
+++ b/tactics/tactics.ml
@@ -1707,6 +1707,7 @@ let default_matching_flags sigma = {
   use_metas_eagerly_in_conv_on_closed_terms = false;
   modulo_delta = empty_transparent_state;
   modulo_delta_types = full_transparent_state;
+  modulo_delta_in_merge = Some full_transparent_state;
   check_applied_meta_types = true;
   resolve_evars = false;
   use_pattern_unification = false;