X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=e8c030b61cc3aeeb208ba95b67b9f1a57b965f67;hb=ef9ec8cb57d15426a96fe40d056eb07804753bb9;hp=5fb0cb9061a7a8dfb6da9b9d39c3639be2dbef97;hpb=015263908d9142798bcbddbe4c4d13f71e08c5c3;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 5fb0cb906..e8c030b61 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -23,117 +23,174 @@
  * http://helm.cs.unibo.it/
  *)
 
-open MatitaGtkMisc
-
-(** {2 Internal status} *)
-
-let (get_proof, set_proof, has_proof) =
-  let (current_proof: MatitaTypes.proof option ref) = ref None in
-  ((fun () ->
-    match !current_proof with
-    | Some proof -> proof
-    | None -> failwith "No current proof"),
-   (fun proof ->  (* TODO Zack: this function should probably be smarter taking
-               care also of unregistering notifications subscriber and so on *)
-     current_proof := proof),
-   (fun () -> !current_proof <> None))
-
-(** {2 Settings} *)
+open Printf
 
-let debug_print = MatitaTypes.debug_print
+open MatitaGtkMisc
+open MatitaTypes
+open MatitaMisc
 
 (** {2 Initialization} *)
 
-let _ = Helm_registry.load_from "matita.conf.xml"
-let _ = GMain.Main.init ()
-let gui = new MatitaGui.gui (Helm_registry.get "matita.glade_file")
+let _ =
+  Helm_registry.load_from "matita.conf.xml";
+  GtkMain.Rc.add_default_file BuildTimeConf.gtkrc;
+  GMain.Main.init ()
+
 let parserr = new MatitaDisambiguator.parserr ()
-let mqiconn = MQIConn.init ()
+let dbd =
+  Mysql.quick_connect
+    ~host:(Helm_registry.get "db.host")
+    ~user:(Helm_registry.get "db.user")
+    ~database:(Helm_registry.get "db.database")
+    ()
+let _ = MetadataDb.clean ~dbd ~owner:(Helm_registry.get "matita.owner")
+let gui = MatitaGui.instance ()
 let disambiguator =
-  new MatitaDisambiguator.disambiguator ~parserr ~mqiconn
+  new MatitaDisambiguator.disambiguator ~parserr ~dbd
     ~chooseUris:(interactive_user_uri_choice ~gui)
     ~chooseInterp:(interactive_interp_choice ~gui)
     ()
