(* *)
(***************************************************************************)
-let use_stylesheets = ref false;;(* false performs the transformations in OCaml*)
+let debug = false
+let debug_print s = if debug then prerr_endline s
+type mml_of_cic_sequent =
+ Cic.metasenv ->
+ int * Cic.context * Cic.term ->
+ Gdome.document *
+ (Cic.annconjecture *
+ ((Cic.id, Cic.term) Hashtbl.t *
+ (Cic.id, Cic.id option) Hashtbl.t *
+ (string, Cic.hypothesis) Hashtbl.t *
+ (Cic.id, string) Hashtbl.t))
+
+
+type mml_of_cic_object =
+ Cic.obj ->
+ Gdome.document *
+ (Cic.annobj *
+ ((Cic.id, Cic.term) Hashtbl.t *
+ (Cic.id, Cic.id option) Hashtbl.t *
+ (Cic.id, Cic.conjecture) Hashtbl.t *
+ (Cic.id, Cic.hypothesis) Hashtbl.t *
+ (Cic.id, string) Hashtbl.t *
+ (Cic.id, Cic2acic.anntypes) Hashtbl.t))
+
(* List utility functions *)
exception Skip;;
(** A widget to render sequents **)
-class sequent_viewer obj =
+class sequent_viewer ~(mml_of_cic_sequent:mml_of_cic_sequent) obj =
object(self)
inherit GMathViewAux.multi_selection_math_view obj
(* returns the list of selected terms *)
(* selections which are not terms are ignored *)
method get_selected_terms =
- prerr_endline (string_of_int (List.length self#get_selections)) ;
+ debug_print (string_of_int (List.length self#get_selections)) ;
let selections = self#get_selections in
list_map_fail
(function node ->
let xpath =
((node : Gdome.element)#getAttributeNS
- ~namespaceURI:Misc.helmns
+ ~namespaceURI:Misc.helm_ns
~localName:(Gdome.domString "xref"))#to_string
in
- prerr_endline ("YAHHHHHHHHHH " ^ xpath) ;
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
else
match current_infos with
(function node ->
let xpath =
((node : Gdome.element)#getAttributeNS
- ~namespaceURI:Misc.helmns
+ ~namespaceURI:Misc.helm_ns
~localName:(Gdome.domString "xref"))#to_string
in
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
method load_sequent metasenv sequent =
(**** SIAM QUI ****)
- let sequent_mml,(ids_to_terms,ids_to_father_ids,ids_to_hypotheses) =
- if !use_stylesheets then
- ApplyStylesheets.mml_of_cic_sequent metasenv sequent
- else
- ApplyTransformation.mml_of_cic_sequent metasenv sequent
+ let sequent_mml,(_,(ids_to_terms,ids_to_father_ids,ids_to_hypotheses,ids_to_inner_sorts)) =
+ mml_of_cic_sequent metasenv sequent
in
- self#load_doc ~dom:sequent_mml ;
-(*
-Misc.domImpl#saveDocumentToFile ~name:"/tmp/pippo" ~doc:sequent_mml () ;
-*)
+ self#load_root ~root:sequent_mml#get_documentElement ;
+ignore (Misc.domImpl#saveDocumentToFile ~name:"/tmp/pippo" ~doc:sequent_mml ());
current_infos <-
- Some (ids_to_terms,ids_to_father_ids,ids_to_hypotheses)
+ Some (ids_to_terms,ids_to_father_ids,ids_to_hypotheses)
end
;;
-let sequent_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity =
- GtkBase.Container.make_params ~cont:(
+let sequent_viewer ~(mml_of_cic_sequent: mml_of_cic_sequent)
+ ?hadjustment ?vadjustment ?font_size ?log_verbosity
+=
+ GtkBase.Widget.size_params ~cont:(
OgtkMathViewProps.pack_return
- (fun p -> OgtkMathViewProps.set_params (new sequent_viewer (GtkMathViewProps.MathView.create p)) ~font_size ~log_verbosity)) []
+ (fun p ->
+ OgtkMathViewProps.set_params
+ (new sequent_viewer ~mml_of_cic_sequent
+ (GtkMathViewProps.MathView_GMetaDOM.create p))
+ ~font_size ~log_verbosity)) []
;;
(*
(** A widget to render proofs **)
-class proof_viewer obj =
+class proof_viewer ~(mml_of_cic_object:mml_of_cic_object) obj =
object(self)
inherit GMathViewAux.single_selection_math_view obj
Some node ->
let xpath =
((node : Gdome.element)#getAttributeNS
- ~namespaceURI:Misc.helmns
+ ~namespaceURI:Misc.helm_ns
~localName:(Gdome.domString "xref"))#to_string
in
- prerr_endline ("YAEEEEEEEEEEEEEEEEEEE " ^ xpath) ;
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
else
begin
Some node ->
let xpath =
((node : Gdome.element)#getAttributeNS
- ~namespaceURI:Misc.helmns
+ ~namespaceURI:Misc.helm_ns
~localName:(Gdome.domString "xref"))#to_string
in
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
end
| None -> assert false (* "ERROR: No selection!!!" *)
- method load_proof uri currentproof =
- let
- (acic,ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,
- ids_to_inner_types,ids_to_conjectures,ids_to_hypotheses)
- = Cic2acic.acic_object_of_cic_object currentproof
+ method load_proof currentproof =
+ let mml,
+ (acic,
+ (ids_to_terms,ids_to_father_ids,ids_to_conjectures,
+ ids_to_hypotheses,ids_to_inner_sorts,ids_to_inner_types)) =
+ mml_of_cic_object currentproof
in
- let mml =
- if !use_stylesheets then
- ApplyStylesheets.mml_of_cic_object
- ~explode_all:true uri acic ids_to_inner_sorts ids_to_inner_types
- else
- ApplyTransformation.mml_of_cic_object
- ~explode_all:true uri acic ids_to_inner_sorts ids_to_inner_types in
current_infos <-
Some
(ids_to_terms,ids_to_father_ids,ids_to_conjectures,ids_to_hypotheses);
(* self#load_doc ~dom:mml ;
current_mml <- Some mml ; *)
+ ignore(Misc.domImpl#saveDocumentToFile ~name:"/tmp/prova" ~doc:mml ());
(match current_mml with
None ->
let time1 = Sys.time () in
- self#load_doc ~dom:mml ;
+ self#load_root ~root:mml#get_documentElement ;
let time2 = Sys.time () in
- prerr_endline ("Loading and displaying the proof took " ^ string_of_float (time2 -. time1) ^ "seconds") ;
+ debug_print ("Loading and displaying the proof took " ^
+ string_of_float (time2 -. time1) ^ "seconds") ;
current_mml <- Some mml
| Some current_mml' ->
self#freeze ;
let time1 = Sys.time () in
XmlDiff.update_dom ~from:current_mml' mml ;
let time2 = Sys.time () in
- prerr_endline ("XMLDIFF took " ^ string_of_float (time2 -. time1) ^ "seconds") ;
+ debug_print ("XMLDIFF took " ^
+ string_of_float (time2 -. time1) ^ "seconds") ;
self#thaw ;
let time3 = Sys.time () in
- prerr_endline ("The refresh of the widget took " ^ string_of_float (time3 -. time2) ^ "seconds"));
+ debug_print ("The refresh of the widget took " ^
+ string_of_float (time3 -. time2) ^ "seconds"));
(acic, ids_to_inner_types, ids_to_inner_sorts)
end
;;
-let proof_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity =
- GtkBase.Container.make_params ~cont:(
+let proof_viewer ~(mml_of_cic_object: mml_of_cic_object)
+ ?hadjustment ?vadjustment ?font_size ?log_verbosity
+=
+ GtkBase.Widget.size_params ~cont:(
OgtkMathViewProps.pack_return
- (fun p -> OgtkMathViewProps.set_params (new proof_viewer (GtkMathViewProps.MathView.create p)) ~font_size ~log_verbosity)) []
+ (fun p ->
+ OgtkMathViewProps.set_params
+ (new proof_viewer ~mml_of_cic_object
+ (GtkMathViewProps.MathView_GMetaDOM.create p))
+ ~font_size ~log_verbosity)) []
;;
(*
;;
*)
-let _ =
- Cexpr2pres_hashtbl.init Cexpr2pres.cexpr2pres Cexpr2pres.cexpr2pres_charcount
-;;
projects / helm.git / blobdiff