MAJ

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

1 files changed, 122 insertions, 118 deletions

diff --git a/.depend b/.depend
index 1cd80335d6..676af2d578 100644
--- a/.depend
+++ b/.depend
@@ -52,7 +52,7 @@ library/summary.cmi: kernel/names.cmi
 parsing/ast.cmi: parsing/coqast.cmi lib/dyn.cmi kernel/names.cmi \
     parsing/pcoq.cmi lib/pp.cmi 
 parsing/astterm.cmi: parsing/coqast.cmi kernel/environ.cmi kernel/evd.cmi \
-    kernel/names.cmi pretyping/rawterm.cmi kernel/sign.cmi \
+    kernel/names.cmi proofs/pattern.cmi pretyping/rawterm.cmi kernel/sign.cmi \
     pretyping/tacred.cmi kernel/term.cmi 
 parsing/coqast.cmi: lib/dyn.cmi 
 parsing/egrammar.cmi: parsing/ast.cmi parsing/coqast.cmi parsing/extend.cmi \
@@ -67,9 +67,9 @@ parsing/pcoq.cmi: parsing/coqast.cmi
 parsing/pretty.cmi: kernel/environ.cmi kernel/inductive.cmi library/lib.cmi \
     kernel/names.cmi lib/pp.cmi kernel/reduction.cmi kernel/sign.cmi \
     kernel/term.cmi 
-parsing/printer.cmi: parsing/coqast.cmi kernel/names.cmi lib/pp.cmi \
-    pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi 
-parsing/termast.cmi: parsing/coqast.cmi kernel/names.cmi \
+parsing/printer.cmi: parsing/coqast.cmi kernel/names.cmi proofs/pattern.cmi \
+    lib/pp.cmi pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi 
+parsing/termast.cmi: parsing/coqast.cmi kernel/names.cmi proofs/pattern.cmi \
     pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi 
 pretyping/cases.cmi: kernel/environ.cmi pretyping/evarutil.cmi kernel/evd.cmi \
     kernel/names.cmi pretyping/rawterm.cmi kernel/term.cmi 
@@ -94,8 +94,7 @@ pretyping/pretype_errors.cmi: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
 pretyping/pretyping.cmi: kernel/environ.cmi pretyping/evarutil.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/rawterm.cmi: kernel/names.cmi kernel/sign.cmi kernel/term.cmi 
 pretyping/recordops.cmi: pretyping/classops.cmi kernel/generic.cmi \
     library/libobject.cmi library/library.cmi kernel/names.cmi \
     kernel/term.cmi 
@@ -113,6 +112,8 @@ proofs/logic.cmi: kernel/environ.cmi kernel/evd.cmi kernel/names.cmi \
     lib/pp.cmi proofs/proof_trees.cmi kernel/sign.cmi kernel/term.cmi 
 proofs/macros.cmi: parsing/ast.cmi parsing/coqast.cmi kernel/names.cmi \
     proofs/proof_trees.cmi proofs/tacmach.cmi 
+proofs/pattern.cmi: kernel/environ.cmi kernel/evd.cmi kernel/names.cmi \
+    pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi 
 proofs/pfedit.cmi: parsing/coqast.cmi library/declare.cmi kernel/environ.cmi \
     kernel/names.cmi lib/pp.cmi proofs/proof_trees.cmi kernel/sign.cmi \
     proofs/tacmach.cmi kernel/term.cmi 
@@ -128,36 +129,37 @@ proofs/tacmach.cmi: parsing/coqast.cmi kernel/environ.cmi \
     proofs/proof_trees.cmi kernel/reduction.cmi proofs/refiner.cmi \
     kernel/sign.cmi pretyping/tacred.cmi kernel/term.cmi 
 tactics/auto.cmi: tactics/btermdn.cmi proofs/clenv.cmi parsing/coqast.cmi \
-    kernel/names.cmi proofs/proof_trees.cmi pretyping/rawterm.cmi \
-    kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi lib/util.cmi 
-tactics/btermdn.cmi: kernel/generic.cmi pretyping/rawterm.cmi kernel/term.cmi 
+    kernel/names.cmi proofs/pattern.cmi proofs/proof_trees.cmi \
+    pretyping/rawterm.cmi kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi \
+    lib/util.cmi 
+tactics/btermdn.cmi: kernel/generic.cmi proofs/pattern.cmi kernel/term.cmi 
 tactics/dhyp.cmi: kernel/names.cmi proofs/tacmach.cmi 
 tactics/elim.cmi: kernel/names.cmi proofs/proof_trees.cmi proofs/tacmach.cmi \
     tactics/tacticals.cmi kernel/term.cmi 
 tactics/equality.cmi: parsing/coqast.cmi kernel/environ.cmi kernel/evd.cmi \
