X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic%2FcicUtil.ml;h=7c6e3eabe28619cc14fdd0cb812f998566d38b52;hb=771ee8b9d122fa963881c876e86f90531bb7434f;hp=81055e68178099bd41523c9e870b07d83be84194;hpb=faabe59afc8e66c96a1191210ac1e97effa028fe;p=helm.git

diff --git a/helm/ocaml/cic/cicUtil.ml b/helm/ocaml/cic/cicUtil.ml
index 81055e681..7c6e3eabe 100644
--- a/helm/ocaml/cic/cicUtil.ml
+++ b/helm/ocaml/cic/cicUtil.ml
@@ -23,6 +23,8 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Printf
 
 exception Meta_not_found of int
@@ -115,24 +117,25 @@ let rec is_meta_closed =
     | Cic.Lambda (_,so,dest) -> is_meta_closed so && is_meta_closed dest
     | Cic.LetIn (_,so,dest) -> is_meta_closed so && is_meta_closed dest
     | Cic.Appl l ->
-       List.fold_right (fun x i -> i && is_meta_closed x) l true
+       not (List.exists (fun x -> not (is_meta_closed x)) l)
     | Cic.Var (_,exp_named_subst)
     | Cic.Const (_,exp_named_subst)
     | Cic.MutInd (_,_,exp_named_subst)
     | Cic.MutConstruct (_,_,_,exp_named_subst) ->
-       List.fold_right (fun (_,x) i -> i && is_meta_closed x)
-        exp_named_subst true
+       not (List.exists (fun (_,x) -> not (is_meta_closed x)) exp_named_subst)
     | Cic.MutCase (_,_,out,te,pl) ->
        is_meta_closed out && is_meta_closed te &&
-        List.fold_right (fun x i -> i && is_meta_closed x) pl true
+        not (List.exists (fun x -> not (is_meta_closed x)) pl)
     | Cic.Fix (_,fl) ->
-        List.fold_right
-          (fun (_,_,ty,bo) i -> i && is_meta_closed ty && is_meta_closed bo
-          ) fl true
+        not (List.exists 
+              (fun (_,_,ty,bo) -> 
+                  not (is_meta_closed ty) || not (is_meta_closed bo)) 
+              fl)
     | Cic.CoFix (_,fl) ->
-         List.fold_right
-          (fun (_,ty,bo) i -> i && is_meta_closed ty && is_meta_closed bo
-          ) fl true
+        not (List.exists 
+              (fun (_,ty,bo) -> 
+                  not (is_meta_closed ty) || not (is_meta_closed bo)) 
+              fl)
 ;;
 
 let xpointer_RE = Str.regexp "\\([^#]+\\)#xpointer(\\(.*\\))"
@@ -141,9 +144,9 @@ let slash_RE = Str.regexp "/"
 let term_of_uri uri =
   let s = UriManager.string_of_uri uri in
   try
