X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_transformations%2Fcontent2pres.ml;h=aa10e02ab5b47fb4f0980624bf27da3d6d58bb6b;hb=49d5e4fbf175050e4afdf26494eec5231c0eac8d;hp=9356c288540066c7b207c4d02d75ba539866954e;hpb=b5a5ad620ce04ec43098d7d1f2bcf69eca9743a6;p=helm.git diff --git a/helm/ocaml/cic_transformations/content2pres.ml b/helm/ocaml/cic_transformations/content2pres.ml index 9356c2885..aa10e02ab 100644 --- a/helm/ocaml/cic_transformations/content2pres.ml +++ b/helm/ocaml/cic_transformations/content2pres.ml @@ -105,6 +105,8 @@ let is_big_general countterm p = (match prem.Con.premise_binder with Some s -> current_size + (String.length s) | None -> current_size + 7) + | Con.Lemma lemma -> + current_size + (String.length lemma.Con.lemma_name) | Con.Term t -> countterm current_size t | Con.ArgProof p -> countp current_size p | Con.ArgMethod s -> (maxsize + 1)) in @@ -115,28 +117,38 @@ let is_big_general countterm p = let is_big = is_big_general (Cexpr2pres.countterm) ;; -let make_row items concl = +let get_xref = + let module Con = Content in + function + `Declaration d + | `Hypothesis d -> d.Con.dec_id + | `Proof p -> p.Con.proof_id + | `Definition d -> d.Con.def_id + | `Joint jo -> jo.Con.joint_id +;; + +let make_row ?(attrs=[]) items concl = let module P = Mpresentation in (match concl with P.Mtable _ -> (* big! *) - P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; + P.Mtable (attrs@[None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"], [P.Mtr([],[P.Mtd ([],P.Mrow([],items))]); P.Mtr ([],[P.Mtd ([],P.indented concl)])]) | _ -> (* small *) - P.Mrow([],items@[P.Mspace([None,"width","0.1cm"]);concl])) + P.Mrow(attrs,items@[P.Mspace([None,"width","0.1cm"]);concl])) ;; -let make_concl verb concl = +let make_concl ?(attrs=[]) verb concl = let module P = Mpresentation in (match concl with P.Mtable _ -> (* big! *) - P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; + P.Mtable (attrs@[None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"], [P.Mtr([],[P.Mtd ([],P.Mtext([None,"mathcolor","Red"],verb))]); P.Mtr ([],[P.Mtd ([],P.indented concl)])]) | _ -> (* small *) - P.Mrow([], + P.Mrow(attrs, [P.Mtext([None,"mathcolor","Red"],verb); P.Mspace([None,"width","0.1cm"]); concl])) @@ -153,14 +165,16 @@ let make_args_for_apply term2pres args = (match prem.Con.premise_binder with None -> "previous" | Some s -> s) in - P.Mi([],name)::row + P.smallskip::P.Mi([],name)::row + | Con.Lemma lemma -> + P.smallskip::P.Mi([],lemma.Con.lemma_name)::row | Con.Term t -> if is_first then (term2pres t)::row - else P.Mspace([None,"width","0.1cm"])::P.Mi([],"_")::row + else P.smallskip::P.Mi([],"_")::row | Con.ArgProof _ | Con.ArgMethod _ -> - P.Mspace([None,"width","0.1cm"])::P.Mi([],"_")::row) in + P.smallskip::P.Mi([],"_")::row) in match args with hd::tl -> make_arg_for_apply true hd @@ -192,52 +206,67 @@ and proof2pres term2pres p = | `Hypothesis _ -> true | _ -> false) in ((List.filter is_decl p.Con.proof_context) != []) in + let omit_conclusion = (not indent) && (p.Con.proof_context != []) in let concl = (match p.Con.proof_conclude.Con.conclude_conclusion with None -> None | Some t -> Some (term2pres t)) in let body = - let presconclude = conclude2pres p.Con.proof_conclude indent in + let presconclude = + conclude2pres p.Con.proof_conclude indent omit_conclusion in let presacontext = acontext2pres p.Con.proof_apply_context presconclude indent in context2pres p.Con.proof_context presacontext in -(* - P.Mtable ([("align","baseline 1");("equalrows","false"); - ("columnalign","left")], - (context2pres_old p.Con.proof_context)@ - (acontext2pres_old p.Con.proof_apply_context indent)@ - [conclude2pres_old p.Con.proof_conclude indent]) in *) match p.Con.proof_name with None -> body | Some name -> - let ac = - (match concl with - None -> P.Mtext([],"NO PROOF!!!") - | Some c -> c) in let action = - P.Maction([None,"actiontype","toggle" ; - None,"selection","1"], - [(make_concl "proof of" ac); - body]) in + match concl with + None -> body +(* + P.Maction + ([None,"actiontype","toggle" ; None,"selection","1"], + [P.Mtext [] "proof" ; body]) +*) + | Some ac -> + P.Maction + ([None,"actiontype","toggle" ; None,"selection","1"], + [(make_concl "proof of" ac); body]) + in P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"], [P.Mtr ([],[P.Mtd ([],P.Mfenced([],[P.Mtext ([],name)]))]); P.Mtr ([],[P.Mtd ([], P.indented action)])]) +(* + P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; + None,"columnalign","left";Some "helm", "xref", p.Con.proof_id], + [P.Mtr ([],[P.Mtd ([],P.Mfenced([],[P.Mtext ([],name)]))]); + P.Mtr ([],[P.Mtd ([], P.indented action)])]) *) and context2pres c continuation = + (* we generate a subtable for each context element, for selection + purposes + The table generated by the head-element does not have an xref; + the whole context-proof is already selectable *) let module P = Mpresentation in - List.fold_right - (fun ce continuation -> + match c with + [] -> continuation + | hd::tl -> + let continuation' = + List.fold_right + (fun ce continuation -> + let xref = get_xref ce in + P.Mtable([None,"align","baseline 1"; None,"equalrows","false"; + None,"columnalign","left"; Some "helm", "xref", xref ], + [P.Mtr([Some "helm", "xref", "ce_"^xref],[P.Mtd ([],ce2pres ce)]); + P.Mtr([],[P.Mtd ([], continuation)])])) tl continuation in + let hd_xref= get_xref hd in P.Mtable([None,"align","baseline 1"; None,"equalrows","false"; - None,"columnalign","left"], - [P.Mtr([],[P.Mtd ([],ce2pres ce)]); - P.Mtr([],[P.Mtd ([], continuation)])])) c continuation - - and context2pres_old c = - let module P = Mpresentation in - List.map - (function ce -> P.Mtr ([], [P.Mtd ([], ce2pres ce)])) c - + None,"columnalign","left"], + [P.Mtr([Some "helm", "xref", "ce_"^hd_xref], + [P.Mtd ([],ce2pres hd)]); + P.Mtr([],[P.Mtd ([], continuation')])]) + and ce2pres = let module P = Mpresentation in let module Con = Content in @@ -284,6 +313,7 @@ and proof2pres term2pres p = P.Mtext ([],"jointdef") and acontext2pres ac continuation indent = + let module Con = Content in let module P = Mpresentation in List.fold_right (fun p continuation -> @@ -293,34 +323,33 @@ and proof2pres term2pres p = else proof2pres p in P.Mtable([None,"align","baseline 1"; None,"equalrows","false"; - None,"columnalign","left"], - [P.Mtr([],[P.Mtd ([],hd)]); + None,"columnalign","left"; Some "helm","xref",p.Con.proof_id], + [P.Mtr([Some "helm","xref","ace_"^p.Con.proof_id],[P.Mtd ([],hd)]); P.Mtr([],[P.Mtd ([], continuation)])])) ac continuation - and acontext2pres_old ac indent = - let module P = Mpresentation in - List.map - (function p -> - if indent then - P.Mtr ([], [P.Mtd ([], P.indented (proof2pres p))]) - else - P.Mtr ([], - [P.Mtd ([], proof2pres p)])) ac - - and conclude2pres conclude indent = + and conclude2pres conclude indent omit_conclusion = + let module Con = Content in let module P = Mpresentation in - if indent then - P.indented (conclude_aux conclude) + let tconclude_body = + match conclude.Con.conclude_conclusion with + Some t when not omit_conclusion -> + let concl = (term2pres t) in + if conclude.Con.conclude_method = "BU_Conversion" then + make_concl "that is equivalent to" concl + else + let conclude_body = conclude_aux conclude in + let ann_concl = make_concl "we conclude" concl in + P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; + None,"columnalign","left"], + [P.Mtr ([],[P.Mtd ([],conclude_body)]); + P.Mtr ([],[P.Mtd ([],ann_concl)])]) + | _ -> conclude_aux conclude in + if indent then + P.indented (P.Mrow ([Some "helm", "xref", conclude.Con.conclude_id], + [tconclude_body])) else - conclude_aux conclude + P.Mrow ([Some "helm", "xref", conclude.Con.conclude_id],[tconclude_body]) - and conclude2pres_old conclude indent = - let module P = Mpresentation in - if indent then - P.Mtr ([], [P.Mtd ([], P.indented (conclude_aux conclude))]) - else - P.Mtr ([], - [P.Mtd ([], conclude_aux conclude)]) and conclude_aux conclude = let module Con = Content in @@ -344,23 +373,26 @@ and proof2pres term2pres p = P.Mtr([],[P.Mtd([],make_concl "or equivalently" synth)]); P.Mtr([],[P.Mtd([],proof2pres subproof)])]) else if conclude.Con.conclude_method = "BU_Conversion" then - let conclusion = - (match conclude.Con.conclude_conclusion with - None -> P.Mtext([],"NO Conclusion!!!") - | Some c -> term2pres c) in - make_concl "that is equivalent to" conclusion + assert false else if conclude.Con.conclude_method = "Exact" then - let conclusion = - (match conclude.Con.conclude_conclusion with - None -> P.Mtext([],"NO Conclusion!!!") - | Some c -> term2pres c) in let arg = (match conclude.Con.conclude_args with [Con.Term t] -> term2pres t | _ -> assert false) in - make_row - [arg;P.Mspace([None,"width","0.1cm"]);P.Mtext([],"proves")] conclusion + (match conclude.Con.conclude_conclusion with + None -> + P.Mrow [] + [P.Mtext [None, "mathcolor", "red"] "Consider" ; P.smallskip; arg] + | Some c -> let conclusion = term2pres c in + make_row + [arg; P.Mspace([None,"width","0.1cm"]);P.Mtext([],"proves")] + conclusion + ) else if conclude.Con.conclude_method = "Intros+LetTac" then + (match conclude.Con.conclude_args with + [Con.ArgProof p] -> proof2pres p + | _ -> assert false) +(* OLD CODE let conclusion = (match conclude.Con.conclude_conclusion with None -> P.Mtext([],"NO Conclusion!!!") @@ -372,8 +404,9 @@ and proof2pres term2pres p = None,"columnalign","left"], [P.Mtr([],[P.Mtd([],proof2pres p)]); P.Mtr([],[P.Mtd([], - (make_concl "we proved *" conclusion))])]); + (make_concl "we proved 1" conclusion))])]); | _ -> assert false) +*) else if (conclude.Con.conclude_method = "ByInduction") then byinduction conclude else if (conclude.Con.conclude_method = "Rewrite") then @@ -388,7 +421,17 @@ and proof2pres term2pres p = let term2 = (match List.nth conclude.Con.conclude_args 5 with Con.Term t -> term2pres t - | _ -> assert false) in + | _ -> assert false) in + P.Mtable ([None,"align","baseline 1";None,"equalrows","false"; + None,"columnalign","left"], + [P.Mtr ([],[P.Mtd ([],P.Mrow([],[ + P.Mtext([None,"mathcolor","Red"],"rewrite"); + P.Mspace([None,"width","0.1cm"]);term1; + P.Mspace([None,"width","0.1cm"]); + P.Mtext([None,"mathcolor","Red"],"with"); + P.Mspace([None,"width","0.1cm"]);term2]))]); + P.Mtr ([],[P.Mtd ([],P.indented justif)])]); +(* OLD CODE let conclusion = (match conclude.Con.conclude_conclusion with None -> P.Mtext([],"NO Conclusion!!!") @@ -402,10 +445,15 @@ and proof2pres term2pres p = P.Mtext([None,"mathcolor","Red"],"with"); P.Mspace([None,"width","0.1cm"]);term2]))]); P.Mtr ([],[P.Mtd ([],P.indented justif)]); - P.Mtr ([],[P.Mtd ([],make_concl "we proved" conclusion)])]) + P.Mtr ([],[P.Mtd ([],make_concl "we proved 2" conclusion)])]) *) else if conclude.Con.conclude_method = "Apply" then let pres_args = - make_args_for_apply term2pres conclude.Con.conclude_args in + make_args_for_apply term2pres conclude.Con.conclude_args in + P.Mrow([], + P.Mtext([None,"mathcolor","Red"],"by"):: + P.Mspace([None,"width","0.1cm"]):: + P.Mo([],"(")::pres_args@[P.Mo([],")")]) +(* OLD CODE let by = P.Mrow([], P.Mtext([None,"mathcolor","Red"],"by")::P.Mspace([None,"width","0.1cm"]):: @@ -414,12 +462,13 @@ and proof2pres term2pres p = None -> P.Mrow([],[P.Mtext([],"QUA");by]) | Some t -> let concl = (term2pres t) in - let ann_concl = make_concl "we proved" concl in + let ann_concl = make_concl "we proved 3" concl in P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; - None,"columnalign","left"], + None,"columnalign","left"; + Some "helm", "xref", conclude.Con.conclude_id], [P.Mtr ([],[P.Mtd ([],by)]); - P.Mtr ([],[P.Mtd ([],ann_concl)])]) - else let body = + P.Mtr ([],[P.Mtd ([],ann_concl)])]) *) + else P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"], [P.Mtr ([],[P.Mtd ([],P.Mtext([],"Apply method" ^ conclude.Con.conclude_method ^ " to"))]); @@ -429,16 +478,17 @@ and proof2pres term2pres p = (P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"], - args2pres conclude.Con.conclude_args))))])]) in + args2pres conclude.Con.conclude_args))))])]) +(* OLD CODE match conclude.Con.conclude_conclusion with None -> body | Some t -> let concl = (term2pres t) in - let ann_concl = make_concl "we proved" concl in + let ann_concl = make_concl "we proved 4" concl in P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"], [P.Mtr ([],[P.Mtd ([],body)]); - P.Mtr ([],[P.Mtd ([],ann_concl)])]) + P.Mtr ([],[P.Mtd ([],ann_concl)])]) *) and args2pres l = let module P = Mpresentation in @@ -453,6 +503,8 @@ and proof2pres term2pres p = P.Mtext ([],"aux " ^ n) | Con.Premise prem -> P.Mtext ([],"premise") + | Con.Lemma lemma -> + P.Mtext ([],"lemma") | Con.Term t -> term2pres t | Con.ArgProof p -> @@ -483,6 +535,7 @@ and proof2pres term2pres p = (match prem.Con.premise_binder with None -> P.Mtext ([],"the previous result") | Some n -> P.Mi([],n)) + | Con.Lemma lemma -> P.Mi([],lemma.Con.lemma_name) | Con.Term t -> term2pres t | Con.ArgProof p -> @@ -492,14 +545,21 @@ and proof2pres term2pres p = (make_concl "we proceede by induction on" arg) in let to_prove = (make_concl "to prove" proof_conclusion) in + P.Mtable + ([None,"align","baseline 1"; None,"equalrows","false"; + None,"columnalign","left"], + P.Mtr ([],[P.Mtd ([],induction_on)]):: + P.Mtr ([],[P.Mtd ([],to_prove)]):: + (make_cases args_for_cases)) +(* OLD CODE let we_proved = - (make_concl "we proved" proof_conclusion) in + (make_concl "we proved 5" proof_conclusion) in P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"], P.Mtr ([],[P.Mtd ([],induction_on)]):: P.Mtr ([],[P.Mtd ([],to_prove)]):: (make_cases args_for_cases) @ - [P.Mtr ([],[P.Mtd ([],we_proved)])]) + [P.Mtr ([],[P.Mtd ([],we_proved)])]) *) and make_cases args_for_cases = let module P = Mpresentation in @@ -548,7 +608,7 @@ and proof2pres term2pres p = | Some t -> term2pres t) in let asubconcl = P.Mtr([],[P.Mtd([], - make_concl "the thesis becomes" subconcl)]) in + P.indented (make_concl "the thesis becomes" subconcl))]) in let induction_hypothesis = (match indhyps with [] -> [] @@ -577,9 +637,11 @@ and proof2pres term2pres p = text::hyps) in (* let acontext = acontext2pres_old p.Con.proof_apply_context true in *) - let body = conclude2pres p.Con.proof_conclude true in + let body = conclude2pres p.Con.proof_conclude true false in let presacontext = - acontext2pres p.Con.proof_apply_context body true in + P.Maction([None,"actiontype","toggle" ; None,"selection","1"], + [P.indented (P.Mtext([None,"mathcolor","Red"],"Proof")); + acontext2pres p.Con.proof_apply_context body true]) in P.Mtable ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"], pattern::asubconcl::induction_hypothesis@