-    kernel/names.cmi tactics/pattern.cmi proofs/proof_trees.cmi \
-    kernel/sign.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
-    tactics/tactics.cmi kernel/term.cmi tactics/wcclausenv.cmi 
+    tactics/hipattern.cmi kernel/names.cmi proofs/pattern.cmi \
+    proofs/proof_trees.cmi kernel/sign.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    tactics/wcclausenv.cmi 
 tactics/hiddentac.cmi: kernel/names.cmi proofs/proof_trees.cmi \
     tactics/tacentries.cmi proofs/tacmach.cmi kernel/term.cmi 
+tactics/hipattern.cmi: kernel/environ.cmi kernel/evd.cmi kernel/names.cmi \
+    proofs/proof_trees.cmi kernel/sign.cmi tactics/stock.cmi kernel/term.cmi \
+    lib/util.cmi 
 tactics/inv.cmi: parsing/coqast.cmi kernel/names.cmi proofs/tacmach.cmi 
 tactics/nbtermdn.cmi: tactics/btermdn.cmi kernel/generic.cmi \
-    pretyping/rawterm.cmi kernel/term.cmi 
-tactics/pattern.cmi: kernel/environ.cmi kernel/evd.cmi kernel/names.cmi \
-    proofs/proof_trees.cmi pretyping/rawterm.cmi kernel/sign.cmi \
-    tactics/stock.cmi kernel/term.cmi lib/util.cmi 
+    proofs/pattern.cmi kernel/term.cmi 
 tactics/stock.cmi: kernel/names.cmi 
 tactics/tacentries.cmi: proofs/proof_trees.cmi proofs/tacmach.cmi 
 tactics/tacticals.cmi: proofs/clenv.cmi parsing/coqast.cmi kernel/names.cmi \
-    tactics/pattern.cmi proofs/proof_trees.cmi pretyping/rawterm.cmi \
-    kernel/reduction.cmi kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi \
-    tactics/wcclausenv.cmi 
+    proofs/pattern.cmi proofs/proof_trees.cmi kernel/reduction.cmi \
+    kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi tactics/wcclausenv.cmi 
 tactics/tactics.cmi: proofs/clenv.cmi parsing/coqast.cmi kernel/environ.cmi \
     kernel/evd.cmi kernel/names.cmi proofs/proof_trees.cmi \
     kernel/reduction.cmi proofs/tacmach.cmi pretyping/tacred.cmi \
     tactics/tacticals.cmi kernel/term.cmi 
 tactics/tauto.cmi: proofs/tacmach.cmi kernel/term.cmi 
-tactics/termdn.cmi: kernel/generic.cmi pretyping/rawterm.cmi kernel/term.cmi 
+tactics/termdn.cmi: kernel/generic.cmi proofs/pattern.cmi kernel/term.cmi 
 tactics/wcclausenv.cmi: proofs/clenv.cmi kernel/environ.cmi kernel/evd.cmi \
     kernel/names.cmi proofs/proof_trees.cmi kernel/sign.cmi \
     proofs/tacmach.cmi kernel/term.cmi 
@@ -399,16 +401,16 @@ parsing/ast.cmx: parsing/coqast.cmx lib/dyn.cmx lib/hashcons.cmx \
 parsing/astterm.cmo: parsing/ast.cmi kernel/closure.cmi parsing/coqast.cmi \
     library/declare.cmi kernel/environ.cmi pretyping/evarutil.cmi \
     kernel/evd.cmi kernel/generic.cmi library/global.cmi library/impargs.cmi \
-    kernel/names.cmi library/nametab.cmi parsing/pcoq.cmi lib/pp.cmi \
-    pretyping/pretype_errors.cmi pretyping/pretyping.cmi \
+    kernel/names.cmi library/nametab.cmi proofs/pattern.cmi parsing/pcoq.cmi \
+    lib/pp.cmi pretyping/pretype_errors.cmi pretyping/pretyping.cmi \
     pretyping/rawterm.cmi kernel/reduction.cmi kernel/sign.cmi \
     pretyping/syntax_def.cmi pretyping/tacred.cmi kernel/term.cmi \
     pretyping/typing.cmi lib/util.cmi parsing/astterm.cmi 
 parsing/astterm.cmx: parsing/ast.cmx kernel/closure.cmx parsing/coqast.cmx \
     library/declare.cmx kernel/environ.cmx pretyping/evarutil.cmx \
     kernel/evd.cmx kernel/generic.cmx library/global.cmx library/impargs.cmx \
-    kernel/names.cmx library/nametab.cmx parsing/pcoq.cmx lib/pp.cmx \
-    pretyping/pretype_errors.cmx pretyping/pretyping.cmx \
+    kernel/names.cmx library/nametab.cmx proofs/pattern.cmx parsing/pcoq.cmx \
+    lib/pp.cmx pretyping/pretype_errors.cmx pretyping/pretyping.cmx \
     pretyping/rawterm.cmx kernel/reduction.cmx kernel/sign.cmx \
     pretyping/syntax_def.cmx pretyping/tacred.cmx kernel/term.cmx \
     pretyping/typing.cmx lib/util.cmx parsing/astterm.cmi 
