X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=b71463860148a98b08c587d57d65dbcaed067ef8;hb=481992ea591bf53cba758a96e7d42e9cdce7e129;hp=5056a88a26521750b551c6f9f366d075d8b97a6d;hpb=c5d4ad1c98c1434b95a8a9b1c8697dd36cf39623;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 5056a88a2..b71463860 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -23,132 +23,94 @@
  * http://helm.cs.unibo.it/
  *)
 
-exception Not_implemented of string
-let not_implemented feature = raise (Not_implemented feature)
+open MatitaGtkMisc
 
-  (** exceptions whose content should be presented to the user *)
-exception Failure of string
-let error s = raise (Failure s)
+(** {2 Internal status} *)
 
-let _ = Helm_registry.load_from "matita.conf.xml"
-let _ = GMain.Main.init ()
-let gui = new MatitaGui.gui (Helm_registry.get "matita.glade_file")
+  (* TODO Zack: may be current_proofs if we want an MDI interface *)
+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 -> assert false),
+   (fun proof -> current_proof := Some proof),
+   (fun () -> !current_proof <> None))
 
-let interactive_user_uri_choice
-  ~(selection_mode:[`MULTIPLE|`SINGLE]) ?(nonvars_button=false) ~title ~msg
-  uris
-=
-  let only_constant_choices =
-    lazy
-      (List.filter
-        (fun uri -> not (String.sub uri (String.length uri - 4) 4 = ".var"))
-        uris)
-  in
-  if (selection_mode <> `SINGLE) &&
-    (Helm_registry.get_bool "matita.auto_disambiguation")
-  then
-    Lazy.force only_constant_choices
-  else begin
-    let win = gui#uriChoice in
-    let choices = ref [] in
-    let chosen = ref false in
-    let use_only_constants = ref false in
-    win#uriChoiceDialog#set_title title;
-    win#uriChoiceLabel#set_text msg;
-    gui#uriChoices#list_store#clear ();
-    List.iter gui#uriChoices#easy_append uris;
-    win#uriChoiceConstantsButton#misc#set_sensitive nonvars_button;
-    let bye = ref (fun () -> ()) in
-    let id1 =
-      win#uriChoiceConstantsButton#connect#clicked (fun _ ->
-        use_only_constants := true;
-        !bye ())
-    in
-    let id2 =
-      win#uriChoiceAutoButton#connect#clicked (fun _ ->
-       use_only_constants := true ;
-       Helm_registry.set_bool "matita.auto_disambiguation" true;
-       !bye ())
-    in
-    let id3 =
-      win#uriChoiceSelectedButton#connect#clicked (fun _ ->
-        choices := gui#uriChoices#easy_selection ();
-        !bye ())
-    in
-    bye := (fun () ->
-      win#uriChoiceDialog#misc#hide ();
-      win#uriChoiceConstantsButton#misc#disconnect id1;
-      win#uriChoiceAutoButton#misc#disconnect id2;
-      win#uriChoiceSelectedButton#misc#disconnect id3;
-      prerr_endline "quit";
-      GMain.Main.quit ());
-    win#uriChoiceDialog#show ();
-    GtkThread.main ();
-    if !use_only_constants then
-      Lazy.force only_constant_choices
-    else
-      match !choices with
-      | [] -> error "No choice"
-      | choices -> choices
-  end
+(** {2 Settings} *)
 
-(*
-module DisambiguateCallbacks =
-  struct
-    let interactive_user_uri_choice =
-      assert false  (* TODO *)
-(*       interactive_user_uri_choice *)
-    let interactive_interpretation_choice choices =
-      assert false  (* TODO *)
-    let input_or_locate_uri ~title =
-      assert false  (* TODO *)
-  end
-*)
+let debug_print = MatitaTypes.debug_print
 
-let debugDialog () =
-  let dialog =
-    new MatitaGeneratedGui.debug
-      ~file:(Helm_registry.get "matita.glade_file") ()
-  in
-  let retval = ref None in
-  let return v =
-    retval := Some v;
-    dialog#debug#destroy ();
-    GMain.Main.quit ()
-  in
-  ignore (dialog#debug#event#connect#delete (fun _ -> true));
-  ignore (dialog#okbutton2#connect#clicked (fun _ -> return 1));
-  ignore (dialog#cancelbutton2#connect#clicked (fun _ -> return 2));
-  dialog#debug#show ();
-  GtkThread.main ();
-  (match !retval with None -> assert false | Some v -> v)
+(** {2 Initialization} *)
 
-let _ =
-  gui#main#debugMenuItem2#connect#activate (fun _ ->
-    prerr_endline (string_of_int (debugDialog ())))
+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)
+    ()
 
   (** quit program, possibly asking for confirmation *)
 let quit () = GMain.Main.quit ()
-let _ = gui#setQuitCallback quit
-let _ =
-  gui#main#debugMenuItem0#connect#activate (fun _ ->
-    let uris =
-      interactive_user_uri_choice
-        ~selection_mode:`MULTIPLE
-        ~nonvars_button:false
-        ~title:"titolo"
-        ~msg:"messaggio"
-        ["cic:/uno.con"; "cic:/due.var"; "cic:/tre.con"; "cic:/quattro.con";
-        "cic:/cinque.var"]
-    in
-    List.iter prerr_endline uris; print_newline ())
+
 let _ =
-  gui#main#debugMenuItem1#connect#activate (fun _ ->
-    Helm_registry.set_bool "matita.auto_disambiguation"
-      (not (Helm_registry.get_bool "matita.auto_disambiguation")))
+  gui#setQuitCallback quit;
+  gui#main#debugMenu#misc#hide ();
+  ignore (gui#main#newProofMenuItem#connect#activate (fun _ ->
+   if has_proof () &&
+      not (ask_confirmation ~gui
+              ~msg:("Starting a new proof will abort current one,\n" ^
+                "are you sure you want to continue?")
+              ())
+    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
+(*       proof#status#attach ... FINQUI *)
+      proof#status#notify ();
+      set_proof proof;
+      debug_print ("new proof, goal is: " ^ CicPp.ppterm term)))
 
+  (** <DEBUGGING> *)
 let _ =
-(*   gui#uriChoices#easy_append "pippo"; *)
-(*   gui#uriChoices#list_store#clear (); *)
-  GtkThread.main ()
+  if BuildTimeConf.debug then begin
+    gui#main#debugMenu#misc#show ();
+    let addDebugItem ~label callback =
+      let item =
+        GMenu.menu_item ~packing:gui#main#debugMenu_menu#append ~label ()
+      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));
+  end
+  (** </DEBUGGING> *)
+
+let _ = GtkThread.main ()