X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitaEngine.ml;h=cb420d267ecf41f866a96dcb2695d1a95a93c00f;hb=b05dceab1903f9d15f214a9ddeaf791cd594e215;hp=d9297bce5d517c20182a8648c220995597171a08;hpb=d513d6872096bfe51f8fa3ced917131e954130e1;p=helm.git

diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml
index d9297bce5..cb420d267 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,115 +22,75 @@ 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 (_, pattern, with_what) ->
+     Tactics.change ~pattern with_what
+  | TacticAst.Clear (_,id) -> Tactics.clear id
+  | TacticAst.ClearBody (_,id) -> Tactics.clearbody id
   | TacticAst.Contradiction _ -> Tactics.contradiction
+  | 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 ~term ~pattern
   | TacticAst.Fourier _ -> Tactics.fourier
+  | TacticAst.FwdSimpl (_, hyp, names) -> 
+     Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names) ~dbd:(MatitaDb.instance ()) hyp
+  | TacticAst.Generalize (_,pattern,ident) ->
+     let names = match ident with None -> [] | Some id -> [id] in
+     Tactics.generalize ~mk_fresh_name_callback:(namer_of names) pattern 
   | 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 (_, how_many, to_what, what, ident) ->
+     let names = match ident with None -> [] | Some id -> [id] in
+     Tactics.lapply ~mk_fresh_name_callback:(namer_of names) ?how_many ~to_what what
   | TacticAst.Left _ -> Tactics.left
