fixed demodulation of goal

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

diff --git a/components/grafite/grafiteAstPp.ml b/components/grafite/grafiteAstPp.ml
index 8bd5c96f15862677345877c9487e4ce6a96c5501..ab27e853e300843a9605b8a05a1d8bb1795f69cb 100644 (file)
--- a/components/grafite/grafiteAstPp.ml
+++ b/components/grafite/grafiteAstPp.ml
@@ -72,19 +72,18 @@ let rec pp_tactic ~term_pp ~lazy_term_pp =
   function
   | Absurd (_, term) -> "absurd" ^ term_pp term
   | Apply (_, term) -> "apply " ^ term_pp term
+  | Auto (_,_,_,Some kind,_) -> "auto " ^ kind
   | Auto _ -> "auto"
   | Assumption _ -> "assumption"
   | Change (_, where, with_what) ->
       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) ->
@@ -119,7 +118,7 @@ let rec pp_tactic ~term_pp ~lazy_term_pp =
   | Fourier _ -> "fourier"
   | IdTac _ -> "id"
   | Injection (_, term) -> "injection " ^ term_pp term
-  | Intros (_, None, []) -> "intro"
+  | Intros (_, None, []) -> "intros"
   | Inversion (_, term) -> "inversion " ^ term_pp term
   | Intros (_, num, idents) ->
       sprintf "intros%s%s"
@@ -156,11 +155,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 *)
@@ -194,7 +203,7 @@ let pp_coercion uri do_composites =
      (if do_composites then "compounds" else "no compounds")
     
 let pp_command ~obj_pp = function
-  | Include (_,path) -> "include " ^ path
+  | Include (_,path) -> "include \"" ^ path ^ "\""
   | Qed _ -> "qed"
   | Drop _ -> "drop"
   | Set (_, name, value) -> sprintf "set \"%s\" \"%s\"" name value
@@ -235,12 +244,12 @@ and pp_tacticals ~term_pp ~lazy_term_pp ~sep tacs =
 
 let pp_executable ~term_pp ~lazy_term_pp ~obj_pp =
   function
-  | Macro (_, macro) -> pp_macro ~term_pp macro
+  | Macro (_, macro) -> pp_macro ~term_pp macro ^ "."
   | Tactical (_, tac, Some punct) ->
       pp_tactical ~lazy_term_pp ~term_pp tac
       ^ pp_tactical ~lazy_term_pp ~term_pp punct
   | Tactical (_, tac, None) -> pp_tactical ~lazy_term_pp ~term_pp tac
-  | Command (_, cmd) -> pp_command ~obj_pp cmd
+  | Command (_, cmd) -> pp_command ~obj_pp cmd ^ "."
                       
 let pp_comment ~term_pp ~lazy_term_pp ~obj_pp =
   function
@@ -250,5 +259,5 @@ let pp_comment ~term_pp ~lazy_term_pp ~obj_pp =
 
 let pp_statement ~term_pp ~lazy_term_pp ~obj_pp =
   function
-  | Executable (_, ex) -> pp_executable ~lazy_term_pp ~term_pp ~obj_pp ex
+  | Executable (_, ex) -> pp_executable ~lazy_term_pp ~term_pp ~obj_pp ex 
   | Comment (_, c) -> pp_comment ~term_pp ~lazy_term_pp ~obj_pp c