MAJ pour fusion avec pretyping

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

1 files changed, 139 insertions, 46 deletions

diff --git a/.depend b/.depend
index cd9716d2c..4e90f4322 100644
--- a/.depend
+++ b/.depend
@@ -48,7 +48,7 @@ library/nametab.cmi: kernel/names.cmi
 library/redinfo.cmi: kernel/names.cmi kernel/term.cmi 
 library/summary.cmi: kernel/names.cmi 
 parsing/ast.cmi: parsing/coqast.cmi lib/dyn.cmi parsing/pcoq.cmi lib/pp.cmi 
-parsing/astterm.cmi: parsing/coqast.cmi kernel/environ.cmi kernel/names.cmi \
+parsing/astterm.cmi: kernel/evd.cmi kernel/names.cmi pretyping/rawterm.cmi \
     kernel/term.cmi 
 parsing/coqast.cmi: lib/dyn.cmi 
 parsing/g_minicoq.cmi: kernel/names.cmi lib/pp.cmi kernel/sign.cmi \
@@ -57,7 +57,24 @@ parsing/pcoq.cmi: parsing/coqast.cmi
 parsing/printer.cmi: parsing/coqast.cmi kernel/names.cmi lib/pp.cmi \
     kernel/term.cmi 
 parsing/termast.cmi: parsing/coqast.cmi kernel/names.cmi kernel/term.cmi 
-pretyping/astterm.cmi: kernel/evd.cmi kernel/names.cmi kernel/term.cmi 
+pretyping/classops.cmi: library/declare.cmi kernel/environ.cmi kernel/evd.cmi \
+    library/libobject.cmi kernel/names.cmi lib/pp.cmi kernel/term.cmi 
+pretyping/coercion.cmi: kernel/environ.cmi pretyping/evarutil.cmi \
+    kernel/evd.cmi kernel/sign.cmi kernel/term.cmi 
+pretyping/evarconv.cmi: kernel/environ.cmi pretyping/evarutil.cmi \
+    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi 
+pretyping/evarutil.cmi: kernel/environ.cmi kernel/evd.cmi kernel/names.cmi \
+    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi 
+pretyping/pretype_errors.cmi: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/type_errors.cmi 
+pretyping/pretyping.cmi: parsing/coqast.cmi kernel/environ.cmi kernel/evd.cmi \
+    kernel/names.cmi pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi 
+pretyping/rawterm.cmi: kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/type_errors.cmi 
+pretyping/recordops.cmi: pretyping/classops.cmi kernel/generic.cmi \
+    library/libobject.cmi library/library.cmi kernel/names.cmi \
+    kernel/term.cmi 
 proofs/clenv.cmi: kernel/names.cmi proofs/proof_trees.cmi proofs/tacmach.cmi \
     kernel/term.cmi lib/util.cmi 
 proofs/evar_refiner.cmi: kernel/environ.cmi kernel/evd.cmi kernel/names.cmi \
@@ -111,6 +128,8 @@ toplevel/mltop.cmi: library/libobject.cmi
 toplevel/protectedtoplevel.cmi: lib/pp.cmi 
 toplevel/toplevel.cmi: parsing/pcoq.cmi lib/pp.cmi 
 toplevel/vernac.cmi: parsing/coqast.cmi parsing/pcoq.cmi 
+toplevel/vernacentries.cmi: kernel/names.cmi kernel/term.cmi \
+    toplevel/vernacinterp.cmi 
 toplevel/vernacinterp.cmi: parsing/coqast.cmi lib/dyn.cmi kernel/names.cmi \
     proofs/proof_trees.cmi 
 config/coq_config.cmo: config/coq_config.cmi 
@@ -189,14 +208,16 @@ kernel/type_errors.cmo: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
     kernel/sign.cmi kernel/term.cmi kernel/type_errors.cmi 
 kernel/type_errors.cmx: kernel/environ.cmx kernel/names.cmx lib/pp.cmx \
     kernel/sign.cmx kernel/term.cmx kernel/type_errors.cmi 