@@ -464,28 +466,28 @@ parsing/pretty.cmx: pretyping/classops.cmx kernel/constant.cmx \
     parsing/pretty.cmi 
 parsing/printer.cmo: parsing/ast.cmi parsing/coqast.cmi library/declare.cmi \
     kernel/environ.cmi parsing/esyntax.cmi parsing/extend.cmi \
-    library/global.cmi kernel/names.cmi lib/options.cmi lib/pp.cmi \
-    pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi parsing/termast.cmi \
+    library/global.cmi kernel/names.cmi lib/options.cmi proofs/pattern.cmi \
+    lib/pp.cmi kernel/sign.cmi kernel/term.cmi parsing/termast.cmi \
     lib/util.cmi parsing/printer.cmi 
 parsing/printer.cmx: parsing/ast.cmx parsing/coqast.cmx library/declare.cmx \
     kernel/environ.cmx parsing/esyntax.cmx parsing/extend.cmx \
-    library/global.cmx kernel/names.cmx lib/options.cmx lib/pp.cmx \
-    pretyping/rawterm.cmx kernel/sign.cmx kernel/term.cmx parsing/termast.cmx \
+    library/global.cmx kernel/names.cmx lib/options.cmx proofs/pattern.cmx \
+    lib/pp.cmx kernel/sign.cmx kernel/term.cmx parsing/termast.cmx \
     lib/util.cmx parsing/printer.cmi 
 parsing/termast.cmo: parsing/ast.cmi pretyping/classops.cmi \
     parsing/coqast.cmi library/declare.cmi pretyping/detyping.cmi \
     kernel/environ.cmi kernel/evd.cmi kernel/generic.cmi library/global.cmi \
     library/impargs.cmi kernel/inductive.cmi kernel/names.cmi \
-    library/nametab.cmi lib/pp.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
-    kernel/sign.cmi kernel/term.cmi kernel/univ.cmi lib/util.cmi \
-    parsing/termast.cmi 
+    library/nametab.cmi proofs/pattern.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi kernel/univ.cmi \
+    lib/util.cmi parsing/termast.cmi 
 parsing/termast.cmx: parsing/ast.cmx pretyping/classops.cmx \
     parsing/coqast.cmx library/declare.cmx pretyping/detyping.cmx \
     kernel/environ.cmx kernel/evd.cmx kernel/generic.cmx library/global.cmx \
     library/impargs.cmx kernel/inductive.cmx kernel/names.cmx \
-    library/nametab.cmx lib/pp.cmx pretyping/rawterm.cmx kernel/reduction.cmx \
-    kernel/sign.cmx kernel/term.cmx kernel/univ.cmx lib/util.cmx \
-    parsing/termast.cmi 
+    library/nametab.cmx proofs/pattern.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx kernel/univ.cmx \
+    lib/util.cmx parsing/termast.cmi 
 pretyping/cases.cmo: pretyping/coercion.cmi kernel/environ.cmi \
     pretyping/evarconv.cmi pretyping/evarutil.cmi kernel/evd.cmi \
     kernel/generic.cmi library/global.cmi kernel/inductive.cmi \
@@ -582,10 +584,10 @@ pretyping/pretyping.cmx: pretyping/cases.cmx pretyping/classops.cmx \
     pretyping/retyping.cmx kernel/sign.cmx kernel/term.cmx \
     kernel/type_errors.cmx kernel/typeops.cmx lib/util.cmx \
     pretyping/pretyping.cmi 
-pretyping/rawterm.cmo: kernel/generic.cmi kernel/names.cmi kernel/sign.cmi \
-    kernel/term.cmi kernel/type_errors.cmi lib/util.cmi pretyping/rawterm.cmi 
-pretyping/rawterm.cmx: kernel/generic.cmx kernel/names.cmx kernel/sign.cmx \
-    kernel/term.cmx kernel/type_errors.cmx lib/util.cmx pretyping/rawterm.cmi 
+pretyping/rawterm.cmo: kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
+    lib/util.cmi pretyping/rawterm.cmi 
+pretyping/rawterm.cmx: kernel/names.cmx kernel/sign.cmx kernel/term.cmx \
+    lib/util.cmx pretyping/rawterm.cmi 
 pretyping/recordops.cmo: pretyping/classops.cmi library/lib.cmi \
     library/libobject.cmi library/library.cmi kernel/names.cmi lib/pp.cmi \
     library/summary.cmi kernel/term.cmi kernel/typeops.cmi lib/util.cmi \
@@ -662,6 +664,10 @@ proofs/macros.cmx: parsing/ast.cmx parsing/coqast.cmx library/lib.cmx \
     library/libobject.cmx library/library.cmx kernel/names.cmx \
     parsing/pcoq.cmx lib/pp.cmx proofs/proof_trees.cmx library/summary.cmx \
     kernel/term.cmx lib/util.cmx proofs/macros.cmi 
