X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=3052e975e5cab70b78f8a86f7137bba1cda31738;hb=ab336f7c09d052c45a09dd49e9b75a39e8b57e5b;hp=8f34f5bf728c141b88fe12cc8f97c3303cc45756;hpb=e89486cad653803954662a5e543537acd49a866f;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 8f34f5bf7..3052e975e 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -23,82 +23,147 @@
  * http://helm.cs.unibo.it/
  *)
 
+open Printf
+
 open MatitaGtkMisc
+open MatitaTypes
+open MatitaMisc
 
-(** {2 Internal status} *)
+(** {2 Initialization} *)
 
-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 -> current_proof := proof),
-   (fun () -> !current_proof <> None))
+let _ =
+  Helm_registry.load_from "matita.conf.xml";  (* read conf *)
+  Http_getter.init ();
+  MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
+  MatitaDb.clean_owner_environment ();
+  MatitaDb.create_owner_environment ();
+  GtkMain.Rc.add_default_file BuildTimeConf.gtkrc;  (* loads gtk rc files *)
+  ignore (GMain.Main.init ())
 
-(** {2 Settings} *)
+let gui = MatitaGui.instance ()
+let disambiguator = MatitaDisambiguator.instance ()
+let _ = (* set disambiguator callbacks *)
+  disambiguator#setChooseUris (interactive_user_uri_choice ~gui);
+  disambiguator#setChooseInterp (interactive_interp_choice ~gui)
 
-let debug_print = MatitaTypes.debug_print
+let _ = (* environment trust *)
+  CicEnvironment.set_trust
+    (let trust = Helm_registry.get_bool "matita.environment_trust" in
+     fun _ -> trust)
 
-(** {2 Initialization} *)
+let currentProof = MatitaProof.instance ()
 
-let _ = Helm_registry.load_from "matita.conf.xml"
-let _ = GMain.Main.init ()
-let gui = new MatitaGui.gui (Helm_registry.get "matita.glade_file")
-let parserr = new MatitaDisambiguator.parserr ()
-let mqiconn = MQIConn.init ()
-let disambiguator =
-  new MatitaDisambiguator.disambiguator ~parserr ~mqiconn
-    ~chooseUris:(interactive_user_uri_choice ~gui)
-    ~chooseInterp:(interactive_interp_choice ~gui)
-    ()
-
-let new_proof proof =
-  (* TODO Zack: high level function which create a new proof object and register
-  * to it the widgets which must be refreshed upon status changes *)
-(*       proof#status#attach ... *)
-  proof#status#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;
-  }
+let sequent_viewer = MatitaMathView.sequent_viewer_instance ()
+let sequents_viewer = MatitaMathView.sequents_viewer_instance ()
+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
+  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 interpreter =
-  let console = gui#console in
-  new MatitaInterpreter.interpreter ~disambiguator ~proof_handler ~console ()
+  let mathViewer = MatitaMathView.mathViewer () in
+  MatitaInterpreter.interpreter ~console:gui#console ~mathViewer ()
+let script = MatitaScript.script ~interpreter
+let _ =
+  let href_callback uri =
+    let term = CicAst.Uri (uri, None) in
+    ignore (interpreter#evalAst (TacticAst.Command (TacticAst.Check term)))
+  in
+  sequent_viewer#set_href_callback (Some href_callback)
+
+let console_callback s =
+  let module A = TacticAst in
+  let rec strip_locations = function
+    | A.LocatedTactical (loc, tac) -> strip_locations tac
+    | tac -> tac
+  in
+  let needed_by_script ast =
+    match strip_locations ast with
+    | A.Tactic _
+    | A.Command
+      (A.Inductive _ | A.Theorem _ | A.Coercion _ | A.Qed _ | A.Proof) ->
+        true
+    | _ -> false
+  in
+  let ast = disambiguator#parserr#parseTactical (Stream.of_string s) in
+  debug_print (sprintf "evaluating '%s'" s);
+  if needed_by_script ast then
+    script#advance s
+  else
+    interpreter#evalAst ast
+
+let console_callback s =
+  match gui#console#wrap_exn (fun () -> console_callback s) with
+  | None -> (false, false)
+  | Some outcome -> outcome
+
+(** {2 GUI callbacks} *)
 
 let _ =
-  gui#setQuitCallback quit;
-  gui#setPhraseCallback interpreter#evalPhrase;
+  gui#setQuitCallback currentProof#quit;
+  gui#setPhraseCallback console_callback;
   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, term) =
-        disambiguator#disambiguateTerm (Stream.of_string input)
-      in
-      let proof = MatitaProof.proof ~typ:term ~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 ->
+        ignore (gui#console#wrap_exn (fun () -> script#loadFrom 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 _ ->
+    ignore (MatitaMathView.cicBrowser ())));
+  let module A = TacticAst in
+  let hole = CicAst.UserInput in
+  let tac ast _ =
+    let ast = A.Tactic ast in
+    ignore (script#advance (TacticAstPp.pp_tactical 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 ();
@@ -108,28 +173,37 @@ 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 ())#status#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 "dump getter settings" (fun _ ->
+      prerr_endline (Http_getter_env.env_to_string ()));
+    addDebugItem "getter: update" Http_getter.update;
+    addDebugItem "getter: getalluris" (fun _ ->
+      List.iter prerr_endline (Http_getter.getalluris ()));
   end
+
   (** </DEBUGGING> *)
 
-let _ = GtkThread.main ()
+let _ =
+  (try script#loadFrom Sys.argv.(1) with Invalid_argument _ -> ());
+  if Filename.basename Sys.argv.(0) = "cicbrowser" then begin (* cicbrowser *)
+    Helm_registry.set "matita.mode" "cicbrowser";
+    let browser = MatitaMathView.cicBrowser () in
+    try
+      browser#loadUri Sys.argv.(1)
+    with Invalid_argument _ -> ()
+  end else begin  (* matita *)
+    Helm_registry.set "matita.mode" "matita";
+    gui#main#mainWin#show ();
+    gui#toolbar#toolBarWin#show ();
+    gui#console#show ()
+  end;
+  GtkThread.main ()