X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=3052e975e5cab70b78f8a86f7137bba1cda31738;hb=7e9904185ceff75884783dbf0bad506b8521b857;hp=6b7af6983ea4ef8ced4b091da5d276ad6d4d479c;hpb=a826cb23fc70a37b3ba3b7bbaee8862467a4a875;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 6b7af6983..3052e975e 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -32,41 +32,29 @@ open MatitaMisc
 (** {2 Initialization} *)
 
 let _ =
-  Helm_registry.load_from "matita.conf.xml";
-  GtkMain.Rc.add_default_file BuildTimeConf.gtkrc;
-  GMain.Main.init ()
-
-let parserr = new MatitaDisambiguator.parserr ()
-let dbd =
-  Mysql.quick_connect
-    ~host:(Helm_registry.get "db.host")
-    ~user:(Helm_registry.get "db.user")
-    ~database:(Helm_registry.get "db.database")
-    ()
-
-let owner = (Helm_registry.get "matita.owner") ;;
-let _ = MetadataTypes.ownerize_tables owner ;;
-let _ = MatitaDb.clean_owner_environment dbd owner ;; 
-let _ = MatitaDb.create_owner_environment dbd owner ;; 
+  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 ())
 
 let gui = MatitaGui.instance ()
-let disambiguator =
-  new MatitaDisambiguator.disambiguator ~parserr ~dbd
-    ~chooseUris:(interactive_user_uri_choice ~gui)
-    ~chooseInterp:(interactive_interp_choice ~gui)
-    ()
+let disambiguator = MatitaDisambiguator.instance ()
+let _ = (* set disambiguator callbacks *)
+  disambiguator#setChooseUris (interactive_user_uri_choice ~gui);
+  disambiguator#setChooseInterp (interactive_interp_choice ~gui)
 
-let currentProof = MatitaProof.instance ()
+let _ = (* environment trust *)
+  CicEnvironment.set_trust
+    (let trust = Helm_registry.get_bool "matita.environment_trust" in
+     fun _ -> trust)
 
+let currentProof = MatitaProof.instance ()
 
-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
-  MatitaMathView.sequents_viewer ~notebook:gui#main#sequentsNotebook
-    ~sequent_viewer ~set_goal ()
+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), ()) =
@@ -89,64 +77,48 @@ let _ = (* attach observers to proof status *)
     false);
   currentProof#connect `Abort (fun () -> sequents_viewer#reset; false)
 
-let mathViewer = MatitaMathView.mathViewer ~disambiguator ()
 let interpreter =
-  let console = gui#console in
-  MatitaInterpreter.interpreter ~disambiguator ~console ~mathViewer ()
+  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 (UriManager.string_of_uri uri, None) in
+    let term = CicAst.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 ())
+let console_callback s =
+  let module A = TacticAst in
+  let rec strip_locations = function
+    | A.LocatedTactical (loc, tac) -> strip_locations tac
+    | tac -> tac
   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
+  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
-  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
+  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 currentProof#quit;
-  gui#setPhraseCallback interpreter#evalPhrase;
+  gui#setPhraseCallback console_callback;
   gui#main#debugMenu#misc#hide ();
   ignore (gui#main#newProofMenuItem#connect#activate (fun _ ->
     gui#console#clear ();
@@ -154,19 +126,20 @@ let _ =
   ignore (gui#main#openMenuItem#connect#activate (fun _ ->
     match gui#chooseFile () with
     | None -> ()
-    | Some f when is_proof_script f -> load_script f
+    | 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 ~disambiguator ())));
-  connect_button gui#script#scriptWinForwardButton script_forward;
-  connect_button gui#script#scriptWinBackButton script_back;
-  connect_button gui#script#scriptWinJumpButton script_jump;
+    ignore (MatitaMathView.cicBrowser ())));
   let module A = TacticAst in
   let hole = CicAst.UserInput in
-  let tac ast _ = ignore (interpreter#evalAst (A.Tactic ast)) 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) ();
@@ -200,11 +173,6 @@ let _ =
       in
       ignore (item#connect#activate callback)
     in
-    addDebugItem "toggle auto disambiguation" (fun _ ->
-      Helm_registry.set_bool "matita.auto_disambiguation"
-        (not (Helm_registry.get_bool "matita.auto_disambiguation")));
-    addDebugItem "dump proof status to stdout" (fun _ ->
-      print_endline (currentProof#proof#toString));
     addDebugItem "dump environment to \"env.dump\"" (fun _ ->
       let oc = open_out "env.dump" in
       CicEnvironment.dump_to_channel oc;
@@ -214,21 +182,20 @@ let _ =
       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;
+    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 _ =
-(*   CicEnvironment.set_trust (fun _ -> false); *)
-(*
-  (try
-    load_script Sys.argv.(1)
-  with Invalid_argument _ -> ());
-*)
-  if Pcre.pmatch ~pat:"cicbrowser$" Sys.argv.(0) then begin (* cicbrowser *)
-    let browser = MatitaMathView.cicBrowser ~disambiguator () in
+  (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 _ -> ()