X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FgTopLevel.ml;h=4a730283208354abffc7529ac3822640747923f0;hb=373eaf73bebec626e031a4a534ddfdd4f1c1b474;hp=d052040c5f8177502ac4e2a4c1cee1cb879cf3ea;hpb=b2b968e27508993b1716810c2c27ff532e284742;p=helm.git

diff --git a/helm/gTopLevel/gTopLevel.ml b/helm/gTopLevel/gTopLevel.ml
index d052040c5..4a7302832 100644
--- a/helm/gTopLevel/gTopLevel.ml
+++ b/helm/gTopLevel/gTopLevel.ml
@@ -1,4 +1,4 @@
-(* 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
@@ -33,6 +33,18 @@
 (*                                                                            *)
 (******************************************************************************)
 
+
+(* 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";;
@@ -47,6 +59,24 @@ let htmlfooter =
  "</html>"
 ;;
 
+(*
+let prooffile = "/home/tassi/miohelm/tmp/currentproof";;
+let prooffile = "/public/sacerdot/currentproof";;
+*)
+
+let prooffile = "/home/galata/miohelm/currentproof";;
+let prooffiletype = "/home/galata/miohelm/currentprooftype";;
+
+(*CSC: the getter should handle the innertypes, not the FS *)
+(*
+let innertypesfile = "/home/tassi/miohelm/tmp/innertypes";;
+let innertypesfile = "/public/sacerdot/innertypes";;
+*)
+
+let innertypesfile = "/home/galata/miohelm/innertypes";;
+let constanttypefile = "/home/galata/miohelm/constanttype";;
+
+
 (* GLOBAL REFERENCES (USED BY CALLBACKS) *)
 
 let htmlheader_and_content = ref htmlheader;;
@@ -55,9 +85,52 @@ let current_cic_infos = ref None;;
 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 cic_textual_parser_uri_of_uri uri' =
+ (* 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)
+   )
+;;
+
+let term_of_uri uri =
+ let module C = Cic in
+ let module CTP = CicTextualParser0 in
+  match (cic_textual_parser_uri_of_uri uri) with
+     CTP.ConUri uri -> C.Const (uri,[])
+   | CTP.VarUri uri -> C.Var (uri,[])
+   | CTP.IndTyUri (uri,tyno) -> C.MutInd (uri,tyno,[])
+   | CTP.IndConUri (uri,tyno,consno) -> C.MutConstruct (uri,tyno,consno,[])
+;;
+
 let domImpl = Gdome.domImplementation ();;
 
 let parseStyle name =
@@ -140,18 +213,25 @@ let applyStylesheets input styles args =
 ;;
 
 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 
+(*CSC: ????????????????? *)
+ let xml, bodyxml =
+  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
+  let input =
+   match bodyxml with
+      None -> Xml2Gdome.document_of_xml domImpl xml
+    | Some bodyxml' ->
+       Xml.pp xml (Some constanttypefile) ;
+       Xml2Gdome.document_of_xml 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 "/public/sacerdot/innertypes") ;
+   Xml.pp xmlinnertypes (Some innertypesfile) ;
    let output = applyStylesheets input mml_styles mml_args in
     output
 ;;
@@ -168,7 +248,8 @@ let refresh_proof (output : GMathView.math_view) =
    match !ProofEngine.proof with
       None -> assert false
     | Some (uri,metasenv,bo,ty) ->
