Merge branch 'handle-stdout'

[SXSI/xpathcomp.git] / src / logger.ml

diff --git a/src/logger.ml b/src/logger.ml
index 7796b73..05fbc83 100644 (file)
--- a/src/logger.ml
+++ b/src/logger.ml
@@ -3,7 +3,9 @@ open Format
 type t = string
 type level = int
 
-let loggers = [ "top-down-run";
+let loggers = [ "parsing";
+                "indexing";
+                "top-down-run";
                "top-down-approx";
                "result-set";
                "level2-jit";
@@ -38,8 +40,19 @@ let log t l fmt =
     ifprintf !logger_output fmt
 
 let print ppf fmt =
-  pp_open_hovbox ppf 0;
-  kfprintf (fun _ ->
-    pp_close_box ppf ();
-    fprintf ppf "@?")
-    ppf fmt
+  fprintf ppf fmt
+
+let _verbose = ref false
+let set_verbose b = _verbose := b
+let msg ppf fmt =
+  if !_verbose
+  then fprintf ppf fmt
+  else ifprintf ppf fmt
+
+let start_msg ppf s =
+  msg ppf "@[%s" s
+
+let end_msg ppf s =
+  msg ppf "@]%s@?" s
+
+let verbose a b = msg a b