X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite_engine%2FgrafiteEngine.ml;h=e8e3171a08fa9290bd0d8405c63d0238843d7522;hb=249d11773d32add20d665c4f8521b7380e4fec0a;hp=296625a1dbc43a7284a3f9d730cf671aa01db5e3;hpb=b8254cf86275b9d78b30a0b14974a6f23ad9be24;p=helm.git

diff --git a/components/grafite_engine/grafiteEngine.ml b/components/grafite_engine/grafiteEngine.ml
index 296625a1d..e8e3171a0 100644
--- a/components/grafite_engine/grafiteEngine.ml
+++ b/components/grafite_engine/grafiteEngine.ml
@@ -25,6 +25,8 @@
 
 (* $Id$ *)
 
+module PEH = ProofEngineHelpers
+
 exception Drop
 (* mo file name, ma file name *)
 exception IncludedFileNotCompiled of string * string 
@@ -86,8 +88,8 @@ let rec tactic_of_ast status ast =
      Tactics.applyS ~term ~params ~dbd:(LibraryDb.instance ())
        ~universe:status.GrafiteTypes.universe
   | GrafiteAst.Assumption _ -> Tactics.assumption
-  | GrafiteAst.Auto (_,params) ->
-      AutoTactic.auto_tac ~params ~dbd:(LibraryDb.instance ()) 
+  | GrafiteAst.AutoBatch (_,params) ->
+      Tactics.auto ~params ~dbd:(LibraryDb.instance ()) 
 	~universe:status.GrafiteTypes.universe
   | GrafiteAst.Cases (_, what, (howmany, names)) ->
       Tactics.cases_intros ?howmany ~mk_fresh_name_callback:(namer_of names)
@@ -96,6 +98,9 @@ let rec tactic_of_ast status ast =
      Tactics.change ~pattern with_what
   | GrafiteAst.Clear (_,id) -> Tactics.clear id
   | GrafiteAst.ClearBody (_,id) -> Tactics.clearbody id
+  | GrafiteAst.Compose (_,t1,t2,times,(howmany, names)) -> 
+      Tactics.compose times t1 t2 ?howmany
+        ~mk_fresh_name_callback:(namer_of names)
   | GrafiteAst.Contradiction _ -> Tactics.contradiction
   | GrafiteAst.Constructor (_, n) -> Tactics.constructor n
   | GrafiteAst.Cut (_, ident, term) ->
@@ -107,7 +112,7 @@ let rec tactic_of_ast status ast =
   | GrafiteAst.Demodulate _ -> 
       Tactics.demodulate 
 	~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe
-  | GrafiteAst.Destruct (_,term) -> Tactics.destruct term
+  | GrafiteAst.Destruct (_,xterms) -> Tactics.destruct xterms
   | GrafiteAst.Elim (_, what, using, pattern, (depth, names)) ->
       Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names)
         ~pattern what
@@ -172,7 +177,6 @@ let rec tactic_of_ast status ast =
   | GrafiteAst.Right _ -> Tactics.right
   | GrafiteAst.Ring _ -> Tactics.ring
   | GrafiteAst.Split _ -> Tactics.split
-  | GrafiteAst.Subst _ -> Tactics.subst
   | GrafiteAst.Symmetry _ -> Tactics.symmetry
   | GrafiteAst.Transitivity (_, term) -> Tactics.transitivity term
   (* Implementazioni Aggiunte *)
@@ -217,7 +221,6 @@ let classify_tactic tactic =
   | _ -> false
   
 let reorder_metasenv start refine tactic goals current_goal always_opens_a_goal=