-kernel/typeops.cmo: kernel/constant.cmi kernel/environ.cmi kernel/generic.cmi \
-    kernel/inductive.cmi kernel/instantiate.cmi kernel/names.cmi lib/pp.cmi \
-    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
-    kernel/type_errors.cmi kernel/univ.cmi lib/util.cmi kernel/typeops.cmi 
-kernel/typeops.cmx: kernel/constant.cmx kernel/environ.cmx kernel/generic.cmx \
-    kernel/inductive.cmx kernel/instantiate.cmx kernel/names.cmx lib/pp.cmx \
-    kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
-    kernel/type_errors.cmx kernel/univ.cmx lib/util.cmx kernel/typeops.cmi 
+kernel/typeops.cmo: kernel/constant.cmi kernel/environ.cmi kernel/evd.cmi \
+    kernel/generic.cmi kernel/inductive.cmi kernel/instantiate.cmi \
+    kernel/names.cmi lib/pp.cmi kernel/reduction.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/type_errors.cmi kernel/univ.cmi lib/util.cmi \
+    kernel/typeops.cmi 
+kernel/typeops.cmx: kernel/constant.cmx kernel/environ.cmx kernel/evd.cmx \
+    kernel/generic.cmx kernel/inductive.cmx kernel/instantiate.cmx \
+    kernel/names.cmx lib/pp.cmx kernel/reduction.cmx kernel/sign.cmx \
+    kernel/term.cmx kernel/type_errors.cmx kernel/univ.cmx lib/util.cmx \
+    kernel/typeops.cmi 
 kernel/typing.cmo: kernel/constant.cmi kernel/environ.cmi kernel/evd.cmi \
     kernel/generic.cmi kernel/indtypes.cmi kernel/inductive.cmi \
     kernel/names.cmi lib/pp.cmi kernel/reduction.cmi kernel/sign.cmi \
@@ -305,6 +326,16 @@ parsing/ast.cmo: parsing/coqast.cmi lib/dyn.cmi lib/hashcons.cmi \
     parsing/pcoq.cmi lib/pp.cmi lib/util.cmi parsing/ast.cmi 
 parsing/ast.cmx: parsing/coqast.cmx lib/dyn.cmx lib/hashcons.cmx \
     parsing/pcoq.cmi lib/pp.cmx lib/util.cmx parsing/ast.cmi 
+parsing/astterm.cmo: parsing/ast.cmi parsing/astterm.cmi kernel/environ.cmi \
+    kernel/evd.cmi kernel/generic.cmi toplevel/himsg.cmi kernel/names.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/printer.cmi pretyping/rawterm.cmi \
+    kernel/term.cmi parsing/termast.cmi toplevel/vernac.cmi \
+    parsing/astterm.cmi 
+parsing/astterm.cmx: parsing/ast.cmx parsing/astterm.cmx kernel/environ.cmx \
+    kernel/evd.cmx kernel/generic.cmx toplevel/himsg.cmx kernel/names.cmx \
+    parsing/pcoq.cmi lib/pp.cmx parsing/printer.cmi pretyping/rawterm.cmi \
+    kernel/term.cmx parsing/termast.cmx toplevel/vernac.cmx \
+    parsing/astterm.cmi 
 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 
@@ -315,16 +346,60 @@ parsing/termast.cmo: parsing/ast.cmi parsing/coqast.cmi kernel/environ.cmi \
 parsing/termast.cmx: parsing/ast.cmx parsing/coqast.cmx kernel/environ.cmx \
     kernel/generic.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
     lib/pp.cmx kernel/term.cmx lib/util.cmx parsing/termast.cmi 
