(* $Id$ *)
-open Printf
-
open GrafiteAst
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
| `Normalize -> "normalize"
| `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
| None -> ""
- | Some t -> sprintf "in match (%s) " (lazy_term_pp t) in
+ | Some t -> Printf.sprintf "in match (%s) " (lazy_term_pp t) in
let hyp_text =
String.concat " "
- (List.map (fun (name, p) -> sprintf "%s:(%s)" name (term_pp p)) hyp) in
+ (List.map (fun (name, p) -> Printf.sprintf "%s:(%s)" name (term_pp p)) hyp) in
let goal_text =
match goal with
| None -> ""
- | Some t -> sprintf "\\vdash (%s)" (term_pp t) in
- 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)
+let pp_terms ~term_pp terms = String.concat ", " (List.map term_pp terms)
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_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) ->
+ 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 tac)
+ (pp_tactics ~sep:" | " tacs)
+ | First (_, tacs) ->
+ Printf.sprintf "tries [%s]" (pp_tactics ~sep:" | " tacs)
+ | Try (_, tac) -> "try " ^ pp_tactic tac
+ | Solve (_, 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 ^ ")" (* FG: rm parentheses *)
+ | 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)
- | 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) -> 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) ->
- sprintf "change %s with %s" (pp_tactic_pattern where) (lazy_term_pp with_what)
- | Clear (_,ids) -> sprintf "clear %s" (pp_idents ids)
- | ClearBody (_,id) -> sprintf "clearbody %s" id
+ 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 ^ ")" ^ (* FG: rm parentheses *)
+ "cut " ^ term_pp term ^
(match ident with None -> "" | Some id -> " as " ^ id)
- | Decompose (_, [], what, names) ->
- sprintf "decompose %s%s" (opt_string_pp what) (pp_intros_specs (None, names))
- | Decompose (_, types, what, names) ->
- let to_ident = function
- | Ident id -> id
- | Type _ -> assert false
- in
- let types = List.rev_map to_ident types in
- sprintf "decompose %s %s%s" (pp_idents types) (opt_string_pp what) (pp_intros_specs (None, names))
+ | Decompose (_, names) ->
+ Printf.sprintf "decompose%s"
+ (pp_intros_specs "names " (None, names))
| Demodulate _ -> "demodulate"
- | Destruct (_, term) -> "destruct " ^ term_pp term
- | Elim (_, term, using, num, idents) ->
- sprintf "elim (" ^ term_pp term ^ ")" ^ (* FG: rm parentheses *)
+ | 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)
(match using with None -> "" | Some term -> " using " ^ term_pp term)
- ^ pp_intros_specs (num, idents)
- | ElimType (_, term, using, num, idents) ->
- sprintf "elim type " ^ term_pp term ^
+ (pp_tactic_pattern pattern)
+ (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) ->
- sprintf "fold %s %s %s" (pp_reduction_kind kind)
+ Printf.sprintf "fold %s %s %s" (pp_reduction_kind kind)
(lazy_term_pp term) (pp_tactic_pattern pattern)
- | FwdSimpl (_, hyp, idents) ->
- 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) ->
- sprintf "generalize %s%s" (pp_tactic_pattern pattern)
+ Printf.sprintf "generalize %s%s" (pp_tactic_pattern pattern)
(match ident with None -> "" | Some id -> " as " ^ id)
- | Goal (_, n) -> "goal " ^ string_of_int n
| 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) ->
- 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) ->
- sprintf "lapply %s%s%s%s%s"
+ Printf.sprintf "lapply %s%s%s%s%s"
(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) ->
- sprintf "letin %s \\def %s" ident ("(" ^ term_pp term ^ ")") (* FG: rm parentheses *)
+ Printf.sprintf "letin %s \\def %s" ident (term_pp term)
| Reduce (_, kind, pat) ->
- sprintf "%s %s" (pp_reduction_kind kind) (pp_tactic_pattern pat)
+ Printf.sprintf "%s %s" (pp_reduction_kind kind) (pp_tactic_pattern pat)
| Reflexivity _ -> "reflexivity"
- | Rename (_, froms, tos) ->
- sprintf "rename %s as %s" (pp_idents froms) (pp_idents tos)
| Replace (_, pattern, t) ->
- sprintf "replace %s with %s" (pp_tactic_pattern pattern) (lazy_term_pp t)
+ Printf.sprintf "replace %s with %s" (pp_tactic_pattern pattern) (lazy_term_pp t)
| Rewrite (_, pos, t, pattern, names) ->
- sprintf "rewrite %s %s %s%s"
+ Printf.sprintf "rewrite %s %s %s%s"
(if pos = `LeftToRight then ">" else "<")
- ("(" ^ term_pp t ^ ")") (* FG: rm parentheses *)
+ (term_pp t)
(pp_tactic_pattern pattern)
(if names = [] then "" else " as " ^ pp_idents names)
| Right _ -> "right"
| Ring _ -> "ring"
| Split _ -> "split"
- | Subst _ -> "subst"
| Symmetry _ -> "symmetry"
| Transitivity (_, term) -> "transitivity " ^ term_pp term
(* Tattiche Aggiunte *)
| We_proceed_by_induction_on (_, term, term1) -> "we proceed by induction on" ^ term_pp term ^ "to prove" ^ term_pp term1
| Byinduction (_, term, ident) -> "by induction hypothesis we know" ^ term_pp term ^ "(" ^ ident ^ ")"
| Thesisbecomes (_, term) -> "the thesis becomes " ^ term_pp term
- | ExistsElim (_, term0, ident, term, ident1, term1) -> "by " ^ term_pp term0 ^ "let " ^ ident ^ ":" ^ term_pp term ^ "such that " ^ term_pp term1 ^ "(" ^ ident1 ^ ")"
+ | 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 ~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"
let pp_macro ~term_pp =
let term_pp = pp_arg ~term_pp in
let style_pp = function
- | Declarative -> ""
- | Procedural -> "procedural "
+ | Declarative -> ""
+ | Procedural None -> "procedural "
+ | Procedural (Some i) -> Printf.sprintf "procedural %u " i
in
let prefix_pp prefix =
- if prefix = "" then "" else sprintf " \"%s\"" prefix
+ if prefix = "" then "" else Printf.sprintf " \"%s\"" prefix
in
function
(* Whelp *)
| WElim (_, t) -> "whelp elim " ^ term_pp t
| WMatch (_, term) -> "whelp match " ^ term_pp term
(* real macros *)
- | Check (_, term) -> sprintf "check %s" (term_pp term)
- | Hint _ -> "hint"
+ | Check (_, term) -> Printf.sprintf "check %s" (term_pp term)
+ | 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)
| Inline (_, style, suri, prefix) ->
- sprintf "inline %s\"%s\"%s" (style_pp style) suri (prefix_pp prefix)
+ Printf.sprintf "inline %s\"%s\"%s" (style_pp style) suri (prefix_pp prefix)
let pp_associativity = function
| Gramext.LeftA -> "left associative"
| Gramext.RightA -> "right associative"
| Gramext.NonA -> "non associative"
-let pp_precedence i = sprintf "with precedence %d" i
+let pp_precedence i = Printf.sprintf "with precedence %d" i
let pp_dir_opt = function
| None -> ""
| Some `RightToLeft -> "< "
let pp_default what uris =
- sprintf "default \"%s\" %s" what
+ Printf.sprintf "default \"%s\" %s" what
(String.concat " " (List.map UriManager.string_of_uri uris))
-let pp_coercion uri do_composites arity =
- 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 ^ "\""
Some r -> " transitivity proved by " ^ term_pp r
| None -> "")
| Print (_,s) -> "print " ^ s
- | Set (_, name, value) -> sprintf "set \"%s\" \"%s\"" name value
+ | Set (_, name, value) -> Printf.sprintf "set \"%s\" \"%s\"" name value
-let rec pp_tactical ~term_pp ~lazy_term_pp =
- let pp_tactic = pp_tactic ~lazy_term_pp ~term_pp in
- let pp_tacticals = pp_tacticals ~lazy_term_pp ~term_pp in
+let pp_punctuation_tactical ~term_pp ~lazy_term_pp =
function
- | Tactic (_, tac) -> pp_tactic tac
- | Do (_, count, tac) ->
- sprintf "do %d %s" count (pp_tactical ~term_pp ~lazy_term_pp tac)
- | Repeat (_, tac) -> "repeat " ^ pp_tactical ~term_pp ~lazy_term_pp tac
- | Seq (_, tacs) -> pp_tacticals ~sep:"; " tacs
- | Then (_, tac, tacs) ->
- sprintf "%s; [%s]" (pp_tactical ~term_pp ~lazy_term_pp tac)
- (pp_tacticals ~sep:" | " tacs)
- | First (_, tacs) -> sprintf "tries [%s]" (pp_tacticals ~sep:" | " tacs)
- | Try (_, tac) -> "try " ^ pp_tactical ~term_pp ~lazy_term_pp tac
- | Solve (_, tac) -> sprintf "solve [%s]" (pp_tacticals ~sep:" | " tac)
- | Progress (_, tac) -> "progress " ^ pp_tactical ~term_pp ~lazy_term_pp tac
-
| Dot _ -> "."
| Semicolon _ -> ";"
| Branch _ -> "["
| Shift _ -> "|"
- | Pos (_, i) -> sprintf "%s:" (String.concat "," (List.map string_of_int i))
+ | Pos (_, i) -> Printf.sprintf "%s:" (String.concat "," (List.map string_of_int i))
| Wildcard _ -> "*:"
| Merge _ -> "]"
+
+let pp_non_punctuation_tactical ~term_pp ~lazy_term_pp =
+ function
| Focus (_, goals) ->
- sprintf "focus %s" (String.concat " " (List.map string_of_int goals))
+ Printf.sprintf "focus %s" (String.concat " " (List.map string_of_int goals))
| Unfocus _ -> "unfocus"
| Skip _ -> "skip"
-and pp_tacticals ~term_pp ~lazy_term_pp ~sep tacs =
- String.concat sep (List.map (pp_tactical~lazy_term_pp ~term_pp) tacs)
-
-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 ^ "."
- | Tactical (_, tac, Some punct) ->
- pp_tactical ~lazy_term_pp ~term_pp tac
- ^ pp_tactical ~lazy_term_pp ~term_pp punct
- | Tactical (_, tac, None) -> pp_tactical ~lazy_term_pp ~term_pp tac
+ | Tactic (_, Some tac, punct) ->
+ 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
+ | NonPunctuationTactical (_, tac, punct) ->
+ pp_non_punctuation_tactical ~lazy_term_pp ~term_pp tac
+ ^ 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 (_,"") -> sprintf "\n"
- | Note (_,str) -> sprintf "(* %s *)\n" str
+ | Note (_,"") -> Printf.sprintf "\n"
+ | Note (_,str) -> Printf.sprintf "\n(* %s *)" str
| Code (_,code) ->
- sprintf "(** %s. **)\n" (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
projects / helm.git / blobdiff