From 3bbcfded9c83e5f7a44d1fcd7dc2c4a8a1f3fcbe Mon Sep 17 00:00:00 2001
From: letouzey
Date: Mon, 26 Apr 2010 16:22:03 +0000
Subject: Misc small fixes : warning, dep cycles, ocamlbuild...

 - git ignore g_decl_mode.ml
 - exhaustive match for pp_vernac (BeginSubproof, ...)
 - for ocamlbuild, remove a spurious cycle in recordops.mli
   (unnecessary open of Classops), and fixes of *.itargets and _tags

 The compilation via ocamlbuild still need some work, since
 plugin firstorder now depends on the new plugin decl_mode

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12964 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 .gitignore                  | 1 +
 parsing/ppvernac.ml         | 5 +++++
 plugins/_tags               | 1 +
 plugins/pluginsbyte.itarget | 2 +-
 plugins/pluginsdyn.itarget  | 1 +
 plugins/pluginsopt.itarget  | 2 +-
 pretyping/recordops.mli     | 1 -
 7 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index eaa6b8f727..4a16b77224 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,6 +145,7 @@ plugins/groebner/ideal.ml
 plugins/micromega/g_micromega.ml
 plugins/subtac/g_subtac.ml
 plugins/fourier/g_fourier.ml
+plugins/decl_mode/g_decl_mode.ml
 tactics/tauto.ml
 tactics/eauto.ml
 tactics/hipattern.ml
diff --git a/parsing/ppvernac.ml b/parsing/ppvernac.ml
index dc61aaa261..470f937c00 100644
--- a/parsing/ppvernac.ml
+++ b/parsing/ppvernac.ml
@@ -957,6 +957,11 @@ let rec pr_vernac = function
   | VernacProof (Tacexpr.TacId _) -> str "Proof"
   | VernacProof te -> str "Proof with" ++ spc() ++ pr_raw_tactic te
 
+  | VernacProofMode s -> str ("Proof Mode "^s)
+  | VernacSubproof None -> str "BeginSubproof"
+  | VernacSubproof (Some i) -> str "BeginSubproof " ++ pr_int i
+  | VernacEndSubproof -> str "EndSubproof"
+
 and pr_extend s cl =
   let pr_arg a =
     try pr_gen (Global.env()) a
diff --git a/plugins/_tags b/plugins/_tags
index f95e0c5b80..8611ebc0cf 100644
--- a/plugins/_tags
+++ b/plugins/_tags
@@ -20,6 +20,7 @@
 "fourier/g_fourier.ml4": use_grammar
 "groebner/ideal.ml4": use_refutpat
 "groebner/groebner.ml4": use_grammar
+"decl_mode/g_decl_mode.ml4": use_grammar, use_extend, use_MLast
 
 "cc": include
 "extraction": include
diff --git a/plugins/pluginsbyte.itarget b/plugins/pluginsbyte.itarget
index c0237ecf70..c76c199424 100644
--- a/plugins/pluginsbyte.itarget
+++ b/plugins/pluginsbyte.itarget
@@ -1,6 +1,7 @@
 field/field_plugin.cma
 setoid_ring/newring_plugin.cma
 extraction/extraction_plugin.cma
+decl_mode/decl_mode_plugin.cma
 firstorder/ground_plugin.cma
 rtauto/rtauto_plugin.cma
 fourier/fourier_plugin.cma
@@ -21,4 +22,3 @@ syntax/r_syntax_plugin.cma
 syntax/string_syntax_plugin.cma
 syntax/z_syntax_plugin.cma
 quote/quote_plugin.cma
-decl_mode/decl_mode_plugin.cma
diff --git a/plugins/pluginsdyn.itarget b/plugins/pluginsdyn.itarget
index f44121ee4a..559adfb6ec 100644
--- a/plugins/pluginsdyn.itarget
+++ b/plugins/pluginsdyn.itarget
@@ -1,6 +1,7 @@
 field/field_plugin.cmxs
 setoid_ring/newring_plugin.cmxs
 extraction/extraction_plugin.cmxs
+decl_mode/decl_mode_plugin.cmxs
 firstorder/ground_plugin.cmxs
 rtauto/rtauto_plugin.cmxs
 fourier/fourier_plugin.cmxs
diff --git a/plugins/pluginsopt.itarget b/plugins/pluginsopt.itarget
index 26b3f90842..62868a2c4e 100644
--- a/plugins/pluginsopt.itarget
+++ b/plugins/pluginsopt.itarget
@@ -1,6 +1,7 @@
 field/field_plugin.cmxa
 setoid_ring/newring_plugin.cmxa
 extraction/extraction_plugin.cmxa
+decl_mode/decl_mode_plugin.cmxa
 firstorder/ground_plugin.cmxa
 rtauto/rtauto_plugin.cmxa
 fourier/fourier_plugin.cmxa
@@ -21,4 +22,3 @@ syntax/r_syntax_plugin.cmxa
 syntax/string_syntax_plugin.cmxa
 syntax/z_syntax_plugin.cmxa
 quote/quote_plugin.cmxa
-decl_mode/decl_mode_plugin.cmxa
diff --git a/pretyping/recordops.mli b/pretyping/recordops.mli
index 0af25666d4..74a0d7d8ec 100755
--- a/pretyping/recordops.mli
+++ b/pretyping/recordops.mli
@@ -13,7 +13,6 @@ open Names
 open Nametab
 open Term
 open Libnames
-open Classops
 open Libobject
 open Library
 (*i*)
-- 
cgit v1.2.3