+  | TacticAst.LetIn (loc,term,name) ->
+      Tactics.letin term ~mk_fresh_name_callback:(namer_of [name])
+  | TacticAst.Reduce (_, reduction_kind, pattern) ->
+      (match reduction_kind with
+      | `Normalize -> Tactics.normalize ~pattern
+      | `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 (_, direction, t, pattern) ->
+     EqualityTactics.rewrite_tac ~direction ~pattern t
   | 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 (_,num) -> 
-      AutoTactic.auto_tac ~num (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.Discriminate of 'ident
-  | 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.ReduceAt (_,reduction_kind,ident,path) ->
-      ProofEngineTypes.mk_tactic 
-      (fun (((_,metasenv,_,_),goal) as status) ->
-         let metano,context,ty = CicUtil.lookup_meta goal metasenv in
-         let where, also_in_hypotheses = 
-           if ident = "goal" then
-             ty, false
-           else
-             let hyp = 
-               try 
-                 List.find (function 
-                   | Some (Cic.Name name,entry) when name = ident -> true
-                   | _ -> false) 
-                 context
-               with 
-                 Not_found -> 
-                   raise (ProofEngineTypes.Fail 
-                            (ident ^ " is not an hypothesis"))  
-             in 
-             (match hyp with
-             | Some (_, Cic.Decl term) -> term
-             | Some (_, Cic.Def (term,ty)) -> term
-             | None -> assert false),true
-         in
-         let pointers = CicUtil.select ~term:where ~context:path in
-          (match reduction_kind with
-          | `Normalize -> 
-              ProofEngineTypes.apply_tactic 
-                (Tactics.normalize ~also_in_hypotheses ~terms:(Some pointers)) 
-                status
-          | `Reduce -> 
-              ProofEngineTypes.apply_tactic 
-                (Tactics.reduce ~also_in_hypotheses ~terms:(Some pointers)) 
-                status
-          | `Simpl -> 
-              ProofEngineTypes.apply_tactic 
-                (Tactics.simpl ~also_in_hypotheses ~terms:(Some pointers)) 
-                status
-          | `Whd -> 
-              ProofEngineTypes.apply_tactic 
-                (Tactics.whd ~also_in_hypotheses ~terms:(Some pointers)) 
-                status)) 
-  | 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
-      | `Normalize -> Tactics.normalize ~also_in_hypotheses ~terms
-      | `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 
-      else
-        EqualityTactics.rewrite_back_tac ~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
-  | _ -> assert false
 
 let eval_tactical status tac =
   let apply_tactic tactic =
@@ -148,10 +110,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; ... *)
@@ -211,11 +171,11 @@ let eval_coercion status coercion =
   let context = [] in 
   let src_uri = 
     let ty_src = CicReduction.whd context ty_src in
-    UriManager.uri_of_string (CicUtil.uri_of_term ty_src) 
+     CicUtil.uri_of_term ty_src
   in
   let tgt_uri = 
     let ty_tgt = CicReduction.whd context ty_tgt in
-    UriManager.uri_of_string (CicUtil.uri_of_term ty_tgt) 
+     CicUtil.uri_of_term ty_tgt
   in
   let new_coercions =
     (* also adds them to the Db *)
@@ -235,8 +195,8 @@ let generate_elimination_principles uri status =
  List.fold_left (fun status sort -> elim sort status) status
   [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ]
 
-let generate_projections uri status =
- let projections = CicRecord.projections_of uri in
+let generate_projections uri fields status =
+ let projections = CicRecord.projections_of uri fields in
   List.fold_left
    (fun status (uri, name, bo) -> 
      try 
@@ -258,10 +218,31 @@ let generate_projections uri status =
            ("Unable to create projection " ^ name ^ " because it requires " ^ depend);
          status
   ) status projections
+
+(* to avoid a long list of recursive functions *)
+let eval_from_stream_ref = ref (fun _ _ _ -> assert false);;
  
 let eval_command status cmd =
   match cmd with
-  | TacticAst.Set (loc, name, value) -> set_option status name value
+  | TacticAst.Default (loc, what, uris) as cmd ->
+     LibraryObjects.set_default what uris;
+     {status with moo_content_rev =
+        (TacticAstPp.pp_command cmd ^ "\n") :: status.moo_content_rev}
+  | TacticAst.Include (loc, path) ->
+     let path = MatitaMisc.obj_file_of_script path in
+     let stream = Stream.of_channel (open_in path) in
+     let status = ref status in
+      !eval_from_stream_ref status stream (fun _ _ -> ());
+      !status
+  | TacticAst.Set (loc, name, value) -> 
+      let value = 
+        if name = "baseuri" then
+          MatitaMisc.strip_trailing_slash value
+        else
+          value
+      in
+      set_option status name value
+  | TacticAst.Drop loc -> raise Drop
   | TacticAst.Qed loc ->
       let uri, metasenv, bo, ty = 
         match status.proof_status with
@@ -280,26 +261,31 @@ let eval_command status cmd =
       let obj = Cic.Constant (name,Some bo,ty,[],[]) in
       MatitaSync.add_obj uri obj status
   | TacticAst.Coercion (loc, coercion) -> 
-      eval_coercion status coercion
+      let status = eval_coercion status coercion in
+      let moo_content_rev =
+       (TacticAstPp.pp_cic_command
+         (TacticAst.Coercion (CicAst.dummy_floc,coercion)) ^ ".\n") ::
+       status.moo_content_rev in
+      {status with moo_content_rev = moo_content_rev}
   | TacticAst.Alias (loc, spec) -> 
-     (match spec with
+     let aliases =
+      match spec with
       | TacticAst.Ident_alias (id,uri) -> 
-          {status with aliases = 
-            DisambiguateTypes.Environment.add 
-              (DisambiguateTypes.Id id) 
-              ("boh?",(fun _ _ _ -> CicUtil.term_of_uri uri)) 
-              status.aliases }
+         DisambiguateTypes.Environment.add 
+          (DisambiguateTypes.Id id) 
+          (uri,(fun _ _ _-> CicUtil.term_of_uri (UriManager.uri_of_string uri)))
+          status.aliases 
       | TacticAst.Symbol_alias (symb, instance, desc) ->
-          {status with aliases = 
-            DisambiguateTypes.Environment.add 
-              (DisambiguateTypes.Symbol (symb,instance))
-              (DisambiguateChoices.lookup_symbol_by_dsc symb desc) 
-              status.aliases }
+         DisambiguateTypes.Environment.add 
+          (DisambiguateTypes.Symbol (symb,instance))
+          (DisambiguateChoices.lookup_symbol_by_dsc symb desc) 
+          status.aliases
       | TacticAst.Number_alias (instance,desc) ->
-          {status with aliases = 
-            DisambiguateTypes.Environment.add 
-              (DisambiguateTypes.Num instance) 
-              (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases })
+         DisambiguateTypes.Environment.add 
+          (DisambiguateTypes.Num instance) 
+          (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases
+     in
+      MatitaSync.set_proof_aliases status aliases
   | TacticAst.Obj (loc,obj) ->
      let ext,name =
       match obj with
@@ -328,12 +314,17 @@ let eval_command status cmd =
         let status = MatitaSync.add_obj uri obj status in
          match obj with
             Cic.Constant _ -> status
-          | Cic.InductiveDefinition (_,_,_,attrs)
-              when List.mem (`Class `Record) attrs ->
+          | Cic.InductiveDefinition (_,_,_,attrs) ->
              let status = generate_elimination_principles uri status in
-              generate_projections uri status
-          | Cic.InductiveDefinition (_,_,_,_) ->
-             generate_elimination_principles uri status
+             let rec get_record_attrs =
+              function
+                 [] -> None
+               | (`Class (`Record fields))::_ -> Some fields
+               | _::tl -> get_record_attrs tl
+             in
+              (match get_record_attrs attrs with
+                  None -> status (* not a record *)
+                | Some fields -> generate_projections uri fields status)
           | Cic.CurrentProof _
           | Cic.Variable _ -> assert false
 
@@ -370,11 +361,8 @@ let disambiguate_term status term =
     | Intermediate _ -> Intermediate metasenv 
     | Proof _ -> assert false
   in
-  let status =
-    { status with
-        aliases = aliases;
-        proof_status = proof_status }
-  in
+  let status = { status with proof_status = proof_status } in
+  let status = MatitaSync.set_proof_aliases status aliases in
   status, cic
   
 let disambiguate_obj status obj =
@@ -400,34 +388,59 @@ let disambiguate_obj status obj =
     | Intermediate _
     | Proof _ -> assert false
   in
-  let status =
-    { status with
-        aliases = aliases;
-        proof_status = proof_status }
-  in
+  let status = { status with proof_status = proof_status } in
+  let status = MatitaSync.set_proof_aliases status aliases in
   status, cic
   
-let disambiguate_closedtypes status terms =
-  let term = CicAst.pack terms in
-  let status, term = disambiguate_term status term in
-  status, CicUtil.unpack term
+let disambiguate_pattern status (wanted, hyp_paths, goal_path) =
+  let interp path = Disambiguate.interpretate_path [] status.aliases path in
+  let goal_path = interp goal_path in
+  let hyp_paths = List.map (fun (name, path) -> name, interp path) hyp_paths in
+  let status,wanted =
+   match wanted with
+      None -> status,None
+    | Some wanted ->
+       let status,wanted = disambiguate_term status wanted in
+        status, Some wanted
+  in
+   status, (wanted, 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, pattern, with_what) -> 
+      let status, with_what = disambiguate_term status with_what in
+      let status, pattern = disambiguate_pattern status pattern in
+      status, TacticAst.Change (loc, pattern, with_what)
+  | 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
@@ -438,74 +451,56 @@ 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)
-(*
-  (* 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
-*)
-  | TacticAst.LetIn (loc,term,name) ->
+  | TacticAst.Exists loc -> status, TacticAst.Exists loc 
+  | TacticAst.Fail loc -> status,TacticAst.Fail loc
+  | TacticAst.Fold (loc,reduction_kind, term, pattern) ->
+     let status, pattern = disambiguate_pattern status pattern in
+     let status, term = disambiguate_term status term in
+     status, TacticAst.Fold (loc,reduction_kind, term, pattern)
+  | TacticAst.FwdSimpl (loc, hyp, names) ->
+     status, TacticAst.FwdSimpl (loc, hyp, names)  
+  | TacticAst.Fourier loc -> status, TacticAst.Fourier loc
+  | TacticAst.Generalize (loc,pattern,ident) ->
+      let status, pattern = disambiguate_pattern status pattern in
+      status, TacticAst.Generalize(loc,pattern,ident)
+  | 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.LetIn (loc,term,name)
-  | TacticAst.ReduceAt (loc, reduction_kind, ident, path) ->
-      let path = Disambiguate.interpretate_path [] status.aliases path in
-      status, TacticAst.ReduceAt(loc, reduction_kind, ident, path)
-  | 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)
+      status, TacticAst.Injection (loc,term)
   | 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.LApply (loc, depth, to_what, what, ident) ->
+     let f term (status, to_what) =
+        let status, term = disambiguate_term status term in
+        status, term :: to_what
+     in
+     let status, to_what = List.fold_right f to_what (status, []) in 
+     let status, what = disambiguate_term status what in
+     status, TacticAst.LApply (loc, depth, 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 status, pattern = disambiguate_pattern status pattern in
+      status, TacticAst.Reduce(loc, reduction_kind, pattern)
+  | TacticAst.Reflexivity loc -> status, TacticAst.Reflexivity loc
+  | TacticAst.Replace (loc, pattern, with_what) -> 
+      let status, pattern = disambiguate_pattern status 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 status, pattern = disambiguate_pattern status pattern in
+      status, TacticAst.Rewrite (loc, dir, term, pattern)
   | 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)
-  
-  | x -> 
-      print_endline ("Not yet implemented:" ^ TacticAstPp.pp_tactic x);
-      assert false
+  | 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) -> 
@@ -531,8 +526,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 =
@@ -547,12 +540,14 @@ and disambiguate_tacticals status tacticals =
   status, tacticals
   
 let disambiguate_command status = function
+  | TacticAst.Default _
+  | TacticAst.Alias _
+  | TacticAst.Include _ as cmd  -> status,cmd
   | 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) ->
       let status,obj = disambiguate_obj status obj in
        status, TacticAst.Obj (loc,obj)
@@ -592,30 +587,46 @@ 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
+;;
+
+(* to avoid a long list of recursive functions *)
+eval_from_stream_ref := eval_from_stream;;
   
+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 _ _ -> ())
 
 let default_options () =
+(*
   let options =
     StringMap.add "baseuri"
       (String
         (Helm_registry.get "matita.baseuri" ^ Helm_registry.get "matita.owner"))
       no_options
   in
+*)
   let options =
     StringMap.add "basedir"
       (String (Helm_registry.get "matita.basedir" ))
-      options
+      no_options
   in
   options
 
 let initial_status =
   lazy {
     aliases = DisambiguateTypes.empty_environment;
+    moo_content_rev = [];
     proof_status = No_proof;
     options = default_options ();
     objects = [];