-  let module PEH = ProofEngineHelpers in
 (*   let print_m name metasenv =
     prerr_endline (">>>>> " ^ name);
     prerr_endline (CicMetaSubst.ppmetasenv [] metasenv)
@@ -332,14 +335,14 @@ let apply_tactic ~disambiguate_tactic (text,prefix_len,tactic) (status, goal) =
  let after = ProofEngineTypes.goals_of_proof proof in
  let opened_goals, closed_goals = Tacticals.goals_diff ~before ~after ~opened in
  let proof, opened_goals = 
-  let uri, metasenv_after_tactic, t, ty, attrs = proof in
+  let uri, metasenv_after_tactic, _subst, t, ty, attrs = proof in
   let reordered_metasenv, opened_goals = 
     reorder_metasenv
      starting_metasenv
      metasenv_after_refinement metasenv_after_tactic
      opened goal always_opens_a_goal
   in
-  let proof' = uri, reordered_metasenv, t, ty, attrs in
+  let proof' = uri, reordered_metasenv, _subst, t, ty, attrs in
   proof', opened_goals
  in
  let incomplete_proof =
@@ -366,14 +369,14 @@ let apply_atomic_tactical ~disambiguate_tactic ~patch (text,prefix_len,tactic) (
  let after = ProofEngineTypes.goals_of_proof proof in
  let opened_goals, closed_goals = Tacticals.goals_diff ~before ~after ~opened in
  let proof, opened_goals = 
-  let uri, metasenv_after_tactic, t, ty, attrs = proof in
+  let uri, metasenv_after_tactic, _subst, t, ty, attrs = proof in
   let reordered_metasenv, opened_goals = 
     reorder_metasenv
      starting_metasenv
      metasenv_after_refinement metasenv_after_tactic
      opened goal always_opens_a_goal
   in
-  let proof' = uri, reordered_metasenv, t, ty, attrs in
+  let proof' = uri, reordered_metasenv, _subst, t, ty, attrs in
   proof', opened_goals
  in
  let incomplete_proof =
@@ -453,8 +456,8 @@ type 'a eval_executable =
 type 'a eval_from_moo =
  { efm_go: GrafiteTypes.status -> string -> GrafiteTypes.status }
       
-let coercion_moo_statement_of (uri,arity) =
-  GrafiteAst.Coercion (HExtlib.dummy_floc, uri, false, arity)
+let coercion_moo_statement_of (uri,arity, saturations) =
+  GrafiteAst.Coercion (HExtlib.dummy_floc, uri, false, arity, saturations)
 
 let refinement_toolkit = {
   RefinementTool.type_of_aux' = 
@@ -479,17 +482,17 @@ let refinement_toolkit = {
   RefinementTool.pack_coercion_obj = CicRefine.pack_coercion_obj;
  }
   
-let eval_coercion status ~add_composites uri arity baseuri =
+let eval_coercion status ~add_composites uri arity saturations baseuri =
  let status,compounds =
-  GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri arity 
-   baseuri
+  GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri arity
+   saturations baseuri
  in
  let moo_content = 
-   List.map coercion_moo_statement_of ((uri,arity)::compounds)
+   List.map coercion_moo_statement_of ((uri,arity,saturations)::compounds)
  in
  let status = GrafiteTypes.add_moo_content moo_content status in
   {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},
-   List.map fst compounds
+   List.map (fun u,_,_ -> u) compounds
 
 module MatitaStatus =
  struct
@@ -600,9 +603,9 @@ let add_coercions_of_record_to_moo obj lemmas status =
               in
               let is_a_coercion, arity_coercion = is_a_coercion uri in
               if is_a_coercion then
-                Some (uri, coercion_moo_statement_of (uri,arity_coercion))
+                Some (uri, coercion_moo_statement_of (uri,arity_coercion,0))
               else if is_a_wanted_coercion then
-                Some (uri, coercion_moo_statement_of (uri,arity_wanted))
+                Some (uri, coercion_moo_statement_of (uri,arity_wanted,0))
               else
                 None)
             lemmas)
@@ -645,8 +648,8 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
 *)
       let status = GrafiteTypes.add_moo_content [cmd] status in
       status,[] 
