| `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)
+ (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 pp_goal_pattern p =
- match p with
- | None -> ""
- | Some p -> pp_term_ast p
- in
- let separator =
- if hyp <> [] then " \vdash " else " "
- in
- "in " ^ pp_hyp_pattern hyp ^ separator ^ pp_goal_pattern goal
+ pp_t t ^ " in " ^ pp_hyp_pattern hyp ^ " \\vdash " ^ pp_term_ast goal
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)
- (pp_pattern where)
-(* | 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
+ | 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
| ElimType (_, term) -> "elim type " ^ pp_term_ast term
| 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, pattern) ->
+ sprintf "fold %s %s" (pp_reduction_kind kind) (pp_pattern pattern)
+ | 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"
+ | IdTac _ -> "id"
| Injection (_, term) -> "injection " ^ pp_term_ast term
| Intros (_, None, []) -> "intro"
| Intros (_, num, idents) ->
(match idents with [] -> "" | idents -> " " ^ pp_idents idents)
| 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 %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 %s"
- (if pos = `Left then "left" else "right") (pp_term_ast t)
+ (if pos = `LeftToRight then ">" else "<")
+ (pp_term_ast t)
(pp_pattern pattern)
| Right _ -> "right"
| Ring _ -> "ring"
| Symmetry _ -> "symmetry"
| Transitivity (_, term) -> "transitivity " ^ pp_term_ast term
| FwdSimpl (_, term) -> sprintf "fwd %s" (pp_term_ast term)
+ | LApply (_, term_opt, term, ident) ->
+ sprintf "lapply %s%s%s" (pp_term_ast term)
+ (match term_opt with None -> "" | Some t -> " to " ^ pp_term_ast t)
+ (match ident with None -> "" | Some id -> " using " ^ id)
let pp_flavour = function
| `Definition -> "Definition"
let pp_command = function
| Qed _ -> "qed"
+ | Drop _ -> "drop"
| Set (_, name, value) -> sprintf "Set \"%s\" \"%s\"" name value
| Coercion (_,_) -> "Coercion IMPLEMENT ME!!!!!"
| Alias (_,s) -> pp_alias s
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
| Then (_, tac, tacs) ->