(******************************************************************************)
-(* CSC: quick fix: a function from [uri#xpointer(path)] to [uri#path] *)
-let wrong_xpointer_format_from_wrong_xpointer_format' uri =
- try
- let index_sharp = String.index uri '#' in
- let index_rest = index_sharp + 10 in
- let baseuri = String.sub uri 0 index_sharp in
- let rest = String.sub uri index_rest (String.length uri - index_rest - 1) in
- baseuri ^ "#" ^ rest
- with Not_found -> uri
-;;
-
(* GLOBAL CONSTANTS *)
-let helmns = Gdome.domString "http://www.cs.unibo.it/helm";;
let xlinkns = Gdome.domString "http://www.w3.org/1999/xlink";;
let htmlheader =
Not_found -> "host=mowgli.cs.unibo.it dbname=helm_mowgli_new_schema user=helm"
;;
-let empty_id_to_uris = ([],function _ -> None);;
-
-
(* GLOBAL REFERENCES (USED BY CALLBACKS) *)
let htmlheader_and_content = ref htmlheader;;
let current_goal_infos = ref None;;
let current_scratch_infos = ref None;;
-let id_to_uris = ref empty_id_to_uris;;
-
let check_term = ref (fun _ _ _ -> assert false);;
let mml_of_cic_term_ref = ref (fun _ _ -> assert false);;
in
Arg.parse argspec ignore ""
-(* A WIDGET TO ENTER CIC TERMS *)
-
-class term_editor ?packing ?width ?height ?isnotempty_callback () =
- let input = GEdit.text ~editable:true ?width ?height ?packing () in
- let _ =
- match isnotempty_callback with
- None -> ()
- | Some callback ->
- ignore(input#connect#changed (function () -> callback (input#length > 0)))
- in
-object(self)
- method coerce = input#coerce
- method reset =
- input#delete_text 0 input#length
- (* CSC: txt is now a string, but should be of type Cic.term *)
- method set_term txt =
- self#reset ;
- ignore ((input#insert_text txt) ~pos:0)
- (* CSC: this method should disappear *)
- method get_as_string =
- input#get_chars 0 input#length
- method get_term ~context ~metasenv =
- let lexbuf = Lexing.from_string (input#get_chars 0 input#length) in
- CicTextualParserContext.main ~context ~metasenv CicTextualLexer.token lexbuf
-end
-;;
-
(* MISC FUNCTIONS *)
-exception IllFormedUri of string;;
-
-let cic_textual_parser_uri_of_string uri' =
- try
- (* Constant *)
- if String.sub uri' (String.length uri' - 4) 4 = ".con" then
- CicTextualParser0.ConUri (UriManager.uri_of_string uri')
- else
- if String.sub uri' (String.length uri' - 4) 4 = ".var" then
- CicTextualParser0.VarUri (UriManager.uri_of_string uri')
- else
- (try
- (* Inductive Type *)
- let uri'',typeno = CicTextualLexer.indtyuri_of_uri uri' in
- CicTextualParser0.IndTyUri (uri'',typeno)
- with
- _ ->
- (* Constructor of an Inductive Type *)
- let uri'',typeno,consno =
- CicTextualLexer.indconuri_of_uri uri'
- in
- CicTextualParser0.IndConUri (uri'',typeno,consno)
- )
- with
- _ -> raise (IllFormedUri uri')
-;;
-
let term_of_cic_textual_parser_uri uri =
let module C = Cic in
let module CTP = CicTextualParser0 in
in
lazy
(let mmlwidget =
- GMathView.math_view
+ GMathViewAux.single_selection_math_view
~packing:scrolled_window#add ~width:400 ~height:280 () in
let expr =
let term =
- term_of_cic_textual_parser_uri (cic_textual_parser_uri_of_string uri)
+ term_of_cic_textual_parser_uri
+ (Misc.cic_textual_parser_uri_of_string uri)
in
(Cic.Cast (term, CicTypeChecker.type_of_aux' [] [] term))
in
try
let mml = !mml_of_cic_term_ref 111 expr in
-prerr_endline ("### " ^ CicPp.ppterm expr) ;
- mmlwidget#load_tree ~dom:mml
+ mmlwidget#load_doc ~dom:mml
with
e ->
output_html outputhtml
exception NoChoice;;
let
- interactive_user_uri_choice ~selection_mode ?(ok="Ok")
+ interactive_user_uri_choice ~(selection_mode:[`SINGLE|`EXTENDED]) ?(ok="Ok")
?(enable_button_for_non_vars=false) ~title ~msg uris
=
let choices = ref [] in
let expected_height = 18 * List.length uris in
let height = if expected_height > 400 then 400 else expected_height in
GList.clist ~columns:1 ~packing:scrolled_window#add
- ~height ~selection_mode () in
+ ~height ~selection_mode:(selection_mode :> Gtk.Tags.selection_mode) () in
let _ = List.map (function x -> clist#append [x]) uris in
let hbox2 =
GPack.hbox ~border_width:0
function result -> !query ^ " <h1>Result:</h1> " ^ MQueryUtil.text_of_result result "<br>"
;;
-let domImpl = Gdome.domImplementation ();;
-
-let parseStyle name =
- let style =
- domImpl#createDocumentFromURI
-(*
- ~uri:("http://phd.cs.unibo.it:8081/getxslt?uri=" ^ name) ?mode:None
-*)
- ~uri:("styles/" ^ name) ()
- in
- Gdome_xslt.processStylesheet style
-;;
-
-let d_c = parseStyle "drop_coercions.xsl";;
-let tc1 = parseStyle "objtheorycontent.xsl";;
-let hc2 = parseStyle "content_to_html.xsl";;
-let l = parseStyle "link.xsl";;
-
-let c1 = parseStyle "rootcontent.xsl";;
-let g = parseStyle "genmmlid.xsl";;
-let c2 = parseStyle "annotatedpres.xsl";;
-
-
-let getterURL = Configuration.getter_url;;
-let processorURL = Configuration.processor_url;;
-
-let mml_styles = [d_c ; c1 ; g ; c2 ; l];;
-let mml_args ~explode_all =
- ("explodeall",(if explode_all then "true()" else "false()"))::
- ["processorURL", "'" ^ processorURL ^ "'" ;
- "getterURL", "'" ^ getterURL ^ "'" ;
- "draw_graphURL", "'http%3A//phd.cs.unibo.it%3A8083/'" ;
- "uri_set_queueURL", "'http%3A//phd.cs.unibo.it%3A8084/'" ;
- "UNICODEvsSYMBOL", "'symbol'" ;
- "doctype-public", "'-//W3C//DTD%20XHTML%201.0%20Transitional//EN'" ;
- "encoding", "'iso-8859-1'" ;
- "media-type", "'text/html'" ;
- "keys", "'d_c%2CC1%2CG%2CC2%2CL'" ;
- "interfaceURL", "'http%3A//phd.cs.unibo.it/helm/html/cic/index.html'" ;
- "naturalLanguage", "'yes'" ;
- "annotations", "'no'" ;
- "URLs_or_URIs", "'URIs'" ;
- "topurl", "'http://phd.cs.unibo.it/helm'" ;
- "CICURI", "'cic:/Coq/Init/Datatypes/bool_ind.con'" ]
-;;
-
-let sequent_styles = [d_c ; c1 ; g ; c2 ; l];;
-let sequent_args =
- ["processorURL", "'" ^ processorURL ^ "'" ;
- "getterURL", "'" ^ getterURL ^ "'" ;
- "draw_graphURL", "'http%3A//phd.cs.unibo.it%3A8083/'" ;
- "uri_set_queueURL", "'http%3A//phd.cs.unibo.it%3A8084/'" ;
- "UNICODEvsSYMBOL", "'symbol'" ;
- "doctype-public", "'-//W3C//DTD%20XHTML%201.0%20Transitional//EN'" ;
- "encoding", "'iso-8859-1'" ;
- "media-type", "'text/html'" ;
- "keys", "'d_c%2CC1%2CG%2CC2%2CL'" ;
- "interfaceURL", "'http%3A//phd.cs.unibo.it/helm/html/cic/index.html'" ;
- "naturalLanguage", "'no'" ;
- "annotations", "'no'" ;
- "explodeall", "true()" ;
- "URLs_or_URIs", "'URIs'" ;
- "topurl", "'http://phd.cs.unibo.it/helm'" ;
- "CICURI", "'cic:/Coq/Init/Datatypes/bool_ind.con'" ]
-;;
-
-let parse_file filename =
- let inch = open_in filename in
- let rec read_lines () =
- try
- let line = input_line inch in
- line ^ read_lines ()
- with
- End_of_file -> ""
- in
- read_lines ()
-;;
-
-let applyStylesheets input styles args =
- List.fold_left (fun i style -> Gdome_xslt.applyStylesheet i style args)
- input styles
-;;
-
let
mml_of_cic_object ~explode_all uri annobj ids_to_inner_sorts ids_to_inner_types
=
in
let input =
match bodyxml with
- None -> Xml2Gdome.document_of_xml domImpl xml
+ None -> Xml2Gdome.document_of_xml Misc.domImpl xml
| Some bodyxml' ->
Xml.pp xml (Some constanttypefile) ;
- Xml2Gdome.document_of_xml domImpl bodyxml'
+ Xml2Gdome.document_of_xml Misc.domImpl bodyxml'
in
(*CSC: We save the innertypes to disk so that we can retrieve them in the *)
(*CSC: stylesheet. This DOES NOT work when UWOBO and/or the getter are not *)
(*CSC: local. *)
Xml.pp xmlinnertypes (Some innertypesfile) ;
- let output = applyStylesheets input mml_styles (mml_args ~explode_all) in
+ let output = ApplyStylesheets.apply_proof_stylesheets input ~explode_all in
output
;;
exception RefreshSequentException of exn;;
exception RefreshProofException of exn;;
-let refresh_proof (output : GMathView.math_view) =
+let refresh_proof (output : GMathViewAux.single_selection_math_view) =
try
let uri,currentproof =
match !ProofEngine.proof with
mml_of_cic_object ~explode_all:true uri acic ids_to_inner_sorts
ids_to_inner_types
in
- output#load_tree mml ;
+ output#load_doc ~dom:mml ;
current_cic_infos :=
Some (ids_to_terms,ids_to_father_ids,ids_to_conjectures,ids_to_hypotheses)
with
end
else
begin
- let sequent_doc = Xml2Gdome.document_of_xml domImpl sequent_gdome in
+ let sequent_doc =
+ Xml2Gdome.document_of_xml Misc.domImpl sequent_gdome in
let sequent_mml =
- applyStylesheets sequent_doc sequent_styles sequent_args
+ ApplyStylesheets.apply_sequent_stylesheets sequent_doc
in
notebook#set_current_page ~may_skip_switch_page_event:true metano;
- notebook#proofw#load_tree ~dom:sequent_mml
+ notebook#proofw#load_doc ~dom:sequent_mml
end ;
current_goal_infos :=
Some (ids_to_terms,ids_to_father_ids,ids_to_hypotheses)
SequentPp.XmlPp.print_sequent metasenv (metano,context,term)
in
let sequent_doc =
- Xml2Gdome.document_of_xml domImpl sequent_gdome
+ Xml2Gdome.document_of_xml Misc.domImpl sequent_gdome
in
- let res =
- applyStylesheets sequent_doc sequent_styles sequent_args ;
- in
+ let res = ApplyStylesheets.apply_sequent_stylesheets sequent_doc in
current_scratch_infos :=
Some (term,ids_to_terms,ids_to_father_ids,ids_to_hypotheses) ;
res
mml_of_cic_object ~explode_all:false uri acic ids_to_inner_sorts
ids_to_inner_types
in
- ((rendering_window ())#output : GMathView.math_view)#load_tree mml ;
+ ((rendering_window ())#output : GMathViewAux.single_selection_math_view)#load_doc mml ;
!qed_set_sensitive false ;
(* let's save the theorem and register it to the getter *)
let pathname = pathname_of_annuri (UriManager.buri_of_uri uri) in
let load () =
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
- let output = ((rendering_window ())#output : GMathView.math_view) in
+ let output = ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
let notebook = (rendering_window ())#notebook in
try
match
;;
let edit_aliases () =
+ let inputt = ((rendering_window ())#inputt : TermEditor.term_editor) in
+ let id_to_uris = inputt#id_to_uris in
let chosen = ref false in
let window =
GWindow.window
let n' = Str.search_forward regexpr inputtext n in
let id = Str.matched_group 2 inputtext in
let uri =
- cic_textual_parser_uri_of_string
+ Misc.cic_textual_parser_uri_of_string
("cic:" ^ (Str.matched_group 5 inputtext))
in
let dom,resolve_id = aux (n' + 1) in
id::dom,
(function id' -> if id = id' then Some uri else resolve_id id')
with
- Not_found -> empty_id_to_uris
+ Not_found -> TermEditor.empty_id_to_uris
in
aux 0
in
- id_to_uris := dom,resolve_id
+ id_to_uris := (dom,resolve_id)
;;
let proveit () =
(*CSC: OCAML DIVERGE
((element : G.element)#getAttributeNS
*)
- ~namespaceURI:helmns
+ ~namespaceURI:Misc.helmns
~localName:(G.domString "xref"))#to_string
in
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
(*CSC: OCAML DIVERGE
((element : G.element)#getAttributeNS
*)
- ~namespaceURI:helmns
+ ~namespaceURI:Misc.helmns
~localName:(G.domString "xref"))#to_string
in
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
let scrolled_window =
GBin.scrolled_window ~border_width:10 ~packing:window#add () in
let mmlwidget =
- GMathView.math_view ~packing:scrolled_window#add ~width:600 ~height:400 () in
+ GMathViewAux.single_selection_math_view ~packing:scrolled_window#add ~width:600 ~height:400 () in
let _ = window#event#connect#delete (fun _ -> window#misc#hide () ; true ) in
let href = Gdome.domString "href" in
let show_in_show_window_obj uri obj =
in
window#set_title (UriManager.string_of_uri uri) ;
window#misc#hide () ; window#show () ;
- mmlwidget#load_tree mml ;
+ mmlwidget#load_doc mml ;
with
e ->
output_html outputhtml
let obj = CicEnvironment.get_obj uri in
show_in_show_window_obj uri obj
in
- let show_in_show_window_callback mmlwidget (n : Gdome.element) =
+ let show_in_show_window_callback mmlwidget (n : Gdome.element) _ =
if n#hasAttributeNS ~namespaceURI:xlinkns ~localName:href then
let uri =
(n#getAttributeNS ~namespaceURI:xlinkns ~localName:href)#to_string
in
show_in_show_window_uri (UriManager.uri_of_string uri)
else
- if mmlwidget#get_action <> None then
- mmlwidget#action_toggle
+ ignore (mmlwidget#action_toggle n)
in
let _ =
- mmlwidget#connect#clicked (show_in_show_window_callback mmlwidget)
+ mmlwidget#connect#click (show_in_show_window_callback mmlwidget)
in
show_in_show_window_obj, show_in_show_window_uri,
show_in_show_window_callback
let result = MQueryGenerator.locate id in
let uris =
List.map
- (function uri,_ -> wrong_xpointer_format_from_wrong_xpointer_format' uri)
+ (function uri,_ ->
+ Misc.wrong_xpointer_format_from_wrong_xpointer_format' uri)
result in
let html =
(" <h1>Locate Query: </h1><pre>" ^ get_last_query result ^ "</pre>")
uris
;;
-let locate () =
- let inputt = ((rendering_window ())#inputt : term_editor) in
- let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
- try
- match
- GToolbox.input_string ~title:"Locate" "Enter an identifier to locate:"
- with
- None -> raise NoChoice
- | Some input ->
- let uri = locate_callback input in
- inputt#set_term uri
- with
- e ->
- output_html outputhtml
- ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
-;;
let input_or_locate_uri ~title =
let uri = ref None in
| Some uri -> UriManager.uri_of_string ("cic:" ^ uri)
;;
-let locate_one_id id =
- let result = MQueryGenerator.locate id in
- let uris =
- List.map
- (function uri,_ ->
- wrong_xpointer_format_from_wrong_xpointer_format' uri
- ) result in
- let html= " <h1>Locate Query: </h1><pre>" ^ get_last_query result ^ "</pre>" in
- output_html (rendering_window ())#outputhtml html ;
- let uris' =
- match uris with
- [] ->
- [UriManager.string_of_uri
- (input_or_locate_uri ~title:("URI matching \"" ^ id ^ "\" unknown."))]
- | [uri] -> [uri]
- | _ ->
- interactive_user_uri_choice
- ~selection_mode:`EXTENDED
- ~ok:"Try every selection."
- ~enable_button_for_non_vars:true
- ~title:"Ambiguous input."
- ~msg:
- ("Ambiguous input \"" ^ id ^
- "\". Please, choose one or more interpretations:")
- uris
- in
- List.map cic_textual_parser_uri_of_string uris'
+exception AmbiguousInput;;
+
+(* A WIDGET TO ENTER CIC TERMS *)
+
+module Callbacks =
+ struct
+ let output_html msg = output_html (outputhtml ()) msg;;
+ let interactive_user_uri_choice =
+ fun ~selection_mode ?ok ?enable_button_for_non_vars ~title ~msg ~id ->
+ interactive_user_uri_choice ~selection_mode ?ok
+ ?enable_button_for_non_vars ~title ~msg;;
+ let interactive_interpretation_choice = interactive_interpretation_choice;;
+ let input_or_locate_uri = input_or_locate_uri;;
+ end
;;
-exception ThereDoesNotExistAnyWellTypedInterpretationOfTheInput;;
-exception AmbiguousInput;;
+module TermEditor' = TermEditor.Make(Callbacks);;
-let disambiguate_input context metasenv dom mk_metasenv_and_expr =
- let known_ids,resolve_id = !id_to_uris in
- let dom' =
- let rec filter =
- function
- [] -> []
- | he::tl ->
- if List.mem he known_ids then filter tl else he::(filter tl)
- in
- filter dom
- in
- (* for each id in dom' we get the list of uris associated to it *)
- let list_of_uris = List.map locate_one_id dom' in
- (* and now we compute the list of all possible assignments from id to uris *)
- let resolve_ids =
- let rec aux ids list_of_uris =
- match ids,list_of_uris with
- [],[] -> [resolve_id]
- | id::idtl,uris::uristl ->
- let resolves = aux idtl uristl in
- List.concat
- (List.map
- (function uri ->
- List.map
- (function f ->
- function id' -> if id = id' then Some uri else f id'
- ) resolves
- ) uris
- )
- | _,_ -> assert false
- in
- aux dom' list_of_uris
- in
- let tests_no = List.length resolve_ids in
- if tests_no > 1 then
- output_html (outputhtml ())
- ("<h1>Disambiguation phase started: " ^
- string_of_int (List.length resolve_ids) ^ " cases will be tried.") ;
- (* now we select only the ones that generates well-typed terms *)
- let resolve_ids' =
- let rec filter =
- function
- [] -> []
- | resolve::tl ->
- let metasenv',expr = mk_metasenv_and_expr resolve in
- try
-(*CSC: Bug here: we do not try to typecheck also the metasenv' *)
- ignore
- (CicTypeChecker.type_of_aux' metasenv context expr) ;
- resolve::(filter tl)
- with
- _ -> filter tl
- in
- filter resolve_ids
- in
- let resolve_id' =
- match resolve_ids' with
- [] -> raise ThereDoesNotExistAnyWellTypedInterpretationOfTheInput
- | [resolve_id] -> resolve_id
- | _ ->
- let choices =
- List.map
- (function resolve ->
- List.map
- (function id ->
- id,
- match resolve id with
- None -> assert false
- | Some uri ->
- match uri with
- CicTextualParser0.ConUri uri
- | CicTextualParser0.VarUri uri ->
- UriManager.string_of_uri uri
- | CicTextualParser0.IndTyUri (uri,tyno) ->
- UriManager.string_of_uri uri ^ "#xpointer(1/" ^
- string_of_int (tyno+1) ^ ")"
- | CicTextualParser0.IndConUri (uri,tyno,consno) ->
- UriManager.string_of_uri uri ^ "#xpointer(1/" ^
- string_of_int (tyno+1) ^ "/" ^ string_of_int consno ^ ")"
- ) dom
- ) resolve_ids'
- in
- let index = interactive_interpretation_choice choices in
- List.nth resolve_ids' index
- in
- id_to_uris := known_ids @ dom', resolve_id' ;
- mk_metasenv_and_expr resolve_id'
+(* OTHER FUNCTIONS *)
+
+let locate () =
+ let inputt = ((rendering_window ())#inputt : TermEditor.term_editor) in
+ let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
+ try
+ match
+ GToolbox.input_string ~title:"Locate" "Enter an identifier to locate:"
+ with
+ None -> raise NoChoice
+ | Some input ->
+ let uri = locate_callback input in
+ inputt#set_term uri
+ with
+ e ->
+ output_html outputhtml
+ ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
;;
+
exception UriAlreadyInUse;;
exception NotAUriToAConstant;;
let new_inductive () =
+ let inputt = ((rendering_window ())#inputt : TermEditor.term_editor) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
- let output = ((rendering_window ())#output : GMathView.math_view) in
+ let output = ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
let notebook = (rendering_window ())#notebook in
let chosen = ref false in
let get_base_uri = ref (function _ -> assert false) in
let get_names = ref (function _ -> assert false) in
let get_types_and_cons = ref (function _ -> assert false) in
- let get_name_context_context_and_subst = ref (function _ -> assert false) in
+ let get_context_and_subst = ref (function _ -> assert false) in
let window =
GWindow.window
~width:600 ~modal:true ~position:`CENTER
GBin.scrolled_window ~border_width:5
~packing:(vbox#pack ~expand:true ~padding:0) () in
let newinputt =
- new term_editor ~width:400 ~height:20 ~packing:scrolled_window#add ()
+ TermEditor'.term_editor
+ ~width:400 ~height:20 ~packing:scrolled_window#add
+ ~share_id_to_uris_with:inputt ()
~isnotempty_callback:
(function b ->
(*non_empty_type := b ;*)
let types_and_cons =
List.map2
(fun name (newinputt,cons_names_entry) ->
- let dom,mk_metasenv_and_expr =
- newinputt#get_term ~context:[] ~metasenv:[] in
let consnamesstr = cons_names_entry#text in
let cons_names = Str.split (Str.regexp " +") consnamesstr in
let metasenv,expr =
- disambiguate_input [] [] dom mk_metasenv_and_expr
+ newinputt#get_metasenv_and_term ~context:[] ~metasenv:[]
in
match metasenv with
[] -> expr,cons_names
CicTypeChecker.typecheck_mutual_inductive_defs uri
(tys,params,paramsno)
in
- get_name_context_context_and_subst :=
+ get_context_and_subst :=
(function () ->
let i = ref 0 in
List.fold_left2
- (fun (namecontext,context,subst) name (ty,_) ->
+ (fun (context,subst) name (ty,_) ->
let res =
- (Some (Cic.Name name))::namecontext,
- (Some (Cic.Name name, Cic.Decl ty))::context,
+ (Some (Cic.Name name, Cic.Decl ty))::context,
(Cic.MutInd (uri,!i,[]))::subst
in
incr i ; res
- ) ([],[],[]) names types_and_cons) ;
+ ) ([],[]) names types_and_cons) ;
let types_and_cons' =
List.map2
(fun name (ty,cons) -> (name, !inductive, ty, phase3 name cons))
GBin.scrolled_window ~border_width:5
~packing:(vbox#pack ~expand:true ~padding:0) () in
let newinputt =
- new term_editor ~width:400 ~height:20 ~packing:scrolled_window#add ()
+ TermEditor'.term_editor
+ ~width:400 ~height:20 ~packing:scrolled_window#add
+ ~share_id_to_uris_with:inputt ()
~isnotempty_callback:
(function b ->
(* (*non_empty_type := b ;*)
(function () ->
try
chosen := true ;
- let namecontext,context,subst= !get_name_context_context_and_subst () in
+ let context,subst= !get_context_and_subst () in
let cons_types =
List.map2
(fun name inputt ->
- let dom,mk_metasenv_and_expr =
- inputt#get_term ~context:namecontext ~metasenv:[]
+ let metasenv,expr =
+ inputt#get_metasenv_and_term ~context ~metasenv:[]
in
- let metasenv,expr =
- disambiguate_input context [] dom mk_metasenv_and_expr
- in
- match metasenv with
- [] ->
- let undebrujined_expr =
- List.fold_left
- (fun expr t -> CicSubstitution.subst t expr) expr subst
- in
- name, undebrujined_expr
- | _ -> raise AmbiguousInput
+ match metasenv with
+ [] ->
+ let undebrujined_expr =
+ List.fold_left
+ (fun expr t -> CicSubstitution.subst t expr) expr subst
+ in
+ name, undebrujined_expr
+ | _ -> raise AmbiguousInput
) cons cons_type_widgets
in
get_cons_types := (function () -> cons_types) ;
("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>") ;
;;
+let mk_fresh_name_callback context name ~typ =
+ let fresh_name =
+ match ProofEngineHelpers.mk_fresh_name context name ~typ with
+ Cic.Name fresh_name -> fresh_name
+ | Cic.Anonymous -> assert false
+ in
+ match
+ GToolbox.input_string ~title:"Enter a fresh hypothesis name" ~text:fresh_name
+ ("Enter a fresh name for the hypothesis " ^
+ CicPp.pp typ
+ (List.map (function None -> None | Some (n,_) -> Some n) context))
+ with
+ Some fresh_name' -> Cic.Name fresh_name'
+ | None -> raise NoChoice
+;;
+
let new_proof () =
- let inputt = ((rendering_window ())#inputt : term_editor) in
+ let inputt = ((rendering_window ())#inputt : TermEditor.term_editor) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
- let output = ((rendering_window ())#output : GMathView.math_view) in
+ let output = ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
let notebook = (rendering_window ())#notebook in
let chosen = ref false in
- let get_parsed = ref (function _ -> assert false) in
+ let get_metasenv_and_term = ref (function _ -> assert false) in
let get_uri = ref (function _ -> assert false) in
let non_empty_type = ref false in
let window =
~packing:(hbox#pack ~expand:false ~fill:false ~padding:5) () in
(* moved here to have visibility of the ok button *)
let newinputt =
- new term_editor ~width:400 ~height:100 ~packing:scrolled_window#add ()
+ TermEditor'.term_editor ~width:400 ~height:100 ~packing:scrolled_window#add
+ ~share_id_to_uris_with:inputt ()
~isnotempty_callback:
(function b ->
non_empty_type := b ;
(function () ->
chosen := true ;
try
- let parsed = newinputt#get_term [] [] in
+ let metasenv,parsed = newinputt#get_metasenv_and_term [] [] in
let uristr = "cic:" ^ uri_entry#text in
let uri = UriManager.uri_of_string uristr in
if String.sub uristr (String.length uristr - 4) 4 <> ".con" then
raise UriAlreadyInUse
with
Getter.Unresolved ->
- get_parsed := (function () -> parsed) ;
+ get_metasenv_and_term := (function () -> metasenv,parsed) ;
get_uri := (function () -> uri) ;
window#destroy ()
end
GMain.Main.main () ;
if !chosen then
try
- let dom,mk_metasenv_and_expr = !get_parsed () in
- let metasenv,expr =
- disambiguate_input [] [] dom mk_metasenv_and_expr
- in
- let _ = CicTypeChecker.type_of_aux' metasenv [] expr in
- ProofEngine.proof :=
- Some (!get_uri (), (1,[],expr)::metasenv, Cic.Meta (1,[]), expr) ;
- ProofEngine.goal := Some 1 ;
- refresh_sequent notebook ;
- refresh_proof output ;
- !save_set_sensitive true ;
- inputt#reset
+ let metasenv,expr = !get_metasenv_and_term () in
+ let _ = CicTypeChecker.type_of_aux' metasenv [] expr in
+ ProofEngine.proof :=
+ Some (!get_uri (), (1,[],expr)::metasenv, Cic.Meta (1,[]), expr) ;
+ ProofEngine.goal := Some 1 ;
+ refresh_sequent notebook ;
+ refresh_proof output ;
+ !save_set_sensitive true ;
+ inputt#reset ;
+ ProofEngine.intros ~mk_fresh_name_callback () ;
+ refresh_sequent notebook ;
+ refresh_proof output
with
RefreshSequentException e ->
output_html outputhtml
let check_term_in_scratch scratch_window metasenv context expr =
try
- let ty = CicTypeChecker.type_of_aux' metasenv context expr in
+ let ty = CicTypeChecker.type_of_aux' metasenv context expr in
let mml = mml_of_cic_term 111 (Cic.Cast (expr,ty)) in
-prerr_endline ("### " ^ CicPp.ppterm expr ^ " ==> " ^ CicPp.ppterm ty) ;
scratch_window#show () ;
- scratch_window#mmlwidget#load_tree ~dom:mml
+ scratch_window#mmlwidget#load_doc ~dom:mml
with
e ->
print_endline ("? " ^ CicPp.ppterm expr) ;
;;
let check scratch_window () =
- let inputt = ((rendering_window ())#inputt : term_editor) in
+ let inputt = ((rendering_window ())#inputt : TermEditor.term_editor) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
let metasenv =
match !ProofEngine.proof with
None -> []
| Some (_,metasenv,_,_) -> metasenv
in
- let context,names_context =
- let context =
- match !ProofEngine.goal with
- None -> []
- | Some metano ->
- let (_,canonical_context,_) =
- List.find (function (m,_,_) -> m=metano) metasenv
- in
- canonical_context
- in
- context,
- List.map
- (function
- Some (n,_) -> Some n
- | None -> None
- ) context
+ let context =
+ match !ProofEngine.goal with
+ None -> []
+ | Some metano ->
+ let (_,canonical_context,_) =
+ List.find (function (m,_,_) -> m=metano) metasenv
+ in
+ canonical_context
in
try
- let dom,mk_metasenv_and_expr = inputt#get_term names_context metasenv in
- let (metasenv',expr) =
- disambiguate_input context metasenv dom mk_metasenv_and_expr
- in
- check_term_in_scratch scratch_window metasenv' context expr
+ let metasenv',expr = inputt#get_metasenv_and_term context metasenv in
+ check_term_in_scratch scratch_window metasenv' context expr
with
e ->
output_html outputhtml
("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>") ;
;;
+let decompose_uris_choice_callback uris =
+(* N.B.: in questo passaggio perdo l'informazione su exp_named_subst !!!! *)
+ let module U = UriManager in
+ List.map
+ (function uri ->
+ match Misc.cic_textual_parser_uri_of_string uri with
+ CicTextualParser0.IndTyUri (uri,typeno) -> (uri,typeno,[])
+ | _ -> assert false)
+ (interactive_user_uri_choice
+ ~selection_mode:`EXTENDED ~ok:"Ok" ~enable_button_for_non_vars:false
+ ~title:"Decompose" ~msg:"Please, select the Inductive Types to decompose"
+ (List.map
+ (function (uri,typeno,_) ->
+ U.string_of_uri uri ^ "#1/" ^ string_of_int (typeno+1)
+ ) uris)
+ )
+;;
(***********************)
(* TACTICS *)
let call_tactic tactic () =
let notebook = (rendering_window ())#notebook in
- let output = ((rendering_window ())#output : GMathView.math_view) in
+ let output = ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
let savedproof = !ProofEngine.proof in
let savedgoal = !ProofEngine.goal in
let call_tactic_with_input tactic () =
let notebook = (rendering_window ())#notebook in
- let output = ((rendering_window ())#output : GMathView.math_view) in
+ let output = ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
- let inputt = ((rendering_window ())#inputt : term_editor) in
+ let inputt = ((rendering_window ())#inputt : TermEditor.term_editor) in
let savedproof = !ProofEngine.proof in
let savedgoal = !ProofEngine.goal in
let uri,metasenv,bo,ty =
List.find (function (m,_,_) -> m=metano) metasenv
in
canonical_context
- in
- let context =
- List.map
- (function
- Some (n,_) -> Some n
- | None -> None
- ) canonical_context
in
try
- let dom,mk_metasenv_and_expr = inputt#get_term context metasenv in
- let (metasenv',expr) =
- disambiguate_input canonical_context metasenv dom mk_metasenv_and_expr
- in
- ProofEngine.proof := Some (uri,metasenv',bo,ty) ;
- tactic expr ;
- refresh_sequent notebook ;
- refresh_proof output ;
- inputt#reset
+ let metasenv',expr =
+ inputt#get_metasenv_and_term canonical_context metasenv
+ in
+ ProofEngine.proof := Some (uri,metasenv',bo,ty) ;
+ tactic expr ;
+ refresh_sequent notebook ;
+ refresh_proof output ;
+ inputt#reset
with
RefreshSequentException e ->
output_html outputhtml
let module L = LogicalOperations in
let module G = Gdome in
let notebook = (rendering_window ())#notebook in
- let output = ((rendering_window ())#output : GMathView.math_view) in
+ let output = ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
let savedproof = !ProofEngine.proof in
let savedgoal = !ProofEngine.goal in
- match notebook#proofw#get_selection with
- Some node ->
+ match notebook#proofw#get_selections with
+ [node] ->
let xpath =
((node : Gdome.element)#getAttributeNS
- ~namespaceURI:helmns
+ ~namespaceURI:Misc.helmns
~localName:(G.domString "xref"))#to_string
in
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
ProofEngine.proof := savedproof ;
ProofEngine.goal := savedgoal ;
end
- | None ->
+ | [] ->
output_html outputhtml
("<h1 color=\"red\">No term selected</h1>")
+ | _ ->
+ output_html outputhtml
+ ("<h1 color=\"red\">Many terms selected</h1>")
+;;
+
+let call_tactic_with_goal_inputs tactic () =
+ let module L = LogicalOperations in
+ let module G = Gdome in
+ let notebook = (rendering_window ())#notebook in
+ let output =
+ ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
+ let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
+ let savedproof = !ProofEngine.proof in
+ let savedgoal = !ProofEngine.goal in
+ try
+ let term_of_node node =
+ let xpath =
+ ((node : Gdome.element)#getAttributeNS
+ ~namespaceURI:Misc.helmns
+ ~localName:(G.domString "xref"))#to_string
+ in
+ if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
+ else
+ match !current_goal_infos with
+ Some (ids_to_terms, ids_to_father_ids,_) ->
+ let id = xpath in
+ (Hashtbl.find ids_to_terms id)
+ | None -> assert false (* "ERROR: No current term!!!" *)
+ in
+ match notebook#proofw#get_selections with
+ [] ->
+ output_html outputhtml
+ ("<h1 color=\"red\">No term selected</h1>")
+ | l ->
+ let terms = List.map term_of_node l in
+ match !current_goal_infos with
+ Some (ids_to_terms, ids_to_father_ids,_) ->
+ tactic terms ;
+ refresh_sequent notebook ;
+ refresh_proof output
+ | None -> assert false (* "ERROR: No current term!!!" *)
+ with
+ RefreshSequentException e ->
+ output_html outputhtml
+ ("<h1 color=\"red\">Exception raised during the refresh of the " ^
+ "sequent: " ^ Printexc.to_string e ^ "</h1>") ;
+ ProofEngine.proof := savedproof ;
+ ProofEngine.goal := savedgoal ;
+ refresh_sequent notebook
+ | RefreshProofException e ->
+ output_html outputhtml
+ ("<h1 color=\"red\">Exception raised during the refresh of the " ^
+ "proof: " ^ Printexc.to_string e ^ "</h1>") ;
+ ProofEngine.proof := savedproof ;
+ ProofEngine.goal := savedgoal ;
+ refresh_sequent notebook ;
+ refresh_proof output
+ | e ->
+ output_html outputhtml
+ ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>") ;
+ ProofEngine.proof := savedproof ;
+ ProofEngine.goal := savedgoal
;;
let call_tactic_with_input_and_goal_input tactic () =
let module L = LogicalOperations in
let module G = Gdome in
let notebook = (rendering_window ())#notebook in
- let output = ((rendering_window ())#output : GMathView.math_view) in
+ let output = ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
- let inputt = ((rendering_window ())#inputt : term_editor) in
+ let inputt = ((rendering_window ())#inputt : TermEditor.term_editor) in
let savedproof = !ProofEngine.proof in
let savedgoal = !ProofEngine.goal in
- match notebook#proofw#get_selection with
- Some node ->
+ match notebook#proofw#get_selections with
+ [node] ->
let xpath =
((node : Gdome.element)#getAttributeNS
- ~namespaceURI:helmns
+ ~namespaceURI:Misc.helmns
~localName:(G.domString "xref"))#to_string
in
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
List.find (function (m,_,_) -> m=metano) metasenv
in
canonical_context in
- let context =
- List.map
- (function
- Some (n,_) -> Some n
- | None -> None
- ) canonical_context
+ let (metasenv',expr) =
+ inputt#get_metasenv_and_term canonical_context metasenv
in
- let dom,mk_metasenv_and_expr = inputt#get_term context metasenv
- in
- let (metasenv',expr) =
- disambiguate_input canonical_context metasenv dom
- mk_metasenv_and_expr
- in
- ProofEngine.proof := Some (uri,metasenv',bo,ty) ;
- tactic ~goal_input:(Hashtbl.find ids_to_terms id)
- ~input:expr ;
- refresh_sequent notebook ;
- refresh_proof output ;
- inputt#reset
+ ProofEngine.proof := Some (uri,metasenv',bo,ty) ;
+ tactic ~goal_input:(Hashtbl.find ids_to_terms id)
+ ~input:expr ;
+ refresh_sequent notebook ;
+ refresh_proof output ;
+ inputt#reset
| None -> assert false (* "ERROR: No current term!!!" *)
with
RefreshSequentException e ->
ProofEngine.proof := savedproof ;
ProofEngine.goal := savedgoal ;
end
- | None ->
+ | [] ->
output_html outputhtml
("<h1 color=\"red\">No term selected</h1>")
+ | _ ->
+ output_html outputhtml
+ ("<h1 color=\"red\">Many terms 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 mmlwidget =
+ (scratch_window#mmlwidget : GMathViewAux.multi_selection_math_view) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
let savedproof = !ProofEngine.proof in
let savedgoal = !ProofEngine.goal in
- match mmlwidget#get_selection with
- Some node ->
+ match mmlwidget#get_selections with
+ [node] ->
let xpath =
((node : Gdome.element)#getAttributeNS
- ~namespaceURI:helmns
+ ~namespaceURI:Misc.helmns
~localName:(G.domString "xref"))#to_string
in
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
let expr = tactic term (Hashtbl.find ids_to_terms id) in
let mml = mml_of_cic_term 111 expr in
scratch_window#show () ;
- scratch_window#mmlwidget#load_tree ~dom:mml
+ scratch_window#mmlwidget#load_doc ~dom:mml
| None -> assert false (* "ERROR: No current term!!!" *)
with
e ->
output_html outputhtml
("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
end
- | None ->
+ | [] ->
output_html outputhtml
("<h1 color=\"red\">No term selected</h1>")
+ | _ ->
+ output_html outputhtml
+ ("<h1 color=\"red\">Many terms selected</h1>")
+;;
+
+let call_tactic_with_goal_inputs_in_scratch tactic scratch_window () =
+ let module L = LogicalOperations in
+ let module G = Gdome in
+ let mmlwidget =
+ (scratch_window#mmlwidget : GMathViewAux.multi_selection_math_view) in
+ let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
+ let savedproof = !ProofEngine.proof in
+ let savedgoal = !ProofEngine.goal in
+ match mmlwidget#get_selections with
+ [] ->
+ output_html outputhtml
+ ("<h1 color=\"red\">No term selected</h1>")
+ | l ->
+ 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 term_of_node node =
+ let xpath =
+ ((node : Gdome.element)#getAttributeNS
+ ~namespaceURI:Misc.helmns
+ ~localName:(G.domString "xref"))#to_string
+ in
+ if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
+ else
+ let id = xpath in
+ Hashtbl.find ids_to_terms id
+ in
+ let terms = List.map term_of_node l in
+ let expr = tactic terms term in
+ let mml = mml_of_cic_term 111 expr in
+ scratch_window#show () ;
+ scratch_window#mmlwidget#load_doc ~dom:mml
+ | None -> assert false (* "ERROR: No current term!!!" *)
+ with
+ e ->
+ output_html outputhtml
+ ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
;;
let call_tactic_with_hypothesis_input tactic () =
let module L = LogicalOperations in
let module G = Gdome in
let notebook = (rendering_window ())#notebook in
- let output = ((rendering_window ())#output : GMathView.math_view) in
+ let output = ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
let savedproof = !ProofEngine.proof in
let savedgoal = !ProofEngine.goal in
- match notebook#proofw#get_selection with
- Some node ->
+ match notebook#proofw#get_selections with
+ [node] ->
let xpath =
((node : Gdome.element)#getAttributeNS
- ~namespaceURI:helmns
+ ~namespaceURI:Misc.helmns
~localName:(G.domString "xref"))#to_string
in
if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
ProofEngine.proof := savedproof ;
ProofEngine.goal := savedgoal ;
end
- | None ->
+ | [] ->
output_html outputhtml
("<h1 color=\"red\">No term selected</h1>")
+ | _ ->
+ output_html outputhtml
+ ("<h1 color=\"red\">Many terms selected</h1>")
;;
-let intros = call_tactic ProofEngine.intros;;
+let intros = call_tactic (ProofEngine.intros ~mk_fresh_name_callback);;
let exact = call_tactic_with_input ProofEngine.exact;;
let apply = call_tactic_with_input ProofEngine.apply;;
let elimintrossimpl = call_tactic_with_input ProofEngine.elim_intros_simpl;;
let elimtype = call_tactic_with_input ProofEngine.elim_type;;
-let whd = call_tactic_with_goal_input ProofEngine.whd;;
-let reduce = call_tactic_with_goal_input ProofEngine.reduce;;
-let simpl = call_tactic_with_goal_input ProofEngine.simpl;;
+let whd = call_tactic_with_goal_inputs ProofEngine.whd;;
+let reduce = call_tactic_with_goal_inputs ProofEngine.reduce;;
+let simpl = call_tactic_with_goal_inputs ProofEngine.simpl;;
let fold_whd = call_tactic_with_input ProofEngine.fold_whd;;
let fold_reduce = call_tactic_with_input ProofEngine.fold_reduce;;
let fold_simpl = call_tactic_with_input ProofEngine.fold_simpl;;
-let cut = call_tactic_with_input ProofEngine.cut;;
+let cut = call_tactic_with_input (ProofEngine.cut ~mk_fresh_name_callback);;
let change = call_tactic_with_input_and_goal_input ProofEngine.change;;
-let letin = call_tactic_with_input ProofEngine.letin;;
+let letin = call_tactic_with_input (ProofEngine.letin ~mk_fresh_name_callback);;
let ring = call_tactic ProofEngine.ring;;
let clearbody = call_tactic_with_hypothesis_input ProofEngine.clearbody;;
let clear = call_tactic_with_hypothesis_input ProofEngine.clear;;
let fourier = call_tactic ProofEngine.fourier;;
let rewritesimpl = call_tactic_with_input ProofEngine.rewrite_simpl;;
+let rewritebacksimpl = call_tactic_with_input ProofEngine.rewrite_back_simpl;;
+let replace = call_tactic_with_input_and_goal_input ProofEngine.replace;;
let reflexivity = call_tactic ProofEngine.reflexivity;;
let symmetry = call_tactic ProofEngine.symmetry;;
let transitivity = call_tactic_with_input ProofEngine.transitivity;;
let left = call_tactic ProofEngine.left;;
let right = call_tactic ProofEngine.right;;
let assumption = call_tactic ProofEngine.assumption;;
-let generalize = call_tactic_with_goal_input ProofEngine.generalize;;
+let generalize =
+ call_tactic_with_goal_inputs (ProofEngine.generalize ~mk_fresh_name_callback);;
let absurd = call_tactic_with_input ProofEngine.absurd;;
let contradiction = call_tactic ProofEngine.contradiction;;
-(* Galla: come dare alla tattica la lista di termini da decomporre?
-let decompose = call_tactic_with_input_and_goal_input ProofEngine.decompose;;
-*)
+let decompose =
+ call_tactic_with_input
+ (ProofEngine.decompose ~uris_choice_callback:decompose_uris_choice_callback);;
let whd_in_scratch scratch_window =
- call_tactic_with_goal_input_in_scratch ProofEngine.whd_in_scratch
+ call_tactic_with_goal_inputs_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
+ call_tactic_with_goal_inputs_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
+ call_tactic_with_goal_inputs_in_scratch ProofEngine.simpl_in_scratch
scratch_window
;;
let open_ () =
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
- let output = ((rendering_window ())#output : GMathView.math_view) in
+ let output = ((rendering_window ())#output : GMathViewAux.single_selection_math_view) in
let notebook = (rendering_window ())#notebook in
try
let uri = input_or_locate_uri ~title:"Open" in
(fun ~row ~column ~event ->
let (uristr,_) = List.nth results row in
match
- cic_textual_parser_uri_of_string
- (wrong_xpointer_format_from_wrong_xpointer_format' uristr)
+ Misc.cic_textual_parser_uri_of_string
+ (Misc.wrong_xpointer_format_from_wrong_xpointer_format'
+ uristr)
with
CicTextualParser0.ConUri uri
| CicTextualParser0.VarUri uri
;;
let completeSearchPattern () =
- let inputt = ((rendering_window ())#inputt : term_editor) in
+ let inputt = ((rendering_window ())#inputt : TermEditor.term_editor) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
try
- let dom,mk_metasenv_and_expr = inputt#get_term ~context:[] ~metasenv:[] in
- let metasenv,expr = disambiguate_input [] [] dom mk_metasenv_and_expr in
+ let metasenv,expr = inputt#get_metasenv_and_term ~context:[] ~metasenv:[] in
let must = MQueryLevels2.get_constraints expr in
let must',only = refine_constraints must in
let results = MQueryGenerator.searchPattern must' only in
("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>") ;
;;
+let insertQuery () =
+ let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
+ try
+ let chosen = ref None in
+ let window =
+ GWindow.window
+ ~modal:true ~title:"Insert Query (Experts Only)" ~border_width:2 () in
+ let vbox = GPack.vbox ~packing:window#add () in
+ let label =
+ GMisc.label ~text:"Insert Query. For Experts Only."
+ ~packing:(vbox#pack ~expand:false ~fill:false ~padding:5) () in
+ let scrolled_window =
+ GBin.scrolled_window ~border_width:10 ~height:400 ~width:600
+ ~packing:(vbox#pack ~expand:true ~fill:true ~padding:5) () in
+ let input = GEdit.text ~editable:true
+ ~packing:scrolled_window#add () in
+ let hbox =
+ GPack.hbox ~packing:(vbox#pack ~expand:false ~fill:false ~padding:5) () in
+ let okb =
+ GButton.button ~label:"Ok"
+ ~packing:(hbox#pack ~expand:false ~fill:false ~padding:5) () in
+ let loadb =
+ GButton.button ~label:"Load from file..."
+ ~packing:(hbox#pack ~expand:false ~fill:false ~padding:5) () in
+ let cancelb =
+ GButton.button ~label:"Abort"
+ ~packing:(hbox#pack ~expand:false ~fill:false ~padding:5) () in
+ ignore (window#connect#destroy GMain.Main.quit) ;
+ ignore (cancelb#connect#clicked window#destroy) ;
+ ignore
+ (okb#connect#clicked
+ (function () ->
+ chosen := Some (input#get_chars 0 input#length) ; window#destroy ())) ;
+ ignore
+ (loadb#connect#clicked
+ (function () ->
+ match
+ GToolbox.select_file ~title:"Select Query File" ()
+ with
+ None -> ()
+ | Some filename ->
+ let inch = open_in filename in
+ let rec read_file () =
+ try
+ let line = input_line inch in
+ line ^ "\n" ^ read_file ()
+ with
+ End_of_file -> ""
+ in
+ let text = read_file () in
+ input#delete_text 0 input#length ;
+ ignore (input#insert_text text ~pos:0))) ;
+ window#set_position `CENTER ;
+ window#show () ;
+ GMain.Main.main () ;
+ match !chosen with
+ None -> ()
+ | Some q ->
+ let results =
+ Mqint.execute (MQueryUtil.query_of_text (Lexing.from_string q))
+ in
+ show_query_results results
+ with
+ e ->
+ output_html outputhtml
+ ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>") ;
+;;
+
let choose_must list_of_must only =
let chosen = ref None in
let user_constraints = ref [] in
;;
let searchPattern () =
- let inputt = ((rendering_window ())#inputt : term_editor) in
+ let inputt = ((rendering_window ())#inputt : TermEditor.term_editor) in
let outputhtml = ((rendering_window ())#outputhtml : GHtml.xmhtml) in
try
let metasenv =
let uris =
List.map
(function uri,_ ->
- wrong_xpointer_format_from_wrong_xpointer_format' uri
+ Misc.wrong_xpointer_format_from_wrong_xpointer_format' uri
) result in
let html =
" <h1>Backward Query: </h1>" ^
if
ProofEngine.can_apply
(term_of_cic_textual_parser_uri
- (cic_textual_parser_uri_of_string uri))
+ (Misc.cic_textual_parser_uri_of_string uri))
then
uri::tl',exc
else
("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
;;
-let choose_selection
- (mmlwidget : GMathView.math_view) (element : Gdome.element option)
-=
+let choose_selection mmlwidget (element : Gdome.element option) =
let module G = Gdome in
let rec aux element =
if element#hasAttributeNS
- ~namespaceURI:helmns
+ ~namespaceURI:Misc.helmns
~localName:(G.domString "xref")
then
mmlwidget#set_selection (Some element)
else
+ try
match element#get_parentNode with
None -> assert false
(*CSC: OCAML DIVERGES!
| Some p -> aux (new G.element_of_node p)
*)
| Some p -> aux (new Gdome.element_of_node p)
+ with
+ GdomeInit.DOMCastException _ ->
+ prerr_endline
+ "******* trying to select above the document root ********"
in
match element with
Some x -> aux x
(* Stuff for the widget settings *)
-let export_to_postscript (output : GMathView.math_view) =
+let export_to_postscript (output : GMathViewAux.single_selection_math_view) =
let lastdir = ref (Unix.getcwd ()) in
function () ->
match
output#export_to_postscript ~filename:filename ();
;;
-let activate_t1 (output : GMathView.math_view) button_set_anti_aliasing
- button_set_kerning button_set_transparency export_to_postscript_menu_item
+let activate_t1 (output : GMathViewAux.single_selection_math_view) button_set_anti_aliasing
+ button_set_transparency export_to_postscript_menu_item
button_t1 ()
=
let is_set = button_t1#active in
if is_set then
begin
button_set_anti_aliasing#misc#set_sensitive true ;
- button_set_kerning#misc#set_sensitive true ;
button_set_transparency#misc#set_sensitive true ;
export_to_postscript_menu_item#misc#set_sensitive true ;
end
else
begin
button_set_anti_aliasing#misc#set_sensitive false ;
- button_set_kerning#misc#set_sensitive false ;
button_set_transparency#misc#set_sensitive false ;
export_to_postscript_menu_item#misc#set_sensitive false ;
end
output#set_anti_aliasing button_set_anti_aliasing#active
;;
-let set_kerning output button_set_kerning () =
- output#set_kerning button_set_kerning#active
-;;
-
let set_transparency output button_set_transparency () =
output#set_transparency button_set_transparency#active
;;
output#set_log_verbosity log_verbosity_spinb#value_as_int
;;
-class settings_window (output : GMathView.math_view) sw
+class settings_window (output : GMathViewAux.single_selection_math_view) sw
export_to_postscript_menu_item selection_changed_callback
=
let settings_window = GWindow.window ~title:"GtkMathView settings" () in
let button_set_anti_aliasing =
GButton.toggle_button ~label:"set_anti_aliasing"
~packing:(table#attach ~left:0 ~top:1) () in
- let button_set_kerning =
- GButton.toggle_button ~label:"set_kerning"
- ~packing:(table#attach ~left:1 ~top:1) () in
let button_set_transparency =
GButton.toggle_button ~label:"set_transparency"
~packing:(table#attach ~left:2 ~top:1) () in
method show = settings_window#show
initializer
button_set_anti_aliasing#misc#set_sensitive false ;
- button_set_kerning#misc#set_sensitive false ;
button_set_transparency#misc#set_sensitive false ;
(* Signals connection *)
ignore(button_t1#connect#clicked
- (activate_t1 output button_set_anti_aliasing button_set_kerning
+ (activate_t1 output button_set_anti_aliasing
button_set_transparency export_to_postscript_menu_item button_t1)) ;
ignore(font_size_spinb#connect#changed (changefont output font_size_spinb)) ;
ignore(button_set_anti_aliasing#connect#toggled
(set_anti_aliasing output button_set_anti_aliasing));
- ignore(button_set_kerning#connect#toggled
- (set_kerning output button_set_kerning)) ;
ignore(button_set_transparency#connect#toggled
(set_transparency output button_set_transparency)) ;
ignore(log_verbosity_spinb#connect#changed
GBin.scrolled_window ~border_width:10
~packing:(vbox#pack ~expand:true ~padding:5) () in
let mmlwidget =
- GMathView.math_view
+ GMathViewAux.multi_selection_math_view
~packing:(scrolled_window#add) ~width:400 ~height:280 () in
object(self)
method mmlwidget = mmlwidget
ignore(simplb#connect#clicked (simpl_in_scratch self))
end;;
+let open_contextual_menu_for_selected_terms mmlwidget infos =
+ let button = GdkEvent.Button.button infos in
+ let terms_selected = List.length mmlwidget#get_selections > 0 in
+ if button = 3 then
+ begin
+ let time = GdkEvent.Button.time infos in
+ let menu = GMenu.menu () in
+ let f = new GMenu.factory menu in
+ let whd_menu_item =
+ f#add_item "Whd" ~key:GdkKeysyms._W ~callback:whd in
+ let reduce_menu_item =
+ f#add_item "Reduce" ~key:GdkKeysyms._R ~callback:reduce in
+ let simpl_menu_item =
+ f#add_item "Simpl" ~key:GdkKeysyms._S ~callback:simpl in
+ let _ = f#add_separator () in
+ let generalize_menu_item =
+ f#add_item "Generalize" ~key:GdkKeysyms._G ~callback:generalize in
+ let _ = f#add_separator () in
+ let clear_menu_item =
+ f#add_item "Clear" ~key:GdkKeysyms._C ~callback:clear in
+ let clearbody_menu_item =
+ f#add_item "ClearBody" ~key:GdkKeysyms._B ~callback:clearbody
+ in
+ whd_menu_item#misc#set_sensitive terms_selected ;
+ reduce_menu_item#misc#set_sensitive terms_selected ;
+ simpl_menu_item#misc#set_sensitive terms_selected ;
+ generalize_menu_item#misc#set_sensitive terms_selected ;
+ clear_menu_item#misc#set_sensitive terms_selected ;
+ clearbody_menu_item#misc#set_sensitive terms_selected ;
+ menu#popup ~button ~time
+ end ;
+ true
+;;
+
class page () =
let vbox1 = GPack.vbox () in
object(self)
GBin.scrolled_window ~border_width:10
~packing:(vbox1#pack ~expand:true ~padding:5) () in
let proofw =
- GMathView.math_view ~width:400 ~height:275
+ GMathViewAux.multi_selection_math_view ~width:400 ~height:275
~packing:(scrolled_window1#add) () in
let _ = proofw_ref <- Some proofw in
let hbox3 =
GPack.hbox ~packing:(vbox1#pack ~expand:false ~fill:false ~padding:5) () in
- let exactb =
- GButton.button ~label:"Exact"
- ~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let introsb =
- GButton.button ~label:"Intros"
- ~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let applyb =
- GButton.button ~label:"Apply"
- ~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let elimintrossimplb =
- GButton.button ~label:"ElimIntrosSimpl"
+ let ringb =
+ GButton.button ~label:"Ring"
~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let elimtypeb =
- GButton.button ~label:"ElimType"
+ let fourierb =
+ GButton.button ~label:"Fourier"
~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let whdb =
- GButton.button ~label:"Whd"
+ let reflexivityb =
+ GButton.button ~label:"Reflexivity"
~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let reduceb =
- GButton.button ~label:"Reduce"
+ let symmetryb =
+ GButton.button ~label:"Symmetry"
~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let simplb =
- GButton.button ~label:"Simpl"
+ let assumptionb =
+ GButton.button ~label:"Assumption"
~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let foldwhdb =
- GButton.button ~label:"Fold_whd"
+ let contradictionb =
+ GButton.button ~label:"Contradiction"
~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
let hbox4 =
GPack.hbox ~packing:(vbox1#pack ~expand:false ~fill:false ~padding:5) () in
- let foldreduceb =
- GButton.button ~label:"Fold_reduce"
- ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
- let foldsimplb =
- GButton.button ~label:"Fold_simpl"
- ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
- let cutb =
- GButton.button ~label:"Cut"
- ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
- let changeb =
- GButton.button ~label:"Change"
+ let existsb =
+ GButton.button ~label:"Exists"
~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
- let letinb =
- GButton.button ~label:"Let ... In"
+ let splitb =
+ GButton.button ~label:"Split"
~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
- let ringb =
- GButton.button ~label:"Ring"
+ let leftb =
+ GButton.button ~label:"Left"
~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
- let clearbodyb =
- GButton.button ~label:"ClearBody"
+ let rightb =
+ GButton.button ~label:"Right"
~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
- let clearb =
- GButton.button ~label:"Clear"
+ let searchpatternb =
+ GButton.button ~label:"SearchPattern_Apply"
~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
let hbox5 =
GPack.hbox ~packing:(vbox1#pack ~expand:false ~fill:false ~padding:5) () in
- let fourierb =
- GButton.button ~label:"Fourier"
+ let exactb =
+ GButton.button ~label:"Exact"
~packing:(hbox5#pack ~expand:false ~fill:false ~padding:5) () in
- let rewritesimplb =
- GButton.button ~label:"RewriteSimpl ->"
+ let introsb =
+ GButton.button ~label:"Intros"
~packing:(hbox5#pack ~expand:false ~fill:false ~padding:5) () in
- let reflexivityb =
- GButton.button ~label:"Reflexivity"
+ let applyb =
+ GButton.button ~label:"Apply"
~packing:(hbox5#pack ~expand:false ~fill:false ~padding:5) () in
- let symmetryb =
- GButton.button ~label:"Symmetry"
+ let elimintrossimplb =
+ GButton.button ~label:"ElimIntrosSimpl"
~packing:(hbox5#pack ~expand:false ~fill:false ~padding:5) () in
- let transitivityb =
- GButton.button ~label:"Transitivity"
+ let elimtypeb =
+ GButton.button ~label:"ElimType"
~packing:(hbox5#pack ~expand:false ~fill:false ~padding:5) () in
- let existsb =
- GButton.button ~label:"Exists"
+ let foldwhdb =
+ GButton.button ~label:"Fold_whd"
~packing:(hbox5#pack ~expand:false ~fill:false ~padding:5) () in
- let splitb =
- GButton.button ~label:"Split"
+ let foldreduceb =
+ GButton.button ~label:"Fold_reduce"
~packing:(hbox5#pack ~expand:false ~fill:false ~padding:5) () in
let hbox6 =
GPack.hbox ~packing:(vbox1#pack ~expand:false ~fill:false ~padding:5) () in
- let leftb =
- GButton.button ~label:"Left"
- ~packing:(hbox6#pack ~expand:false ~fill:false ~padding:5) () in
- let rightb =
- GButton.button ~label:"Right"
+ let foldsimplb =
+ GButton.button ~label:"Fold_simpl"
~packing:(hbox6#pack ~expand:false ~fill:false ~padding:5) () in
- let assumptionb =
- GButton.button ~label:"Assumption"
+ let cutb =
+ GButton.button ~label:"Cut"
~packing:(hbox6#pack ~expand:false ~fill:false ~padding:5) () in
- let generalizeb =
- GButton.button ~label:"Generalize"
+ let changeb =
+ GButton.button ~label:"Change"
~packing:(hbox6#pack ~expand:false ~fill:false ~padding:5) () in
- let absurdb =
- GButton.button ~label:"Absurd"
+ let letinb =
+ GButton.button ~label:"Let ... In"
~packing:(hbox6#pack ~expand:false ~fill:false ~padding:5) () in
- let contradictionb =
- GButton.button ~label:"Contradiction"
+ let rewritesimplb =
+ GButton.button ~label:"RewriteSimpl ->"
~packing:(hbox6#pack ~expand:false ~fill:false ~padding:5) () in
- let searchpatternb =
- GButton.button ~label:"SearchPattern_Apply"
+ let rewritebacksimplb =
+ GButton.button ~label:"RewriteSimpl <-"
~packing:(hbox6#pack ~expand:false ~fill:false ~padding:5) () in
+ let hbox7 =
+ GPack.hbox ~packing:(vbox1#pack ~expand:false ~fill:false ~padding:5) () in
+ let absurdb =
+ GButton.button ~label:"Absurd"
+ ~packing:(hbox7#pack ~expand:false ~fill:false ~padding:5) () in
+ let decomposeb =
+ GButton.button ~label:"Decompose"
+ ~packing:(hbox7#pack ~expand:false ~fill:false ~padding:5) () in
+ let transitivityb =
+ GButton.button ~label:"Transitivity"
+ ~packing:(hbox7#pack ~expand:false ~fill:false ~padding:5) () in
+ let replaceb =
+ GButton.button ~label:"Replace"
+ ~packing:(hbox7#pack ~expand:false ~fill:false ~padding:5) () in
+(* Zack: spostare in una toolbar
+ let generalizeb =
+ GButton.button ~label:"Generalize"
+ ~packing:(hbox7#pack ~expand:false ~fill:false ~padding:5) () in
+ let clearbodyb =
+ GButton.button ~label:"ClearBody"
+ ~packing:(hbox5#pack ~expand:false ~fill:false ~padding:5) () in
+ let clearb =
+ GButton.button ~label:"Clear"
+ ~packing:(hbox5#pack ~expand:false ~fill:false ~padding:5) () in
+ let whdb =
+ GButton.button ~label:"Whd"
+ ~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
+ let reduceb =
+ GButton.button ~label:"Reduce"
+ ~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
+ let simplb =
+ GButton.button ~label:"Simpl"
+ ~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
+*)
ignore(exactb#connect#clicked exact) ;
ignore(applyb#connect#clicked apply) ;
ignore(elimintrossimplb#connect#clicked elimintrossimpl) ;
ignore(elimtypeb#connect#clicked elimtype) ;
- ignore(whdb#connect#clicked whd) ;
- ignore(reduceb#connect#clicked reduce) ;
- ignore(simplb#connect#clicked simpl) ;
ignore(foldwhdb#connect#clicked fold_whd) ;
ignore(foldreduceb#connect#clicked fold_reduce) ;
ignore(foldsimplb#connect#clicked fold_simpl) ;
ignore(changeb#connect#clicked change) ;
ignore(letinb#connect#clicked letin) ;
ignore(ringb#connect#clicked ring) ;
- ignore(clearbodyb#connect#clicked clearbody) ;
- ignore(clearb#connect#clicked clear) ;
ignore(fourierb#connect#clicked fourier) ;
ignore(rewritesimplb#connect#clicked rewritesimpl) ;
+ ignore(rewritebacksimplb#connect#clicked rewritebacksimpl) ;
+ ignore(replaceb#connect#clicked replace) ;
ignore(reflexivityb#connect#clicked reflexivity) ;
ignore(symmetryb#connect#clicked symmetry) ;
ignore(transitivityb#connect#clicked transitivity) ;
ignore(leftb#connect#clicked left) ;
ignore(rightb#connect#clicked right) ;
ignore(assumptionb#connect#clicked assumption) ;
- ignore(generalizeb#connect#clicked generalize) ;
ignore(absurdb#connect#clicked absurd) ;
ignore(contradictionb#connect#clicked contradiction) ;
ignore(introsb#connect#clicked intros) ;
ignore(searchpatternb#connect#clicked searchPattern) ;
ignore(proofw#connect#selection_changed (choose_selection proofw)) ;
+ ignore
+ ((new GObj.event_ops proofw#as_widget)#connect#button_press
+ (open_contextual_menu_for_selected_terms proofw)) ;
+ ignore(decomposeb#connect#clicked decompose) ;
+(* Zack: spostare in una toolbar
+ ignore(whdb#connect#clicked whd) ;
+ ignore(reduceb#connect#clicked reduce) ;
+ ignore(simplb#connect#clicked simpl) ;
+ ignore(clearbodyb#connect#clicked clearbody) ;
+ ignore(clearb#connect#clicked clear) ;
+ ignore(generalizeb#connect#clicked generalize) ;
+*)
))
end
;;
GBin.scrolled_window ~border_width:10
~packing:(vbox1#pack ~expand:true ~padding:5) () in
let proofw =
- GMathView.math_view ~width:400 ~height:275
+ GMathViewAux.single_selection_math_view ~width:400 ~height:275
~packing:(scrolled_window1#add) () in
object(self)
- method proofw = (assert false : GMathView.math_view)
+ method proofw = (assert false : GMathViewAux.single_selection_math_view)
method content = vbox1
method compute = (assert false : unit)
end
let show_menu_item =
factory4#add_item "Show..." ~key:GdkKeysyms._H ~callback:show
in
+ let insert_query_item =
+ factory4#add_item "Insert Query (Experts Only)..." ~key:GdkKeysyms._U
+ ~callback:insertQuery in
(* settings menu *)
let settings_menu = factory0#add_submenu "Settings" in
let factory3 = new GMenu.factory settings_menu ~accel_group in
GBin.scrolled_window ~border_width:5
~packing:frame#add () in
let inputt =
- new term_editor ~width:400 ~height:100 ~packing:scrolled_window1#add ()
+ TermEditor'.term_editor
+ ~width:400 ~height:100 ~packing:scrolled_window1#add ()
~isnotempty_callback:
(function b ->
check_menu_item#misc#set_sensitive b ;
object
method outputhtml = outputhtml
method inputt = inputt
- method output = (output : GMathView.math_view)
+ method output = (output : GMathViewAux.single_selection_math_view)
method notebook = notebook
method show = window#show
initializer
choose_selection output elem ;
!focus_and_proveit_set_sensitive true
)) ;
- ignore (output#connect#clicked (show_in_show_window_callback output)) ;
+ ignore (output#connect#click (show_in_show_window_callback output)) ;
let settings_window = new settings_window output scrolled_window0
export_to_postscript_menu_item (choose_selection output) in
set_settings_window settings_window ;
let initialize_everything () =
let module U = Unix in
- let output = GMathView.math_view ~width:350 ~height:280 () in
+ let output = GMathViewAux.single_selection_math_view ~width:350 ~height:280 () in
let notebook = new notebook in
let rendering_window' = new rendering_window output notebook in
set_rendering_window rendering_window' ;