-  | GrafiteAst.Coercion (loc, uri, add_composites, arity) ->
-     eval_coercion status ~add_composites uri arity
+  | GrafiteAst.Coercion (loc, uri, add_composites, arity, saturations) ->
+     eval_coercion status ~add_composites uri arity saturations
       (GrafiteTypes.get_string_option status "baseuri")
   | GrafiteAst.Default (loc, what, uris) as cmd ->
      LibraryObjects.set_default what uris;
@@ -681,16 +684,16 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
 *)
      status,[]
   | GrafiteAst.Print (_,"proofterm") ->
-      let _,_,p,_, _ = GrafiteTypes.get_current_proof status in
-      print_endline (AutoTactic.pp_proofterm p);
+      let _,_,_,p,_, _ = GrafiteTypes.get_current_proof status in
+      print_endline (Auto.pp_proofterm p);
       status,[]
   | GrafiteAst.Print (_,_) -> status,[]
   | GrafiteAst.Qed loc ->
-      let uri, metasenv, bo, ty, attrs =
+      let uri, metasenv, _subst, bo, ty, attrs =
         match status.GrafiteTypes.proof_status with
-        | GrafiteTypes.Proof (Some uri, metasenv, body, ty, attrs) ->
-            uri, metasenv, body, ty, attrs
-        | GrafiteTypes.Proof (None, metasenv, body, ty, attrs) -> 
+        | GrafiteTypes.Proof (Some uri, metasenv, subst, body, ty, attrs) ->
+            uri, metasenv, subst, body, ty, attrs
+        | GrafiteTypes.Proof (None, metasenv, subst, body, ty, attrs) -> 
             raise (GrafiteTypes.Command_error 
               ("Someone allows to start a theorem without giving the "^
                "name/uri. This should be fixed!"))
@@ -725,19 +728,21 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
           HLog.error (Printf.sprintf "uri %s belongs to a read-only repository" value);
           raise (ReadOnlyUri value)
         end;
-        if not (Http_getter_storage.is_empty value) && 
-           opts.clean_baseuri 
+        if (not (Http_getter_storage.is_empty ~local:true value) ||
+            LibraryClean.db_uris_of_baseuri value <> [])
+           && opts.clean_baseuri 
           then begin
           HLog.message ("baseuri " ^ value ^ " is not empty");
           HLog.message ("cleaning baseuri " ^ value);
           LibraryClean.clean_baseuris [value];
-          assert (Http_getter_storage.is_empty value);
+          assert (Http_getter_storage.is_empty ~local:true value);
         end;
         if not (Helm_registry.get_opt_default Helm_registry.bool "matita.nodisk"
                   ~default:false) 
         then
           HExtlib.mkdir 
-            (Filename.dirname (Http_getter.filename ~writable:true (value ^
+            (Filename.dirname 
+              (Http_getter.filename ~local:true ~writable:true (value ^
               "/foo.con")));
       end;
       GrafiteTypes.set_option status name value,[]
@@ -758,7 +763,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
      | Cic.CurrentProof (_,metasenv',bo,ty,_, attrs) ->
          let name = UriManager.name_of_uri uri in
          if not(CicPp.check name ty) then
-           HLog.error ("Bad name: " ^ name);
+           HLog.warn ("Bad name: " ^ name);
          if opts.do_heavy_checks then
            begin
              let dbd = LibraryDb.instance () in
@@ -787,7 +792,8 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
                  ("Theorem already proved: " ^ UriManager.string_of_uri x ^ 
                   "\nPlease use a variant."));
            end;
-         let initial_proof = (Some uri, metasenv', bo, ty, attrs) in
+         let _subst = [] in
+         let initial_proof = (Some uri, metasenv', _subst, bo, ty, attrs) in
          let initial_stack = Continuationals.Stack.of_metasenv metasenv' in
          { status with GrafiteTypes.proof_status =
             GrafiteTypes.Incomplete_proof