whelp locate now accepts * and ?

[helm.git] / components / grafite / grafiteAstPp.ml

diff --git a/components/grafite/grafiteAstPp.ml b/components/grafite/grafiteAstPp.ml
index 8bd5c96f15862677345877c9487e4ce6a96c5501..de6200e0925134bdcc02938a0cdf83b3105923c8 100644 (file)
--- a/components/grafite/grafiteAstPp.ml
+++ b/components/grafite/grafiteAstPp.ml
@@ -78,13 +78,11 @@ let rec pp_tactic ~term_pp ~lazy_term_pp =
       sprintf "change %s with %s" (pp_tactic_pattern where) (lazy_term_pp with_what)
   | Clear (_,id) -> sprintf "clear %s" id
   | ClearBody (_,id) -> sprintf "clearbody %s" id
-  | Compare (_,term) -> "compare " ^ term_pp term
   | Constructor (_,n) -> "constructor " ^ string_of_int n
   | Contradiction _ -> "contradiction"
   | Cut (_, ident, term) ->
      "cut " ^ term_pp term ^
       (match ident with None -> "" | Some id -> " as " ^ id)
-  | DecideEquality _ -> "decide equality"
   | Decompose (_, [], what, names) ->
       sprintf "decompose %s%s" what (pp_intros_specs (None, names)) 
   | Decompose (_, types, what, names) ->
@@ -156,11 +154,21 @@ 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
-  | WLocate (_, s) -> "whelp locate " ^ s
+  | WLocate (_, s) -> "whelp locate \"" ^ s ^ "\""
   | WElim (_, t) -> "whelp elim " ^ term_pp t
   | WMatch (_, term) -> "whelp match " ^ term_pp term
   (* real macros *)