new more flexible compose, see matita/tests/compose.ma for a sample

[helm.git] / components / grafite_engine / grafiteEngine.ml

diff --git a/components/grafite_engine/grafiteEngine.ml b/components/grafite_engine/grafiteEngine.ml
index 296625a1dbc43a7284a3f9d730cf671aa01db5e3..ad4ae40c6c6d2e7f040e9ed82ec892d37db01cc6 100644 (file)
--- a/components/grafite_engine/grafiteEngine.ml
+++ b/components/grafite_engine/grafiteEngine.ml
@@ -86,8 +86,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 +96,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) ->
@@ -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 =
@@ -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,8 +728,9 @@ 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 value) ||
+            LibraryClean.db_uris_of_baseuri value <> [])
+           && opts.clean_baseuri 
           then begin
           HLog.message ("baseuri " ^ value ^ " is not empty");
           HLog.message ("cleaning baseuri " ^ value);
@@ -787,7 +791,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