redeplacement des var. ex. dans kernel :-)

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

5 files changed, 23 insertions, 13 deletions

diff --git a/.depend b/.depend
index b50cf35e4..d122ff5a2 100644
--- a/.depend
+++ b/.depend
@@ -6,6 +6,7 @@ kernel/constant.cmi: kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
 kernel/environ.cmi: kernel/abstraction.cmi kernel/constant.cmi \
     kernel/inductive.cmi kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
     kernel/univ.cmi 
+kernel/evd.cmi: kernel/names.cmi kernel/sign.cmi kernel/term.cmi 
 kernel/generic.cmi: kernel/names.cmi lib/util.cmi 
 kernel/indtypes.cmi: kernel/environ.cmi kernel/inductive.cmi kernel/names.cmi \
     kernel/term.cmi kernel/univ.cmi 
@@ -44,10 +45,9 @@ parsing/coqast.cmi: lib/dyn.cmi
 parsing/g_minicoq.cmi: kernel/names.cmi lib/pp.cmi kernel/sign.cmi \
     kernel/term.cmi 
 parsing/pcoq.cmi: parsing/coqast.cmi 
-proofs/evd.cmi: kernel/names.cmi kernel/sign.cmi kernel/term.cmi 
-proofs/logic.cmi: proofs/evd.cmi lib/pp.cmi proofs/proof_trees.cmi 
+proofs/logic.cmi: kernel/evd.cmi lib/pp.cmi proofs/proof_trees.cmi 
 proofs/pfedit.cmi: lib/pp.cmi 
-proofs/proof_trees.cmi: parsing/coqast.cmi proofs/evd.cmi kernel/names.cmi \
+proofs/proof_trees.cmi: parsing/coqast.cmi kernel/evd.cmi kernel/names.cmi \
     kernel/term.cmi 
 toplevel/errors.cmi: parsing/coqast.cmi lib/pp.cmi 
 toplevel/himsg.cmi: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
@@ -84,6 +84,10 @@ kernel/environ.cmx: kernel/abstraction.cmx kernel/constant.cmx \
     kernel/generic.cmx kernel/inductive.cmx kernel/names.cmx lib/pp.cmx \
     kernel/sign.cmx lib/system.cmx kernel/term.cmx kernel/univ.cmx \
     lib/util.cmx kernel/environ.cmi 
+kernel/evd.cmo: kernel/names.cmi kernel/sign.cmi kernel/term.cmi lib/util.cmi \
+    kernel/evd.cmi 
+kernel/evd.cmx: kernel/names.cmx kernel/sign.cmx kernel/term.cmx lib/util.cmx \
+    kernel/evd.cmi 
 kernel/generic.cmo: kernel/names.cmi lib/pp.cmi lib/util.cmi \
     kernel/generic.cmi 
 kernel/generic.cmx: kernel/names.cmx lib/pp.cmx lib/util.cmx \
@@ -220,13 +224,15 @@ parsing/coqast.cmo: lib/dyn.cmi lib/hashcons.cmi parsing/coqast.cmi
 parsing/coqast.cmx: lib/dyn.cmx lib/hashcons.cmx parsing/coqast.cmi 
 parsing/lexer.cmo: lib/util.cmi parsing/lexer.cmi 
 parsing/lexer.cmx: lib/util.cmx parsing/lexer.cmi 
-proofs/evd.cmo: kernel/names.cmi kernel/sign.cmi kernel/term.cmi lib/util.cmi \
-    proofs/evd.cmi 
-proofs/evd.cmx: kernel/names.cmx kernel/sign.cmx kernel/term.cmx lib/util.cmx \
-    proofs/evd.cmi 
-proofs/proof_trees.cmo: parsing/coqast.cmi proofs/evd.cmi kernel/names.cmi \
+proofs/logic.cmo: parsing/coqast.cmi kernel/evd.cmi kernel/names.cmi \
+    lib/pp.cmi proofs/proof_trees.cmi kernel/reduction.cmi kernel/term.cmi \
+    kernel/typing.cmi proofs/logic.cmi 
+proofs/logic.cmx: parsing/coqast.cmx kernel/evd.cmx kernel/names.cmx \
+    lib/pp.cmx proofs/proof_trees.cmx kernel/reduction.cmx kernel/term.cmx \
+    kernel/typing.cmx proofs/logic.cmi 
+proofs/proof_trees.cmo: parsing/coqast.cmi kernel/evd.cmi kernel/names.cmi \
     kernel/sign.cmi lib/stamps.cmi kernel/term.cmi proofs/proof_trees.cmi 
