rendu silencieux le warning de recuperation d'erreur de Camlp4

git-svn-id: http://caml.inria.fr/svn/ocaml/version/3.08@6689 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

10 files changed, 13 insertions, 5 deletions

diff --git a/camlp4/lib/grammar.ml b/camlp4/lib/grammar.ml
index 8b0f06f937..04b87ad336 100644
--- a/camlp4/lib/grammar.ml
+++ b/camlp4/lib/grammar.ml
@@ -461,12 +461,13 @@ value do_recover parser_of_tree entry nlevn alevn bp a s son =
 ;
 
 value strict_parsing = ref False;
+value strict_parsing_warning = ref False;
 
 value recover parser_of_tree entry nlevn alevn bp a s son strm =
   if strict_parsing.val then raise (Stream.Error (tree_failed entry a s son))
   else
     let _ =
-      if warning_verbose.val then
+      if strict_parsing_warning.val then
         do {
           let msg = tree_failed entry a s son in
           try
diff --git a/camlp4/lib/grammar.mli b/camlp4/lib/grammar.mli
index 10074b9e7c..5b9ad39733 100644
--- a/camlp4/lib/grammar.mli
+++ b/camlp4/lib/grammar.mli
@@ -165,6 +165,10 @@ value strict_parsing : ref bool;
    (** Flag to apply strict parsing, without trying to recover errors;
        default = [False] *)
 
+value strict_parsing_warning : ref bool;
+   (** Flag for displaying a warning when entering recovery mode;
+       default = [False] *)
+
 value print_entry : Format.formatter -> Gramext.g_entry 'te -> unit;
    (** General printer for all kinds of entries (obj entries) *)
 
diff --git a/camlp4/ocaml_src/camlp4/ast2pt.ml b/camlp4/ocaml_src/camlp4/ast2pt.ml
index 9691a038f8..786075527c 100644
--- a/camlp4/ocaml_src/camlp4/ast2pt.ml
+++ b/camlp4/ocaml_src/camlp4/ast2pt.ml
diff --git a/camlp4/ocaml_src/lib/Makefile b/camlp4/ocaml_src/lib/Makefile
index 3ff1650880..37fa4fbb1c 100644
--- a/camlp4/ocaml_src/lib/Makefile
+++ b/camlp4/ocaml_src/lib/Makefile
@@ -8,8 +8,6 @@ OBJS=stdpp.cmo token.cmo plexer.cmo gramext.cmo grammar.cmo extfold.cmo extfun.c
 SHELL=/bin/sh
 TARGET=gramlib.cma
 
-.PHONY: opt all clean depend promote compare install installopt
-
 all: $(TARGET)
 opt: opt$(PROFILING)
 
diff --git a/camlp4/ocaml_src/lib/grammar.ml b/camlp4/ocaml_src/lib/grammar.ml
index 9ea0152cb5..4067f50718 100644
--- a/camlp4/ocaml_src/lib/grammar.ml
+++ b/camlp4/ocaml_src/lib/grammar.ml
@@ -464,12 +464,13 @@ let do_recover
 ;;
 
 let strict_parsing = ref false;;
+let strict_parsing_warning = ref false;;
 
 let recover parser_of_tree entry nlevn alevn bp a s son strm =
   if !strict_parsing then raise (Stream.Error (tree_failed entry a s son))
   else
     let _ =
-      if !warning_verbose then
+      if !strict_parsing_warning then
         let msg = tree_failed entry a s son in
         begin try
           let (_, bp2) = !floc bp in
diff --git a/camlp4/ocaml_src/lib/grammar.mli b/camlp4/ocaml_src/lib/grammar.mli
index 34dee1b3eb..becf81a018 100644
--- a/camlp4/ocaml_src/lib/grammar.mli
+++ b/camlp4/ocaml_src/lib/grammar.mli
@@ -156,6 +156,10 @@ val strict_parsing : bool ref;;
    (** Flag to apply strict parsing, without trying to recover errors;
        default = [False] *)
 
+val strict_parsing_warning : bool ref;;
+   (** Flag for displaying a warning when entering recovery mode;
+       default = [False] *)
+
 val print_entry : Format.formatter -> 'te Gramext.g_entry -> unit;;
    (** General printer for all kinds of entries (obj entries) *)
 
diff --git a/camlp4/ocaml_src/lib/plexer.ml b/camlp4/ocaml_src/lib/plexer.ml
index 773eb0349f..57fe1a6820 100644
--- a/camlp4/ocaml_src/lib/plexer.ml
+++ b/camlp4/ocaml_src/lib/plexer.ml
diff --git a/camlp4/ocaml_src/lib/plexer.mli b/camlp4/ocaml_src/lib/plexer.mli
index 477c966b57..b32a580685 100644
--- a/camlp4/ocaml_src/lib/plexer.mli
+++ b/camlp4/ocaml_src/lib/plexer.mli
diff --git a/camlp4/ocaml_src/meta/pa_r.ml b/camlp4/ocaml_src/meta/pa_r.ml
index b59ce124d7..710d08bd59 100644
--- a/camlp4/ocaml_src/meta/pa_r.ml
+++ b/camlp4/ocaml_src/meta/pa_r.ml
diff --git a/stdlib/sys.ml b/stdlib/sys.ml
index a323971284..6e99d760d6 100644
--- a/stdlib/sys.ml
+++ b/stdlib/sys.ml
@@ -78,4 +78,4 @@ let catch_break on =
 
 (* OCaml version string, must be in the format described in sys.mli. *)
 
-let ocaml_version = "3.08.1+5 (2004-11-18)";;
+let ocaml_version = "3.08.1+6 (2004-11-22)";;