PrimitiveTactics: intros _ now aveilable

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

diff --git a/components/grafite_engine/grafiteEngine.ml b/components/grafite_engine/grafiteEngine.ml
index 08b88b95fbc1b5e32ce1c883b2f5a4ed1d2053d3..296625a1dbc43a7284a3f9d730cf671aa01db5e3 100644 (file)
--- 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
@@ -88,8 +89,8 @@ let rec tactic_of_ast status ast =
   | GrafiteAst.Auto (_,params) ->
       AutoTactic.auto_tac ~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
@@ -98,7 +99,7 @@ let rec tactic_of_ast status ast =
   | 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 +108,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 +140,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 +166,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
@@ -721,7 +722,7 @@ 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) &&