X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite%2FgrafiteAstPp.ml;h=51b002de9b8d2910734cf0a2d65a73ac30ad896a;hb=936f80cf031a7b034dd70fef49abb90e69f2e680;hp=1b73d62de66dc638df803e136309da1e7fc645d3;hpb=36856cfaefdb29efec317eb072e06a2b13ed8da6;p=helm.git

diff --git a/components/grafite/grafiteAstPp.ml b/components/grafite/grafiteAstPp.ml
index 1b73d62de..51b002de9 100644
--- a/components/grafite/grafiteAstPp.ml
+++ b/components/grafite/grafiteAstPp.ml
@@ -31,7 +31,9 @@ let tactical_terminator = ""
 let tactic_terminator = tactical_terminator
 let command_terminator = tactical_terminator
 
-let pp_idents idents = "(" ^ String.concat " " idents ^ ")"
+let pp_idents idents = 
+   let map = function Some s -> s | None -> "_" in
+   "(" ^ String.concat " " (List.map map idents) ^ ")"
 let pp_hyps idents = String.concat " " idents
 
 let pp_reduction_kind ~term_pp = function
@@ -57,11 +59,11 @@ let pp_tactic_pattern ~term_pp ~lazy_term_pp (what, hyp, goal) =
     | Some t -> Printf.sprintf "\\vdash (%s)" (term_pp t) in
   Printf.sprintf "%sin %s%s" what_text hyp_text goal_text
 
-let pp_intros_specs = function
+let pp_intros_specs s = function
    | None, []         -> ""
-   | Some num, []     -> Printf.sprintf " names %i" num
-   | None, idents     -> Printf.sprintf " names %s" (pp_idents idents)
-   | Some num, idents -> Printf.sprintf " names %i %s" num (pp_idents idents)
+   | Some num, []     -> Printf.sprintf " %s%i" s num
+   | None, idents     -> Printf.sprintf " %s%s" s (pp_idents idents)
+   | Some num, idents -> Printf.sprintf " %s%i %s" s num (pp_idents idents)
 
 let terms_pp ~term_pp terms = String.concat ", " (List.map term_pp terms)
 
@@ -94,55 +96,55 @@ let rec pp_tactic ~term_pp ~lazy_term_pp =
      "applyS " ^ term_pp term ^
       String.concat " " 
         (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params)
-  | Auto (_,params) -> "auto " ^ 
+  | AutoBatch (_,params) -> "auto batch " ^ 
       String.concat " " 
         (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params)
   | Assumption _ -> "assumption"
-  | Cases (_, term, idents) -> Printf.sprintf "cases " ^ term_pp term ^
-      pp_intros_specs (None, idents) 
+  | Cases (_, term, specs) -> Printf.sprintf "cases " ^ term_pp term ^
+      pp_intros_specs "names " specs 
   | Change (_, where, with_what) ->
       Printf.sprintf "change %s with %s" (pp_tactic_pattern where) (lazy_term_pp with_what)
   | Clear (_,ids) -> Printf.sprintf "clear %s" (pp_hyps ids)
   | ClearBody (_,id) -> Printf.sprintf "clearbody %s" (pp_hyps [id])
   | Constructor (_,n) -> "constructor " ^ string_of_int n
+  | Compose (_,t1, t2, intro_specs) -> 
+      Printf.sprintf "compose %s %s%s" (term_pp t1) (term_pp t1)
+        (pp_intros_specs " as " intro_specs)
   | Contradiction _ -> "contradiction"
   | Cut (_, ident, term) ->
      "cut " ^ term_pp term ^
       (match ident with None -> "" | Some id -> " as " ^ id)
   | Decompose (_, names) ->
-      Printf.sprintf "decompose%s" (pp_intros_specs (None, names)) 
+      Printf.sprintf "decompose%s" 
+      (pp_intros_specs "names " (None, names)) 
   | Demodulate _ -> "demodulate"
   | Destruct (_, term) -> "destruct " ^ term_pp term
-  | Elim (_, what, using, pattern, num, idents) ->
+  | Elim (_, what, using, pattern, specs) ->
       Printf.sprintf "elim %s%s %s%s" 
       (term_pp what)
       (match using with None -> "" | Some term -> " using " ^ term_pp term)
       (pp_tactic_pattern pattern)
-      (pp_intros_specs (num, idents)) 
-  | ElimType (_, term, using, num, idents) ->
-      Printf.sprintf "elim type " ^ term_pp term ^
+      (pp_intros_specs "names " specs) 
+  | ElimType (_, term, using, specs) ->
+      Printf.sprintf "elim type %s%s%s" 
+      (term_pp term)
       (match using with None -> "" | Some term -> " using " ^ term_pp term)
-      ^ pp_intros_specs (num, idents)
+      (pp_intros_specs "names " specs)
   | Exact (_, term) -> "exact " ^ term_pp term
   | Exists _ -> "exists"
   | Fold (_, kind, term, pattern) ->
       Printf.sprintf "fold %s %s %s" (pp_reduction_kind kind)
        (lazy_term_pp term) (pp_tactic_pattern pattern)
-  | FwdSimpl (_, hyp, idents) -> 
-      Printf.sprintf "fwd %s%s" hyp 
-        (match idents with [] -> "" | idents -> " as " ^ pp_idents idents)
+  | FwdSimpl (_, hyp, names) -> 
+      Printf.sprintf "fwd %s%s" hyp (pp_intros_specs "names " (None, names))
   | Generalize (_, pattern, ident) ->
      Printf.sprintf "generalize %s%s" (pp_tactic_pattern pattern)
       (match ident with None -> "" | Some id -> " as " ^ id)
   | Fail _ -> "fail"
   | Fourier _ -> "fourier"
   | IdTac _ -> "id"
-  | Intros (_, None, []) -> "intros"
+  | Intros (_, specs) -> Printf.sprintf "intros%s" (pp_intros_specs "" specs)
   | Inversion (_, term) -> "inversion " ^ term_pp term
-  | Intros (_, num, idents) ->
-      Printf.sprintf "intros%s%s"
-        (match num with None -> "" | Some num -> " " ^ string_of_int num)
-        (match idents with [] -> "" | idents -> " " ^ pp_idents idents)
   | LApply (_, linear, level_opt, terms, term, ident_opt) -> 
       Printf.sprintf "lapply %s%s%s%s%s" 
         (if linear then " linear " else "")
@@ -228,6 +230,9 @@ let pp_macro ~term_pp =
   (* real macros *)
   | Check (_, term) -> Printf.sprintf "check %s" (term_pp term)
   | Hint _ -> "hint"
+  | AutoInteractive (_,params) -> "auto " ^ 
+      String.concat " " 
+        (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params)
   | Inline (_, style, suri, prefix) ->  
       Printf.sprintf "inline %s\"%s\"%s" (style_pp style) suri (prefix_pp prefix)