+proofs/pattern.cmo: kernel/generic.cmi kernel/names.cmi pretyping/rawterm.cmi \
+    kernel/reduction.cmi kernel/term.cmi lib/util.cmi proofs/pattern.cmi 
+proofs/pattern.cmx: kernel/generic.cmx kernel/names.cmx pretyping/rawterm.cmx \
+    kernel/reduction.cmx kernel/term.cmx lib/util.cmx proofs/pattern.cmi 
 proofs/pfedit.cmo: parsing/astterm.cmi kernel/constant.cmi \
     library/declare.cmi lib/edit.cmi kernel/environ.cmi kernel/evd.cmi \
     kernel/generic.cmi library/global.cmi library/lib.cmi proofs/logic.cmi \
@@ -719,34 +725,36 @@ scripts/coqmktop.cmx: config/coq_config.cmx scripts/tolink.cmx
 tactics/auto.cmo: parsing/astterm.cmi tactics/btermdn.cmi proofs/clenv.cmi \
     parsing/coqast.cmi library/declare.cmi tactics/dhyp.cmi kernel/evd.cmi \
     kernel/generic.cmi library/global.cmi tactics/hiddentac.cmi \
-    kernel/inductive.cmi library/lib.cmi library/libobject.cmi \
-    library/library.cmi proofs/logic.cmi kernel/names.cmi lib/options.cmi \
-    tactics/pattern.cmi proofs/pfedit.cmi lib/pp.cmi parsing/printer.cmi \
-    proofs/proof_trees.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
-    kernel/sign.cmi library/summary.cmi proofs/tacmach.cmi \
-    pretyping/tacred.cmi tactics/tacticals.cmi tactics/tactics.cmi \
-    kernel/term.cmi pretyping/typing.cmi lib/util.cmi \
-    toplevel/vernacinterp.cmi tactics/auto.cmi 
+    tactics/hipattern.cmi kernel/inductive.cmi library/lib.cmi \
+    library/libobject.cmi library/library.cmi proofs/logic.cmi \
+    kernel/names.cmi lib/options.cmi proofs/pattern.cmi proofs/pfedit.cmi \
+    lib/pp.cmi parsing/printer.cmi proofs/proof_trees.cmi \
+    pretyping/rawterm.cmi kernel/reduction.cmi kernel/sign.cmi \
+    library/summary.cmi proofs/tacmach.cmi pretyping/tacred.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/typing.cmi lib/util.cmi toplevel/vernacinterp.cmi \
+    tactics/auto.cmi 
 tactics/auto.cmx: parsing/astterm.cmx tactics/btermdn.cmx proofs/clenv.cmx \
     parsing/coqast.cmx library/declare.cmx tactics/dhyp.cmx kernel/evd.cmx \
     kernel/generic.cmx library/global.cmx tactics/hiddentac.cmx \
-    kernel/inductive.cmx library/lib.cmx library/libobject.cmx \
-    library/library.cmx proofs/logic.cmx kernel/names.cmx lib/options.cmx \
-    tactics/pattern.cmx proofs/pfedit.cmx lib/pp.cmx parsing/printer.cmx \
-    proofs/proof_trees.cmx pretyping/rawterm.cmx kernel/reduction.cmx \
-    kernel/sign.cmx library/summary.cmx proofs/tacmach.cmx \
-    pretyping/tacred.cmx tactics/tacticals.cmx tactics/tactics.cmx \
-    kernel/term.cmx pretyping/typing.cmx lib/util.cmx \
-    toplevel/vernacinterp.cmx tactics/auto.cmi 
-tactics/btermdn.cmo: tactics/dn.cmi pretyping/rawterm.cmi kernel/term.cmi \
+    tactics/hipattern.cmx kernel/inductive.cmx library/lib.cmx \
+    library/libobject.cmx library/library.cmx proofs/logic.cmx \
+    kernel/names.cmx lib/options.cmx proofs/pattern.cmx proofs/pfedit.cmx \
+    lib/pp.cmx parsing/printer.cmx proofs/proof_trees.cmx \
+    pretyping/rawterm.cmx kernel/reduction.cmx kernel/sign.cmx \
+    library/summary.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/typing.cmx lib/util.cmx toplevel/vernacinterp.cmx \
+    tactics/auto.cmi 
+tactics/btermdn.cmo: tactics/dn.cmi proofs/pattern.cmi kernel/term.cmi \
     tactics/termdn.cmi tactics/btermdn.cmi 
-tactics/btermdn.cmx: tactics/dn.cmx pretyping/rawterm.cmx kernel/term.cmx \
+tactics/btermdn.cmx: tactics/dn.cmx proofs/pattern.cmx kernel/term.cmx \
     tactics/termdn.cmx tactics/btermdn.cmi 
 tactics/dhyp.cmo: parsing/ast.cmi parsing/astterm.cmi proofs/clenv.cmi \
     parsing/coqast.cmi kernel/environ.cmi kernel/evd.cmi kernel/generic.cmi \
     library/global.cmi library/lib.cmi library/libobject.cmi \
     library/library.cmi kernel/names.cmi tactics/nbtermdn.cmi \
-    tactics/pattern.cmi parsing/pcoq.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    proofs/pattern.cmi parsing/pcoq.cmi lib/pp.cmi proofs/proof_trees.cmi \
     pretyping/rawterm.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 \