-proofs/proof_trees.cmx: parsing/coqast.cmx proofs/evd.cmx kernel/names.cmx \
+proofs/proof_trees.cmx: parsing/coqast.cmx kernel/evd.cmx kernel/names.cmx \
     kernel/sign.cmx lib/stamps.cmx kernel/term.cmx proofs/proof_trees.cmi 
 toplevel/errors.cmo: parsing/ast.cmi lib/options.cmi lib/pp.cmi lib/util.cmi \
     toplevel/errors.cmi 
diff --git a/Makefile b/Makefile
index 18195d6ee..c72be1451 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ LIB=lib/pp_control.cmo lib/pp.cmo lib/util.cmo \
     lib/bstack.cmo lib/edit.cmo lib/stamps.cmo
 
 KERNEL=kernel/names.cmo kernel/generic.cmo kernel/univ.cmo kernel/term.cmo \
-       kernel/sign.cmo kernel/constant.cmo \
+       kernel/sign.cmo kernel/constant.cmo kernel/evd.cmo \
        kernel/inductive.cmo kernel/sosub.cmo kernel/abstraction.cmo \
        kernel/environ.cmo kernel/instantiate.cmo \
        kernel/closure.cmo kernel/reduction.cmo \
@@ -51,7 +51,7 @@ PARSING=parsing/lexer.cmo parsing/coqast.cmo parsing/pcoq.cmo parsing/ast.cmo \
 	parsing/g_prim.cmo parsing/g_basevernac.cmo parsing/g_vernac.cmo \
 	parsing/g_command.cmo parsing/g_tactic.cmo parsing/g_multiple_case.cmo
 
-PROOFS=proofs/evd.cmo proofs/proof_trees.cmo proofs/logic.cmo
+PROOFS=proofs/proof_trees.cmo proofs/logic.cmo
 
 TOPLEVEL=toplevel/himsg.cmo toplevel/errors.cmo toplevel/vernac.cmo \
 	 toplevel/protectedtoplevel.cmo toplevel/toplevel.cmo
@@ -189,6 +189,7 @@ archclean::
 	rm -f lib/*.cmx lib/*.[so]
 	rm -f kernel/*.cmx kernel/*.[so]
 	rm -f library/*.cmx library/*.[so]
+	rm -f proofs/*.cmx proofs/*.[so]
 	rm -f parsing/*.cmx parsing/*.[so]
 
 cleanall:: archclean
@@ -198,6 +199,7 @@ cleanall:: archclean
 	rm -f lib/*.cm[io] lib/*~
 	rm -f kernel/*.cm[io] kernel/*~
 	rm -f library/*.cm[io] library/*~
+	rm -f proofs/*.cm[io] proofs/*~
 	rm -f parsing/*.cm[io] parsing/*.ppo parsing/*~
 
 cleanconfig::
diff --git a/proofs/evd.ml b/kernel/evd.ml
index 48b2a4b57..48b2a4b57 100644
--- a/proofs/evd.ml
+++ b/kernel/evd.ml
diff --git a/proofs/evd.mli b/kernel/evd.mli
index 8063f42b0..8063f42b0 100644
--- a/proofs/evd.mli
+++ b/kernel/evd.mli
diff --git a/proofs/logic.mli b/proofs/logic.mli
index 0366cd25b..ce5dfbc60 100644
--- a/proofs/logic.mli
+++ b/proofs/logic.mli
@@ -3,6 +3,8 @@
 
 (*i*)
 open Pp
+open Term
+open Sign
 open Proof_trees
 (*i*)
 
@@ -11,7 +13,7 @@ val pr_prim_rule : prim_rule -> std_ppcmds
 val prim_refiner : prim_rule -> 'a Evd.evar_map -> goal -> goal list
 
 val prim_extractor : 
-  ((type_judgement, constr) env -> proof_tree -> constr) -> 
-    (type_judgement, constr) env -> proof_tree -> constr
+  ((typed_type, constr) env -> proof_tree -> constr) -> 
+    (typed_type, constr) env -> proof_tree -> constr
 
 val extract_constr : constr assumptions -> constr -> constr