Merge branch 'pretty-print'

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

diff --git a/src/logger.ml b/src/logger.ml
index e99fd1f..05fbc83 100644 (file)
--- a/src/logger.ml
+++ b/src/logger.ml
@@ -40,18 +40,19 @@ let log t l fmt =
     ifprintf !logger_output fmt
 
 let print ppf fmt =
-  kfprintf (fun _ ->
-    fprintf ppf "@?")
-    ppf fmt
+  fprintf ppf fmt
 
 let _verbose = ref false
 let set_verbose b = _verbose := b
-let verbose ppf fmt =
-  if !_verbose then begin
-    kfprintf (fun _ ->
-      fprintf ppf "@?")
-      ppf fmt
-  end else 
-  ikfprintf (fun _ ->
-    fprintf ppf "@?")
-    ppf fmt
+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