let tactical_terminator = "."
let tactic_terminator = tactical_terminator
let command_terminator = tactical_terminator
-let tactical_separator = ";"
let pp_term_ast term = CicAstPp.pp_term term
let pp_term_cic term = CicPp.ppterm term
let pp_idents idents = "[" ^ String.concat "; " idents ^ "]"
+let pp_terms_ast terms = String.concat ", " (List.map pp_term_ast terms)
+
let pp_reduction_kind = function
| `Reduce -> "reduce"
| `Simpl -> "simplify"
| `Normalize -> "normalize"
-let pp_pattern (hyp, goal) =
+let pp_pattern (t, hyp, goal) =
let pp_hyp_pattern l =
String.concat "; "
- (List.map (fun (name, p) -> sprintf "%s : %s" name (pp_term_ast p)) l)
- in
- let pp_goal_pattern p =
- match p with
- | None -> ""
- | Some p -> pp_term_ast p
+ (List.map (fun (name, p) -> sprintf "%s : %s" name (pp_term_ast p)) l) in
+ let pp_t t =
+ match t with
+ None -> ""
+ | Some t -> pp_term_ast t
in
- let separator =
- if hyp <> [] then " \vdash " else " "
- in
- pp_hyp_pattern hyp ^ separator ^ pp_goal_pattern goal
+ pp_t t ^ " in " ^ pp_hyp_pattern hyp ^ " \\vdash " ^ pp_term_ast goal
+
+let pp_intros_specs = 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)
+
let rec pp_tactic = function
| Absurd (_, term) -> "absurd" ^ pp_term_ast term
| Apply (_, term) -> "apply " ^ pp_term_ast term
| Auto _ -> "auto"
| Assumption _ -> "assumption"
- | Change (_, t1, t2, where) ->
- sprintf "change %s with %s%s" (pp_term_ast t1) (pp_term_ast t2)
- (match where with None -> "" | Some ident -> "in " ^ ident)
-(* | Change_pattern (_, _, _, _) -> assert false (* TODO *) *)
+ | Change (_, where, with_what) ->
+ sprintf "change %s with %s" (pp_pattern where) (pp_term_ast with_what)
+ | Clear (_,id) -> sprintf "clear %s" id
+ | ClearBody (_,id) -> sprintf "clearbody %s" id
+ | Compare (_,term) -> "compare " ^ pp_term_ast term
+ | Constructor (_,n) -> "constructor " ^ string_of_int n
| Contradiction _ -> "contradiction"
- | Cut (_, term) -> "cut " ^ pp_term_ast term
- | Decompose (_, ident, principles) ->
- sprintf "decompose %s %s" (pp_idents principles) ident
+ | Cut (_, ident, term) ->
+ "cut " ^ pp_term_ast term ^
+ (match ident with None -> "" | Some id -> " as " ^ id)
+ | DecideEquality _ -> "decide equality"
+ | Decompose (_, term) ->
+ sprintf "decompose %s" (pp_term_ast term)
| Discriminate (_, term) -> "discriminate " ^ pp_term_ast term
- | Elim (_, term, using) ->
+ | Elim (_, term, using, num, idents) ->
sprintf "elim " ^ pp_term_ast term ^
(match using with None -> "" | Some term -> " using " ^ pp_term_ast term)
- | ElimType (_, term) -> "elim type " ^ pp_term_ast term
+ ^ pp_intros_specs (num, idents)
+ | ElimType (_, term, using, num, idents) ->
+ sprintf "elim type " ^ pp_term_ast term ^
+ (match using with None -> "" | Some term -> " using " ^ pp_term_ast term)
+ ^ pp_intros_specs (num, idents)
| Exact (_, term) -> "exact " ^ pp_term_ast term
| Exists _ -> "exists"
- | Fold (_, kind, term) ->
- sprintf "fold %s %s" (pp_reduction_kind kind) (pp_term_ast term)
- | Generalize (_, term, pattern) ->
- sprintf "generalize %s %s" (pp_term_ast term) (pp_pattern pattern)
+ | Fold (_, kind, term, pattern) ->
+ sprintf "fold %s %s %s" (pp_reduction_kind kind)
+ (pp_term_ast term) (pp_pattern pattern)
+ | FwdSimpl (_, hyp, idents) ->
+ sprintf "fwd %s%s" hyp
+ (match idents with [] -> "" | idents -> " " ^ pp_idents idents)
+ | Generalize (_, pattern, ident) ->
+ sprintf "generalize %s%s" (pp_pattern pattern)
+ (match ident with None -> "" | Some id -> " as " ^ id)
| Goal (_, n) -> "goal " ^ string_of_int n
+ | Fail _ -> "fail"
| Fourier _ -> "fourier"
- | Injection (_, ident) -> "injection " ^ ident
+ | IdTac _ -> "id"
+ | Injection (_, term) -> "injection " ^ pp_term_ast term
| Intros (_, None, []) -> "intro"
| 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 (_, level_opt, terms, term, ident_opt) ->
+ sprintf "lapply %s%s%s%s"
+ (match level_opt with None -> "" | Some i -> " depth = " ^ string_of_int i ^ " ")
+ (pp_term_ast term)
+ (match terms with [] -> "" | _ -> " to " ^ pp_terms_ast terms)
+ (match ident_opt with None -> "" | Some ident -> " using " ^ ident)
| Left _ -> "left"
| LetIn (_, term, ident) -> sprintf "let %s in %s" (pp_term_ast term) ident
-(* | Reduce (_, kind, None) *)
-(* | Reduce (_, kind, Some ([], `Goal)) -> pp_reduction_kind kind *)
-(* | Reduce (_, kind, Some ([], `Everywhere)) -> *)
-(* sprintf "%s in hyp" (pp_reduction_kind kind) *)
-(* | Reduce (_, kind, Some (terms, `Goal)) -> *)
-(* sprintf "%s %s" (pp_reduction_kind kind) *)
-(* (String.concat ", " (List.map pp_term_ast terms)) *)
-(* | Reduce (_, kind, Some (terms, `Everywhere)) -> *)
-(* sprintf "%s in hyp %s" (pp_reduction_kind kind) *)
-(* (String.concat ", " (List.map pp_term_ast terms)) *)
| Reduce (_, kind, pat) ->
- sprintf "%s in %s" (pp_reduction_kind kind) (pp_pattern pat)
+ sprintf "%s %s" (pp_reduction_kind kind) (pp_pattern pat)
| Reflexivity _ -> "reflexivity"
- | Replace (_, t1, t2) ->
- sprintf "replace %s with %s" (pp_term_ast t1) (pp_term_ast t2)
-(* | Replace_pattern (_, _, _) -> assert false (* TODO *) *)
+ | Replace (_, pattern, t) ->
+ sprintf "replace %s with %s" (pp_pattern pattern) (pp_term_ast t)
| Rewrite (_, pos, t, pattern) ->
- sprintf "rewrite %s %s in %s"
- (if pos = `Left then "left" else "right") (pp_term_ast t)
+ sprintf "rewrite %s %s %s"
+ (if pos = `LeftToRight then ">" else "<")
+ (pp_term_ast t)
(pp_pattern pattern)
| Right _ -> "right"
| Ring _ -> "ring"
| Split _ -> "split"
| Symmetry _ -> "symmetry"
| Transitivity (_, term) -> "transitivity " ^ pp_term_ast term
- | FwdSimpl (_, ident) -> sprintf "fwd %s" ident
let pp_flavour = function
| `Definition -> "Definition"
let pp_command = function
+ | Include (_,path) -> "include " ^ path
| Qed _ -> "qed"
- | Set (_, name, value) -> sprintf "Set \"%s\" \"%s\"" name value
- | Coercion (_,_) -> "Coercion IMPLEMENT ME!!!!!"
+ | Drop _ -> "drop"
+ | Set (_, name, value) -> sprintf "set \"%s\" \"%s\"" name value
+ | Coercion (_,term) -> sprintf "coercion %s" (pp_term_ast term)
| Alias (_,s) -> pp_alias s
| Obj (_,obj) -> pp_obj obj
+ | Default (_,what,uris) ->
+ sprintf "default \"%s\" %s" what
+ (String.concat " " (List.map UriManager.string_of_uri uris))
let rec pp_tactical = function
| Tactic (_, tac) -> pp_tactic tac
-
- | Fail _ -> "fail"
| Do (_, count, tac) -> sprintf "do %d %s" count (pp_tactical tac)
- | IdTac _ -> "id"
| Repeat (_, tac) -> "repeat " ^ pp_tactical tac
- | Seq (_, tacs) -> pp_tacticals tacs
+ | Seq (_, tacs) -> pp_tacticals ~sep:"; " tacs
| Then (_, tac, tacs) ->
- sprintf "%s [%s]" (pp_tactical tac) (pp_tacticals tacs)
- | Tries (_, tacs) -> sprintf "tries [%s]" (pp_tacticals tacs)
+ sprintf "%s; [%s]" (pp_tactical tac) (pp_tacticals ~sep:" | " tacs)
+ | First (_, tacs) -> sprintf "tries [%s]" (pp_tacticals ~sep:" | " tacs)
| Try (_, tac) -> "try " ^ pp_tactical tac
+ | Solve (_, tac) -> sprintf "solve [%s]" (pp_tacticals ~sep:" | " tac)
-and pp_tacticals tacs =
- String.concat (tactical_separator ^ " ") (List.map pp_tactical tacs)
+and pp_tacticals ~sep tacs =
+ String.concat sep (List.map pp_tactical tacs)
let pp_tactical tac = pp_tactical tac ^ tactical_terminator
let pp_tactic tac = pp_tactic tac ^ tactic_terminator
let pp_statement = function
| Executable (_, ex) -> pp_executable ex
| Comment (_, c) -> pp_comment c
+
+let pp_cic_command = function
+ | Include (_,path) -> "include " ^ path
+ | Qed _ -> "qed"
+ | Drop _ -> "drop"
+ | Coercion (_,term) -> sprintf "coercion %s" (CicPp.ppterm term)
+ | Set (_, _, _)
+ | Alias (_,_)
+ | Default (_,_,_)
+ | Obj (_,_) -> assert false (* not implemented *)
projects / helm.git / blobdiff