X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=b177435d4143943e62352bc357d6fc5e918d2e53;hb=bf71f28526258043857cc389adda5ce58fd236be;hp=d7343c98c1447c5831ace4066798c6828e37fd09;hpb=e31bb143e3a303321e509f415764338849b7e516;p=helm.git

diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml
index d7343c98c..b177435d4 100644
--- a/helm/software/components/grafite_engine/grafiteEngine.ml
+++ b/helm/software/components/grafite_engine/grafiteEngine.ml
@@ -28,7 +28,8 @@
 open Printf
 
 exception Drop
-exception IncludedFileNotCompiled of string (* file name *)
+(* mo file name, ma file name *)
+exception IncludedFileNotCompiled of string * string 
 exception Macro of
  GrafiteAst.loc *
   (Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro)
@@ -83,6 +84,7 @@ let tactic_of_ast ast =
       let dbd = LibraryDb.instance () in
       let mk_fresh_name_callback = namer_of names in
       Tactics.decompose ~mk_fresh_name_callback ~dbd ~user_types ?what
+  | GrafiteAst.Demodulate _ -> Tactics.demodulate ~dbd:(LibraryDb.instance ())
   | GrafiteAst.Discriminate (_,term) -> Tactics.discriminate term
   | GrafiteAst.Elim (_, what, using, depth, names) ->
       Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names)
@@ -96,8 +98,6 @@ let tactic_of_ast ast =
   | GrafiteAst.Fold (_, reduction_kind, term, pattern) ->
       let reduction =
         match reduction_kind with
-        | `Demodulate -> 
-            GrafiteTypes.command_error "demodulation can't be folded"
         | `Normalize ->
             PET.const_lazy_reduction
               (CicReduction.normalize ~delta:false ~subst:[])
