X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic%2FcicUtil.ml;h=81834251577822662c5121c70ea0cf98a11aaf5f;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=36c266ba7b7054ebbfec0941c6e4a48d13262219;hpb=e466e614d63da993d6380cf166bbb041b46f04cd;p=helm.git

diff --git a/helm/ocaml/cic/cicUtil.ml b/helm/ocaml/cic/cicUtil.ml
index 36c266ba7..818342515 100644
--- a/helm/ocaml/cic/cicUtil.ml
+++ b/helm/ocaml/cic/cicUtil.ml
@@ -23,10 +23,11 @@
  * http://helm.cs.unibo.it/
  *)
 
+open Printf
+
 exception Meta_not_found of int
 exception Subst_not_found of int
 
-
 let lookup_meta index metasenv =
   try
     List.find (fun (index', _, _) -> index = index') metasenv
@@ -46,7 +47,7 @@ canonical context *)
 let clean_up_local_context subst metasenv n l =
   let cc =
     (try
-       let (cc,_) = lookup_subst n subst in cc
+       let (cc,_,_) = lookup_subst n subst in cc
      with Subst_not_found _ ->
        try
 	 let (_,cc,_) = lookup_meta n metasenv in cc
@@ -103,66 +104,126 @@ in
  is_closed 0
 ;;
 
-(* CPS iterators on Cic.term ************************************************)
-
-let rec visit_l visit_t map f r = function
-   | []        -> f r
-   | h :: tail -> 
-      let f r = visit_l visit_t map f r tail in 
-      visit_t f r (map h) 
-
-let meta_closed t =
-   let rec visit_t f r = function
-      | Cic.Meta _                     -> raise Exit
-      | Cic.Implicit _
-      | Cic.Sort _      
-      | Cic.Rel _                      -> f r 
-      | Cic.Cast (t, u) 
-      | Cic.Prod (_, t, u) 
-      | Cic.Lambda (_, t, u) 
-      | Cic.LetIn (_, t, u)            -> 
-         let f r = visit_t f r u in visit_t f r t 
-      | Cic.Appl tl                    -> 
-         visit_l visit_t (fun x -> x) f r tl 
-      | Cic.Fix (_, tl)                ->  
-         let f r = visit_l visit_t (fun (_, _, _, u) -> u) f r tl in
-         visit_l visit_t (fun (_, _, t, _) -> t) f r tl
-      | Cic.CoFix (_, tl)              -> 
-         let f r = visit_l visit_t (fun (_, _, u) -> u) f r tl in
-         visit_l visit_t (fun (_, t, _) -> t) f r tl
-      | Cic.Var (k, tl)
-      | Cic.Const (k, tl)             
-      | Cic.MutInd (k, _, tl) 
-      | Cic.MutConstruct (k, _, _, tl) -> 
-         visit_l visit_t (fun (_, u) -> u) f r tl
-      | Cic.MutCase (_, _, t, u, tl)   -> 
-         let f r = visit_l visit_t (fun u -> u) f r tl in
-         let f r = visit_t f r u in
-         visit_t f r t
-   in	  
-   try visit_t (fun x -> x) () t; false with Exit -> true
-
-let xpointer_RE = Str.regexp "[^#]+#xpointer(\\(.*\\))"
+let rec is_meta_closed =
+  function
+      Cic.Rel _ -> true
+    | Cic.Meta _ -> false
+    | Cic.Sort _ -> true
+    | Cic.Implicit _ -> assert false
+    | Cic.Cast (te,ty) -> is_meta_closed te && is_meta_closed ty
+    | Cic.Prod (name,so,dest) -> is_meta_closed so && is_meta_closed dest
+    | 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
+    | 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
+    | 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
+    | Cic.Fix (_,fl) ->
+        List.fold_right
+          (fun (_,_,ty,bo) i -> i && is_meta_closed ty && is_meta_closed bo
+          ) fl true
+    | Cic.CoFix (_,fl) ->
+         List.fold_right
+          (fun (_,ty,bo) i -> i && is_meta_closed ty && is_meta_closed bo
+          ) fl true
+;;
+
+let xpointer_RE = Str.regexp "\\([^#]+\\)#xpointer(\\(.*\\))"
 let slash_RE = Str.regexp "/"
 
-let term_of_uri s =
-  let uri = UriManager.uri_of_string s in
+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)
     else
-      (match Str.split slash_RE (Str.matched_group 1 s) with
-      | [_; tyno] -> Cic.MutInd (uri, int_of_string tyno - 1, [])
+      let (baseuri,xpointer) = (Str.matched_group 1 s, Str.matched_group 2 s) in
+      let baseuri = UriManager.uri_of_string baseuri in
+      (match Str.split slash_RE xpointer with
+      | [_; tyno] -> Cic.MutInd (baseuri, int_of_string tyno - 1, [])
       | [_; tyno; consno] ->
           Cic.MutConstruct
-            (uri, int_of_string tyno - 1, int_of_string consno, [])
+            (baseuri, int_of_string tyno - 1, int_of_string consno, [])
       | _ -> raise Exit))
   with
   | Exit
   | Failure _
   | Not_found -> raise (UriManager.IllFormedUri s)
 
+let uri_of_term = function
+  | Cic.Const (uri, [])
+  | Cic.Var (uri, []) -> uri
+  | Cic.MutInd (baseuri, tyno, []) ->
+     UriManager.uri_of_string
+      (sprintf "%s#xpointer(1/%d)" (UriManager.string_of_uri baseuri) (tyno+1))
+  | Cic.MutConstruct (baseuri, tyno, consno, []) ->
+     UriManager.uri_of_string
+      (sprintf "%s#xpointer(1/%d/%d)" (UriManager.string_of_uri baseuri)
+        (tyno + 1) consno)
+  | _ -> raise (Invalid_argument "uri_of_term")
+
+
+(*
+let pack terms =
+  List.fold_right
+    (fun term acc -> Cic.Prod (Cic.Anonymous, term, acc))
+    terms (Cic.Sort (Cic.Type (CicUniv.fresh ())))
+
+let rec unpack = function
+  | Cic.Prod (Cic.Anonymous, term, Cic.Sort (Cic.Type _)) -> [term]
+  | Cic.Prod (Cic.Anonymous, term, tgt) -> term :: unpack tgt
+  | _ -> assert false
+*)
+
+let rec strip_prods n = function
+  | t when n = 0 -> t
+  | Cic.Prod (_, _, tgt) when n > 0 -> strip_prods (n-1) tgt
+  | _ -> failwith "not enough prods"
+
+let params_of_obj = function
+  | Cic.Constant (_, _, _, params, _)
+  | Cic.Variable (_, _, _, params, _)
+  | Cic.CurrentProof (_, _, _, _, params, _)
+  | Cic.InductiveDefinition (_, params, _, _) ->
+      params
+
+let attributes_of_obj = function
+  | Cic.Constant (_, _, _, _, attributes)
+  | Cic.Variable (_, _, _, _, attributes)
+  | Cic.CurrentProof (_, _, _, _, _, attributes)
+  | Cic.InductiveDefinition (_, _, _, attributes) ->
+      attributes
+let rec mk_rels howmany from =
+  match howmany with 
+  | 0 -> []
+  | _ -> (Cic.Rel (howmany + from)) :: (mk_rels (howmany-1) from)
+
+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