@@ -755,7 +763,7 @@ tactics/dhyp.cmx: parsing/ast.cmx parsing/astterm.cmx proofs/clenv.cmx \
     parsing/coqast.cmx kernel/environ.cmx kernel/evd.cmx kernel/generic.cmx \
     library/global.cmx library/lib.cmx library/libobject.cmx \
     library/library.cmx kernel/names.cmx tactics/nbtermdn.cmx \
-    tactics/pattern.cmx parsing/pcoq.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    proofs/pattern.cmx parsing/pcoq.cmx lib/pp.cmx proofs/proof_trees.cmx \
     pretyping/rawterm.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 \
@@ -763,37 +771,49 @@ tactics/dhyp.cmx: parsing/ast.cmx parsing/astterm.cmx proofs/clenv.cmx \
 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 \
-    kernel/names.cmi tactics/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    tactics/hipattern.cmi kernel/names.cmi lib/pp.cmi proofs/proof_trees.cmi \
     kernel/reduction.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
     tactics/tactics.cmi kernel/term.cmi lib/util.cmi tactics/elim.cmi 
 tactics/elim.cmx: proofs/clenv.cmx kernel/generic.cmx tactics/hiddentac.cmx \
-    kernel/names.cmx tactics/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    tactics/hipattern.cmx kernel/names.cmx lib/pp.cmx proofs/proof_trees.cmx \
     kernel/reduction.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
     tactics/tactics.cmx kernel/term.cmx lib/util.cmx tactics/elim.cmi 
 tactics/equality.cmo: parsing/astterm.cmi parsing/coqast.cmi \
     kernel/environ.cmi kernel/evd.cmi kernel/generic.cmi library/global.cmi \
-    lib/gmapl.cmi kernel/inductive.cmi kernel/instantiate.cmi library/lib.cmi \
-    library/libobject.cmi proofs/logic.cmi kernel/names.cmi \
-    tactics/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
-    kernel/reduction.cmi library/summary.cmi proofs/tacinterp.cmi \
-    proofs/tacmach.cmi pretyping/tacred.cmi tactics/tacticals.cmi \
-    tactics/tactics.cmi kernel/term.cmi kernel/typeops.cmi \
-    pretyping/typing.cmi kernel/univ.cmi lib/util.cmi \
+    lib/gmapl.cmi tactics/hipattern.cmi kernel/inductive.cmi \
+    kernel/instantiate.cmi library/lib.cmi library/libobject.cmi \
+    proofs/logic.cmi kernel/names.cmi proofs/pattern.cmi lib/pp.cmi \
+    proofs/proof_trees.cmi kernel/reduction.cmi library/summary.cmi \
+    proofs/tacinterp.cmi proofs/tacmach.cmi pretyping/tacred.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    kernel/typeops.cmi pretyping/typing.cmi kernel/univ.cmi lib/util.cmi \
     toplevel/vernacinterp.cmi tactics/wcclausenv.cmi tactics/equality.cmi 
 tactics/equality.cmx: parsing/astterm.cmx parsing/coqast.cmx \
     kernel/environ.cmx kernel/evd.cmx kernel/generic.cmx library/global.cmx \
-    lib/gmapl.cmx kernel/inductive.cmx kernel/instantiate.cmx library/lib.cmx \
-    library/libobject.cmx proofs/logic.cmx kernel/names.cmx \
-    tactics/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
-    kernel/reduction.cmx library/summary.cmx proofs/tacinterp.cmx \
-    proofs/tacmach.cmx pretyping/tacred.cmx tactics/tacticals.cmx \
-    tactics/tactics.cmx kernel/term.cmx kernel/typeops.cmx \
-    pretyping/typing.cmx kernel/univ.cmx lib/util.cmx \
+    lib/gmapl.cmx tactics/hipattern.cmx kernel/inductive.cmx \
+    kernel/instantiate.cmx library/lib.cmx library/libobject.cmx \
+    proofs/logic.cmx kernel/names.cmx proofs/pattern.cmx lib/pp.cmx \
+    proofs/proof_trees.cmx kernel/reduction.cmx library/summary.cmx \
+    proofs/tacinterp.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    kernel/typeops.cmx pretyping/typing.cmx kernel/univ.cmx lib/util.cmx \
     toplevel/vernacinterp.cmx tactics/wcclausenv.cmx tactics/equality.cmi 
 tactics/hiddentac.cmo: proofs/proof_trees.cmi tactics/tacentries.cmi \
     proofs/tacmach.cmi kernel/term.cmi tactics/hiddentac.cmi 
 tactics/hiddentac.cmx: proofs/proof_trees.cmx tactics/tacentries.cmx \
     proofs/tacmach.cmx kernel/term.cmx tactics/hiddentac.cmi 