-pretyping/astterm.cmo: parsing/ast.cmi kernel/environ.cmi kernel/evd.cmi \
-    kernel/generic.cmi toplevel/himsg.cmi kernel/names.cmi parsing/pcoq.cmi \
-    lib/pp.cmi parsing/printer.cmi kernel/term.cmi parsing/termast.cmi \
-    toplevel/vernac.cmi pretyping/astterm.cmi 
-pretyping/astterm.cmx: parsing/ast.cmx kernel/environ.cmx kernel/evd.cmx \
-    kernel/generic.cmx toplevel/himsg.cmx kernel/names.cmx parsing/pcoq.cmi \
-    lib/pp.cmx parsing/printer.cmi kernel/term.cmx parsing/termast.cmx \
-    toplevel/vernac.cmx pretyping/astterm.cmi 
-pretyping/rawterm.cmo: kernel/names.cmi kernel/term.cmi 
-pretyping/rawterm.cmx: kernel/names.cmx kernel/term.cmx 
+pretyping/classops.cmo: kernel/environ.cmi kernel/generic.cmi library/lib.cmi \
+    library/libobject.cmi library/library.cmi kernel/names.cmi lib/pp.cmi \
+    parsing/printer.cmi kernel/reduction.cmi kernel/term.cmi \
+    pretyping/classops.cmi 
+pretyping/classops.cmx: kernel/environ.cmx kernel/generic.cmx library/lib.cmx \
+    library/libobject.cmx library/library.cmx kernel/names.cmx lib/pp.cmx \
+    parsing/printer.cmi kernel/reduction.cmx kernel/term.cmx \
+    pretyping/classops.cmi 
+pretyping/coercion.cmo: pretyping/classops.cmi pretyping/evarconv.cmi \
+    kernel/evd.cmi kernel/generic.cmi toplevel/himsg.cmi kernel/names.cmi \
+    pretyping/recordops.cmi kernel/reduction.cmi kernel/term.cmi \
+    pretyping/coercion.cmi 
+pretyping/coercion.cmx: pretyping/classops.cmx pretyping/evarconv.cmx \
+    kernel/evd.cmx kernel/generic.cmx toplevel/himsg.cmx kernel/names.cmx \
+    pretyping/recordops.cmx kernel/reduction.cmx kernel/term.cmx \
+    pretyping/coercion.cmi 
+pretyping/evarconv.cmo: pretyping/classops.cmi pretyping/evarutil.cmi \
+    kernel/generic.cmi kernel/names.cmi pretyping/recordops.cmi \
+    kernel/reduction.cmi kernel/term.cmi lib/util.cmi pretyping/evarconv.cmi 
+pretyping/evarconv.cmx: pretyping/classops.cmx pretyping/evarutil.cmx \
+    kernel/generic.cmx kernel/names.cmx pretyping/recordops.cmx \
+    kernel/reduction.cmx kernel/term.cmx lib/util.cmx pretyping/evarconv.cmi 
+pretyping/evarutil.cmo: kernel/environ.cmi kernel/evd.cmi kernel/generic.cmi \
+    toplevel/himsg.cmi kernel/names.cmi lib/pp.cmi parsing/printer.cmi \
+    kernel/reduction.cmi kernel/term.cmi pretyping/evarutil.cmi 
+pretyping/evarutil.cmx: kernel/environ.cmx kernel/evd.cmx kernel/generic.cmx \
+    toplevel/himsg.cmx kernel/names.cmx lib/pp.cmx parsing/printer.cmi \
+    kernel/reduction.cmx kernel/term.cmx pretyping/evarutil.cmi 
+pretyping/pretype_errors.cmo: pretyping/pretype_errors.cmi 
+pretyping/pretype_errors.cmx: pretyping/pretype_errors.cmi 
+pretyping/pretyping.cmo: parsing/ast.cmi pretyping/classops.cmi \
+    pretyping/coercion.cmi kernel/environ.cmi pretyping/evarconv.cmi \
+    pretyping/evarutil.cmi kernel/evd.cmi kernel/generic.cmi \
+    library/indrec.cmi pretyping/multcase.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi pretyping/rawterm.cmi \
+    pretyping/recordops.cmi kernel/reduction.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/type_errors.cmi kernel/typeops.cmi lib/util.cmi \
+    pretyping/pretyping.cmi 
+pretyping/pretyping.cmx: parsing/ast.cmx pretyping/classops.cmx \
+    pretyping/coercion.cmx kernel/environ.cmx pretyping/evarconv.cmx \
+    pretyping/evarutil.cmx kernel/evd.cmx kernel/generic.cmx \
+    library/indrec.cmx pretyping/multcase.cmi kernel/names.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx pretyping/rawterm.cmi \
+    pretyping/recordops.cmx kernel/reduction.cmx kernel/sign.cmx \
+    kernel/term.cmx kernel/type_errors.cmx kernel/typeops.cmx lib/util.cmx \
+    pretyping/pretyping.cmi 
+pretyping/recordops.cmo: pretyping/classops.cmi kernel/generic.cmi \
+    toplevel/himsg.cmi library/libobject.cmi library/library.cmi \
+    kernel/names.cmi lib/pp.cmi lib/pp_control.cmi kernel/term.cmi \
+    pretyping/recordops.cmi 
+pretyping/recordops.cmx: pretyping/classops.cmx kernel/generic.cmx \
+    toplevel/himsg.cmx library/libobject.cmx library/library.cmx \
+    kernel/names.cmx lib/pp.cmx lib/pp_control.cmx kernel/term.cmx \
+    pretyping/recordops.cmi 
 proofs/clenv.cmo: kernel/environ.cmi kernel/evd.cmi kernel/generic.cmi \
     kernel/instantiate.cmi proofs/logic.cmi kernel/names.cmi lib/pp.cmi \
     proofs/proof_trees.cmi kernel/reduction.cmi kernel/sign.cmi \
