X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Fmatita.ml;h=7c9502bd414cc89b674d00a1d216a77baf8b4610;hb=e09713d333183e929f108ff8bb8fbe2a25bfcac7;hp=6a5e2e51debf5c20bedc785d079ffba14e357c60;hpb=190e42f1030ea3d459c4040bb0e8503a7c096820;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 6a5e2e51d..7c9502bd4 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -72,7 +72,6 @@ let sequents_viewer =
     ~sequent_viewer ~set_goal ()
 
 let new_proof (proof: MatitaTypes.proof) =
-  let xmldump_observer _ _ =  print_endline proof#toString in
   let proof_observer _ (status, ()) =
     let ((uri_opt, _, _, _), _) = status in
     proof_viewer#load_proof status;
@@ -89,10 +88,6 @@ let new_proof (proof: MatitaTypes.proof) =
     sequents_observer);
   ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
     proof_observer);
-(*
-  ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
-    xmldump_observer);
-*)
   proof#notify;
   set_proof (Some proof)
 
@@ -120,24 +115,19 @@ let proof_handler =
 
 let interpreter =
   let console = gui#console in
-  new MatitaInterpreter.interpreter ~disambiguator ~proof_handler ~console ()
-
-  (** prompt the user for the textual input of a term and disambiguate it *)
-let ask_term ?(title = "term input") ?(msg = "insert term") () =
-  match gui#askText ~title ~msg () with
-  | Some t ->
-      let (_, _, term) = disambiguator#disambiguateTerm (Stream.of_string t) in
-      Some term
-  | None -> None
+  new MatitaInterpreter.interpreter
+    ~disambiguator ~proof_handler ~console ~dbd ()
 
 (** {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
-  interpreter#evalPhrase
-    (buf#get_text ~start:locked_iter ~stop:buf#end_iter ());
-  gui#lockScript (locked_iter#offset + interpreter#endOffset)
+  if
+    interpreter#evalPhrase
+      (buf#get_text ~start:locked_iter ~stop:buf#end_iter ());
+  then
+    gui#lockScript (locked_iter#offset + interpreter#endOffset)
 
 let script_jump _ =
   let buf = gui#script#scriptTextView#buffer in
@@ -147,16 +137,19 @@ let script_jump _ =
   let len = String.length raw_text in
   let rec parse offset =
     if offset < len then begin
-      interpreter#evalPhrase ~transparent:true
-        (String.sub raw_text offset (len - offset));
-      let new_offset = interpreter#endOffset + offset in
-      gui#lockScript (new_offset + locked_iter#offset);
-      parse new_offset
+      if
+        interpreter#evalPhrase (String.sub raw_text offset (len - offset))
+      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 CicTextualParser2.Parse_error _ -> ()
+  with Exit -> ()
 
 let script_back _ = not_implemented "script_back"
 
@@ -172,19 +165,8 @@ let _ =
   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 -> ()
@@ -193,47 +175,39 @@ let _ =
         gui#console#echo_error (sprintf
           "Don't know what to do with file: %s\nUnrecognized file format."
           f)));
-  ignore (gui#script#scriptWinForwardButton#connect#clicked script_forward);
-  ignore (gui#script#scriptWinBackButton#connect#clicked script_back);
-  ignore (gui#script#scriptWinJumpButton#connect#clicked script_jump);
-  let tac_w_term name tac _ =
-    match ask_term ~title:name ~msg:("term for " ^ name) () with
-    | Some term -> (get_proof ())#apply_tactic (tac ~term)
-    | None -> ()
+  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 tac _ tac _ = (get_proof ())#apply_tactic tac in
   let tbar = gui#toolbar in
-  ignore (tbar#introsButton#connect#clicked (tac "intros" (Tactics.intros ())));
-  ignore (tbar#applyButton#connect#clicked (tac_w_term "apply" Tactics.apply));
-  ignore (tbar#exactButton#connect#clicked (tac_w_term "exact" Tactics.exact));
-  ignore (tbar#elimButton#connect#clicked (tac_w_term "elim"
-    Tactics.elim_intros_simpl));
-  ignore (tbar#elimTypeButton#connect#clicked (tac_w_term "elim type"
-    Tactics.elim_type));
-  ignore (tbar#splitButton#connect#clicked (tac "split" Tactics.split));
-  ignore (tbar#leftButton#connect#clicked (tac "left" Tactics.left));
-  ignore (tbar#rightButton#connect#clicked (tac "right" Tactics.right));
-  ignore (tbar#existsButton#connect#clicked (tac "exists" Tactics.exists));
-  ignore (tbar#reflexivityButton#connect#clicked (tac "reflexivity"
-    Tactics.reflexivity));
-  ignore (tbar#symmetryButton#connect#clicked (tac "symmetry"
-    Tactics.symmetry));
-  ignore (tbar#transitivityButton#connect#clicked (tac_w_term "transitivity"
-    Tactics.transitivity));
-  ignore (tbar#assumptionButton#connect#clicked (tac "assumption"
-    Tactics.assumption));
-  ignore (tbar#cutButton#connect#clicked (tac_w_term "cut"
-    (Tactics.cut ?mk_fresh_name_callback:None)));
-  ignore (tbar#autoButton#connect#clicked (tac "auto" (Tactics.auto ~dbd)))
+  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#simplifyButton FINQUI; *)
+
+  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 save_dom =
-  let domImpl = lazy (Gdome.domImplementation ()) in
-  fun ~doc ~dest ->
-    ignore
-      ((Lazy.force domImpl)#saveDocumentToFile ~doc ~name:dest ~indent:true ())
-
 let _ =
   if BuildTimeConf.debug then begin
     gui#main#debugMenu#misc#show ();
@@ -243,26 +217,16 @@ 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));
+    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)
   end
 
   (** </DEBUGGING> *)