This patch splits pretty printing representation from IO operations.

6 files changed, 10 insertions, 10 deletions

diff --git a/interp/constrintern.ml b/interp/constrintern.ml
index 0de98242ae..4a451634d3 100644
--- a/interp/constrintern.ml
+++ b/interp/constrintern.ml
@@ -1069,7 +1069,7 @@ let alias_of als = match als.alias_ids with
 | id :: _ -> Name id
 
 let message_redundant_alias id1 id2 =
-  msg_warning
+  Feedback.msg_warning
     (str "Alias variable " ++ pr_id id1 ++ str " is merged with " ++ pr_id id2)
 
 (** {6 Expanding notations }
diff --git a/interp/dumpglob.ml b/interp/dumpglob.ml
index 85212b7aba..931fc1ca40 100644
--- a/interp/dumpglob.ml
+++ b/interp/dumpglob.ml
@@ -141,7 +141,7 @@ let interval loc =
 let dump_ref loc filepath modpath ident ty =
   match !glob_output with
   | Feedback ->
-    Pp.feedback (Feedback.GlobRef (loc, filepath, modpath, ident, ty))
+    Feedback.feedback (Feedback.GlobRef (loc, filepath, modpath, ident, ty))
   | NoGlob -> ()
   | _ when not (Loc.is_ghost loc) ->
     let bl,el = interval loc in
@@ -240,7 +240,7 @@ let dump_binding loc id = ()
 
 let dump_def ty loc secpath id =
   if !glob_output = Feedback then
-    Pp.feedback (Feedback.GlobDef (loc, id, secpath, ty))
+    Feedback.feedback (Feedback.GlobDef (loc, id, secpath, ty))
   else
     let bl,el = interval loc in
     dump_string (Printf.sprintf "%s %d:%d %s %s\n" ty bl el secpath id)
diff --git a/interp/implicit_quantifiers.ml b/interp/implicit_quantifiers.ml
index 751b03a4a8..567150a5d6 100644
--- a/interp/implicit_quantifiers.ml
+++ b/interp/implicit_quantifiers.ml
@@ -310,7 +310,7 @@ let implicits_of_glob_constr ?(with_products=true) l =
 	  else
             let () = match bk with
             | Implicit ->
-	       msg_warning (strbrk "Ignoring implicit status of product binder " ++ 
+	       Feedback.msg_warning (strbrk "Ignoring implicit status of product binder " ++ 
 			      pr_name na ++ strbrk " and following binders")
             | _ -> ()
             in []
diff --git a/interp/notation.ml b/interp/notation.ml
index 0a65dfc096..b19fd9e1fe 100644
--- a/interp/notation.ml
+++ b/interp/notation.ml
@@ -184,7 +184,7 @@ let declare_delimiters scope key =
     | None -> scope_map := String.Map.add scope newsc !scope_map
     | Some oldkey when String.equal oldkey key -> ()
     | Some oldkey ->
-	msg_warning
+	Feedback.msg_warning
 	  (str "Overwriting previous delimiting key " ++ str oldkey ++ str " in scope " ++ str scope);
 	scope_map := String.Map.add scope newsc !scope_map
   end;
@@ -192,7 +192,7 @@ let declare_delimiters scope key =
     let oldscope = String.Map.find key !delimiters_map in
     if String.equal oldscope scope then ()
     else begin
-      msg_warning (str "Hiding binding of key " ++ str key ++ str " to " ++ str oldscope);
+      Feedback.msg_warning (str "Hiding binding of key " ++ str key ++ str " to " ++ str oldscope);
       delimiters_map := String.Map.add key scope !delimiters_map
     end
   with Not_found -> delimiters_map := String.Map.add key scope !delimiters_map
@@ -201,7 +201,7 @@ let remove_delimiters scope =
   let sc = find_scope scope in
   let newsc = { sc with delimiters = None } in
   match sc.delimiters with
-    | None -> msg_warning (str "No bound key for scope " ++ str scope ++ str ".")
+    | None -> Feedback.msg_warning (str "No bound key for scope " ++ str scope ++ str ".")
     | Some key ->
        scope_map := String.Map.add scope newsc !scope_map;
        try
@@ -388,7 +388,7 @@ let declare_notation_interpretation ntn scopt pat df =
     let which_scope = match scopt with
     | None -> mt ()
     | Some _ -> str " in scope " ++ str scope in
-    msg_warning (str "Notation " ++ str ntn ++ str " was already used" ++ which_scope)
+    Feedback.msg_warning (str "Notation " ++ str ntn ++ str " was already used" ++ which_scope)
   in
   let sc = { sc with notations = String.Map.add ntn (pat,df) sc.notations } in
   let () = scope_map := String.Map.add scope sc !scope_map in
diff --git a/interp/syntax_def.ml b/interp/syntax_def.ml
index db548ec326..891b64fa11 100644
--- a/interp/syntax_def.ml
+++ b/interp/syntax_def.ml
@@ -93,7 +93,7 @@ let is_verbose_compat () =
 let verbose_compat kn def = function
   | Some v when is_verbose_compat () && Flags.version_strictly_greater v ->
     let act =
-      if !verbose_compat_notations then msg_warning else errorlabstrm ""
+      if !verbose_compat_notations then Feedback.msg_warning else errorlabstrm ""
     in
     let pp_def = match def with
       | [], NRef r -> str " is " ++ pr_global_env Id.Set.empty r
diff --git a/interp/topconstr.ml b/interp/topconstr.ml
index 42538925a8..91099bbb19 100644
--- a/interp/topconstr.ml
+++ b/interp/topconstr.ml
@@ -132,7 +132,7 @@ let fold_constr_expr_with_binders g f n acc = function
 	fold_local_binders g f n'
 	  (fold_local_binders g f n acc t lb) c lb) l acc
   | CCoFix (loc,_,_) ->
-      msg_warning (strbrk "Capture check in multiple binders not done"); acc
+      Feedback.msg_warning (strbrk "Capture check in multiple binders not done"); acc
 
 let free_vars_of_constr_expr c =
   let rec aux bdvars l = function