let current_cic_infos = ref None;;
let current_goal_infos = ref None;;
+let current_scratch_infos = ref None;;
(* MISC FUNCTIONS *)
let sequent_doc =
Xml2Gdome.document_of_xml domImpl sequent_gdome
in
- applyStylesheets sequent_doc sequent_styles sequent_args
- (*CSC: magari prima o poi serve*)
- (*current_scratch_infos := Some (ids_to_terms,ids_to_father_ids)*)
+ let res =
+ applyStylesheets sequent_doc sequent_styles sequent_args ;
+ in
+ current_scratch_infos := Some (term,ids_to_terms,ids_to_father_ids) ;
+ res
;;
let output_html outputhtml msg =
CicTextualParser0.Eof ->
inputt#delete_text 0 inputlen
| e ->
-prerr_endline ("? " ^ Printexc.to_string e) ; flush stderr ;
output_html outputhtml
("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>");
ProofEngine.proof := savedproof ;
| None -> assert false (* "ERROR: No current term!!!" *)
with
e ->
- prerr_endline ("? " ^ Printexc.to_string e) ; flush stderr ;
output_html outputhtml
("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
end
| None -> assert false (* "ERROR: No current term!!!" *)
with
e ->
-prerr_endline ("? " ^ Printexc.to_string e) ; flush stderr ;
+ output_html outputhtml
+ ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
+ end
+ | None ->
+ output_html outputhtml
+ ("<h1 color=\"red\">No term selected</h1>")
+;;
+
+let call_tactic_with_goal_input_in_scratch tactic scratch_window () =
+ let module L = LogicalOperations in
+ let module G = Gdome in
+ let mmlwidget = (scratch_window#mmlwidget : GMathView.math_view) in
+ let outputhtml = (scratch_window#outputhtml : GHtml.xmhtml) in
+ let savedproof = !ProofEngine.proof in
+ let savedgoal = !ProofEngine.goal in
+ match mmlwidget#get_selection with
+ Some node ->
+ let xpath =
+ ((node : Gdome.element)#getAttributeNS
+ ~namespaceURI:helmns
+ ~localName:(G.domString "xref"))#to_string
+ in
+ if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
+ else
+ begin
+ try
+ match !current_scratch_infos with
+ (* term is the whole goal in the scratch_area *)
+ Some (term,ids_to_terms, ids_to_father_ids) ->
+ let id = xpath in
+ let expr = tactic term (Hashtbl.find ids_to_terms id) in
+ let mml = mml_of_cic_term expr in
+ scratch_window#show () ;
+ scratch_window#mmlwidget#load_tree ~dom:mml
+ | None -> assert false (* "ERROR: No current term!!!" *)
+ with
+ e ->
output_html outputhtml
("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
end
;;
+let whd_in_scratch scratch_window =
+ call_tactic_with_goal_input_in_scratch ProofEngine.whd_in_scratch
+ scratch_window
+;;
+let reduce_in_scratch scratch_window =
+ call_tactic_with_goal_input_in_scratch ProofEngine.reduce_in_scratch
+ scratch_window
+;;
+let simpl_in_scratch scratch_window =
+ call_tactic_with_goal_input_in_scratch ProofEngine.simpl_in_scratch
+ scratch_window
+;;
+
(**********************)
let proveit rendering_window () =
let module L = LogicalOperations in
let module G = Gdome in
- match rendering_window#output#get_selection with
- Some node ->
- let xpath =
- ((node : Gdome.element)#getAttributeNS
- (*CSC: OCAML DIVERGE
- ((element : G.element)#getAttributeNS
- *)
- ~namespaceURI:helmns
- ~localName:(G.domString "xref"))#to_string
- in
- if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
- else
- begin
- try
- match !current_cic_infos with
- Some (ids_to_terms, ids_to_father_ids) ->
- let id = xpath in
- if L.to_sequent id ids_to_terms ids_to_father_ids then
- refresh_proof rendering_window#output ;
- refresh_sequent rendering_window#proofw
- | None -> assert false (* "ERROR: No current term!!!" *)
- with
- e -> print_endline ("Error: " ^ Printexc.to_string e) ; flush stdout
- end
- | None -> assert false (* "ERROR: No selection!!!" *)
+ let outputhtml = (rendering_window#outputhtml : GHtml.xmhtml) in
+ match rendering_window#output#get_selection with
+ Some node ->
+ let xpath =
+ ((node : Gdome.element)#getAttributeNS
+ (*CSC: OCAML DIVERGE
+ ((element : G.element)#getAttributeNS
+ *)
+ ~namespaceURI:helmns
+ ~localName:(G.domString "xref"))#to_string
+ in
+ if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
+ else
+ begin
+ try
+ match !current_cic_infos with
+ Some (ids_to_terms, ids_to_father_ids) ->
+ let id = xpath in
+ if L.to_sequent id ids_to_terms ids_to_father_ids then
+ refresh_proof rendering_window#output ;
+ refresh_sequent rendering_window#proofw
+ | None -> assert false (* "ERROR: No current term!!!" *)
+ with
+ e ->
+ output_html outputhtml
+ ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
+ end
+ | None -> assert false (* "ERROR: No selection!!!" *)
;;
exception NotADefinition;;
inputt#delete_text 0 inputlen ;
ignore(oldinputt#insert_text input oldinputt#length)
| e ->
- print_endline ("Error: " ^ Printexc.to_string e) ; flush stdout
+ output_html outputhtml
+ ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>") ;
;;
let check rendering_window scratch_window () =
let input = inputt#get_chars 0 inputlen ^ "\n" in
let curi,metasenv =
match !ProofEngine.proof with
- None -> assert false
+ None -> UriManager.uri_of_string "cic:/dummy.con", []
| Some (curi,metasenv,_,_) -> curi,metasenv
in
let ciccontext,names_context =
let context =
match !ProofEngine.goal with
- None -> assert false
+ None -> []
| Some (_,(ctx,_)) -> ctx
in
ProofEngine.cic_context_of_context context,
| Some expr ->
try
let ty = CicTypeChecker.type_of_aux' metasenv ciccontext expr in
- let mml = mml_of_cic_term ty in
+ let mml = mml_of_cic_term (Cic.Cast (expr,ty)) in
scratch_window#show () ;
- scratch_window#display ~dom:mml
+ scratch_window#mmlwidget#load_tree ~dom:mml
with
e ->
print_endline ("? " ^ CicPp.ppterm expr) ;
inputt#delete_text 0 inputlen ;
ignore(oldinputt#insert_text input oldinputt#length)
| e ->
- print_endline ("Error: " ^ Printexc.to_string e) ; flush stdout
+ output_html outputhtml
+ ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>") ;
;;
let choose_selection
(* Scratch window *)
-class scratch_window () =
+class scratch_window outputhtml =
let window =
GWindow.window ~title:"MathML viewer" ~border_width:2 () in
+ let vbox =
+ GPack.vbox ~packing:window#add () in
+ let hbox =
+ GPack.hbox ~packing:(vbox#pack ~expand:false ~fill:false ~padding:5) () in
+ let whdb =
+ GButton.button ~label:"Whd"
+ ~packing:(hbox#pack ~expand:false ~fill:false ~padding:5) () in
+ let reduceb =
+ GButton.button ~label:"Reduce"
+ ~packing:(hbox#pack ~expand:false ~fill:false ~padding:5) () in
+ let simplb =
+ GButton.button ~label:"Simpl"
+ ~packing:(hbox#pack ~expand:false ~fill:false ~padding:5) () in
+ let scrolled_window =
+ GBin.scrolled_window ~border_width:10
+ ~packing:(vbox#pack ~expand:true ~padding:5) () in
let mmlwidget =
- GMathView.math_view ~packing:(window#add) ~width:400 ~height:280 () in
+ GMathView.math_view
+ ~packing:(scrolled_window#add) ~width:400 ~height:280 () in
object(self)
- method display = mmlwidget#load_tree
- method show = window#show
+ method outputhtml = outputhtml
+ method mmlwidget = mmlwidget
+ method show () = window#misc#hide () ; window#show ()
initializer
- ignore(window#event#connect#delete (fun _ -> GMain.Main.quit () ; true ))
+ ignore(mmlwidget#connect#selection_changed (choose_selection mmlwidget)) ;
+ ignore(window#event#connect#delete (fun _ -> window#misc#hide () ; true )) ;
+ ignore(whdb#connect#clicked (whd_in_scratch self)) ;
+ ignore(reduceb#connect#clicked (reduce_in_scratch self)) ;
+ ignore(simplb#connect#clicked (simpl_in_scratch self))
end;;
(* Main window *)
~width:400 ~height: 200
~packing:(vbox1#pack ~expand:false ~fill:false ~padding:5)
~show:true () in
- let scratch_window = new scratch_window () in
+ let scratch_window = new scratch_window outputhtml in
object(self)
method outputhtml = outputhtml
method oldinputt = oldinputt
method inputt = inputt
method output = (output : GMathView.math_view)
method proofw = (proofw : GMathView.math_view)
- method show () = window#show ()
+ method show = window#show
initializer
button_export_to_postscript#misc#set_sensitive false ;
projects / helm.git / blobdiff