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
| `Normalize -> "normalize"
| 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)
"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_idents ids)
- | ClearBody (_,id) -> Printf.sprintf "clearbody %s" id
+ | 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 "")
| 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 " "
(* 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)
let pp_comment ~term_pp ~lazy_term_pp ~obj_pp =
function
| Note (_,"") -> Printf.sprintf "\n"
- | Note (_,str) -> Printf.sprintf "(* %s *)\n" str
+ | Note (_,str) -> Printf.sprintf "\n(* %s *)" str
| Code (_,code) ->
- Printf.sprintf "(** %s. **)\n" (pp_executable ~term_pp ~lazy_term_pp ~obj_pp code)
+ Printf.sprintf "\n(** %s. **)" (pp_executable ~term_pp ~lazy_term_pp ~obj_pp code)
let pp_statement ~term_pp ~lazy_term_pp ~obj_pp =
function