-    (if String.sub s (String.length s - 4) 4 = ".con" then
+    (if UriManager.uri_is_con uri then
       Cic.Const (uri, [])
-    else if String.sub s (String.length s - 4) 4 = ".var" then
+    else if UriManager.uri_is_var uri then
       Cic.Var (uri, [])
     else if not (Str.string_match xpointer_RE s 0) then
       raise (UriManager.IllFormedUri s)
@@ -173,87 +176,6 @@ let uri_of_term = function
         (tyno + 1) consno)
   | _ -> raise (Invalid_argument "uri_of_term")
 
-let select ~term ~context =
-  (* i is the number of binder traversed *) 
-  let rec aux i context term =
-    match (context, term) with
-    | Cic.Implicit (Some `Hole), t -> [i,t]
-    | Cic.Implicit None,_ -> []
-    | Cic.Meta (_, ctxt1), Cic.Meta (_, ctxt2) ->
-        List.concat
-          (List.map2
-            (fun t1 t2 ->
-              (match (t1, t2) with Some t1, Some t2 -> aux i t1 t2 | _ -> []))
-            ctxt1 ctxt2)
-    | Cic.Cast (te1, ty1), Cic.Cast (te2, ty2) -> aux i te1 te2 @ aux i ty1 ty2
-    | Cic.Prod (_, s1, t1), Cic.Prod (_, s2, t2)
-    | Cic.Lambda (_, s1, t1), Cic.Lambda (_, s2, t2)
-    | Cic.LetIn (_, s1, t1), Cic.LetIn (_, s2, t2) -> 
-        aux i s1 s2 @ aux (i+1) t1 t2
-    | Cic.Appl terms1, Cic.Appl terms2 -> auxs i terms1 terms2
-    | Cic.Var (_, subst1), Cic.Var (_, subst2)
-    | Cic.Const (_, subst1), Cic.Const (_, subst2)
-    | Cic.MutInd (_, _, subst1), Cic.MutInd (_, _, subst2)
-    | Cic.MutConstruct (_, _, _, subst1), Cic.MutConstruct (_, _, _, subst2) ->
-        auxs i (List.map snd subst1) (List.map snd subst2)
-    | Cic.MutCase (_, _, out1, t1, pat1), Cic.MutCase (_ , _, out2, t2, pat2) ->
-        aux i out1 out2 @ aux i t1 t2 @ auxs i pat1 pat2
-    | Cic.Fix (_, funs1), Cic.Fix (_, funs2) ->
-        List.concat
-          (List.map2
-            (fun (_, _, ty1, bo1) (_, _, ty2, bo2) -> 
-              aux i ty1 ty2 @ aux i bo1 bo2)
-            funs1 funs2)
-    | Cic.CoFix (_, funs1), Cic.CoFix (_, funs2) ->
-        List.concat
-          (List.map2
-            (fun (_, ty1, bo1) (_, ty2, bo2) -> aux i ty1 ty2 @ aux i bo1 bo2)
-            funs1 funs2)
-    | _ -> assert false
-  and auxs i terms1 terms2 =  (* as aux for list of terms *)
-    List.concat (List.map2 (fun t1 t2 -> aux i t1 t2) terms1 terms2)
-  in
-  aux 0 context term
-
-let context_of ?(equality=(==)) ~term terms =
-  let (===) x y = equality x y in
-  let rec aux t =
-    match t with
-    | t when List.exists (fun t' -> t === t') terms -> Cic.Implicit (Some `Hole)
-    | Cic.Var (uri, subst) -> Cic.Var (uri, aux_subst subst)
-    | Cic.Meta (i, ctxt) ->
-        let ctxt =
-          List.map (function None -> None | Some t -> Some (aux t)) ctxt
-        in
-        Cic.Meta (i, ctxt)
-    | Cic.Cast (t, ty) -> Cic.Cast (aux t, aux ty)
-    | Cic.Prod (name, s, t) -> Cic.Prod (name, aux s, aux t)
-    | Cic.Lambda (name, s, t) -> Cic.Lambda (name, aux s, aux t)
-    | Cic.LetIn (name, s, t) -> Cic.LetIn (name, aux s, aux t)
-    | Cic.Appl terms -> Cic.Appl (List.map aux terms)
-    | Cic.Const (uri, subst) -> Cic.Const (uri, aux_subst subst)
-    | Cic.MutInd (uri, tyno, subst) -> Cic.MutInd (uri, tyno, aux_subst subst)
-    | Cic.MutConstruct (uri, tyno, consno, subst) ->
-        Cic.MutConstruct (uri, tyno, consno, aux_subst subst)
-    | Cic.MutCase (uri, tyno, outty, t, pat) ->
-        Cic.MutCase (uri, tyno, aux outty, aux t, List.map aux pat)
-    | Cic.Fix (funno, funs) ->
-        let funs =
-          List.map (fun (name, i, ty, bo) -> (name, i, aux ty, aux bo)) funs
-        in
-        Cic.Fix (funno, funs)
-    | Cic.CoFix (funno, funs) ->
-        let funs =
-          List.map (fun (name, ty, bo) -> (name, aux ty, aux bo)) funs
-        in
-        Cic.CoFix (funno, funs)
-    | Cic.Rel _
-    | Cic.Sort _
-    | Cic.Implicit _ -> t
-  and aux_subst subst =
-    List.map (fun (uri, t) -> (uri, aux t)) subst
-  in
-  aux term
 
 (*
 let pack terms =
@@ -290,18 +212,154 @@ let rec mk_rels howmany from =
   | 0 -> []
   | _ -> (Cic.Rel (howmany + from)) :: (mk_rels (howmany-1) from)
 
-let profile =
- function s ->
-  let total = ref 0.0 in
-  let profile f x =
-   let before = Unix.gettimeofday () in
-   let res = f x in
-   let after = Unix.gettimeofday () in
-    total := !total +. (after -. before);
-    res
-  in
-  at_exit
-   (fun () ->
-     print_endline
-      ("!! TOTAL TIME SPENT IN " ^ s ^ ": " ^ string_of_float !total));
-  profile
+let id_of_annterm =
+  function
+  | Cic.ARel (id,_,_,_)
+  | Cic.AVar (id,_,_)
+  | Cic.AMeta (id,_,_)
+  | Cic.ASort (id,_)
+  | Cic.AImplicit (id,_)
+  | Cic.ACast (id,_,_)
+  | Cic.AProd (id,_,_,_)
+  | Cic.ALambda (id,_,_,_)
+  | Cic.ALetIn (id,_,_,_)
+  | Cic.AAppl (id,_)
+  | Cic.AConst (id,_,_)
+  | Cic.AMutInd (id,_,_,_)
+  | Cic.AMutConstruct (id,_,_,_,_)
+  | Cic.AMutCase (id,_,_,_,_,_)
+  | Cic.AFix (id,_,_)
+  | Cic.ACoFix (id,_,_) -> id
+
+
+let rec rehash_term =
+  let module C = Cic in
+  let recons uri = UriManager.uri_of_string (UriManager.string_of_uri uri) in
+  function
+   | (C.Rel _) as t -> t
+   | C.Var (uri,exp_named_subst) ->
+      let uri' = recons uri in
+      let exp_named_subst' =
+       List.map
+        (function (uri,t) ->(recons uri,rehash_term t)) 
+         exp_named_subst
+      in
+       C.Var (uri',exp_named_subst')
+   | C.Meta (i,l) ->
+      let l' =
+       List.map
+        (function
+            None -> None
+          | Some t -> Some (rehash_term t)
+        ) l
+      in
+       C.Meta(i,l')
+   | C.Sort (C.Type u) -> 
+       CicUniv.assert_univ u;
+       C.Sort (C.Type (CicUniv.recons_univ u))
+   | C.Sort _ as t -> t
+   | C.Implicit _ as t -> t
+   | C.Cast (te,ty) -> C.Cast (rehash_term te, rehash_term ty)
+   | C.Prod (n,s,t) -> C.Prod (n, rehash_term s, rehash_term t)
+   | C.Lambda (n,s,t) -> C.Lambda (n, rehash_term s, rehash_term t)
+   | C.LetIn (n,s,t) -> C.LetIn (n, rehash_term s, rehash_term t)
+   | C.Appl l -> C.Appl (List.map rehash_term l)
+   | C.Const (uri,exp_named_subst) ->
+      let uri' = recons uri in
+      let exp_named_subst' = 
+       List.map
+        (function (uri,t) -> (recons uri,rehash_term t)) exp_named_subst
+      in
+       C.Const (uri',exp_named_subst')
+   | C.MutInd (uri,tyno,exp_named_subst) ->
+      let uri' = recons uri in
+      let exp_named_subst' = 
+       List.map
+        (function (uri,t) -> (recons uri,rehash_term t)) exp_named_subst
+      in
+       C.MutInd (uri',tyno,exp_named_subst')
+   | C.MutConstruct (uri,tyno,consno,exp_named_subst) ->
+      let uri' = recons uri in
+      let exp_named_subst' = 
+       List.map
+        (function (uri,t) -> (recons uri,rehash_term t)) exp_named_subst
+      in
+       C.MutConstruct (uri',tyno,consno,exp_named_subst')
+   | C.MutCase (uri,i,outty,t,pl) ->
+      C.MutCase (recons uri, i, rehash_term outty, rehash_term t,
+       List.map rehash_term pl)
+   | C.Fix (i, fl) ->
+      let liftedfl =
+       List.map
+        (fun (name, i, ty, bo) ->
+          (name, i, rehash_term ty, rehash_term bo))
+         fl
+      in
+       C.Fix (i, liftedfl)
+   | C.CoFix (i, fl) ->
+      let liftedfl =
+       List.map
+        (fun (name, ty, bo) -> (name, rehash_term ty, rehash_term bo))
+         fl
+      in
+       C.CoFix (i, liftedfl)
+
+let rehash_obj =
+ let module C = Cic in
+ let recons uri = UriManager.uri_of_string (UriManager.string_of_uri uri) in
+ function 
+   C.Constant (name,bo,ty,params,attrs) ->
+     let bo' =
+       match bo with
+         None -> None
+       | Some bo -> Some (rehash_term bo)
+     in
+     let ty' = rehash_term ty in
+     let params' = List.map recons params in
+     C.Constant (name, bo', ty', params',attrs)
+ | C.CurrentProof (name,conjs,bo,ty,params,attrs) ->
+     let conjs' =
+       List.map
+         (function (i,hyps,ty) ->
+           (i,
+           List.map (function
+               None -> None
+             | Some (name,C.Decl t) ->
+                 Some (name,C.Decl (rehash_term t))
+             | Some (name,C.Def (bo,ty)) ->
+                 let ty' =
+                   match ty with
+                     None -> None
+                   | Some ty'' -> Some (rehash_term ty'')
+                 in
+                 Some (name,C.Def (rehash_term bo, ty'))) hyps,
+           rehash_term ty))
+         conjs
+     in
+     let bo' = rehash_term bo in
+     let ty' = rehash_term ty in
+     let params' = List.map recons params in
+     C.CurrentProof (name, conjs', bo', ty', params',attrs)
+ | C.Variable (name,bo,ty,params,attrs) ->
+     let bo' =
+       match bo with
+         None -> None
+       | Some bo -> Some (rehash_term bo)
+     in
+     let ty' = rehash_term ty in
+     let params' = List.map recons params in
+     C.Variable (name, bo', ty', params',attrs)
+ | C.InductiveDefinition (tl,params,paramsno,attrs) ->
+     let params' = List.map recons params in
+     let tl' =
+       List.map (function (name, inductive, ty, constructors) ->
+         name,
+         inductive,
+         rehash_term ty,
+         (List.map
+           (function (name, ty) -> name, rehash_term ty)
+           constructors))
+         tl
+     in
+     C.InductiveDefinition (tl', params', paramsno, attrs)
+