| B.Text (attrs, t) -> B.Text (((Some "helm", "xref", id) :: attrs), t)
| _ -> assert false (* TODO, add_xref is meaningful for all boxes *)
-let rec justification term2pres p =
- if ((p.Con.proof_conclude.Con.conclude_method = "Exact") or
- ((p.Con.proof_context = []) &
- (p.Con.proof_apply_context = []) &
- (p.Con.proof_conclude.Con.conclude_method = "Apply"))) then
+let rec justification ~ignore_atoms term2pres p =
+ if p.Con.proof_conclude.Con.conclude_method = "Exact" &&
+ ignore_atoms
+ then
+ [], None
+ else if
+ (p.Con.proof_conclude.Con.conclude_method = "Exact" && not ignore_atoms) ||
+ (p.Con.proof_context = [] &&
+ p.Con.proof_apply_context = [] &&
+ p.Con.proof_conclude.Con.conclude_method = "Apply")
+ then
let pres_args =
- make_args_for_apply term2pres p.Con.proof_conclude.Con.conclude_args in
- B.H([],
- (B.b_kw "by")::B.b_space::
- B.Text([],"(")::pres_args@[B.Text([],")")]), None
+ make_args_for_apply term2pres p.Con.proof_conclude.Con.conclude_args
+ in
+ [B.H([],
+ (B.b_kw "by")::B.b_space::
+ B.Text([],"(")::pres_args@[B.Text([],")")])], None
else
- B.H([],[B.b_kw "by"; B.b_space; B.b_kw "proof"]),
+ [B.H([],[B.b_kw "by"; B.b_space; B.b_kw "proof"])],
Some (B.b_toggle [B.b_kw "proof";B.indent (proof2pres true term2pres p)])
and proof2pres ?skip_initial_lambdas is_top_down term2pres p =
- let rec proof2pres ?skip_initial_lambdas_internal is_top_down p omit_dot =
+ let rec proof2pres ?skip_initial_lambdas_internal is_top_down p in_bu_conversion =
let indent =
let is_decl e =
(match e with
let body =
let presconclude =
conclude2pres
- ?skip_initial_lambdas_internal:
- (match skip_initial_lambdas_internal with
- Some (`Later s) -> Some (`Now s)
- | _ -> None)
- is_top_down
- p.Con.proof_name p.Con.proof_conclude indent omit_conclusion
- omit_dot in
+ ?skip_initial_lambdas_internal:
+ (match skip_initial_lambdas_internal with
+ Some (`Later s) -> Some (`Now s)
+ | _ -> None)
+ is_top_down p.Con.proof_name p.Con.proof_conclude indent
+ omit_conclusion in_bu_conversion in
let presacontext =
acontext2pres
- (p.Con.proof_conclude.Con.conclude_method = "BU_Conversion")
- p.Con.proof_apply_context
- presconclude indent
+ (if p.Con.proof_conclude.Con.conclude_method = "BU_Conversion" then
+ is_top_down
+ else
+ false)
+ p.Con.proof_apply_context
+ presconclude indent
(p.Con.proof_conclude.Con.conclude_method = "BU_Conversion")
in
context2pres
| _ -> p.Con.proof_context)
presacontext
in
+(*
+let body = B.V([],[B.b_kw ("(*<<" ^ p.Con.proof_conclude.Con.conclude_method ^ (if is_top_down then "(TD)" else "(NTD)") ^ "*)"); body; B.b_kw "(*>>*)"]) in
+*)
match p.Con.proof_name with
None -> body
| Some name ->
[] -> in_bu_conversion
| p::_ -> p.Con.proof_conclude.Con.conclude_method = "BU_Conversion"
in
- let hd =
- if indent then
- B.indent (proof2pres is_top_down p in_bu_conversion)
- else
- proof2pres is_top_down p in_bu_conversion
- in
- B.V([Some "helm","xref",p.Con.proof_id],
+ let hd = proof2pres is_top_down p in_bu_conversion in
+ let hd = if indent then B.indent hd else hd in
+ B.V([Some "helm","xref",p.Con.proof_id],
[B.H([Some "helm","xref","ace_"^p.Con.proof_id],[hd]);
continuation])
in aux ac
- and conclude2pres ?skip_initial_lambdas_internal is_top_down name conclude indent omit_conclusion omit_dot =
+ and conclude2pres ?skip_initial_lambdas_internal is_top_down name conclude indent omit_conclusion in_bu_conversion =
let tconclude_body =
match conclude.Con.conclude_conclusion with
Some t (*when not omit_conclusion or
B.H([], [B.b_kw "done" ; B.Text([],".") ])
else
B.b_hv []
- ((if not is_top_down || omit_dot then
+ ((if not is_top_down || in_bu_conversion then
(make_concl "we proved" concl) ::
if not is_top_down then
let name = get_name ~default:"previous" name in
[B.b_space; B.Text([],"(" ^ name ^ ")")]
else []
else [B.b_kw "done"]
- ) @ if not omit_dot then [B.Text([],".")] else [])
+ ) @ if not in_bu_conversion then [B.Text([],".")] else [])
in
B.V ([], prequel @ [conclude_body; ann_concl])
| _ -> conclude_aux ?skip_initial_lambdas_internal is_top_down conclude
|| conclude.Con.conclude_method = "RewriteRL" then
let justif1,justif2 =
(match (List.nth conclude.Con.conclude_args 6) with
- Con.ArgProof p -> justification term2pres p
+ Con.ArgProof p -> justification ~ignore_atoms:true term2pres p
| _ -> assert false) in
let justif =
match justif2 with
None -> justif1
- | Some j -> j
+ | Some j -> [j]
+ in
+ let index_term1, index_term2 =
+ if (conclude.Con.conclude_method = "RewriteLR" && is_top_down)
+ || (conclude.Con.conclude_method = "RewriteRL" && not is_top_down)
+ then 2,5 else 5,2
in
let term1 =
- (match List.nth conclude.Con.conclude_args 2 with
+ (match List.nth conclude.Con.conclude_args index_term1 with
Con.Term (_,t) -> term2pres t
| _ -> assert false) in
let term2 =
- (match List.nth conclude.Con.conclude_args 5 with
+ (match List.nth conclude.Con.conclude_args index_term2 with
Con.Term (_,t) -> term2pres t
| _ -> assert false) in
+ let justif =
+ match justif with
+ [] -> []
+ | _ ->
+ justif @
+ [B.V([],
+ [B.b_kw "we proved (" ;
+ term1 ;
+ B.b_kw "=" ;
+ term2; B.b_kw ") (equality)."])]
+ in
(*
B.V ([],
B.H ([],[
B.b_space; justif1])::
match justif2 with None -> [] | Some j -> [B.indent j])
*)
- if (conclude.Con.conclude_method = "RewriteLR" && is_top_down)
- || (conclude.Con.conclude_method = "RewriteRL" && not is_top_down) then
- B.V([], [justif ; B.H([],[B.b_kw "we proved (" ; term1 ; B.b_kw "=" ; term2; B.b_kw ") (equality)."]); B.b_kw "by _"])
- else
- B.V([], [justif ; B.H([],[B.b_kw "we proved (" ; term2 ; B.b_kw "=" ; term1; B.b_kw ") (equality)."]); B.b_kw "by _"])
-(*CSC: bad idea
- B.V([], [B.H([],[B.b_kw "obtain fooo " ; term2 ; B.b_kw "=" ; term1; B.b_kw "by" ; B.b_kw "proof" ; B.Text([],"."); justif1])]) *)
+ B.V([], justif @ [B.b_kw "by _"])
else if conclude.Con.conclude_method = "Eq_chain" then
let justification p =
- let j1,j2 = justification term2pres p in
- [j1], match j2 with Some j -> [j] | None -> []
+ let j1,j2 = justification ~ignore_atoms:false term2pres p in
+ j1, match j2 with Some j -> [j] | None -> []
in
let rec aux args =
match args with
| Con.Term (_,t) -> t
| _ -> assert false
in
- B.HOV([],[B.b_kw "conclude";B.b_space;term2pres hd; (* B.b_space; *)
- B.V ([],aux (List.tl conclude.Con.conclude_args))])
+ if is_top_down then
+ B.HOV([],
+ [B.b_kw "conclude";B.b_space;term2pres hd;
+ B.V ([],aux (List.tl conclude.Con.conclude_args))])
+ else
+ B.HOV([],
+ [B.b_kw "obtain";B.b_space;B.b_kw "FIXMEXX"; B.b_space;term2pres hd;
+ B.V ([],aux (List.tl conclude.Con.conclude_args))])
else if conclude.Con.conclude_method = "Apply" then
let pres_args =
make_args_for_apply term2pres conclude.Con.conclude_args in