| 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 ~for_rewriting_step ~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([],
+ (if for_rewriting_step then (B.b_kw "exact") else (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([],
+ if for_rewriting_step then
+ [B.b_kw "proof"]
+ else
+ [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 =
| _ -> 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 ->
|| 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 ~for_rewriting_step:true ~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" 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 ~for_rewriting_step:true ~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
(B.b_hv [Some "helm", "xref", id]
((B.b_toggle [
B.b_h [] [B.b_text [] "{...}"; B.b_space];
- B.b_hv [] (List.map
+ B.b_hv [] (HExtlib.list_concat ~sep:[B.b_text [] ";"; B.b_space]
+ (List.map (fun x -> [x])
+ (List.map
(function
| None ->
B.b_h []
| Some n -> n)) ;
B.b_text [] (Utf8Macro.unicode_of_tex "\\Assign");
proof2pres true term2pres p])
- (List.rev context)) ] ::
+ (List.rev context)))) ] ::
[ B.b_h []
[ B.b_text [] (Utf8Macro.unicode_of_tex "\\vdash");
B.b_object (p_mi [] (string_of_int n)) ;
match kind with
| `Recursive _ -> "Recursive definition"
| `CoRecursive -> "CoRecursive definition"
- | `Inductive _ -> "Inductive definition"
- | `CoInductive _ -> "CoInductive definition"
+ | `Inductive i ->
+ "Inductive definition with "^string_of_int i^" fixed parameter(s)"
+ | `CoInductive i ->
+ "Co-Inductive definition with "^string_of_int i^" fixed parameter(s)"
in
B.b_h [] (B.b_kw kind :: params2pres params)
content2pres ?skip_initial_lambdas ?skip_thm_and_qed
(fun ?(prec=90) annterm ->
let ast, ids_to_uris =
- TermAcicContent.ast_of_acic ids_to_inner_sorts annterm
+ TermAcicContent.ast_of_acic ~output_type:`Term ids_to_inner_sorts annterm
in
CicNotationPres.box_of_mpres
(CicNotationPres.render ids_to_uris ~prec
projects / helm.git / blobdiff