X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=95de73528cf8ba1b273002e395026d11c2935d59;hb=94c9255e1f3095440f4d49ea1d75443a5a343185;hp=7302e3bde0ff6d5e2b5b012192e87f78fa56ad14;hpb=e32693f30563379989b75b53c3be088396b732da;p=helm.git

diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml
index 7302e3bde..95de73528 100644
--- a/helm/matita/matitaEngine.ml
+++ b/helm/matita/matitaEngine.ml
@@ -2,6 +2,8 @@
 open Printf
 open MatitaTypes
 
+exception Drop;;
+
 let debug = false ;;
 let debug_print = if debug then prerr_endline else ignore ;;
 
@@ -20,52 +22,57 @@ let namer_of names =
       FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context name ~typ
 
 let tactic_of_ast = function
-  | TacticAst.Intros (_, None, names) ->
-      (* TODO Zack implement intros length *)
-      PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) ()
-  | TacticAst.Intros (_, Some num, names) ->
-      (* TODO Zack implement intros length *)
-      PrimitiveTactics.intros_tac ~howmany:num
-        ~mk_fresh_name_callback:(namer_of names) ()
-  | TacticAst.Reflexivity _ -> Tactics.reflexivity
+  | TacticAst.Absurd (_, term) -> Tactics.absurd term
+  | TacticAst.Apply (_, term) -> Tactics.apply term
   | TacticAst.Assumption _ -> Tactics.assumption
+  | TacticAst.Auto (_,depth,width) -> 
+      AutoTactic.auto_tac ?depth ?width ~dbd:(MatitaDb.instance ()) ()
+  | TacticAst.Change (_, what, with_what, pattern) ->
+     Tactics.change ~what ~with_what ~pattern
+  | TacticAst.Clear (_,id) -> Tactics.clear id
+  | TacticAst.ClearBody (_,id) -> Tactics.clearbody id
   | TacticAst.Contradiction _ -> Tactics.contradiction
-(*
-  | TacticAst.Discriminate (_,id) -> Tactics.discriminate id
-*)
+  | TacticAst.Compare (_, term) -> Tactics.compare term
+  | TacticAst.Constructor (_, n) -> Tactics.constructor n
+  | TacticAst.Cut (_, ident, term) ->
+     let names = match ident with None -> [] | Some id -> [id] in
+     Tactics.cut ~mk_fresh_name_callback:(namer_of names) term
+  | TacticAst.DecideEquality _ -> Tactics.decide_equality
+  | TacticAst.Decompose (_,term) -> Tactics.decompose term
+  | TacticAst.Discriminate (_,term) -> Tactics.discriminate term
+  | TacticAst.Elim (_, term, _) ->
+      Tactics.elim_intros term
+  | TacticAst.ElimType (_, term) -> Tactics.elim_type term
+  | TacticAst.Exact (_, term) -> Tactics.exact term
   | TacticAst.Exists _ -> Tactics.exists
+  | TacticAst.Fail _ -> Tactics.fail
+  | TacticAst.Fold (_, reduction_kind ,term, pattern) ->
+     let reduction =
+      match reduction_kind with
+       | `Normalize -> CicReduction.normalize ~delta:false ~subst:[]
+       | `Reduce -> ProofEngineReduction.reduce
+       | `Simpl -> ProofEngineReduction.simpl
+       | `Whd -> CicReduction.whd ~delta:false ~subst:[]
+     in
+      Tactics.fold ~reduction ~pattern ~term
   | TacticAst.Fourier _ -> Tactics.fourier
-  | TacticAst.Generalize (_,term,pat) -> Tactics.generalize term pat
+  | TacticAst.FwdSimpl (_, term) -> 
+     Tactics.fwd_simpl ~what:term ~dbd:(MatitaDb.instance ())
+  | TacticAst.Generalize (_,term,ident,pat) ->
+     let names = match ident with None -> [] | Some id -> [id] in
+     Tactics.generalize ~term ~mk_fresh_name_callback:(namer_of names) pat
   | TacticAst.Goal (_, n) -> Tactics.set_goal n
+  | TacticAst.IdTac _ -> Tactics.id
+  | TacticAst.Injection (_,term) -> Tactics.injection term
+  | TacticAst.Intros (_, None, names) ->
+      PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) ()
+  | TacticAst.Intros (_, Some num, names) ->
+      PrimitiveTactics.intros_tac ~howmany:num
+        ~mk_fresh_name_callback:(namer_of names) ()
+  | TacticAst.LApply (_, to_what, what, ident) ->
+     let names = match ident with None -> [] | Some id -> [id] in
+     Tactics.lapply ~mk_fresh_name_callback:(namer_of names) ?to_what what
   | TacticAst.Left _ -> Tactics.left
