- inversion principles are now generated also for co-inductive types

[helm.git] / helm / software / components / grafite_engine / grafiteEngine.ml

diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml
index 73905eef306be23960b89d239e2ff473f7ce4ff3..89673e7d75dae131b867114380e98b37fec483f6 100644 (file)
--- a/helm/software/components/grafite_engine/grafiteEngine.ml
+++ b/helm/software/components/grafite_engine/grafiteEngine.ml
@@ -530,19 +530,9 @@ let record_index_obj =
    end
 ;;
 
-let index_obj_for_auto status (uri, height, _, _, kind) = 
- (*prerr_endline (string_of_int height);*)
+let compute_keys uri height kind = 
  let mk_item orig_ty spec =
-   let ty,_,_ = NCicMetaSubst.saturate ~delta:max_int [] [] [] orig_ty 0 in
-   let keys = 
-     match ty with
-     | NCic.Const (NReference.Ref (_,NReference.Def h)) 
-     | NCic.Appl (NCic.Const (NReference.Ref (_,NReference.Def h))::_) 
-        when h > 0 ->
-          let ty',_,_= NCicMetaSubst.saturate ~delta:(h-1) [] [] [] orig_ty 0 in
-          [ty;ty']
-     | _ -> [ty]
-   in
+  let keys = NnAuto.keys_of_cic_term [] [] [] orig_ty in
    keys,NCic.Const(NReference.reference_of_spec uri spec)
  in
  let data = 
@@ -565,7 +555,7 @@ let index_obj_for_auto status (uri, height, _, _, kind) =
   | NCic.Constant (_,_,None, ty, _) ->
      [ mk_item ty NReference.Decl ]
  in
- let data = HExtlib.filter_map
+  HExtlib.filter_map
    (fun (keys, t) ->
      let keys = List.filter
        (function 
@@ -589,10 +579,14 @@ let index_obj_for_auto status (uri, height, _, _, kind) =
         None
       end)
    data
- in
- let status = basic_index_obj data status in
- let dump = record_index_obj data :: status#dump in
- status#set_dump dump
+;;
+
+let index_obj_for_auto status (uri, height, _, _, kind) = 
+ (*prerr_endline (string_of_int height);*)
+  let data = compute_keys uri height kind in
+  let status = basic_index_obj data status in
+  let dump = record_index_obj data :: status#dump in   
+  status#set_dump dump
 ;; 
 
 let index_eq uri status =
@@ -616,7 +610,7 @@ let record_index_eq =
 let index_eq_for_auto status uri =
  if NnAuto.is_a_fact_obj status uri then
    let newstatus = index_eq uri status in
-     if newstatus == status then status 
+     if newstatus#eq_cache == status#eq_cache then status 
      else
        ((*prerr_endline ("recording " ^ (NUri.string_of_uri uri));*)
        let dump = record_index_eq uri :: newstatus#dump 
@@ -752,7 +746,7 @@ let eval_ng_punct (_text, _prefix_len, punct) =
   match punct with
   | GrafiteAst.Dot _ -> NTactics.dot_tac 
   | GrafiteAst.Semicolon _ -> fun x -> x
-  | GrafiteAst.Branch _ -> NTactics.branch_tac 
+  | GrafiteAst.Branch _ -> NTactics.branch_tac ~force:false
   | GrafiteAst.Shift _ -> NTactics.shift_tac 
   | GrafiteAst.Pos (_,l) -> NTactics.pos_tac l
   | GrafiteAst.Wildcard _ -> NTactics.wildcard_tac 
@@ -776,10 +770,11 @@ let eval_ng_tac tac =
            ) hyps,
           (text,prefix_len,concl))
        ) seqs)
-  | GrafiteAst.NAuto (_loc, (l,a)) ->
+  | GrafiteAst.NAuto (_loc, (None,a)) -> NAuto.auto_tac ~params:(None,a)
+  | GrafiteAst.NAuto (_loc, (Some l,a)) ->
       NAuto.auto_tac
-       ~params:(List.map (fun x -> "",0,x) l,a)
-  | GrafiteAst.NBranch _ -> NTactics.branch_tac 
+       ~params:(Some List.map (fun x -> "",0,x) l,a)
+  | GrafiteAst.NBranch _ -> NTactics.branch_tac ~force:false
   | GrafiteAst.NCases (_loc, what, where) ->
       NTactics.cases_tac 
         ~what:(text,prefix_len,what)
@@ -805,6 +800,10 @@ let eval_ng_tac tac =
       NTactics.generalize_tac ~where:(text,prefix_len,where)
   | GrafiteAst.NId _ -> (fun x -> x)
   | GrafiteAst.NIntro (_loc,n) -> NTactics.intro_tac n
+  | GrafiteAst.NInversion (_loc, what, where) ->
+      NTactics.inversion_tac 
+        ~what:(text,prefix_len,what)
+        ~where:(text,prefix_len,where)
   | GrafiteAst.NLApply (_loc, t) -> NTactics.lapply_tac (text,prefix_len,t) 
   | GrafiteAst.NLetIn (_loc,where,what,name) ->
       NTactics.letin_tac ~where:(text,prefix_len,where) 
@@ -882,8 +881,18 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) =
         let obj = uri,height,[],[],obj_kind in
         let old_status = status in
         let status = NCicLibrary.add_obj status obj in
-        let status = index_obj_for_auto status obj in
-        let status = index_eq_for_auto status uri in
+        let index_obj =
+         match obj_kind with
+            NCic.Constant (_,_,_,_,(_,`Example,_))
+          | NCic.Fixpoint (_,_,(_,`Example,_)) -> false
+          | _ -> true
+        in
+        let status =
+         if index_obj then
+          let status = index_obj_for_auto status obj in
+           index_eq_for_auto status uri
+         else
+          status in
 (*
          try 
            index_eq uri status
@@ -931,15 +940,17 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) =
              ) (status,`New [] (* uris *)) boxml in             
            let _,_,_,_,nobj = obj in 
            let status = match nobj with
-               NCic.Inductive (true,leftno,[it],_) ->
+               NCic.Inductive (is_ind,leftno,[it],_) ->
                  let _,ind_name,ty,cl = it in
                  List.fold_left 
                    (fun status outsort ->
                       let status = status#set_ng_mode `ProofMode in
                       try
-                       (let status,invobj = NInversion.mk_inverter 
-                                      (ind_name ^ "_inv_" ^ (snd (NCicElim.ast_of_sort outsort))) 
-                                      it leftno outsort status status#baseuri in
+                       (let status,invobj =
+                         NInversion.mk_inverter 
+                          (ind_name ^ "_inv_" ^
+                            (snd (NCicElim.ast_of_sort outsort)))
+                          is_ind it leftno outsort status status#baseuri in
                        let _,_,menv,_,_ = invobj in
                        fst (match menv with
                              [] -> eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc)
@@ -1076,7 +1087,7 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) =
             indtyno, NCicEnvironment.get_checked_indtys r
         | _ -> prerr_endline ("engine: indty ="  ^ NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] indty) ; assert false in
       let it = List.nth tys indtyno in
-     let status,obj = NInversion.mk_inverter name it leftno ?selection sort 
+     let status,obj = NInversion.mk_inverter name true it leftno ?selection sort 
                         status status#baseuri in
      let _,_,menv,_,_ = obj in
      (match menv with