-       uri,(Cic.CurrentProof (UriManager.name_of_uri uri, metasenv, bo, ty))
+       (*CSC: Wrong: [] is just plainly wrong *)
+       uri,(Cic.CurrentProof (UriManager.name_of_uri uri, metasenv, bo, ty, []))
   in
    let
     (acic,ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,
@@ -187,7 +268,7 @@ let refresh_proof (output : GMathView.math_view) =
  match !ProofEngine.proof with
     None -> assert false
   | Some (uri,metasenv,bo,ty) ->
-prerr_endline ("Offending proof: " ^ CicPp.ppobj (Cic.CurrentProof ("questa",metasenv,bo,ty))) ; flush stderr ;
+prerr_endline ("Offending proof: " ^ CicPp.ppobj (Cic.CurrentProof ("questa",metasenv,bo,ty,[]))) ; flush stderr ;
    raise (RefreshProofException e)
 ;;
 
@@ -233,7 +314,7 @@ prerr_endline ("Offending sequent: " ^ SequentPp.TextualPp.print_sequent current
 
 (*
 ignore(domImpl#saveDocumentToFile ~doc:sequent_doc
- ~name:"/public/sacerdot/guruguru1" ~indent:true ()) ;
+ ~name:"/home/galata/miohelm/guruguru1" ~indent:true ()) ;
 *)
 
 let mml_of_cic_term metano term =
@@ -326,10 +407,10 @@ let call_tactic_with_input tactic rendering_window () =
        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
@@ -348,10 +429,12 @@ let call_tactic_with_input tactic rendering_window () =
     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
@@ -466,10 +549,10 @@ let call_tactic_with_input_and_goal_input tactic rendering_window () =
                     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
@@ -489,11 +572,12 @@ let call_tactic_with_input_and_goal_input tactic rendering_window () =
                   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 ;
@@ -629,8 +713,11 @@ let exact rendering_window =
 let apply rendering_window =
  call_tactic_with_input ProofEngine.apply rendering_window
 ;;
-let elimintrossimpl rendering_window =
- call_tactic_with_input ProofEngine.elim_intros_simpl rendering_window
+let elimsimplintros rendering_window =
+ call_tactic_with_input ProofEngine.elim_simpl_intros 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
@@ -653,12 +740,42 @@ let change 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 clear rendering_window =
  call_tactic_with_hypothesis_input ProofEngine.clear rendering_window
 ;;
+let fourier rendering_window =
+ call_tactic ProofEngine.fourier rendering_window
+;;
+let rewritesimpl rendering_window =
+ call_tactic_with_input ProofEngine.rewrite_simpl rendering_window
+;;
+let reflexivity rendering_window =
+ call_tactic ProofEngine.reflexivity rendering_window
+;;
+let symmetry rendering_window =
+ call_tactic ProofEngine.symmetry rendering_window
+;;
+let transitivity rendering_window =
+ call_tactic_with_input ProofEngine.transitivity rendering_window
+;;
+let left rendering_window =
+ call_tactic ProofEngine.left rendering_window
+;;
+let right rendering_window =
+ call_tactic ProofEngine.right rendering_window
+;;
+let assumption rendering_window =
+ call_tactic ProofEngine.assumption rendering_window
+;;
+(*
+let prova_tatticali rendering_window =
+ call_tactic ProofEngine.prova_tatticali rendering_window
+;;
+*)
 
 
 let whd_in_scratch scratch_window =
@@ -693,7 +810,7 @@ let qed rendering_window () =
      then
       begin
        (*CSC: Wrong: [] is just plainly wrong *)
-       let proof = Cic.Definition (UriManager.name_of_uri uri,bo,ty,[]) in
+       let proof = Cic.Constant (UriManager.name_of_uri uri,Some bo,ty,[]) in
         let
          (acic,ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,
           ids_to_inner_types,ids_to_conjectures,ids_to_hypotheses)
@@ -716,8 +833,9 @@ let qed rendering_window () =
 
 (*????
 let dtdname = "http://www.cs.unibo.it/helm/dtd/cic.dtd";;
+let dtdname = "/home/tassi/miohelm/helm/dtd/cic.dtd";;
 *)
-let dtdname = "/projects/helm/V7/dtd/cic.dtd";;
+let dtdname = "/projects/helm/V7_mowgli/dtd/cic.dtd";;
 
 let save rendering_window () =
  let outputhtml = (rendering_window#outputhtml : GHtml.xmhtml) in
@@ -725,41 +843,49 @@ let save rendering_window () =
      None -> assert false
    | Some (uri, metasenv, bo, ty) ->
       let currentproof =
-       Cic.CurrentProof (UriManager.name_of_uri uri,metasenv,bo,ty)
+       (*CSC: Wrong: [] is just plainly wrong *)
+       Cic.CurrentProof (UriManager.name_of_uri uri,metasenv,bo,ty,[])
       in
        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' =
-          [< Xml.xml_cdata "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" ;
-             Xml.xml_cdata
-              ("<!DOCTYPE CurrentProof SYSTEM \"" ^ dtdname ^ "\">\n\n") ;
-             xml
-          >]
-         in
-          Xml.pp ~quiet:true xml' (Some "/public/sacerdot/currentproof") ;
-          output_html outputhtml
-           ("<h1 color=\"Green\">Current proof saved to " ^
-             "/public/sacerdot/currentproof</h1>")
+        let xml, bodyxml =
+         match Cic2Xml.print_object uri ~ids_to_inner_sorts acurrentproof with
+            xml,Some bodyxml -> xml,bodyxml
+          | _,None -> assert false
+        in
+         Xml.pp ~quiet:true xml (Some prooffiletype) ;
+         output_html outputhtml
+          ("<h1 color=\"Green\">Current proof type saved to " ^
+           prooffiletype ^ "</h1>") ;
+         Xml.pp ~quiet:true bodyxml (Some prooffile) ;
+         output_html outputhtml
+          ("<h1 color=\"Green\">Current proof body saved to " ^
+           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 (
+   List.fold_left
+    (fun metasenv ((_,context,ty) as conj) ->
+      ignore (T.type_of_aux' metasenv context ty) ;
+      metasenv @ [conj]
+    ) [] metasenv) ;
   ignore (T.type_of_aux' metasenv [] ty) ;
   ignore (T.type_of_aux' metasenv [] bo)
 ;;
 
+(*CSC: ancora da implementare *)
 let load rendering_window () =
  let outputhtml = (rendering_window#outputhtml : GHtml.xmhtml) in
  let output = (rendering_window#output : GMathView.math_view) in
  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
-       Cic.CurrentProof (_,metasenv,bo,ty) ->
+    match CicParser.obj_of_xml prooffiletype (Some prooffile) with
+       Cic.CurrentProof (_,metasenv,bo,ty,_) ->
         typecheck_loaded_proof metasenv bo ty ;
         ProofEngine.proof :=
          Some (uri, metasenv, bo, ty) ;
@@ -771,8 +897,11 @@ let load rendering_window () =
         refresh_proof output ;
         refresh_sequent proofw ;
          output_html outputhtml
-          ("<h1 color=\"Green\">Current proof loaded from " ^
-            "/public/sacerdot/currentproof</h1>")
+          ("<h1 color=\"Green\">Current proof type loaded from " ^
+            prooffiletype ^ "</h1>") ;
+         output_html outputhtml
+          ("<h1 color=\"Green\">Current proof body loaded from " ^
+            prooffile ^ "</h1>")
      | _ -> assert false
   with
      RefreshSequentException e ->
@@ -930,15 +1059,15 @@ let open_ rendering_window () =
  let output = (rendering_window#output : GMathView.math_view) in
  let proofw = (rendering_window#proofw : GMathView.math_view) in
   let inputlen = inputt#length in
-  let input = inputt#get_chars 0 inputlen ^ "\n" in
+  let input = inputt#get_chars 0 inputlen in
    try
     let uri = UriManager.uri_of_string ("cic:" ^ input) in
      CicTypeChecker.typecheck uri ;
      let metasenv,bo,ty =
-      match CicEnvironment.get_cooked_obj uri 0 with
-         Cic.Definition (_,bo,ty,_) -> [],bo,ty
-       | Cic.CurrentProof (_,metasenv,bo,ty) -> metasenv,bo,ty
-       | Cic.Axiom _
+      match CicEnvironment.get_cooked_obj uri with
+         Cic.Constant (_,Some bo,ty,_) -> [],bo,ty
+       | Cic.CurrentProof (_,metasenv,bo,ty,_) -> metasenv,bo,ty
+       | Cic.Constant _
        | Cic.Variable _
        | Cic.InductiveDefinition _ -> raise NotADefinition
      in
@@ -1033,20 +1162,20 @@ let check rendering_window scratch_window () =
        | None -> None
      ) context
   in
-   (* Do something interesting *)
    let lexbuf = Lexing.from_string input in
     try
      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
+prerr_endline ("### " ^ CicPp.ppterm expr ^ " ==> " ^ CicPp.ppterm ty) ;
              scratch_window#show () ;
              scratch_window#mmlwidget#load_tree ~dom:mml
           with
@@ -1061,44 +1190,124 @@ let check rendering_window scratch_window () =
         ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>") ;
 ;;
 
+exception NoObjectsLocated;;
+
+let user_uri_choice uris =
+ let uri =
+  match uris with
+     [] -> raise NoObjectsLocated
+   | [uri] -> uri
+   | uris ->
+      let choice =
+       GToolbox.question_box ~title:"Ambiguous result."
+        ~buttons:uris ~default:1
+        "Ambiguous result. Please, choose one."
+      in
+       List.nth uris (choice-1)
+ in
+  String.sub uri 4 (String.length uri - 4)
+;;
+
+(* CSC: IMPERATIVE AND NOT VERY CLEAN, TO GET THE LAST ISSUED QUERY *)
+let get_last_query = 
+ let query = ref "" in
+  MQueryGenerator.set_confirm_query
+   (function q -> query := MQueryUtil.text_of_query q ; true) ;
+  function result -> !query ^ " <h1>Result:</h1> " ^ MQueryUtil.text_of_result result "<br>"
+;;
+
 let locate rendering_window () =
  let inputt = (rendering_window#inputt : GEdit.text) in
  let outputhtml = (rendering_window#outputhtml : GHtml.xmhtml) in
   let inputlen = inputt#length in
   let input = inputt#get_chars 0 inputlen in
-  output_html outputhtml (
-     try
-        match Str.split (Str.regexp "[ \t]+") input with
-           | [] -> ""
-           | head :: tail ->
-	       inputt#delete_text 0 inputlen;
-	       MQueryGenerator.locate head 
-     with
-        e -> "<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>"
-  )
-;;
-
-let backward rendering_window () =
-   let outputhtml = (rendering_window#outputhtml : GHtml.xmhtml) in
-   let inputt = (rendering_window#inputt : GEdit.text) in
-    let inputlen = inputt#length in
-    let input = inputt#get_chars 0 inputlen in
-    let level = int_of_string input in
-    let metasenv =
-     match !ProofEngine.proof with
-        None -> assert false
-      | Some (_,metasenv,_,_) -> metasenv
-    in
-    let result =
-       match !ProofEngine.goal with
-          | None -> ""
-          | Some metano ->
-             let (_,_,ty) =
-              List.find (function (m,_,_) -> m=metano) metasenv
-             in
-              MQueryGenerator.backward ty level
-       in 
-   output_html outputhtml result
+   try
+    match Str.split (Str.regexp "[ \t]+") input with
+       [] -> ()
+     | head :: tail ->
+        inputt#delete_text 0 inputlen ;
+        let result = MQueryGenerator.locate head 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 outputhtml html ;
+         let uri' = user_uri_choice uris in
+          ignore ((inputt#insert_text uri') ~pos:0)
+   with
+    e ->
+     output_html outputhtml
+      ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
+;;
+
+let searchPattern rendering_window () =
+ let outputhtml = (rendering_window#outputhtml : GHtml.xmhtml) in
+ let inputt = (rendering_window#inputt : GEdit.text) in
+  let inputlen = inputt#length in
+  let input = inputt#get_chars 0 inputlen in
+  let level = int_of_string input in
+  let metasenv =
+   match !ProofEngine.proof with
+      None -> assert false
+    | Some (_,metasenv,_,_) -> metasenv
+  in
+   try
+    match !ProofEngine.goal with
+       None -> ()
+     | Some metano ->
+        let (_, ey ,ty) = List.find (function (m,_,_) -> m=metano) metasenv in
+         let result = MQueryGenerator.searchPattern metasenv ey ty level in
+         let uris =
+          List.map
+           (function uri,_ -> wrong_xpointer_format_from_wrong_xpointer_format' uri)
+           result in
+         let html =
+	  " <h1>Backward Query: </h1>" ^
+	  " <h2>Levels: </h2> " ^
+	   MQueryGenerator.string_of_levels
+            (MQueryGenerator.levels_of_term metasenv ey ty) "<br>" ^
+	   " <pre>" ^ get_last_query result ^ "</pre>"
+         in
+          output_html outputhtml html ;
+          let uris',exc =
+           let rec filter_out =
+            function
+               [] -> [],""
+             | uri::tl ->
+                let tl',exc = filter_out tl in
+                 try
+                  if ProofEngine.can_apply (term_of_uri uri) then
+                   uri::tl',exc
+                  else
+                   tl',exc
+                 with
+                  e ->
+                   let exc' =
+                    "<h1 color=\"red\"> ^ Exception raised trying to apply " ^
+                     uri ^ ": " ^ Printexc.to_string e ^ " </h1>" ^ exc
+                   in
+                    tl',exc'
+           in
+            filter_out uris
+          in
+           let html' =
+            " <h1>Objects that can actually be applied: </h1> " ^
+            String.concat "<br>" uris' ^ exc ^
+            " <h1>Number of false matches: " ^
+             string_of_int (List.length uris - List.length uris') ^ "</h1>" ^
+            " <h1>Number of good matches: " ^
+             string_of_int (List.length uris') ^ "</h1>"
+           in
+            output_html outputhtml html' ;
+            let uri' = user_uri_choice uris' in
+             inputt#delete_text 0 inputlen ;
+             ignore ((inputt#insert_text uri') ~pos:0)
+    with
+     e -> 
+      output_html outputhtml 
+       ("<h1 color=\"red\">" ^ Printexc.to_string e ^ "</h1>")
+;;
       
 let choose_selection
      (mmlwidget : GMathView.math_view) (element : Gdome.element option)
@@ -1345,8 +1554,8 @@ class rendering_window output proofw (label : GMisc.label) =
  let locateb =
   GButton.button ~label:"Locate"
    ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
- let backwardb =
-  GButton.button ~label:"Backward"
+ let searchpatternb =
+  GButton.button ~label:"SearchPattern"
    ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
  let inputt = GEdit.text ~editable:true ~width:400 ~height: 100
    ~packing:(vbox#pack ~padding:5) () in
@@ -1367,8 +1576,11 @@ class rendering_window output proofw (label : GMisc.label) =
  let applyb =
   GButton.button ~label:"Apply"
    ~packing:(hbox3#pack ~expand:false ~fill:false ~padding:5) () in
- let elimintrossimplb =
-  GButton.button ~label:"ElimIntrosSimpl"
+ let elimsimplintrosb =
+  GButton.button ~label:"ElimSimplIntros"
+   ~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"
@@ -1388,17 +1600,47 @@ class rendering_window output proofw (label : GMisc.label) =
  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
  let clearb =
   GButton.button ~label:"Clear"
    ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let fourierb =
+  GButton.button ~label:"Fourier"
+   ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let rewritesimplb =
+  GButton.button ~label:"RewriteSimpl ->"
+   ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let reflexivityb =
+  GButton.button ~label:"Reflexivity"
+   ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let symmetryb =
+  GButton.button ~label:"Symmetry"
+   ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let transitivityb =
+  GButton.button ~label:"Transitivity"
+   ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let leftb =
+  GButton.button ~label:"Left"
+   ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let rightb =
+  GButton.button ~label:"Right"
+   ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let assumptionb =
+  GButton.button ~label:"Assumption"
+   ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
+ let prova_tatticalib =
+  GButton.button ~label:"Prova_tatticali"
+   ~packing:(hbox4#pack ~expand:false ~fill:false ~padding:5) () in
  let outputhtml =
   GHtml.xmhtml
    ~source:"<html><body bgColor=\"white\"></body></html>"
@@ -1437,10 +1679,11 @@ object(self)
   ignore(openb#connect#clicked (open_ self)) ;
   ignore(checkb#connect#clicked (check self scratch_window)) ;
   ignore(locateb#connect#clicked (locate self)) ;
-  ignore(backwardb#connect#clicked (backward self)) ;
+  ignore(searchpatternb#connect#clicked (searchPattern self)) ;
   ignore(exactb#connect#clicked (exact self)) ;
   ignore(applyb#connect#clicked (apply self)) ;
-  ignore(elimintrossimplb#connect#clicked (elimintrossimpl self)) ;
+  ignore(elimsimplintrosb#connect#clicked (elimsimplintros 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)) ;
@@ -1448,8 +1691,20 @@ object(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(fourierb#connect#clicked (fourier self)) ;
+  ignore(rewritesimplb#connect#clicked (rewritesimpl self)) ;
+  ignore(reflexivityb#connect#clicked (reflexivity self)) ;
+  ignore(symmetryb#connect#clicked (symmetry self)) ;
+  ignore(transitivityb#connect#clicked (transitivity self)) ;
+  ignore(leftb#connect#clicked (left self)) ;
+  ignore(rightb#connect#clicked (right self)) ;
+  ignore(assumptionb#connect#clicked (assumption self)) ;
+(*
+  ignore(prova_tatticalib#connect#clicked (prova_tatticali self)) ;
+*)
   ignore(introsb#connect#clicked (intros self)) ;
   Logger.log_callback :=
    (Logger.log_to_html ~print_and_flush:(output_html outputhtml))
@@ -1457,22 +1712,72 @@ end;;
 
 (* MAIN *)
 
+let rendering_window = ref None;;
+
 let initialize_everything () =
  let module U = Unix in
-  let output = GMathView.math_view ~width:400 ~height:280 ()
+  let output = GMathView.math_view ~width:350 ~height:280 ()
   and proofw = GMathView.math_view ~width:400 ~height:275 ()
   and label = GMisc.label ~text:"gTopLevel" () in
-    let rendering_window =
+    let rendering_window' =
      new rendering_window output proofw label
     in
-     rendering_window#show () ;
+     rendering_window := Some rendering_window' ;
+     rendering_window'#show () ;
      GMain.Main.main ()
 ;;
 
 let _ =
- CicCooking.init () ;
- MQueryGenerator.init () ;
+ if !usedb then
+  begin
+(*
+   Mqint.init "dbname=helm" ;
+*)
+   Mqint.init "host=mowgli.cs.unibo.it dbname=helm_mowgli user=helm" ;
+   CicTextualParser0.set_locate_object
+    (function 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
+       begin
+        match !rendering_window with
+           None -> assert false
+         | Some rw -> output_html rw#outputhtml html ;
+       end ;
+       let uri = 
+        match uris with
+           [] ->
+            (match
+              (GToolbox.input_string ~title:"Unknown input"
+               ("No URI matching \"" ^ id ^ "\" found. Please enter its URI"))
+             with
+                None -> None
+              | Some uri -> Some ("cic:" ^ uri)
+            )
+         | [uri] -> Some uri
+         | _ ->
+           let choice =
+            GToolbox.question_box ~title:"Ambiguous input."
+             ~buttons:uris ~default:1 "Ambiguous input. Please, choose one."
+           in
+            if choice > 0 then
+             Some (List.nth uris (choice - 1))
+            else
+             (* No choice from the user *)
+             None
+       in
+        match uri with
+           Some uri' -> Some (cic_textual_parser_uri_of_uri uri')
+         | None -> None
+    )
+  end ;
  ignore (GtkMain.Main.init ()) ;
  initialize_everything () ;
- MQueryGenerator.close ()
+ if !usedb then Mqint.close ();
 ;;