+tactics/hipattern.cmo: parsing/astterm.cmi proofs/clenv.cmi \
+    kernel/environ.cmi kernel/evd.cmi kernel/generic.cmi library/global.cmi \
+    kernel/names.cmi proofs/pattern.cmi parsing/pcoq.cmi lib/pp.cmi \
+    parsing/printer.cmi proofs/proof_trees.cmi kernel/reduction.cmi \
+    kernel/sosub.cmi tactics/stock.cmi kernel/term.cmi lib/util.cmi \
+    tactics/hipattern.cmi 
+tactics/hipattern.cmx: parsing/astterm.cmx proofs/clenv.cmx \
+    kernel/environ.cmx kernel/evd.cmx kernel/generic.cmx library/global.cmx \
+    kernel/names.cmx proofs/pattern.cmx parsing/pcoq.cmx lib/pp.cmx \
+    parsing/printer.cmx proofs/proof_trees.cmx kernel/reduction.cmx \
+    kernel/sosub.cmx tactics/stock.cmx kernel/term.cmx lib/util.cmx \
+    tactics/hipattern.cmi 
 tactics/inv.cmo: tactics/auto.cmi proofs/clenv.cmi tactics/elim.cmi \
     kernel/environ.cmi tactics/equality.cmi kernel/evd.cmi kernel/generic.cmi \
     library/global.cmi library/indrec.cmi kernel/names.cmi lib/pp.cmi \
@@ -811,7 +831,7 @@ tactics/inv.cmx: tactics/auto.cmx proofs/clenv.cmx tactics/elim.cmx \
 tactics/leminv.cmo: proofs/clenv.cmi library/declare.cmi \
     toplevel/discharge.cmi kernel/environ.cmi tactics/equality.cmi \
     kernel/evd.cmi kernel/generic.cmi tactics/inv.cmi kernel/names.cmi \
-    tactics/pattern.cmi proofs/pfedit.cmi lib/pp.cmi parsing/printer.cmi \
+    proofs/pattern.cmi proofs/pfedit.cmi lib/pp.cmi parsing/printer.cmi \
     proofs/proof_trees.cmi kernel/reduction.cmi proofs/refiner.cmi \
     kernel/sign.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
     tactics/tactics.cmi kernel/term.cmi lib/util.cmi \
@@ -819,29 +839,19 @@ tactics/leminv.cmo: proofs/clenv.cmi library/declare.cmi \
 tactics/leminv.cmx: proofs/clenv.cmx library/declare.cmx \
     toplevel/discharge.cmx kernel/environ.cmx tactics/equality.cmx \
     kernel/evd.cmx kernel/generic.cmx tactics/inv.cmx kernel/names.cmx \
-    tactics/pattern.cmx proofs/pfedit.cmx lib/pp.cmx parsing/printer.cmx \
+    proofs/pattern.cmx proofs/pfedit.cmx lib/pp.cmx parsing/printer.cmx \
     proofs/proof_trees.cmx kernel/reduction.cmx proofs/refiner.cmx \
     kernel/sign.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
     tactics/tactics.cmx kernel/term.cmx lib/util.cmx \
     toplevel/vernacinterp.cmx tactics/wcclausenv.cmx 
 tactics/nbtermdn.cmo: tactics/btermdn.cmi kernel/generic.cmi lib/gmap.cmi \
     library/libobject.cmi library/library.cmi kernel/names.cmi \
-    pretyping/rawterm.cmi kernel/term.cmi tactics/termdn.cmi lib/util.cmi \
+    proofs/pattern.cmi kernel/term.cmi tactics/termdn.cmi lib/util.cmi \
     tactics/nbtermdn.cmi 
 tactics/nbtermdn.cmx: tactics/btermdn.cmx kernel/generic.cmx lib/gmap.cmx \
     library/libobject.cmx library/library.cmx kernel/names.cmx \
-    pretyping/rawterm.cmx kernel/term.cmx tactics/termdn.cmx lib/util.cmx \
+    proofs/pattern.cmx kernel/term.cmx tactics/termdn.cmx lib/util.cmx \
     tactics/nbtermdn.cmi 
-tactics/pattern.cmo: parsing/astterm.cmi proofs/clenv.cmi kernel/environ.cmi \
-    kernel/evd.cmi kernel/generic.cmi library/global.cmi proofs/logic.cmi \
-    kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi proofs/proof_trees.cmi \
-    pretyping/rawterm.cmi kernel/reduction.cmi kernel/sosub.cmi \
-    tactics/stock.cmi kernel/term.cmi lib/util.cmi tactics/pattern.cmi 
-tactics/pattern.cmx: parsing/astterm.cmx proofs/clenv.cmx kernel/environ.cmx \
-    kernel/evd.cmx kernel/generic.cmx library/global.cmx proofs/logic.cmx \
-    kernel/names.cmx parsing/pcoq.cmx lib/pp.cmx proofs/proof_trees.cmx \
-    pretyping/rawterm.cmx kernel/reduction.cmx kernel/sosub.cmx \
-    tactics/stock.cmx kernel/term.cmx lib/util.cmx tactics/pattern.cmi 
 tactics/stock.cmo: lib/bij.cmi lib/gmap.cmi lib/gmapl.cmi library/library.cmi \
     kernel/names.cmi lib/pp.cmi lib/util.cmi tactics/stock.cmi 
 tactics/stock.cmx: lib/bij.cmx lib/gmap.cmx lib/gmapl.cmx library/library.cmx \
