X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic%2FcicUtil.ml;h=1c5d603caffcaa61b78ee158fc1235ae01f643b7;hb=ac7687ce66526f905874ed99a845223c853c558a;hp=29b03a07ea130a687d097e9d6a4d9228ef26c95c;hpb=d6e620f90542cc84eb7a1c8ae0127871fbea93f9;p=helm.git

diff --git a/helm/ocaml/cic/cicUtil.ml b/helm/ocaml/cic/cicUtil.ml
index 29b03a07e..1c5d603ca 100644
--- a/helm/ocaml/cic/cicUtil.ml
+++ b/helm/ocaml/cic/cicUtil.ml
@@ -46,7 +46,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,41 +103,60 @@ in
  is_closed 0
 ;;
 
-(* CPS iterators on Cic.term ************************************************)
+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 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 xpointer_RE = Str.regexp "\\([^#]+\\)#xpointer(\\(.*\\))"
+let slash_RE = Str.regexp "/"
+
+let term_of_uri s =
+  let uri = UriManager.uri_of_string s in
+  try
+    (if String.sub s (String.length s - 4) 4 = ".con" then
+      Cic.Const (uri, [])
+    else if String.sub s (String.length s - 4) 4 = ".var" then
+      Cic.Var (uri, [])
+    else if not (Str.string_match xpointer_RE s 0) then
+      raise (UriManager.IllFormedUri s)
+    else
+      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
+            (baseuri, int_of_string tyno - 1, int_of_string consno, [])
+      | _ -> raise Exit))
+  with
+  | Exit
+  | Failure _
+  | Not_found -> raise (UriManager.IllFormedUri s)
 
-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