now destruct takes an optional list of term rather than a sigle optional term

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

diff --git a/components/grafite_engine/grafiteEngine.ml b/components/grafite_engine/grafiteEngine.ml
index a31f3990e2c3e5acfb19441ba968ab4a4431eb56..e8e3171a08fa9290bd0d8405c63d0238843d7522 100644 (file)
--- 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 
@@ -110,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
@@ -175,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 *)
@@ -220,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)
@@ -456,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' = 
@@ -482,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
@@ -603,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)
@@ -648,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;