@@ -428,19 +503,19 @@ tactics/btermdn.cmo: tactics/dn.cmi kernel/term.cmi tactics/termdn.cmi \
 tactics/btermdn.cmx: tactics/dn.cmx kernel/term.cmx tactics/termdn.cmx \
     tactics/btermdn.cmi 
 tactics/dhyp.cmo: parsing/ast.cmi proofs/clenv.cmi kernel/generic.cmi \
-    toplevel/himsg.cmi library/lib.cmi library/libobject.cmi \
-    library/library.cmi kernel/names.cmi tactics/nbtermdn.cmi \
-    tactics/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
-    kernel/reduction.cmi library/summary.cmi proofs/tacinterp.cmi \
-    proofs/tacmach.cmi tactics/tacticals.cmi tactics/tactics.cmi \
-    kernel/term.cmi lib/util.cmi toplevel/vernacinterp.cmi tactics/dhyp.cmi 
+    library/lib.cmi library/libobject.cmi library/library.cmi \
+    kernel/names.cmi tactics/nbtermdn.cmi tactics/pattern.cmi lib/pp.cmi \
+    proofs/proof_trees.cmi kernel/reduction.cmi library/summary.cmi \
+    proofs/tacinterp.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi tactics/dhyp.cmi 
 tactics/dhyp.cmx: parsing/ast.cmx proofs/clenv.cmx kernel/generic.cmx \
-    toplevel/himsg.cmx library/lib.cmx library/libobject.cmx \
-    library/library.cmx kernel/names.cmx tactics/nbtermdn.cmx \
-    tactics/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
-    kernel/reduction.cmx library/summary.cmx proofs/tacinterp.cmx \
-    proofs/tacmach.cmx tactics/tacticals.cmx tactics/tactics.cmx \
-    kernel/term.cmx lib/util.cmx toplevel/vernacinterp.cmx tactics/dhyp.cmi 
+    library/lib.cmx library/libobject.cmx library/library.cmx \
+    kernel/names.cmx tactics/nbtermdn.cmx tactics/pattern.cmx lib/pp.cmx \
+    proofs/proof_trees.cmx kernel/reduction.cmx library/summary.cmx \
+    proofs/tacinterp.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx tactics/dhyp.cmi 
 tactics/dn.cmo: lib/tlm.cmi tactics/dn.cmi 
 tactics/dn.cmx: lib/tlm.cmx tactics/dn.cmi 
 tactics/elim.cmo: proofs/clenv.cmi kernel/generic.cmi tactics/hiddentac.cmi \
@@ -519,12 +594,12 @@ toplevel/errors.cmo: parsing/ast.cmi lib/options.cmi lib/pp.cmi lib/util.cmi \
     toplevel/errors.cmi 
 toplevel/errors.cmx: parsing/ast.cmx lib/options.cmx lib/pp.cmx lib/util.cmx \
     toplevel/errors.cmi 
-toplevel/himsg.cmo: kernel/environ.cmi kernel/generic.cmi kernel/names.cmi \
-    lib/pp.cmi kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
-    kernel/type_errors.cmi lib/util.cmi toplevel/himsg.cmi 
-toplevel/himsg.cmx: kernel/environ.cmx kernel/generic.cmx kernel/names.cmx \
-    lib/pp.cmx kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
-    kernel/type_errors.cmx lib/util.cmx toplevel/himsg.cmi 
+toplevel/himsg.cmo: parsing/ast.cmi kernel/environ.cmi kernel/generic.cmi \
+    kernel/names.cmi lib/pp.cmi kernel/reduction.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/type_errors.cmi lib/util.cmi toplevel/himsg.cmi 
+toplevel/himsg.cmx: parsing/ast.cmx kernel/environ.cmx kernel/generic.cmx \
+    kernel/names.cmx lib/pp.cmx kernel/reduction.cmx kernel/sign.cmx \
+    kernel/term.cmx kernel/type_errors.cmx lib/util.cmx toplevel/himsg.cmi 
 toplevel/minicoq.cmo: kernel/constant.cmi parsing/g_minicoq.cmi \
     kernel/generic.cmi toplevel/himsg.cmi kernel/inductive.cmi \
     kernel/names.cmi lib/pp.cmi kernel/sign.cmi kernel/term.cmi \
