whelp macros have now () around args

diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml
index d6502aca80dae87f36db7c05f923e98c6eeb8042..6b618c6ac46ad7c2efcc00e75ffedb031147f721 100644 (file)
--- a/helm/software/components/grafite/grafiteAstPp.ml
+++ b/helm/software/components/grafite/grafiteAstPp.ml
@@ -154,7 +154,17 @@ let pp_search_kind = function
   | `Elim -> "elim"
   | `Instance -> "instance"
 
-let pp_macro ~term_pp = function 
+let pp_arg ~term_pp arg = 
+  let s = term_pp arg in
+   if s = "" || (s.[0] = '(' && s.[String.length s - 1] = ')') then
+     (* _nice_ heuristic *)
+     s
+   else
+     "(" ^ s ^ ")"
+  
+let pp_macro ~term_pp = 
+  let term_pp = pp_arg ~term_pp in
+  function 
   (* Whelp *)
   | WInstance (_, term) -> "whelp instance " ^ term_pp term
   | WHint (_, t) -> "whelp hint " ^ term_pp t