let tactic_terminator = tactical_terminator
let command_terminator = tactical_terminator
-let pp_idents idents = "[" ^ String.concat "; " idents ^ "]"
+let pp_idents idents = "(" ^ String.concat " " idents ^ ")"
let pp_reduction_kind ~term_pp = function
| `Normalize -> "normalize"
| `Whd -> "whd"
let pp_tactic_pattern ~term_pp ~lazy_term_pp (what, hyp, goal) =
+ if what = None && hyp = [] && goal = None then "" else
let what_text =
match what with
| None -> ""
let pp_reduction_kind = pp_reduction_kind ~term_pp in
let pp_tactic_pattern = pp_tactic_pattern ~lazy_term_pp ~term_pp in
function
+ (* Higher order tactics *)
+ | Do (_, count, tac) ->
+ 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
+ | Then (_, tac, tacs) ->
+ sprintf "%s; [%s]" (pp_tactic ~term_pp ~lazy_term_pp tac)
+ (pp_tactics ~term_pp ~lazy_term_pp ~sep:" | " tacs)
+ | First (_, tacs) ->
+ sprintf "tries [%s]" (pp_tactics ~term_pp ~lazy_term_pp ~sep:" | " tacs)
+ | Try (_, tac) -> "try " ^ pp_tactic ~term_pp ~lazy_term_pp tac
+ | Solve (_, tac) ->
+ sprintf "solve [%s]" (pp_tactics ~term_pp ~lazy_term_pp ~sep:" | " tac)
+ | Progress (_, tac) -> "progress " ^ pp_tactic ~term_pp ~lazy_term_pp tac
+ (* First order tactics *)
| Absurd (_, term) -> "absurd" ^ term_pp term
| Apply (_, term) -> "apply " ^ term_pp term
- | ApplyS (_, term) -> "applyS " ^ 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 " ^
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)
| 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)
| Cut (_, ident, term) ->
"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) ->
+ sprintf "decompose%s" (pp_intros_specs (None, names))
| Demodulate _ -> "demodulate"
| Destruct (_, term) -> "destruct " ^ term_pp term
- | Elim (_, term, using, num, idents) ->
- sprintf "elim " ^ term_pp term ^
+ | Elim (_, what, using, pattern, num, idents) ->
+ sprintf "elim %s%s %s%s"
+ (term_pp what)
(match using with None -> "" | Some term -> " using " ^ term_pp term)
- ^ pp_intros_specs (num, idents)
+ (pp_tactic_pattern pattern)
+ (pp_intros_specs (num, idents))
| ElimType (_, term, using, num, idents) ->
sprintf "elim type " ^ term_pp term ^
(match using with None -> "" | Some term -> " using " ^ term_pp term)
| Generalize (_, pattern, ident) ->
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"
(match terms with [] -> "" | _ -> " to " ^ terms_pp ~term_pp terms)
(match ident_opt with None -> "" | Some ident -> " as " ^ ident)
| Left _ -> "left"
- | LetIn (_, term, ident) -> sprintf "let %s in %s" (term_pp term) ident
+ | LetIn (_, term, ident) ->
+ sprintf "letin %s \\def %s" ident (term_pp term)
| Reduce (_, kind, pat) ->
sprintf "%s %s" (pp_reduction_kind kind) (pp_tactic_pattern pat)
| Reflexivity _ -> "reflexivity"
| Replace (_, pattern, t) ->
sprintf "replace %s with %s" (pp_tactic_pattern pattern) (lazy_term_pp t)
- | Rewrite (_, pos, t, pattern) ->
- sprintf "rewrite %s %s %s"
+ | Rewrite (_, pos, t, pattern, names) ->
+ sprintf "rewrite %s %s %s%s"
(if pos = `LeftToRight then ">" else "<")
(term_pp t)
(pp_tactic_pattern pattern)
+ (if names = [] then "" else " as " ^ pp_idents names)
| Right _ -> "right"
| Ring _ -> "ring"
| Split _ -> "split"
| Assume (_, ident , term) -> "assume" ^ ident ^ ":" ^ term_pp term
| Suppose (_, term, ident,term1) -> "suppose" ^ term_pp term ^ "(" ^ ident ^ ")" ^ (match term1 with None -> " " | Some term1 -> term_pp term1)
| Bydone (_, term) -> "by" ^ (match term with None -> "_" | Some term -> term_pp term) ^ "done"
- | By_term_we_proved (_, term, term1, ident, term2) -> "by" ^ (match term with None -> "_" | Some term -> term_pp term) ^ "we proved" ^ term_pp term1 ^ "(" ^ident^ ")" ^
+ | By_term_we_proved (_, term, term1, ident, term2) -> "by" ^ (match term with None -> "_" | Some term -> term_pp term) ^ "we proved" ^ term_pp term1 ^ (match ident with None -> "" | Some ident -> "(" ^ident^ ")") ^
(match term2 with None -> " " | Some term2 -> term_pp term2)
- | We_need_to_prove (_, term, ident, term1) -> "we need to prove" ^ term_pp term ^ "(" ^ ident ^ ")" ^ (match term1 with None -> " " | Some term1 -> term_pp term1)
+ | We_need_to_prove (_, term, ident, term1) -> "we need to prove" ^ term_pp term ^ (match ident with None -> "" | Some ident -> "(" ^ ident ^ ")") ^ (match term1 with None -> " " | Some term1 -> term_pp term1)
+ | We_proceed_by_cases_on (_, term, term1) -> "we proceed by cases on" ^ term_pp term ^ "to prove" ^ term_pp term1
| 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 term -> "obtain " ^ term_pp term) ^ "=" ^ term_pp term1 ^ (match term2 with None -> "_" | Some term2 -> term_pp term2) ^ (match cont with None -> " done" | Some Cic.Anonymous -> "" | Some (Cic.Name id) -> " we proved " ^ id)
+ | 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 "")
| Case (_, id, args) ->
"case" ^ id ^
String.concat " "
(List.map (function (id,term) -> "(" ^ id ^ ": " ^ term_pp term ^ ")")
args)
+and pp_tactics ~term_pp ~lazy_term_pp ~sep tacs =
+ String.concat sep (List.map (pp_tactic ~lazy_term_pp ~term_pp) tacs)
+
let pp_search_kind = function
| `Locate -> "locate"
| `Hint -> "hint"
let pp_macro ~term_pp =
let term_pp = pp_arg ~term_pp in
+ let style_pp = function
+ | Declarative -> ""
+ | Procedural None -> "procedural "
+ | Procedural (Some i) -> sprintf "procedural %u " i
+ in
+ let prefix_pp prefix =
+ if prefix = "" then "" else sprintf " \"%s\"" prefix
+ in
function
(* Whelp *)
| WInstance (_, term) -> "whelp instance " ^ term_pp term
| WElim (_, t) -> "whelp elim " ^ term_pp t
| WMatch (_, term) -> "whelp match " ^ term_pp term
(* real macros *)
- | Check (_, term) -> sprintf "Check %s" (term_pp term)
+ | Check (_, term) -> sprintf "check %s" (term_pp term)
| Hint _ -> "hint"
+ | Inline (_, style, suri, prefix) ->
+ sprintf "inline %s\"%s\"%s" (style_pp style) suri (prefix_pp prefix)
let pp_associativity = function
| Gramext.LeftA -> "left associative"
(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
| Default (_,what,uris) -> pp_default what uris
| Drop _ -> "drop"
| Print (_,s) -> "print " ^ s
| Set (_, name, value) -> 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 _ -> "["
| Pos (_, i) -> 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))
| 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 =
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
- | Command (_, cmd) -> pp_command ~term_pp ~obj_pp cmd ^ "."
+ | Tactic (_, Some tac, punct) ->
+ pp_tactic ~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 ^ ".\n"
let pp_comment ~term_pp ~lazy_term_pp ~obj_pp =
function
- | Note (_,str) -> sprintf "(* %s *)" str
+ | Note (_,"") -> sprintf "\n"
+ | Note (_,str) -> sprintf "(* %s *)\n" str
| Code (_,code) ->
- sprintf "(** %s. **)" (pp_executable ~term_pp ~lazy_term_pp ~obj_pp code)
+ sprintf "(** %s. **)\n" (pp_executable ~term_pp ~lazy_term_pp ~obj_pp code)
let pp_statement ~term_pp ~lazy_term_pp ~obj_pp =
function
projects / helm.git / blobdiff