@@ -139,7 +139,6 @@ let tactic_of_ast ast =
       Tactics.letin term ~mk_fresh_name_callback:(namer_of [name])
   | GrafiteAst.Reduce (_, reduction_kind, pattern) ->
       (match reduction_kind with
-	 | `Demodulate -> Tactics.demodulate ~dbd:(LibraryDb.instance ()) ~pattern
 	 | `Normalize -> Tactics.normalize ~pattern
 	 | `Reduce -> Tactics.reduce ~pattern  
 	 | `Simpl -> Tactics.simpl ~pattern 
@@ -155,8 +154,25 @@ let tactic_of_ast ast =
   | GrafiteAst.Split _ -> Tactics.split
   | GrafiteAst.Symmetry _ -> Tactics.symmetry
   | GrafiteAst.Transitivity (_, term) -> Tactics.transitivity term
+  (* Implementazioni Aggiunte *)
+  | GrafiteAst.Assume (_, id, t) -> Declarative.assume id t
+  | GrafiteAst.Suppose (_, t, id, t1) -> Declarative.suppose t id t1
+  | GrafiteAst.By_term_we_proved (_, t, ty, id, t1) ->
+     Declarative.by_term_we_proved t ty id t1
+  | GrafiteAst.We_need_to_prove (_, t, id, t2) ->
+     Declarative.we_need_to_prove t id t2
+  | GrafiteAst.Bydone (_, t) -> Declarative.bydone t 
+  | GrafiteAst.We_proceed_by_induction_on (_, t, t1) ->
+     Declarative.we_proceed_by_induction_on t t1
+  | GrafiteAst.Byinduction (_, t, id) -> Declarative.byinduction id t
+  | GrafiteAst.Thesisbecomes (_, t) -> Declarative.thesisbecomes t
+  | GrafiteAst.ExistsElim (_, t, id1, t1, id2, t2) ->
+     Declarative.existselim t id1 t1 id2 t2
+  | GrafiteAst.Case (_,id,params) -> Declarative.case id params
+  | GrafiteAst.AndElim(_,t,id1,t1,id2,t2) -> Declarative.andelim t id1 t1 id2 t2
+  | GrafiteAst.RewritingStep (_,termine,t1,t2,cont) ->
+     Declarative.rewritingstep termine t1 t2 cont
 
-(* maybe we only need special cases for apply and goal *)
 let classify_tactic tactic = 
   match tactic with
   (* tactics that can't close the goal (return a goal we want to "select") *)
@@ -424,8 +440,10 @@ let refinement_toolkit = {
 let eval_coercion status ~add_composites uri =
  let status,compounds =
   GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri in
- let moo_content = coercion_moo_statement_of uri in
- let status = GrafiteTypes.add_moo_content [moo_content] status in
+ let moo_content = 
+   List.map coercion_moo_statement_of (uri::compounds)
+ in
+ let status = GrafiteTypes.add_moo_content moo_content status in
   {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},
    compounds
 
@@ -518,7 +536,7 @@ let add_coercions_of_record_to_moo obj lemmas status =
           let obj,_ = 
             CicEnvironment.get_cooked_obj  CicUniv.empty_ugraph uri in
           let attrs = CicUtil.attributes_of_obj obj in
-          List.mem (`Class `Projection) attrs
+          List.mem (`Class `Coercion) attrs
         with Not_found -> assert false
       in
       (* looking at the fields we can know the 'wanted' coercions, but not the 
@@ -535,8 +553,7 @@ let add_coercions_of_record_to_moo obj lemmas status =
             | _ -> None) 
           fields
       in
-      (*
-      prerr_endline "wanted coercions:";
+      (*prerr_endline "wanted coercions:";
       List.iter 
         (fun u -> prerr_endline (UriManager.string_of_uri u)) 
         wanted_coercions; *)
@@ -545,17 +562,22 @@ let add_coercions_of_record_to_moo obj lemmas status =
           (HExtlib.filter_map 
             (fun uri ->
               let is_a_wanted_coercion = 
-                List.exists (UriManager.eq uri) wanted_coercions in
-              if is_a_coercion uri && is_a_wanted_coercion then
+                List.exists (UriManager.eq uri) wanted_coercions 
+              in
+              if is_a_coercion uri || is_a_wanted_coercion then
                 Some (uri, coercion_moo_statement_of uri)
               else
                 None) 
             lemmas)
       in
-      (* prerr_endline "actual coercions:";
+      (*prerr_endline "actual coercions:";
+      List.iter 
+        (fun u -> prerr_endline (UriManager.string_of_uri u)) 
+        coercions; 
+      prerr_endline "lemmas was:";
       List.iter 
         (fun u -> prerr_endline (UriManager.string_of_uri u)) 
-        coercions; *)
+        lemmas; *)
       let status = GrafiteTypes.add_moo_content moo_content status in 
       {status with 
         GrafiteTypes.coercions = coercions @ status.GrafiteTypes.coercions}, 
@@ -570,6 +592,11 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
  let status,cmd = disambiguate_command status (text,prefix_len,cmd) in
  let status,uris =
   match cmd with
+  | GrafiteAst.Print (_,"proofterm") ->
+      let _,_,p,_ = GrafiteTypes.get_current_proof status in
+      print_endline (AutoTactic.pp_proofterm p);
+      status,[]
+  | GrafiteAst.Print (_,_) -> status,[]
   | GrafiteAst.Default (loc, what, uris) as cmd ->
      LibraryObjects.set_default what uris;
      GrafiteTypes.add_moo_content [cmd] status,[]
@@ -583,7 +610,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
      let moopath = 
        if Sys.file_exists moopath_r then moopath_r else
          if Sys.file_exists moopath_rw then moopath_rw else
-           raise (IncludedFileNotCompiled moopath_rw)
+           raise (IncludedFileNotCompiled (moopath_rw,baseuri))
      in
      let status = eval_from_moo.efm_go status moopath in
      status,[]
@@ -608,9 +635,12 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
           LibraryClean.clean_baseuris [value];
           assert (Http_getter_storage.is_empty value);
         end;
-        HExtlib.mkdir 
-          (Filename.dirname (Http_getter.filename ~writable:true (value ^
-            "/foo.con")));
+        if not (Helm_registry.get_opt_default Helm_registry.bool "matita.nodisk"
+                  ~default:false) 
+        then
+          HExtlib.mkdir 
+            (Filename.dirname (Http_getter.filename ~writable:true (value ^
+              "/foo.con")));
       end;
       GrafiteTypes.set_option status name value,[]
   | GrafiteAst.Drop loc -> raise Drop