X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=components%2Fgrafite_engine%2FgrafiteEngine.ml;h=ad4ae40c6c6d2e7f040e9ed82ec892d37db01cc6;hb=c2a02fcbcaaef7358acebcb27014db4a601ad026;hp=08b88b95fbc1b5e32ce1c883b2f5a4ed1d2053d3;hpb=cd91767a396b7bbc72e6e3ee90a3b758421f935d;p=helm.git

diff --git a/components/grafite_engine/grafiteEngine.ml b/components/grafite_engine/grafiteEngine.ml
index 08b88b95f..ad4ae40c6 100644
--- a/components/grafite_engine/grafiteEngine.ml
+++ b/components/grafite_engine/grafiteEngine.ml
@@ -25,8 +25,6 @@
 
 (* $Id$ *)
 
-open Printf
-
 exception Drop
 (* mo file name, ma file name *)
 exception IncludedFileNotCompiled of string * string 
@@ -50,7 +48,10 @@ let namer_of names =
   let count = ref 0 in
   fun metasenv context name ~typ ->
     if !count < len then begin
-      let name = Cic.Name (List.nth names !count) in
+      let name = match List.nth names !count with
+         | Some s -> Cic.Name s
+	 | None   -> Cic.Anonymous
+      in
       incr count;
       name
     end else
@@ -85,20 +86,23 @@ 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, names) ->
-      Tactics.cases_intros ~mk_fresh_name_callback:(namer_of names)
+  | GrafiteAst.Cases (_, what, (howmany, names)) ->
+      Tactics.cases_intros ?howmany ~mk_fresh_name_callback:(namer_of names)
         what
   | GrafiteAst.Change (_, pattern, with_what) ->
      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) ->
-     let names = match ident with None -> [] | Some id -> [id] in
+     let names = match ident with None -> [] | Some id -> [Some id] in
      Tactics.cut ~mk_fresh_name_callback:(namer_of names) term
   | GrafiteAst.Decompose (_, names) ->
       let mk_fresh_name_callback = namer_of names in
@@ -107,10 +111,10 @@ let rec tactic_of_ast status ast =
       Tactics.demodulate 
 	~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe
   | GrafiteAst.Destruct (_,term) -> Tactics.destruct term
-  | GrafiteAst.Elim (_, what, using, pattern, depth, names) ->
+  | GrafiteAst.Elim (_, what, using, pattern, (depth, names)) ->
       Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names)
         ~pattern what
-  | GrafiteAst.ElimType (_, what, using, depth, names) ->
+  | GrafiteAst.ElimType (_, what, using, (depth, names)) ->
       Tactics.elim_type ?using ?depth ~mk_fresh_name_callback:(namer_of names)
         what
   | GrafiteAst.Exact (_, term) -> Tactics.exact term
@@ -139,23 +143,21 @@ let rec tactic_of_ast status ast =
      Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names)
       ~dbd:(LibraryDb.instance ()) hyp
   | GrafiteAst.Generalize (_,pattern,ident) ->
-     let names = match ident with None -> [] | Some id -> [id] in
+     let names = match ident with None -> [] | Some id -> [Some id] in
      Tactics.generalize ~mk_fresh_name_callback:(namer_of names) pattern 
   | GrafiteAst.IdTac _ -> Tactics.id
-  | GrafiteAst.Intros (_, None, names) ->
-      PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) ()
-  | GrafiteAst.Intros (_, Some num, names) ->
-      PrimitiveTactics.intros_tac ~howmany:num
+  | GrafiteAst.Intros (_, (howmany, names)) ->
+      PrimitiveTactics.intros_tac ?howmany
         ~mk_fresh_name_callback:(namer_of names) ()
   | GrafiteAst.Inversion (_, term) ->
       Tactics.inversion term
   | GrafiteAst.LApply (_, linear, how_many, to_what, what, ident) ->
-      let names = match ident with None -> [] | Some id -> [id] in
+      let names = match ident with None -> [] | Some id -> [Some id] in
       Tactics.lapply ~mk_fresh_name_callback:(namer_of names) 
         ~linear ?how_many ~to_what what
   | GrafiteAst.Left _ -> Tactics.left
   | GrafiteAst.LetIn (loc,term,name) ->
-      Tactics.letin term ~mk_fresh_name_callback:(namer_of [name])
+      Tactics.letin term ~mk_fresh_name_callback:(namer_of [Some name])
   | GrafiteAst.Reduce (_, reduction_kind, pattern) ->
       (match reduction_kind with
 	 | `Normalize -> Tactics.normalize ~pattern
@@ -167,7 +169,9 @@ let rec tactic_of_ast status ast =
   | GrafiteAst.Replace (_, pattern, with_what) ->
      Tactics.replace ~pattern ~with_what
   | GrafiteAst.Rewrite (_, direction, t, pattern, names) ->
-     EqualityTactics.rewrite_tac ~direction ~pattern t names
+     EqualityTactics.rewrite_tac ~direction ~pattern t 
+(* to be replaced with ~mk_fresh_name_callback:(namer_of names) *)
+     (List.map (function Some s -> s | None -> assert false) names)
   | GrafiteAst.Right _ -> Tactics.right
   | GrafiteAst.Ring _ -> Tactics.ring
   | GrafiteAst.Split _ -> Tactics.split
@@ -331,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 =
@@ -365,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 =
@@ -680,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!"))
@@ -721,11 +725,12 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
           with Not_found -> v
         in
         if Http_getter_storage.is_read_only value then begin
-          HLog.error (sprintf "uri %s belongs to a read-only repository" value);
+          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);
@@ -786,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