@@ -853,7 +863,7 @@ tactics/tacentries.cmx: proofs/proof_trees.cmx proofs/tacmach.cmx \
 tactics/tacticals.cmo: proofs/clenv.cmi parsing/coqast.cmi \
     library/declare.cmi kernel/environ.cmi kernel/generic.cmi \
     library/global.cmi library/indrec.cmi kernel/inductive.cmi \
-    kernel/names.cmi tactics/pattern.cmi lib/pp.cmi parsing/pretty.cmi \
+    kernel/names.cmi proofs/pattern.cmi lib/pp.cmi parsing/pretty.cmi \
     proofs/proof_trees.cmi kernel/reduction.cmi kernel/sign.cmi \
     proofs/tacinterp.cmi proofs/tacmach.cmi kernel/term.cmi \
     parsing/termast.cmi lib/util.cmi tactics/wcclausenv.cmi \
@@ -861,43 +871,43 @@ tactics/tacticals.cmo: proofs/clenv.cmi parsing/coqast.cmi \
 tactics/tacticals.cmx: proofs/clenv.cmx parsing/coqast.cmx \
     library/declare.cmx kernel/environ.cmx kernel/generic.cmx \
     library/global.cmx library/indrec.cmx kernel/inductive.cmx \
-    kernel/names.cmx tactics/pattern.cmx lib/pp.cmx parsing/pretty.cmx \
+    kernel/names.cmx proofs/pattern.cmx lib/pp.cmx parsing/pretty.cmx \
     proofs/proof_trees.cmx kernel/reduction.cmx kernel/sign.cmx \
     proofs/tacinterp.cmx proofs/tacmach.cmx kernel/term.cmx \
     parsing/termast.cmx lib/util.cmx tactics/wcclausenv.cmx \
     tactics/tacticals.cmi 
 tactics/tactics.cmo: parsing/ast.cmi parsing/astterm.cmi proofs/clenv.cmi \
     library/declare.cmi kernel/environ.cmi kernel/evd.cmi kernel/generic.cmi \
-    library/global.cmi library/indrec.cmi kernel/inductive.cmi \
-    proofs/logic.cmi kernel/names.cmi tactics/pattern.cmi proofs/pfedit.cmi \
+    library/global.cmi tactics/hipattern.cmi library/indrec.cmi \
+    kernel/inductive.cmi proofs/logic.cmi kernel/names.cmi proofs/pfedit.cmi \
     lib/pp.cmi proofs/proof_trees.cmi kernel/reduction.cmi kernel/sign.cmi \
     lib/stamps.cmi proofs/tacinterp.cmi proofs/tacmach.cmi \
     pretyping/tacred.cmi tactics/tacticals.cmi kernel/term.cmi lib/util.cmi \
     tactics/tactics.cmi 
 tactics/tactics.cmx: parsing/ast.cmx parsing/astterm.cmx proofs/clenv.cmx \
     library/declare.cmx kernel/environ.cmx kernel/evd.cmx kernel/generic.cmx \
-    library/global.cmx library/indrec.cmx kernel/inductive.cmx \
-    proofs/logic.cmx kernel/names.cmx tactics/pattern.cmx proofs/pfedit.cmx \
+    library/global.cmx tactics/hipattern.cmx library/indrec.cmx \
+    kernel/inductive.cmx proofs/logic.cmx kernel/names.cmx proofs/pfedit.cmx \
     lib/pp.cmx proofs/proof_trees.cmx kernel/reduction.cmx kernel/sign.cmx \
     lib/stamps.cmx proofs/tacinterp.cmx proofs/tacmach.cmx \
     pretyping/tacred.cmx tactics/tacticals.cmx kernel/term.cmx lib/util.cmx \
     tactics/tactics.cmi 
 tactics/tauto.cmo: tactics/auto.cmi proofs/clenv.cmi library/declare.cmi \
     kernel/environ.cmi kernel/generic.cmi kernel/names.cmi \
-    library/nametab.cmi tactics/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    library/nametab.cmi proofs/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
     kernel/reduction.cmi kernel/sign.cmi proofs/tacmach.cmi \
     tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi lib/util.cmi \
     tactics/tauto.cmi 
 tactics/tauto.cmx: tactics/auto.cmx proofs/clenv.cmx library/declare.cmx \
     kernel/environ.cmx kernel/generic.cmx kernel/names.cmx \
-    library/nametab.cmx tactics/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    library/nametab.cmx proofs/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
     kernel/reduction.cmx kernel/sign.cmx proofs/tacmach.cmx \
     tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx lib/util.cmx \
     tactics/tauto.cmi 
 tactics/termdn.cmo: tactics/dn.cmi kernel/generic.cmi kernel/names.cmi \
