[pp] Replace `Pp.Tag` by `Ppstyle.tag` = `string list`

This is what has always been used, so it doesn't represent a functional
change.

This is just a preliminary patch, but many more possibilities could be
done wrt tags.

2 files changed, 17 insertions, 25 deletions

diff --git a/printing/ppconstr.ml b/printing/ppconstr.ml
index b16384c600..c772f7be16 100644
--- a/printing/ppconstr.ml
+++ b/printing/ppconstr.ml
@@ -52,7 +52,7 @@ struct
 end
 
 let do_not_tag _ x = x
-let tag t s = Pp.tag (Pp.Tag.inj t Ppstyle.tag) s
+let tag t s = Pp.tag t s
 let tag_keyword     = tag Tag.keyword
 let tag_evar        = tag Tag.evar
 let tag_type        = tag Tag.univ
diff --git a/printing/printmod.ml b/printing/printmod.ml
index dfa66d4376..ac7ff7697b 100644
--- a/printing/printmod.ml
+++ b/printing/printmod.ml
@@ -26,6 +26,20 @@ open Goptions
     the "short" mode or (Some env) in the "rich" one.
 *)
 
+module Tag =
+struct
+  let definition =
+    let style = Terminal.make ~bold:true ~fg_color:`LIGHT_RED () in
+    Ppstyle.make ~style ["module"; "definition"]
+  let keyword =
+    let style = Terminal.make ~bold:true () in
+    Ppstyle.make ~style ["module"; "keyword"]
+end
+
+let tag t s = Pp.tag t s
+let tag_definition s = tag Tag.definition s
+let tag_keyword s = tag Tag.keyword s
+
 let short = ref false
 
 let _ =
@@ -44,14 +58,8 @@ let mk_fake_top =
   let r = ref 0 in
   fun () -> incr r; Id.of_string ("FAKETOP"^(string_of_int !r))
 
-module Make (Taggers : sig
-  val tag_definition : std_ppcmds -> std_ppcmds
-  val tag_keyword : std_ppcmds -> std_ppcmds
-end) =
-struct
-
-let def s = Taggers.tag_definition (str s)
-let keyword s = Taggers.tag_keyword (str s)
+let def s = tag_definition (str s)
+let keyword s = tag_keyword (str s)
 
 let get_new_id locals id =
   let rec get_id l id =
@@ -441,20 +449,4 @@ let print_modtype kn =
       with e when CErrors.noncritical e ->
 	print_signature' true None kn mtb.mod_type))
 
-end
-
-module Tag =
-struct
-  let definition =
-    let style = Terminal.make ~bold:true ~fg_color:`LIGHT_RED () in
-    Ppstyle.make ~style ["module"; "definition"]
-  let keyword =
-    let style = Terminal.make ~bold:true () in
-    Ppstyle.make ~style ["module"; "keyword"]
-end
 
-include Make(struct
-  let tag t s = Pp.tag (Pp.Tag.inj t Ppstyle.tag) s
-  let tag_definition s = tag Tag.definition s
-  let tag_keyword s = tag Tag.keyword s
-end)