-let proof_viewer =
-  let mml_of_cic_object = BuildTimeConf.Transformer.mml_of_cic_object in
-  MatitaMathView.proof_viewer ~mml_of_cic_object ~show:true
-    ~packing:(gui#proof#scrolledProof#add) ()
-(*
-let sequent_viewer =
-  let mml_of_cic_sequent = BuildTimeConf.Transformer.mml_of_cic_sequent in
-  MatitaMathView.sequent_viewer ~mml_of_cic_sequent ~show:true
-    ~packing:(gui#main#scrolledSequents#add) ()
-*)
-
-let new_proof (proof: MatitaTypes.proof) =
-  (* TODO Zack a lot:
-  * - ids_to_inner_types, ids_to_inner_sorts handling
-  * - sequent viewer notification
-  *)
-  let xmldump_observer _ (status, _) =  print_endline proof#toString in
-  ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
-    xmldump_observer);
-(*
-  let proof_observer _ (status, ()) =
-prerr_endline "proof_observer";
-    let ((uri_opt, metasenv, bo, ty), _) = status in
-    let uri = MatitaTypes.unopt_uri uri_opt in
-    (* TODO CSC [] is wrong *)
-    let proof = Cic.Constant (UriManager.name_of_uri uri,Some bo,ty,[]) in
-try
-      ignore (proof_viewer#load_proof uri proof)
-with exn ->
-prerr_endline "proof_observer exception:";
-prerr_endline (Printexc.to_string exn);
-raise exn
+
+let currentProof = new MatitaProof.currentProof
+
+let sequent_viewer = MatitaMathView.sequent_viewer ~show:true ()
+let sequents_viewer =
+  let set_goal goal =
+    if not (currentProof#onGoing ()) then assert false;
+    currentProof#proof#set_goal goal
   in
-  let proof_observer_id =
-    proof#attach_observer ~interested_in:StatefulProofEngine.all_events
-      proof_observer
+  MatitaMathView.sequents_viewer ~notebook:gui#main#sequentsNotebook
+    ~sequent_viewer ~set_goal ()
+let _ = (* attach observers to proof status *)
+  let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in
+  let sequents_observer _ (((_, metasenv, _, _), goal_opt), ()) =
+    sequents_viewer#reset;
+    (match goal_opt with
+    | None -> ()
+    | Some goal ->
+        sequents_viewer#load_sequents metasenv;
+        sequents_viewer#goto_sequent goal)
   in
-*)
-  proof#notify;
-  set_proof (Some proof)
-
-let quit () = (* quit program, asking for confirmation if needed *)
-  if not (has_proof ()) ||
-    (ask_confirmation ~gui
-      ~msg:("Proof in progress, are you sure you want to quit?") ())
-  then
-    GMain.Main.quit ()
-
-let proof_handler =
-  { MatitaTypes.get_proof = get_proof;
-    MatitaTypes.set_proof = set_proof;
-    MatitaTypes.has_proof = has_proof;
-    MatitaTypes.new_proof = new_proof;
-    MatitaTypes.quit = quit;
-  }
+  currentProof#addObserver sequents_observer;
+  currentProof#addObserver browser_observer;
+  currentProof#connect `Quit (fun () ->
+    (* quit program, asking for confirmation if needed *)
+    if not (currentProof#onGoing ()) ||
+      (ask_confirmation ~gui
+        ~msg:("Proof in progress, are you sure you want to quit?") ())
+    then
+      GMain.Main.quit ();
+    false);
+  currentProof#connect `Abort (fun () -> sequents_viewer#reset; false)
 
+let currentProof = (currentProof :> MatitaTypes.currentProof)
+let mathViewer =
+  MatitaMathView.mathViewer ~disambiguator
+    ~currentProof:(currentProof :> MatitaTypes.currentProof) ()
 let interpreter =
-  let console = gui#console in
-  new MatitaInterpreter.interpreter ~disambiguator ~proof_handler ~console ()
+  let console = (gui#console :> MatitaTypes.console) in
+  new MatitaInterpreter.interpreter
+    ~disambiguator ~currentProof:(currentProof :> MatitaTypes.currentProof)
+    ~console ~mathViewer ~dbd ()
+let _ =
+  let href_callback uri =
+    let term = CicAst.Uri (UriManager.string_of_uri uri, None) in
+    ignore (interpreter#evalAst (TacticAst.Command (TacticAst.Check term)))
+  in
+  sequent_viewer#set_href_callback (Some href_callback)
+
+(** {2 Script window handling} *)
+
+let script_forward _ =
+  let buf = gui#script#scriptTextView#buffer in
+  let locked_iter = buf#get_iter_at_mark (`NAME "locked") in
+  let (success, hide) =
+    interpreter#evalPhrase
+      (buf#get_text ~start:locked_iter ~stop:buf#end_iter ())
+  in
+  if success then
+    gui#lockScript (locked_iter#offset + interpreter#endOffset)
+
+let script_jump _ =
+  let buf = gui#script#scriptTextView#buffer in
+  let locked_iter = buf#get_iter_at_mark (`NAME "locked") in
+  let cursor_iter = buf#get_iter_at_mark (`NAME "insert") in
+  let raw_text = buf#get_text ~start:locked_iter ~stop:cursor_iter () in
+  let len = String.length raw_text in
+  let rec parse offset =
+    if offset < len then begin
+      let (success, hide) =
+        interpreter#evalPhrase (String.sub raw_text offset (len - offset))
+      in
+      if success then begin
+        let new_offset = interpreter#endOffset + offset in
+        gui#lockScript (new_offset + locked_iter#offset);
+        parse new_offset
+      end else
+        raise Exit
+    end
+  in
+  try
+    parse 0
+  with Exit -> ()
+
+let script_back _ = not_implemented "script_back"
+
+let load_script fname =
+  gui#script#scriptTextView#buffer#set_text (input_file fname);
+  gui#script#scriptWin#show ();
+  gui#main#showScriptMenuItem#set_active true
+
+(** {2 GUI callbacks} *)
 
 let _ =
-  gui#setQuitCallback quit;
+  gui#setQuitCallback currentProof#quit;
   gui#setPhraseCallback interpreter#evalPhrase;
   gui#main#debugMenu#misc#hide ();
   ignore (gui#main#newProofMenuItem#connect#activate (fun _ ->
-   if has_proof () &&
-      not (ask_confirmation ~gui
-        ~msg:("Proof in progress, are you sure you want to start a new one?")
-        ())
-    then
-      ()  (* abort new proof process *)
-    else
-      let input = ask_text ~gui ~msg:"Insert proof goal" ~multiline:true () in
-      let (env, metasenv, expr) =
-        disambiguator#disambiguateTerm (Stream.of_string input)
-      in
-      let proof = MatitaProof.proof ~typ:expr ~metasenv () in
-      new_proof proof))
+    gui#console#clear ();
+    gui#console#show ~msg:"theorem " ()));
+  ignore (gui#main#openMenuItem#connect#activate (fun _ ->
+    match gui#chooseFile () with
+    | None -> ()
+    | Some f when is_proof_script f -> load_script f
+    | Some f ->
+        gui#console#echo_error (sprintf
+          "Don't know what to do with file: %s\nUnrecognized file format."
+          f)));
+  ignore (gui#main#newCicBrowserMenuItem#connect#activate (fun _ ->
+    let currentProof = (currentProof :> MatitaTypes.currentProof) in
+    ignore (MatitaMathView.cicBrowser ~disambiguator ~currentProof ())));
+  connect_button gui#script#scriptWinForwardButton script_forward;
+  connect_button gui#script#scriptWinBackButton script_back;
+  connect_button gui#script#scriptWinJumpButton script_jump;
+  let module A = TacticAst in
+  let hole = CicAst.UserInput in
+  let tac ast _ = ignore (interpreter#evalAst (A.Tactic ast)) in
+  let tac_w_term ast _ =
+(*     gui#console#clear (); *)
+    gui#console#show ~msg:(TacticAstPp.pp_tactic ast) ();
+    gui#main#mainWin#present ()
+  in
+  let tbar = gui#toolbar in
+  connect_button tbar#introsButton (tac (A.Intros (None, [])));
+  connect_button tbar#applyButton (tac_w_term (A.Apply hole));
+  connect_button tbar#exactButton (tac_w_term (A.Exact hole));
+  connect_button tbar#elimButton (tac_w_term (A.Elim (hole, None)));
+  connect_button tbar#elimTypeButton (tac_w_term (A.ElimType hole));
+  connect_button tbar#splitButton (tac A.Split);
+  connect_button tbar#leftButton (tac A.Left);
+  connect_button tbar#rightButton (tac A.Right);
+  connect_button tbar#existsButton (tac A.Exists);
+  connect_button tbar#reflexivityButton (tac A.Reflexivity);
+  connect_button tbar#symmetryButton (tac A.Symmetry);
+  connect_button tbar#transitivityButton (tac_w_term (A.Transitivity hole));
+  connect_button tbar#assumptionButton (tac A.Assumption);
+  connect_button tbar#cutButton (tac_w_term (A.Cut hole));
+  connect_button tbar#autoButton (tac A.Auto)
 
   (** <DEBUGGING> *)
+
 let _ =
   if BuildTimeConf.debug then begin
     gui#main#debugMenu#misc#show ();
@@ -143,28 +200,30 @@ let _ =
       in
       ignore (item#connect#activate callback)
     in
-    addDebugItem "interactive user uri choice" (fun _ ->
-      try
-        let uris =
-          interactive_user_uri_choice ~gui ~selection_mode:`MULTIPLE
-            ~msg:"messaggio" ~nonvars_button:true
-            ["cic:/uno.con"; "cic:/due.var"; "cic:/tre.con"; "cic:/quattro.con";
-            "cic:/cinque.var"]
-        in
-        List.iter prerr_endline uris
-      with MatitaGtkMisc.Cancel -> MatitaTypes.error "no choice");
     addDebugItem "toggle auto disambiguation" (fun _ ->
       Helm_registry.set_bool "matita.auto_disambiguation"
         (not (Helm_registry.get_bool "matita.auto_disambiguation")));
-    addDebugItem "mono line text input" (fun _ ->
-      prerr_endline (ask_text ~gui ~title:"title" ~msg:"message" ()));
-    addDebugItem "multi line text input" (fun _ ->
-      prerr_endline
-        (ask_text ~gui ~title:"title" ~multiline:true ~msg:"message" ()));
     addDebugItem "dump proof status to stdout" (fun _ ->
-      print_endline ((get_proof ())#toString));
+      print_endline (currentProof#proof#toString));
+    addDebugItem "dump environment to \"env.dump\"" (fun _ ->
+      let oc = open_out "env.dump" in
+      CicEnvironment.dump_to_channel oc;
+      close_out oc);
+    addDebugItem "print selected terms" (fun () ->
+      let i = ref 0 in
+      List.iter
+        (fun t -> incr i; debug_print (sprintf "%d: %s" !i (CicPp.ppterm t)))
+        sequent_viewer#get_selected_terms);
+    addDebugItem "refresh all browsers" MatitaMathView.refresh_all_browsers;
   end
+
   (** </DEBUGGING> *)
 
-let _ = GtkThread.main ()
+let _ =
+(*   CicEnvironment.set_trust (fun _ -> false); *)
+  (try
+    load_script Sys.argv.(1)
+  with Invalid_argument _ -> ());
+  gui#console#show ();
+  GtkThread.main ()