-    pretyping/rawterm.cmi kernel/term.cmi lib/util.cmi tactics/termdn.cmi 
+    proofs/pattern.cmi kernel/term.cmi lib/util.cmi tactics/termdn.cmi 
 tactics/termdn.cmx: tactics/dn.cmx kernel/generic.cmx kernel/names.cmx \
-    pretyping/rawterm.cmx kernel/term.cmx lib/util.cmx tactics/termdn.cmi 
+    proofs/pattern.cmx kernel/term.cmx lib/util.cmx tactics/termdn.cmi 
 tactics/wcclausenv.cmo: proofs/clenv.cmi kernel/environ.cmi kernel/evd.cmi \
     kernel/generic.cmi library/global.cmi proofs/logic.cmi kernel/names.cmi \
     lib/pp.cmi proofs/proof_trees.cmi kernel/reduction.cmi kernel/sign.cmi \
@@ -908,12 +918,8 @@ tactics/wcclausenv.cmx: proofs/clenv.cmx kernel/environ.cmx kernel/evd.cmx \
     lib/pp.cmx proofs/proof_trees.cmx kernel/reduction.cmx kernel/sign.cmx \
     proofs/tacmach.cmx kernel/term.cmx pretyping/typing.cmx lib/util.cmx \
     tactics/wcclausenv.cmi 
-tools/coqdep.cmo: config/coq_config.cmi tools/coqdep_lexer.cmo 
-tools/coqdep.cmx: config/coq_config.cmx tools/coqdep_lexer.cmx 
-tools/coqdep_lexer.cmo: config/coq_config.cmi 
-tools/coqdep_lexer.cmx: config/coq_config.cmx 
-tools/gallina.cmo: tools/gallina_lexer.cmo 
-tools/gallina.cmx: tools/gallina_lexer.cmx 
+tools/coqdep.cmo: config/coq_config.cmi 
+tools/coqdep.cmx: config/coq_config.cmx 
 toplevel/command.cmo: parsing/ast.cmi parsing/astterm.cmi kernel/constant.cmi \
     parsing/coqast.cmi library/declare.cmi kernel/environ.cmi kernel/evd.cmi \
     kernel/generic.cmi library/global.cmi library/indrec.cmi \
@@ -1071,20 +1077,18 @@ toplevel/vernacinterp.cmx: parsing/ast.cmx parsing/coqast.cmx lib/dyn.cmx \
     proofs/proof_trees.cmx proofs/tacinterp.cmx lib/util.cmx \
     toplevel/vernacinterp.cmi 
 contrib/omega/coq_omega.cmo: parsing/ast.cmi proofs/clenv.cmi \
-    parsing/coqast.cmi library/declare.cmi kernel/environ.cmi \
-    tactics/equality.cmi kernel/generic.cmi library/global.cmi \
-    kernel/inductive.cmi kernel/names.cmi contrib/omega/omega.cmo \
-    tactics/pattern.cmi lib/pp.cmi parsing/printer.cmi proofs/proof_trees.cmi \
-    kernel/reduction.cmi kernel/sign.cmi proofs/tacmach.cmi \
-    tactics/tactics.cmi kernel/term.cmi parsing/termast.cmi lib/util.cmi \
-    toplevel/vernacinterp.cmi 
+    library/declare.cmi kernel/environ.cmi tactics/equality.cmi \
+    kernel/generic.cmi library/global.cmi kernel/inductive.cmi \
+    proofs/logic.cmi kernel/names.cmi contrib/omega/omega.cmo lib/pp.cmi \
+    parsing/printer.cmi proofs/proof_trees.cmi kernel/reduction.cmi \
+    kernel/sign.cmi proofs/tacmach.cmi tactics/tactics.cmi kernel/term.cmi \
+    lib/util.cmi 
 contrib/omega/coq_omega.cmx: parsing/ast.cmx proofs/clenv.cmx \
-    parsing/coqast.cmx library/declare.cmx kernel/environ.cmx \
-    tactics/equality.cmx kernel/generic.cmx library/global.cmx \
-    kernel/inductive.cmx kernel/names.cmx contrib/omega/omega.cmx \
-    tactics/pattern.cmx lib/pp.cmx parsing/printer.cmx proofs/proof_trees.cmx \
-    kernel/reduction.cmx kernel/sign.cmx proofs/tacmach.cmx \
-    tactics/tactics.cmx kernel/term.cmx parsing/termast.cmx lib/util.cmx \
-    toplevel/vernacinterp.cmx 
+    library/declare.cmx kernel/environ.cmx tactics/equality.cmx \
+    kernel/generic.cmx library/global.cmx kernel/inductive.cmx \
+    proofs/logic.cmx kernel/names.cmx contrib/omega/omega.cmx lib/pp.cmx \
+    parsing/printer.cmx proofs/proof_trees.cmx kernel/reduction.cmx \
+    kernel/sign.cmx proofs/tacmach.cmx tactics/tactics.cmx kernel/term.cmx \
+    lib/util.cmx 
 contrib/omega/omega.cmo: lib/util.cmi 
 contrib/omega/omega.cmx: lib/util.cmx