X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAstPp.ml;h=0b448659484067634158e73c91f023b0c6c02956;hb=bb6a5a4cb3f8bc14764bb31eb46225004ad38cd0;hp=1b73d62de66dc638df803e136309da1e7fc645d3;hpb=cf45f0f766c147324e587522a4a3761b5ac13415;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml
index 1b73d62de..0b4486594 100644
--- a/helm/software/components/grafite/grafiteAstPp.ml
+++ b/helm/software/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
@@ -42,7 +44,7 @@ let pp_reduction_kind ~term_pp = function
   | `Unfold None -> "unfold"
   | `Whd -> "whd"
  
-let pp_tactic_pattern ~term_pp ~lazy_term_pp (what, hyp, goal) = 
+let pp_tactic_pattern ~map_unicode_to_tex ~term_pp ~lazy_term_pp (what, hyp, goal) = 
   if what = None && hyp = [] && goal = None then "" else 
   let what_text =
     match what with
@@ -54,14 +56,17 @@ let pp_tactic_pattern ~term_pp ~lazy_term_pp (what, hyp, goal) =
   let goal_text =
     match goal with
     | None -> ""
-    | Some t -> Printf.sprintf "\\vdash (%s)" (term_pp t) in
-  Printf.sprintf "%sin %s%s" what_text hyp_text goal_text
+    | Some t ->
+       let vdash = if map_unicode_to_tex then "\\vdash" else "⊢" in
+        Printf.sprintf "%s (%s)" vdash (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)
 
@@ -69,24 +74,27 @@ let opt_string_pp = function
    | None -> ""
    | Some what -> what ^ " "
 
-let rec pp_tactic ~term_pp ~lazy_term_pp =
-  let pp_reduction_kind = pp_reduction_kind ~term_pp in
-  let pp_tactic_pattern = pp_tactic_pattern ~lazy_term_pp ~term_pp in
+let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp =
+ 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) ->
-      Printf.sprintf "do %d %s" count (pp_tactic ~term_pp ~lazy_term_pp tac)
-  | Repeat (_, tac) -> "repeat " ^ pp_tactic ~term_pp ~lazy_term_pp tac
-  | Seq (_, tacs) -> pp_tactics ~term_pp ~lazy_term_pp ~sep:"; " tacs
+      Printf.sprintf "do %d %s" count (pp_tactic tac)
+  | Repeat (_, tac) -> "repeat " ^ pp_tactic tac
+  | Seq (_, tacs) -> pp_tactics ~sep:"; " tacs
   | Then (_, tac, tacs) ->
-      Printf.sprintf "%s; [%s]" (pp_tactic ~term_pp ~lazy_term_pp tac)
-        (pp_tactics ~term_pp ~lazy_term_pp ~sep:" | " tacs)
+      Printf.sprintf "%s; [%s]" (pp_tactic tac)
+        (pp_tactics ~sep:" | " tacs)
   | First (_, tacs) ->
-     Printf.sprintf "tries [%s]" (pp_tactics ~term_pp ~lazy_term_pp ~sep:" | " tacs)
-  | Try (_, tac) -> "try " ^ pp_tactic ~term_pp ~lazy_term_pp tac
+     Printf.sprintf "tries [%s]" (pp_tactics ~sep:" | " tacs)
+  | Try (_, tac) -> "try " ^ pp_tactic tac
   | Solve (_, tac) ->
-     Printf.sprintf "solve [%s]" (pp_tactics ~term_pp ~lazy_term_pp ~sep:" | " tac)
-  | Progress (_, tac) -> "progress " ^ pp_tactic ~term_pp ~lazy_term_pp tac
+     Printf.sprintf "solve [%s]" (pp_tactics ~sep:" | " tac)
+  | Progress (_, tac) -> "progress " ^ pp_tactic tac
   (* First order tactics *)
   | Absurd (_, term) -> "absurd" ^ term_pp term
   | Apply (_, term) -> "apply " ^ term_pp term