@@ -533,12 +608,12 @@ toplevel/minicoq.cmx: kernel/constant.cmx parsing/g_minicoq.cmi \
     kernel/generic.cmx toplevel/himsg.cmx kernel/inductive.cmx \
     kernel/names.cmx lib/pp.cmx kernel/sign.cmx kernel/term.cmx \
     kernel/type_errors.cmx kernel/typing.cmx lib/util.cmx 
-toplevel/mltop.cmo: library/libobject.cmi library/library.cmi lib/pp.cmi \
-    library/summary.cmi lib/system.cmi lib/util.cmi toplevel/vernacinterp.cmi \
-    toplevel/mltop.cmi 
-toplevel/mltop.cmx: library/libobject.cmx library/library.cmx lib/pp.cmx \
-    library/summary.cmx lib/system.cmx lib/util.cmx toplevel/vernacinterp.cmx \
-    toplevel/mltop.cmi 
+toplevel/mltop.cmo: library/lib.cmi library/libobject.cmi library/library.cmi \
+    lib/pp.cmi library/summary.cmi lib/system.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi toplevel/mltop.cmi 
+toplevel/mltop.cmx: library/lib.cmx library/libobject.cmx library/library.cmx \
+    lib/pp.cmx library/summary.cmx lib/system.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx toplevel/mltop.cmi 
 toplevel/protectedtoplevel.cmo: toplevel/errors.cmi parsing/pcoq.cmi \
     lib/pp.cmi toplevel/vernac.cmi toplevel/vernacinterp.cmi \
     toplevel/protectedtoplevel.cmi 
@@ -561,11 +636,29 @@ toplevel/vernac.cmx: parsing/ast.cmx parsing/coqast.cmx library/library.cmx \
     lib/options.cmx parsing/pcoq.cmi proofs/pfedit.cmi lib/pp.cmx \
     library/states.cmx lib/system.cmx lib/util.cmx toplevel/vernacinterp.cmx \
     toplevel/vernac.cmi 
+toplevel/vernacentries.cmo: parsing/ast.cmi pretyping/class.cmi \
+    pretyping/classops.cmi parsing/coqast.cmi library/declare.cmi \
+    kernel/environ.cmi kernel/evd.cmi library/libobject.cmi \
+    library/library.cmi proofs/macros.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi parsing/pcoq.cmi proofs/pfedit.cmi \
+    lib/pp.cmi lib/pp_control.cmi proofs/proof_trees.cmi kernel/reduction.cmi \
+    proofs/refiner.cmi library/states.cmi lib/system.cmi proofs/tacmach.cmi \
+    kernel/term.cmi kernel/typing.cmi toplevel/vernacinterp.cmi \
+    toplevel/vernacentries.cmi 
+toplevel/vernacentries.cmx: parsing/ast.cmx pretyping/class.cmi \
+    pretyping/classops.cmx parsing/coqast.cmx library/declare.cmx \
+    kernel/environ.cmx kernel/evd.cmx library/libobject.cmx \
+    library/library.cmx proofs/macros.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx parsing/pcoq.cmi proofs/pfedit.cmi \
+    lib/pp.cmx lib/pp_control.cmx proofs/proof_trees.cmx kernel/reduction.cmx \
+    proofs/refiner.cmx library/states.cmx lib/system.cmx proofs/tacmach.cmx \
+    kernel/term.cmx kernel/typing.cmx toplevel/vernacinterp.cmx \
+    toplevel/vernacentries.cmi 
 toplevel/vernacinterp.cmo: parsing/ast.cmi parsing/coqast.cmi lib/dyn.cmi \
-    toplevel/errors.cmi toplevel/himsg.cmi kernel/names.cmi lib/pp.cmi \
+    toplevel/himsg.cmi kernel/names.cmi lib/options.cmi lib/pp.cmi \
     proofs/proof_trees.cmi proofs/tacinterp.cmi lib/util.cmi \
     toplevel/vernacinterp.cmi 
 toplevel/vernacinterp.cmx: parsing/ast.cmx parsing/coqast.cmx lib/dyn.cmx \
-    toplevel/errors.cmx toplevel/himsg.cmx kernel/names.cmx lib/pp.cmx \
+    toplevel/himsg.cmx kernel/names.cmx lib/options.cmx lib/pp.cmx \
     proofs/proof_trees.cmx proofs/tacinterp.cmx lib/util.cmx \
     toplevel/vernacinterp.cmi