-(* Copyright (C) 2000, HELM Team.
+(* Copyright (C) 2000-2002, HELM Team.
*
* This file is part of HELM, an Hypertextual, Electronic
* Library of Mathematics, developed at the Computer Science
"</html>"
;;
+let prooffile = "/public/sacerdot/currentproof";;
+(*CSC: the getter should handle the innertypes, not the FS *)
+let innertypesfile = "/public/sacerdot/innertypes";;
+
(* GLOBAL REFERENCES (USED BY CALLBACKS) *)
let htmlheader_and_content = ref htmlheader;;
let current_goal_infos = ref None;;
let current_scratch_infos = ref None;;
+(* COMMAND LINE OPTIONS *)
+
+let usedb = ref true
+
+let argspec =
+ [
+ "-nodb", Arg.Clear usedb, "disable use of MathQL DB"
+ ]
+in
+Arg.parse argspec ignore ""
+
(* MISC FUNCTIONS *)
let mml_of_cic_object uri annobj ids_to_inner_sorts ids_to_inner_types =
let xml =
- Cic2Xml.print_object uri ids_to_inner_sorts annobj
+ Cic2Xml.print_object uri ~ids_to_inner_sorts annobj
in
let xmlinnertypes =
- Cic2Xml.print_inner_types uri ids_to_inner_sorts
- ids_to_inner_types
+ Cic2Xml.print_inner_types uri ~ids_to_inner_sorts
+ ~ids_to_inner_types
in
let input = Xml2Gdome.document_of_xml domImpl xml 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 "/public/sacerdot/innertypes") ;
+ Xml.pp xmlinnertypes (Some innertypesfile) ;
let output = applyStylesheets input mml_styles mml_args in
output
;;
None -> assert false
| Some (curi,_,_,_) -> curi
in
- let metasenv =
+ let uri,metasenv,bo,ty =
match !ProofEngine.proof with
None -> assert false
- | Some (_,metasenv,_,_) -> metasenv
+ | Some (uri,metasenv,bo,ty) -> uri,metasenv,bo,ty
in
let context =
List.map
try
while true do
match
- CicTextualParserContext.main curi context CicTextualLexer.token lexbuf
+ CicTextualParserContext.main
+ curi context metasenv CicTextualLexer.token lexbuf
with
None -> ()
- | Some expr ->
+ | Some (metasenv',expr) ->
+ ProofEngine.proof := Some (uri,metasenv',bo,ty) ;
tactic expr ;
refresh_sequent proofw ;
refresh_proof output
None -> assert false
| Some (curi,_,_,_) -> curi
in
- let metasenv =
+ let uri,metasenv,bo,ty =
match !ProofEngine.proof with
None -> assert false
- | Some (_,metasenv,_,_) -> metasenv
+ | Some (uri,metasenv,bo,ty) -> uri,metasenv,bo,ty
in
let context =
List.map
try
while true do
match
- CicTextualParserContext.main curi context
+ CicTextualParserContext.main curi context metasenv
CicTextualLexer.token lexbuf
with
None -> ()
- | Some expr ->
+ | Some (metasenv',expr) ->
+ ProofEngine.proof := Some (uri,metasenv',bo,ty) ;
tactic ~goal_input:(Hashtbl.find ids_to_terms id)
~input:expr ;
refresh_sequent proofw ;
let elimintrossimpl rendering_window =
call_tactic_with_input ProofEngine.elim_intros_simpl rendering_window
;;
+let elimtype rendering_window =
+ call_tactic_with_input ProofEngine.elim_type rendering_window
+;;
let whd rendering_window =
call_tactic_with_goal_input ProofEngine.whd rendering_window
;;
let letin rendering_window =
call_tactic_with_input ProofEngine.letin rendering_window
;;
+let ring rendering_window = call_tactic ProofEngine.ring rendering_window;;
let clearbody rendering_window =
call_tactic_with_hypothesis_input ProofEngine.clearbody rendering_window
;;
let (acurrentproof,_,_,ids_to_inner_sorts,_,_,_) =
Cic2acic.acic_object_of_cic_object currentproof
in
- let xml = Cic2Xml.print_object uri ids_to_inner_sorts acurrentproof in
+ let xml = Cic2Xml.print_object uri ~ids_to_inner_sorts acurrentproof in
let xml' =
[< Xml.xml_cdata "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" ;
Xml.xml_cdata
xml
>]
in
- Xml.pp ~quiet:true xml' (Some "/public/sacerdot/currentproof") ;
+ Xml.pp ~quiet:true xml' (Some prooffile) ;
output_html outputhtml
("<h1 color=\"Green\">Current proof saved to " ^
- "/public/sacerdot/currentproof</h1>")
+ prooffile ^ "</h1>")
+;;
+
+(* Used to typecheck the loaded proofs *)
+let typecheck_loaded_proof metasenv bo ty =
+ let module T = CicTypeChecker in
+ (*CSC: bisogna controllare anche il metasenv!!! *)
+ ignore (T.type_of_aux' metasenv [] ty) ;
+ ignore (T.type_of_aux' metasenv [] bo)
;;
let load rendering_window () =
let proofw = (rendering_window#proofw : GMathView.math_view) in
try
let uri = UriManager.uri_of_string "cic:/dummy.con" in
- match CicParser.obj_of_xml "/public/sacerdot/currentproof" uri with
+ match CicParser.obj_of_xml prooffile uri with
Cic.CurrentProof (_,metasenv,bo,ty) ->
+ typecheck_loaded_proof metasenv bo ty ;
ProofEngine.proof :=
Some (uri, metasenv, bo, ty) ;
ProofEngine.goal :=
refresh_sequent proofw ;
output_html outputhtml
("<h1 color=\"Green\">Current proof loaded from " ^
- "/public/sacerdot/currentproof</h1>")
+ prooffile ^ "</h1>")
| _ -> assert false
with
RefreshSequentException e ->
while true do
(* Execute the actions *)
match
- CicTextualParserContext.main curi names_context CicTextualLexer.token
- lexbuf
+ CicTextualParserContext.main curi names_context metasenv
+ CicTextualLexer.token lexbuf
with
None -> ()
- | Some expr ->
+ | Some (metasenv',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
scratch_window#show () ;
scratch_window#mmlwidget#load_tree ~dom:mml
| [] -> ""
| head :: tail ->
inputt#delete_text 0 inputlen;
- Mquery.locate head
+ MQueryGenerator.locate head
with
e -> "<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>"
)
match !ProofEngine.goal with
| None -> ""
| Some metano ->
- let (_,_,ty) =
+ let (_, ey ,ty) =
List.find (function (m,_,_) -> m=metano) metasenv
in
- Mquery.backward ty level
+ MQueryGenerator.backward metasenv ey ty level
in
output_html outputhtml result
+;;
let choose_selection
(mmlwidget : GMathView.math_view) (element : Gdome.element option)
let elimintrossimplb =
GButton.button ~label:"ElimIntrosSimpl"
~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
+ let elimtypeb =
+ GButton.button ~label:"ElimType"
+ ~packing:(hbox3#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 changeb =
GButton.button ~label:"Change"
~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let letinb =
- GButton.button ~label:"Let ... In"
- ~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 letinb =
+ GButton.button ~label:"Let ... In"
+ ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let ringb =
+ GButton.button ~label:"Ring"
+ ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
let clearbodyb =
GButton.button ~label:"ClearBody"
~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
ignore(exactb#connect#clicked (exact self)) ;
ignore(applyb#connect#clicked (apply self)) ;
ignore(elimintrossimplb#connect#clicked (elimintrossimpl self)) ;
+ ignore(elimtypeb#connect#clicked (elimtype self)) ;
ignore(whdb#connect#clicked (whd self)) ;
ignore(reduceb#connect#clicked (reduce self)) ;
ignore(simplb#connect#clicked (simpl self)) ;
ignore(cutb#connect#clicked (cut self)) ;
ignore(changeb#connect#clicked (change self)) ;
ignore(letinb#connect#clicked (letin self)) ;
+ ignore(ringb#connect#clicked (ring self)) ;
ignore(clearbodyb#connect#clicked (clearbody self)) ;
ignore(clearb#connect#clicked (clear self)) ;
ignore(introsb#connect#clicked (intros self)) ;
let _ =
CicCooking.init () ;
- Mquery.init () ;
+ if !usedb then MQueryGenerator.init () ;
ignore (GtkMain.Main.init ()) ;
initialize_everything () ;
- Mquery.close ()
+ if !usedb then MQueryGenerator.close ();
;;
projects / helm.git / blobdiff