| 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)
+let pp_terms ~term_pp terms = String.concat ", " (List.map term_pp terms)
let opt_string_pp = function
| None -> ""
| Some what -> what ^ " "
+
+let pp_auto_params ~term_pp (univ, params) =
+ String.concat " "
+ (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params) ^
+ if univ <> [] then
+ (if params <> [] then " " else "") ^ "by " ^
+ String.concat " " (List.map term_pp univ)
+ else ""
+;;
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_terms = pp_terms ~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) ->
| Absurd (_, term) -> "absurd" ^ term_pp term
| Apply (_, term) -> "apply " ^ term_pp term
| ApplyS (_, term, params) ->
- "applyS " ^ term_pp term ^
- String.concat " "
- (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params)
- | AutoBatch (_,params) -> "auto batch " ^
- String.concat " "
- (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params)
+ "applyS " ^ term_pp term ^ pp_auto_params ~term_pp params
+ | AutoBatch (_,params) -> "autobatch " ^
+ pp_auto_params ~term_pp params
| Assumption _ -> "assumption"
| Cases (_, term, specs) -> Printf.sprintf "cases " ^ term_pp term ^
pp_intros_specs "names " specs
| Decompose (_, names) ->
Printf.sprintf "decompose%s"
(pp_intros_specs "names " (None, names))
- | Demodulate _ -> "demodulate"
- | Destruct (_, term) -> "destruct " ^ term_pp term
+ | Demodulate (_, params) -> "demodulate " ^ pp_auto_params ~term_pp params
+ | Destruct (_, None) -> "destruct"
+ | Destruct (_, Some terms) -> "destruct " ^ pp_terms terms
| Elim (_, what, using, pattern, specs) ->
Printf.sprintf "elim %s%s %s%s"
(term_pp what)
(if linear then " linear " else "")
(match level_opt with None -> "" | Some i -> " depth = " ^ string_of_int i ^ " ")
(term_pp term)
- (match terms with [] -> "" | _ -> " to " ^ terms_pp ~term_pp terms)
+ (match terms with [] -> "" | _ -> " to " ^ pp_terms terms)
(match ident_opt with None -> "" | Some ident -> " as " ^ ident)
| Left _ -> "left"
| LetIn (_, term, ident) ->
| Right _ -> "right"
| Ring _ -> "ring"
| Split _ -> "split"
- | Subst _ -> "subst"
| Symmetry _ -> "symmetry"
| Transitivity (_, term) -> "transitivity " ^ term_pp term
(* Tattiche Aggiunte *)
| 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 ^ " 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 "")
+ | 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 -> pp_auto_params ~term_pp params
+ | `Term term2 -> " exact " ^ term_pp term2
+ | `Proof -> " proof"
+ | `SolveWith term -> " using " ^ term_pp term)
+ ^ (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 ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~sep tacs =
String.concat sep
| WMatch (_, term) -> "whelp match " ^ term_pp term
(* 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)
+ | Hint (_, true) -> "hint rewrite"
+ | Hint (_, false) -> "hint"
+ | AutoInteractive (_,params) -> "auto " ^ pp_auto_params ~term_pp params
| Inline (_, style, suri, prefix) ->
Printf.sprintf "inline %s\"%s\"%s" (style_pp style) suri (prefix_pp prefix)
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 "" else "nocomposites")
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 ^ "\""
projects / helm.git / blobdiff