X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=7239e98e3e2e5ee6ce00b83e2cad8717e4c0a254;hb=9f8a383035b272c628c555b728e84caf9229cd57;hp=89d168af36acb80efefc91b890005e161d6f9de3;hpb=ea543eafaae687b248478db7bf6166dd912b5729;p=helm.git

diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml
index 89d168af3..7239e98e3 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 ;;
 
@@ -25,7 +27,10 @@ let tactic_of_ast = function
   | TacticAst.Assumption _ -> Tactics.assumption
   | TacticAst.Auto (_,depth,width) -> 
       AutoTactic.auto_tac ?depth ?width ~dbd:(MatitaDb.instance ()) ()
-  | TacticAst.Change (_, what, with_what, _) -> Tactics.change ~what ~with_what
+  | 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
@@ -40,7 +45,8 @@ let tactic_of_ast = function
   | TacticAst.ElimType (_, term) -> Tactics.elim_type term
   | TacticAst.Exact (_, term) -> Tactics.exact term
   | TacticAst.Exists _ -> Tactics.exists
-  | TacticAst.Fold (_, reduction_kind ,term) ->
+  | TacticAst.Fail _ -> Tactics.fail
+  | TacticAst.Fold (_, reduction_kind, pattern) ->
      let reduction =
       match reduction_kind with
        | `Normalize -> CicReduction.normalize ~delta:false ~subst:[]
@@ -48,22 +54,24 @@ let tactic_of_ast = function
        | `Simpl -> ProofEngineReduction.simpl
        | `Whd -> CicReduction.whd ~delta:false ~subst:[]
      in
-      Tactics.fold ~reduction ~also_in_hypotheses:false ~term
+      Tactics.fold ~reduction ~pattern
   | TacticAst.Fourier _ -> Tactics.fourier
   | TacticAst.FwdSimpl (_, term) -> 
      Tactics.fwd_simpl ~what:term ~dbd:(MatitaDb.instance ())
-  | TacticAst.Generalize (_,term,ident,pat) ->
+  | TacticAst.Generalize (_,pattern,ident) ->
      let names = match ident with None -> [] | Some id -> [id] in
-     Tactics.generalize ~term ~mk_fresh_name_callback:(namer_of names) pat
+     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 (_, to_what, what) ->
-     Tactics.lapply ?to_what what
+  | 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.LetIn (loc,term,name) ->
       Tactics.letin term ~mk_fresh_name_callback:(namer_of [name])
@@ -74,12 +82,10 @@ let tactic_of_ast = function
       | `Simpl -> Tactics.simpl ~pattern 
       | `Whd -> Tactics.whd ~pattern)
   | TacticAst.Reflexivity _ -> Tactics.reflexivity
-  | TacticAst.Replace (_, what, with_what) -> Tactics.replace ~what ~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.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
@@ -104,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; ... *)
@@ -217,7 +221,15 @@ 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.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
@@ -368,14 +380,18 @@ let disambiguate_obj status obj =
   in
   status, cic
   
-let disambiguate_pattern aliases (hyp_paths ,goal_path) =
-  let interp path = Disambiguate.interpretate_path [] aliases path in
-  let goal_path = 
-    match goal_path with 
-    | None -> None
-    | Some path -> Some (interp path) in
+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
-  (hyp_paths ,goal_path)
+  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.Apply (loc, term) ->
@@ -386,11 +402,12 @@ let disambiguate_tactic status = function
       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.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)
@@ -423,24 +440,25 @@ let disambiguate_tactic status = function
       let status, cic = disambiguate_term status term in
       status, TacticAst.ElimType (loc, cic)
   | TacticAst.Exists loc -> status, TacticAst.Exists loc 
-  | TacticAst.Fold (loc,reduction_kind, term) ->
-     let status, term = disambiguate_term status term in
-     status, TacticAst.Fold (loc,reduction_kind, term)
+  | TacticAst.Fail loc -> status,TacticAst.Fail loc
+  | TacticAst.Fold (loc,reduction_kind, pattern) ->
+     let status, pattern = disambiguate_pattern status pattern in
+     status, TacticAst.Fold (loc,reduction_kind, 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,ident,pattern)
+  | 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.Injection (loc,term)
   | TacticAst.Intros (loc, num, names) ->
       status, TacticAst.Intros (loc, num, names)
-  | TacticAst.LApply (loc, to_what, what) ->
+  | TacticAst.LApply (loc, to_what, what, ident) ->
      let status, to_what =
       match to_what with
          None -> status,None
@@ -449,22 +467,22 @@ let disambiguate_tactic status = function
            status, Some to_what
      in
      let status, what = disambiguate_term status what in
-     status, TacticAst.LApply (loc, to_what, what)
+     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
+      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, 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.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 pattern = disambiguate_pattern status.aliases pattern 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
@@ -498,8 +516,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 =
@@ -517,7 +533,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) ->
@@ -559,24 +575,33 @@ 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 _ _ -> ())
 
 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