Commit 2edb3ec3 authored by MARCHE Claude's avatar MARCHE Claude

session: suppressed redundant attributes verified and proved

parent 0b05b7a7
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -11,12 +11,10 @@
<!ELEMENT file (theory*)>
<!ATTLIST file name CDATA #REQUIRED>
<!ATTLIST file verified CDATA #REQUIRED>
<!ATTLIST file expanded CDATA #IMPLIED>
<!ELEMENT theory (label*,goal*)>
<!ATTLIST theory name CDATA #REQUIRED>
<!ATTLIST theory verified CDATA #REQUIRED>
<!ATTLIST theory expanded CDATA #IMPLIED>
<!ATTLIST theory locfile CDATA #IMPLIED>
<!ATTLIST theory loclnum CDATA #IMPLIED>
......@@ -26,7 +24,6 @@
<!ELEMENT goal (label*, proof*, transf*, metas*)>
<!ATTLIST goal name CDATA #REQUIRED>
<!ATTLIST goal expl CDATA #IMPLIED>
<!ATTLIST goal proved CDATA #REQUIRED>
<!ATTLIST goal sum CDATA #REQUIRED>
<!ATTLIST goal shape CDATA #IMPLIED>
<!ATTLIST goal expanded CDATA #IMPLIED>
......@@ -54,14 +51,12 @@
<!ELEMENT transf (goal*)>
<!ATTLIST transf name CDATA #REQUIRED>
<!ATTLIST transf proved CDATA #REQUIRED>
<!ATTLIST transf expanded CDATA #IMPLIED>
<!ELEMENT label EMPTY>
<!ATTLIST label name CDATA #REQUIRED>
<!ELEMENT metas (ts_pos*,ls_pos*,pr_pos*,meta*,goal)>
<!ATTLIST metas proved CDATA #REQUIRED>
<!ATTLIST metas expanded CDATA #IMPLIED>
<!ELEMENT ts_pos (ip_library*,ip_qualid+)>
......
......@@ -572,14 +572,15 @@ let save_label fmt s =
fprintf fmt "@\n@[<hov 1><label@ name=\"%a\"/>@]" save_string s.Ident.lab_string
let rec save_goal provers fmt g =
assert (Tc.string_of_shape g.goal_shape <> "");
let shape = Tc.string_of_shape g.goal_shape in
assert (shape <> "");
fprintf fmt
"@\n@[<hov 1><goal@ %a%a@ sum=\"%a\"@ proved=\"%b\"%a@ shape=\"%a\">"
"@\n@[<hov 1><goal@ %a%a@ sum=\"%a\"%a@ shape=\"%a\">"
save_ident g.goal_name
(opt "expl") g.goal_expl
save_string (Tc.string_of_checksum g.goal_checksum)
g.goal_verified (save_bool_def "expanded" false) g.goal_expanded
save_string (Tc.string_of_shape g.goal_shape);
(save_bool_def "expanded" false) g.goal_expanded
save_string shape;
Ident.Slab.iter (save_label fmt) g.goal_name.Ident.id_label;
let l = PHprover.fold
(fun _ a acc -> (Mprover.find a.proof_prover provers, a) :: acc)
......@@ -593,15 +594,14 @@ let rec save_goal provers fmt g =
fprintf fmt "@]@\n</goal>"
and save_trans provers fmt t =
fprintf fmt "@\n@[<hov 1><transf@ name=\"%a\"@ proved=\"%b\"%a>"
save_string t.transf_name t.transf_verified
fprintf fmt "@\n@[<hov 1><transf@ name=\"%a\"%a>"
save_string t.transf_name
(save_bool_def "expanded" false) t.transf_expanded;
List.iter (save_goal provers fmt) t.transf_goals;
fprintf fmt "@]@\n</transf>"
and save_metas provers fmt _ m =
fprintf fmt "@\n@[<hov 1><metas@ proved=\"%b\"%a>"
m.metas_verified
fprintf fmt "@\n@[<hov 1><metas%a>"
(save_bool_def "expanded" false) m.metas_expanded;
let save_pos fmt pos =
fprintf fmt "ip_theory=\"%a\">" save_string pos.ip_theory;
......@@ -665,9 +665,8 @@ and save_ty fmt ty =
let save_theory provers fmt t =
fprintf fmt
"@\n@[<hov 1><theory@ %a@ verified=\"%b\"%a>"
"@\n@[<hov 1><theory@ %a%a>"
save_ident t.theory_name
t.theory_verified
(save_bool_def "expanded" false) t.theory_expanded;
Ident.Slab.iter (save_label fmt) t.theory_name.Ident.id_label;
List.iter (save_goal provers fmt) t.theory_goals;
......@@ -675,9 +674,9 @@ let save_theory provers fmt t =
let save_file provers fmt _ f =
fprintf fmt
"@\n@[<hov 1><file@ name=\"%a\"%a@ verified=\"%b\"%a>"
"@\n@[<hov 1><file@ name=\"%a\"%a%a>"
save_string f.file_name (opt "format")
f.file_format f.file_verified (save_bool_def "expanded" false) f.file_expanded;
f.file_format (save_bool_def "expanded" false) f.file_expanded;
List.iter (save_theory provers fmt) f.file_theories;
fprintf fmt "@]@\n</file>"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment