premiere reorganisation de l\'unification

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

8 files changed, 7 insertions, 14 deletions

diff --git a/contrib/interface/blast.ml b/contrib/interface/blast.ml
index d5236a7a9f..96dd51ab8b 100755
--- a/contrib/interface/blast.ml
+++ b/contrib/interface/blast.ml
@@ -38,7 +38,6 @@ open Typing;;
 open Util;;
 open Vernacentries;;
 open Vernacinterp;;
-open Evar_refiner;;
 
 
 let parse_com   = Pcoq.parse_string Pcoq.Constr.constr;;
@@ -152,8 +151,7 @@ let pp_string x =
 (***************************************************************************)
 
 let unify_e_resolve  (c,clenv) gls = 
-  let (wc,kONT) = startWalk gls in
-  let clenv' = connect_clenv wc clenv in
+  let clenv' = connect_clenv gls clenv in
   let _ = clenv_unique_resolver false clenv' gls in
   vernac_e_resolve_constr c gls
 
diff --git a/contrib/interface/blast.mli b/contrib/interface/blast.mli
index 21c29bc986..f670194399 100644
--- a/contrib/interface/blast.mli
+++ b/contrib/interface/blast.mli
@@ -1,5 +1,3 @@
 val blast_tac : (Tacexpr.raw_tactic_expr -> 'a) ->
-    int list ->
-    Proof_type.goal Tacmach.sigma ->
-    Proof_type.goal list Proof_type.sigma * Proof_type.validation;;
+    int list -> Proof_type.tactic
 
diff --git a/contrib/interface/debug_tac.mli b/contrib/interface/debug_tac.mli
index ded714b629..da4bbaa093 100644
--- a/contrib/interface/debug_tac.mli
+++ b/contrib/interface/debug_tac.mli
@@ -1,6 +1,6 @@
 
 val report_error : Tacexpr.glob_tactic_expr ->
-    Proof_type.goal Proof_type.sigma option ref ->
+    Proof_type.goal Evd.sigma option ref ->
     Tacexpr.glob_tactic_expr ref -> int list ref -> int list -> Tacmach.tactic;;
 
 val clean_path : Tacexpr.glob_tactic_expr -> int list -> int list;;
diff --git a/contrib/interface/pbp.mli b/contrib/interface/pbp.mli
index 43ec1274d8..9daba1844c 100644
--- a/contrib/interface/pbp.mli
+++ b/contrib/interface/pbp.mli
@@ -1,4 +1,2 @@
 val pbp_tac : (Tacexpr.raw_tactic_expr -> 'a) ->
-    Names.identifier option -> int list ->
-    Proof_type.goal Tacmach.sigma ->
-    Proof_type.goal list Proof_type.sigma * Proof_type.validation;;
+    Names.identifier option -> int list -> Proof_type.tactic
diff --git a/contrib/ring/quote.ml b/contrib/ring/quote.ml
index 6168fdd24f..5a381b57c6 100644
--- a/contrib/ring/quote.ml
+++ b/contrib/ring/quote.ml
@@ -107,7 +107,6 @@ open Pp
 open Util
 open Names
 open Term
-open Instantiate
 open Pattern
 open Matching
 open Tacmach
diff --git a/contrib/xml/cic2acic.ml b/contrib/xml/cic2acic.ml
index d820f9e594..ec5ccc8e53 100644
--- a/contrib/xml/cic2acic.ml
+++ b/contrib/xml/cic2acic.ml
@@ -229,7 +229,7 @@ let typeur sigma metamap =
     | T.Const c ->
         let cb = Environ.lookup_constant c env in
         T.body_of_type cb.Declarations.const_type
-    | T.Evar ev -> Instantiate.existential_type sigma ev
+    | T.Evar ev -> Evd.existential_type sigma ev
     | T.Ind ind -> T.body_of_type (Inductive.type_of_inductive env ind)
     | T.Construct cstr ->
        T.body_of_type (Inductive.type_of_constructor env cstr)
diff --git a/contrib/xml/doubleTypeInference.ml b/contrib/xml/doubleTypeInference.ml
index f0e3f5e356..7faf74db83 100644
--- a/contrib/xml/doubleTypeInference.ml
+++ b/contrib/xml/doubleTypeInference.ml
@@ -89,7 +89,7 @@ let double_type_of env sigma cstr expectedty subterms_to_types =
          "DoubleTypeInference.double_type_of: found a non-instanciated goal"
  
      | T.Evar ((n,l) as ev) ->
-        let ty = Unshare.unshare (Instantiate.existential_type sigma ev) in
+        let ty = Unshare.unshare (Evd.existential_type sigma ev) in
         let jty = execute env sigma ty None in
         let jty = assumption_of_judgment env sigma jty in
         let evar_context = (Evd.map sigma n).Evd.evar_hyps in
diff --git a/contrib/xml/proof2aproof.ml b/contrib/xml/proof2aproof.ml
index 165a456dca..62d4ad8424 100644
--- a/contrib/xml/proof2aproof.ml
+++ b/contrib/xml/proof2aproof.ml
@@ -48,7 +48,7 @@ let nf_evar sigma ~preserve =
               )
            | _ -> T.mkApp (c', l'))
      | T.Evar (e,l) when Evd.in_dom sigma e & Evd.is_defined sigma e ->
-	aux (Instantiate.existential_value sigma (e,l))
+	aux (Evd.existential_value sigma (e,l))
      | T.Evar (e,l) -> T.mkEvar (e, Array.map aux l)
      | T.Case (ci,p,c,bl) -> T.mkCase (ci, aux p, aux c, Array.map aux bl)
      | T.Fix (ln,(lna,tl,bl)) ->