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

diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml
index 437fed32d..4ca54d0e4 100644
--- a/helm/matita/matitaEngine.ml
+++ b/helm/matita/matitaEngine.ml
@@ -40,7 +40,8 @@ let tactic_of_ast = function
   | TacticAst.Cut (_, term) -> Tactics.cut term
   | TacticAst.Elim (_, term, _) ->
       (* TODO Zack implement "using" argument *)
-      Tactics.elim_intros_simpl term
+      (* old: Tactics.elim_intros_simpl term *)
+      Tactics.elim_intros term
   | TacticAst.ElimType (_, term) -> Tactics.elim_type term
   | TacticAst.Replace (_, what, with_what) -> Tactics.replace ~what ~with_what
   | TacticAst.Auto (_,num) -> 
@@ -55,9 +56,19 @@ let tactic_of_ast = function
   | TacticAst.Fold of reduction_kind * 'term
   | TacticAst.Injection of 'ident
   | TacticAst.LetIn of 'term * 'ident
-  | TacticAst.Reduce of reduction_kind * 'term pattern * 'ident option
   | TacticAst.Replace_pattern of 'term pattern * 'term
 *)
+  | TacticAst.Reduce (_,reduction_kind,opts) ->
+      let terms, also_in_hypotheses = 
+        match opts with
+        | Some (l,`Goal) -> Some l, false
+        | Some (l,`Everywhere) -> Some l, true
+        | None -> None, false
+      in
+      (match reduction_kind with
+      | `Reduce -> Tactics.reduce ~also_in_hypotheses ~terms
+      | `Simpl -> Tactics.simpl ~also_in_hypotheses ~terms
+      | `Whd -> Tactics.whd ~also_in_hypotheses ~terms) 
   | TacticAst.Rewrite (_,dir,t,ident) ->
       if dir = `Left then
         EqualityTactics.rewrite_tac ~term:t 
@@ -149,8 +160,11 @@ let eval_command status cmd =
         CicTypeChecker.typecheck_mutual_inductive_defs uri
           (types, [], leftno) CicUniv.empty_ugraph
       in
+      let status = 
         MatitaSync.add_inductive_def
-          ~uri ~types ~params:[] ~leftno ~ugraph status;
+          ~uri ~types ~params:[] ~leftno ~ugraph status
+      in
+	{status with proof_status = No_proof }
   | TacticAst.Theorem (loc, thm_flavour, Some name, ty, None) ->
       let uri = 
         UriManager.uri_of_string (MatitaMisc.qualify status name ^ ".con") 
@@ -180,7 +194,8 @@ let eval_command status cmd =
           "metasenv not empty while giving a definition with body";
       let body = CicMetaSubst.apply_subst subst body in
       let ty = CicMetaSubst.apply_subst subst ty in
-      MatitaSync.add_constant ~uri ~body ~ty ~ugraph status
+      let status = MatitaSync.add_constant ~uri ~body ~ty ~ugraph status in
+      {status with proof_status = No_proof}
   | TacticAst.Theorem (_, _, None, _, _) ->
       command_error "The grammas should avoid having unnamed theorems!"
   | TacticAst.Coercion (loc, term) -> assert false  (** TODO *)
@@ -292,9 +307,22 @@ let disambiguate_tactic status = function
   | TacticAst.Fold of reduction_kind * 'term
   | TacticAst.Injection of 'ident
   | TacticAst.LetIn of 'term * 'ident
-  | TacticAst.Reduce of reduction_kind * 'term pattern * 'ident option
   | TacticAst.Replace_pattern of 'term pattern * 'term
 *)
+  | TacticAst.Reduce (loc, reduction_kind, opts) ->
+      let status, opts = 
+        match opts with
+        | None -> status, None
+        | Some (l,pat) -> 
+            let status, l = 
+              List.fold_right (fun t (status,acc) ->
+                let status',t' = disambiguate_term status t in
+                status', t'::acc) 
+              l (status,[]) 
+            in
+            status, Some (l, pat)
+      in
+      status, TacticAst.Reduce (loc, reduction_kind, opts)
   | TacticAst.Rewrite (loc,dir,t,ident) ->
       let status, term = disambiguate_term status t in
       status, TacticAst.Rewrite (loc,dir,term,ident)