@@ -94,55 +102,57 @@ 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, times, intro_specs) -> 
+      Printf.sprintf "compose %s%s %s%s" 
+        (if times > 0 then string_of_int times ^ " " else "")
+        (term_pp t1) (match t2 with None -> "" | Some t2 -> "with "^term_pp t2)
+        (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 "")
@@ -183,15 +193,17 @@ let rec pp_tactic ~term_pp ~lazy_term_pp =
   | Thesisbecomes (_, term) -> "the thesis becomes " ^ term_pp term
   | ExistsElim (_, term0, ident, term, ident1, term1) -> "by " ^ (match term0 with None -> "_" | Some term -> term_pp term) ^ "let " ^ ident ^ ":" ^ term_pp term ^ "such that " ^ lazy_term_pp term1 ^ "(" ^ ident1 ^ ")"
   | AndElim (_, term, ident1, term1, ident2, term2) -> "by " ^ term_pp term ^ "we have " ^ term_pp term1 ^ " (" ^ ident1 ^ ") " ^ "and " ^ term_pp term2 ^ " (" ^ ident2 ^ ")" 
-  | RewritingStep (_, term, term1, term2, cont) -> (match term with None -> " " | Some (None,term) -> "conclude " ^ term_pp term | Some (Some name,term) -> "obtain (" ^ name ^ ") " ^ term_pp term) ^ "=" ^ term_pp term1 ^ (match term2 with `Auto params -> "_" ^ String.concat " " (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params)  | `Term term2 -> term_pp term2) ^ (if cont then " done" else "")
+  | RewritingStep (_, term, term1, term2, cont) -> (match term with None -> " " | Some (None,term) -> "conclude " ^ term_pp term | Some (Some name,term) -> "obtain (" ^ name ^ ") " ^ term_pp term) ^ "=" ^ term_pp term1 ^ " by " ^ (match term2 with `Auto params -> "_" ^ String.concat " " (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params)  | `Term term2 -> term_pp term2 | `Proof -> "proof") ^ (if cont then " done" else "")
   | Case (_, id, args) ->
      "case" ^ id ^
        String.concat " "
         (List.map (function (id,term) -> "(" ^ id ^ ": " ^ term_pp term ^  ")")
 	  args)
+ in pp_tactic
 
-and pp_tactics ~term_pp ~lazy_term_pp ~sep tacs =
-  String.concat sep (List.map (pp_tactic ~lazy_term_pp ~term_pp) tacs)
+and pp_tactics ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~sep tacs =
+  String.concat sep
+   (List.map (pp_tactic ~map_unicode_to_tex ~lazy_term_pp ~term_pp) tacs)
 
  let pp_search_kind = function
   | `Locate -> "locate"
@@ -228,6 +240,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) 
 
@@ -290,11 +305,11 @@ let pp_non_punctuation_tactical ~term_pp ~lazy_term_pp =
   | Unfocus _ -> "unfocus"
   | Skip _ -> "skip"
 
-let pp_executable ~term_pp ~lazy_term_pp ~obj_pp =
+let pp_executable ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =
   function
   | Macro (_, macro) -> pp_macro ~term_pp macro ^ "."
   | Tactic (_, Some tac, punct) ->
-      pp_tactic ~lazy_term_pp ~term_pp tac
+      pp_tactic ~map_unicode_to_tex ~lazy_term_pp ~term_pp tac
       ^ pp_punctuation_tactical ~lazy_term_pp ~term_pp punct
   | Tactic (_, None, punct) ->
      pp_punctuation_tactical ~lazy_term_pp ~term_pp punct
@@ -303,12 +318,12 @@ let pp_executable ~term_pp ~lazy_term_pp ~obj_pp =
      ^ pp_punctuation_tactical ~lazy_term_pp ~term_pp punct
   | Command (_, cmd) -> pp_command ~term_pp ~obj_pp cmd ^ "."
                       
-let pp_comment ~term_pp ~lazy_term_pp ~obj_pp =
+let pp_comment ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =
   function
   | Note (_,"") -> Printf.sprintf "\n"
   | Note (_,str) -> Printf.sprintf "\n(* %s *)" str
   | Code (_,code) ->
-      Printf.sprintf "\n(** %s. **)" (pp_executable ~term_pp ~lazy_term_pp ~obj_pp code)
+      Printf.sprintf "\n(** %s. **)" (pp_executable ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp code)
 
 let pp_statement ~term_pp ~lazy_term_pp ~obj_pp =
   function