-  | TacticAst.Right _ -> Tactics.right
-  | TacticAst.Ring _ -> Tactics.ring
-  | TacticAst.Split _ -> Tactics.split
-  | TacticAst.Symmetry _ -> Tactics.symmetry
-  | TacticAst.Transitivity (_, term) -> Tactics.transitivity term
-  | TacticAst.Apply (_, term) -> Tactics.apply term
-  | TacticAst.Absurd (_, term) -> Tactics.absurd term
-  | TacticAst.Exact (_, term) -> Tactics.exact term
-  | TacticAst.Cut (_, term) -> Tactics.cut term
-  | TacticAst.Elim (_, term, _) ->
-      (* TODO Zack implement "using" argument *)
-      (* 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 (_,depth) -> 
-(*       AutoTactic.auto_tac ~num (MatitaDb.instance ()) *)
-      AutoTactic.auto_tac_new ?depth ~dbd:(MatitaDb.instance ()) ()
-  | TacticAst.Change (_, what, with_what, _) -> Tactics.change ~what ~with_what
-(*
-  (* TODO Zack a lot more of tactics to be implemented here ... *)
-  | TacticAst.Change_pattern of 'term pattern * 'term * 'ident option
-  | TacticAst.Change of 'term * 'term * 'ident option
-  | TacticAst.Decompose of 'ident * 'ident list
-  | TacticAst.Fold of reduction_kind * 'term
-  | TacticAst.Injection of 'ident
-  | TacticAst.Replace_pattern of 'term pattern * 'term
-*)
   | TacticAst.LetIn (loc,term,name) ->
       Tactics.letin term ~mk_fresh_name_callback:(namer_of [name])
   | TacticAst.Reduce (_, reduction_kind, pattern) ->
@@ -74,16 +81,19 @@ let tactic_of_ast = function
       | `Reduce -> Tactics.reduce ~pattern  
       | `Simpl -> Tactics.simpl ~pattern 
       | `Whd -> Tactics.whd ~pattern)
+  | TacticAst.Reflexivity _ -> Tactics.reflexivity
+  | TacticAst.Replace (_, pattern, with_what) ->
+     Tactics.replace ~pattern ~with_what
   | TacticAst.Rewrite (_, dir, t, pattern) ->
       if dir = `Left then
         EqualityTactics.rewrite_tac ~where:pattern ~term:t ()
       else
         EqualityTactics.rewrite_back_tac ~where:pattern ~term:t ()
-  | TacticAst.FwdSimpl (_, name) -> 
-     Tactics.fwd_simpl ~hyp:(Cic.Name name) ~dbd:(MatitaDb.instance ())
-  | TacticAst.LApply (_, term, substs) ->
-     let f (name, term) = Cic.Name name, term in
-     Tactics.lapply ~substs:(List.map f substs) term
+  | TacticAst.Right _ -> Tactics.right
+  | TacticAst.Ring _ -> Tactics.ring
+  | TacticAst.Split _ -> Tactics.split
+  | TacticAst.Symmetry _ -> Tactics.symmetry
+  | TacticAst.Transitivity (_, term) -> Tactics.transitivity term
 
 let eval_tactical status tac =
   let apply_tactic tactic =
@@ -103,10 +113,8 @@ let eval_tactical status tac =
   in
   let rec tactical_of_ast = function
     | TacticAst.Tactic (loc, tactic) -> tactic_of_ast tactic
-    | TacticAst.Fail loc -> Tacticals.fail
     | TacticAst.Do (loc, num, tactical) ->
         Tacticals.do_tactic num (tactical_of_ast tactical)
-    | TacticAst.IdTac loc -> Tacticals.id_tac
     | TacticAst.Repeat (loc, tactical) ->
         Tacticals.repeat_tactic (tactical_of_ast tactical)
     | TacticAst.Seq (loc, tacticals) ->  (* tac1; tac2; ... *)
@@ -217,6 +225,7 @@ let generate_projections uri fields status =
 let eval_command status cmd =
   match cmd with
   | TacticAst.Set (loc, name, value) -> set_option status name value
+  | TacticAst.Drop loc -> raise Drop
   | TacticAst.Qed loc ->
       let uri, metasenv, bo, ty = 
         match status.proof_status with
@@ -377,21 +386,42 @@ let disambiguate_pattern aliases (hyp_paths ,goal_path) =
   (hyp_paths ,goal_path)
   
 let disambiguate_tactic status = function
-  | TacticAst.Transitivity (loc, term) -> 
-      let status, cic = disambiguate_term status term in
-      status, TacticAst.Transitivity (loc, cic)
   | TacticAst.Apply (loc, term) ->
       let status, cic = disambiguate_term status term in
       status, TacticAst.Apply (loc, cic)
   | TacticAst.Absurd (loc, term) -> 
       let status, cic = disambiguate_term status term in
       status, TacticAst.Absurd (loc, cic)
+  | TacticAst.Assumption loc -> status, TacticAst.Assumption loc
+  | TacticAst.Auto (loc,depth,width) -> status, TacticAst.Auto (loc,depth,width)
+  | TacticAst.Change (loc, what, with_what, pattern) -> 
+      let status, cic1 = disambiguate_term status what in
+      let status, cic2 = disambiguate_term status with_what in
+      let pattern = disambiguate_pattern status.aliases pattern in
+      status, TacticAst.Change (loc, cic1, cic2, pattern)
+  | TacticAst.Clear (loc,id) -> status,TacticAst.Clear (loc,id)
+  | TacticAst.ClearBody (loc,id) -> status,TacticAst.ClearBody (loc,id)
+  | TacticAst.Compare (loc,term) ->
+      let status, term = disambiguate_term status term in
+      status, TacticAst.Compare (loc,term)
+  | TacticAst.Constructor (loc,n) ->
+      status, TacticAst.Constructor (loc,n)
+  | TacticAst.Contradiction loc ->
+      status, TacticAst.Contradiction loc
+  | TacticAst.Cut (loc, ident, term) -> 
+      let status, cic = disambiguate_term status term in
+      status, TacticAst.Cut (loc, ident, cic)
+  | TacticAst.DecideEquality loc ->
+      status, TacticAst.DecideEquality loc
+  | TacticAst.Decompose (loc,term) ->
+      let status,term = disambiguate_term status term in
+      status, TacticAst.Decompose(loc,term)
+  | TacticAst.Discriminate (loc,term) ->
+      let status,term = disambiguate_term status term in
+      status, TacticAst.Discriminate(loc,term)
   | TacticAst.Exact (loc, term) -> 
       let status, cic = disambiguate_term status term in
       status, TacticAst.Exact (loc, cic)
-  | TacticAst.Cut (loc, term) -> 
-      let status, cic = disambiguate_term status term in
-      status, TacticAst.Cut (loc, cic)
   | TacticAst.Elim (loc, term, Some term') ->
       let status, cic1 = disambiguate_term status term in
       let status, cic2 = disambiguate_term status term' in
@@ -402,61 +432,60 @@ let disambiguate_tactic status = function
   | TacticAst.ElimType (loc, term) -> 
       let status, cic = disambiguate_term status term in
       status, TacticAst.ElimType (loc, cic)
-  | TacticAst.Replace (loc, what, with_what) -> 
-      let status, cic1 = disambiguate_term status what in
-      let status, cic2 = disambiguate_term status with_what in
-      status, TacticAst.Replace (loc, cic1, cic2)
-  | TacticAst.Change (loc, what, with_what, ident) -> 
-      let status, cic1 = disambiguate_term status what in
-      let status, cic2 = disambiguate_term status with_what in
-      status, TacticAst.Change (loc, cic1, cic2, ident)
-  | TacticAst.Generalize (loc,term,pattern) ->
+  | TacticAst.Exists loc -> status, TacticAst.Exists loc 
+  | TacticAst.Fail loc -> status,TacticAst.Fail loc
+  | TacticAst.Fold (loc,reduction_kind, term, pattern) ->
+     let status, term = disambiguate_term status term in
+     let pattern = disambiguate_pattern status.aliases pattern in
+     status, TacticAst.Fold (loc,reduction_kind, term, pattern)
+  | TacticAst.FwdSimpl (loc, term) ->
+     let status, term = disambiguate_term status term in
+     status, TacticAst.FwdSimpl (loc, term)  
+  | TacticAst.Fourier loc -> status, TacticAst.Fourier loc
+  | TacticAst.Generalize (loc,term,ident,pattern) ->
       let status,term = disambiguate_term status term in
       let pattern = disambiguate_pattern status.aliases pattern in
-      status, TacticAst.Generalize(loc,term,pattern)
-(*
-  (* TODO Zack a lot more of tactics to be implemented here ... *)
-  | TacticAst.Change_pattern of 'term pattern * 'term * 'ident option
-  | TacticAst.Change of 'term * 'term * 'ident option
-  | TacticAst.Decompose of 'ident * 'ident list
-  | TacticAst.Discriminate of 'ident
-  | TacticAst.Fold of reduction_kind * 'term
-  | TacticAst.Injection of 'ident
-  | TacticAst.Replace_pattern of 'term pattern * 'term
-*)
+      status, TacticAst.Generalize(loc,term,ident,pattern)
+  | TacticAst.Goal (loc, g) -> status, TacticAst.Goal (loc, g)
+  | TacticAst.IdTac loc -> status,TacticAst.IdTac loc
+  | TacticAst.Injection (loc,term) ->
+      let status, term = disambiguate_term status term in
+      status, TacticAst.Injection (loc,term)
+  | TacticAst.Intros (loc, num, names) ->
+      status, TacticAst.Intros (loc, num, names)
+  | TacticAst.LApply (loc, to_what, what, ident) ->
+     let status, to_what =
+      match to_what with
+         None -> status,None
+       | Some to_what -> 
+           let status, to_what = disambiguate_term status to_what in
+           status, Some to_what
+     in
+     let status, what = disambiguate_term status what in
+     status, TacticAst.LApply (loc, to_what, what, ident)
+  | TacticAst.Left loc -> status, TacticAst.Left loc
   | TacticAst.LetIn (loc, term, name) ->
       let status, term = disambiguate_term status term in
       status, TacticAst.LetIn (loc,term,name)
   | TacticAst.Reduce (loc, reduction_kind, pattern) ->
       let pattern = disambiguate_pattern status.aliases pattern in
       status, TacticAst.Reduce(loc, reduction_kind, pattern)
+  | TacticAst.Reflexivity loc -> status, TacticAst.Reflexivity loc
+  | TacticAst.Replace (loc, pattern, with_what) -> 
+      let pattern = disambiguate_pattern status.aliases pattern in
+      let status, with_what = disambiguate_term status with_what in
+      status, TacticAst.Replace (loc, pattern, with_what)
   | TacticAst.Rewrite (loc, dir, t, pattern) ->
       let status, term = disambiguate_term status t in
       let pattern = disambiguate_pattern status.aliases pattern in
       status, TacticAst.Rewrite (loc, dir, term, pattern)
-  | TacticAst.Intros (loc, num, names) ->
-      status, TacticAst.Intros (loc, num, names)
-  | 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
-  | TacticAst.Exists loc -> status, TacticAst.Exists loc 
-  | TacticAst.Fourier loc -> status, TacticAst.Fourier loc
-  | TacticAst.Left loc -> status, TacticAst.Left loc
   | TacticAst.Right loc -> status, TacticAst.Right loc
   | TacticAst.Ring loc -> status, TacticAst.Ring loc
   | TacticAst.Split loc -> status, TacticAst.Split loc
   | TacticAst.Symmetry loc -> status, TacticAst.Symmetry loc
-  | TacticAst.Goal (loc, g) -> status, TacticAst.Goal (loc, g)
-  | TacticAst.FwdSimpl (loc, name) -> status, TacticAst.FwdSimpl (loc, name)  
-  | TacticAst.LApply (loc, term, substs) ->
-     let f (status, substs) (name, term) =
-        let status, term = disambiguate_term status term in
-	status, (name, term) :: substs
-     in
-     let status, term = disambiguate_term status term in
-     let status, substs = List.fold_left f (status, []) substs in 
-     status, TacticAst.LApply (loc, term, substs)
+  | TacticAst.Transitivity (loc, term) -> 
+      let status, cic = disambiguate_term status term in
+      status, TacticAst.Transitivity (loc, cic)
 
 let rec disambiguate_tactical status = function 
   | TacticAst.Tactic (loc, tactic) -> 
@@ -482,8 +511,6 @@ let rec disambiguate_tactical status = function
   | TacticAst.Try (loc, tactical) ->
       let status, tactical = disambiguate_tactical status tactical in
       status, TacticAst.Try (loc, tactical)
-  | (TacticAst.IdTac _ | TacticAst.Fail _) as tac ->
-      status, tac
 
 and disambiguate_tacticals status tacticals =
   let status, tacticals =
@@ -501,7 +528,7 @@ let disambiguate_command status = function
   | TacticAst.Coercion (loc, term) ->
       let status, term = disambiguate_term status term in
       status, TacticAst.Coercion (loc,term)
-  | (TacticAst.Set _ | TacticAst.Qed _) as cmd ->
+  | (TacticAst.Set _ | TacticAst.Qed _ | TacticAst.Drop _ ) as cmd ->
       status, cmd
   | TacticAst.Alias _ as x -> status, x
   | TacticAst.Obj (loc,obj) ->
@@ -543,9 +570,16 @@ let eval_ast status ast =
 
 let eval_from_stream status str cb =
   let stl = CicTextualParser2.parse_statements str in
-  List.fold_left 
-    (fun status ast -> cb status ast;eval_ast status ast) status 
-  stl
+  List.iter (fun ast -> cb !status ast;status := eval_ast !status ast) stl
+
+let eval_from_stream_greedy status str cb =
+  while true do
+    print_string "matita> ";
+    flush stdout;
+    let ast = CicTextualParser2.parse_statement str in
+    cb !status ast;
+    status := eval_ast !status ast 
+  done
   
 let eval_string status str =
   eval_from_stream status (Stream.of_string str) (fun _ _ -> ())