new implementation of the destruct tactic,

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

diff --git a/components/grafite/grafiteAstPp.ml b/components/grafite/grafiteAstPp.ml
index 6dc488816f304193c834271b1273f51033f49e01..eb1a18e5ad00d365ba23e3db088b620ece02ceab 100644 (file)
--- a/components/grafite/grafiteAstPp.ml
+++ b/components/grafite/grafiteAstPp.ml
@@ -75,11 +75,11 @@ let opt_string_pp = function
    | Some what -> what ^ " "
 
 let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp =
-  let pp_tactic = pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp in
-  let pp_tactics = pp_tactics ~map_unicode_to_tex ~term_pp ~lazy_term_pp in
-  let pp_reduction_kind = pp_reduction_kind ~term_pp in
-  let pp_tactic_pattern =
-   pp_tactic_pattern ~map_unicode_to_tex ~lazy_term_pp ~term_pp in
+ let pp_tactics = pp_tactics ~map_unicode_to_tex ~term_pp ~lazy_term_pp in
+ let pp_reduction_kind = pp_reduction_kind ~term_pp in
+ let pp_tactic_pattern =
+  pp_tactic_pattern ~map_unicode_to_tex ~lazy_term_pp ~term_pp in
+ let rec pp_tactic =
   function
   (* Higher order tactics *)
   | Do (_, count, tac) ->
@@ -126,7 +126,8 @@ let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp =
       Printf.sprintf "decompose%s" 
       (pp_intros_specs "names " (None, names)) 
   | Demodulate _ -> "demodulate"
-  | Destruct (_, term) -> "destruct " ^ term_pp term
+  | Destruct (_, None) -> "destruct" 
+  | Destruct (_, Some term) -> "destruct " ^ term_pp term
   | Elim (_, what, using, pattern, specs) ->
       Printf.sprintf "elim %s%s %s%s" 
       (term_pp what)
@@ -177,7 +178,6 @@ let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp =
   | Right _ -> "right"
   | Ring _ -> "ring"
   | Split _ -> "split"
-  | Subst _ -> "subst"
   | Symmetry _ -> "symmetry"
   | Transitivity (_, term) -> "transitivity " ^ term_pp term
   (* Tattiche Aggiunte *)
@@ -199,6 +199,7 @@ let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp =
        String.concat " "
         (List.map (function (id,term) -> "(" ^ id ^ ": " ^ term_pp term ^  ")")
          args)
+ in pp_tactic
 
 and pp_tactics ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~sep tacs =
   String.concat sep
@@ -238,7 +239,8 @@ let pp_macro ~term_pp =
   | WMatch (_, term) -> "whelp match " ^ term_pp term
   (* real macros *)
   | Check (_, term) -> Printf.sprintf "check %s" (term_pp term)
-  | Hint _ -> "hint"
+  | Hint (_, true) -> "hint rewrite"
+  | Hint (_, false) -> "hint"
   | AutoInteractive (_,params) -> "auto " ^ 
       String.concat " " 
         (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params)
@@ -261,13 +263,15 @@ let pp_default what uris =
   Printf.sprintf "default \"%s\" %s" what
     (String.concat " " (List.map UriManager.string_of_uri uris))
 
-let pp_coercion uri do_composites arity =
-   Printf.sprintf "coercion %s %d (* %s *)" (UriManager.string_of_uri uri) arity
-     (if do_composites then "compounds" else "no compounds")
+let pp_coercion uri do_composites arity saturations=
+   Printf.sprintf "coercion %s %d %d (* %s *)"
+    (UriManager.string_of_uri uri) arity saturations
+    (if do_composites then "compounds" else "no compounds")
     
 let pp_command ~term_pp ~obj_pp = function
   | Index (_,_,uri) -> "Indexing " ^ UriManager.string_of_uri uri
-  | Coercion (_, uri, do_composites, i) -> pp_coercion uri do_composites i
+  | Coercion (_, uri, do_composites, i, j) ->
+     pp_coercion uri do_composites i j
   | Default (_,what,uris) -> pp_default what uris
   | Drop _ -> "drop"
   | Include (_,path) -> "include \"" ^ path ^ "\""