X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=437fed32db9ee9f749c3e7c688cccb15761e3669;hb=00583d5c57f2d242b5e7d0babbb909296705fb1f;hp=f3ac49e16deb10355e3bdbad14c7f250c3931b33;hpb=de9a83f286eee12117fb478ea2db18f7faebac9a;p=helm.git

diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml
index f3ac49e16..437fed32d 100644
--- a/helm/matita/matitaEngine.ml
+++ b/helm/matita/matitaEngine.ml
@@ -43,7 +43,8 @@ let tactic_of_ast = function
       Tactics.elim_intros_simpl term
   | TacticAst.ElimType (_, term) -> Tactics.elim_type term
   | TacticAst.Replace (_, what, with_what) -> Tactics.replace ~what ~with_what
-(*   | TacticAst.Auto _ -> Tactics.auto_new ~dbd *)
+  | TacticAst.Auto (_,num) -> 
+      AutoTactic.auto_tac ~num ~dbd:(MatitaDb.instance ())
   | TacticAst.Change (_, what, with_what, _) -> Tactics.change ~what ~with_what
 (*
   (* TODO Zack a lot more of tactics to be implemented here ... *)
@@ -56,8 +57,12 @@ let tactic_of_ast = function
   | TacticAst.LetIn of 'term * 'ident
   | TacticAst.Reduce of reduction_kind * 'term pattern * 'ident option
   | TacticAst.Replace_pattern of 'term pattern * 'term
-  | TacticAst.Rewrite of direction * 'term * 'ident option
 *)
+  | TacticAst.Rewrite (_,dir,t,ident) ->
+      if dir = `Left then
+        EqualityTactics.rewrite_tac ~term:t 
+      else
+        EqualityTactics.rewrite_back_tac ~term:t
   | _ -> assert false
 
 let eval_tactical status tac =
@@ -199,14 +204,21 @@ let eval_command status cmd =
               (DisambiguateTypes.Num instance) 
               (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases }
 
-let eval status st =
-  match st with
+let eval_executable status ex =
+  match ex with
   | TacticAst.Tactical (_, tac) -> eval_tactical status tac
   | TacticAst.Command (_, cmd) -> eval_command status cmd
   | TacticAst.Macro (_, mac) -> 
       command_error (sprintf "The macro %s can't be in a script" 
         (TacticAstPp.pp_macro_cic mac))
 
+let eval_comment status c = status
+            
+let eval status st =
+  match st with
+  | TacticAst.Executable (_,ex) -> eval_executable status ex
+  | TacticAst.Comment (_,c) -> eval_comment status c
+
 let disambiguate_term status term =
   let (aliases, metasenv, cic, _) =
     match
@@ -282,11 +294,13 @@ let disambiguate_tactic status = function
   | TacticAst.LetIn of 'term * 'ident
   | TacticAst.Reduce of reduction_kind * 'term pattern * 'ident option
   | TacticAst.Replace_pattern of 'term pattern * 'term
-  | TacticAst.Rewrite of direction * 'term * 'ident option
 *)
+  | TacticAst.Rewrite (loc,dir,t,ident) ->
+      let status, term = disambiguate_term status t in
+      status, TacticAst.Rewrite (loc,dir,term,ident)
   | TacticAst.Intros (loc, num, names) ->
       status, TacticAst.Intros (loc, num, names)
-  | TacticAst.Auto loc -> status, TacticAst.Auto loc
+  | TacticAst.Auto (loc,num) -> status, TacticAst.Auto (loc,num)
   | TacticAst.Reflexivity loc -> status, TacticAst.Reflexivity loc
   | TacticAst.Assumption loc -> status, TacticAst.Assumption loc
   | TacticAst.Contradiction loc -> status, TacticAst.Contradiction loc
@@ -429,8 +443,8 @@ let disambiguate_command status = function
       status, cmd
   | TacticAst.Alias _ as x -> status, x
 
-let disambiguate_statement status statement =
-  match statement with
+let disambiguate_executable status ex =
+  match ex with
   | TacticAst.Tactical (loc, tac) ->
       let status, tac = disambiguate_tactical status tac in
       status, (TacticAst.Tactical (loc, tac))
@@ -441,6 +455,22 @@ let disambiguate_statement status statement =
       command_error 
         (sprintf ("The engine is not allowed to disambiguate any macro, "^^
                  "in particular %s") (TacticAstPp.pp_macro_ast mac))
+
+let disambiguate_comment status c = 
+  match c with
+  | TacticAst.Note (loc,n) -> status, TacticAst.Note (loc,n)
+  | TacticAst.Code (loc,ex) -> 
+        let status, ex = disambiguate_executable status ex in
+        status, TacticAst.Code (loc,ex)
+        
+let disambiguate_statement status statement =
+  match statement with
+  | TacticAst.Comment (loc,c) -> 
+        let status, c = disambiguate_comment status c in
+        status, TacticAst.Comment (loc,c)
+  | TacticAst.Executable (loc,ex) -> 
+        let status, ex = disambiguate_executable status ex in
+        status, TacticAst.Executable (loc,ex)
   
 let eval_ast status ast =
   let status,st = disambiguate_statement status ast in